From d7472937e8edbb607bd0f98b632544d5f7555bfb Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 10 Feb 2017 15:05:44 -0800 Subject: [PATCH 1/7] kodi: drop aarch64 patches --- ...ackets-completely-when-resampling-to.patch | 29 ------------------- ...e-default-device-for-non-passthrough.patch | 24 --------------- 2 files changed, 53 deletions(-) delete mode 100644 packages/mediacenter/kodi/patches/aarch64/kodi-0001-aml-Fill-audio-packets-completely-when-resampling-to.patch delete mode 100644 packages/mediacenter/kodi/patches/aarch64/kodi-0002-AESinkALSA-force-default-device-for-non-passthrough.patch diff --git a/packages/mediacenter/kodi/patches/aarch64/kodi-0001-aml-Fill-audio-packets-completely-when-resampling-to.patch b/packages/mediacenter/kodi/patches/aarch64/kodi-0001-aml-Fill-audio-packets-completely-when-resampling-to.patch deleted file mode 100644 index a829e77600..0000000000 --- a/packages/mediacenter/kodi/patches/aarch64/kodi-0001-aml-Fill-audio-packets-completely-when-resampling-to.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 58415a1c26a1d0f41bc45ff66471c2a41b705edf Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Sat, 20 Sep 2014 04:43:52 +0300 -Subject: [PATCH 1/5] [aml] Fill audio packets completely when resampling to - prevent 'audio data unaligned' kernel warnings - ---- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -index 3ca667c..304cff8 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -@@ -162,7 +162,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm - m_inputFormat.m_channelLayout += AE_CH_FC; - } - m_resampler = NULL; -+#ifdef HAS_LIBAMCODEC -+ m_fillPackets = true; -+#else - m_fillPackets = false; -+#endif - m_drain = false; - m_empty = true; - m_procSample = NULL; --- -1.7.10.4 - diff --git a/packages/mediacenter/kodi/patches/aarch64/kodi-0002-AESinkALSA-force-default-device-for-non-passthrough.patch b/packages/mediacenter/kodi/patches/aarch64/kodi-0002-AESinkALSA-force-default-device-for-non-passthrough.patch deleted file mode 100644 index e5f0b5181d..0000000000 --- a/packages/mediacenter/kodi/patches/aarch64/kodi-0002-AESinkALSA-force-default-device-for-non-passthrough.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 370709ff0bd108a8bf66656e1424c38341e0b0ac Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Fri, 7 Oct 2016 13:42:10 +0200 -Subject: [PATCH] AESinkALSA: force default device for non-passthrough - ---- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 6a9066b..4d7f85d 100644 ---- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -535,8 +535,8 @@ bool CAESinkALSA::Initialize(AEAudioFormat &format, std::string &device) - m_passthrough = false; - } - #if defined(HAS_LIBAMCODEC) -- if (aml_present()) -+ if (!m_passthrough && device.find("hdmi:CARD=AMLM8AUDIO") != std::string::npos) - { -- aml_set_audio_passthrough(m_passthrough); -+ device = "default"; - } - #endif From e5953619cec1854044a1b057c0cb7722d874b81b Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 10 Feb 2017 15:06:15 -0800 Subject: [PATCH 2/7] kodi: drop RPi patches --- .../RPi/patches/kodi/kodi-001-backport.patch | 52006 ---------------- 1 file changed, 52006 deletions(-) delete mode 100644 projects/RPi/patches/kodi/kodi-001-backport.patch diff --git a/projects/RPi/patches/kodi/kodi-001-backport.patch b/projects/RPi/patches/kodi/kodi-001-backport.patch deleted file mode 100644 index 3316323ffa..0000000000 --- a/projects/RPi/patches/kodi/kodi-001-backport.patch +++ /dev/null @@ -1,52006 +0,0 @@ -From 8386e404766c270aa72043215184400d2ec96c25 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 19 Dec 2016 13:28:26 +0000 -Subject: [PATCH 01/61] [cec] Drop CEC_DOUBLE_TAP_TIMEOUT_MS_OLD code - -Kodi won't even build with libcec 3, so supporting a libcec 2.2 setting is of no value ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 54dc37e751ba4ec50cfa922cfe4c0b1fd354e3cd..73872e3c6126bf4a4e8b998491f87a35dcbdaceb 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1391,13 +1391,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == LOCALISED_ID_SUSPEND ? 1 : 0; - m_bShutdownOnStandby = iStandbyAction == LOCALISED_ID_POWEROFF; - --#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) -- // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -- m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; --#else -- // backwards compatibility. will be removed once the next major release of libCEC is out -+ // double tap prevention timeout in ms - m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); --#endif - - if (GetSettingBool("pause_playback_on_deactivate")) - { - -From 606fde4f5f9e8cd26600d949619db516fd8d4ec1 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 28 Oct 2014 00:19:40 +0000 -Subject: [PATCH 02/61] [cec] Add settings for configuring button repeats - ---- - addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ - system/peripherals.xml | 4 +++- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 11 +++++++++++ - 3 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 0cdc64916aec1c12bfa2bb617eec530d5f1efe80..b356dbe55165567a232c2a6afd00387122aee96f 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -20424,3 +20424,18 @@ msgstr "" - msgctxt "#39014" - msgid "Would you also like to remove all related data (e.g. settings) of this add-on?" - msgstr "" -+ -+#: system/peripherals.xml -+msgctxt "#38050" -+msgid "Remote button press delay before repeating (ms)" -+msgstr "" -+ -+#: system/peripherals.xml -+msgctxt "#38051" -+msgid "Remote button press repeat rate (ms)" -+msgstr "" -+ -+#: system/peripherals.xml -+msgctxt "#38052" -+msgid "Remote button press release time (ms)" -+msgstr "" -diff --git a/system/peripherals.xml b/system/peripherals.xml -index d5704b249c3065b2980dc92c7c81dc7b384187bc..02b1a9ed6fce1986bd864bba09a9df0621f9e041 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -31,7 +31,9 @@ - - - -- -+ -+ -+ - - - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 73872e3c6126bf4a4e8b998491f87a35dcbdaceb..92c901e044aeb7b9bece17636ffe89c05648814f 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1296,6 +1296,15 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu - m_configuration.bActivateSource = config.bActivateSource; - bChanged |= SetSetting("activate_source", m_configuration.bActivateSource == 1); - -+ m_configuration.iDoubleTapTimeoutMs = config.iDoubleTapTimeoutMs; -+ bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeoutMs); -+ -+ m_configuration.iButtonRepeatRateMs = config.iButtonRepeatRateMs; -+ bChanged |= SetSetting("button_repeat_rate_ms", (int)m_configuration.iButtonRepeatRateMs); -+ -+ m_configuration.iButtonReleaseDelayMs = config.iButtonReleaseDelayMs; -+ bChanged |= SetSetting("button_release_delay_ms", (int)m_configuration.iButtonReleaseDelayMs); -+ - m_configuration.bPowerOffOnStandby = config.bPowerOffOnStandby; - - m_configuration.iFirmwareVersion = config.iFirmwareVersion; -@@ -1393,6 +1402,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - - // double tap prevention timeout in ms - m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ m_configuration.iButtonRepeatRateMs = GetSettingInt("button_repeat_rate_ms"); -+ m_configuration.iButtonReleaseDelayMs = GetSettingInt("button_release_delay_ms"); - - if (GetSettingBool("pause_playback_on_deactivate")) - { - -From cf1c64764598b85d9da9032feddd87c8f0fc58b6 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 3 Nov 2014 23:17:46 +0000 -Subject: [PATCH 03/61] [cec] Don't discard buttons when repeat mode is enabled - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 92c901e044aeb7b9bece17636ffe89c05648814f..da99db975e994c0e1d9d9b420f3ad92c6ed91eb6 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -803,7 +803,10 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration); - - CSingleLock lock(m_critSection); -- if (key.iDuration > 0) -+ // avoid the queue getting too long -+ if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5) -+ return; -+ if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0) - { - if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) - { - -From 4855222624ec6f184e5763bf9387f904545ab873 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 4 Nov 2014 18:50:00 +0000 -Subject: [PATCH 04/61] [cec] Temp - more logging - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index da99db975e994c0e1d9d9b420f3ad92c6ed91eb6..9114cec72ccaf16afa1e50d13b238c9ca0dee30d 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -800,12 +800,15 @@ void CPeripheralCecAdapter::GetNextKey(void) - - void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - { -- CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration); -+ CLog::Log(LOGDEBUG, "%s - received key %2x duration %d (rep:%d size:%d)", __FUNCTION__, key.iButton, key.iDuration, m_configuration.iButtonRepeatRateMs, m_buttonQueue.size()); - - CSingleLock lock(m_critSection); - // avoid the queue getting too long - if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5) -+ { -+ CLog::Log(LOGDEBUG, "%s - discarded key %2x", __FUNCTION__, key.iButton); - return; -+ } - if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0) - { - if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) -@@ -814,6 +817,7 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - if (m_bHasButton) - m_currentButton.iDuration = key.iDuration; - // ignore this one, since it's already been handled by xbmc -+ CLog::Log(LOGDEBUG, "%s - ignored key %2x", __FUNCTION__, key.iButton); - return; - } - // if we received a keypress with a duration set, try to find the same one without a duration set, and replace it -@@ -824,6 +828,7 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - if ((*it).iDuration == 0) - { - // replace this entry -+ CLog::Log(LOGDEBUG, "%s - replaced key %2x", __FUNCTION__, key.iButton); - (*it).iDuration = key.iDuration; - return; - } -@@ -833,6 +838,7 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - } - } - -+ CLog::Log(LOGDEBUG, "%s - added key %2x", __FUNCTION__, key.iButton); - m_buttonQueue.push_back(key); - } - - -From 741c1ec64bca9da543d9be6a4a82049ca0d70593 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 26 Apr 2014 17:27:52 +0100 -Subject: [PATCH 05/61] [cec] Don't suspend pi on tv switch off - it can't wake - up - ---- - system/peripherals.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index 02b1a9ed6fce1986bd864bba09a9df0621f9e041..54f9b70cfd5c8c82ceb99932e1b3e3251211cd20 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -16,7 +16,7 @@ - - - -- -+ - - - - -From 161d42929f5bbf481c946601d78376e873e706a4 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 7 Apr 2014 18:19:32 +0100 -Subject: [PATCH 06/61] [rbp/omxplayer] When opening a stream don't try to - update gui so often - ---- - xbmc/dialogs/GUIDialogBusy.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xbmc/dialogs/GUIDialogBusy.cpp b/xbmc/dialogs/GUIDialogBusy.cpp -index c8fe0706d128b3c67a4000894129ae0fa08bb223..8a5916299575661743131b921a27a76f0bb88409 100644 ---- a/xbmc/dialogs/GUIDialogBusy.cpp -+++ b/xbmc/dialogs/GUIDialogBusy.cpp -@@ -69,7 +69,11 @@ bool CGUIDialogBusy::WaitOnEvent(CEvent &event, unsigned int displaytime /* = 10 - { - dialog->Open(); - -+#ifdef TARGET_RASPBERRY_PI -+ while(!event.WaitMSec(100)) -+#else - while(!event.WaitMSec(1)) -+#endif - { - dialog->ProcessRenderLoop(false); - if (allowCancel && dialog->IsCanceled()) - -From c2d9db11fa5b5d56b0d5c19fe5712ed4e9088f3c Mon Sep 17 00:00:00 2001 -From: Ben Avison -Date: Thu, 1 May 2014 16:28:39 +0100 -Subject: [PATCH 07/61] Improved file buffering in CArchive - -Even though memcpy is typically inlined by the compiler into byte/word loads -and stores (at least for release builds), the frequency with which 1, 2 and 4 -byte loads/stores are encountered in cases where the size is *not* -determinable at compile time is still high enough that it's worth handling -these specially. On the ARM1176JZF-S in the Raspberry Pi, this improves the -total time to open a library (in the case where it's fetched from a CArchive) -by around 4%. - -It should be noted that this code uses 16-bit and 32-bit word loads and -stores that are not necessarily aligned to their respective widths. It is -possible that there are some architectures out there which do not support -this, although all ARMs since ARMv6 have supported it (and ARMs earlier than -that are probably not powerful enough to be good targets for XBMC). ---- - xbmc/utils/Archive.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/xbmc/utils/Archive.h b/xbmc/utils/Archive.h -index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7acce53b3a 100644 ---- a/xbmc/utils/Archive.h -+++ b/xbmc/utils/Archive.h -@@ -155,9 +155,17 @@ protected: - * than waiting until we attempt to put more data into an already full buffer */ - if (m_BufferRemain > size) - { -+ switch (size) -+ { -+ case 1: *m_BufferPos++ = *ptr; m_BufferRemain--; break; -+ case 2: *(uint16_t *) m_BufferPos = *(const uint16_t *) ptr; m_BufferPos += 2; m_BufferRemain -= 2; break; -+ case 4: *(uint32_t *) m_BufferPos = *(const uint32_t *) ptr; m_BufferPos += 4; m_BufferRemain -= 4; break; -+ default: - memcpy(m_BufferPos, ptr, size); - m_BufferPos += size; - m_BufferRemain -= size; -+ break; -+ } - return *this; - } - -@@ -170,9 +178,17 @@ protected: - /* Note, refilling the buffer is deferred until we know we need to read more from it */ - if (m_BufferRemain >= size) - { -+ switch (size) -+ { -+ case 1: *ptr = *m_BufferPos++; m_BufferRemain--; break; -+ case 2: *(uint16_t *) ptr = *(const uint16_t *) m_BufferPos; m_BufferPos += 2; m_BufferRemain -= 2; break; -+ case 4: *(uint32_t *) ptr = *(const uint32_t *) m_BufferPos; m_BufferPos += 4; m_BufferRemain -= 4; break; -+ default: - memcpy(ptr, m_BufferPos, size); - m_BufferPos += size; - m_BufferRemain -= size; -+ break; -+ } - return *this; - } - - -From 7835b498bae03e702db8dec9eebbe38ba0c9181c Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sun, 10 Aug 2014 16:45:16 +0100 -Subject: [PATCH 08/61] filesystem: Make support of browsing into archives - optional - -The ability to browse, scan and play content in archives can cause problems on low powered/low memory devices. -It's quite common to see reports of a large rar file that causes xbmc to crash with an out-of-memory error when browsing or scanning. -It also can be slow as any archive in the directory is opened and extracted. - -This causes issues for people who scan library with archives disabled, then subsequently enable it. -The library has the .rar files in which don't play without removing and re-adding. - -We'll let people who don't use archives disable it manually ---- - addons/resource.language.en_gb/resources/strings.po | 9 +++++++++ - system/settings/rbp.xml | 11 +++++++++++ - xbmc/Util.cpp | 4 ++-- - xbmc/filesystem/FileDirectoryFactory.cpp | 4 ++++ - 4 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index b356dbe55165567a232c2a6afd00387122aee96f..d4b4911282fbc32c89ef3f66f26179e1d798fb1f 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -20045,6 +20045,15 @@ msgstr "" - #: system/settings/rbp.xml - msgctxt "#38010" - msgid "GPU accelerated" -+ -+#: system/settings/settings.xml -+msgctxt "#38040" -+msgid "Support browsing into archives" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#38041" -+msgid "Allow viewing and playing files in archives (e.g. zip, rar)" - msgstr "" - - #. Setting #38011 "Show All Items entry" -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index 62e9c8ed2199f8c57a640b06b0216ee4c8f0ca1e..e8b0d3d472b02fd161a4b51e957b9129e3cb9792 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -102,4 +102,15 @@ - - - -+
-+ -+ -+ -+ 1 -+ true -+ -+ -+ -+ -+
- -diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp -index f2d69da28ce36209ace7391ed607bc85983520ac..c3fd0e2b3277a0a29de9b7c6861b796a9f198aee 100644 ---- a/xbmc/Util.cpp -+++ b/xbmc/Util.cpp -@@ -1900,7 +1900,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, - URIUtils::RemoveExtension(strCandidate); - if (StringUtils::StartsWithNoCase(strCandidate, videoName)) - { -- if (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath())) -+ if (CServiceBroker::GetSettings().GetBool("filelists.browsearchives") && (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath()))) - CUtil::ScanArchiveForAssociatedItems(pItem->GetPath(), "", item_exts, associatedFiles); - else - { -@@ -1910,7 +1910,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, - } - else - { -- if (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath())) -+ if (CServiceBroker::GetSettings().GetBool("filelists.browsearchives") && (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath()))) - CUtil::ScanArchiveForAssociatedItems(pItem->GetPath(), videoName, item_exts, associatedFiles); - } - } -diff --git a/xbmc/filesystem/FileDirectoryFactory.cpp b/xbmc/filesystem/FileDirectoryFactory.cpp -index 36fd7bb6358497abf80494620341def8ff991996..9c1b6bf975afee8b6a3d8784ed19af0367455f46 100644 ---- a/xbmc/filesystem/FileDirectoryFactory.cpp -+++ b/xbmc/filesystem/FileDirectoryFactory.cpp -@@ -40,6 +40,7 @@ - #include "playlists/PlayListFactory.h" - #include "Directory.h" - #include "File.h" -+#include "settings/Settings.h" - #include "FileItem.h" - #include "utils/StringUtils.h" - #include "URL.h" -@@ -148,6 +149,8 @@ IFileDirectory* CFileDirectoryFactory::Create(const CURL& url, CFileItem* pItem, - return NULL; - } - #endif -+ if (CServiceBroker::GetSettings().GetBool("filelists.browsearchives")) -+ { - if (url.IsFileType("zip")) - { - CURL zipURL = URIUtils::CreateArchivePath("zip", url); -@@ -221,6 +224,7 @@ IFileDirectory* CFileDirectoryFactory::Create(const CURL& url, CFileItem* pItem, - } - return NULL; - } -+ } - if (url.IsFileType("xbt")) - { - CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url); - -From b06c63eb292cd2a12c61435420ea7472bbf04e42 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 27 Oct 2014 13:06:57 +0000 -Subject: [PATCH 09/61] [rbp] Make cachemembuffersize default depend on memory - size - ---- - xbmc/linux/RBP.cpp | 10 ++++++++++ - xbmc/linux/RBP.h | 1 + - xbmc/settings/AdvancedSettings.cpp | 12 +++++++++++- - 3 files changed, 22 insertions(+), 1 deletion(-) - -diff --git a/xbmc/linux/RBP.cpp b/xbmc/linux/RBP.cpp -index 356d64b0b16e4b543abbdbb11f4beacd0b715334..c073dc28db9abc24025909e2d91b7ce49201f4ea 100644 ---- a/xbmc/linux/RBP.cpp -+++ b/xbmc/linux/RBP.cpp -@@ -24,6 +24,7 @@ - #include - #include "ServiceBroker.h" - #include "settings/Settings.h" -+#include "settings/AdvancedSettings.h" - #include "utils/log.h" - - #include "cores/omxplayer/OMXImage.h" -@@ -59,6 +60,12 @@ CRBP::~CRBP() - delete m_DllBcmHost; - } - -+void CRBP::InitializeSettings() -+{ -+ if (m_initialized && g_advancedSettings.m_cacheMemSize == ~0U) -+ g_advancedSettings.m_cacheMemSize = m_arm_mem < 256 ? 1024 * 1024 * 2 : 1024 * 1024 * 20; -+} -+ - bool CRBP::Initialize() - { - CSingleLock lock(m_critSection); -@@ -98,6 +105,8 @@ bool CRBP::Initialize() - if (!m_gui_resolution_limit) - m_gui_resolution_limit = m_gpu_mem < 128 ? 720:1080; - -+ InitializeSettings(); -+ - g_OMXImage.Initialize(); - m_omx_image_init = true; - return true; -@@ -110,6 +119,7 @@ void CRBP::LogFirmwareVerison() - response[sizeof(response) - 1] = '\0'; - CLog::Log(LOGNOTICE, "Raspberry PI firmware version: %s", response); - CLog::Log(LOGNOTICE, "ARM mem: %dMB GPU mem: %dMB MPG2:%d WVC1:%d", m_arm_mem, m_gpu_mem, m_codec_mpg2_enabled, m_codec_wvc1_enabled); -+ CLog::Log(LOGNOTICE, "cache.memorysize: %dMB", g_advancedSettings.m_cacheMemSize >> 20); - m_DllBcmHost->vc_gencmd(response, sizeof response, "get_config int"); - response[sizeof(response) - 1] = '\0'; - CLog::Log(LOGNOTICE, "Config:\n%s", response); -diff --git a/xbmc/linux/RBP.h b/xbmc/linux/RBP.h -index eff631d24cd7b072fd601f8f6a35ff0ae67bad4c..26a2a4bd74b54288282b534c5de7d59d6ccec7f5 100644 ---- a/xbmc/linux/RBP.h -+++ b/xbmc/linux/RBP.h -@@ -61,6 +61,7 @@ public: - ~CRBP(); - - bool Initialize(); -+ void InitializeSettings(); - void LogFirmwareVerison(); - void Deinitialize(); - int GetArmMem() { return m_arm_mem; } -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 5634ed111a6b7b19fb81acb9a81b58109ef40395..4ebc890a52995ca761effad6c30d41cb25b5bdb8 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -50,6 +50,9 @@ - #if defined(TARGET_DARWIN_IOS) - #include "platform/darwin/DarwinUtils.h" - #endif -+#if defined(TARGET_RASPBERRY_PI) -+#include "linux/RBP.h" -+#endif - - using namespace ADDON; - using namespace XFILE; -@@ -355,7 +358,12 @@ void CAdvancedSettings::Initialize() - m_bPVRAutoScanIconsUserSet = false; - m_iPVRNumericChannelSwitchTimeout = 2000; - -+#ifdef TARGET_RASPBERRY_PI -+ // want default to be memory dependent, but interface to gpu not available yet, so set in RBP.cpp -+ m_cacheMemSize = ~0; -+#else - m_cacheMemSize = 1024 * 1024 * 20; -+#endif - m_cacheBufferMode = CACHE_BUFFER_MODE_INTERNET; // Default (buffer all internet streams/filesystems) - // the following setting determines the readRate of a player data - // as multiply of the default data read rate -@@ -404,7 +412,9 @@ void CAdvancedSettings::Initialize() - m_extraLogLevels = 0; - - m_userAgent = g_sysinfo.GetUserAgent(); -- -+#ifdef TARGET_RASPBERRY_PI -+ g_RBP.InitializeSettings(); -+#endif - m_initialized = true; - } - - -From e3e9ab17bc67e558df61e4a88cf5ee7d42e29e31 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 30 May 2014 14:58:43 +0100 -Subject: [PATCH 10/61] [settings] Experiment: Report DESKTOP resolution in - video settings - ---- - xbmc/settings/DisplaySettings.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp -index 0f0f3549bb4e68fcbdf73976c43e300791fabc6b..b6a9adacc7872487b25331dff16cc5a302cb3e15 100644 ---- a/xbmc/settings/DisplaySettings.cpp -+++ b/xbmc/settings/DisplaySettings.cpp -@@ -705,6 +705,9 @@ void CDisplaySettings::SettingOptionsResolutionsFiller(const CSetting *setting, - std::vector resolutions = g_Windowing.ScreenResolutions(info.iScreen, info.fRefreshRate); - for (std::vector::const_iterator resolution = resolutions.begin(); resolution != resolutions.end(); ++resolution) - { -+if (resolution->ResInfo_Index == RES_DESKTOP) -+ list.push_back(std::make_pair(StringUtils::Format("DESKTOP"), resolution->ResInfo_Index)); -+else - list.push_back(std::make_pair( - StringUtils::Format("%dx%d%s", resolution->width, resolution->height, - ModeFlagsToString(resolution->flags, false).c_str()), - -From b688c614ab62dfcee9d7b44eb1d972fd7775a444 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 24 Sep 2014 23:13:52 +0100 -Subject: [PATCH 11/61] [audio] Add settings option to boost centre channel - when downmixing - -This allows a dB volume increase to be added to centre channel. -This can help improve dialgue in the presence of background music/effects. -It can go up to 30dB for testing purposes, but value of 6 is probably more reasonable. -It is recommended to ensure "Normalise levels on downmix" is enabled when boosting by large values to avoid clipping. - -Should work with Pi Sink (dvdplayer/paplayer) and omxplayer ---- - addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ - system/settings/settings.xml | 12 ++++++++++++ - .../Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp | 8 ++++++++ - .../AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp | 7 +++++++ - xbmc/cores/omxplayer/OMXAudio.cpp | 6 ++++++ - 5 files changed, 48 insertions(+) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index d4b4911282fbc32c89ef3f66f26179e1d798fb1f..532be48326aebeb2c05bb52176ea4544fae81c49 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -20265,6 +20265,21 @@ msgstr "" - - #empty strings from id 38062 to 38099 - -+#: system/settings/settings.xml -+msgctxt "#38007" -+msgid "Boost centre channel when downmixing" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#38008" -+msgid "Increase this value to make the dialogue louder compared to background sounds when downmixing multichannel audio" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#38009" -+msgid "%i dB" -+msgstr "" -+ - #. Description of section #14200 "Player"" - #: system/settings/settings.xml - msgctxt "#38100" -diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 9060fbc5eafe3726ab33649273aad9e05980f64a..b0d103cba5bcdd1d7bece68bc983ab37b0133dbb 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -2491,6 +2491,18 @@ - - - -+ -+ 2 -+ 0 -+ -+ 0 -+ 1 -+ 30 -+ -+ -+ 38009 -+ -+ - - HAS_AE_QUALITY_LEVELS - 2 -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -index af5bf93116543bd282953b01d0c5bcef93bb3a84..80aecbd496ac021b1a02c10ef9432a4c22e54bfa 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -@@ -20,6 +20,8 @@ - - #include "cores/AudioEngine/Utils/AEUtil.h" - #include "ActiveAEResampleFFMPEG.h" -+#include "ServiceBroker.h" -+#include "settings/Settings.h" - #include "utils/log.h" - - extern "C" { -@@ -104,6 +106,12 @@ bool CActiveAEResampleFFMPEG::Init(uint64_t dst_chan_layout, int dst_channels, i - { - av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); - } -+ int boost_center = CServiceBroker::GetSettings().GetInt("audiooutput.boostcenter"); -+ if (boost_center) -+ { -+ float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f); -+ av_opt_set_double(m_pContext, "center_mix_level", gain, 0); -+ } - - if (remapLayout) - { -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp -index 78071493fca4756c6741d7085e35cbe2f27038e6..9b9d1a736c974eab37bdd85e6553dfe69b438847 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp -@@ -25,6 +25,7 @@ - - #include "cores/AudioEngine/Utils/AEUtil.h" - #include "ActiveAEResamplePi.h" -+#include "ServiceBroker.h" - #include "settings/Settings.h" - #include "utils/log.h" - #include "linux/RBP.h" -@@ -164,6 +165,12 @@ bool CActiveAEResamplePi::Init(uint64_t dst_chan_layout, int dst_channels, int d - { - av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); - } -+ int boost_center = CServiceBroker::GetSettings().GetInt("audiooutput.boostcenter"); -+ if (boost_center) -+ { -+ float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f); -+ av_opt_set_double(m_pContext, "center_mix_level", gain, 0); -+ } - - if (remapLayout) - { -diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp -index fcec25db0c48b4d4ec7b329b19538a73d0b53efd..ae048e0d144e174020a6f567112f9829e3ac0c8b 100644 ---- a/xbmc/cores/omxplayer/OMXAudio.cpp -+++ b/xbmc/cores/omxplayer/OMXAudio.cpp -@@ -632,6 +632,12 @@ bool COMXAudio::Initialize(AEAudioFormat format, OMXClock *clock, CDVDStreamInfo - { - av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); - } -+ int boost_center = CServiceBroker::GetSettings().GetInt("audiooutput.boostcenter"); -+ if (boost_center) -+ { -+ float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f); -+ av_opt_set_double(m_pContext, "center_mix_level", gain, 0); -+ } - - // stereo upmix - if (upmix && m_src_channels == 2 && m_dst_channels > 2) - -From 564d8219c632fec87bc13cca69e92913441dada3 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 27 Oct 2014 15:23:51 +0000 -Subject: [PATCH 12/61] [rbp] Default extract thumbnails to false - -It can take 80 seconds for a single file on a Pi. It can cause crashes with out-of-memory errors. -It genereates a lot of support issues. Best to default to disabled and let users enable it if they must ---- - system/settings/rbp.xml | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc72740085 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -43,6 +43,12 @@ - - false - -+ -+ false -+ -+ -+ false -+ - - - - -From c3ffa7554489075837a561020d47a66e06bb6b7f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 27 Nov 2014 16:31:56 +0000 -Subject: [PATCH 13/61] [languageinvoker] Reduce priority of python threads - ---- - xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/xbmc/interfaces/generic/LanguageInvokerThread.cpp b/xbmc/interfaces/generic/LanguageInvokerThread.cpp -index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd12b5a81fd 100644 ---- a/xbmc/interfaces/generic/LanguageInvokerThread.cpp -+++ b/xbmc/interfaces/generic/LanguageInvokerThread.cpp -@@ -50,6 +50,11 @@ bool CLanguageInvokerThread::execute(const std::string &script, const std::vecto - m_args = arguments; - - Create(); -+ #ifdef TARGET_RASPBERRY_PI -+ /* low prio */ -+ SetPriority(GetPriority()-1); -+ #endif -+ - return true; - } - - -From 898ca2aa44542ed99f4e435e39a2a199c9ffd893 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 29 Nov 2014 15:25:16 +0000 -Subject: [PATCH 14/61] [rbp] hack: wait for splash to complete before changing - hdmi mode - ---- - xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp | 52 +++++++++++++++++++++++++ - 1 file changed, 52 insertions(+) - -diff --git a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp -index 6ec0f110ca748c1ca305b255e2f1a0413b40c1ad..d1a7de58dea31dba3864828bd268292d53945b3d 100644 ---- a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp -+++ b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp -@@ -33,6 +33,9 @@ - #include "guilib/StereoscopicsManager.h" - #include "rendering/RenderSystem.h" - #include -+#ifdef TARGET_POSIX -+#include "linux/XTimeUtils.h" -+#endif - - #ifndef __VIDEOCORE4__ - #define __VIDEOCORE4__ -@@ -222,12 +225,61 @@ int CEGLNativeTypeRaspberryPI::AddUniqueResolution(RESOLUTION_INFO &res, std::ve - } - #endif - -+#include -+ -+pid_t proc_find(const char* name) -+{ -+ DIR* dir; -+ struct dirent* ent; -+ char buf[512]; -+ -+ long pid; -+ char pname[100] = {0,}; -+ char state; -+ FILE *fp=NULL; -+ -+ if (!(dir = opendir("/proc"))) { -+ perror("can't open /proc"); -+ return -1; -+ } -+ -+ while((ent = readdir(dir)) != NULL) { -+ long lpid = atol(ent->d_name); -+ if(lpid < 0) -+ continue; -+ snprintf(buf, sizeof(buf), "/proc/%ld/stat", lpid); -+ fp = fopen(buf, "r"); -+ -+ if (fp) { -+ if ( (fscanf(fp, "%ld (%[^)]) %c", &pid, pname, &state)) != 3 ){ -+ printf("fscanf failed \n"); -+ fclose(fp); -+ closedir(dir); -+ return -1; -+ } -+ if (!strcmp(pname, name)) { -+ fclose(fp); -+ closedir(dir); -+ return (pid_t)lpid; -+ } -+ fclose(fp); -+ } -+ } -+ -+ closedir(dir); -+ return -1; -+} -+ -+ - bool CEGLNativeTypeRaspberryPI::SetNativeResolution(const RESOLUTION_INFO &res) - { - #if defined(TARGET_RASPBERRY_PI) - if(!m_DllBcmHost || !m_nativeWindow) - return false; - -+ while (proc_find("hello_video.bin") >= 0) -+ Sleep(100); -+ - DestroyDispmanxWindow(); - - RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); - -From 68a166868644bbd8bcd34267dd84af4fc1b42fe1 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 11 Dec 2014 17:00:57 +0000 -Subject: [PATCH 15/61] Fix for UI not showing both extractflags and - extractthumb - ---- - addons/resource.language.en_gb/resources/strings.po | 10 +++++++--- - system/settings/settings.xml | 4 ++-- - 2 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 532be48326aebeb2c05bb52176ea4544fae81c49..2e3f179fcc7aa100e2aaec64d0513145903ccd32 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -12880,7 +12880,7 @@ msgstr "" - - #: system/settings/settings.xml - msgctxt "#20433" --msgid "Extract thumbnails and video information" -+msgid "Extract video information from files" - msgstr "" - - #: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp -@@ -17688,7 +17688,7 @@ msgstr "" - #. Description of setting with label #20433 "Extract thumbnails and video information" - #: system/settings/settings.xml - msgctxt "#36178" --msgid "Extract thumbnails and metadata information such as codec and aspect ratio from videos." -+msgid "Extract metadata information such as codec and aspect ratio from videos." - msgstr "" - - #. Description of setting with label #20419 "Replace file names with library titles" -@@ -17700,7 +17700,7 @@ msgstr "" - #. Description of setting with label #20433 "Extract thumbnails and video information" - #: system/settings/settings.xml - msgctxt "#36180" --msgid "Extract thumbnails and information, such as codecs and aspect ratio, to display in library mode." -+msgid "Extract thumbnails, to display in library Mode." - msgstr "" - - #: system/settings/settings.xml -@@ -20463,3 +20463,7 @@ msgstr "" - msgctxt "#38052" - msgid "Remote button press release time (ms)" - msgstr "" -+ -+msgctxt "#38190" -+msgid "Extract thumbnails from video files" -+msgstr "" -diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index b0d103cba5bcdd1d7bece68bc983ab37b0133dbb..38a772b4e5f59cdd30293850752a761dbe532177 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -969,8 +969,8 @@ - true - - -- -- 4 -+ -+ 1 - true - - - -From 3ad4ce7c292f534de8db3305c8be7bf229b507dd Mon Sep 17 00:00:00 2001 -From: anaconda -Date: Thu, 11 Sep 2014 21:30:43 +0200 -Subject: [PATCH 16/61] Disable autoscrolling while on screensaver and while - opening streams. - ---- - xbmc/Application.cpp | 10 ++++++++++ - xbmc/Application.h | 2 ++ - xbmc/guilib/GUIFadeLabelControl.cpp | 4 +++- - xbmc/guilib/GUIFont.cpp | 4 ++++ - xbmc/guilib/GUILabel.cpp | 4 +++- - xbmc/guilib/GUITextBox.cpp | 3 ++- - 6 files changed, 24 insertions(+), 3 deletions(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 11f8005d16abd40a696156581384afeb68db66f6..2d668dc7b6239fafa6a7440093c34bb486d994a6 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -5260,3 +5260,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const - - return false; - } -+ -+bool CApplication::ScreenSaverDisablesAutoScrolling() -+{ -+ bool onBlackDimScreenSaver = IsInScreenSaver() && m_screenSaver && -+ (m_screenSaver->ID() == "screensaver.xbmc.builtin.black" || -+ m_screenSaver->ID() == "screensaver.xbmc.builtin.dim"); -+ bool openingStreams = m_pPlayer->IsPlaying() && g_windowManager.IsWindowActive(WINDOW_DIALOG_BUSY); -+ -+ return onBlackDimScreenSaver || openingStreams; -+} -diff --git a/xbmc/Application.h b/xbmc/Application.h -index 59a1ec96b24014b4bc3cc6a7e0d4aa345958eaf8..c50a56f4254c88a9f69a156aec2967bdc6315330 100644 ---- a/xbmc/Application.h -+++ b/xbmc/Application.h -@@ -382,6 +382,8 @@ public: - */ - void UnregisterActionListener(IActionListener *listener); - -+ bool ScreenSaverDisablesAutoScrolling(); -+ - std::unique_ptr m_ServiceManager; - - /*! -diff --git a/xbmc/guilib/GUIFadeLabelControl.cpp b/xbmc/guilib/GUIFadeLabelControl.cpp -index 01826a5f7ca2ccb104f897ca0670571a9b04b83d..553a6458a71009dd592c8a843eeb3bc336864d61 100644 ---- a/xbmc/guilib/GUIFadeLabelControl.cpp -+++ b/xbmc/guilib/GUIFadeLabelControl.cpp -@@ -21,6 +21,8 @@ - #include "GUIFadeLabelControl.h" - #include "utils/Random.h" - -+#include "Application.h" -+ - CGUIFadeLabelControl::CGUIFadeLabelControl(int parentID, int controlID, float posX, float posY, float width, float height, const CLabelInfo& labelInfo, bool scrollOut, unsigned int timeToDelayAtEnd, bool resetOnLabelChange, bool randomized) - : CGUIControl(parentID, controlID, posX, posY, width, height), m_label(labelInfo), m_scrollInfo(50, labelInfo.offsetX, labelInfo.scrollSpeed) - , m_textLayout(labelInfo.font, false) -@@ -106,7 +108,7 @@ void CGUIFadeLabelControl::Process(unsigned int currentTime, CDirtyRegionList &d - m_lastLabel = m_currentLabel; - } - -- if (m_infoLabels.size() > 1 || !m_shortText) -+ if ((m_infoLabels.size() > 1 || !m_shortText) && !g_application.ScreenSaverDisablesAutoScrolling()) - { // have scrolling text - bool moveToNextLabel = false; - if (!m_scrollOut) -diff --git a/xbmc/guilib/GUIFont.cpp b/xbmc/guilib/GUIFont.cpp -index 7f1108939a63162024c7a055403a58e395f090b6..1192b74675b79d1a862de2949a60163abb916035 100644 ---- a/xbmc/guilib/GUIFont.cpp -+++ b/xbmc/guilib/GUIFont.cpp -@@ -22,6 +22,7 @@ - #include "GUIFontTTF.h" - #include "GraphicContext.h" - -+#include "Application.h" - #include "threads/SingleLock.h" - #include "utils/TimeUtils.h" - #include "utils/MathUtils.h" -@@ -128,6 +129,9 @@ bool CGUIFont::UpdateScrollInfo(const vecText &text, CScrollInfo &scrollInfo) - // If the string is smaller than the viewport, then it may be plotted even - // more times than that. - // -+ if (g_application.ScreenSaverDisablesAutoScrolling()) -+ return false; -+ - if (scrollInfo.waitTime) - { - scrollInfo.waitTime--; -diff --git a/xbmc/guilib/GUILabel.cpp b/xbmc/guilib/GUILabel.cpp -index f15e847ec43d07b44660caec9f8faca780b0a061..ba88a7c5e45da13404d59dfbf1bbc8b93d3528c1 100644 ---- a/xbmc/guilib/GUILabel.cpp -+++ b/xbmc/guilib/GUILabel.cpp -@@ -21,6 +21,8 @@ - #include "GUILabel.h" - #include - -+#include "Application.h" -+ - CGUILabel::CGUILabel(float posX, float posY, float width, float height, const CLabelInfo& labelInfo, CGUILabel::OVER_FLOW overflow) - : m_label(labelInfo) - , m_textLayout(labelInfo.font, overflow == OVER_FLOW_WRAP, height) -@@ -103,7 +105,7 @@ void CGUILabel::Render() - color_t color = GetColor(); - bool renderSolid = (m_color == COLOR_DISABLED); - bool overFlows = (m_renderRect.Width() + 0.5f < m_textLayout.GetTextWidth()); // 0.5f to deal with floating point rounding issues -- if (overFlows && m_scrolling && !renderSolid) -+ if (overFlows && m_scrolling && !renderSolid && !g_application.ScreenSaverDisablesAutoScrolling()) - m_textLayout.RenderScrolling(m_renderRect.x1, m_renderRect.y1, m_label.angle, color, m_label.shadowColor, 0, m_renderRect.Width(), m_scrollInfo); - else - { -diff --git a/xbmc/guilib/GUITextBox.cpp b/xbmc/guilib/GUITextBox.cpp -index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144b303f15f 100644 ---- a/xbmc/guilib/GUITextBox.cpp -+++ b/xbmc/guilib/GUITextBox.cpp -@@ -24,6 +24,7 @@ - #include "utils/MathUtils.h" - #include "utils/StringUtils.h" - #include "guiinfo/GUIInfoLabels.h" -+#include "Application.h" - - #include - -@@ -133,7 +134,7 @@ void CGUITextBox::Process(unsigned int currentTime, CDirtyRegionList &dirtyregio - // update our auto-scrolling as necessary - if (m_autoScrollTime && m_lines.size() > m_itemsPerPage) - { -- if (!m_autoScrollCondition || m_autoScrollCondition->Get()) -+ if ((!m_autoScrollCondition || m_autoScrollCondition->Get()) && !g_application.ScreenSaverDisablesAutoScrolling()) - { - if (m_lastRenderTime) - m_autoScrollDelayTime += currentTime - m_lastRenderTime; - -From c5388bfa1dcd43ab0a2ba6a8426a19d511fb7207 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 13 Dec 2014 18:35:20 +0000 -Subject: [PATCH 17/61] [demuxer] Avoid memcpy on every demuxer packet - -Avoids an unnecessary memcpy on every demuxer packet which for -high bitrate videos can be significant. ---- - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 17 ++++++++++++----- - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h | 3 +++ - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp | 7 ++++++- - 3 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index a00a362239df1f7d99e3bf13a41a58e5d0567e02..e9a1645acbdb2dd2fbf3c1eaee9ef1401fe9bfd7 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -922,7 +922,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - { - if(m_pkt.pkt.stream_index == (int)m_pFormatContext->programs[m_program]->stream_index[i]) - { -- pPacket = CDVDDemuxUtils::AllocateDemuxPacket(m_pkt.pkt.size); -+ pPacket = CDVDDemuxUtils::AllocateDemuxPacket(0); - break; - } - } -@@ -931,7 +931,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - bReturnEmpty = true; - } - else -- pPacket = CDVDDemuxUtils::AllocateDemuxPacket(m_pkt.pkt.size); -+ pPacket = CDVDDemuxUtils::AllocateDemuxPacket(0); - } - else - bReturnEmpty = true; -@@ -961,9 +961,13 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - // copy contents into our own packet - pPacket->iSize = m_pkt.pkt.size; - -- // maybe we can avoid a memcpy here by detecting where pkt.destruct is pointing too? - if (m_pkt.pkt.data) -- memcpy(pPacket->pData, m_pkt.pkt.data, pPacket->iSize); -+ { -+ pPacket->pData = m_pkt.pkt.data; -+ // so we can free AVPacket when DemuxPacket is freed -+ pPacket->pkt = new AVPacket(m_pkt.pkt); -+ } -+ - - pPacket->pts = ConvertTimestamp(m_pkt.pkt.pts, stream->time_base.den, stream->time_base.num); - pPacket->dts = ConvertTimestamp(m_pkt.pkt.dts, stream->time_base.den, stream->time_base.num); -@@ -1017,7 +1021,10 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - pPacket->iStreamId = m_pkt.pkt.stream_index; - } - m_pkt.result = -1; -- av_packet_unref(&m_pkt.pkt); -+ if (pPacket && pPacket->pkt) -+ memset(&m_pkt.pkt, 0, sizeof(AVPacket)); -+ else -+ av_packet_unref(&m_pkt.pkt); - } - } - } // end of lock scope -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -index 4f471188c133deb91516311f0082e8741d9dee79..22805781c4d5a957d10fdf74ffa34387f67a25e9 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -@@ -25,6 +25,8 @@ - #define DMX_SPECIALID_STREAMINFO -10 - #define DMX_SPECIALID_STREAMCHANGE -11 - -+struct AVPacket; -+ - typedef struct DemuxPacket - { - unsigned char* pData; // data -@@ -36,6 +38,7 @@ typedef struct DemuxPacket - double pts; // pts in DVD_TIME_BASE - double dts; // dts in DVD_TIME_BASE - double duration; // duration in DVD_TIME_BASE if available -+ AVPacket *pkt; // to allow packet to be freed - - int dispTime; - } DemuxPacket; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp -index 403d75fe905f02dcc46a9bd1798ca6c8fc0ccc4e..66774e4d299790059db8ed99fb060e2b3e91cef4 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp -@@ -36,7 +36,12 @@ void CDVDDemuxUtils::FreeDemuxPacket(DemuxPacket* pPacket) - if (pPacket) - { - try { -- if (pPacket->pData) _aligned_free(pPacket->pData); -+ if (pPacket->pkt) -+ { -+ av_free_packet(pPacket->pkt); -+ delete pPacket->pkt; -+ } -+ else if (pPacket->pData) _aligned_free(pPacket->pData); - delete pPacket; - } - catch(...) { - -From 5fe6dc3d7ae961e85918126ba7ec834a0acf6f7f Mon Sep 17 00:00:00 2001 -From: anaconda -Date: Wed, 25 Feb 2015 18:22:21 +0100 -Subject: [PATCH 18/61] Load OSD dialogs on startup. - -Fixes skipped frames the first time they're loaded in memory on less powered -devices, like a Raspberry Pi, when using DVDPlayer. -See http://forum.kodi.tv/showthread.php?tid=211501&pid=1938811#pid1938811 ---- - xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp | 1 + - xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp | 1 + - xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp | 4 +++- - xbmc/video/dialogs/GUIDialogSubtitles.cpp | 2 +- - xbmc/video/dialogs/GUIDialogVideoOSD.cpp | 2 +- - xbmc/video/dialogs/GUIDialogVideoSettings.cpp | 4 +++- - 6 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp -index 4450583494e483afdeec610b489a9fe75944e054..28ed83f59ba1db07fc64d3c1fbcdc2acc7c1ad82 100644 ---- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp -+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp -@@ -45,6 +45,7 @@ CGUIDialogPVRChannelsOSD::CGUIDialogPVRChannelsOSD() : - CGUIDialog(WINDOW_DIALOG_PVR_OSD_CHANNELS, "DialogPVRChannelsOSD.xml"), - CPVRChannelNumberInputHandler(1000) - { -+ m_loadType = LOAD_ON_GUI_INIT; - m_vecItems = new CFileItemList; - } - -diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp -index 99a75175638c66968b7fe61a9dc973de64edd9fe..81355ff55f92f47378a986ac7ff2c0cd52296f9e 100644 ---- a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp -+++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp -@@ -36,6 +36,7 @@ using namespace PVR; - CGUIDialogPVRGuideOSD::CGUIDialogPVRGuideOSD() - : CGUIDialog(WINDOW_DIALOG_PVR_OSD_GUIDE, "DialogPVRGuideOSD.xml") - { -+ m_loadType = LOAD_ON_GUI_INIT; - m_vecItems = new CFileItemList; - } - -diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp -index ac501f769d648b669c4363a824fa4a751744555f..0a0cf76f254b85212bd5777b26e8872651bffece 100644 ---- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp -+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp -@@ -69,7 +69,9 @@ CGUIDialogAudioSubtitleSettings::CGUIDialogAudioSubtitleSettings() - : CGUIDialogSettingsManualBase(WINDOW_DIALOG_AUDIO_OSD_SETTINGS, "DialogSettings.xml"), - m_passthrough(false), - m_dspEnabled(false) --{ } -+{ -+ m_loadType = LOAD_ON_GUI_INIT; -+} - - CGUIDialogAudioSubtitleSettings::~CGUIDialogAudioSubtitleSettings() - { } -diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp -index 09ac499df555ea9231d6d486df11eb3a6a5265af..72da62e76337663f44ef8d5fc5c890bea1213ab3 100644 ---- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp -+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp -@@ -104,7 +104,7 @@ CGUIDialogSubtitles::CGUIDialogSubtitles(void) - , m_pausedOnRun(false) - , m_updateSubsList(false) - { -- m_loadType = KEEP_IN_MEMORY; -+ m_loadType = LOAD_ON_GUI_INIT; - } - - CGUIDialogSubtitles::~CGUIDialogSubtitles(void) -diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp -index e498e1fd476d9ab5300bb00bc39946a22cfd93cb..a6648d016b07e2eb3e52f8d927697cc53a42fd7b 100644 ---- a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp -+++ b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp -@@ -30,7 +30,7 @@ using namespace PVR; - CGUIDialogVideoOSD::CGUIDialogVideoOSD(void) - : CGUIDialog(WINDOW_DIALOG_VIDEO_OSD, "VideoOSD.xml") - { -- m_loadType = KEEP_IN_MEMORY; -+ m_loadType = LOAD_ON_GUI_INIT; - } - - CGUIDialogVideoOSD::~CGUIDialogVideoOSD(void) -diff --git a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp -index 7f10c52223c7a02471dcd3bc6d13da59b076a198..072c7be73f352ad00219594bb5ce0c3939f9c540 100644 ---- a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp -+++ b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp -@@ -67,7 +67,9 @@ - CGUIDialogVideoSettings::CGUIDialogVideoSettings() - : CGUIDialogSettingsManualBase(WINDOW_DIALOG_VIDEO_OSD_SETTINGS, "DialogSettings.xml"), - m_viewModeChanged(false) --{ } -+{ -+ m_loadType = LOAD_ON_GUI_INIT; -+} - - CGUIDialogVideoSettings::~CGUIDialogVideoSettings() - { } - -From 28634a946f135a94dd6167d54ee9c41dc27c6633 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 14 Apr 2015 20:51:14 +0100 -Subject: [PATCH 19/61] [gui] Also limit GUI updates when in non full-screen - video mode - ---- - xbmc/Application.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 2d668dc7b6239fafa6a7440093c34bb486d994a6..159d169cb4511afd192ac56fe8712f396af12b07 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -2761,7 +2761,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) - #if defined(TARGET_RASPBERRY_PI) || defined(HAS_IMXVPU) - // This code reduces rendering fps of the GUI layer when playing videos in fullscreen mode - // it makes only sense on architectures with multiple layers -- if (g_graphicsContext.IsFullScreenVideo() && !m_pPlayer->IsPausedPlayback() && m_pPlayer->IsRenderingVideoLayer()) -+ if (m_pPlayer->IsPlayingVideo() && !m_pPlayer->IsPausedPlayback() && m_pPlayer->IsRenderingVideoLayer()) - fps = m_ServiceManager->GetSettings().GetInt(CSettings::SETTING_VIDEOPLAYER_LIMITGUIUPDATE); - #endif - -@@ -2774,6 +2774,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) - { - if (!m_skipGuiRender) - g_windowManager.Process(CTimeUtils::GetFrameTime()); -+ else if (!g_graphicsContext.IsFullScreenVideo()) -+ g_windowManager.FrameMove(); - } - g_windowManager.FrameMove(); - } - -From d50f671f5d2a8607443d156f8cf4b6e5d48c9506 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 5 May 2015 23:58:06 +0100 -Subject: [PATCH 20/61] [screensaver] Leave GUI contents available for - screensaver - ---- - xbmc/guilib/GUIWindowManager.cpp | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp -index 77ab06e490beded56258826c91da5ee69cd55ed8..f0af5bc1e4d0e7b4e736a39fef06fbf7a37a6e93 100644 ---- a/xbmc/guilib/GUIWindowManager.cpp -+++ b/xbmc/guilib/GUIWindowManager.cpp -@@ -818,7 +818,16 @@ void CGUIWindowManager::ActivateWindow_Internal(int iWindowID, const std::vector - int currentWindow = GetActiveWindow(); - CGUIWindow *pWindow = GetWindow(currentWindow); - if (pWindow) -- CloseWindowSync(pWindow, iWindowID); -+ { -+ if (iWindowID == WINDOW_SCREENSAVER) -+ { -+ pWindow->Close(true, iWindowID); -+ } -+ else -+ { -+ CloseWindowSync(pWindow, iWindowID); -+ } -+ } - g_infoManager.SetNextWindow(WINDOW_INVALID); - - // Add window to the history list (we must do this before we activate it, - -From 96fc13c18ff166151226aa531fc0d49950f42d95 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 6 Jun 2015 18:43:57 +0100 -Subject: [PATCH 21/61] ffmpeg: Automatic switch to software decode for GMC - with more than one warp point - ---- - ...Signal-unsupported-GMC-with-more-than-one.patch | 48 ++++++++++++++++++++++ - tools/depends/target/ffmpeg/Makefile | 4 +- - tools/depends/target/ffmpeg/autobuild.sh | 2 + - .../VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++ - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h | 2 + - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 2 +- - xbmc/cores/VideoPlayer/DVDStreamInfo.cpp | 3 ++ - xbmc/cores/VideoPlayer/DVDStreamInfo.h | 1 + - xbmc/cores/omxplayer/OMXHelper.cpp | 8 +++- - 9 files changed, 73 insertions(+), 3 deletions(-) - create mode 100644 tools/depends/target/ffmpeg/0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - -diff --git a/tools/depends/target/ffmpeg/0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch b/tools/depends/target/ffmpeg/0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..4cb8dd8fc466220e5d2539120de79ab123e65713 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -@@ -0,0 +1,48 @@ -+From 84e9a1784bbd3182b68cefa5e5feae8da8b9e184 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Fri, 5 Jun 2015 22:48:33 +0100 -+Subject: [PATCH] mpeg4video: Signal unsupported GMC with more than one warp -+ point -+ -+--- -+ libavcodec/avcodec.h | 1 + -+ libavcodec/mpeg4videodec.c | 4 ++++ -+ 2 files changed, 5 insertions(+) -+ -+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -+index 8c7c420..e63dc2d 100644 -+--- a/libavcodec/avcodec.h -++++ b/libavcodec/avcodec.h -+@@ -2527,6 +2527,7 @@ typedef struct AVCodecContext { -+ #define FF_BUG_DC_CLIP 4096 -+ #define FF_BUG_MS 8192 ///< Work around various bugs in Microsoft's broken decoders. -+ #define FF_BUG_TRUNCATED 16384 -++#define FF_BUG_GMC_UNSUPPORTED 32768 -+ -+ /** -+ * strictly follow the standard (MPEG4, ...). -+diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c -+index 9bf33dd..0b5d3b9 100644 -+--- a/libavcodec/mpeg4videodec.c -++++ b/libavcodec/mpeg4videodec.c -+@@ -2179,6 +2179,9 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) -+ -+ if (ctx->divx_version >= 0) -+ s->workaround_bugs |= FF_BUG_HPEL_CHROMA; -++ -++ if (ctx->num_sprite_warping_points > 1) -++ s->workaround_bugs |= FF_BUG_GMC_UNSUPPORTED; -+ } -+ -+ if (s->workaround_bugs & FF_BUG_STD_QPEL) { -+@@ -2203,6 +2206,7 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) -+ s->workaround_bugs, ctx->lavc_build, ctx->xvid_build, -+ ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : ""); -+ -++ avctx->workaround_bugs = s->workaround_bugs; -+ if (CONFIG_MPEG4_DECODER && ctx->xvid_build >= 0 && -+ s->codec_id == AV_CODEC_ID_MPEG4 && -+ avctx->idct_algo == FF_IDCT_AUTO) { -+-- -+1.9.1 -+ -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index eaf9fc49319d5f0ee450ddd802bba569e291f0b5..8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -1,6 +1,7 @@ - include ../../Makefile.include - include FFMPEG-VERSION --DEPS= ../../Makefile.include FFMPEG-VERSION Makefile -+DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ -+ 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -76,6 +77,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - rm -rf $(PLATFORM); mkdir -p $(PLATFORM) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \&\& pkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure -+ cd $(PLATFORM); patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure $(ffmpg_config) -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index 5c2976278eb5ec5b8b4a4f9f9c7174b164ab5201..dde29adf425e54f54e4104b3370352db0be6ef40 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -132,6 +132,8 @@ mkdir -p "ffmpeg-${VERSION}" - cd "ffmpeg-${VERSION}" || exit 2 - tar --strip-components=1 -xf $MYDIR/${ARCHIVE} - -+patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -+ - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ - --extra-version="kodi-${VERSION}" \ -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 0976d9fb361324ca25224535c6a7c23c3b50bba1..4f5de0341b344c77a12c936f4f573c2911c0bb7b 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -45,6 +45,10 @@ - - #include "linux/RBP.h" - -+#ifndef FF_BUG_GMC_UNSUPPORTED -+#define FF_BUG_GMC_UNSUPPORTED 0 -+#endif -+ - using namespace KODI::MESSAGING; - - #define CLASSNAME "CMMALVideoBuffer" -@@ -365,6 +369,8 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - // we always qualify even if DVDFactoryCodec does this too. - if (!CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) - return false; -+ if (hints.workaround_bugs & FF_BUG_GMC_UNSUPPORTED) -+ return false; - - std::list deintMethods; - deintMethods.push_back(EINTERLACEMETHOD::VS_INTERLACEMETHOD_AUTO); -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h -index f2a5349d329ba4ce9886db41b7dc6c5aca0f00b1..a201efed7f3a591ebbe65106eb75e95264cd4a3f 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h -@@ -154,6 +154,7 @@ public: - iOrientation = 0; - iBitsPerPixel = 0; - iBitRate = 0; -+ workaround_bugs = 0; - } - - virtual ~CDemuxStreamVideo() {} -@@ -169,6 +170,7 @@ public: - int iBitsPerPixel; - int iBitRate; - std::string stereo_mode; // expected stereo mode -+ int workaround_bugs; // info for decoder - }; - - class CDemuxStreamAudio : public CDemuxStream -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index e9a1645acbdb2dd2fbf3c1eaee9ef1401fe9bfd7..b485ad23e6309647db2bc489ed6bfda60cf506a1 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1418,7 +1418,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - if (!stereoMode.empty()) - st->stereo_mode = stereoMode; - -- -+ st->workaround_bugs = pStream->codec->workaround_bugs; - if ( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) ) - { - if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) -diff --git a/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp b/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp -index e59c84c32ff6f108b52955523321f37bd3885986..28dbdd344473338762927f5f2d01425243187a7c 100644 ---- a/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp -+++ b/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp -@@ -74,6 +74,7 @@ void CDVDStreamInfo::Clear() - channellayout = 0; - - orientation = 0; -+ workaround_bugs = 0; - } - - bool CDVDStreamInfo::Equal(const CDVDStreamInfo& right, bool withextradata) -@@ -175,6 +176,7 @@ void CDVDStreamInfo::Assign(const CDVDStreamInfo& right, bool withextradata) - vfr = right.vfr; - software = right.software; - stereo_mode = right.stereo_mode; -+ workaround_bugs = right.workaround_bugs; - - // AUDIO - channels = right.channels; -@@ -233,6 +235,7 @@ void CDVDStreamInfo::Assign(const CDemuxStream& right, bool withextradata) - orientation = stream->iOrientation; - bitsperpixel = stream->iBitsPerPixel; - stereo_mode = stream->stereo_mode; -+ workaround_bugs = stream->workaround_bugs; - } - else if( right.type == STREAM_SUBTITLE ) - { -diff --git a/xbmc/cores/VideoPlayer/DVDStreamInfo.h b/xbmc/cores/VideoPlayer/DVDStreamInfo.h -index b087a110ad2cd4df00702133607ab117c87f552e..12c251e0feaf59bd9498d9cc63e3e3b9d8bb0dd8 100644 ---- a/xbmc/cores/VideoPlayer/DVDStreamInfo.h -+++ b/xbmc/cores/VideoPlayer/DVDStreamInfo.h -@@ -69,6 +69,7 @@ public: - int orientation; // orientation of the video in degrees counter clockwise - int bitsperpixel; - std::string stereo_mode; // stereoscopic 3d mode -+ int workaround_bugs; // info for decoder - - // AUDIO - int channels; -diff --git a/xbmc/cores/omxplayer/OMXHelper.cpp b/xbmc/cores/omxplayer/OMXHelper.cpp -index d7210ac180edf28024fc205385a75275f0c87330..4f5dedd05745ec918e8e683a329a526f981a9be6 100644 ---- a/xbmc/cores/omxplayer/OMXHelper.cpp -+++ b/xbmc/cores/omxplayer/OMXHelper.cpp -@@ -31,6 +31,10 @@ - #include "cores/omxplayer/OMXPlayerVideo.h" - #include "threads/SystemClock.h" - -+#ifndef FF_BUG_GMC_UNSUPPORTED -+#define FF_BUG_GMC_UNSUPPORTED 0 -+#endif -+ - #define PREDICATE_RETURN(lh, rh) \ - do { \ - if((lh) != (rh)) \ -@@ -82,7 +86,9 @@ bool OMXPlayerUnsuitable(bool m_HasVideo, bool m_HasAudio, CDVDDemux* m_pDemuxer - CDVDStreamInfo hint(*stream, true); - - bool supported = false; -- if ((hint.codec == AV_CODEC_ID_MPEG1VIDEO || hint.codec == AV_CODEC_ID_MPEG2VIDEO) && g_RBP.GetCodecMpg2()) -+ if (hint.workaround_bugs & FF_BUG_GMC_UNSUPPORTED) -+ ; -+ else if ((hint.codec == AV_CODEC_ID_MPEG1VIDEO || hint.codec == AV_CODEC_ID_MPEG2VIDEO) && g_RBP.GetCodecMpg2()) - supported = true; - else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1()) - supported = true; - -From 66c54f029dd878b416c669850f8210a0e6270c67 Mon Sep 17 00:00:00 2001 -From: Claudio-Sjo -Date: Mon, 16 Feb 2015 14:51:26 +0100 -Subject: [PATCH 22/61] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer - - fixes #15794 - ---- - xbmc/filesystem/CDDAFile.cpp | 120 ++++++++++++++++++++++++++++++++----------- - xbmc/filesystem/CDDAFile.h | 3 ++ - 2 files changed, 92 insertions(+), 31 deletions(-) - -diff --git a/xbmc/filesystem/CDDAFile.cpp b/xbmc/filesystem/CDDAFile.cpp -index 722e62602084923bd040803f0e5a5c336a42fa3b..b0f53e5d44e108d88d7af0e46913a7f29328cd31 100644 ---- a/xbmc/filesystem/CDDAFile.cpp -+++ b/xbmc/filesystem/CDDAFile.cpp -@@ -42,10 +42,14 @@ CFileCDDA::CFileCDDA(void) - m_lsnEnd = CDIO_INVALID_LSN; - m_cdio = CLibcdio::GetInstance(); - m_iSectorCount = 52; -+ m_TrackBuf = (uint8_t *) malloc(CDIO_CD_FRAMESIZE_RAW); -+ p_TrackBuf = 0; -+ f_TrackBuf = 0; - } - - CFileCDDA::~CFileCDDA(void) - { -+ free(m_TrackBuf); - Close(); - } - -@@ -53,6 +57,9 @@ bool CFileCDDA::Open(const CURL& url) - { - std::string strURL = url.GetWithoutFilename(); - -+ // Flag TrackBuffer = FALSE, TrackBuffer is empty -+ f_TrackBuf = 0; -+ - if (!g_mediaManager.IsDiscInDrive(strURL) || !IsValidFile(url)) - return false; - -@@ -117,50 +124,98 @@ int CFileCDDA::Stat(const CURL& url, struct __stat64* buffer) - - ssize_t CFileCDDA::Read(void* lpBuf, size_t uiBufSize) - { -- if (!m_pCdIo || !g_mediaManager.IsDiscInDrive()) -- return -1; - -- if (uiBufSize > SSIZE_MAX) -- uiBufSize = SSIZE_MAX; -+ ssize_t returnValue; -+ int iSectorCount; -+ void *destBuf; - -- // limit number of sectors that fits in buffer by m_iSectorCount -- int iSectorCount = std::min((int)uiBufSize / CDIO_CD_FRAMESIZE_RAW, m_iSectorCount); - -- if (iSectorCount <= 0) -+ if (!m_pCdIo || !g_mediaManager.IsDiscInDrive()) -+ { -+ CLog::Log(LOGERROR, "file cdda: Aborted because no disc in drive or no m_pCdIo"); - return -1; -+ } - -- // Are there enough sectors left to read -- if (m_lsnCurrent + iSectorCount > m_lsnEnd) -- iSectorCount = m_lsnEnd - m_lsnCurrent; -+ uiBufSize = std::min( uiBufSize, (size_t)SSIZE_MAX ); - -- // The loop tries to solve read error problem by lowering number of sectors to read (iSectorCount). -- // When problem is solved the proper number of sectors is stored in m_iSectorCount -- int big_iSectorCount = iSectorCount; -- while (iSectorCount > 0) -+ // If we have data in the TrackBuffer, they must be used first -+ if (f_TrackBuf) - { -- int iret = m_cdio->cdio_read_audio_sectors(m_pCdIo, lpBuf, m_lsnCurrent, iSectorCount); -+ // Get at most the remaining data in m_TrackBuf -+ uiBufSize = std::min(uiBufSize, CDIO_CD_FRAMESIZE_RAW - p_TrackBuf); -+ memcpy(lpBuf, m_TrackBuf + p_TrackBuf, uiBufSize); -+ // Update the data offset -+ p_TrackBuf += uiBufSize; -+ // Is m_TrackBuf empty? -+ f_TrackBuf = (CDIO_CD_FRAMESIZE_RAW == p_TrackBuf); -+ // All done, return read bytes -+ return uiBufSize; -+ } -+ -+ // No data left in buffer -+ -+ // Is this a short read? -+ if (uiBufSize < CDIO_CD_FRAMESIZE_RAW) -+ { -+ // short request, buffer one full sector -+ iSectorCount = 1; -+ destBuf = m_TrackBuf; -+ } -+ else // normal request -+ { -+ // limit number of sectors that fits in buffer by m_iSectorCount -+ iSectorCount = std::min((int)uiBufSize / CDIO_CD_FRAMESIZE_RAW, m_iSectorCount); -+ destBuf = lpBuf; -+ } - -+ // Are there enough sectors left to read? -+ iSectorCount = std::min(iSectorCount, m_lsnEnd - m_lsnCurrent); -+ -+ // Have we reached EOF? -+ if (iSectorCount == 0) -+ { -+ CLog::Log(LOGNOTICE, "file cdda: Read EoF"); -+ return 0; // Success, but nothing read -+ } // Reached EoF -+ -+ // At leat one sector to read -+ int retries; -+ int iret; -+ // Try reading a decresing number of sectors, then 3 times with 1 sector -+ for (retries = 3; retries > 0; iSectorCount>1 ? iSectorCount-- : retries--) -+ { -+ iret = m_cdio->cdio_read_audio_sectors(m_pCdIo, destBuf, m_lsnCurrent, iSectorCount); - if (iret == DRIVER_OP_SUCCESS) -+ break; // Get out from the loop -+ else - { -- // If lower iSectorCount solved the problem limit it's value -- if (iSectorCount < big_iSectorCount) -- { -- m_iSectorCount = iSectorCount; -- } -- break; -- } -- -- // iSectorCount is low so it cannot solve read problem -- if (iSectorCount <= 10) -- { -- CLog::Log(LOGERROR, "file cdda: Reading %d sectors of audio data starting at lsn %d failed with error code %i", iSectorCount, m_lsnCurrent, iret); -- return -1; -- } -- -- iSectorCount = 10; -+ CLog::Log(LOGERROR, "file cdda: Read cdio error when reading track "); -+ } // Errors when reading file - } -+ // retries == 0 only if failed reading at least one sector -+ if (retries == 0) -+ { -+ CLog::Log(LOGERROR, "file cdda: Reading %d sectors of audio data starting at lsn %d failed with error code %i", iSectorCount, m_lsnCurrent, iret); -+ return -1; -+ } -+ -+ // Update position in file - m_lsnCurrent += iSectorCount; - -+ // Was it a short request? -+ if (uiBufSize < CDIO_CD_FRAMESIZE_RAW) -+ { -+ // We copy the amount if requested data into the destination buffer -+ memcpy(lpBuf, m_TrackBuf, uiBufSize); -+ // and keep track of the first available data -+ p_TrackBuf = uiBufSize; -+ // Finally, we set the buffer flag as TRUE -+ f_TrackBuf = true; -+ // We will return uiBufSize -+ return uiBufSize; -+ } -+ -+ // Otherwise, just return the size of read data - return iSectorCount*CDIO_CD_FRAMESIZE_RAW; - } - -@@ -194,6 +249,9 @@ int64_t CFileCDDA::Seek(int64_t iFilePosition, int iWhence /*=SEEK_SET*/) - - void CFileCDDA::Close() - { -+ // Flag TrackBuffer = FALSE, TrackBuffer is empty -+ f_TrackBuf = 0; -+ - if (m_pCdIo) - { - m_cdio->cdio_destroy(m_pCdIo); -diff --git a/xbmc/filesystem/CDDAFile.h b/xbmc/filesystem/CDDAFile.h -index 0427af4534bfe59a343f0518c7f4242d93299836..e99236294fa8b9b613e465a8ecaf3ad3ba8b5a6f 100644 ---- a/xbmc/filesystem/CDDAFile.h -+++ b/xbmc/filesystem/CDDAFile.h -@@ -50,6 +50,9 @@ protected: - - protected: - CdIo_t* m_pCdIo; -+ uint8_t *m_TrackBuf; -+ size_t p_TrackBuf; -+ int f_TrackBuf; - lsn_t m_lsnStart; // Start of m_iTrack in logical sector number - lsn_t m_lsnCurrent; // Position inside the track in logical sector number - lsn_t m_lsnEnd; // End of m_iTrack in logical sector number - -From d97bb927df4346be71a45c3e1659b0592c080e96 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 24 Jun 2016 19:38:13 +0100 -Subject: [PATCH 23/61] codecoverlay: Include codec name in overlay - ---- - xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 4 ++++ - xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 5 ++++- - xbmc/cores/omxplayer/OMXPlayerAudio.cpp | 4 ++++ - xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 8 +++++--- - xbmc/cores/omxplayer/OMXPlayerVideo.h | 1 - - 5 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -index a40c6191e5e0e403790bbd05d6b5cded773f54c8..1f184e78d28a7430bca7d4f39de1f49adf33b56c 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -@@ -211,6 +211,10 @@ void CVideoPlayerAudio::UpdatePlayerInfo() - std::ostringstream s; - s << "aq:" << std::setw(2) << std::min(99,m_messageQueue.GetLevel()) << "%"; - s << ", Kb/s:" << std::fixed << std::setprecision(2) << (double)m_audioStats.GetBitrate() / 1024.0; -+ s << ", ac:" << m_processInfo.GetAudioDecoderName().c_str(); -+ if (!m_info.passthrough) -+ s << ", chan:" << m_processInfo.GetAudioChannels().c_str(); -+ s << ", " << m_streaminfo.samplerate/1000 << " kHz"; - - //print the inverse of the resample ratio, since that makes more sense - //if the resample ratio is 0.5, then we're playing twice as fast -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index 5298963d58bb976a2bbd608a8dbc8e079a5bef62..d4920ac30216fb295a16b70ddff887e2077ee196 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -@@ -896,10 +896,13 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) - - std::string CVideoPlayerVideo::GetPlayerInfo() - { -+ int width, height; -+ m_processInfo.GetVideoDimensions(width, height); - std::ostringstream s; - s << "vq:" << std::setw(2) << std::min(99,GetLevel()) << "%"; - s << ", Mb/s:" << std::fixed << std::setprecision(2) << (double)GetVideoBitrate() / (1024.0*1024.0); -- s << ", fr:" << std::fixed << std::setprecision(3) << m_fFrameRate; -+ s << ", dc:" << m_processInfo.GetVideoDecoderName().c_str(); -+ s << ", " << width << "x" << height << "[" << std::setprecision(2) << m_processInfo.GetVideoDAR() << "]@" << std::fixed << std::setprecision(3) << m_processInfo.GetVideoFps() << ", deint:" << m_processInfo.GetVideoDeintMethod(); - s << ", drop:" << m_iDroppedFrames; - s << ", skip:" << m_renderManager.GetSkippedFrames(); - -diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -index 968724e81d473a4bf8d4a0456be69f05e1a54812..c593c2fed0ce967f3d0b9fb5cf37b1026504b3a5 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -@@ -657,6 +657,10 @@ std::string OMXPlayerAudio::GetPlayerInfo() - std::ostringstream s; - s << "aq:" << std::setw(2) << std::min(99,m_messageQueue.GetLevel() + MathUtils::round_int(100.0/8.0*GetCacheTime())) << "%"; - s << ", Kb/s:" << std::fixed << std::setprecision(2) << (double)GetAudioBitrate() / 1024.0; -+ s << ", ac:" << m_processInfo.GetAudioDecoderName().c_str(); -+ if (!m_passthrough) -+ s << ", chan:" << m_processInfo.GetAudioChannels().c_str(); -+ s << ", " << m_processInfo.GetAudioSampleRate()/1000 << " kHz"; - - return s.str(); - } -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -index b2c435bb2bc3f458d63be7249069531a954c6b9e..d308e44e26baae1a56127b55b987c28c384a9b63 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -@@ -592,12 +592,14 @@ void OMXPlayerVideo::SetSpeed(int speed) - - std::string OMXPlayerVideo::GetPlayerInfo() - { -+ int width, height; -+ m_processInfo.GetVideoDimensions(width, height); - double match = 0.0f, phase = 0.0f, pll = 0.0f; - std::ostringstream s; -- s << "fr:" << std::fixed << std::setprecision(3) << m_fFrameRate; -- s << ", vq:" << std::setw(2) << std::min(99,GetLevel()) << "%"; -- s << ", dc:" << m_codecname; -+ s << "vq:" << std::setw(2) << std::min(99,GetLevel()) << "%"; - s << ", Mb/s:" << std::fixed << std::setprecision(2) << (double)GetVideoBitrate() / (1024.0*1024.0); -+ s << ", dc:" << m_processInfo.GetVideoDecoderName().c_str(); -+ s << ", " << width << "x" << height << "[" << std::setprecision(2) << m_processInfo.GetVideoDAR() << "]@" << std::fixed << std::setprecision(3) << m_processInfo.GetVideoFps() << ", deint:" << m_processInfo.GetVideoDeintMethod(); - if (m_omxVideo.GetPlayerInfo(match, phase, pll)) - { - s << ", match:" << std::fixed << std::setprecision(2) << match; -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h -index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291e20ecdac 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.h -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.h -@@ -55,7 +55,6 @@ protected: - bool m_stalled; - IDVDStreamPlayer::ESyncState m_syncState; - bool m_flush; -- std::string m_codecname; - std::atomic_bool m_bAbortOutput; - double m_iSubtitleDelay; - bool m_bRenderSubs; - -From b369306f68d346c906ec91a5ea4a3c78364d56e9 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Tue, 8 Mar 2016 21:20:58 +0300 -Subject: [PATCH 24/61] [DebugInfo] Add cpu usage info. - ---- - .../VideoPlayer/VideoRenderers/DebugRenderer.cpp | 56 ++++++++-------------- - .../VideoPlayer/VideoRenderers/DebugRenderer.h | 9 ++-- - .../VideoPlayer/VideoRenderers/RenderManager.cpp | 7 ++- - 3 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp -index 539a560f9554478ad25a5631121dc74e667d9b40..08721e153e5f3232585eb776d1d1b44396f63de4 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp -@@ -28,7 +28,7 @@ using namespace OVERLAY; - - CDebugRenderer::CDebugRenderer() - { -- for (int i=0; i<4; i++) -+ for (int i = 0; iRelease(); - } - } - --void CDebugRenderer::SetInfo(std::string &info1, std::string &info2, std::string &info3, std::string &info4) -+void CDebugRenderer::SetInfo(std::vector &infos) - { - m_overlayRenderer.Release(0); - -- if (info1 != m_strDebug[0]) -+ for (size_t i = 0; i < std::min(infos.size(), (size_t)DEBUG_OVERLAY_COUNT_MAX); i++) - { -- m_strDebug[0] = info1; -- if (m_overlay[0]) -- m_overlay[0]->Release(); -- m_overlay[0] = new CDVDOverlayText(); -- m_overlay[0]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[0])); -- } -- if (info2 != m_strDebug[1]) -- { -- m_strDebug[1] = info2; -- if (m_overlay[1]) -- m_overlay[1]->Release(); -- m_overlay[1] = new CDVDOverlayText(); -- m_overlay[1]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[1])); -- } -- if (info3 != m_strDebug[2]) -- { -- m_strDebug[2] = info3; -- if (m_overlay[2]) -- m_overlay[2]->Release(); -- m_overlay[2] = new CDVDOverlayText(); -- m_overlay[2]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[2])); -+ if (infos[i] != m_strDebug[i]) -+ { -+ if (infos[i].empty()) -+ continue; -+ m_strDebug[i] = infos[i]; -+ if (m_overlay[i]) -+ m_overlay[i]->Release(); -+ m_overlay[i] = new CDVDOverlayText(); -+ m_overlay[i]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[i])); -+ } -+ - } -- if (info4 != m_strDebug[3]) -+ for (size_t i = 0; i < DEBUG_OVERLAY_COUNT_MAX; i++) - { -- m_strDebug[3] = info4; -- if (m_overlay[3]) -- m_overlay[3]->Release(); -- m_overlay[3] = new CDVDOverlayText(); -- m_overlay[3]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[3])); -+ if (m_overlay[i]) -+ m_overlayRenderer.AddOverlay(m_overlay[i], 0, 0); - } -- -- m_overlayRenderer.AddOverlay(m_overlay[0], 0, 0); -- m_overlayRenderer.AddOverlay(m_overlay[1], 0, 0); -- m_overlayRenderer.AddOverlay(m_overlay[2], 0, 0); -- m_overlayRenderer.AddOverlay(m_overlay[3], 0, 0); - } - - void CDebugRenderer::Render(CRect &src, CRect &dst, CRect &view) -@@ -121,7 +103,7 @@ void CDebugRenderer::CRenderer::Render(int idx) - - COverlayText *text = dynamic_cast(o); - if (text) -- text->PrepareRender("arial.ttf", 1, 16, 0, m_font, m_fontBorder); -+ text->PrepareRender("arial.ttf", 1, 12, 0, m_font, m_fontBorder); - - RESOLUTION_INFO res = g_graphicsContext.GetResInfo(g_graphicsContext.GetVideoResolution()); - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h -index 85aefaace73994730f7d2bdff9de85c79e99b2a2..8005a13bc220be0c5c596d276197c11ed938ffb0 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h -@@ -22,6 +22,9 @@ - - #include "OverlayRenderer.h" - #include -+#include -+ -+#define DEBUG_OVERLAY_COUNT_MAX 6 - - class CDVDOverlayText; - -@@ -30,7 +33,7 @@ class CDebugRenderer - public: - CDebugRenderer(); - virtual ~CDebugRenderer(); -- void SetInfo(std::string &info1, std::string &info2, std::string &info3, std::string &info4); -+ void SetInfo(std::vector &infos); - void Render(CRect &src, CRect &dst, CRect &view); - void Flush(); - -@@ -43,7 +46,7 @@ protected: - void Render(int idx) override; - }; - -- std::string m_strDebug[4]; -- CDVDOverlayText *m_overlay[4]; -+ std::string m_strDebug[DEBUG_OVERLAY_COUNT_MAX]; -+ CDVDOverlayText *m_overlay[DEBUG_OVERLAY_COUNT_MAX]; - CRenderer m_overlayRenderer; - }; -\ No newline at end of file -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index 5230c6d2c9b20bfa6390b0da1b06ae9045580972..5feee388bb3a433ea6a35b29e587ab6447c089a5 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -@@ -24,6 +24,7 @@ - #include "guilib/GraphicContext.h" - #include "utils/MathUtils.h" - #include "threads/SingleLock.h" -+#include "utils/CPUInfo.h" - #include "utils/log.h" - #include "utils/StringUtils.h" - #include "windowing/WindowingFactory.h" -@@ -929,7 +930,7 @@ void CRenderManager::Render(bool clear, DWORD flags, DWORD alpha, bool gui) - - if (m_renderDebug) - { -- std::string audio, video, player, vsync; -+ std::string audio, video, player, vsync, cpu; - - m_playerPort->GetDebugInfo(audio, video, player); - -@@ -943,8 +944,10 @@ void CRenderManager::Render(bool clear, DWORD flags, DWORD alpha, bool gui) - missedvblanks, - clockspeed * 100); - } -+ cpu = g_cpuInfo.GetCoresUsageString(); - -- m_debugRenderer.SetInfo(audio, video, player, vsync); -+ std::vector infos = { audio, video, player, vsync, cpu }; -+ m_debugRenderer.SetInfo(infos); - m_debugRenderer.Render(src, dst, view); - - m_debugTimer.Set(1000); - -From a7af3b0cf07e3154c4c81672cdf977d639b53a21 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 22 May 2015 13:56:29 +0100 -Subject: [PATCH 25/61] ffmpeg: Allow neon to be enabled in unified builds - ---- - tools/depends/target/ffmpeg/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index 8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93..b5f38a458dfb341c43089e07afded153e234b9cd 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -23,7 +23,11 @@ ffmpg_config += --enable-gnutls - ffmpg_config += --enable-encoder=png --enable-encoder=mjpeg - - ifeq ($(CROSS_COMPILING), yes) -+ ifeq ($(CPU), cortex-a7) -+ ffmpg_config += --arch=arm --enable-cross-compile -+ else - ffmpg_config += --arch=$(CPU) --enable-cross-compile -+ endif - endif - ifeq ($(OS), linux) - ffmpg_config += --target-os=$(OS) --cpu=$(CPU) - -From 030cff10e75130e22daf8e1b2bbcd809170e654f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 27 Feb 2015 14:37:27 +0000 -Subject: [PATCH 26/61] ffmpeg: Add some upstream HEVC optimisations - ---- - tools/depends/target/ffmpeg/Makefile | 6 +- - .../added_ARM_NEON_optimized_SAO_patches.patch | 3328 ++++++++++++++++++++ - tools/depends/target/ffmpeg/autobuild.sh | 2 + - ...hevcdsp_ARM_NEON_optimized_epel_functions.patch | 409 +++ - 4 files changed, 3744 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/added_ARM_NEON_optimized_SAO_patches.patch - create mode 100644 tools/depends/target/ffmpeg/hevcdsp_ARM_NEON_optimized_epel_functions.patch - -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index b5f38a458dfb341c43089e07afded153e234b9cd..c46b533e47497cb7b1e7200eff2cee1a6f2a1a2f 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -1,7 +1,8 @@ - include ../../Makefile.include - include FFMPEG-VERSION - DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ -- 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -+ 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \ -+ hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -82,6 +83,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \&\& pkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure - cd $(PLATFORM); patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -+ cd $(PLATFORM); patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch -+ cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch -+ - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure $(ffmpg_config) -diff --git a/tools/depends/target/ffmpeg/added_ARM_NEON_optimized_SAO_patches.patch b/tools/depends/target/ffmpeg/added_ARM_NEON_optimized_SAO_patches.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..792b5fea581613a6fe9108443357f97518f4b4db ---- /dev/null -+++ b/tools/depends/target/ffmpeg/added_ARM_NEON_optimized_SAO_patches.patch -@@ -0,0 +1,3328 @@ -+From b0cb307c253d2c9f4b94a54dfc74ddb83af984cc Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Mon, 8 Dec 2014 13:24:40 +0200 -+Subject: [PATCH 1/9] added ARM NEON optimized SAO band offset -+ -+--- -+ libavcodec/arm/Makefile | 3 +- -+ libavcodec/arm/hevcdsp_init_neon.c | 47 +++++++++ -+ libavcodec/arm/hevcdsp_sao_neon.S | 204 +++++++++++++++++++++++++++++++++++++ -+ 3 files changed, 253 insertions(+), 1 deletion(-) -+ create mode 100644 libavcodec/arm/hevcdsp_sao_neon.S -+ -+diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile -+index 6051ec8..093a2e8 100644 -+--- a/libavcodec/arm/Makefile -++++ b/libavcodec/arm/Makefile -+@@ -133,7 +133,8 @@ NEON-OBJS-$(CONFIG_HEVC_DECODER) += arm/hevcdsp_init_neon.o \ -+ arm/hevcdsp_deblock_neon.o \ -+ arm/hevcdsp_epel_neon.o \ -+ arm/hevcdsp_idct_neon.o \ -+- arm/hevcdsp_qpel_neon.o -++ arm/hevcdsp_qpel_neon.o \ -++ arm/hevcdsp_sao_neon.o -+ NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_neon.o -+ NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_neon.o \ -+ arm/rv40dsp_neon.o -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 733ff08..69e2b2c 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -22,6 +22,7 @@ -+ #include "libavutil/arm/cpu.h" -+ #include "libavcodec/hevcdsp.h" -+ #include "hevcdsp_arm.h" -++#include "../bit_depth_template.c" -+ -+ void ff_hevc_v_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+ void ff_hevc_h_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+@@ -43,6 +44,11 @@ void ff_hevc_transform_add_16x16_neon_8(uint8_t *_dst, int16_t *coeffs, -+ void ff_hevc_transform_add_32x32_neon_8(uint8_t *_dst, int16_t *coeffs, -+ ptrdiff_t stride); -+ -++void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++ -+ #define PUT_PIXELS(name) \ -+ void name(int16_t *dst, uint8_t *src, \ -+ ptrdiff_t srcstride, int height, \ -+@@ -151,6 +157,44 @@ void ff_hevc_put_qpel_bi_neon_wrapper(uint8_t *dst, ptrdiff_t dststride, uint8_t -+ put_hevc_qpel_uw_neon[my][mx](dst, dststride, src, srcstride, width, height, src2, MAX_PB_SIZE); -+ } -+ -++static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, -++ int16_t *sao_offset_val, int sao_left_class, int width, int height) -++{ -++ pixel *dst = (pixel *)_dst; -++ pixel *src = (pixel *)_src; -++ int8_t offset_table[32] = { 0 }; -++ int k, y, x; -++ int shift = 3; // BIT_DEPTH - 5 -++ -++ stride_src /= sizeof(pixel); -++ stride_dst /= sizeof(pixel); -++ -++ for (k = 0; k < 4; k++) -++ offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1]; -++ -++ switch(width){ -++ case 8: -++ ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ break; -++ case 16: -++ ff_hevc_sao_band_w16_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ break; -++ case 32: -++ ff_hevc_sao_band_w32_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ break; -++ case 64: -++ ff_hevc_sao_band_w64_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ break; -++ default: -++ for (y = 0; y < height; y++) { -++ for (x = 0; x < width; x++) -++ dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]); -++ dst += stride_dst; -++ src += stride_src; -++ } -++ } -++} -++ -+ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ { -+ if (bit_depth == 8) { -+@@ -170,6 +214,9 @@ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ c->transform_add[2] = ff_hevc_transform_add_16x16_neon_8; -+ c->transform_add[3] = ff_hevc_transform_add_32x32_neon_8; -+ c->idct_4x4_luma = ff_hevc_transform_luma_4x4_neon_8; -++ for (x = 0; x < sizeof c->sao_band_filter / sizeof *c->sao_band_filter; x++) { -++ c->sao_band_filter[x] = ff_hevc_sao_band_neon_wrapper; -++ } -+ put_hevc_qpel_neon[1][0] = ff_hevc_put_qpel_v1_neon_8; -+ put_hevc_qpel_neon[2][0] = ff_hevc_put_qpel_v2_neon_8; -+ put_hevc_qpel_neon[3][0] = ff_hevc_put_qpel_v3_neon_8; -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+new file mode 100644 -+index 0000000..1f0ad64 -+--- /dev/null -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -0,0 +1,204 @@ -++/* -++ * Copyright (c) 2014 Seppo Tomperi -++ * -++ * This file is part of FFmpeg. -++ * -++ * FFmpeg is free software; you can redistribute it and/or -++ * modify it under the terms of the GNU Lesser General Public -++ * License as published by the Free Software Foundation; either -++ * version 2.1 of the License, or (at your option) any later version. -++ * -++ * FFmpeg is distributed in the hope that it will be useful, -++ * but WITHOUT ANY WARRANTY; without even the implied warranty of -++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -++ * Lesser General Public License for more details. -++ * -++ * You should have received a copy of the GNU Lesser General Public -++ * License along with FFmpeg; if not, write to the Free Software -++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -++ */ -++ -++#include "libavutil/arm/asm.S" -++#include "neon.S" -++ -++function ff_hevc_sao_band_w8_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // offset_table -++ vpush {d8-d15} -++ vld1.8 {q0, q1}, [r5] // offset table -++ -++1: subs r4, #1 -++ vld1.8 {d24}, [r1], r3 -++ vshr.u8 d16, d24, #3 -++ vtbl.8 d16, {q0, q1}, d16 -++ vmovl.s8 q2, d16 -++ vmovl.u8 q6, d24 -++ vadd.s16 q2, q6 -++ vqmovun.s16 d4, q2 -++ vst1.8 {d4}, [r0], r2 -++ bne 1b -++ -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w16_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // offset_table -++ vpush {d8-d15} -++ vld1.8 {q0, q1}, [r5] // offset table -++ -++1: subs r4, #1 -++ vld1.8 {q12}, [r1], r3 -++ -++ vshr.u8 q8, q12, #3 -++ -++ vtbl.8 d16, {q0, q1}, d16 -++ vtbl.8 d17, {q0, q1}, d17 -++ -++ vmovl.s8 q2, d16 -++ vmovl.s8 q3, d17 -++ -++ vmovl.u8 q6, d24 -++ vmovl.u8 q7, d25 -++ -++ vadd.s16 q2, q6 -++ vadd.s16 q3, q7 -++ -++ vqmovun.s16 d4, q2 -++ vqmovun.s16 d5, q3 -++ -++ vstm.8 r0, {q2} -++ add r0, r2 -++ bne 1b -++ -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // offset_table -++ vpush {d8-d15} -++ vld1.8 {q0, q1}, [r5] // offset table -++ -++1: subs r4, #1 -++ vld1.8 {q12-q13}, [r1], r3 -++ -++ vshr.u8 q8, q12, #3 -++ vshr.u8 q9, q13, #3 -++ -++ vtbl.8 d16, {q0, q1}, d16 -++ vtbl.8 d17, {q0, q1}, d17 -++ vtbl.8 d18, {q0, q1}, d18 -++ vtbl.8 d19, {q0, q1}, d19 -++ -++ vmovl.s8 q2, d16 -++ vmovl.s8 q3, d17 // q8 free -++ vmovl.s8 q4, d18 -++ vmovl.s8 q5, d19 // q9 free -++ -++ vmovl.u8 q6, d24 -++ vmovl.u8 q7, d25 // q12 free -++ vmovl.u8 q8, d26 -++ vmovl.u8 q9, d27 // q13 free -++ -++ vadd.s16 q2, q6 -++ vadd.s16 q3, q7 -++ vadd.s16 q4, q8 -++ vadd.s16 q5, q9 -++ -++ vqmovun.s16 d4, q2 -++ vqmovun.s16 d5, q3 -++ vqmovun.s16 d6, q4 // q4 free -++ vqmovun.s16 d7, q5 // q5 free -++ -++ vst1.8 {q2-q3}, [r0], r2 -++ bne 1b -++ -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // offset_table -++ vpush {d8-d15} -++ vld1.8 {q0, q1}, [r5] // offset table -++ -++1: subs r4, #1 -++ vld1.8 {q12-q13}, [r1]! -++ vld1.8 {q14-q15}, [r1], r3 -++ sub r1, #32 -++ -++ vshr.u8 q8, q12, #3 -++ vshr.u8 q9, q13, #3 -++ vshr.u8 q10, q14, #3 -++ vshr.u8 q11, q15, #3 -++ -++ vtbl.8 d16, {q0, q1}, d16 -++ vtbl.8 d17, {q0, q1}, d17 -++ vtbl.8 d18, {q0, q1}, d18 -++ vtbl.8 d19, {q0, q1}, d19 -++ vtbl.8 d20, {q0, q1}, d20 -++ vtbl.8 d21, {q0, q1}, d21 -++ vtbl.8 d22, {q0, q1}, d22 -++ vtbl.8 d23, {q0, q1}, d23 -++ -++ vmovl.s8 q2, d16 -++ vmovl.s8 q3, d17 // q8 free -++ vmovl.s8 q4, d18 -++ vmovl.s8 q5, d19 // q9 free -++ -++ vmovl.u8 q6, d24 -++ vmovl.u8 q7, d25 // q12 free -++ vmovl.u8 q8, d26 -++ vmovl.u8 q9, d27 // q13 free -++ -++ vadd.s16 q2, q6 -++ vadd.s16 q3, q7 -++ vadd.s16 q4, q8 -++ vadd.s16 q5, q9 -++ -++ vqmovun.s16 d4, q2 -++ vqmovun.s16 d5, q3 -++ vqmovun.s16 d6, q4 // q4 free -++ vqmovun.s16 d7, q5 // q5 free -++ -++ // free q4 -q9, q12 - q13 -++ vmovl.s8 q4, d20 -++ vmovl.s8 q5, d21 // q10 free -++ vmovl.s8 q6, d22 -++ vmovl.s8 q7, d23 // q11 free -++ -++ vmovl.u8 q8, d28 -++ vmovl.u8 q9, d29 // q14 free -++ vmovl.u8 q10, d30 -++ vmovl.u8 q11, d31 // q15 free -++ -++ vadd.s16 q4, q8 -++ vadd.s16 q5, q9 -++ vadd.s16 q6, q10 -++ vadd.s16 q7, q11 -++ -++ vqmovun.s16 d8, q4 -++ vqmovun.s16 d9, q5 -++ vqmovun.s16 d10, q6 -++ vqmovun.s16 d11, q7 -++ -++ vstm.8 r0, {q2-q5} -++ add r0, r2 -++ bne 1b -++ -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -+-- -+2.5.0 -+ -+ -+From 8429b1de64bb871d57651ecfe3b084e2dfe0af51 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Wed, 27 May 2015 18:10:20 +0100 -+Subject: [PATCH 2/9] added NEON optimized sao edge for eo1 width 64 -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 47 ++++++++++++ -+ libavcodec/arm/hevcdsp_sao_neon.S | 147 +++++++++++++++++++++++++++++++++++++ -+ 2 files changed, 194 insertions(+) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 69e2b2c..c7b5404 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -22,6 +22,7 @@ -+ #include "libavutil/arm/cpu.h" -+ #include "libavcodec/hevcdsp.h" -+ #include "hevcdsp_arm.h" -++#include "libavcodec/avcodec.h" -+ #include "../bit_depth_template.c" -+ -+ void ff_hevc_v_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+@@ -48,6 +49,7 @@ void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_d -+ void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+ void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+ void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_edge_eo1_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ -+ #define PUT_PIXELS(name) \ -+ void name(int16_t *dst, uint8_t *src, \ -+@@ -195,6 +197,50 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ } -+ } -+ -++#define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1)) -++static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t *_src /* align 32 */, ptrdiff_t stride_dst, -++ int16_t *_sao_offset_val, int eo, int width, int height) -++{ -++ static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 }; -++ static const int8_t pos[4][2][2] = { -++ { { -1, 0 }, { 1, 0 } }, // horizontal -++ { { 0, -1 }, { 0, 1 } }, // vertical -++ { { -1, -1 }, { 1, 1 } }, // 45 degree -++ { { 1, -1 }, { -1, 1 } }, // 135 degree -++ }; -++ int8_t sao_offset_val[8]; // padding of 3 for vld -++ ptrdiff_t stride_src = (2*MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); -++ pixel *dst = (pixel *)_dst; -++ pixel *src = (pixel *)_src; -++ int a_stride, b_stride; -++ int x, y; -++ -++ for (x = 0; x < 5; x++) { -++ sao_offset_val[x] = _sao_offset_val[x]; -++ } -++ -++ stride_src /= sizeof(pixel); -++ stride_dst /= sizeof(pixel); -++ -++ if (eo == 1 && width == 64) { -++ ff_hevc_sao_edge_eo1_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ } else { -++ a_stride = pos[eo][0][0] + pos[eo][0][1] * stride_src; -++ b_stride = pos[eo][1][0] + pos[eo][1][1] * stride_src; -++ for (y = 0; y < height; y++) { -++ for (x = 0; x < width; x++) { -++ int diff0 = CMP(src[x], src[x + a_stride]); -++ int diff1 = CMP(src[x], src[x + b_stride]); -++ int offset_val = edge_idx[2 + diff0 + diff1]; -++ dst[x] = av_clip_pixel(src[x] + sao_offset_val[offset_val]); -++ } -++ src += stride_src; -++ dst += stride_dst; -++ } -++ } -++} -++#undef CMP -++ -+ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ { -+ if (bit_depth == 8) { -+@@ -216,6 +262,7 @@ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ c->idct_4x4_luma = ff_hevc_transform_luma_4x4_neon_8; -+ for (x = 0; x < sizeof c->sao_band_filter / sizeof *c->sao_band_filter; x++) { -+ c->sao_band_filter[x] = ff_hevc_sao_band_neon_wrapper; -++ c->sao_edge_filter[x] = ff_hevc_sao_edge_neon_wrapper; -+ } -+ put_hevc_qpel_neon[1][0] = ff_hevc_put_qpel_v1_neon_8; -+ put_hevc_qpel_neon[2][0] = ff_hevc_put_qpel_v2_neon_8; -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 1f0ad64..5ec2de9 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -202,3 +202,150 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ bx lr -+ endfunc -+ -++function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x02 -++ vpush {d8-d15} -++1: subs r4, #1 -++ // load a -++ sub r1, r3 -++ vld1.8 {q0-q1}, [r1]! -++ vld1.8 {q2-q3}, [r1], r3 -++ sub r1, #32 -++ // load c -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ // load b -++ vld1.8 {q8-q9}, [r1]! -++ vld1.8 {q10-q11}, [r1], r3 -++ sub r1, #32 -++ -++ vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -++ vcgt.u8 q13, q5, q1 -++ vcgt.u8 q1, q1, q5 -++ vcgt.u8 q14, q6, q2 -++ vcgt.u8 q2, q2, q6 -++ vcgt.u8 q15, q7, q3 -++ vcgt.u8 q3, q3, q7 -++ -++ vsub.s8 q12, q0, q12 // diff0 -++ vsub.s8 q13, q1, q13 -++ vsub.s8 q14, q2, q14 -++ vsub.s8 q15, q3, q15 -++ -++ vcgt.u8 q0, q4, q8 // c > b -++ vcgt.u8 q8, q8, q4 // b > c -++ vcgt.u8 q1, q5, q9 -++ vcgt.u8 q9, q9, q5 -++ vcgt.u8 q2, q6, q10 -++ vcgt.u8 q10, q10, q6 -++ vcgt.u8 q3, q7, q11 -++ vcgt.u8 q11, q11, q7 -++ -++ vsub.s8 q0, q8, q0 // diff1 -++ vsub.s8 q1, q9, q1 -++ vsub.s8 q2, q10, q2 -++ vsub.s8 q3, q11, q3 -++ -++ veor.u8 q8, q8 // zero register -++ vdup.s8 q9, r6 // 2 to all elements -++ add r6, #1 -++ vdup.s8 q10, r6 // 3 to all elements -++ sub r6, #1 -++ -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ vadd.s8 q2, q14 -++ vadd.s8 q3, q15 -++ -++ vcgt.s8 q4, q0, q8 // diff0 + diff1 > 0 -++ vcgt.s8 q5, q1, q8 -++ vcgt.s8 q6, q2, q8 -++ vcgt.s8 q7, q3, q8 -++ -++ vclt.s8 q11, q0, q8 // diff0 + diff1 < 0 -++ vclt.s8 q12, q1, q8 -++ vclt.s8 q13, q2, q8 -++ vclt.s8 q14, q3, q8 -++ -++ vadd.s8 q8, q0, q9 // diff0 + diff1 + 2 -++ vand.8 q15, q8, q4 -++ vadd.s8 q8, q0, q10 // diff0 + diff1 + 3 -++ vand.8 q8, q8, q11 -++ vadd.s8 q0, q15, q8 // offset_idx -++ -++ vadd.s8 q8, q1, q9 // diff0 + diff1 + 2 -++ vand.8 q15, q8, q5 -++ vadd.s8 q8, q1, q10 // diff0 + diff1 + 3 -++ vand.8 q8, q8, q12 -++ vadd.s8 q1, q15, q8 // offset_idx -++ -++ vadd.s8 q8, q2, q9 // diff0 + diff1 + 2 + 2 -++ vand.8 q15, q8, q6 -++ vadd.s8 q8, q2, q10 // diff0 + diff1 + 2 + 3 -++ vand.8 q8, q8, q13 -++ vadd.s8 q2, q15, q8 // offset_idx -++ -++ vadd.s8 q8, q3, q9 // diff0 + diff1 + 2 + 2 -++ vand.8 q15, q8, q7 -++ vadd.s8 q8, q3, q10 // diff0 + diff1 + 2 + 3 -++ vand.8 q8, q8, q14 -++ vadd.s8 q3, q15, q8 // offset_idx -++ // TODO: load only once -++ vld1.8 d16, [r5] -++ -++ vtbl.8 d0, {d16}, d0 -++ vtbl.8 d1, {d16}, d1 -++ vtbl.8 d2, {d16}, d2 -++ vtbl.8 d3, {d16}, d3 -++ vtbl.8 d4, {d16}, d4 -++ vtbl.8 d5, {d16}, d5 -++ vtbl.8 d6, {d16}, d6 -++ vtbl.8 d7, {d16}, d7 -++ -++ // TODO: load only once -++ // load c again -++ sub r1, r3 -++ sub r1, r3 -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ -++ vmovl.u8 q8, d8 -++ vmovl.u8 q9, d9 -++ vmovl.u8 q10, d10 -++ vmovl.u8 q11, d11 -++ vmovl.u8 q12, d12 -++ vmovl.u8 q13, d13 -++ vmovl.u8 q14, d14 -++ vmovl.u8 q15, d15 -++ -++ vaddw.s8 q8, d0 -++ vaddw.s8 q9, d1 -++ vaddw.s8 q10, d2 -++ vaddw.s8 q11, d3 -++ vaddw.s8 q12, d4 -++ vaddw.s8 q13, d5 -++ vaddw.s8 q14, d6 -++ vaddw.s8 q15, d7 -++ -++ vqmovun.s16 d0, q8 -++ vqmovun.s16 d1, q9 -++ vqmovun.s16 d2, q10 -++ vqmovun.s16 d3, q11 -++ vqmovun.s16 d4, q12 -++ vqmovun.s16 d5, q13 -++ vqmovun.s16 d6, q14 -++ vqmovun.s16 d7, q15 -++ -++ vstm r0, {q0-q3} -++ add r0, r2 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -+-- -+2.5.0 -+ -+ -+From 402e2bd1c5ad659c757bf9734abe6331904fb9e2 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Tue, 16 Dec 2014 16:28:25 +0200 -+Subject: [PATCH 3/9] Added SAO edge offset for ARM NEON w32 and w64 -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 46 +++- -+ libavcodec/arm/hevcdsp_sao_neon.S | 510 +++++++++++++++++++++++++++++++------ -+ 2 files changed, 474 insertions(+), 82 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index c7b5404..c32940e 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -49,7 +49,16 @@ void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_d -+ void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+ void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+ void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++ -++void ff_hevc_sao_edge_eo0_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo1_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo2_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo3_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++ -++void ff_hevc_sao_edge_eo0_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ void ff_hevc_sao_edge_eo1_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo2_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo3_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ -+ #define PUT_PIXELS(name) \ -+ void name(int16_t *dst, uint8_t *src, \ -+@@ -222,9 +231,40 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ stride_src /= sizeof(pixel); -+ stride_dst /= sizeof(pixel); -+ -+- if (eo == 1 && width == 64) { -+- ff_hevc_sao_edge_eo1_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -+- } else { -++ switch (width) { -++ case 32: -++ switch(eo) { -++ case 0: -++ ff_hevc_sao_edge_eo0_w32_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 1: -++ ff_hevc_sao_edge_eo1_w32_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 2: -++ ff_hevc_sao_edge_eo2_w32_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 3: -++ ff_hevc_sao_edge_eo3_w32_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ } -++ break; -++ case 64: -++ switch(eo) { -++ case 0: -++ ff_hevc_sao_edge_eo0_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 1: -++ ff_hevc_sao_edge_eo1_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 2: -++ ff_hevc_sao_edge_eo2_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 3: -++ ff_hevc_sao_edge_eo3_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ } -++ break; -++ default: -+ a_stride = pos[eo][0][0] + pos[eo][0][1] * stride_src; -+ b_stride = pos[eo][1][0] + pos[eo][1][1] * stride_src; -+ for (y = 0; y < height; y++) { -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 5ec2de9..4687012 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -202,27 +202,7 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ bx lr -+ endfunc -+ -+-function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x02 -+- vpush {d8-d15} -+-1: subs r4, #1 -+- // load a -+- sub r1, r3 -+- vld1.8 {q0-q1}, [r1]! -+- vld1.8 {q2-q3}, [r1], r3 -+- sub r1, #32 -+- // load c -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -+- sub r1, #32 -+- // load b -+- vld1.8 {q8-q9}, [r1]! -+- vld1.8 {q10-q11}, [r1], r3 -+- sub r1, #32 -+- -++.macro edge_w64_body -+ vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -+ vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -+ vcgt.u8 q13, q5, q1 -+@@ -251,69 +231,61 @@ function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+ vsub.s8 q2, q10, q2 -+ vsub.s8 q3, q11, q3 -+ -+- veor.u8 q8, q8 // zero register -+- vdup.s8 q9, r6 // 2 to all elements -+- add r6, #1 -+- vdup.s8 q10, r6 // 3 to all elements -+- sub r6, #1 -+- -+ vadd.s8 q0, q12 //diff0 + diff1 -+ vadd.s8 q1, q13 -+ vadd.s8 q2, q14 -+ vadd.s8 q3, q15 -+ -+- vcgt.s8 q4, q0, q8 // diff0 + diff1 > 0 -+- vcgt.s8 q5, q1, q8 -+- vcgt.s8 q6, q2, q8 -+- vcgt.s8 q7, q3, q8 -+- -+- vclt.s8 q11, q0, q8 // diff0 + diff1 < 0 -+- vclt.s8 q12, q1, q8 -+- vclt.s8 q13, q2, q8 -+- vclt.s8 q14, q3, q8 -+- -+- vadd.s8 q8, q0, q9 // diff0 + diff1 + 2 -+- vand.8 q15, q8, q4 -+- vadd.s8 q8, q0, q10 // diff0 + diff1 + 3 -+- vand.8 q8, q8, q11 -+- vadd.s8 q0, q15, q8 // offset_idx -+- -+- vadd.s8 q8, q1, q9 // diff0 + diff1 + 2 -+- vand.8 q15, q8, q5 -+- vadd.s8 q8, q1, q10 // diff0 + diff1 + 3 -+- vand.8 q8, q8, q12 -+- vadd.s8 q1, q15, q8 // offset_idx -+- -+- vadd.s8 q8, q2, q9 // diff0 + diff1 + 2 + 2 -+- vand.8 q15, q8, q6 -+- vadd.s8 q8, q2, q10 // diff0 + diff1 + 2 + 3 -+- vand.8 q8, q8, q13 -+- vadd.s8 q2, q15, q8 // offset_idx -+- -+- vadd.s8 q8, q3, q9 // diff0 + diff1 + 2 + 2 -+- vand.8 q15, q8, q7 -+- vadd.s8 q8, q3, q10 // diff0 + diff1 + 2 + 3 -+- vand.8 q8, q8, q14 -+- vadd.s8 q3, q15, q8 // offset_idx -+- // TODO: load only once -+- vld1.8 d16, [r5] -+- -+- vtbl.8 d0, {d16}, d0 -+- vtbl.8 d1, {d16}, d1 -+- vtbl.8 d2, {d16}, d2 -+- vtbl.8 d3, {d16}, d3 -+- vtbl.8 d4, {d16}, d4 -+- vtbl.8 d5, {d16}, d5 -+- vtbl.8 d6, {d16}, d6 -+- vtbl.8 d7, {d16}, d7 -+- -+- // TODO: load only once -+- // load c again -+- sub r1, r3 -+- sub r1, r3 -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -+- sub r1, #32 -++ vdup.s8 q9, r6 // 3 to all elements -++ sub r6, #1 -++ -++ vclt.s8 q12, q0, #0 // diff0 + diff1 < 0 -++ vclt.s8 q13, q1, #0 -++ vclt.s8 q14, q2, #0 -++ vclt.s8 q15, q3, #0 -++ -++ vadd.s8 q8, q0, q9 // diff0 + diff1 + 3 -++ vadd.s8 q10, q1, q9 -++ vand.8 q12, q8, q12 // if (diff0 + diff1 < 0) then (diff0 + diff1 + 3) else 0 -++ vand.8 q13, q10, q13 -++ vadd.s8 q8, q2, q9 -++ vadd.s8 q10, q3, q9 -++ vand.8 q14, q8, q14 -++ vand.8 q15, q10, q15 -++ -++ vdup.s8 q9, r6 // 2 to all elements -++ add r6, #1 -++ -++ vcgt.s8 q10, q0, #0 // diff0 + diff1 > 0 -++ vadd.s8 q8, q0, q9 // diff0 + diff1 + 2 -++ vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vcgt.s8 q10, q1, #0 -++ vadd.s8 q0, q11, q12 // offset_idx -++ -++ vadd.s8 q8, q1, q9 // diff0 + diff1 + 2 -++ vcgt.s8 q12, q2, #0 -++ vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vadd.s8 q8, q2, q9 // diff0 + diff1 + 2 -++ vadd.s8 q1, q11, q13 -++ -++ vand.8 q11, q8, q12 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vcgt.s8 q10, q3, #0 -++ vadd.s8 q2, q11, q14 -++ -++ vadd.s8 q8, q3, q9 // diff0 + diff1 + 2 -++ vmov.32 d18[0], r7 // load offset table from general registers -++ vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vmov.32 d18[1], r5 // load rest of offset table -++ vadd.s8 q3, q11, q15 -++ -++ vtbl.8 d0, {d18}, d0 -++ vtbl.8 d1, {d18}, d1 -++ vtbl.8 d2, {d18}, d2 -++ vtbl.8 d3, {d18}, d3 -++ vtbl.8 d4, {d18}, d4 -++ vtbl.8 d5, {d18}, d5 -++ vtbl.8 d6, {d18}, d6 -++ vtbl.8 d7, {d18}, d7 -+ -+ vmovl.u8 q8, d8 -+ vmovl.u8 q9, d9 -+@@ -344,8 +316,388 @@ function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+ -+ vstm r0, {q0-q3} -+ add r0, r2 -++.endm -++ -++.macro edge_w32_body -++ vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -++ vcgt.u8 q13, q5, q1 -++ vcgt.u8 q1, q1, q5 -++ -++ vsub.s8 q12, q0, q12 // diff0 -++ vcgt.u8 q0, q4, q8 // c > b -++ vsub.s8 q13, q1, q13 // diff0 part 2 -++ -++ vcgt.u8 q6, q8, q4 // b > c -++ vcgt.u8 q1, q5, q9 -++ vcgt.u8 q7, q9, q5 -++ -++ vsub.s8 q0, q6, q0 // diff1 -++ vsub.s8 q1, q7, q1 // diff1 part 2 -++ vadd.s8 q0, q12 //diff0 + diff1 -++ -++ vdup.s8 q7, r6 // 3 to all elements -++ sub r6, #1 -++ vadd.s8 q1, q13 -++ -++ vclt.s8 q12, q0, #0 // diff0 + diff1 < 0 -++ vclt.s8 q13, q1, #0 -++ -++ vadd.s8 q6, q0, q7 // diff0 + diff1 + 3 -++ vadd.s8 q10, q1, q7 -++ vdup.s8 q7, r6 // 2 to all elements -++ add r6, #1 -++ vand.8 q12, q6, q12 // if (diff0 + diff1 < 0) then (diff0 + diff1 + 3) else 0 -++ vand.8 q13, q10, q13 -++ -++ -++ vcgt.s8 q10, q0, #0 // diff0 + diff1 > 0 -++ vadd.s8 q6, q0, q7 // diff0 + diff1 + 2 -++ vand.8 q11, q6, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vcgt.s8 q10, q1, #0 -++ vadd.s8 q0, q11, q12 // offset_idx -++ -++ vadd.s8 q6, q1, q7 // diff0 + diff1 + 2 -++ vmov.32 d14[0], r7 // load offset table from general registers -++ vand.8 q11, q6, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vmov.32 d14[1], r5 // load rest of offset table -++ vadd.s8 q1, q11, q13 -++ -++ vtbl.8 d0, {d14}, d0 -++ vtbl.8 d1, {d14}, d1 -++ vtbl.8 d2, {d14}, d2 -++ vtbl.8 d3, {d14}, d3 -++ -++ vmovl.u8 q6, d8 -++ vmovl.u8 q7, d9 -++ vmovl.u8 q10, d10 -++ vmovl.u8 q11, d11 -++ -++ vaddw.s8 q6, d0 -++ vaddw.s8 q7, d1 -++ vaddw.s8 q10, d2 -++ vaddw.s8 q11, d3 -++ -++ vqmovun.s16 d0, q6 -++ vqmovun.s16 d1, q7 -++ vqmovun.s16 d2, q10 -++ vqmovun.s16 d3, q11 -++ -++ vstm r0, {q0-q1} -++ add r0, r2 -++.endm -++ -++function ff_hevc_sao_edge_eo0_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ sub r1, #8 -++1: subs r4, #1 -++ vld1.64 {q10-q11}, [r1]! -++ vld1.64 {q12-q13}, [r1]! -++ vld1.64 {q14}, [r1], r3 -++ sub r1, #64 -++ // load a -++ vext.8 q0, q10, q11, #7 -++ vext.8 q1, q11, q12, #7 -++ vext.8 q2, q12, q13, #7 -++ vext.8 q3, q13, q14, #7 -++ // load c -++ vext.8 q4, q10, q11, #8 -++ vext.8 q5, q11, q12, #8 -++ vext.8 q6, q12, q13, #8 -++ vext.8 q7, q13, q14, #8 -++ // load b -++ vext.8 q8, q10, q11, #9 -++ vext.8 q9, q11, q12, #9 -++ vext.8 q10, q12, q13, #9 -++ vext.8 q11, q13, q14, #9 -++ edge_w64_body -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ sub r1, r3 -++ // load a -++ vld1.8 {q0-q1}, [r1]! -++ vld1.8 {q2-q3}, [r1], r3 -++ sub r1, #32 -++1: subs r4, #1 -++ // load c -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ // load b -++ vld1.8 {q8-q9}, [r1]! -++ vld1.8 {q10-q11}, [r1] -++ sub r1, #32 -++ edge_w64_body -++ // copy c to a -++ vmov.64 q0, q4 -++ vmov.64 q1, q5 -++ vmov.64 q2, q6 -++ vmov.64 q3, q7 -+ bne 1b -+ vpop {d8-d15} -+ pop {r4-r8} -+ bx lr -+ endfunc -++ -++function ff_hevc_sao_edge_eo2_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++1: sub r1, r3 -++ // load a -++ // TODO: fix unaligned load -++ // don't reload a like in eo1 -++ sub r1, #1 -++ vld1.8 {q0-q1}, [r1]! -++ vld1.8 {q2-q3}, [r1], r3 -++ sub r1, #31 -++ subs r4, #1 -++ // load c -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ // load b -++ add r1, #1 -++ vld1.8 {q8-q9}, [r1]! -++ vld1.8 {q10-q11}, [r1] -++ sub r1, #33 -++ edge_w64_body -++ // copy c to a -++ vmov.64 q0, q4 -++ vmov.64 q1, q5 -++ vmov.64 q2, q6 -++ vmov.64 q3, q7 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++1: sub r1, r3 -++ // load a -++ // TODO: fix unaligned load -++ // don't reload a like in eo1 -++ add r1, #1 -++ vld1.8 {q0-q1}, [r1]! -++ vld1.8 {q2-q3}, [r1], r3 -++ sub r1, #33 -++ subs r4, #1 -++ // load c -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ // load b -++ sub r1, #1 -++ vld1.8 {q8-q9}, [r1]! -++ vld1.8 {q10-q11}, [r1] -++ sub r1, #31 -++ edge_w64_body -++ // copy c to a -++ vmov.64 q0, q4 -++ vmov.64 q1, q5 -++ vmov.64 q2, q6 -++ vmov.64 q3, q7 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo0_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ sub r1, #8 // load 8 extra bytes -++1: subs r4, #1 -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 // only first 9 bytes are used -++ sub r1, #32 -++ // a -++ vext.8 q0, q10, q11, #7 -++ vext.8 q1, q11, q12, #7 -++ // c -++ vext.8 q4, q10, q11, #8 -++ vext.8 q5, q11, q12, #8 -++ // b -++ vext.8 q8, q10, q11, #9 -++ vext.8 q9, q11, q12, #9 -++ edge_w32_body -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo1_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ // load a -++ sub r1, r3 -++ vld1.8 {q0-q1}, [r1], r3 -++ // load c -++ vld1.8 {q4-q5}, [r1], r3 -++1: subs r4, #1 -++ // load b -++ vld1.8 {q8-q9}, [r1], r3 -++ edge_w32_body -++ // inputs for next loop iteration -++ // a -++ vmov.64 q0, q4 -++ vmov.64 q1, q5 -++ // c -++ vmov.64 q4, q8 -++ vmov.64 q5, q9 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo2_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ // load a -++ sub r1, r3 -++ sub r1, #8 -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q0, q10, q11, #7 -++ vext.8 q1, q11, q12, #7 -++ // load c -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q4, q10, q11, #8 -++ vext.8 q5, q11, q12, #8 -++ vext.8 q2, q10, q11, #7 -++1: subs r4, #1 -++ // load b -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q8, q10, q11, #9 -++ vext.8 q9, q11, q12, #9 -++ vext.8 q14, q10, q11, #8 -++ vext.8 q15, q11, q12, #8 -++ vext.8 q3, q10, q11, #7 -++ edge_w32_body -++ // inputs for next loop iteration -++ // a -++ vmov.8 q0, q2 -++ vext.8 q1, q4, q5, #15 -++ // c -++ vmov.8 q4, q14 -++ vmov.8 q5, q15 -++ vmov.8 q2, q3 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo3_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ sub r1, r3 -++ ldr r5, [r5] -++ sub r1, #8 -++ vpush {d8-d15} -++ // load a -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q0, q10, q11, #9 -++ vext.8 q1, q11, q12, #9 -++ // load c -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q4, q10, q11, #8 -++ vext.8 q5, q11, q12, #8 -++ vext.8 q2, q12, q11, #8 -++1: subs r4, #1 -++ // load b -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q8, q10, q11, #7 -++ vext.8 q9, q11, q12, #7 -++ vext.8 q3, q12, q10, #7 -++ edge_w32_body -++ // inputs for next loop iteration -++ // a -++ vext.8 q0, q4, q5, #1 -++ vext.8 q1, q5, q2, #1 -++ // c -++ vext.8 q4, q8, q9, #1 -++ vext.8 q5, q9, q3, #1 -++ vext.8 q2, q3, q1, #1 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -+-- -+2.5.0 -+ -+ -+From 1898d052a73370166d57e17cc7c52b7275887df3 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Fri, 19 Dec 2014 09:44:10 +0200 -+Subject: [PATCH 4/9] Improved SAO band NEON opimizations made SAO buffer 16 -+ byte aligned added alignment hints to loads and stores optimized register -+ usage in SAO band neon assembly -+ -+--- -+ libavcodec/arm/hevcdsp_sao_neon.S | 212 +++++++++++++++----------------------- -+ 1 file changed, 82 insertions(+), 130 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 4687012..ac21013 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -22,120 +22,84 @@ -+ #include "neon.S" -+ -+ function ff_hevc_sao_band_w8_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // offset_table -+- vpush {d8-d15} -+- vld1.8 {q0, q1}, [r5] // offset table -++ ldr r12, [sp, #4] // offset_table address -++ vld1.8 {q0, q1}, [r12] // offset table -++ ldr r12, [sp, #0] // height -+ -+-1: subs r4, #1 -+- vld1.8 {d24}, [r1], r3 -++1: subs r12, #1 -++ vld1.8 {d24}, [r1,:64], r3 -+ vshr.u8 d16, d24, #3 -+ vtbl.8 d16, {q0, q1}, d16 -+- vmovl.s8 q2, d16 -+ vmovl.u8 q6, d24 -+- vadd.s16 q2, q6 -++ vaddw.s8 q6, d16 -+ vqmovun.s16 d4, q2 -+- vst1.8 {d4}, [r0], r2 -++ vst1.8 {d4}, [r0,:64], r2 -+ bne 1b -+ -+- vpop {d8-d15} -+- pop {r4-r8} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_band_w16_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // offset_table -+- vpush {d8-d15} -+- vld1.8 {q0, q1}, [r5] // offset table -+- -+-1: subs r4, #1 -+- vld1.8 {q12}, [r1], r3 -++ ldr r12, [sp, #4] // offset_table address -++ vld1.8 {q0, q1}, [r12] // offset table -++ ldr r12, [sp, #0] // height -+ -++1: subs r12, #1 -++ vld1.8 {q12}, [r1,:128], r3 -+ vshr.u8 q8, q12, #3 -+- -+ vtbl.8 d16, {q0, q1}, d16 -+ vtbl.8 d17, {q0, q1}, d17 -+- -+- vmovl.s8 q2, d16 -+- vmovl.s8 q3, d17 -+- -+- vmovl.u8 q6, d24 -+- vmovl.u8 q7, d25 -+- -+- vadd.s16 q2, q6 -+- vadd.s16 q3, q7 -+- -+- vqmovun.s16 d4, q2 -+- vqmovun.s16 d5, q3 -+- -+- vstm.8 r0, {q2} -+- add r0, r2 -++ vmovl.u8 q10, d24 -++ vmovl.u8 q11, d25 -++ vaddw.s8 q10, d16 -++ vaddw.s8 q11, d17 -++ vqmovun.s16 d4, q10 -++ vqmovun.s16 d5, q11 -++ vst1.8 {q2}, [r0,:128], r2 -+ bne 1b -+ -+- vpop {d8-d15} -+- pop {r4-r8} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_band_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // offset_table -+- vpush {d8-d15} -+- vld1.8 {q0, q1}, [r5] // offset table -+- -+-1: subs r4, #1 -+- vld1.8 {q12-q13}, [r1], r3 -+- -+- vshr.u8 q8, q12, #3 -+- vshr.u8 q9, q13, #3 -+- -+- vtbl.8 d16, {q0, q1}, d16 -+- vtbl.8 d17, {q0, q1}, d17 -+- vtbl.8 d18, {q0, q1}, d18 -+- vtbl.8 d19, {q0, q1}, d19 -+- -+- vmovl.s8 q2, d16 -+- vmovl.s8 q3, d17 // q8 free -+- vmovl.s8 q4, d18 -+- vmovl.s8 q5, d19 // q9 free -+- -+- vmovl.u8 q6, d24 -+- vmovl.u8 q7, d25 // q12 free -+- vmovl.u8 q8, d26 -+- vmovl.u8 q9, d27 // q13 free -+- -+- vadd.s16 q2, q6 -+- vadd.s16 q3, q7 -+- vadd.s16 q4, q8 -+- vadd.s16 q5, q9 -+- -+- vqmovun.s16 d4, q2 -+- vqmovun.s16 d5, q3 -+- vqmovun.s16 d6, q4 // q4 free -+- vqmovun.s16 d7, q5 // q5 free -+- -+- vst1.8 {q2-q3}, [r0], r2 -+- bne 1b -+- -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ ldr r12, [sp, #4] // offset_table address -++ vld1.8 {q0, q1}, [r12] // offset table -++ ldr r12, [sp, #0] // height -++ -++1: subs r12, #1 -++ vld1.8 {q2-q3}, [r1,:128], r3 -++ vshr.u8 q8, q2, #3 -++ vshr.u8 q9, q3, #3 -++ vtbl.8 d16, {q0, q1}, d16 -++ vtbl.8 d17, {q0, q1}, d17 -++ vtbl.8 d18, {q0, q1}, d18 -++ vtbl.8 d19, {q0, q1}, d19 -++ vmovl.u8 q12, d4 -++ vmovl.u8 q13, d5 -++ vmovl.u8 q14, d6 -++ vmovl.u8 q15, d7 -++ vaddw.s8 q12, d16 -++ vaddw.s8 q13, d17 -++ vaddw.s8 q14, d18 -++ vaddw.s8 q15, d19 -++ vqmovun.s16 d4, q12 -++ vqmovun.s16 d5, q13 -++ vqmovun.s16 d6, q14 -++ vqmovun.s16 d7, q15 -++ vst1.8 {q2-q3}, [r0,:128], r2 -++ bne 1b -++ -++ bx lr -+ endfunc -+ -+ function ff_hevc_sao_band_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // offset_table -+- vpush {d8-d15} -+- vld1.8 {q0, q1}, [r5] // offset table -++ ldr r12, [sp, #4] // offset_table address -++ vld1.8 {q0, q1}, [r12] // offset table -++ ldr r12, [sp, #0] // height -+ -+-1: subs r4, #1 -+- vld1.8 {q12-q13}, [r1]! -+- vld1.8 {q14-q15}, [r1], r3 -++1: subs r12, #1 -++ vld1.8 {q12-q13}, [r1,:128]! -++ vld1.8 {q14-q15}, [r1,:128], r3 -+ sub r1, #32 -+ -+ vshr.u8 q8, q12, #3 -+@@ -152,53 +116,41 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ vtbl.8 d22, {q0, q1}, d22 -+ vtbl.8 d23, {q0, q1}, d23 -+ -+- vmovl.s8 q2, d16 -+- vmovl.s8 q3, d17 // q8 free -+- vmovl.s8 q4, d18 -+- vmovl.s8 q5, d19 // q9 free -++ vmovl.u8 q2, d24 -++ vmovl.u8 q3, d25 -++ vmovl.u8 q12, d26 -++ vmovl.u8 q13, d27 -+ -+- vmovl.u8 q6, d24 -+- vmovl.u8 q7, d25 // q12 free -+- vmovl.u8 q8, d26 -+- vmovl.u8 q9, d27 // q13 free -+- -+- vadd.s16 q2, q6 -+- vadd.s16 q3, q7 -+- vadd.s16 q4, q8 -+- vadd.s16 q5, q9 -++ vaddw.s8 q2, d16 -++ vaddw.s8 q3, d17 -++ vaddw.s8 q12, d18 -++ vaddw.s8 q13, d19 -+ -+ vqmovun.s16 d4, q2 -+ vqmovun.s16 d5, q3 -+- vqmovun.s16 d6, q4 // q4 free -+- vqmovun.s16 d7, q5 // q5 free -+- -+- // free q4 -q9, q12 - q13 -+- vmovl.s8 q4, d20 -+- vmovl.s8 q5, d21 // q10 free -+- vmovl.s8 q6, d22 -+- vmovl.s8 q7, d23 // q11 free -+- -+- vmovl.u8 q8, d28 -+- vmovl.u8 q9, d29 // q14 free -+- vmovl.u8 q10, d30 -+- vmovl.u8 q11, d31 // q15 free -+- -+- vadd.s16 q4, q8 -+- vadd.s16 q5, q9 -+- vadd.s16 q6, q10 -+- vadd.s16 q7, q11 -+- -+- vqmovun.s16 d8, q4 -+- vqmovun.s16 d9, q5 -+- vqmovun.s16 d10, q6 -+- vqmovun.s16 d11, q7 -+- -+- vstm.8 r0, {q2-q5} -+- add r0, r2 -++ vqmovun.s16 d6, q12 -++ vqmovun.s16 d7, q13 -++ -++ vmovl.u8 q12, d28 -++ vmovl.u8 q13, d29 -++ vmovl.u8 q14, d30 -++ vmovl.u8 q15, d31 -++ -++ vaddw.s8 q12, d20 -++ vaddw.s8 q13, d21 -++ vaddw.s8 q14, d22 -++ vaddw.s8 q15, d23 -++ -++ vqmovun.s16 d8, q12 -++ vqmovun.s16 d9, q13 -++ vqmovun.s16 d10, q14 -++ vqmovun.s16 d11, q15 -++ -++ vst1.8 {q2-q3}, [r0,:128]! -++ vst1.8 {q4-q5}, [r0,:128], r2 -++ sub r0, #32 -+ bne 1b -+ -+- vpop {d8-d15} -+- pop {r4-r8} -+ bx lr -+ endfunc -+ -+-- -+2.5.0 -+ -+ -+From 26bd536800db2f50ff6a021e1fda0d0394d1ea01 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Mon, 29 Dec 2014 15:00:49 +0200 -+Subject: [PATCH 5/9] better code reuse in NEON SAO band -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 16 ++-- -+ libavcodec/arm/hevcdsp_sao_neon.S | 155 +++++++++++++------------------------ -+ 2 files changed, 61 insertions(+), 110 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index c32940e..6379810 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -45,10 +45,10 @@ void ff_hevc_transform_add_16x16_neon_8(uint8_t *_dst, int16_t *coeffs, -+ void ff_hevc_transform_add_32x32_neon_8(uint8_t *_dst, int16_t *coeffs, -+ ptrdiff_t stride); -+ -+-void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+-void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+-void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+-void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -++void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -++void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -++void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -+ -+ void ff_hevc_sao_edge_eo0_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ void ff_hevc_sao_edge_eo1_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+@@ -185,16 +185,16 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ -+ switch(width){ -+ case 8: -+- ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+ case 16: -+- ff_hevc_sao_band_w16_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ ff_hevc_sao_band_w16_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+ case 32: -+- ff_hevc_sao_band_w32_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ ff_hevc_sao_band_w32_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+ case 64: -+- ff_hevc_sao_band_w64_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ ff_hevc_sao_band_w64_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+ default: -+ for (y = 0; y < height; y++) { -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index ac21013..8852550 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -21,53 +21,13 @@ -+ #include "libavutil/arm/asm.S" -+ #include "neon.S" -+ -+-function ff_hevc_sao_band_w8_neon_8, export=1 -+- ldr r12, [sp, #4] // offset_table address -++.macro init_sao_band -++ ldr r12, [sp, #0] // offset_table address -+ vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #0] // height -+- -+-1: subs r12, #1 -+- vld1.8 {d24}, [r1,:64], r3 -+- vshr.u8 d16, d24, #3 -+- vtbl.8 d16, {q0, q1}, d16 -+- vmovl.u8 q6, d24 -+- vaddw.s8 q6, d16 -+- vqmovun.s16 d4, q2 -+- vst1.8 {d4}, [r0,:64], r2 -+- bne 1b -+- -+- bx lr -+-endfunc -+- -+-function ff_hevc_sao_band_w16_neon_8, export=1 -+- ldr r12, [sp, #4] // offset_table address -+- vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #0] // height -+- -+-1: subs r12, #1 -+- vld1.8 {q12}, [r1,:128], r3 -+- vshr.u8 q8, q12, #3 -+- vtbl.8 d16, {q0, q1}, d16 -+- vtbl.8 d17, {q0, q1}, d17 -+- vmovl.u8 q10, d24 -+- vmovl.u8 q11, d25 -+- vaddw.s8 q10, d16 -+- vaddw.s8 q11, d17 -+- vqmovun.s16 d4, q10 -+- vqmovun.s16 d5, q11 -+- vst1.8 {q2}, [r0,:128], r2 -+- bne 1b -+- -+- bx lr -+-endfunc -+- -+-function ff_hevc_sao_band_w32_neon_8, export=1 -+- ldr r12, [sp, #4] // offset_table address -+- vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #0] // height -++ ldr r12, [sp, #4] // height -++.endm -+ -+-1: subs r12, #1 -+- vld1.8 {q2-q3}, [r1,:128], r3 -++.macro sao_band_32 -+ vshr.u8 q8, q2, #3 -+ vshr.u8 q9, q3, #3 -+ vtbl.8 d16, {q0, q1}, d16 -+@@ -86,6 +46,43 @@ function ff_hevc_sao_band_w32_neon_8, export=1 -+ vqmovun.s16 d5, q13 -+ vqmovun.s16 d6, q14 -+ vqmovun.s16 d7, q15 -++.endm -++ -++function ff_hevc_sao_band_w8_neon_8, export=1 -++ init_sao_band -++1: subs r12, #4 -++ vld1.8 {d4}, [r1,:64], r3 -++ vld1.8 {d5}, [r1,:64], r3 -++ vld1.8 {d6}, [r1,:64], r3 -++ vld1.8 {d7}, [r1,:64], r3 -++ sao_band_32 -++ vst1.8 {d4}, [r0,:64], r2 -++ vst1.8 {d5}, [r0,:64], r2 -++ vst1.8 {d6}, [r0,:64], r2 -++ vst1.8 {d7}, [r0,:64], r2 -++ bne 1b -++ -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w16_neon_8, export=1 -++ init_sao_band -++1: subs r12, #2 -++ vld1.8 {q2}, [r1,:128], r3 -++ vld1.8 {q3}, [r1,:128], r3 -++ sao_band_32 -++ vst1.8 {q2}, [r0,:128], r2 -++ vst1.8 {q3}, [r0,:128], r2 -++ bne 1b -++ -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w32_neon_8, export=1 -++ init_sao_band -++1: subs r12, #1 -++ vld1.8 {q2-q3}, [r1,:128], r3 -++ sao_band_32 -+ vst1.8 {q2-q3}, [r0,:128], r2 -+ bne 1b -+ -+@@ -93,63 +90,17 @@ function ff_hevc_sao_band_w32_neon_8, export=1 -+ endfunc -+ -+ function ff_hevc_sao_band_w64_neon_8, export=1 -+- ldr r12, [sp, #4] // offset_table address -+- vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #0] // height -+- -+-1: subs r12, #1 -+- vld1.8 {q12-q13}, [r1,:128]! -+- vld1.8 {q14-q15}, [r1,:128], r3 -+- sub r1, #32 -+- -+- vshr.u8 q8, q12, #3 -+- vshr.u8 q9, q13, #3 -+- vshr.u8 q10, q14, #3 -+- vshr.u8 q11, q15, #3 -+- -+- vtbl.8 d16, {q0, q1}, d16 -+- vtbl.8 d17, {q0, q1}, d17 -+- vtbl.8 d18, {q0, q1}, d18 -+- vtbl.8 d19, {q0, q1}, d19 -+- vtbl.8 d20, {q0, q1}, d20 -+- vtbl.8 d21, {q0, q1}, d21 -+- vtbl.8 d22, {q0, q1}, d22 -+- vtbl.8 d23, {q0, q1}, d23 -+- -+- vmovl.u8 q2, d24 -+- vmovl.u8 q3, d25 -+- vmovl.u8 q12, d26 -+- vmovl.u8 q13, d27 -+- -+- vaddw.s8 q2, d16 -+- vaddw.s8 q3, d17 -+- vaddw.s8 q12, d18 -+- vaddw.s8 q13, d19 -+- -+- vqmovun.s16 d4, q2 -+- vqmovun.s16 d5, q3 -+- vqmovun.s16 d6, q12 -+- vqmovun.s16 d7, q13 -+- -+- vmovl.u8 q12, d28 -+- vmovl.u8 q13, d29 -+- vmovl.u8 q14, d30 -+- vmovl.u8 q15, d31 -+- -+- vaddw.s8 q12, d20 -+- vaddw.s8 q13, d21 -+- vaddw.s8 q14, d22 -+- vaddw.s8 q15, d23 -+- -+- vqmovun.s16 d8, q12 -+- vqmovun.s16 d9, q13 -+- vqmovun.s16 d10, q14 -+- vqmovun.s16 d11, q15 -+- -+- vst1.8 {q2-q3}, [r0,:128]! -+- vst1.8 {q4-q5}, [r0,:128], r2 -+- sub r0, #32 -+- bne 1b -++ init_sao_band -++1: subs r12, #1 -++ vld1.8 {q2-q3}, [r1,:128]! -++ sao_band_32 -++ vst1.8 {q2-q3}, [r0,:128]! -++ vld1.8 {q2-q3}, [r1,:128], r3 -++ sub r1, #32 -++ sao_band_32 -++ vst1.8 {q2-q3}, [r0,:128], r2 -++ sub r0, #32 -++ bne 1b -+ -+ bx lr -+ endfunc -+-- -+2.5.0 -+ -+ -+From f93646a97bc885b81759e774d04be3781916a3e7 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Wed, 7 Jan 2015 15:27:38 +0200 -+Subject: [PATCH 6/9] More SAO NEON optimizations Now uses only 8 bit integers -+ for SAO calculations -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 7 +- -+ libavcodec/arm/hevcdsp_sao_neon.S | 664 +++++++++++++++---------------------- -+ 2 files changed, 272 insertions(+), 399 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 6379810..8d6e863 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -225,7 +225,7 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ int x, y; -+ -+ for (x = 0; x < 5; x++) { -+- sao_offset_val[x] = _sao_offset_val[x]; -++ sao_offset_val[x] = _sao_offset_val[edge_idx[x]]; -+ } -+ -+ stride_src /= sizeof(pixel); -+@@ -271,8 +271,9 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ for (x = 0; x < width; x++) { -+ int diff0 = CMP(src[x], src[x + a_stride]); -+ int diff1 = CMP(src[x], src[x + b_stride]); -+- int offset_val = edge_idx[2 + diff0 + diff1]; -+- dst[x] = av_clip_pixel(src[x] + sao_offset_val[offset_val]); -++ int idx = diff0 + diff1; -++ if (idx) -++ dst[x] = av_clip_pixel(src[x] + sao_offset_val[idx+2]); -+ } -+ src += stride_src; -+ dst += stride_dst; -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 8852550..5fc482b 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -1,5 +1,5 @@ -+ /* -+- * Copyright (c) 2014 Seppo Tomperi -++ * Copyright (c) 2014 - 2015 Seppo Tomperi -+ * -+ * This file is part of FFmpeg. -+ * -+@@ -23,6 +23,7 @@ -+ -+ .macro init_sao_band -+ ldr r12, [sp, #0] // offset_table address -++ pld [r1] -+ vld1.8 {q0, q1}, [r12] // offset table -+ ldr r12, [sp, #4] // height -+ .endm -+@@ -30,36 +31,31 @@ -+ .macro sao_band_32 -+ vshr.u8 q8, q2, #3 -+ vshr.u8 q9, q3, #3 -++ vmov.u8 q14, #128 -+ vtbl.8 d16, {q0, q1}, d16 -+ vtbl.8 d17, {q0, q1}, d17 -+ vtbl.8 d18, {q0, q1}, d18 -+ vtbl.8 d19, {q0, q1}, d19 -+- vmovl.u8 q12, d4 -+- vmovl.u8 q13, d5 -+- vmovl.u8 q14, d6 -+- vmovl.u8 q15, d7 -+- vaddw.s8 q12, d16 -+- vaddw.s8 q13, d17 -+- vaddw.s8 q14, d18 -+- vaddw.s8 q15, d19 -+- vqmovun.s16 d4, q12 -+- vqmovun.s16 d5, q13 -+- vqmovun.s16 d6, q14 -+- vqmovun.s16 d7, q15 -++ vadd.s8 q2, q14 -++ vadd.s8 q3, q14 -++ vqadd.s8 q2, q8 -++ vqadd.s8 q3, q9 -++ vsub.s8 q2, q14 -++ vsub.s8 q3, q14 -+ .endm -+ -+ function ff_hevc_sao_band_w8_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #4 -+- vld1.8 {d4}, [r1,:64], r3 -+- vld1.8 {d5}, [r1,:64], r3 -+- vld1.8 {d6}, [r1,:64], r3 -+- vld1.8 {d7}, [r1,:64], r3 -++ vld1.8 {d4}, [r1, :64], r3 -++ vld1.8 {d5}, [r1, :64], r3 -++ vld1.8 {d6}, [r1, :64], r3 -++ vld1.8 {d7}, [r1, :64], r3 -+ sao_band_32 -+- vst1.8 {d4}, [r0,:64], r2 -+- vst1.8 {d5}, [r0,:64], r2 -+- vst1.8 {d6}, [r0,:64], r2 -+- vst1.8 {d7}, [r0,:64], r2 -++ vst1.8 {d4}, [r0, :64], r2 -++ vst1.8 {d5}, [r0, :64], r2 -++ vst1.8 {d6}, [r0, :64], r2 -++ vst1.8 {d7}, [r0, :64], r2 -+ bne 1b -+ -+ bx lr -+@@ -68,11 +64,11 @@ endfunc -+ function ff_hevc_sao_band_w16_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #2 -+- vld1.8 {q2}, [r1,:128], r3 -+- vld1.8 {q3}, [r1,:128], r3 -++ vld1.8 {q2}, [r1, :128], r3 -++ vld1.8 {q3}, [r1, :128], r3 -+ sao_band_32 -+- vst1.8 {q2}, [r0,:128], r2 -+- vst1.8 {q3}, [r0,:128], r2 -++ vst1.8 {q2}, [r0, :128], r2 -++ vst1.8 {q3}, [r0, :128], r2 -+ bne 1b -+ -+ bx lr -+@@ -81,9 +77,9 @@ endfunc -+ function ff_hevc_sao_band_w32_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #1 -+- vld1.8 {q2-q3}, [r1,:128], r3 -++ vld1.8 {q2-q3}, [r1, :128], r3 -+ sao_band_32 -+- vst1.8 {q2-q3}, [r0,:128], r2 -++ vst1.8 {q2-q3}, [r0, :128], r2 -+ bne 1b -+ -+ bx lr -+@@ -92,263 +88,153 @@ endfunc -+ function ff_hevc_sao_band_w64_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #1 -+- vld1.8 {q2-q3}, [r1,:128]! -++ pld [r1, r3] -++ vld1.8 {q2-q3}, [r1, :128]! -+ sao_band_32 -+- vst1.8 {q2-q3}, [r0,:128]! -+- vld1.8 {q2-q3}, [r1,:128], r3 -++ vst1.8 {q2-q3}, [r0, :128]! -++ vld1.8 {q2-q3}, [r1, :128], r3 -+ sub r1, #32 -+ sao_band_32 -+- vst1.8 {q2-q3}, [r0,:128], r2 -++ vst1.8 {q2-q3}, [r0, :128], r2 -+ sub r0, #32 -+ bne 1b -+ -+ bx lr -+ endfunc -+- -++// input -++// a in q0 - q3 -++// c in q4 - q7 -++// b in q8 - q11 -++// offset table in r7 and r5 -++// output in q0 - q3 -++// clobbers q12 - q15 -+ .macro edge_w64_body -+- vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -+- vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -+- vcgt.u8 q13, q5, q1 -+- vcgt.u8 q1, q1, q5 -+- vcgt.u8 q14, q6, q2 -+- vcgt.u8 q2, q2, q6 -+- vcgt.u8 q15, q7, q3 -+- vcgt.u8 q3, q3, q7 -+- -+- vsub.s8 q12, q0, q12 // diff0 -+- vsub.s8 q13, q1, q13 -+- vsub.s8 q14, q2, q14 -+- vsub.s8 q15, q3, q15 -+- -++ vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -++ vcgt.u8 q13, q5, q1 -++ vcgt.u8 q1, q1, q5 -++ vsub.s8 q12, q0, q12 // diff0 -+ vcgt.u8 q0, q4, q8 // c > b -+- vcgt.u8 q8, q8, q4 // b > c -++ vsub.s8 q13, q1, q13 -++ -++ vcgt.u8 q14, q8, q4 // b > c -+ vcgt.u8 q1, q5, q9 -+- vcgt.u8 q9, q9, q5 -+- vcgt.u8 q2, q6, q10 -+- vcgt.u8 q10, q10, q6 -+- vcgt.u8 q3, q7, q11 -+- vcgt.u8 q11, q11, q7 -++ vcgt.u8 q15, q9, q5 -++ vsub.s8 q0, q14, q0 // diff1 -+ -+- vsub.s8 q0, q8, q0 // diff1 -+- vsub.s8 q1, q9, q1 -+- vsub.s8 q2, q10, q2 -+- vsub.s8 q3, q11, q3 -++ vsub.s8 q1, q15, q1 -+ -+- vadd.s8 q0, q12 //diff0 + diff1 -+- vadd.s8 q1, q13 -+- vadd.s8 q2, q14 -+- vadd.s8 q3, q15 -+- -+- vdup.s8 q9, r6 // 3 to all elements -+- sub r6, #1 -+- -+- vclt.s8 q12, q0, #0 // diff0 + diff1 < 0 -+- vclt.s8 q13, q1, #0 -+- vclt.s8 q14, q2, #0 -+- vclt.s8 q15, q3, #0 -+- -+- vadd.s8 q8, q0, q9 // diff0 + diff1 + 3 -+- vadd.s8 q10, q1, q9 -+- vand.8 q12, q8, q12 // if (diff0 + diff1 < 0) then (diff0 + diff1 + 3) else 0 -+- vand.8 q13, q10, q13 -+- vadd.s8 q8, q2, q9 -+- vadd.s8 q10, q3, q9 -+- vand.8 q14, q8, q14 -+- vand.8 q15, q10, q15 -+- -+- vdup.s8 q9, r6 // 2 to all elements -+- add r6, #1 -+- -+- vcgt.s8 q10, q0, #0 // diff0 + diff1 > 0 -+- vadd.s8 q8, q0, q9 // diff0 + diff1 + 2 -+- vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vcgt.s8 q10, q1, #0 -+- vadd.s8 q0, q11, q12 // offset_idx -+- -+- vadd.s8 q8, q1, q9 // diff0 + diff1 + 2 -+- vcgt.s8 q12, q2, #0 -+- vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vadd.s8 q8, q2, q9 // diff0 + diff1 + 2 -+- vadd.s8 q1, q11, q13 -+- -+- vand.8 q11, q8, q12 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vcgt.s8 q10, q3, #0 -+- vadd.s8 q2, q11, q14 -+- -+- vadd.s8 q8, q3, q9 // diff0 + diff1 + 2 -+- vmov.32 d18[0], r7 // load offset table from general registers -+- vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vmov.32 d18[1], r5 // load rest of offset table -+- vadd.s8 q3, q11, q15 -+- -+- vtbl.8 d0, {d18}, d0 -+- vtbl.8 d1, {d18}, d1 -+- vtbl.8 d2, {d18}, d2 -+- vtbl.8 d3, {d18}, d3 -+- vtbl.8 d4, {d18}, d4 -+- vtbl.8 d5, {d18}, d5 -+- vtbl.8 d6, {d18}, d6 -+- vtbl.8 d7, {d18}, d7 -+- -+- vmovl.u8 q8, d8 -+- vmovl.u8 q9, d9 -+- vmovl.u8 q10, d10 -+- vmovl.u8 q11, d11 -+- vmovl.u8 q12, d12 -+- vmovl.u8 q13, d13 -+- vmovl.u8 q14, d14 -+- vmovl.u8 q15, d15 -+- -+- vaddw.s8 q8, d0 -+- vaddw.s8 q9, d1 -+- vaddw.s8 q10, d2 -+- vaddw.s8 q11, d3 -+- vaddw.s8 q12, d4 -+- vaddw.s8 q13, d5 -+- vaddw.s8 q14, d6 -+- vaddw.s8 q15, d7 -+- -+- vqmovun.s16 d0, q8 -+- vqmovun.s16 d1, q9 -+- vqmovun.s16 d2, q10 -+- vqmovun.s16 d3, q11 -+- vqmovun.s16 d4, q12 -+- vqmovun.s16 d5, q13 -+- vqmovun.s16 d6, q14 -+- vqmovun.s16 d7, q15 -+- -+- vstm r0, {q0-q3} -+- add r0, r2 -+-.endm -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -+ -+-.macro edge_w32_body -+- vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -+- vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -+- vcgt.u8 q13, q5, q1 -+- vcgt.u8 q1, q1, q5 -++ vcgt.u8 q14, q6, q2 -++ vcgt.u8 q2, q2, q6 -++ vcgt.u8 q15, q7, q3 -++ vcgt.u8 q3, q3, q7 -+ -+- vsub.s8 q12, q0, q12 // diff0 -+- vcgt.u8 q0, q4, q8 // c > b -+- vsub.s8 q13, q1, q13 // diff0 part 2 -++ vsub.s8 q14, q2, q14 -++ vcgt.u8 q2, q6, q10 -++ vsub.s8 q15, q3, q15 -+ -+- vcgt.u8 q6, q8, q4 // b > c -+- vcgt.u8 q1, q5, q9 -+- vcgt.u8 q7, q9, q5 -++ vcgt.u8 q12, q10, q6 -++ vcgt.u8 q3, q7, q11 -++ vcgt.u8 q13, q11, q7 -++ vsub.s8 q2, q12, q2 -++ vsub.s8 q3, q13, q3 -+ -+- vsub.s8 q0, q6, q0 // diff1 -+- vsub.s8 q1, q7, q1 // diff1 part 2 -+- vadd.s8 q0, q12 //diff0 + diff1 -++ vmov.s8 q13, #2 // 2 to all elements -+ -+- vdup.s8 q7, r6 // 3 to all elements -+- sub r6, #1 -+- vadd.s8 q1, q13 -++ vadd.s8 q2, q14 -++ vadd.s8 q3, q15 -++ -++ vmov.32 d24[0], r4 // load offset table from general registers -++ vmov.32 d24[1], r5 // load rest of offset table -+ -+- vclt.s8 q12, q0, #0 // diff0 + diff1 < 0 -+- vclt.s8 q13, q1, #0 -+- -+- vadd.s8 q6, q0, q7 // diff0 + diff1 + 3 -+- vadd.s8 q10, q1, q7 -+- vdup.s8 q7, r6 // 2 to all elements -+- add r6, #1 -+- vand.8 q12, q6, q12 // if (diff0 + diff1 < 0) then (diff0 + diff1 + 3) else 0 -+- vand.8 q13, q10, q13 -+- -+- -+- vcgt.s8 q10, q0, #0 // diff0 + diff1 > 0 -+- vadd.s8 q6, q0, q7 // diff0 + diff1 + 2 -+- vand.8 q11, q6, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vcgt.s8 q10, q1, #0 -+- vadd.s8 q0, q11, q12 // offset_idx -+- -+- vadd.s8 q6, q1, q7 // diff0 + diff1 + 2 -+- vmov.32 d14[0], r7 // load offset table from general registers -+- vand.8 q11, q6, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vmov.32 d14[1], r5 // load rest of offset table -+- vadd.s8 q1, q11, q13 -+- -+- vtbl.8 d0, {d14}, d0 -+- vtbl.8 d1, {d14}, d1 -+- vtbl.8 d2, {d14}, d2 -+- vtbl.8 d3, {d14}, d3 -+- -+- vmovl.u8 q6, d8 -+- vmovl.u8 q7, d9 -+- vmovl.u8 q10, d10 -+- vmovl.u8 q11, d11 -+- -+- vaddw.s8 q6, d0 -+- vaddw.s8 q7, d1 -+- vaddw.s8 q10, d2 -+- vaddw.s8 q11, d3 -+- -+- vqmovun.s16 d0, q6 -+- vqmovun.s16 d1, q7 -+- vqmovun.s16 d2, q10 -+- vqmovun.s16 d3, q11 -+- -+- vstm r0, {q0-q1} -+- add r0, r2 -++ vadd.s8 q0, q13 -++ vadd.s8 q1, q13 -++ vadd.s8 q2, q13 -++ vadd.s8 q3, q13 -++ -++ vmov.u8 q15, #128 // s8 #-128 -++ vtbl.8 d0, {d24}, d0 -++ vtbl.8 d1, {d24}, d1 -++ vtbl.8 d2, {d24}, d2 -++ vtbl.8 d3, {d24}, d3 -++ vtbl.8 d4, {d24}, d4 -++ vtbl.8 d5, {d24}, d5 -++ vtbl.8 d6, {d24}, d6 -++ vtbl.8 d7, {d24}, d7 -++ -++ vadd.s8 q12, q4, q15 -++ vadd.s8 q13, q5, q15 -++ vadd.s8 q14, q6, q15 -++ vadd.s8 q15, q7, q15 -++ vqadd.s8 q12, q0 -++ vqadd.s8 q15, q3 -++ vmov.u8 q3, #128 // s8 #-128 -++ vqadd.s8 q13, q1 -++ vqadd.s8 q14, q2 -++ vsub.s8 q0, q12, q3 -++ vsub.s8 q1, q13, q3 -++ vsub.s8 q2, q14, q3 -++ vsub.s8 q3, q15, q3 -++ vst1.8 {q0-q1}, [r0, :128]! -++ vst1.8 {q2-q3}, [r0, :128], r2 -++ sub r0, #32 -+ .endm -+ -+-function ff_hevc_sao_edge_eo0_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -++.macro init_edge_64 -++ push {r4-r5} -++ ldr r12, [sp, #8] // height -++ ldr r5, [sp, #12] // sao_offset_val_table -++ ldr r4, [r5] -+ add r5, #4 -+ ldr r5, [r5] -++.endm -++ -++function ff_hevc_sao_edge_eo0_w64_neon_8, export=1 -++ init_edge_64 -+ vpush {d8-d15} -+ sub r1, #8 -+-1: subs r4, #1 -+- vld1.64 {q10-q11}, [r1]! -+- vld1.64 {q12-q13}, [r1]! -+- vld1.64 {q14}, [r1], r3 -+- sub r1, #64 -++1: subs r12, #1 -++ vld1.64 {d7}, [r1, :64]! -++ vld1.64 {q4-q5}, [r1, :128]! // load c -++ vld1.64 {q6-q7}, [r1, :128]! -++ vld1.64 {d24}, [r1, :64], r3 -++ sub r1, #72 -+ // load a -+- vext.8 q0, q10, q11, #7 -+- vext.8 q1, q11, q12, #7 -+- vext.8 q2, q12, q13, #7 -+- vext.8 q3, q13, q14, #7 -+- // load c -+- vext.8 q4, q10, q11, #8 -+- vext.8 q5, q11, q12, #8 -+- vext.8 q6, q12, q13, #8 -+- vext.8 q7, q13, q14, #8 -++ vext.8 q0, q3, q4, #15 -++ vext.8 q1, q4, q5, #15 -++ vext.8 q2, q5, q6, #15 -++ vext.8 q3, q6, q7, #15 -+ // load b -+- vext.8 q8, q10, q11, #9 -+- vext.8 q9, q11, q12, #9 -+- vext.8 q10, q12, q13, #9 -+- vext.8 q11, q13, q14, #9 -++ vext.8 q8, q4, q5, #1 -++ vext.8 q9, q5, q6, #1 -++ vext.8 q10, q6, q7, #1 -++ vext.8 q11, q7, q12, #1 -+ edge_w64_body -+ bne 1b -+ vpop {d8-d15} -+- pop {r4-r8} -++ pop {r4-r5} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -++ init_edge_64 -+ vpush {d8-d15} -+ sub r1, r3 -+ // load a -+- vld1.8 {q0-q1}, [r1]! -+- vld1.8 {q2-q3}, [r1], r3 -++ vld1.8 {q0-q1}, [r1, :128]! -++ vld1.8 {q2-q3}, [r1, :128], r3 -+ sub r1, #32 -+-1: subs r4, #1 -+ // load c -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -++ vld1.8 {q4-q5}, [r1, :128]! -++ vld1.8 {q6-q7}, [r1, :128], r3 -+ sub r1, #32 -++1: subs r12, #1 -+ // load b -+- vld1.8 {q8-q9}, [r1]! -+- vld1.8 {q10-q11}, [r1] -++ vld1.8 {q8-q9}, [r1, :128]! -++ vld1.8 {q10-q11}, [r1, :128], r3 -+ sub r1, #32 -+ edge_w64_body -+ // copy c to a -+@@ -356,20 +242,19 @@ function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+ vmov.64 q1, q5 -+ vmov.64 q2, q6 -+ vmov.64 q3, q7 -++ // copy b to c -++ vmov.64 q4, q8 -++ vmov.64 q5, q9 -++ vmov.64 q6, q10 -++ vmov.64 q7, q11 -+ bne 1b -+ vpop {d8-d15} -+- pop {r4-r8} -++ pop {r4-r5} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo2_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -++ init_edge_64 -+ vpush {d8-d15} -+ 1: sub r1, r3 -+ // load a -+@@ -379,10 +264,10 @@ function ff_hevc_sao_edge_eo2_w64_neon_8, export=1 -+ vld1.8 {q0-q1}, [r1]! -+ vld1.8 {q2-q3}, [r1], r3 -+ sub r1, #31 -+- subs r4, #1 -++ subs r12, #1 -+ // load c -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -++ vld1.8 {q4-q5}, [r1, :128]! -++ vld1.8 {q6-q7}, [r1, :128], r3 -+ sub r1, #32 -+ // load b -+ add r1, #1 -+@@ -390,25 +275,14 @@ function ff_hevc_sao_edge_eo2_w64_neon_8, export=1 -+ vld1.8 {q10-q11}, [r1] -+ sub r1, #33 -+ edge_w64_body -+- // copy c to a -+- vmov.64 q0, q4 -+- vmov.64 q1, q5 -+- vmov.64 q2, q6 -+- vmov.64 q3, q7 -+ bne 1b -+ vpop {d8-d15} -+- pop {r4-r8} -++ pop {r4-r5} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -++ init_edge_64 -+ vpush {d8-d15} -+ 1: sub r1, r3 -+ // load a -+@@ -418,10 +292,10 @@ function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -+ vld1.8 {q0-q1}, [r1]! -+ vld1.8 {q2-q3}, [r1], r3 -+ sub r1, #33 -+- subs r4, #1 -++ subs r12, #1 -+ // load c -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -++ vld1.8 {q4-q5}, [r1, :128]! -++ vld1.8 {q6-q7}, [r1, :128], r3 -+ sub r1, #32 -+ // load b -+ sub r1, #1 -+@@ -429,178 +303,176 @@ function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -+ vld1.8 {q10-q11}, [r1] -+ sub r1, #31 -+ edge_w64_body -+- // copy c to a -+- vmov.64 q0, q4 -+- vmov.64 q1, q5 -+- vmov.64 q2, q6 -+- vmov.64 q3, q7 -+ bne 1b -+ vpop {d8-d15} -+- pop {r4-r8} -++ pop {r4-r5} -+ bx lr -+ endfunc -+ -++// inputs: -++// a in q0, q1 -++// c in q2, q3 -++// b in q8, q9 -++// offset table in d31 -++// clobbered registers q0, q1, q10, q11, q12, q13 -++// output q0, q1 -++.macro edge_w32_body -++ vcgt.u8 q12, q2, q0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 q0, q0, q2 // a > c -> -1 , otherwise 0 -++ vcgt.u8 q13, q3, q1 -++ vcgt.u8 q1, q1, q3 -++ -++ vsub.s8 q12, q0, q12 // diff0 -++ vcgt.u8 q0, q2, q8 // c > b -++ vsub.s8 q13, q1, q13 // diff0 part 2 -++ -++ vcgt.u8 q10, q8, q2 // b > c -++ vcgt.u8 q1, q3, q9 -++ vcgt.u8 q11, q9, q3 -++ -++ vsub.s8 q0, q10, q0 // diff1 -++ -++ vmov.s8 q10, #2 // 2 to all elements -++ vsub.s8 q1, q11, q1 // diff1 part 2 -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ -++ vadd.s8 q0, q10 -++ vadd.s8 q1, q10 -++ -++ vmov.u8 q10, #128 -++ vtbl.8 d0, {d31}, d0 -++ vtbl.8 d1, {d31}, d1 -++ vtbl.8 d2, {d31}, d2 -++ vtbl.8 d3, {d31}, d3 -++ -++ vadd.s8 q11, q2, q10 -++ vadd.s8 q12, q3, q10 -++ vqadd.s8 q11, q0 -++ vqadd.s8 q12, q1 -++ vsub.s8 q0, q11, q10 -++ vsub.s8 q1, q12, q10 -++ vst1.8 {q0-q1}, [r0, :128], r2 -++.endm -++ -++.macro init_edge_32 -++ ldr r12, [sp, #4] // sao_offset_val_table -++ vld1.32 {d31}, [r12] -++ ldr r12, [sp] // height -++.endm -++ -+ function ff_hevc_sao_edge_eo0_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -+- vpush {d8-d15} -+- sub r1, #8 // load 8 extra bytes -+-1: subs r4, #1 -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 // only first 9 bytes are used -+- sub r1, #32 -++ init_edge_32 -++ sub r1, #4 // load 4 extra bytes -++1: subs r12, #1 -++ vld1.32 d3[1], [r1]! -++ vld1.8 {q2-q3}, [r1, :128]! // c -++ vld1.32 d20[0], [r1], r3 -++ sub r1, #36 -+ // a -+- vext.8 q0, q10, q11, #7 -+- vext.8 q1, q11, q12, #7 -+- // c -+- vext.8 q4, q10, q11, #8 -+- vext.8 q5, q11, q12, #8 -++ vext.8 q0, q1, q2, #15 -++ vext.8 q1, q2, q3, #15 -+ // b -+- vext.8 q8, q10, q11, #9 -+- vext.8 q9, q11, q12, #9 -++ vext.8 q8, q2, q3, #1 -++ vext.8 q9, q3, q10, #1 -+ edge_w32_body -+- bne 1b -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ bne 1b -++ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo1_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -+- vpush {d8-d15} -++ init_edge_32 -+ // load a -+ sub r1, r3 -+- vld1.8 {q0-q1}, [r1], r3 -++ vld1.8 {q0-q1}, [r1, :128], r3 -+ // load c -+- vld1.8 {q4-q5}, [r1], r3 -+-1: subs r4, #1 -++ vld1.8 {q2-q3}, [r1, :128], r3 -++1: subs r12, #1 -+ // load b -+- vld1.8 {q8-q9}, [r1], r3 -++ vld1.8 {q8-q9}, [r1, :128], r3 -+ edge_w32_body -+ // inputs for next loop iteration -+ // a -+- vmov.64 q0, q4 -+- vmov.64 q1, q5 -++ vmov.64 q0, q2 -++ vmov.64 q1, q3 -+ // c -+- vmov.64 q4, q8 -+- vmov.64 q5, q9 -+- bne 1b -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ vmov.64 q2, q8 -++ vmov.64 q3, q9 -++ bne 1b -++ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo2_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -+- vpush {d8-d15} -++ init_edge_32 -++ vpush {d8-d15} -+ // load a -+ sub r1, r3 -+- sub r1, #8 -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -++ sub r1, #8 -++ vld1.8 {q10-q11}, [r1, :64]! -++ vld1.8 {d24}, [r1, :64], r3 -++ sub r1, #32 -+ vext.8 q0, q10, q11, #7 -+ vext.8 q1, q11, q12, #7 -+ // load c -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -+- vext.8 q4, q10, q11, #8 -+- vext.8 q5, q11, q12, #8 -+- vext.8 q2, q10, q11, #7 -+-1: subs r4, #1 -++ vld1.8 {d9}, [r1, :64]! -++ vld1.8 {q2-q3}, [r1, :64], r3 -++ sub r1, #8 -++ vext.8 q4, q4, q2, #15 -++1: subs r12, #1 -+ // load b -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -++ vld1.8 {q10-q11}, [r1, :64]! -++ vld1.8 {q12}, [r1, :64], r3 -++ sub r1, #32 -+ vext.8 q8, q10, q11, #9 -+ vext.8 q9, q11, q12, #9 -+- vext.8 q14, q10, q11, #8 -+- vext.8 q15, q11, q12, #8 -+- vext.8 q3, q10, q11, #7 -++ vext.8 q6, q10, q11, #8 -++ vext.8 q7, q11, q12, #8 -++ vext.8 q5, q10, q11, #7 -+ edge_w32_body -+ // inputs for next loop iteration -+ // a -+- vmov.8 q0, q2 -+- vext.8 q1, q4, q5, #15 -++ vmov.8 q0, q4 -++ vext.8 q1, q2, q3, #15 -+ // c -+- vmov.8 q4, q14 -+- vmov.8 q5, q15 -+- vmov.8 q2, q3 -+- bne 1b -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ vmov.8 q2, q6 -++ vmov.8 q3, q7 -++ vmov.8 q4, q5 -++ bne 1b -++ vpop {d8-d15} -++ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo3_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- sub r1, r3 -+- ldr r5, [r5] -+- sub r1, #8 -+- vpush {d8-d15} -++ init_edge_32 -++ sub r1, r3 -+ // load a -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -+- vext.8 q0, q10, q11, #9 -+- vext.8 q1, q11, q12, #9 -++ vld1.8 {q10-q11}, [r1, :64]! -++ vld1.8 {d24}, [r1, :64], r3 -++ sub r1, #32 -++ vext.8 q0, q10, q11, #1 -++ vext.8 q1, q11, q12, #1 -+ // load c -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -+- vext.8 q4, q10, q11, #8 -+- vext.8 q5, q11, q12, #8 -+- vext.8 q2, q12, q11, #8 -+-1: subs r4, #1 -++ vld1.8 {q2-q3}, [r1, :64]! -++ vld1.8 {d30}, [r1, :64], r3 -++ sub r1, #40 -++1: subs r12, #1 -+ // load b -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -++ vld1.8 {q10-q11}, [r1, :64]! -++ vld1.8 {q12}, [r1, :64], r3 -++ sub r1, #32 -+ vext.8 q8, q10, q11, #7 -+ vext.8 q9, q11, q12, #7 -+- vext.8 q3, q12, q10, #7 -++ vext.8 q14, q12, q10, #7 -+ edge_w32_body -+ // inputs for next loop iteration -+ // a -+- vext.8 q0, q4, q5, #1 -+- vext.8 q1, q5, q2, #1 -++ vext.8 q0, q2, q3, #1 -++ vext.8 q1, q3, q15, #1 -+ // c -+- vext.8 q4, q8, q9, #1 -+- vext.8 q5, q9, q3, #1 -+- vext.8 q2, q3, q1, #1 -+- bne 1b -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ vext.8 q2, q8, q9, #1 -++ vext.8 q3, q9, q14, #1 -++ vext.8 d30, d28, d2, #1 -++ bne 1b -++ bx lr -+ endfunc -+ -+-- -+2.5.0 -+ -+ -+From 016c39d46b86830204a4519590332d2a38f7ee51 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Thu, 8 Jan 2015 09:58:55 +0200 -+Subject: [PATCH 7/9] small optimization to SAO BAND. correct path for -+ bit_depth_template.c -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 2 +- -+ libavcodec/arm/hevcdsp_sao_neon.S | 2 +- -+ 2 files changed, 2 insertions(+), 2 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 8d6e863..385c35d 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -23,7 +23,7 @@ -+ #include "libavcodec/hevcdsp.h" -+ #include "hevcdsp_arm.h" -+ #include "libavcodec/avcodec.h" -+-#include "../bit_depth_template.c" -++#include "libavcodec/bit_depth_template.c" -+ -+ void ff_hevc_v_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+ void ff_hevc_h_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 5fc482b..710b32b 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -26,12 +26,12 @@ -+ pld [r1] -+ vld1.8 {q0, q1}, [r12] // offset table -+ ldr r12, [sp, #4] // height -++ vmov.u8 q14, #128 -+ .endm -+ -+ .macro sao_band_32 -+ vshr.u8 q8, q2, #3 -+ vshr.u8 q9, q3, #3 -+- vmov.u8 q14, #128 -+ vtbl.8 d16, {q0, q1}, d16 -+ vtbl.8 d17, {q0, q1}, d17 -+ vtbl.8 d18, {q0, q1}, d18 -+-- -+2.5.0 -+ -+ -+From 579f1584d688e1ac24fb7d22697e2a7b64f62e8e Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Fri, 9 Jan 2015 10:28:52 +0200 -+Subject: [PATCH 8/9] Added height check for SAO NEON optimizations. Faster SAO -+ band NEON Some reordering to use NEON pipelines more efficiently -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 12 +++- -+ libavcodec/arm/hevcdsp_sao_neon.S | 142 ++++++++++++++++++++++--------------- -+ 2 files changed, 93 insertions(+), 61 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 385c35d..6d0689c 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -176,6 +176,7 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ int8_t offset_table[32] = { 0 }; -+ int k, y, x; -+ int shift = 3; // BIT_DEPTH - 5 -++ int cwidth = 0; -+ -+ stride_src /= sizeof(pixel); -+ stride_dst /= sizeof(pixel); -+@@ -183,7 +184,10 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ for (k = 0; k < 4; k++) -+ offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1]; -+ -+- switch(width){ -++ if (height % 8 == 0) -++ cwidth = width; -++ -++ switch(cwidth){ -+ case 8: -+ ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+@@ -223,15 +227,19 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ pixel *src = (pixel *)_src; -+ int a_stride, b_stride; -+ int x, y; -++ int cwidth = 0; -+ -+ for (x = 0; x < 5; x++) { -+ sao_offset_val[x] = _sao_offset_val[edge_idx[x]]; -+ } -+ -++ if (height % 8 == 0) -++ cwidth = width; -++ -+ stride_src /= sizeof(pixel); -+ stride_dst /= sizeof(pixel); -+ -+- switch (width) { -++ switch (cwidth) { -+ case 32: -+ switch(eo) { -+ case 0: -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 710b32b..08f50b8 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -26,36 +26,59 @@ -+ pld [r1] -+ vld1.8 {q0, q1}, [r12] // offset table -+ ldr r12, [sp, #4] // height -+- vmov.u8 q14, #128 -++ vmov.u8 q3, #128 -+ .endm -+ -+-.macro sao_band_32 -+- vshr.u8 q8, q2, #3 -+- vshr.u8 q9, q3, #3 -+- vtbl.8 d16, {q0, q1}, d16 -+- vtbl.8 d17, {q0, q1}, d17 -+- vtbl.8 d18, {q0, q1}, d18 -+- vtbl.8 d19, {q0, q1}, d19 -+- vadd.s8 q2, q14 -+- vadd.s8 q3, q14 -+- vqadd.s8 q2, q8 -+- vqadd.s8 q3, q9 -+- vsub.s8 q2, q14 -+- vsub.s8 q3, q14 -++// 128 in q3 -++// input q8 - q11 -++// 32 cycles -++.macro sao_band_64 -++ vshr.u8 q12, q8, #3 -++ vshr.u8 q13, q9, #3 -++ vshr.u8 q14, q10, #3 -++ vshr.u8 q15, q11, #3 -++ vtbl.8 d24, {d0, d1, d2, d3}, d24 -++ vadd.s8 q8, q3 -++ vtbl.8 d25, {d0, d1, d2, d3}, d25 -++ vadd.s8 q9, q3 -++ vtbl.8 d26, {d0, d1, d2, d3}, d26 -++ vadd.s8 q10, q3 -++ vtbl.8 d27, {d0, d1, d2, d3}, d27 -++ vadd.s8 q11, q3 -++ vtbl.8 d28, {d0, d1, d2, d3}, d28 -++ vqadd.s8 q8, q12 -++ vtbl.8 d29, {d0, d1, d2, d3}, d29 -++ vqadd.s8 q9, q13 -++ vtbl.8 d30, {d0, d1, d2, d3}, d30 -++ vqadd.s8 q10, q14 -++ vtbl.8 d31, {d0, d1, d2, d3}, d31 -++ vqadd.s8 q11, q15 -++ vsub.s8 q8, q3 -++ vsub.s8 q9, q3 -++ vsub.s8 q10, q3 -++ vsub.s8 q11, q3 -+ .endm -+ -+ function ff_hevc_sao_band_w8_neon_8, export=1 -+ init_sao_band -+-1: subs r12, #4 -+- vld1.8 {d4}, [r1, :64], r3 -+- vld1.8 {d5}, [r1, :64], r3 -+- vld1.8 {d6}, [r1, :64], r3 -+- vld1.8 {d7}, [r1, :64], r3 -+- sao_band_32 -+- vst1.8 {d4}, [r0, :64], r2 -+- vst1.8 {d5}, [r0, :64], r2 -+- vst1.8 {d6}, [r0, :64], r2 -+- vst1.8 {d7}, [r0, :64], r2 -++1: subs r12, #8 -++ vld1.8 {d16}, [r1, :64], r3 -++ vld1.8 {d17}, [r1, :64], r3 -++ vld1.8 {d18}, [r1, :64], r3 -++ vld1.8 {d19}, [r1, :64], r3 -++ vld1.8 {d20}, [r1, :64], r3 -++ vld1.8 {d21}, [r1, :64], r3 -++ vld1.8 {d22}, [r1, :64], r3 -++ vld1.8 {d23}, [r1, :64], r3 -++ sao_band_64 -++ vst1.8 {d16}, [r0, :64], r2 -++ vst1.8 {d17}, [r0, :64], r2 -++ vst1.8 {d18}, [r0, :64], r2 -++ vst1.8 {d19}, [r0, :64], r2 -++ vst1.8 {d20}, [r0, :64], r2 -++ vst1.8 {d21}, [r0, :64], r2 -++ vst1.8 {d22}, [r0, :64], r2 -++ vst1.8 {d23}, [r0, :64], r2 -+ bne 1b -+ -+ bx lr -+@@ -63,12 +86,16 @@ endfunc -+ -+ function ff_hevc_sao_band_w16_neon_8, export=1 -+ init_sao_band -+-1: subs r12, #2 -+- vld1.8 {q2}, [r1, :128], r3 -+- vld1.8 {q3}, [r1, :128], r3 -+- sao_band_32 -+- vst1.8 {q2}, [r0, :128], r2 -+- vst1.8 {q3}, [r0, :128], r2 -++1: subs r12, #4 -++ vld1.8 {q8}, [r1, :128], r3 -++ vld1.8 {q9}, [r1, :128], r3 -++ vld1.8 {q10}, [r1, :128], r3 -++ vld1.8 {q11}, [r1, :128], r3 -++ sao_band_64 -++ vst1.8 {q8}, [r0, :128], r2 -++ vst1.8 {q9}, [r0, :128], r2 -++ vst1.8 {q10}, [r0, :128], r2 -++ vst1.8 {q11}, [r0, :128], r2 -+ bne 1b -+ -+ bx lr -+@@ -76,10 +103,12 @@ endfunc -+ -+ function ff_hevc_sao_band_w32_neon_8, export=1 -+ init_sao_band -+-1: subs r12, #1 -+- vld1.8 {q2-q3}, [r1, :128], r3 -+- sao_band_32 -+- vst1.8 {q2-q3}, [r0, :128], r2 -++1: subs r12, #2 -++ vld1.8 {q8-q9}, [r1, :128], r3 -++ vld1.8 {q10-q11}, [r1, :128], r3 -++ sao_band_64 -++ vst1.8 {q8-q9}, [r0, :128], r2 -++ vst1.8 {q10-q11}, [r0, :128], r2 -+ bne 1b -+ -+ bx lr -+@@ -89,13 +118,12 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #1 -+ pld [r1, r3] -+- vld1.8 {q2-q3}, [r1, :128]! -+- sao_band_32 -+- vst1.8 {q2-q3}, [r0, :128]! -+- vld1.8 {q2-q3}, [r1, :128], r3 -++ vld1.8 {q8-q9}, [r1, :128]! -++ vld1.8 {q10-q11}, [r1, :128], r3 -+ sub r1, #32 -+- sao_band_32 -+- vst1.8 {q2-q3}, [r0, :128], r2 -++ sao_band_64 -++ vst1.8 {q8-q9}, [r0, :128]! -++ vst1.8 {q10-q11}, [r0, :128], r2 -+ sub r0, #32 -+ bne 1b -+ -+@@ -121,7 +149,6 @@ endfunc -+ vcgt.u8 q1, q5, q9 -+ vcgt.u8 q15, q9, q5 -+ vsub.s8 q0, q14, q0 // diff1 -+- -+ vsub.s8 q1, q15, q1 -+ -+ vadd.s8 q0, q12 //diff0 + diff1 -+@@ -157,27 +184,25 @@ endfunc -+ -+ vmov.u8 q15, #128 // s8 #-128 -+ vtbl.8 d0, {d24}, d0 -++ vadd.s8 q13, q4, q15 -+ vtbl.8 d1, {d24}, d1 -++ vadd.s8 q14, q5, q15 -+ vtbl.8 d2, {d24}, d2 -++ vqadd.s8 q0, q13 -+ vtbl.8 d3, {d24}, d3 -++ vqadd.s8 q1, q14 -+ vtbl.8 d4, {d24}, d4 -++ vadd.s8 q13, q6, q15 -+ vtbl.8 d5, {d24}, d5 -++ vadd.s8 q14, q7, q15 -+ vtbl.8 d6, {d24}, d6 -++ vqadd.s8 q2, q13 -+ vtbl.8 d7, {d24}, d7 -+- -+- vadd.s8 q12, q4, q15 -+- vadd.s8 q13, q5, q15 -+- vadd.s8 q14, q6, q15 -+- vadd.s8 q15, q7, q15 -+- vqadd.s8 q12, q0 -+- vqadd.s8 q15, q3 -+- vmov.u8 q3, #128 // s8 #-128 -+- vqadd.s8 q13, q1 -+- vqadd.s8 q14, q2 -+- vsub.s8 q0, q12, q3 -+- vsub.s8 q1, q13, q3 -+- vsub.s8 q2, q14, q3 -+- vsub.s8 q3, q15, q3 -++ vqadd.s8 q3, q14 -++ vsub.s8 q0, q15 -++ vsub.s8 q1, q15 -++ vsub.s8 q2, q15 -++ vsub.s8 q3, q15 -+ vst1.8 {q0-q1}, [r0, :128]! -+ vst1.8 {q2-q3}, [r0, :128], r2 -+ sub r0, #32 -+@@ -342,13 +367,12 @@ endfunc -+ -+ vmov.u8 q10, #128 -+ vtbl.8 d0, {d31}, d0 -++ vadd.s8 q11, q2, q10 -+ vtbl.8 d1, {d31}, d1 -++ vadd.s8 q12, q3, q10 -+ vtbl.8 d2, {d31}, d2 -++ vqadd.s8 q11, q0 -+ vtbl.8 d3, {d31}, d3 -+- -+- vadd.s8 q11, q2, q10 -+- vadd.s8 q12, q3, q10 -+- vqadd.s8 q11, q0 -+ vqadd.s8 q12, q1 -+ vsub.s8 q0, q11, q10 -+ vsub.s8 q1, q12, q10 -+-- -+2.5.0 -+ -+ -+From 026bac1824e4936e948e6b1efec82868c520ea66 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Mon, 2 Feb 2015 16:08:27 +0200 -+Subject: [PATCH 9/9] Further SAO NEON optimisations -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 16 +-- -+ libavcodec/arm/hevcdsp_sao_neon.S | 224 +++++++++++++++++++------------------ -+ 2 files changed, 124 insertions(+), 116 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 6d0689c..e5da7e9 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -45,10 +45,10 @@ void ff_hevc_transform_add_16x16_neon_8(uint8_t *_dst, int16_t *coeffs, -+ void ff_hevc_transform_add_32x32_neon_8(uint8_t *_dst, int16_t *coeffs, -+ ptrdiff_t stride); -+ -+-void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -+-void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -+-void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -+-void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -++void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, int8_t * offset_table, ptrdiff_t stride_src, ptrdiff_t stride_dst, int height); -++void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, int8_t * offset_table, ptrdiff_t stride_src, ptrdiff_t stride_dst, int height); -++void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, int8_t * offset_table, ptrdiff_t stride_src, ptrdiff_t stride_dst, int height); -++void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, int8_t * offset_table, ptrdiff_t stride_src, ptrdiff_t stride_dst, int height); -+ -+ void ff_hevc_sao_edge_eo0_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ void ff_hevc_sao_edge_eo1_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+@@ -189,16 +189,16 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ -+ switch(cwidth){ -+ case 8: -+- ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -++ ff_hevc_sao_band_w8_neon_8(_dst, _src, offset_table, stride_src, stride_dst, height); -+ break; -+ case 16: -+- ff_hevc_sao_band_w16_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -++ ff_hevc_sao_band_w16_neon_8(_dst, _src, offset_table, stride_src, stride_dst, height); -+ break; -+ case 32: -+- ff_hevc_sao_band_w32_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -++ ff_hevc_sao_band_w32_neon_8(_dst, _src, offset_table, stride_src, stride_dst, height); -+ break; -+ case 64: -+- ff_hevc_sao_band_w64_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -++ ff_hevc_sao_band_w64_neon_8(_dst, _src, offset_table, stride_src, stride_dst, height); -+ break; -+ default: -+ for (y = 0; y < height; y++) { -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 08f50b8..9c7808d 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -22,21 +22,16 @@ -+ #include "neon.S" -+ -+ .macro init_sao_band -+- ldr r12, [sp, #0] // offset_table address -+ pld [r1] -+- vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #4] // height -++ vld1.8 {q0, q1}, [r2] // offset table -++ ldr r2, [sp, #0] // stride_dst -++ ldr r12, [sp, #4] // height -+ vmov.u8 q3, #128 -+ .endm -+ -+ // 128 in q3 -+ // input q8 - q11 -+-// 32 cycles -+ .macro sao_band_64 -+- vshr.u8 q12, q8, #3 -+- vshr.u8 q13, q9, #3 -+- vshr.u8 q14, q10, #3 -+- vshr.u8 q15, q11, #3 -+ vtbl.8 d24, {d0, d1, d2, d3}, d24 -+ vadd.s8 q8, q3 -+ vtbl.8 d25, {d0, d1, d2, d3}, d25 -+@@ -52,8 +47,8 @@ -+ vtbl.8 d30, {d0, d1, d2, d3}, d30 -+ vqadd.s8 q10, q14 -+ vtbl.8 d31, {d0, d1, d2, d3}, d31 -+- vqadd.s8 q11, q15 -+ vsub.s8 q8, q3 -++ vqadd.s8 q11, q15 -+ vsub.s8 q9, q3 -+ vsub.s8 q10, q3 -+ vsub.s8 q11, q3 -+@@ -64,12 +59,16 @@ function ff_hevc_sao_band_w8_neon_8, export=1 -+ 1: subs r12, #8 -+ vld1.8 {d16}, [r1, :64], r3 -+ vld1.8 {d17}, [r1, :64], r3 -++ vshr.u8 q12, q8, #3 -+ vld1.8 {d18}, [r1, :64], r3 -+ vld1.8 {d19}, [r1, :64], r3 -++ vshr.u8 q13, q9, #3 -+ vld1.8 {d20}, [r1, :64], r3 -+ vld1.8 {d21}, [r1, :64], r3 -++ vshr.u8 q14, q10, #3 -+ vld1.8 {d22}, [r1, :64], r3 -+ vld1.8 {d23}, [r1, :64], r3 -++ vshr.u8 q15, q11, #3 -+ sao_band_64 -+ vst1.8 {d16}, [r0, :64], r2 -+ vst1.8 {d17}, [r0, :64], r2 -+@@ -88,9 +87,13 @@ function ff_hevc_sao_band_w16_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #4 -+ vld1.8 {q8}, [r1, :128], r3 -++ vshr.u8 q12, q8, #3 -+ vld1.8 {q9}, [r1, :128], r3 -++ vshr.u8 q13, q9, #3 -+ vld1.8 {q10}, [r1, :128], r3 -++ vshr.u8 q14, q10, #3 -+ vld1.8 {q11}, [r1, :128], r3 -++ vshr.u8 q15, q11, #3 -+ sao_band_64 -+ vst1.8 {q8}, [r0, :128], r2 -+ vst1.8 {q9}, [r0, :128], r2 -+@@ -105,7 +108,11 @@ function ff_hevc_sao_band_w32_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #2 -+ vld1.8 {q8-q9}, [r1, :128], r3 -++ vshr.u8 q12, q8, #3 -++ vshr.u8 q13, q9, #3 -+ vld1.8 {q10-q11}, [r1, :128], r3 -++ vshr.u8 q14, q10, #3 -++ vshr.u8 q15, q11, #3 -+ sao_band_64 -+ vst1.8 {q8-q9}, [r0, :128], r2 -+ vst1.8 {q10-q11}, [r0, :128], r2 -+@@ -119,7 +126,11 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ 1: subs r12, #1 -+ pld [r1, r3] -+ vld1.8 {q8-q9}, [r1, :128]! -++ vshr.u8 q12, q8, #3 -++ vshr.u8 q13, q9, #3 -+ vld1.8 {q10-q11}, [r1, :128], r3 -++ vshr.u8 q14, q10, #3 -++ vshr.u8 q15, q11, #3 -+ sub r1, #32 -+ sao_band_64 -+ vst1.8 {q8-q9}, [r0, :128]! -+@@ -129,51 +140,18 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ -+ bx lr -+ endfunc -+-// input -+-// a in q0 - q3 -+-// c in q4 - q7 -+-// b in q8 - q11 -+-// offset table in r7 and r5 -+-// output in q0 - q3 -+-// clobbers q12 - q15 -+-.macro edge_w64_body -+- vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -+- vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -+- vcgt.u8 q13, q5, q1 -+- vcgt.u8 q1, q1, q5 -+- vsub.s8 q12, q0, q12 // diff0 -+- vcgt.u8 q0, q4, q8 // c > b -+- vsub.s8 q13, q1, q13 -+- -+- vcgt.u8 q14, q8, q4 // b > c -+- vcgt.u8 q1, q5, q9 -+- vcgt.u8 q15, q9, q5 -+- vsub.s8 q0, q14, q0 // diff1 -+- vsub.s8 q1, q15, q1 -+ -+- vadd.s8 q0, q12 //diff0 + diff1 -+- vadd.s8 q1, q13 -+- -+- vcgt.u8 q14, q6, q2 -+- vcgt.u8 q2, q2, q6 -+- vcgt.u8 q15, q7, q3 -+- vcgt.u8 q3, q3, q7 -+- -+- vsub.s8 q14, q2, q14 -+- vcgt.u8 q2, q6, q10 -+- vsub.s8 q15, q3, q15 -+- -+- vcgt.u8 q12, q10, q6 -+- vcgt.u8 q3, q7, q11 -+- vcgt.u8 q13, q11, q7 -+- vsub.s8 q2, q12, q2 -+- vsub.s8 q3, q13, q3 -++.macro diff32 out0, out1, tmp0, tmp1, in0, in1, in2, in3 -++ vcgt.u8 \out0, \in2, \in0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 \tmp0, \in0, \in2 // a > c -> -1 , otherwise 0 -++ vcgt.u8 \out1, \in3, \in1 // c > a -> -1 , otherwise 0 part 2 -++ vcgt.u8 \tmp1, \in1, \in3 // a > c -> -1 , otherwise 0 part 2 -++ vsub.s8 \out0, \tmp0, \out0 // diff0 -++ vsub.s8 \out1, \tmp1, \out1 // diff0 part 2 -++.endm -+ -++.macro table64 -+ vmov.s8 q13, #2 // 2 to all elements -+- -+- vadd.s8 q2, q14 -+- vadd.s8 q3, q15 -+- -+ vmov.32 d24[0], r4 // load offset table from general registers -+ vmov.32 d24[1], r5 // load rest of offset table -+ -+@@ -208,6 +186,28 @@ endfunc -+ sub r0, #32 -+ .endm -+ -++// input -++// a in q0 - q3 -++// c in q4 - q7 -++// b in q8 - q11 -++// offset table in r7 and r5 -++// output in q0 - q3 -++// clobbers q12 - q15 -++.macro edge_w64_body -++ diff32 q12, q13, q0, q1, q0, q1, q4, q5 -++ diff32 q0, q1, q14, q15, q8, q9, q4, q5 -++ -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ -++ diff32 q14, q15, q2, q3, q2, q3, q6, q7 -++ diff32 q2, q3, q12, q13, q10, q11, q6, q7 -++ -++ vadd.s8 q2, q14 -++ vadd.s8 q3, q15 -++ table64 -++.endm -++ -+ .macro init_edge_64 -+ push {r4-r5} -+ ldr r12, [sp, #8] // height -+@@ -334,38 +334,23 @@ function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -+ bx lr -+ endfunc -+ -+-// inputs: -+-// a in q0, q1 -+-// c in q2, q3 -+-// b in q8, q9 -+-// offset table in d31 -+-// clobbered registers q0, q1, q10, q11, q12, q13 -+-// output q0, q1 -+-.macro edge_w32_body -+- vcgt.u8 q12, q2, q0 // c > a -> -1 , otherwise 0 -+- vcgt.u8 q0, q0, q2 // a > c -> -1 , otherwise 0 -+- vcgt.u8 q13, q3, q1 -+- vcgt.u8 q1, q1, q3 -+- -+- vsub.s8 q12, q0, q12 // diff0 -+- vcgt.u8 q0, q2, q8 // c > b -+- vsub.s8 q13, q1, q13 // diff0 part 2 -+- -+- vcgt.u8 q10, q8, q2 // b > c -+- vcgt.u8 q1, q3, q9 -+- vcgt.u8 q11, q9, q3 -+- -+- vsub.s8 q0, q10, q0 // diff1 -+- -+- vmov.s8 q10, #2 // 2 to all elements -+- vsub.s8 q1, q11, q1 // diff1 part 2 -+- vadd.s8 q0, q12 //diff0 + diff1 -+- vadd.s8 q1, q13 -++.macro init_edge_32 -++ ldr r12, [sp, #4] // sao_offset_val_table -++ vld1.32 {d31}, [r12] -++ ldr r12, [sp] // height -++.endm -+ -+- vadd.s8 q0, q10 -+- vadd.s8 q1, q10 -++.macro diff out0, tmp0, in0, in1 -++ vcgt.u8 \out0, \in1, \in0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 \tmp0, \in0, \in1 // a > c -> -1 , otherwise 0 -++ vsub.s8 \out0, \tmp0, \out0 // diff0 -++.endm -+ -+- vmov.u8 q10, #128 -++.macro table32 -++ vmov.s8 q10, #2 -++ vadd.s8 q0, q10 -++ vadd.s8 q1, q10 -++ vmov.s8 q10, #128 -+ vtbl.8 d0, {d31}, d0 -+ vadd.s8 q11, q2, q10 -+ vtbl.8 d1, {d31}, d1 -+@@ -373,56 +358,68 @@ endfunc -+ vtbl.8 d2, {d31}, d2 -+ vqadd.s8 q11, q0 -+ vtbl.8 d3, {d31}, d3 -+- vqadd.s8 q12, q1 -+- vsub.s8 q0, q11, q10 -+- vsub.s8 q1, q12, q10 -++ vqadd.s8 q12, q1 -++ vsub.s8 q0, q11, q10 -++ vsub.s8 q1, q12, q10 -+ vst1.8 {q0-q1}, [r0, :128], r2 -+ .endm -+ -+-.macro init_edge_32 -+- ldr r12, [sp, #4] // sao_offset_val_table -+- vld1.32 {d31}, [r12] -+- ldr r12, [sp] // height -+-.endm -+- -+ function ff_hevc_sao_edge_eo0_w32_neon_8, export=1 -+ init_edge_32 -+- sub r1, #4 // load 4 extra bytes -++ vpush {q4-q7} -++ sub r1, #4 -+ 1: subs r12, #1 -+- vld1.32 d3[1], [r1]! -+- vld1.8 {q2-q3}, [r1, :128]! // c -+- vld1.32 d20[0], [r1], r3 -+- sub r1, #36 -++ vld1.8 {q13-q14}, [r1]! -++ vld1.32 d30, [r1], r3 -++ sub r1, #32 -+ // a -+- vext.8 q0, q1, q2, #15 -+- vext.8 q1, q2, q3, #15 -+- // b -+- vext.8 q8, q2, q3, #1 -+- vext.8 q9, q3, q10, #1 -+- edge_w32_body -++ vext.8 q0, q13, q14, #3 -++ vext.8 q1, q14, q15, #3 -++ vshr.u64 d24, d30, #24 -++ // c -++ vext.8 q2, q13, q14, #4 -++ vext.8 q3, q14, q15, #4 -++ vshr.u64 d16, d30, #32 -++ // diff0 -++ diff32 q13, q14, q4, q5, q0, q1, q2, q3 -++ diff d18, d25, d24, d16 -++ // -diff1 -++ vext.s8 q0, q13, q14, #1 -++ vext.s8 q1, q14, q9, #1 -++ -++ vsub.s8 q0, q13, q0 //diff0 + diff1 -++ vsub.s8 q1, q14, q1 -++ table32 -+ bne 1b -++ vpop {q4-q7} -++ -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo1_w32_neon_8, export=1 -+ init_edge_32 -++ vpush {q4-q7} -+ // load a -+ sub r1, r3 -+ vld1.8 {q0-q1}, [r1, :128], r3 -+ // load c -+ vld1.8 {q2-q3}, [r1, :128], r3 -++ diff32 q12, q13, q0, q1, q0, q1, q2, q3 // CMP ( c, a ) -+ 1: subs r12, #1 -+ // load b -+ vld1.8 {q8-q9}, [r1, :128], r3 -+- edge_w32_body -+- // inputs for next loop iteration -+- // a -+- vmov.64 q0, q2 -+- vmov.64 q1, q3 -++ diff32 q4, q5, q10, q11, q8, q9, q2, q3 // CMP ( c, b ) -++ vadd.s8 q0, q4, q12 //diff0 + diff1 -++ vadd.s8 q1, q5, q13 -++ table32 -++ // CMP ( c, a ) -++ vneg.s8 q12, q4 -++ vneg.s8 q13, q5 -+ // c -+ vmov.64 q2, q8 -+ vmov.64 q3, q9 -+ bne 1b -++ vpop {q4-q7} -+ bx lr -+ endfunc -+ -+@@ -452,7 +449,11 @@ function ff_hevc_sao_edge_eo2_w32_neon_8, export=1 -+ vext.8 q6, q10, q11, #8 -+ vext.8 q7, q11, q12, #8 -+ vext.8 q5, q10, q11, #7 -+- edge_w32_body -++ diff32 q12, q13, q0, q1, q0, q1, q2, q3 -++ diff32 q0, q1, q10, q11, q8, q9, q2, q3 -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ table32 -+ // inputs for next loop iteration -+ // a -+ vmov.8 q0, q4 -+@@ -487,7 +488,14 @@ function ff_hevc_sao_edge_eo3_w32_neon_8, export=1 -+ vext.8 q8, q10, q11, #7 -+ vext.8 q9, q11, q12, #7 -+ vext.8 q14, q12, q10, #7 -+- edge_w32_body -++ -++ diff32 q12, q13, q0, q1, q0, q1, q2, q3 -++ diff32 q0, q1, q10, q11, q8, q9, q2, q3 -++ -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ table32 -++ -+ // inputs for next loop iteration -+ // a -+ vext.8 q0, q2, q3, #1 -+-- -+2.5.0 -+ -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index dde29adf425e54f54e4104b3370352db0be6ef40..83369203fef720456080f4119822e7fe3631ca1a 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -133,6 +133,8 @@ cd "ffmpeg-${VERSION}" || exit 2 - tar --strip-components=1 -xf $MYDIR/${ARCHIVE} - - patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -+patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch -+patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ -diff --git a/tools/depends/target/ffmpeg/hevcdsp_ARM_NEON_optimized_epel_functions.patch b/tools/depends/target/ffmpeg/hevcdsp_ARM_NEON_optimized_epel_functions.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e818716ac62 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/hevcdsp_ARM_NEON_optimized_epel_functions.patch -@@ -0,0 +1,409 @@ -+From 29c3327a0d72a7e872ff170363cfe5ed13bca5d0 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Tue, 22 Dec 2015 18:10:24 +0000 -+Subject: [PATCH] hevcdsp: ARM NEON optimized epel functions -+ -+--- -+ libavcodec/arm/Makefile | 1 + -+ libavcodec/arm/hevcdsp_epel_neon.S | 334 +++++++++++++++++++++++++++++++++++++ -+ libavcodec/arm/hevcdsp_init_neon.c | 23 +++ -+ 3 files changed, 358 insertions(+) -+ create mode 100644 libavcodec/arm/hevcdsp_epel_neon.S -+ -+diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile -+index cdd35b0..6051ec8 100644 -+--- a/libavcodec/arm/Makefile -++++ b/libavcodec/arm/Makefile -+@@ -131,6 +131,7 @@ NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \ -+ arm/synth_filter_neon.o -+ NEON-OBJS-$(CONFIG_HEVC_DECODER) += arm/hevcdsp_init_neon.o \ -+ arm/hevcdsp_deblock_neon.o \ -++ arm/hevcdsp_epel_neon.o \ -+ arm/hevcdsp_idct_neon.o \ -+ arm/hevcdsp_qpel_neon.o -+ NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_neon.o -+diff --git a/libavcodec/arm/hevcdsp_epel_neon.S b/libavcodec/arm/hevcdsp_epel_neon.S -+new file mode 100644 -+index 0000000..516ae5b -+--- /dev/null -++++ b/libavcodec/arm/hevcdsp_epel_neon.S -+@@ -0,0 +1,334 @@ -++/* -++ * Copyright (c) 2014 - 2015 Seppo Tomperi -++ * -++ * This file is part of FFmpeg. -++ * -++ * FFmpeg is free software; you can redistribute it and/or -++ * modify it under the terms of the GNU Lesser General Public -++ * License as published by the Free Software Foundation; either -++ * version 2.1 of the License, or (at your option) any later version. -++ * -++ * FFmpeg is distributed in the hope that it will be useful, -++ * but WITHOUT ANY WARRANTY; without even the implied warranty of -++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -++ * Lesser General Public License for more details. -++ * -++ * You should have received a copy of the GNU Lesser General Public -++ * License along with FFmpeg; if not, write to the Free Software -++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -++ */ -++ -++#include "libavutil/arm/asm.S" -++#include "neon.S" -++ -++#define MAX_PB_SIZE #64 -++ -++.macro vextin_d4 -++ vld1.8 {q10}, [r1], r2 -++ vmov d16, d20 -++ vext.8 d17, d20, d21, #1 -++ vext.8 d18, d20, d21, #2 -++ vext.8 d19, d20, d21, #3 -++.endm -++ -++.macro vextin_d4_8 -++ vld1.8 d16, [r1], r2 -++ vext.8 d17, d16, d16, #1 -++ vext.8 d18, d16, d16, #2 -++ vext.8 d19, d16, d16, #3 -++.endm -++ -++.macro load_coeffs_16b coeffs -++ ldr \coeffs, [\coeffs] -++ vdup.i8 d0, \coeffs -++ lsr \coeffs, #8 -++ vdup.i8 d1, \coeffs -++ lsr \coeffs, #8 -++ vdup.i8 d2, \coeffs -++ lsr \coeffs, #8 -++ vdup.i8 d3, \coeffs -++.endm -++ -++.macro epel_filter_16b out=q12 -++ vmull.u8 q3, d16, d0 -++ vmull.u8 q11, d19, d3 -++ vmull.u8 \out, d17, d1 -++ vmull.u8 q10, d18, d2 -++ vadd.s16 q3, q11 -++ vadd.s16 \out, q10 -++ vsub.s16 \out, q3 -++.endm -++ -++.macro load_coeffs_32b coeffs -++ ldr \coeffs, [\coeffs] -++ vmov.i64 d4, #0 -++ vmov.8 d4[0], \coeffs -++ lsr \coeffs, #8 -++ vmov.8 d4[2], \coeffs -++ lsr \coeffs, #8 -++ vmov.8 d4[4], \coeffs -++ lsr \coeffs, #8 -++ vmov.8 d4[6], \coeffs -++.endm -++ -++.macro epel_filter_32b -++ vmull.s16 q3, d24, d4[0] //q12 -++ vmull.s16 q4, d25, d4[0] -++ vmull.s16 q5, d30, d4[3] //q15 -++ vmull.s16 q6, d31, d4[3] -++ -++ vmull.s16 q7, d26, d4[1] // q13 -++ vmull.s16 q8, d27, d4[1] -++ vmull.s16 q9, d28, d4[2] // q14 -++ vmull.s16 q10, d29, d4[2] -++ vadd.s32 q3, q5 -++ vadd.s32 q4, q6 -++ vadd.s32 q7, q9 -++ vadd.s32 q8, q10 -++ vsub.s32 q7, q3 -++ vsub.s32 q8, q4 -++ vqshrn.s32 d6, q7, #6 -++ vqshrn.s32 d7, q8, #6 -++.endm -++ -++.macro epel_filter_32b_4 -++ vmull.s16 q3, d24, d4[0] //q12 -++ vmull.s16 q5, d30, d4[3] //q15 -++ vmull.s16 q7, d26, d4[1] // q13 -++ vmull.s16 q9, d28, d4[2] // q14 -++ vadd.s32 q3, q5 -++ vadd.s32 q7, q9 -++ vsub.s32 q7, q3 -++ vqshrn.s32 d6, q7, #6 -++.endm -++ -++function ff_hevc_put_epel_h_neon_8, export=1 -++ push {r4-r7} -++ mov r4, MAX_PB_SIZE -++ ldr r7, [sp, #16] // mx -++ ldr r5, [sp, #24] // width -++ sub r7, #1 -++ lsl r7, #2 -++ vpush {d8-d15} -++ adrl r12, epel_coeffs -++ add r7, r12 -++ sub r1, #1 -++ lsl r4, #1 -++ load_coeffs_16b r7 -++ mov r12, r3 -++ mov r6, r0 -++ mov r7, r1 -++ cmp r5, #6 -++ bgt 8f -++ cmp r5, #4 -++ blt 2f -++ b 4f -++8: subs r3, #1 -++ pld [r1] -++ vextin_d4 -++ epel_filter_16b -++ vst1.16 {q12}, [r0], r4 -++ bne 8b -++ subs r5, #8 -++ beq 99f -++ mov r3, r12 -++ add r6, #16 -++ mov r0, r6 -++ add r7, #8 -++ mov r1, r7 -++ cmp r5, #4 -++ bgt 8b -++4: subs r3, #1 -++ pld [r1] -++ vextin_d4_8 -++ epel_filter_16b -++ vst1.16 d24, [r0], r4 -++ bne 4b -++ subs r5, #4 -++ beq 99f -++ mov r3, r12 -++ add r6, #8 -++ mov r0, r6 -++ add r7, #4 -++ mov r1, r7 -++2: subs r3, #1 -++ pld [r1] -++ vextin_d4_8 -++ epel_filter_16b -++ vst1.32 d24[0], [r0], r4 -++ bne 2b -++99: vpop {d8-d15} -++ pop {r4-r7} -++ bx lr -++endfunc -++ -++function ff_hevc_put_epel_v_neon_8, export=1 -++ push {r4-r7} -++ mov r4, MAX_PB_SIZE -++ ldr r7, [sp, #20] // my -++ ldr r5, [sp, #24] // width -++ sub r7, #1 -++ lsl r7, #2 -++ vpush {d8-d15} -++ adrl r12, epel_coeffs -++ add r7, r12 -++ load_coeffs_16b r7 -++ sub r1, r2 -++ lsl r4, #1 -++ mov r12, r3 -++ mov r6, r0 -++ mov r7, r1 -++0: pld [r1] -++ vld1.8 {d16}, [r1], r2 -++ pld [r1] -++ vld1.8 {d17}, [r1], r2 -++ pld [r1] -++ vld1.8 {d18}, [r1], r2 -++ cmp r5, #6 -++ bgt 8f -++ cmp r5, #4 -++ blt 2f -++ b 4f -++8: pld [r1] -++ vld1.8 {d19}, [r1], r2 -++ subs r3, #1 -++ epel_filter_16b -++ vst1.16 {q12}, [r0], r4 -++ vmov d16, d17 -++ vmov d17, d18 -++ vmov d18, d19 -++ bne 8b -++ subs r5, #8 -++ beq 99f -++ mov r3, r12 -++ add r6, #16 -++ mov r0, r6 -++ add r7, #8 -++ mov r1, r7 -++ b 0b -++4: pld [r1] -++ vld1.8 {d19}, [r1], r2 -++ subs r3, #1 -++ epel_filter_16b -++ vst1.16 d24, [r0], r4 -++ vmov d16, d17 -++ vmov d17, d18 -++ vmov d18, d19 -++ bne 4b -++ subs r5, #4 -++ beq 99f -++ mov r3, r12 -++ add r6, #8 -++ mov r0, r6 -++ add r7, #4 -++ mov r1, r7 -++ b 0b -++2: pld [r1] -++ vld1.8 {d19}, [r1], r2 -++ subs r3, #1 -++ epel_filter_16b -++ vst1.32 d24[0], [r0], r4 -++ vmov d16, d17 -++ vmov d17, d18 -++ vmov d18, d19 -++ bne 2b -++99: vpop {d8-d15} -++ pop {r4-r7} -++ bx lr -++endfunc -++ -++function ff_hevc_put_epel_hv_neon_8, export=1 -++ push {r4-r7} -++ mov r4, MAX_PB_SIZE -++ ldr r6, [sp, #16] // mx -++ ldr r7, [sp, #20] // my -++ ldr r5, [sp, #24] // width -++ sub r7, #1 -++ lsl r7, #2 -++ vpush {d8-d15} -++ adrl r12, epel_coeffs -++ sub r6, #1 -++ lsl r6, #2 -++ add r6, r12 // mx epel coeff offset -++ add r7, r12 -++ sub r1, #1 -++ sub r1, r2 -++ lsl r4, #1 -++ load_coeffs_16b r6 -++ load_coeffs_32b r7 -++ mov r12, r3 -++ mov r6, r0 -++ mov r7, r1 -++0: pld [r1] -++ vextin_d4 -++ epel_filter_16b q12 -++ pld [r1] -++ vextin_d4 -++ epel_filter_16b q13 -++ pld [r1] -++ vextin_d4 -++ epel_filter_16b q14 -++ cmp r5, #6 -++ bgt 8f -++ cmp r5, #4 -++ blt 2f -++ b 4f -++8: pld [r1] -++ vextin_d4 -++ epel_filter_16b q15 -++ subs r3, #1 -++ epel_filter_32b -++ vst1.16 {q3}, [r0], r4 -++ vmov q12, q13 -++ vmov q13, q14 -++ vmov q14, q15 -++ bne 8b -++ subs r5, #8 -++ beq 99f -++ mov r3, r12 -++ add r6, #16 -++ mov r0, r6 -++ add r7, #8 -++ mov r1, r7 -++ b 0b -++4: pld [r1] -++ vextin_d4_8 -++ epel_filter_16b q15 -++ subs r3, #1 -++ epel_filter_32b_4 -++ vst1.16 d6, [r0], r4 -++ vmov q12, q13 -++ vmov q13, q14 -++ vmov q14, q15 -++ bne 4b -++ subs r5, #4 -++ beq 99f -++ mov r3, r12 -++ add r6, #8 -++ mov r0, r6 -++ add r7, #4 -++ mov r1, r7 -++ b 0b -++2: pld [r1] -++ vextin_d4_8 -++ epel_filter_16b q15 -++ subs r3, #1 -++ epel_filter_32b_4 -++ vst1.32 d6[0], [r0], r4 -++ vmov q12, q13 -++ vmov q13, q14 -++ vmov q14, q15 -++ bne 2b -++99: vpop {d8-d15} -++ pop {r4-r7} -++ bx lr -++endfunc -++ -++epel_coeffs: -++ .byte 2, 58, 10, 2 -++ .byte 4, 54, 16, 2 -++ .byte 6, 46, 28, 4 -++ .byte 4, 36, 36, 4 -++ .byte 4, 28, 46, 6 -++ .byte 2, 16, 54, 4 -++ .byte 2, 10, 58, 2 -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 5591807..733ff08 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -58,6 +58,15 @@ PUT_PIXELS(ff_hevc_put_pixels_w32_neon_8); -+ PUT_PIXELS(ff_hevc_put_pixels_w48_neon_8); -+ PUT_PIXELS(ff_hevc_put_pixels_w64_neon_8); -+ #undef PUT_PIXELS -++void ff_hevc_put_epel_h_neon_8(int16_t *dst, uint8_t *src, -++ ptrdiff_t srcstride, int height, -++ intptr_t mx, intptr_t my, int width); -++void ff_hevc_put_epel_v_neon_8(int16_t *dst, uint8_t *src, -++ ptrdiff_t srcstride, int height, -++ intptr_t mx, intptr_t my, int width); -++void ff_hevc_put_epel_hv_neon_8(int16_t *dst, uint8_t *src, -++ ptrdiff_t srcstride, int height, -++ intptr_t mx, intptr_t my, int width); -+ -+ static void (*put_hevc_qpel_neon[4][4])(int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, -+ int height, int width); -+@@ -201,7 +210,21 @@ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ c->put_hevc_qpel_bi[x][1][0] = ff_hevc_put_qpel_bi_neon_wrapper; -+ c->put_hevc_qpel_bi[x][0][1] = ff_hevc_put_qpel_bi_neon_wrapper; -+ c->put_hevc_qpel_bi[x][1][1] = ff_hevc_put_qpel_bi_neon_wrapper; -++ c->put_hevc_epel[x][1][0] = ff_hevc_put_epel_v_neon_8; -++ c->put_hevc_epel[x][0][1] = ff_hevc_put_epel_h_neon_8; -++ c->put_hevc_epel[x][1][1] = ff_hevc_put_epel_hv_neon_8; -+ } -++ c->put_hevc_epel[0][0][0] = ff_hevc_put_pixels_w2_neon_8; -++ c->put_hevc_epel[1][0][0] = ff_hevc_put_pixels_w4_neon_8; -++ c->put_hevc_epel[2][0][0] = ff_hevc_put_pixels_w6_neon_8; -++ c->put_hevc_epel[3][0][0] = ff_hevc_put_pixels_w8_neon_8; -++ c->put_hevc_epel[4][0][0] = ff_hevc_put_pixels_w12_neon_8; -++ c->put_hevc_epel[5][0][0] = ff_hevc_put_pixels_w16_neon_8; -++ c->put_hevc_epel[6][0][0] = ff_hevc_put_pixels_w24_neon_8; -++ c->put_hevc_epel[7][0][0] = ff_hevc_put_pixels_w32_neon_8; -++ c->put_hevc_epel[8][0][0] = ff_hevc_put_pixels_w48_neon_8; -++ c->put_hevc_epel[9][0][0] = ff_hevc_put_pixels_w64_neon_8; -++ -+ c->put_hevc_qpel[0][0][0] = ff_hevc_put_pixels_w2_neon_8; -+ c->put_hevc_qpel[1][0][0] = ff_hevc_put_pixels_w4_neon_8; -+ c->put_hevc_qpel[2][0][0] = ff_hevc_put_pixels_w6_neon_8; -+-- -+2.5.0 -+ - -From daf0139e58775768c384747ccdcd7953f7a44f81 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 7 May 2015 14:04:18 +0100 -Subject: [PATCH 27/61] [ffmpeg] Add GPU acceleration to hevc - ---- - tools/depends/target/ffmpeg/Makefile | 4 +- - tools/depends/target/ffmpeg/autobuild.sh | 1 + - .../target/ffmpeg/pfcd_hevc_optimisations.patch | 38136 +++++++++++++++++++ - 3 files changed, 38140 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch - -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index c46b533e47497cb7b1e7200eff2cee1a6f2a1a2f..48f8d56988718dd53294e8291a53e532f0ff338d 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -2,7 +2,8 @@ include ../../Makefile.include - include FFMPEG-VERSION - DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ - 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \ -- hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch -+ hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch \ -+ pfcd_hevc_optimisations.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -85,6 +86,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - cd $(PLATFORM); patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch -+ cd $(PLATFORM); patch -p1 < ../pfcd_hevc_optimisations.patch - - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index 83369203fef720456080f4119822e7fe3631ca1a..d6856dbd4fb4957ace700cbc08332223c01938f6 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -135,6 +135,7 @@ tar --strip-components=1 -xf $MYDIR/${ARCHIVE} - patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch -+patch -p1 < ../pfcd_hevc_optimisations.patch - - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ -diff --git a/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch b/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71bc708c93 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch -@@ -0,0 +1,38136 @@ -+From b9b5434c61afd492a54dad5158b4d56ecbf7f01d Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 28 Apr 2015 16:18:40 +0100 -+Subject: [PATCH 01/68] Added display output -+ -+--- -+ ffmpeg.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -+ 1 file changed, 159 insertions(+) -+ -+diff --git a/ffmpeg.c b/ffmpeg.c -+index 9ffd833..50c6e86 100644 -+--- a/ffmpeg.c -++++ b/ffmpeg.c -+@@ -23,6 +23,11 @@ -+ * multimedia converter based on the FFmpeg libraries -+ */ -+ -++#ifdef RPI -++#define RPI_DISPLAY -++//#define RPI_ZERO_COPY -++#endif -++ -+ #include "config.h" -+ #include -+ #include -+@@ -66,6 +71,20 @@ -+ # include "libavfilter/buffersrc.h" -+ # include "libavfilter/buffersink.h" -+ -++#ifdef RPI_DISPLAY -++#include -++#include -++#include -++#include -++#include -++#include -++#include -++#include -++#ifdef RPI_ZERO_COPY -++#include "libavcodec/rpi_qpu.h" -++#endif -++#endif -++ -+ #if HAVE_SYS_RESOURCE_H -+ #include -+ #include -+@@ -158,6 +177,134 @@ static int restore_tty; -+ static void free_input_threads(void); -+ #endif -+ -++#ifdef RPI_DISPLAY -++ -++#define NUM_BUFFERS 4 -++ -++static MMAL_COMPONENT_T* rpi_display = NULL; -++static MMAL_POOL_T *rpi_pool = NULL; -++ -++#ifdef RPI_ZERO_COPY -++static uint8_t *get_vc_handle(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ return (uint8_t *)p->vc_handle; -++} -++#endif -++ -++static MMAL_POOL_T* display_alloc_pool(MMAL_PORT_T* port, size_t w, size_t h) -++{ -++ MMAL_POOL_T* pool; -++ size_t i; -++ size_t size = (w*h*3)/2; -++#ifdef RPI_ZERO_COPY -++ mmal_port_parameter_set_boolean(port, MMAL_PARAMETER_ZERO_COPY, MMAL_TRUE); // Does this mark that the buffer contains a vc_handle? Would have expected a vc_image? -++ pool = mmal_port_pool_create(port, NUM_BUFFERS, 0); -++ assert(pool); -++#else -++ pool = mmal_port_pool_create(port, NUM_BUFFERS, size); -++ -++ for (i = 0; i < NUM_BUFFERS; ++i) -++ { -++ MMAL_BUFFER_HEADER_T* buffer = pool->header[i]; -++ void* bufPtr = buffer->data; -++ memset(bufPtr, i*30, w*h); -++ memset(bufPtr+w*h, 128, (w*h)/2); -++ } -++#endif -++ -++ return pool; -++} -++ -++static void display_cb_input(MMAL_PORT_T *port,MMAL_BUFFER_HEADER_T *buffer) { -++ mmal_buffer_header_release(buffer); -++} -++ -++static MMAL_COMPONENT_T* display_init(size_t x, size_t y, size_t w, size_t h) -++{ -++ MMAL_COMPONENT_T* display; -++ int w2 = (w+31)&~31; -++ int h2 = (h+15)&~15; -++ MMAL_DISPLAYREGION_T region = -++ { -++ {MMAL_PARAMETER_DISPLAYREGION, sizeof(region)}, -++ .set = MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_FULLSCREEN | MMAL_DISPLAY_SET_DEST_RECT, -++ .layer = 2, -++ .fullscreen = 0, -++ .dest_rect = {x, y, w, h} -++ }; -++ bcm_host_init(); // TODO is this needed? -++ mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_RENDERER, &display); -++ assert(display); -++ -++ mmal_port_parameter_set(display->input[0], ®ion.hdr); -++ -++ MMAL_ES_FORMAT_T* format = display->input[0]->format; -++ format->encoding = MMAL_ENCODING_I420; -++ format->es->video.width = w2; -++ format->es->video.height = h2; -++ format->es->video.crop.x = 0; -++ format->es->video.crop.y = 0; -++ format->es->video.crop.width = w; -++ format->es->video.crop.height = h; -++ mmal_port_format_commit(display->input[0]); -++ -++ mmal_component_enable(display); -++ -++ rpi_pool = display_alloc_pool(display->input[0], w2, h2); -++ -++ mmal_port_enable(display->input[0],display_cb_input); -++ mmal_port_enable(display->control,display_cb_input); -++ -++ printf("Allocated display %d %d\n",w,h); -++ -++ return display; -++} -++ -++static void display_frame(MMAL_COMPONENT_T* display,AVFrame* fr) -++{ -++ int w = fr->width; -++ int h = fr->height; -++ int w2 = (w+31)&~31; -++ int h2 = (h+15)&~15; -++ if (!display || !rpi_pool) -++ return; -++ MMAL_BUFFER_HEADER_T* buf = mmal_queue_get(rpi_pool->queue); -++ if (!buf) { -++ // Running too fast so drop the frame -++ return; -++ } -++ assert(buf); -++ buf->cmd = 0; -++ buf->length = (w2 * h2 * 3)/2; -++ buf->offset = 0; // Offset to valid data -++ buf->flags = 0; -++#ifdef RPI_ZERO_COPY -++ buf->data = get_vc_handle(fr->buf[0]); -++ buf->alloc_size = (w2*h2*3)/2; -++#else -++ //mmal_buffer_header_mem_lock(buf); -++ memcpy(buf->data, fr->data[0], w2 * h); -++ memcpy(buf->data+w2*h2, fr->data[1], w2 * h / 4); -++ memcpy(buf->data+w2*h2*5/4, fr->data[2], w2 * h / 4); -++ //mmal_buffer_header_mem_unlock(buf); -++#endif -++ -++ mmal_port_send_buffer(display->input[0], buf); // I assume this will automatically get released -++} -++ -++static void display_exit(MMAL_COMPONENT_T* display) -++{ -++ if (display) { -++ mmal_component_destroy(display); -++ } -++ if (rpi_pool) { -++ mmal_port_pool_destroy(display->input[0], rpi_pool); -++ } -++} -++ -++#endif -++ -++ -+ /* sub2video hack: -+ Convert subtitles to video with alpha to insert them in filter graphs. -+ This is a temporary solution until libavfilter gets real subtitles support. -+@@ -581,6 +728,10 @@ static void ffmpeg_cleanup(int ret) -+ } -+ term_exit(); -+ ffmpeg_exited = 1; -++ -++#ifdef RPI_DISPLAY -++ display_exit(rpi_display); -++#endif -+ } -+ -+ void remove_avoptions(AVDictionary **a, AVDictionary *b) -+@@ -940,6 +1091,14 @@ static void do_video_out(AVFormatContext *s, -+ int frame_size = 0; -+ InputStream *ist = NULL; -+ AVFilterContext *filter = ost->filter->filter; -++#ifdef RPI_DISPLAY -++ if (next_picture) -++ { -++ if (!rpi_display) -++ rpi_display = display_init(0,0,next_picture->width,next_picture->height); -++ display_frame(rpi_display,next_picture); -++ } -++#endif -+ -+ if (ost->source_index >= 0) -+ ist = input_streams[ost->source_index]; -+-- -+2.7.4 -+ -+ -+From b90a5aff7bf9112ebd2a07949c8d79a49fcafe48 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 29 Apr 2015 16:49:43 +0100 -+Subject: [PATCH 02/68] Split transform and intra prediction into commands -+ -+--- -+ libavcodec/hevc.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++- -+ libavcodec/hevc.h | 58 +++++++++++++++++++++++ -+ libavcodec/hevc_cabac.c | 15 ++++++ -+ 3 files changed, 191 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index b478065..aa45dd6 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -931,6 +931,25 @@ static int hls_cross_component_pred(HEVCContext *s, int idx) { -+ return 0; -+ } -+ -++#ifdef RPI -++static void rpi_intra_pred(HEVCContext *s, int log2_trafo_size, int x0, int y0, int c_idx) -++{ -++ if (s->enable_rpi) { -++ HEVCLocalContext *lc = s->HEVClc; -++ HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -++ cmd->type = RPI_PRED_INTRA; -++ cmd->size = log2_trafo_size; -++ cmd->c_idx = c_idx; -++ cmd->x = x0; -++ cmd->y = y0; -++ cmd->na = (lc->na.cand_bottom_left<<4) + (lc->na.cand_left<<3) + (lc->na.cand_up_left<<2) + (lc->na.cand_up<<1) + lc->na.cand_up_right; -++ cmd->mode = c_idx ? lc->tu.intra_pred_mode_c : lc->tu.intra_pred_mode; -++ } else { -++ s->hpc.intra_pred[log2_trafo_size - 2](s, x0, y0, c_idx); -++ } -++} -++#endif -++ -+ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ int xBase, int yBase, int cb_xBase, int cb_yBase, -+ int log2_cb_size, int log2_trafo_size, -+@@ -943,8 +962,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ int trafo_size = 1 << log2_trafo_size; -+ ff_hevc_set_neighbour_available(s, x0, y0, trafo_size, trafo_size); -+- -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, x0, y0, 0); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, x0, y0, 0); -++#endif -+ } -+ -+ if (cbf_luma || cbf_cb[0] || cbf_cr[0] || -+@@ -1030,7 +1052,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (s->ps.sps->chroma_format_idc == 2 ? 2 : 1); i++) { -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ ff_hevc_set_neighbour_available(s, x0, y0 + (i << log2_trafo_size_c), trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0 + (i << log2_trafo_size_c), 1); -++#else -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0 + (i << log2_trafo_size_c), 1); -++#endif -+ } -+ if (cbf_cb[i]) -+ ff_hevc_hls_residual_coding(s, x0, y0 + (i << log2_trafo_size_c), -+@@ -1059,7 +1085,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (s->ps.sps->chroma_format_idc == 2 ? 2 : 1); i++) { -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ ff_hevc_set_neighbour_available(s, x0, y0 + (i << log2_trafo_size_c), trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0 + (i << log2_trafo_size_c), 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0 + (i << log2_trafo_size_c), 2); -++#endif -+ } -+ if (cbf_cr[i]) -+ ff_hevc_hls_residual_coding(s, x0, y0 + (i << log2_trafo_size_c), -+@@ -1088,7 +1118,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ ff_hevc_set_neighbour_available(s, xBase, yBase + (i << log2_trafo_size), -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase + (i << log2_trafo_size), 1); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase + (i << log2_trafo_size), 1); -++#endif -+ } -+ if (cbf_cb[i]) -+ ff_hevc_hls_residual_coding(s, xBase, yBase + (i << log2_trafo_size), -+@@ -1098,7 +1132,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ ff_hevc_set_neighbour_available(s, xBase, yBase + (i << log2_trafo_size), -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase + (i << log2_trafo_size), 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase + (i << log2_trafo_size), 2); -++#endif -+ } -+ if (cbf_cr[i]) -+ ff_hevc_hls_residual_coding(s, xBase, yBase + (i << log2_trafo_size), -+@@ -1110,26 +1148,46 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ int trafo_size_h = 1 << (log2_trafo_size_c + s->ps.sps->hshift[1]); -+ int trafo_size_v = 1 << (log2_trafo_size_c + s->ps.sps->vshift[1]); -+ ff_hevc_set_neighbour_available(s, x0, y0, trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0, 1); -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0, 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0, 1); -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0, 2); -++#endif -+ if (s->ps.sps->chroma_format_idc == 2) { -+ ff_hevc_set_neighbour_available(s, x0, y0 + (1 << log2_trafo_size_c), -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0 + (1 << log2_trafo_size_c), 1); -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0 + (1 << log2_trafo_size_c), 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0 + (1 << log2_trafo_size_c), 1); -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0 + (1 << log2_trafo_size_c), 2); -++#endif -+ } -+ } else if (blk_idx == 3) { -+ int trafo_size_h = 1 << (log2_trafo_size + 1); -+ int trafo_size_v = 1 << (log2_trafo_size + s->ps.sps->vshift[1]); -+ ff_hevc_set_neighbour_available(s, xBase, yBase, -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase, 1); -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase, 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase, 1); -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase, 2); -++#endif -+ if (s->ps.sps->chroma_format_idc == 2) { -+ ff_hevc_set_neighbour_available(s, xBase, yBase + (1 << (log2_trafo_size)), -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase + (1 << (log2_trafo_size)), 1); -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase + (1 << (log2_trafo_size)), 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase + (1 << (log2_trafo_size)), 1); -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase + (1 << (log2_trafo_size)), 2); -++#endif -+ } -+ } -+ } -+@@ -2304,6 +2362,31 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ lc->ctb_up_left_flag = ((x_ctb > 0) && (y_ctb > 0) && (ctb_addr_in_slice-1 >= s->ps.sps->ctb_width) && (s->ps.pps->tile_id[ctb_addr_ts] == s->ps.pps->tile_id[s->ps.pps->ctb_addr_rs_to_ts[ctb_addr_rs-1 - s->ps.sps->ctb_width]])); -+ } -+ -++#ifdef RPI -++static void rpi_execute_pred_cmds(HEVCContext *s) -++{ -++ int i; -++ HEVCPredCmd *cmd = s->univ_pred_cmds; -++ HEVCLocalContext *lc = s->HEVClc; -++ -++ for(i = s->num_pred_cmds; i > 0; i--, cmd++) { -++ if (cmd->type == RPI_PRED_INTRA) { -++ lc->tu.intra_pred_mode_c = lc->tu.intra_pred_mode = cmd->mode; -++ lc->na.cand_bottom_left = (cmd->na >> 4) & 1; -++ lc->na.cand_left = (cmd->na >> 3) & 1; -++ lc->na.cand_up_left = (cmd->na >> 2) & 1; -++ lc->na.cand_up = (cmd->na >> 1) & 1; -++ lc->na.cand_up_right = (cmd->na >> 0) & 1; -++ s->hpc.intra_pred[cmd->size - 2](s, cmd->x, cmd->y, cmd->c_idx); -++ } else { -++ s->hevcdsp.transform_add[cmd->size-2](cmd->dst, cmd->buf, cmd->stride); -++ } -++ } -++ s->num_pred_cmds = 0; -++ s->num_coeffs = 0; -++} -++#endif -++ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ { -+ HEVCContext *s = avctxt->priv_data; -+@@ -2313,6 +2396,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int y_ctb = 0; -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -++#ifdef RPI -++ s->enable_rpi = 1; // TODO this should depend on cross component and frame width etc. -++#endif -++ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+ av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); -+ return AVERROR_INVALIDDATA; -+@@ -2342,6 +2429,9 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -++#ifdef RPI -++ rpi_execute_pred_cmds(s); -++#endif -+ if (more_data < 0) { -+ s->tab_slice_address[ctb_addr_rs] = -1; -+ return more_data; -+@@ -2387,6 +2477,10 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int -+ s = s1->sList[self_id]; -+ lc = s->HEVClc; -+ -++#ifdef RPI -++ s->enable_rpi = 0; -++#endif -++ -+ if(ctb_row) { -+ ret = init_get_bits8(&lc->gb, s->data + s->sh.offset[ctb_row - 1], s->sh.size[ctb_row - 1]); -+ -+@@ -3075,6 +3169,13 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ -+ av_freep(&s->cabac_state); -+ -++#ifdef RPI -++ av_freep(&s->unif_mv_cmds); -++ av_freep(&s->unif_xfm_cmds); -++ av_freep(&s->univ_pred_cmds); -++ av_freep(&s->coeffs_buf); -++#endif -++ -+ for (i = 0; i < 3; i++) { -+ av_freep(&s->sao_pixel_buffer_h[i]); -+ av_freep(&s->sao_pixel_buffer_v[i]); -+@@ -3129,6 +3230,22 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->HEVClcList[0] = s->HEVClc; -+ s->sList[0] = s; -+ -++#ifdef RPI -++ s->unif_mv_cmds = av_mallocz(sizeof(HEVCMvCmd)*RPI_MAX_MV_CMDS); -++ if (!s->unif_mv_cmds) -++ goto fail; -++ s->unif_xfm_cmds = av_mallocz(sizeof(HEVCXfmCmd)*RPI_MAX_XFM_CMDS); -++ if (!s->unif_xfm_cmds) -++ goto fail; -++ s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -++ if (!s->univ_pred_cmds) -++ goto fail; -++ s->coeffs_buf = av_mallocz(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16); -++ if (!s->coeffs_buf) -++ goto fail; -++ s->enable_rpi = 0; -++#endif -++ -+ s->cabac_state = av_malloc(HEVC_CONTEXTS); -+ if (!s->cabac_state) -+ goto fail; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index be91010..7a1c35f 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -23,6 +23,9 @@ -+ #ifndef AVCODEC_HEVC_H -+ #define AVCODEC_HEVC_H -+ -++// define RPI to split the CABAC/prediction/transform into separate stages -++#include "config.h" -++ -+ #include "libavutil/buffer.h" -+ #include "libavutil/md5.h" -+ -+@@ -790,6 +793,49 @@ typedef struct HEVCLocalContext { -+ int boundary_flags; -+ } HEVCLocalContext; -+ -++#ifdef RPI -++ -++// RPI_MAX_WIDTH is maximum width in pixels supported by the accelerated code -++#define RPI_MAX_WIDTH 2048 -++ -++// Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane -++#define RPI_MAX_MV_CMDS (16*3*(RPI_MAX_WIDTH/4)) -++#define RPI_MAX_XFM_CMDS (16*3*(RPI_MAX_WIDTH/4)) -++// Each block can have an intra prediction and a transform_add command -++#define RPI_MAX_PRED_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -++ -++// Command for inter prediction -++typedef struct HEVCMvCmd { -++} HEVCMvCmd; -++ -++// Command for transform to process a block of coefficients -++typedef struct HEVCXfmCmd { -++} HEVCXfmCmd; -++ -++// Command for intra prediction and transform_add of predictions to coefficients -++#define RPI_PRED_TRANSFORM_ADD 0 -++#define RPI_PRED_INTRA 1 -++typedef struct HEVCPredCmd { -++ uint8_t size; -++ uint8_t type; -++ uint8_t na; -++ uint8_t c_idx; -++ union { -++ uint8_t *dst; // RPI_PRED_TRANSFORM_ADD -++ uint32_t x; // RPI_PRED_INTRA -++ }; -++ union { -++ int16_t *buf; // RPI_PRED_TRANSFORM_ADD -++ uint32_t y; // RPI_PRED_INTRA -++ }; -++ union { -++ enum IntraPredMode mode; // RPI_PRED_TRANSFORM_ADD -++ uint32_t stride; // RPI_PRED_INTRA -++ }; -++} HEVCPredCmd; -++ -++#endif -++ -+ typedef struct HEVCContext { -+ const AVClass *c; // needed by private avoptions -+ AVCodecContext *avctx; -+@@ -805,6 +851,18 @@ typedef struct HEVCContext { -+ int width; -+ int height; -+ -++#ifdef RPI -++ int enable_rpi; -++ HEVCMvCmd *unif_mv_cmds; -++ HEVCXfmCmd *unif_xfm_cmds; -++ HEVCPredCmd *univ_pred_cmds; -++ int16_t *coeffs_buf; -++ int num_mv_cmds; -++ int num_xfm_cmds; -++ int num_pred_cmds; -++ int num_coeffs; -++#endif -++ -+ uint8_t *cabac_state; -+ -+ /** 1 if the independent slice segment header was successfully parsed */ -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 05b2821..4e97f06 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1510,6 +1510,21 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ coeffs[i] = coeffs[i] + ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -+ } -++#ifdef RPI -++ if (s->enable_rpi) { -++ int16_t *c = s->coeffs_buf + s->num_coeffs; -++ int n = trafo_size * trafo_size; -++ HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -++ memcpy(c, coeffs, n * sizeof(int16_t)); // TODO change pointer earlier and we can avoid this copy -++ s->num_coeffs += n; -++ cmd->type = RPI_PRED_TRANSFORM_ADD; -++ cmd->size = log2_trafo_size; -++ cmd->buf = c; -++ cmd->dst = dst; -++ cmd->stride = stride; -++ return; -++ } -++#endif -+ s->hevcdsp.transform_add[log2_trafo_size-2](dst, coeffs, stride); -+ } -+ -+-- -+2.7.4 -+ -+ -+From f8293de11dc040d9fa2a558762a357c0c353d2c9 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 30 Apr 2015 15:23:22 +0100 -+Subject: [PATCH 03/68] Added simple VPU test code -+ -+--- -+ libavcodec/Makefile | 7 + -+ libavcodec/hevc.c | 33 +- -+ libavcodec/rpi_hevc_transform.h | 212 ++++++ -+ libavcodec/rpi_hevc_transform.s | 147 ++++ -+ libavcodec/rpi_mailbox.c | 293 ++++++++ -+ libavcodec/rpi_mailbox.h | 20 + -+ libavcodec/rpi_qpu.c | 652 ++++++++++++++++++ -+ libavcodec/rpi_qpu.h | 45 ++ -+ libavcodec/rpi_shader.c | 818 ++++++++++++++++++++++ -+ libavcodec/rpi_shader.h | 20 + -+ libavcodec/rpi_shader.qasm | 1413 +++++++++++++++++++++++++++++++++++++++ -+ libavcodec/rpi_user_vcsm.h | 425 ++++++++++++ -+ 12 files changed, 4084 insertions(+), 1 deletion(-) -+ create mode 100644 libavcodec/rpi_hevc_transform.h -+ create mode 100644 libavcodec/rpi_hevc_transform.s -+ create mode 100644 libavcodec/rpi_mailbox.c -+ create mode 100644 libavcodec/rpi_mailbox.h -+ create mode 100644 libavcodec/rpi_qpu.c -+ create mode 100644 libavcodec/rpi_qpu.h -+ create mode 100644 libavcodec/rpi_shader.c -+ create mode 100644 libavcodec/rpi_shader.h -+ create mode 100644 libavcodec/rpi_shader.qasm -+ create mode 100644 libavcodec/rpi_user_vcsm.h -+ -+diff --git a/libavcodec/Makefile b/libavcodec/Makefile -+index fd0d1f0..03065cd 100644 -+--- a/libavcodec/Makefile -++++ b/libavcodec/Makefile -+@@ -5,6 +5,10 @@ NAME = avcodec -+ HEADERS = avcodec.h \ -+ avdct.h \ -+ avfft.h \ -++ rpi_qpu.h \ -++ rpi_shader.h \ -++ rpi_mailbox.h \ -++ rpi_hevc_transform.h \ -+ d3d11va.h \ -+ dirac.h \ -+ dv_profile.h \ -+@@ -43,6 +47,9 @@ OBJS = allcodecs.o \ -+ resample.o \ -+ resample2.o \ -+ utils.o \ -++ rpi_qpu.o \ -++ rpi_shader.o \ -++ rpi_mailbox.o \ -+ vorbis_parser.o \ -+ xiph.o \ -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index aa45dd6..ab55df1 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -41,6 +41,10 @@ -+ #include "hevc.h" -+ #include "profiles.h" -+ -++#ifdef RPI -++#include "rpi_qpu.h" -++#endif -++ -+ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; -+ -+ /** -+@@ -2430,7 +2434,9 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ #ifdef RPI -+- rpi_execute_pred_cmds(s); -++ if (x_ctb + ctb_size >= s->ps.sps->width) { -++ rpi_execute_pred_cmds(s); -++ } -+ #endif -+ if (more_data < 0) { -+ s->tab_slice_address[ctb_addr_rs] = -1; -+@@ -3244,6 +3250,31 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ if (!s->coeffs_buf) -+ goto fail; -+ s->enable_rpi = 0; -++ -++ // A little test program -++ { -++ GPU_MEM_PTR_T p; -++ int err = gpu_malloc_cached(16, &p); -++ short *q = (short *)p.arm; -++ int i; -++ int r; -++ printf("Allocated memory %d ARM 0x%x, VC 0x%x, Code 0x%x\n",err,(int)p.arm,p.vc,(int)vpu_get_fn()); -++ printf("Allocated memory %d ARM 0x%x, VC 0x%x\n",err,(int)p.arm,p.vc); -++ printf("Preparing data %p\n",q); -++ for(i=0;i<16;i++) -++ q[i] = i; -++ printf("Flush cache\n"); -++ gpu_cache_flush(&p); -++ printf("Executing code\n"); -++ r = vpu_execute_code( vpu_get_fn(), p.vc, 0, 0, 0, 0, 0); -++ printf("Return value %d (",r); -++ for(i=0;i<16;i++) -++ printf("%d ",q[i]); -++ printf(")\n"); -++ gpu_free(&p); -++ goto fail; // Early out -++ } -++ -+ #endif -+ -+ s->cabac_state = av_malloc(HEVC_CONTEXTS); -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+new file mode 100644 -+index 0000000..85a9102 -+--- /dev/null -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -0,0 +1,212 @@ -++unsigned char rpi_hevc_transform [] = { -++169, -++3, -++3, -++232, -++128, -++0, -++0, -++0, -++20, -++248, -++0, -++136, -++0, -++0, -++192, -++248, -++0, -++0, -++0, -++96, -++3, -++232, -++32, -++0, -++0, -++0, -++7, -++232, -++0, -++2, -++0, -++0, -++8, -++232, -++0, -++4, -++0, -++0, -++12, -++248, -++0, -++128, -++0, -++0, -++192, -++8, -++4, -++0, -++4, -++232, -++64, -++0, -++0, -++0, -++5, -++232, -++0, -++0, -++8, -++0, -++128, -++69, -++113, -++66, -++12, -++248, -++0, -++128, -++0, -++0, -++192, -++8, -++4, -++0, -++128, -++69, -++113, -++70, -++128, -++144, -++39, -++0, -++4, -++255, -++48, -++192, -++128, -++3, -++32, -++8, -++16, -++0, -++76, -++254, -++48, -++192, -++9, -++4, -++32, -++8, -++0, -++0, -++4, -++254, -++0, -++144, -++128, -++2, -++0, -++248, -++62, -++0, -++128, -++144, -++22, -++0, -++4, -++255, -++48, -++192, -++128, -++3, -++32, -++8, -++16, -++0, -++76, -++254, -++48, -++192, -++9, -++4, -++32, -++8, -++0, -++0, -++140, -++248, -++44, -++0, -++0, -++0, -++32, -++48, -++4, -++0, -++128, -++69, -++113, -++66, -++242, -++140, -++211, -++192, -++41, -++3, -++68, -++192, -++80, -++7, -++164, -++255, -++36, -++220, -++96, -++2, -++0, -++248, -++62, -++0, -++3, -++255, -++55, -++208, -++120, -++3, -++224, -++3, -++190, -++11, -++16, -++139, -++246, -++83, -++0, -++103, -++90, -++0, -++8, -++240, -++0, -++128, -++128, -++3, -++0, -++247, -++32, -++128, -++10, -++4, -++136, -++240, -++32, -++0, -++128, -++3, -++112, -++96, -++90, -++0, -++}; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+new file mode 100644 -+index 0000000..5e2728d -+--- /dev/null -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -0,0 +1,147 @@ -++# ****************************************************************************** -++# Argon Design Ltd. -++# (c) Copyright 2015 Argon Design Ltd. All rights reserved. -++# -++# Module : HEVC -++# Author : Peter de Rivaz -++# ****************************************************************************** -++ -++# HEVC VPU Transform -++# -++# Transform matrix can be thought of as -++# output row vector = input row vector * transMatrix2 -++# -++# The even rows of the matrix are symmetric -++# The odd rows of the matrix are antisymmetric -++# -++# So only need to compute the first half of the results, then can compute the remainder with a butterfly -++# -++# EXAMPLE -++# (a b c d) (1 2 2 1) -++# (3 4 -4 -3) -++# (5 6 6 5) -++# (7 8 -8 -7) -++# -++# x=(a c)(1 2) = 1a+5c 2a+6c -++# (5 6) -++# -++# y=(b d)(3 4) = 3b+7d 4b+8d -++# (7 8) -++# -++# u=x+y = 1a+5c+3b+7d 2a+4b+6c+8d -++# v=x-y = 1a+5c-3b-7d 2a+6c-4b-8d -++# -++# Final results are (u , v[::-1]) -++# -++# -++# For 32x1 input, load even rows into HX(0++,0), odd rows into HX(16++,0) -++# Apply the even matrix first and stop before rounding -++# Then apply the odd matrix in a full manner: -++# -++# First step is to compute partial products with the first input (16 cycles) -++# 1a 3b 5c 7d 16x1 input coefficients produce 16x16 output -++# 2a 4b 6c 8d -++# 2a -4b 6c -8d -++# 1a -3b 5c -7d -++# -++# Second step is to sum partial products into final position (8 cycles) -++# 1a+3b+5c+7d -++# 2a+4b+6c+8d -++# 2a-4b+6c-8d -++# 1a-3b+5c-7d -++# -++# Then can apply butterfly to combine even results and odd results + rounding to produce 16 rows of output at a time (need to save in transposed format) -++# -++# For 16x16 no butterfly is required and can store final results in original location (Could do 2 16x16s in parallel to make use of the trick - saves on the adds) -++# -++# For 8x8 we could compute two in parallel. -++# -++# -++ -++test_add: -++ vldh HX(0,0),(r0) -++ vadd HX(0,0),HX(0,0),10 -++ vsth HX(0,0),(r0) -++ mov r0,7 # return value -++ b lr -++ -++# Columns are transformed first -++# -++# Store top left half of transMatrix2 in -++# Store bottom left half of transMatrix2 in HX(32,32) -++# -++# For 16x16 -++# HX(0:15,0) contains input data before transform -++# HY(0:15,0) contains 32bit output data after transform -++# HX(32,0) contains even rows of left half of transMatrix2 -++# HX(32,32) contains odd rows of left half of transMatrix2 -++# HY(48,0) contains partial products ready for summing -++# -++ -++ -++# hevc_trans_16x16(short *transMatrix2, short *coeffs, int num) -++# transMatrix2: address of the constant matrix (must be at 32 byte aligned address in Videocore memory) -++# coeffs: address of the transform coefficients (must be at 32 byte aligned address in Videocore memory) -++# num: number of 16x16 transforms to be done -++# -++hevc_trans_16x16: -++ push r6-r15, lr # TODO cut down number of used registers -++ -++ mov r3, 2*32*2 # Twice Stride of transMatrix2 in bytes -++ vld HX(32++,0),(r0 += r3) REP 16 # This is the 16x16 matrix, a transform is equivalent to multiplying input row vector * matrix -++ # Now use r0 to describe which matrix we are working on. -++ # Allows us to prefetch the next block of coefficients for efficiency. -++ mov r0,0 # This describes the location where we read our coefficients from -++ mov r3,16*2 # Stride of coefficients in bytes -++ mov r7,16*16*2 # Total block size -++ mov r8,64*16 # Value used to swap from current to next VRF location -++ vldh HX(0++,0)+r0,(r1 += r3) REP 16 -++ mov r4,64 # Constant used for rounding first pass -++ mov r5,1<<19 # Constant used for rounding second pass -++ -++ # At start of block r0,r1 point to the current block (that has already been loaded) -++block_loop: -++ eor r0,r8 -++ add r1,r7 -++ # Prefetch the next block -++ vldh HX(0++,0)+r0,(r1 += r3) REP 16 -++ eor r0,r8 -++ sub r1,r7 -++ -++ # Transform the current block -++ bl col_trans_16 -++ vadd HY(0++,0)+r0,HY(0++,0)+r0,r4 REP 16 # Now add on rounding, shift down by 7, and saturate -++ #vsasls HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # 9+7=16 so this ends up with the output saturated and in the top half of the word. -++ vasl HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # This should be saturating, but the instruction above does not assemble? -++ vmov VX(0,0++), HX(0++,32) REP 16 # For simplicity transpose this back to the original position -++ -++ bl col_trans_16 -++ vadd HY(0++,0)+r0,HY(0++,0)+r0,r4 REP 16 # Now add on rounding, shift down by 7, and saturate -++ #vsasls HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # 9+7=16 so this ends up with the output saturated and in the top half of the word. -++ vasl HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # This should be saturating, but the instruction above does not assemble? -++ -++ # Save results - note there has been a transposition during the processing so we save columns -++ vsth VX(0,32++)+r0, (r1 += r3) REP 16 -++ -++ # Move onto next block -++ eor r0,r8 -++ add r1,r7 -++ -++ addcmpbgt r2,-1,0,block_loop -++ pop r6-r15, pc -++ -++# r1,r2,r3 r7,r8 should be preserved -++# HX(0++,0)+r0 is the block to be transformed -++# HX(32++,0) is the 16x16 matrix of transform coefficients -++# Use HY(48,0) for intermediate results -++# r0 can be used, but should be returned to its original value at the end -++col_trans_16: -++ add r4,r0,16 # Final value for this loop -++col_trans_16_loop: -++ # First compute partial products for a single column -++ vmul32s VY(48,0++), VX(0,0)+r0, VX(32,0++) REP 16 -++ # Then sum up the results and place back -++ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -++ addcmpblt r0,1,r4,col_trans_16_loop -++ sub r0,16 # but r0 back to its original value -++ b lr -+diff --git a/libavcodec/rpi_mailbox.c b/libavcodec/rpi_mailbox.c -+new file mode 100644 -+index 0000000..536896f -+--- /dev/null -++++ b/libavcodec/rpi_mailbox.c -+@@ -0,0 +1,293 @@ -++/* -++Copyright (c) 2012, Broadcom Europe 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. -++ * Neither the name of the copyright holder nor the -++ names of its contributors may be used to endorse or promote products -++ derived from this software without specific prior written permission. -++ -++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -++DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -++ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -++(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 -++#include -++#include -++#include -++#include -++#include -++#include -++#include -++#include -++ -++#include -++ -++#define MAJOR_NUM 100 -++#define IOCTL_MBOX_PROPERTY _IOWR(MAJOR_NUM, 0, char *) -++#define DEVICE_FILE_NAME "/dev/char_dev" -++ -++#include "rpi_mailbox.h" -++ -++#define PAGE_SIZE (4*1024) -++ -++// Shared memory will not be cached in ARM cache -++void *mapmem_shared(unsigned base, unsigned size) -++{ -++ int mem_fd; -++ unsigned offset = base % PAGE_SIZE; -++ base = base - offset; -++ /* open /dev/mem */ -++ if ((mem_fd = open("/dev/mem", O_RDWR|O_SYNC) ) < 0) { -++ printf("can't open /dev/mem\nThis program should be run as root. Try prefixing command with: sudo\n"); -++ return NULL; -++ } -++ void *mem = mmap( -++ 0, -++ size, -++ PROT_READ|PROT_WRITE, -++ MAP_SHARED/*|MAP_FIXED*/, -++ mem_fd, -++ base); -++#ifdef DEBUG -++ printf("base=0x%x, mem=%p\n", base, mem); -++#endif -++ if (mem == MAP_FAILED) { -++ printf("mmap error %d\n", (int)mem); -++ return NULL; -++ } -++ close(mem_fd); -++ return (char *)mem + offset; -++} -++ -++// Unshared memory will be faster as lives in ARM cache, but requires cache flushing -++void *mapmem_private(unsigned base, unsigned size) -++{ -++ int mem_fd; -++ unsigned offset = base % PAGE_SIZE; -++ base = base - offset; -++ /* open /dev/mem */ -++ if ((mem_fd = open("/dev/mem", O_RDWR|O_SYNC) ) < 0) { -++ printf("can't open /dev/mem\nThis program should be run as root. Try prefixing command with: sudo\n"); -++ return NULL; -++ } -++ void *mem = mmap( -++ 0, -++ size, -++ PROT_READ|PROT_WRITE, -++ MAP_PRIVATE/*|MAP_FIXED*/, -++ mem_fd, -++ base); -++#ifdef DEBUG -++ printf("base=0x%x, mem=%p\n", base, mem); -++#endif -++ if (mem == MAP_FAILED) { -++ printf("mmap error %d\n", (int)mem); -++ return NULL; -++ } -++ close(mem_fd); -++ return (char *)mem + offset; -++} -++ -++void unmapmem(void *addr, unsigned size) -++{ -++ int s = munmap(addr, size); -++ if (s != 0) { -++ printf("munmap error %d\n", s); -++ exit (-1); -++ } -++} -++ -++/* -++ * use ioctl to send mbox property message -++ */ -++ -++static int mbox_property(int file_desc, void *buf) -++{ -++ int ret_val = ioctl(file_desc, IOCTL_MBOX_PROPERTY, buf); -++ -++ if (ret_val < 0) { -++ printf("ioctl_set_msg failed:%d\n", ret_val); -++ } -++ -++#ifdef DEBUG -++ unsigned *p = buf; int i; unsigned size = *(unsigned *)buf; -++ for (i=0; i -++#include -++#include -++#include -++#include -++ -++#include "config.h" -++ -++#include -++#include -++ -++#include "rpi_mailbox.h" -++#include "rpi_qpu.h" -++#include "rpi_shader.h" -++#include "rpi_hevc_transform.h" -++ -++#ifdef RPI_USE_VCSM -++#include "rpi_user_vcsm.h" -++#endif -++ -++// On Pi2 there is no way to access the VPU L2 cache -++// GPU_MEM_FLG should be 4 for uncached memory. -++// However, if using VCSM allocated buffers, need to use C at the moment because VCSM does not allocate uncached memory correctly -++// The QPU crashes if we mix L2 cached and L2 uncached accesses due to a HW bug. -++#define GPU_MEM_FLG 0xC -++#define GPU_MEM_MAP 0x0 -++ -++#define vcos_verify(x) ((x)>=0) -++ -++typedef unsigned char uint8_t; -++typedef signed char int8_t; -++typedef unsigned short uint16_t; -++typedef unsigned int uint32_t; -++typedef int int32_t; -++ -++/*static const unsigned code[] = -++{ -++ #include "rpi_shader.hex" -++};*/ -++ -++// Size in 32bit words -++#define QPU_CODE_SIZE 2048 -++#define VPU_CODE_SIZE 2048 -++ -++struct GPU -++{ -++ unsigned int qpu_code[QPU_CODE_SIZE]; -++ unsigned int vpu_code[VPU_CODE_SIZE]; -++ int open_count; // Number of allocated video buffers -++ unsigned int vc_handle; // Handle of this memory -++ int mb; // Mailbox handle -++ int vc; // Address in GPU memory -++ int mail[12]; // These are used to pass pairs of code/unifs to the QPUs -++}; -++ -++// Stop more than one thread trying to allocate memory or use the processing resources at once -++static pthread_mutex_t gpu_mutex = PTHREAD_MUTEX_INITIALIZER; -++static volatile struct GPU* gpu = NULL; -++ -++#ifdef RPI_TIME_TOTAL_QPU -++static unsigned int Microseconds(void) { -++ struct timespec ts; -++ unsigned int x; -++ static unsigned int base = 0; -++ clock_gettime(CLOCK_REALTIME, &ts); -++ x = ts.tv_sec*1000000 + ts.tv_nsec/1000; -++ if (base==0) base=x; -++ return x-base; -++} -++#endif -++ -++// Connect to QPU, returns 0 on success. -++static int gpu_init(volatile struct GPU **gpu) { -++ int mb = mbox_open(); -++ int vc; -++ int handle; -++ volatile struct GPU* ptr; -++ if (mb < 0) -++ return -1; -++ -++ if (qpu_enable(mb, 1)) return -2; -++ -++#ifdef RPI_USE_VCSM -++ vcsm_init(); -++#endif -++ -++ handle = mem_alloc(mb, sizeof(struct GPU), 4096, GPU_MEM_FLG); -++ if (!handle) -++ { -++ qpu_enable(mb, 0); -++ return -3; -++ } -++ vc = mem_lock(mb, handle); -++ ptr = mapmem_shared((vc+GPU_MEM_MAP)&~0xc0000000, sizeof(struct GPU)); -++ if (ptr == NULL) -++ { mem_free(mb, handle); -++ mem_unlock(mb, handle); -++ qpu_enable(mb, 0); -++ return -4; -++ } -++ -++ ptr->mb = mb; -++ ptr->vc_handle = handle; -++ ptr->vc = vc; -++ -++ *gpu = ptr; -++ -++ // Now copy over the QPU code into GPU memory -++ { -++ int num_bytes = qpu_get_fn(QPU_MC_END) - qpu_get_fn(QPU_MC_SETUP); -++ assert(num_bytes<=QPU_CODE_SIZE*sizeof(unsigned int)); -++ memcpy((void*)ptr->qpu_code, rpi_shader, num_bytes); -++ } -++ // And the VPU code -++ { -++ int num_bytes = sizeof(rpi_hevc_transform); -++ assert(num_bytes<=VPU_CODE_SIZE*sizeof(unsigned int)); -++ memcpy((void*)ptr->vpu_code, rpi_hevc_transform, num_bytes); -++ } -++ -++ return 0; -++} -++ -++// Make sure we have exclusive access to the mailbox, and enable qpu if necessary. -++static void gpu_lock(void) { -++ pthread_mutex_lock(&gpu_mutex); -++ if (gpu==NULL) { -++ gpu_init(&gpu); -++ } -++} -++ -++static void gpu_unlock(void) { -++ pthread_mutex_unlock(&gpu_mutex); -++} -++ -++// Allocate memory on GPU -++// Fills in structure

containing ARM pointer, videocore handle, videocore memory address, numbytes -++// Returns 0 on success. -++// This allocates memory that will not be cached in ARM's data cache. -++// Therefore safe to use without data cache flushing. -++int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) { -++ gpu_lock(); -++ p->vc_handle = mem_alloc(gpu->mb, numbytes, 4096, GPU_MEM_FLG); -++ p->vcsm_handle = 0; -++ if (!p->vc_handle) -++ { -++ qpu_enable(gpu->mb, 0); -++ return -3; -++ } -++ p->vc = mem_lock(gpu->mb, p->vc_handle); -++ p->arm = mapmem_shared((p->vc+GPU_MEM_MAP)&~0xc0000000,numbytes); -++ p->numbytes = numbytes; -++ if (p->arm == NULL) -++ { -++ mem_free(gpu->mb, p->vc_handle); -++ mem_unlock(gpu->mb, p->vc_handle); -++ gpu_unlock(); -++ qpu_enable(gpu->mb, 0); -++ return -4; -++ } -++ gpu->open_count++; -++ gpu_unlock(); -++ return 0; -++} -++ -++void gpu_cache_flush(GPU_MEM_PTR_T *p) -++{ -++ // This only works when using RPI_USE_VCSM -++ void *tmp = vcsm_lock(p->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++} -++ -++// This allocates data that will be -++// Cached in ARM L2 -++// Uncached in VPU L2 -++int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p) { -++ gpu_lock(); -++#ifdef RPI_USE_VCSM -++ { -++ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); // f....... locks up for VP9 - retest this? -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); // 3b...... works -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); //fb...... locks up -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST_AND_VC, (char *)"Video Frame" ); // 3b works (but corrupted due to caching) -++ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -++ p->arm = vcsm_lock(p->vcsm_handle); -++ p->vc = mem_lock(gpu->mb, p->vc_handle); -++ } -++#else -++ p->vc_handle = mem_alloc(gpu->mb, numbytes, 4096, GPU_MEM_FLG); -++ p->vcsm_handle = 0; -++ if (!p->handle) -++ { -++ qpu_enable(gpu->mb, 0); -++ return -3; -++ } -++ p->vc = mem_lock(gpu->mb, p->vc_handle); -++ printf("This mapmem_private does not seem to work\n"); -++ exit(-1); -++ p->arm = mapmem_private((p->vc+GPU_MEM_MAP)&~0xc0000000,numbytes); -++ p->numbytes = numbytes; -++ if (p->arm == NULL) -++ { -++ mem_free(gpu->mb, p->handle); -++ mem_unlock(gpu->mb, p->handle); -++ gpu_unlock(); -++ qpu_enable(gpu->mb, 0); -++ return -4; -++ } -++#endif -++ gpu->open_count++; -++ gpu_unlock(); -++ return 0; -++} -++ -++static void gpu_term(void) -++{ -++ int mb = gpu->mb; -++ unsigned handle = gpu->vc_handle; -++ if (gpu==NULL) -++ return; -++ unmapmem((void*)gpu, sizeof(struct GPU)); -++ mem_unlock(mb, handle); -++ mem_free(mb, handle); -++ qpu_enable(mb, 0); -++#ifdef RPI_USE_VCSM -++ vcsm_exit(); -++#endif -++ mbox_close(mb); -++ gpu = NULL; -++} -++ -++void gpu_free(GPU_MEM_PTR_T *p) { -++ int mb = gpu->mb; -++ unsigned handle = p->vc_handle; -++ gpu_lock(); -++#ifdef RPI_USE_VCSM -++ if (p->vcsm_handle) { -++ mem_unlock(mb,p->vc_handle); -++ vcsm_unlock_ptr(p->arm); -++ vcsm_free(p->vcsm_handle); -++ } else { -++ unmapmem((void*)p->arm, sizeof(struct GPU)); -++ mem_unlock(mb, handle); -++ mem_free(mb, handle); -++ } -++#else -++ unmapmem((void*)p->arm, sizeof(struct GPU)); -++ mem_unlock(mb, handle); -++ mem_free(mb, handle); -++#endif -++ -++ gpu->open_count--; -++ if (gpu->open_count==0) { -++ printf("Closing GPU\n"); -++ gpu_term(); -++ gpu = NULL; -++ } -++ gpu_unlock(); -++} -++ -++unsigned int vpu_get_fn(void) { -++ // Make sure that the gpu is initialized -++ if (gpu==NULL) { -++ printf("Preparing gpu\n"); -++ gpu_lock(); -++ gpu_unlock(); -++ } -++ return gpu->vc + offsetof(struct GPU,vpu_code); -++} -++ -++unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5) -++{ -++ unsigned r; -++ gpu_lock(); -++ r = execute_code(gpu->mb, code, r0, r1, r2, r3, r4, r5); -++ gpu_unlock(); -++ return r; -++} -++ -++// Run a program on a QPU with the given code and uniform stream (given in GPU addresses) -++// The first num QPUs will start at code, the next num2 QPUs will start at code2 -++void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12) -++{ -++ int i; -++#ifdef RPI_TIME_TOTAL_QPU -++ static int last_time=0; -++ static long long on_time=0; -++ static long long off_time=0; -++ int start_time; -++ int end_time; -++ static int count=0; -++#endif -++ -++ gpu_lock(); -++#ifdef RPI_TIME_TOTAL_QPU -++ start_time = Microseconds(); -++ if (last_time==0) -++ last_time = start_time; -++ off_time += start_time-last_time; -++#endif -++ for(i=0;imail[i*2 + 1] = code; -++ } -++ for(;imail[i*2 + 1] = code2; -++ } -++ gpu->mail[0 ] = unifs1; -++ gpu->mail[2 ] = unifs2; -++ gpu->mail[4 ] = unifs3; -++ gpu->mail[6 ] = unifs4; -++ gpu->mail[8 ] = unifs5; -++ gpu->mail[10] = unifs6; -++ gpu->mail[12] = unifs7; -++ gpu->mail[14] = unifs8; -++ gpu->mail[16] = unifs9; -++ gpu->mail[18] = unifs10; -++ gpu->mail[20] = unifs11; -++ gpu->mail[22] = unifs12; -++ execute_qpu( -++ gpu->mb, -++ 12 /* Number of QPUs */, -++ gpu->vc + offsetof(struct GPU, mail), -++ 1 /* no flush */, // Don't flush VPU L1 cache -++ 5000 /* timeout ms */); -++#ifdef RPI_TIME_TOTAL_QPU -++ end_time = Microseconds(); -++ last_time = end_time; -++ on_time += end_time - start_time; -++ count++; -++ if ((count&0x7f)==0) -++ printf("On=%dms, Off=%dms\n",(int)(on_time/1000),(int)(off_time/1000)); -++#endif -++ gpu_unlock(); -++} -++ -++unsigned int qpu_get_fn(int num) { -++ // Make sure that the gpu is initialized -++ unsigned int *fn; -++ if (gpu==NULL) { -++ printf("Preparing gpu\n"); -++ gpu_lock(); -++ gpu_unlock(); -++ } -++ switch(num) { -++ case QPU_MC_SETUP: -++ fn = mc_setup; -++ break; -++ case QPU_MC_FILTER: -++ fn = mc_filter; -++ break; -++ case QPU_MC_EXIT: -++ fn = mc_exit; -++ break; -++ case QPU_MC_INTERRUPT_EXIT: -++ fn = mc_interrupt_exit; -++ break; -++ case QPU_MC_FILTER_B: -++ fn = mc_filter_b; -++ break; -++ case QPU_MC_FILTER_HONLY: -++ fn = mc_filter_honly; -++ break; -++ case QPU_MC_SETUP_UV: -++ fn = mc_setup_uv; -++ break; -++ case QPU_MC_FILTER_UV: -++ fn = mc_filter_uv; -++ break; -++ case QPU_MC_FILTER_UV_B: -++ fn = mc_filter_uv_b; -++ break; -++ case QPU_MC_END: -++ fn = mc_end; -++ break; -++ default: -++ printf("Unknown function\n"); -++ exit(-1); -++ } -++ return gpu->vc + 4*(int)(fn-rpi_shader); -++ //return code[num] + gpu->vc; -++} -++ -++#if 0 -++ -++int32_t hcoeffs[] = {-4, 10, -21, 70, 90, -24, 11, -4}; -++//int32_t hcoeffs[] = {1, 1, 1, 1, 1, 1, 1, 1}; -++int32_t vcoeffs[] = {-2, 6, -13, 37, 115, -20, 9, -4}; -++//int32_t vcoeffs[] = {1, 1, 1, 1, 1, 1, 1, 1}; -++ -++#define ENCODE_COEFFS(c0, c1, c2, c3) (((c0-1) & 0xff) | ((c1-1) & 0xff) << 8 | ((c2-1) & 0xff) << 16 | ((c3-1) & 0xff) << 24); -++ -++static uint8_t av_clip_uint8(int32_t a) -++{ -++ if (a&(~255)) return (-a)>>31; -++ else return a; -++} -++ -++static int32_t filter8(const uint8_t *data, int pitch) -++{ -++ int32_t vsum = 0; -++ int x, y; -++ -++ for (y = 0; y < 8; y++) { -++ int32_t hsum = 0; -++ -++ for (x = 0; x < 8; x++) -++ hsum += hcoeffs[x]*data[x + y * pitch]; -++ -++ vsum += vcoeffs[y]*av_clip_uint8( (hsum + 64) >> 7); // Added brackets to stop compiler warning -++ } -++ -++ return av_clip_uint8( (vsum + 64) >> 7); -++} -++ -++// Note regression changes coefficients so is not thread safe -++//#define REGRESSION -++#ifdef REGRESSION -++#define CMAX 100 -++#else -++#define CMAX 2 -++#endif -++#define YMAX 16 -++ -++int rpi_test_shader(void) -++{ -++ int i, c; -++ -++ uint32_t *unifs; -++ -++ uint8_t *in_buffer; -++ uint8_t *out_buffer[2]; -++ -++ GPU_MEM_PTR_T unifs_ptr; -++ GPU_MEM_PTR_T in_buffer_ptr; -++ GPU_MEM_PTR_T out_buffer_ptr[2]; -++ -++ // Addresses in GPU memory of filter programs -++ uint32_t mc_setup = 0; -++ uint32_t mc_filter = 0; -++ uint32_t mc_exit = 0; -++ -++ int pitch = 0x500; -++ -++ if (gpu==NULL) { -++ gpu_lock(); -++ gpu_unlock(); -++ } -++ -++ printf("This needs to change to reflect new assembler\n"); -++ // Use table to compute locations of program start points -++ mc_setup = code[0] + gpu->vc; -++ mc_filter = code[1] + gpu->vc; -++ mc_exit = code[2] + gpu->vc; -++ -++ if (!vcos_verify(gpu_malloc_uncached(4*64,&unifs_ptr))) { -++ return -2; -++ } -++ unifs = (uint32_t*)unifs_ptr.arm; -++ -++ if (!vcos_verify(gpu_malloc_uncached(64*23,&in_buffer_ptr))) { -++ return -3; -++ } -++ in_buffer = (uint8_t*)in_buffer_ptr.arm; -++ -++ if (!vcos_verify(gpu_malloc_uncached(16*pitch,&out_buffer_ptr[0])) || !vcos_verify(gpu_malloc_uncached(16*pitch,&out_buffer_ptr[1]))) { -++ return -4; -++ } -++ out_buffer[0] = (uint8_t*)out_buffer_ptr[0].arm; -++ out_buffer[1] = (uint8_t*)out_buffer_ptr[1].arm; -++ -++ for (c = 0; c < CMAX; c++) { -++ int xo[] = {rand()&31, rand()&31}; -++ -++#ifdef REGRESSION -++ for (i = 0; i < 8; i++) { -++ hcoeffs[i] = (int8_t)rand(); -++ vcoeffs[i] = (int8_t)rand(); -++ if (hcoeffs[i]==-128) -++ hcoeffs[i]++; -++ if (vcoeffs[i]==-128) -++ vcoeffs[i]++; -++ } -++#endif -++ -++ for (i = 0; i < 64*23; i++) { -++ //printf("%d %d %p\n",i,gpu->mb,&in_buffer[i]); -++ in_buffer[i] = rand(); -++ } -++ -++ // Clear output array -++ { -++ int b; -++ for(b=0;b<2;b++) { -++ for(i=0;i<16*16;i++) { -++ out_buffer[b][i] = 3; -++ } -++ } -++ } -++ -++ unifs[0] = mc_filter; -++ unifs[1] = in_buffer_ptr.vc+xo[0]+16; -++ unifs[2] = 64; // src pitch -++ unifs[3] = pitch; // dst pitch -++ unifs[4] = 0; // Padding -++ unifs[5] = 0; -++ unifs[6] = 0; -++ unifs[7 ] = mc_filter; -++ unifs[8 ] = in_buffer_ptr.vc+xo[1]+16; -++ unifs[9 ] = ENCODE_COEFFS(hcoeffs[0], hcoeffs[1], hcoeffs[2], hcoeffs[3]); -++ unifs[10] = ENCODE_COEFFS(hcoeffs[4], hcoeffs[5], hcoeffs[6], hcoeffs[7]); -++ unifs[11] = ENCODE_COEFFS(vcoeffs[0], vcoeffs[1], vcoeffs[2], vcoeffs[3]); -++ unifs[12] = ENCODE_COEFFS(vcoeffs[4], vcoeffs[5], vcoeffs[6], vcoeffs[7]); -++ unifs[13] = out_buffer_ptr[0].vc; -++ unifs[14] = mc_exit; -++ unifs[15] = in_buffer_ptr.vc+xo[1]+16; // dummy -++ unifs[16] = ENCODE_COEFFS(hcoeffs[0], hcoeffs[1], hcoeffs[2], hcoeffs[3]); -++ unifs[17] = ENCODE_COEFFS(hcoeffs[4], hcoeffs[5], hcoeffs[6], hcoeffs[7]); -++ unifs[18] = ENCODE_COEFFS(vcoeffs[0], vcoeffs[1], vcoeffs[2], vcoeffs[3]); -++ unifs[19] = ENCODE_COEFFS(vcoeffs[4], vcoeffs[5], vcoeffs[6], vcoeffs[7]); -++ unifs[20] = out_buffer_ptr[1].vc; -++ -++ printf("Gpu->vc=%x Code=%x dst=%x\n",gpu->vc, mc_filter,out_buffer_ptr[1].vc); -++ -++ // flush_dcache(); TODO is this needed on ARM side? - tried to use the direct alias to avoid this problem -++ -++ //qpu_run_shader(mc_setup, unifs_ptr.vc); -++ //qpu_run_shader(gpu, gpu->vc, unifs_ptr.vc); -++ rpi_do_block(in_buffer_ptr.vc+xo[0]+16, 64, out_buffer_ptr[0].vc, pitch,out_buffer[0]); -++ rpi_do_block(in_buffer_ptr.vc+xo[1]+16, 64, out_buffer_ptr[1].vc, pitch,out_buffer[1]); -++ -++ if (1) -++ { -++ int x, y, b; -++ int bad = 0; -++ -++ for (b=0; b<2; ++b) -++ for (y=0; yvc; -++ mc_filter = code[1] + gpu->vc; -++ mc_exit = code[2] + gpu->vc; -++ -++ if (!vcos_verify(gpu_malloc_uncached(4*64,&unifs_ptr))) { -++ return; -++ } -++ //gpu_malloc_uncached(16*dst_pitch,&out_buffer_ptr); -++ //out_buffer = (uint8_t*)out_buffer_ptr.arm; -++ -++ /*for (y=0; y<16; ++y) { -++ for (x=0; x<16; ++x) { -++ out_buffer[x+y*dst_pitch] = 7; -++ } -++ }*/ -++ -++ unifs = (uint32_t*)unifs_ptr.arm; -++ -++ unifs[0] = mc_filter; -++ unifs[1] = (int)in_buffer_vc; -++ unifs[2] = src_pitch; // src pitch -++ unifs[3] = dst_pitch; // dst pitch -++ unifs[4] = 0; // Padding -++ unifs[5] = 0; -++ unifs[6] = 0; -++ unifs[7 ] = mc_exit; -++ unifs[8 ] = (int)in_buffer_vc; -++ unifs[9 ] = ENCODE_COEFFS(hcoeffs[0], hcoeffs[1], hcoeffs[2], hcoeffs[3]); -++ unifs[10] = ENCODE_COEFFS(hcoeffs[4], hcoeffs[5], hcoeffs[6], hcoeffs[7]); -++ unifs[11] = ENCODE_COEFFS(vcoeffs[0], vcoeffs[1], vcoeffs[2], vcoeffs[3]); -++ unifs[12] = ENCODE_COEFFS(vcoeffs[4], vcoeffs[5], vcoeffs[6], vcoeffs[7]); -++ unifs[13] = (int)dst_vc; -++ //unifs[13] = (int)out_buffer_ptr.vc; -++ -++ //printf("Gpu->vc=%x Code=%x dst=%x\n",gpu->vc, mc_filter,out_buffer_ptr[1].vc); -++ -++ qpu_run_shader(mc_setup, unifs_ptr.vc); -++ -++ /*for (y=0; y<16; ++y) { -++ for (x=0; x<16; ++x) { -++ dst[x+y*dst_pitch] = out_buffer[x+y*dst_pitch]; -++ } -++ }*/ -++ -++ gpu_free(&unifs_ptr); -++ //gpu_free(&out_buffer_ptr); -++} -++ -++ -++#endif -++ -++#endif // RPI -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+new file mode 100644 -+index 0000000..4e3c35c -+--- /dev/null -++++ b/libavcodec/rpi_qpu.h -+@@ -0,0 +1,45 @@ -++#ifndef RPI_QPU_H -++#define RPI_QPU_H -++ -++typedef struct gpu_mem_ptr_s { -++ unsigned char *arm; // Pointer to memory mapped on ARM side -++ int vc_handle; // Videocore handle of relocatable memory -++ int vcsm_handle; // Handle for use by VCSM -++ int vc; // Address for use in GPU code -++ int numbytes; // Size of memory block -++} GPU_MEM_PTR_T; -++ -++// General GPU functions -++extern int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p); -++extern int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p); -++extern void gpu_free(GPU_MEM_PTR_T *p); -++extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -++ -++// QPU specific functions -++extern void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12); -++ -++enum { -++ QPU_MC_SETUP, -++ QPU_MC_FILTER, -++ QPU_MC_EXIT, -++ QPU_MC_INTERRUPT_EXIT, -++ QPU_MC_FILTER_B, -++ QPU_MC_FILTER_HONLY, -++ QPU_MC_SETUP_UV, -++ QPU_MC_FILTER_UV, -++ QPU_MC_FILTER_UV_B, -++ QPU_MC_END -++ }; -++extern unsigned int qpu_get_fn(int num); -++ -++// VPU specific functions -++extern unsigned int vpu_get_fn(void); -++extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -++ -++// Simple test of shader code -++extern int rpi_test_shader(void); -++ -++extern void rpi_do_block(const unsigned char *in_buffer_vc, int src_pitch, unsigned char *dst_vc, int dst_pitch, unsigned char *dst); -++extern void rpi_do_block_arm(const unsigned char *in_buffer, int src_pitch, unsigned char *dst, int dst_pitch); -++ -++#endif -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+new file mode 100644 -+index 0000000..41cc2e1 -+--- /dev/null -++++ b/libavcodec/rpi_shader.c -+@@ -0,0 +1,818 @@ -++#include "rpi_shader.h" -++ -++#ifdef _MSC_VER -++ #include -++ /* cast through uintptr_t to avoid warnings */ -++ #define POINTER_TO_UINT(X) ((unsigned int)(uintptr_t)(X)) -++#else -++ #define POINTER_TO_UINT(X) ((unsigned int)(X)) -++#endif -++ -++#ifdef __cplusplus -++extern "C" { /* the types are probably wrong... */ -++#endif -++#ifdef __cplusplus -++} -++#endif -++ -++#ifdef _MSC_VER -++__declspec(align(8)) -++#elif defined(__GNUC__) -++__attribute__((aligned(8))) -++#endif -++unsigned int rpi_shader[] = { -++// ::mc_setup -++/* [0x00000000] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000008] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -++/* [0x00000010] */ 0x15827d80, 0x10020767, // mov ra_y, unif -++/* [0x00000018] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -++/* [0x00000020] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00000028] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00000030] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00000038] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000040] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000048] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000050] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000058] */ 0x00000040, 0xe0020567, // mov ra21, 64 -++/* [0x00000060] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000068] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -++/* [0x00000070] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000078] */ 0x00000040, 0xe0021567, // mov rb21, 64 -++/* [0x00000080] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000088] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000090] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000098] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000a0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000a8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000b0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000d0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000d8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000000e0] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000000e8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x000000f0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x000000f8] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000100] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000108] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000110] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000118] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000120] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000128] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000130] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000138] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000140] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000148] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000150] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000158] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000160] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000168] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000170] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000178] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x00000180] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000188] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x00000190] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x00000198] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000001a0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x000001a8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001b0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x000001b8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x000001c0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000001c8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001d0] */ 0x4c9d00cf, 0x10024821, // add r0, r0, r3; mul24 r1, r1, rb_pitch -++/* [0x000001d8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x000001e0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001e8] */ 0x949dc5c0, 0xd0025890, // and r2, r2, ~3; mov ra_x_base, r0 -++/* [0x000001f0] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x000001f8] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x00000200] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000208] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000210] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000218] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000220] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000228] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000230] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000238] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000240] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++// ::mc_filter_uv -++/* [0x00000248] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000250] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000258] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000260] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000268] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000270] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000278] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000280] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000288] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000290] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000298] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002a0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002b0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002d0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000002d8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002e8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002f0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000002f8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000300] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000330] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000340] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000350] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000360] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000368] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000370] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000378] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000380] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000388] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000390] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000398] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003a0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :uvloop -++/* [0x000003a8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003b0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003b8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003c0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003c8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003d0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003d8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003e0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000400] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000408] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++/* [0x00000410] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000420] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000430] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000440] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000448] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000450] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000458] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000460] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000468] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000470] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000478] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000480] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000488] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000490] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000498] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000004a0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000004a8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000004b0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000004b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000004c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000004c8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x000004d8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x000004e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x000004e8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x000004f0] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x000004f8] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000500] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000508] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000510] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000518] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000520] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000528] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000530] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000538] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000540] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000560] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000568] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000570] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000578] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000580] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000588] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000590] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000598] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter -++/* [0x000005a0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005a8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005b0] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x000005b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005c0] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x000005c8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005d0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x000005d8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005e0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x000005e8] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x000005f0] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x000005f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000600] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000608] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000610] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000618] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000620] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000628] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000630] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000638] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000640] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000648] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000650] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000658] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000660] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000668] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000670] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000678] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000680] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000688] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000690] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000698] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000006b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000006d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000006f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000700] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000708] */ 0x000001d0, 0xf07809e7, // brr.anynn -, r:fast_path -++/* [0x00000710] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000718] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000720] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000728] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :loop -++/* [0x00000730] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000738] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000740] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000748] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000750] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000758] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000760] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000768] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000770] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000778] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000780] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000788] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000790] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000798] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000007a0] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000007a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000007b0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000007c0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000007d0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000007e0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000007f0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000007f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000800] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000808] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000810] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000818] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000820] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000828] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000830] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000838] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000840] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000848] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:loop -++/* [0x00000850] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000858] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000860] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000868] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000870] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000878] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000880] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000888] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000890] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000898] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x000008a0] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008a8] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000008b0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000008b8] */ 0xfffffe58, 0xf06809e7, // brr.anyn -, r:loop -++/* [0x000008c0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000008c8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008d0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000008d8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000008e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000008f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// :fast_path -++/* [0x000008f8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :fast_loop -++/* [0x00000900] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000908] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000910] */ 0x95727d9b, 0x1004475f, // mov.ifz ra_y, ra_y_next ; mov rb31, r3 -++/* [0x00000918] */ 0x95690dbf, 0x10044623, // mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -++/* [0x00000920] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000928] */ 0x929de5e4, 0x100248a1, // min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 -++/* [0x00000930] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000938] */ 0xec414c87, 0x10024e20, // add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00000940] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000948] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000950] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000958] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000960] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000968] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000970] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000978] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000980] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000988] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -++/* [0x00000990] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000998] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000009a0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000009a8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000009b0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000009b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000009c8] */ 0xffffff18, 0xf06809e7, // brr.anyn -, r:fast_loop -++/* [0x000009d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x000009d8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x000009e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x000009e8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x000009f0] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x000009f8] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000a00] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000a08] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000a10] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000a18] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000a20] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000a28] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000a30] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000a38] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:fast_loop -++/* [0x00000a40] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00000a48] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a50] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a60] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_b -++/* [0x00000a78] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000a80] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000a88] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x00000a90] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000a98] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000aa0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000aa8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x00000ab0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000ab8] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000ac0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000ac8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000ad0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000ad8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000ae0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000ae8] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000af0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000af8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000b00] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000b08] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b10] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000b18] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000b20] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000b28] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000b30] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000b38] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000b40] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000b48] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000b50] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000b58] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000b60] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000b68] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000b70] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00000b78] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b80] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000b88] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000b90] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000b98] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000ba0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ba8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bb0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bb8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000bc0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bc8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bd0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bd8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000be0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000be8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bf0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bf8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000c00] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000c08] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000c10] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :bloop -++/* [0x00000c18] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000c20] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000c28] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000c30] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000c38] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000c40] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000c48] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000c50] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000c58] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000c60] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000c68] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000c70] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000c78] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000c80] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000c88] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000c90] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000c98] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000ca0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000ca8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000cb0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000cb8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000cc0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000cc8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000cd0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000cd8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000ce0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000ce8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000cf0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000cf8] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000d00] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000d08] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000d10] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000d18] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000d20] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000d28] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000d30] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:bloop -++/* [0x00000d38] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000d40] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000d48] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000d50] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000d58] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000d60] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000d68] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000d70] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000d78] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000d80] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000d88] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000d90] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000d98] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000da0] */ 0x8fc8f3f6, 0xd0020867, // asr r1, r1, 15 ; mov -, vr_wait -++/* [0x00000da8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000db0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x00000db8] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:bloop -++/* [0x00000dc0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000dc8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00000dd0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x00000dd8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000de0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000de8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000df0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_honly -++/* [0x00000df8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000e00] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000e08] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x00000e10] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000e18] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000e20] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000e28] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x00000e30] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000e38] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000e40] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000e48] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000e50] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000e58] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000e60] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000e68] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000e70] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000e78] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e80] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000e88] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e90] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000e98] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000ea0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000ea8] */ 0x0c9de1c0, 0xd0021467, // add rb17, r0, -2 -++/* [0x00000eb0] */ 0x919c71c0, 0xd0024812, // shl r0, r0, 7 ; mov rb18,r0 -++/* [0x00000eb8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000ec0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000ec8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000ed0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000ed8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000ef8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f00] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f08] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f10] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000f18] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000f20] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000f28] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000f30] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :loop_honly -++/* [0x00000f38] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000f40] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000f48] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000f50] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000f58] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000f60] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000f68] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000f70] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000f78] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000f80] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000f88] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000f90] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000f98] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000fa0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000fa8] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000fb0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000fb8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000fc0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000fc8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000fd0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000fd8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000fe0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000fe8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000ff0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000ff8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001000] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001008] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -++/* [0x00001010] */ 0x8d5927f6, 0x100269e1, // sub.setf -, r3, rb18 ; mov r1, ra22 -++/* [0x00001018] */ 0x559f2fc1, 0x100049e0, // mov -, vw_wait ; mul24 r0, r0, r1 -++/* [0x00001020] */ 0xfffffef8, 0xf06809e7, // brr.anyn -, r:loop_honly -++/* [0x00001028] */ 0x0f9cf1c0, 0xd0020827, // asr r0, r0, 15 -++/* [0x00001030] */ 0x129d61c0, 0x10020827, // min r0, r0, rb22 -++/* [0x00001038] */ 0x139c01c0, 0xd0020c27, // max vpm, r0, 0 -++/* [0x00001040] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001048] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001050] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001058] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_exit -++/* [0x00001060] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001068] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00001070] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001078] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001080] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001088] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001090] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001098] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000010a0] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_exit1 -++/* [0x000010a8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000010b0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010b8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010c0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010c8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000010d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000010e0] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit -++/* [0x000010e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000010f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001100] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001108] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001110] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001118] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001120] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001128] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001130] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001138] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001140] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001148] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001150] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001158] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001160] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001168] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001170] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001178] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit4 -++/* [0x00001180] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001188] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001190] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001198] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011c0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000011c8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000011d0] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit8 -++/* [0x000011d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000011e0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011e8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001200] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001208] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001210] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001218] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001220] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001228] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001230] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001238] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001240] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001248] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_setup_uv -++/* [0x00001250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001258] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -++/* [0x00001260] */ 0x15827d80, 0x10020767, // mov ra_y, unif -++/* [0x00001268] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -++/* [0x00001270] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00001278] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -++/* [0x00001280] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00001288] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00001290] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00001298] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000012a0] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x000012a8] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x000012b0] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x000012b8] */ 0x00000040, 0xe0020567, // mov ra21, 64 -++/* [0x000012c0] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x000012c8] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -++/* [0x000012d0] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x000012d8] */ 0x00000040, 0xe0021567, // mov rb21, 64 -++/* [0x000012e0] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x000012e8] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x000012f0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x000012f8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00001300] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00001308] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00001310] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00001318] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00001320] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00001328] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00001330] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00001338] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00001340] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00001348] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00001350] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00001358] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00001360] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00001368] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001370] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00001378] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00001380] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00001388] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00001390] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00001398] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000013a0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x000013a8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x000013b0] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x000013b8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x000013c0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000013c8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x000013d0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x000013d8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x000013e0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000013e8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x000013f0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000013f8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00001400] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00001408] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00001410] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -++/* [0x00001418] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00001420] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x00001428] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x00001430] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x00001438] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001440] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001448] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001450] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00001458] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00001460] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00001468] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001470] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00001478] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00001480] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++// ::mc_filter_uv_b -++/* [0x00001488] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001490] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00001498] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000014a0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000014a8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000014b0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000014b8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000014c0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000014c8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000014d0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000014d8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000014e0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000014e8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000014f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000014f8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00001500] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00001508] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00001510] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00001518] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00001520] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00001528] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00001530] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00001538] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00001540] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001548] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001550] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00001558] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00001560] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00001568] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001570] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001578] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001580] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001588] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00001590] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001598] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015a0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015a8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000015b0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015b8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015c0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015c8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000015d0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015d8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015e0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015e8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x000015f0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000015f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001600] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :uvloop_b -++/* [0x00001608] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001610] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00001618] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00001620] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001628] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00001630] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001638] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001640] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00001648] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00001650] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00001658] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001660] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00001668] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++/* [0x00001670] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00001678] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00001680] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00001688] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001690] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001698] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000016a0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000016a8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000016b0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000016b8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000016c0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000016c8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000016d0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000016d8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x000016e0] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x000016e8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000016f0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x000016f8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001700] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001708] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001710] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001718] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001720] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00001728] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00001730] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00001738] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00001740] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00001748] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00001750] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00001758] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00001760] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00001768] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00001770] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00001778] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00001780] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00001788] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00001790] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00001798] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000017a0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000017a8] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x000017b0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000017b8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000017c0] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x000017c8] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x000017d0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000017d8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000017e0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000017e8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000017f0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000017f8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001800] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00001808] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001810] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_end -++}; -++#ifdef __HIGHC__ -++#pragma Align_to(8, rpi_shader) -++#endif -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+new file mode 100644 -+index 0000000..db971f4 -+--- /dev/null -++++ b/libavcodec/rpi_shader.h -+@@ -0,0 +1,20 @@ -++#ifndef rpi_shader_H -++#define rpi_shader_H -++ -++extern unsigned int rpi_shader[]; -++ -++#define mc_setup (rpi_shader + 0) -++#define mc_filter_uv (rpi_shader + 146) -++#define mc_filter (rpi_shader + 360) -++#define mc_filter_b (rpi_shader + 670) -++#define mc_filter_honly (rpi_shader + 894) -++#define mc_exit (rpi_shader + 1048) -++#define mc_exit1 (rpi_shader + 1066) -++#define mc_interrupt_exit (rpi_shader + 1082) -++#define mc_interrupt_exit4 (rpi_shader + 1120) -++#define mc_interrupt_exit8 (rpi_shader + 1142) -++#define mc_setup_uv (rpi_shader + 1172) -++#define mc_filter_uv_b (rpi_shader + 1314) -++#define mc_end (rpi_shader + 1542) -++ -++#endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+new file mode 100644 -+index 0000000..6851e83 -+--- /dev/null -++++ b/libavcodec/rpi_shader.qasm -+@@ -0,0 +1,1413 @@ -++# register allocation -++# -++# ra0...ra7 eight horizontal filter coefficients -++# -++# rb1...rb7 seven shifted copies of the current unfiltered row -++# -++# ra8...ra15 eight filtered rows of context (rb15 == most recent) -++# -++# (ra15 isn't clamped to zero - this happens during the -++# copy to ra14, and during its use in the vertical filter) -++# -++# rb8...rb15 eight vertical filter coefficients -++# -++# ra16 clipped(row start address+elem_num)&~3 -++# ra17 per-channel shifts -++# ra19 next ra17 -++# -++# rb16 pitch -++# rb17 height + 5 -++# rb18 height + 7 -++# rb19 next ra16 -++# -++# ra20 1 -++# ra21 64 -++# ra22 256 -++# ra23 8 -++# -++# rb20 0xffffff00 -++# rb21 64 -++# rb22 255 -++# rb23 24 -++# -++# rb24 vdw_setup_1(dst_pitch) -++# rb25 frame width-1 -++# rb26 height<<23 + width<<16 + vdw_setup_0 -++# rb27 vdw_setup_0 (depends on QPU number) -++# rb28 vpm_setup (depends on QPU number) -++# rb29 vdw_setup_1(dst_pitch-width) -++# rb30 frame height-1 -++# rb31 used as temp to count loop iterations -++# -++# ra24...ra30 15, 14, 13, 12, 11, 10, 9 -++# ra24 clipped(row start address+8+elem_num)&~3 -++# ra25 per-channel shifts 2 -++# ra26 next ra24 -++# ra27 next ra25 -++# ra28 next y -++# ra29 y for next texture access -++# -++# ra31 next kernel address -++ -++.set rb_frame_width_minus_1, rb25 -++.set rb_frame_height_minus_1, rb30 -++.set rb_pitch, rb16 -++.set ra_x_base, ra16 -++.set rb_x_base_next, rb19 -++.set ra_x2_base, ra24 -++.set ra_x2_base_next, ra26 -++.set ra_xshift, ra17 -++ -++.set ra_x2shift, ra25 -++.set ra_u2v_ref_offset, ra25 -++ -++.set ra_xshift_next, ra19 -++ -++.set ra_x2shift_next, ra27 -++.set ra_u2v_dst_offset, ra27 -++ -++.set ra_y_next, ra28 -++.set ra_y, ra29 -++ -++.set rb_const_64, rb21 -++ -++# mc_setup(next_kernel, x, y, ref_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1) -++::mc_setup -++ -++# Read starting kernel -++mov ra31, unif -++ -++# Load first request location -++add ra_x_base, unif, elem_num # Store x -++mov ra_y, unif # Store y -++mov ra_x2_base, unif # Store frame base -++ -++# Read image dimensions -++sub rb25,unif,1 -++sub rb30,unif,1 -++ -++# get source pitch -++mov rb16, unif -++ -++# get destination pitch -++mov r0, unif -++mov r1, vdw_setup_1(0) -++add rb24, r1, r0 -++ -++# load constants -++ -++mov ra20, 1 -++mov ra21, 64 -++mov ra22, 256 -++mov ra23, 8 -++ -++mov rb20, 0xffffff00 -++mov rb21, 64 -++mov rb22, 255 -++mov rb23, 24 -++ -++# touch vertical context to keep simulator happy -++ -++mov ra8, 0 -++mov ra9, 0 -++mov ra10, 0 -++mov ra11, 0 -++mov ra12, 0 -++mov ra13, 0 -++mov ra14, 0 -++mov ra15, 0 -++ -++# Compute part of VPM to use for DMA output -++mov r2, qpu_num -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++shl r0, r0, 5 -++add rb27, r0, r1 -++ -++# Compute part of VPM to save data into -++mov r2, qpu_num -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vpm_setup(0, 4, h8p(0, 0)) -++add rb28, r0, r1 -++ -++# Compute base address for first and second access -++#add r0, unif, elem_num # x -++mov r0, ra_x_base # Load x -++add r2, r0, 8 # x+8 -++max r0, r0, 0; mov r1, ra_y # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -++shl ra_xshift_next, r0, 3 -++max r2, r2, 0 -++add ra_y, r1, 1 -++min r2, r2, rb_frame_width_minus_1 -++shl ra_x2shift_next, r2, 3 -++max r1, r1, 0 # y -++min r1, r1, rb_frame_height_minus_1 -++add r0, r0, r3; mul24 r1, r1, rb_pitch -++add r2, r2, r3 -++and r0, r0, ~3 -++and r2, r2, ~3; mov ra_x_base, r0 -++# submit texture requests for first line -++add t0s, r0, r1 ; mov ra_x2_base, r2 -++add t0s, r2, r1 -++ -++# Dump padding words -++mov r0, unif -++mov r0, unif -++ -++# submit texture requests for second line -++max r1, ra_y, 0 -++min r1, r1, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 -++bra -, ra31 -++nop ; mul24 r1, r1, rb_pitch -++add t0s, r1, ra_x_base -++add t0s, r1, ra_x2_base -++ -++################################################################################ -++ -++# mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter_uv -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -++shl ra_xshift_next, r0, 3 -++sub r2, unif, r3 # compute offset from frame base u to frame base v -++add r0, r0, r3 -++and rb_x_base_next, r0, ~3 -++mov ra_y_next, r1 -++add ra_x2_base_next, rb_x_base_next, r2 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++asr rb12, r0, rb23 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:uvloop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:uvloop -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++brr.anyn -, r:uvloop -++asr r1, r1, 15 -++min r1, r1, rb22 -++max vpm, r1, 0 -++ -++# DMA out for U -++ -++mov vw_setup, rb26 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++# DMA out for V -++# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -++# Could potentially push this write into the start of the next pipeline stage. -++mov r0, 16 -++mov -, vw_wait -++ -++bra -, ra31 -++add vw_setup, rb26, r0 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++################################################################################ -++ -++ -++# mc_filter(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov ra_x2shift, ra_x2shift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++add r2, r0, 8 # x+8 -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -++shl ra_xshift_next, r0, 3 -++max r2, r2, 0 -++min r2, r2, rb_frame_width_minus_1 -++shl ra_x2shift_next, r2, 3 -++add r0, r0, r3 -++add r2, r2, r3 -++and rb_x_base_next, r0, ~3 -++and ra_x2_base_next, r2, ~3 -++mov ra_y_next, r1 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++brr.anynn -, r:fast_path -++asr rb12, r0, rb23 # delay slot 1 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 # delay slot 2 -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] # delay slot 3 -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++## nop ; ldtmu0 # loop counter increment -++## shr r0, r4, ra17 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 ; mul24 r3, r0, ra0 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++## sub r2, r2, r3 ; ldtmu0 -++## -++## mov r0, ra22 -++## shr r0, r4, ra17 ; mul24 r2, r2, r0 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # apply horizontal filter -++## -++## asr r2, r2, 15 ; mul24 r3, r0, ra0 -++## min r2, r2, rb22 -++## max ra13, r2, 0 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++## sub r0, r2, r3 -++## -++## # apply horizontal filter -++## -++## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -++## asr r0, r0, 15 -++## min r0, r0, rb22 -++## max ra14, r0, 0 -++## -++## -++## -++## -++## nop ; ldtmu0 # loop counter increment -++## shr r0, r4, ra17 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 ; mul24 r3, r0, ra0 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++## sub r0, r2, r3 -++## -++## # apply horizontal filter -++## -++## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -++## asr r0, r0, 15 -++## min r0, r0, rb22 -++## max ra15, r0, 0 -++ -++ -++ -++ -++mov r3, 0 -++ -++:loop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:loop -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++brr.anyn -, r:loop -++asr r1, r1, 15 -++min r1, r1, rb22 -++max vpm, r1, 0 -++ -++# DMA out -++ -++bra -, ra31 -++mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -++mov vw_setup, rb29 -++mov vw_addr, unif # start the VDW -++ -++#################################################### -++ -++:fast_path -++## nop ; ldtmu0 # loop counter increment -++## shr r0, r4, ra17 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 ; mul24 r3, r0, ra0 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## sub r2, r2, r3 ; ldtmu0 -++## -++## mov r0, ra22 -++## shr r0, r4, ra17 ; mul24 r2, r2, r0 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # apply horizontal filter -++## -++## asr r2, r2, 15 ; mul24 r3, r0, ra0 -++## min r2, r2, rb22 -++## max ra13, r2, 0 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## sub r0, r2, r3 -++## -++## # apply horizontal filter -++## -++## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -++## asr r0, r0, 15 -++## min r0, r0, rb22 -++## max ra14, r0, 0 -++## -++## -++## -++## -++## nop ; ldtmu0 # loop counter increment -++## shr r0, r4, ra17 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 ; mul24 r3, r0, ra0 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## sub r0, r2, r3 -++## -++## # apply horizontal filter -++## -++## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -++## asr r0, r0, 15 -++## min r0, r0, rb22 -++## max ra15, r0, 0 -++ -++ -++mov r3, 0 # This signifies the amount of unrolling -++ -++:fast_loop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++# Due to pipelining we can only skip second pipeline instructions related to the fetched pixels -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_y, ra_y_next ; mov rb31, r3 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -++ -++max r2, ra_y, 0 -++min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 # discard texture read -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++sub r0, r2, r3 ; mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++ -++brr.anyn -, r:fast_loop -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++brr.anyn -, r:fast_loop -++asr r1, r1, 15 -++min r1, r1, rb22 -++max vpm, r1, 0 -++ -++# DMA out -++ -++bra -, ra31 -++mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -++mov vw_setup, rb29 -++mov vw_addr, unif # start the VDW -++ -++################################################################################ -++ -++# mc_filter_b(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter_b -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov ra_x2shift, ra_x2shift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++add r2, r0, 8 # x+8 -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -++shl ra_xshift_next, r0, 3 -++max r2, r2, 0 -++min r2, r2, rb_frame_width_minus_1 -++shl ra_x2shift_next, r2, 3 -++add r0, r0, r3 -++add r2, r2, r3 -++and rb_x_base_next, r0, ~3 -++and ra_x2_base_next, r2, ~3 -++mov ra_y_next, r1 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++# r0 is currently height<<7 -++# For vr_setup we want height<<20 (so 20-7=13 additional bits) -++shl r3, r0, 13 -++shl r3, r3, 8 # Mask off top 8 bits -++shr r3, r3, 8 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++# In a B frame, so also set up VPM read -++add vr_setup, r3, rb28 -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++asr rb12, r0, rb23 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++mov r3, 0 -++ -++:bloop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:bloop -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 15 ; mov -, vr_wait -++min r1, r1, rb22 -++add r0, vpm, 1 # Blend in previous VPM contents at this location -++brr.anyn -, r:bloop -++max r1, r1, 0 -++add r1, r1, r0 -++shr vpm, r1, 1 -++ -++# DMA out -++ -++bra -, ra31 -++mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -++mov vw_setup, rb29 -++mov vw_addr, unif # start the VDW -++ -++################################################################################ -++ -++# mc_filter_honly(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -++# This filter only does horizontal filtering. -++# It is assumed that the region to fetch does not include extra rows above. -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter_honly -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov ra_x2shift, ra_x2shift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++add r2, r0, 8 # x+8 -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -++shl ra_xshift_next, r0, 3 -++max r2, r2, 0 -++min r2, r2, rb_frame_width_minus_1 -++shl ra_x2shift_next, r2, 3 -++add r0, r0, r3 -++add r2, r2, r3 -++and rb_x_base_next, r0, ~3 -++and ra_x2_base_next, r2, ~3 -++mov ra_y_next, r1 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, -2 # Pipelining means we move data across 2 iterations early -++shl r0, r0, 7 ; mov rb18,r0 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++mov r0, unif -++ -++# r2 is elem_num -++# r3 is loop counter -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] # delay slot 3 -++mov r3, 0 -++ -++:loop_honly -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 ; mov r3, rb31 -++ -++sub.setf -, r3, rb18 ; mov r1, ra22 -++ -++mov -, vw_wait ; mul24 r0, r0, r1 -++brr.anyn -, r:loop_honly -++asr r0, r0, 15 # delay 1 -++min r0, r0, rb22 # delay 2 -++max vpm, r0, 0 # delay 3 -++ -++# DMA out -++bra -, ra31 -++mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -++mov vw_setup, rb29 -++mov vw_addr, unif # start the VDW -++ -++ -++################################################################################ -++ -++# mc_exit() -++ -++::mc_exit -++mov -, vw_wait # wait on the VDW -++ -++mov -,srel(0) -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++nop ; nop ; thrend -++nop ; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++::mc_exit1 -++mov -, vw_wait # wait on the VDW -++ -++#mov -,srel(1) -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++# mc_interrupt_exit() -++::mc_interrupt_exit -++mov -, vw_wait # wait on the VDW -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++mov -,sacq(0) # 1 -++mov -,sacq(0) # 2 -++mov -,sacq(0) # 3 -++mov -,sacq(0) # 4 -++mov -,sacq(0) # 5 -++mov -,sacq(0) # 6 -++mov -,sacq(0) # 7 -++mov -,sacq(0) # 8 -++mov -,sacq(0) # 9 -++mov -,sacq(0) # 10 -++mov -,sacq(0) # 11 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++# mc_interrupt_exit4() -++::mc_interrupt_exit4 -++mov -, vw_wait # wait on the VDW -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++mov -,sacq(0) # 1 -++mov -,sacq(0) # 2 -++mov -,sacq(0) # 3 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++# mc_interrupt_exit8() -++::mc_interrupt_exit8 -++mov -, vw_wait # wait on the VDW -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++mov -,sacq(0) # 1 -++mov -,sacq(0) # 2 -++mov -,sacq(0) # 3 -++mov -,sacq(0) # 4 -++mov -,sacq(0) # 5 -++mov -,sacq(0) # 6 -++mov -,sacq(0) # 7 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++################################################################################ -++# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -++::mc_setup_uv -++ -++# Read starting kernel -++mov ra31, unif -++ -++# Load first request location -++add ra_x_base, unif, elem_num # Store x -++mov ra_y, unif # Store y -++mov ra_x2_base, unif # Store frame u base -++nop -++sub ra_u2v_ref_offset, unif, ra_x2_base # Store offset to add to move from u to v in reference frame -++ -++# Read image dimensions -++sub rb25,unif,1 -++sub rb30,unif,1 -++ -++# get source pitch -++mov rb16, unif -++ -++# get destination pitch -++mov r0, unif -++mov r1, vdw_setup_1(0) -++add rb24, r1, r0 -++ -++# load constants -++ -++mov ra20, 1 -++mov ra21, 64 -++mov ra22, 256 -++mov ra23, 8 -++ -++mov rb20, 0xffffff00 -++mov rb21, 64 -++mov rb22, 255 -++mov rb23, 24 -++ -++# touch vertical context to keep simulator happy -++ -++mov ra8, 0 -++mov ra9, 0 -++mov ra10, 0 -++mov ra11, 0 -++mov ra12, 0 -++mov ra13, 0 -++mov ra14, 0 -++mov ra15, 0 -++ -++# Compute part of VPM to use for DMA output -++mov r2, qpu_num -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++shl r0, r0, 5 -++add rb27, r0, r1 -++ -++# Compute part of VPM to save data into -++mov r2, qpu_num -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vpm_setup(0, 4, h8p(0, 0)) -++add rb28, r0, r1 -++ -++# Compute base address for first and second access -++mov r0, ra_x_base # Load x -++max r0, r0, 0; mov r1, ra_y # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -++shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++add ra_y, r1, 1 -++add r0, r0, r3 -++and r0, r0, ~3 -++max r1, r1, 0 ; mov ra_x_base, r0 # y -++min r1, r1, rb_frame_height_minus_1 -++# submit texture requests for first line -++add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++add t0s, r0, r1 ; mov ra_x2_base, r2 -++add t0s, r2, r1 -++ -++# Dump padding words -++mov r0, unif -++mov r0, unif -++mov r0, unif -++ -++# submit texture requests for second line -++max r1, ra_y, 0 -++min r1, r1, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 -++bra -, ra31 -++nop ; mul24 r1, r1, rb_pitch -++add t0s, r1, ra_x_base -++add t0s, r1, ra_x2_base -++ -++ -++ -++################################################################################ -++ -++::mc_filter_uv_b -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -++shl ra_xshift_next, r0, 3 -++sub r2, unif, r3 # compute offset from frame base u to frame base v -++add r0, r0, r3 -++and rb_x_base_next, r0, ~3 -++mov ra_y_next, r1 -++add ra_x2_base_next, rb_x_base_next, r2 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++ -++# r0 is currently height<<7 -++# For vr_setup we want height<<20 (so 20-7=13 additional bits) -++shl r3, r0, 13 -++shl r3, r3, 8 # Mask off top 8 bits -++shr r3, r3, 8 -++ -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++# In a B frame, so also set up VPM read -++add vr_setup, r3, rb28 -++ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++asr rb12, r0, rb23 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:uvloop_b -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:uvloop_b -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 15 -++min r1, r1, rb22 -++add r0, vpm, 1 # Blend in previous VPM contents at this location -++brr.anyn -, r:uvloop_b -++max r1, r1, 0 -++add r1, r1, r0 -++shr vpm, r1, 1 -++ -++ -++# DMA out for U -++ -++mov vw_setup, rb26 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++# DMA out for V -++# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -++# Could potentially push this write into the start of the next pipeline stage. -++mov r0, 16 -++mov -, vw_wait -++ -++bra -, ra31 -++add vw_setup, rb26, r0 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++::mc_end -+diff --git a/libavcodec/rpi_user_vcsm.h b/libavcodec/rpi_user_vcsm.h -+new file mode 100644 -+index 0000000..fbebbbe -+--- /dev/null -++++ b/libavcodec/rpi_user_vcsm.h -+@@ -0,0 +1,425 @@ -++/* -++Copyright (c) 2012, Broadcom Europe 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. -++ * Neither the name of the copyright holder nor the -++ names of its contributors may be used to endorse or promote products -++ derived from this software without specific prior written permission. -++ -++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -++DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -++ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -++(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 __USER_VCSM__H__INCLUDED__ -++#define __USER_VCSM__H__INCLUDED__ -++ -++/* VideoCore Shared Memory - user interface library. -++** -++** This library provides all the necessary abstraction for any application to -++** make use of the shared memory service which is distributed accross a kernel -++** driver and a videocore service. -++** -++** It is an application design decision to choose or not to use this service. -++** -++** The logical flow of operations that a user application needs to follow when -++** using this service is: -++** -++** 1) Initialize the service. -++** 2) Allocate shared memory blocks. -++** 3) Start using the allocated blocks. -++** - In order to gain ownership on a block, lock the allocated block, -++** locking a block returns a valid address that the user application -++** can access. -++** - When finished with using the block for the current execution cycle -++** or function, and so when giving up the ownership, unlock the block. -++** 4) A block can be locked/unlocked as many times required - within or outside -++** of - a specific execution context. -++** 5) To completely release an allocated block, free it. -++** 6) If the service is no longer required, terminate it. -++** -++** -++** Some generic considerations: -++ -++** Allocating memory blocks. -++** -++** Memory blocks can be allocated in different manners depending on the cache -++** behavior desired. A given block can either be: -++ -++** - Allocated in a non cached fashion all the way through host and videocore. -++** - Allocated in a cached fashion on host OR videocore. -++** - Allocated in a cached fashion on host AND videocore. -++** -++** It is an application decision to determine how to allocate a block. Evidently -++** if the application will be doing substantial read/write accesses to a given block, -++** it is recommended to allocate the block at least in a 'host cached' fashion for -++** better results. -++** -++** -++** Locking memory blocks. -++** -++** When the memory block has been allocated in a host cached fashion, locking the -++** memory block (and so taking ownership of it) will trigger a cache invalidation. -++** -++** For the above reason and when using host cached allocation, it is important that -++** an application properly implements the lock/unlock mechanism to ensure cache will -++** stay coherent, otherwise there is no guarantee it will at all be. -++** -++** It is possible to dynamically change the host cache behavior (ie cached or non -++** cached) of a given allocation without needing to free and re-allocate the block. -++** This feature can be useful for such application which requires access to the block -++** only at certain times and not otherwise. By changing the cache behavior dynamically -++** the application can optimize performances for a given duration of use. -++** Such dynamic cache behavior remapping only applies to host cache and not videocore -++** cache. If one requires to change the videocore cache behavior, then a new block -++** must be created to replace the old one. -++** -++** On successful locking, a valid pointer is returned that the application can use -++** to access to data inside the block. There is no guarantee that the pointer will -++** stay valid following the unlock action corresponding to this lock. -++** -++** -++** Unocking memory blocks. -++** -++** When the memory block has been allocated in a host cached fashion, unlocking the -++** memory block (and so forgiving its ownership) will trigger a cache flush unless -++** explicitely asked not to flush the cache for performances reasons. -++** -++** For the above reason and when using host cached allocation, it is important that -++** an application properly implements the lock/unlock mechanism to ensure cache will -++** stay coherent, otherwise there is no guarantee it will at all be. -++** -++** -++** A complete API is defined below. -++*/ -++ -++#ifdef __cplusplus -++extern "C" -++{ -++#endif -++ -++/* Different status that can be dumped. -++*/ -++typedef enum -++{ -++ VCSM_STATUS_VC_WALK_ALLOC = 0, // Walks *all* the allocation on videocore. -++ // Result of the walk is seen in the videocore -++ // log. -++ VCSM_STATUS_HOST_WALK_MAP, // Walks the *full* mapping allocation on host -++ // driver (ie for all processes). Result of -++ // the walk is seen in the kernel log. -++ VCSM_STATUS_HOST_WALK_PID_MAP, // Walks the per process mapping allocation on host -++ // driver (for current process). Result of -++ // the walk is seen in the kernel log. -++ VCSM_STATUS_HOST_WALK_PID_ALLOC, // Walks the per process host allocation on host -++ // driver (for current process). Result of -++ // the walk is seen in the kernel log. -++ VCSM_STATUS_VC_MAP_ALL, // Equivalent to both VCSM_STATUS_VC_WALK_ALLOC and -++ // VCSM_STATUS_HOST_WALK_MAP. -++ // -++ VCSM_STATUS_NONE, // Must be last - invalid. -++ -++} VCSM_STATUS_T; -++ -++/* Different kind of cache behavior. -++*/ -++typedef enum -++{ -++ VCSM_CACHE_TYPE_NONE = 0, // No caching applies. -++ VCSM_CACHE_TYPE_HOST, // Allocation is cached on host (user space). -++ VCSM_CACHE_TYPE_VC, // Allocation is cached on videocore. -++ VCSM_CACHE_TYPE_HOST_AND_VC, // Allocation is cached on both host and videocore. -++ -++} VCSM_CACHE_TYPE_T; -++ -++/* Initialize the vcsm processing. -++** -++** Must be called once before attempting to do anything else. -++** -++** Returns 0 on success, -1 on error. -++*/ -++int vcsm_init( void ); -++ -++ -++/* Terminates the vcsm processing. -++** -++** Must be called vcsm services are no longer needed, it will -++** take care of removing any allocation under the current process -++** control if deemed necessary. -++*/ -++void vcsm_exit( void ); -++ -++ -++/* Queries the status of the the vcsm. -++** -++** Triggers dump of various kind of information, see the -++** different variants specified in VCSM_STATUS_T. -++** -++** Pid is optional. -++*/ -++void vcsm_status( VCSM_STATUS_T status, int pid ); -++ -++ -++/* Allocates a non-cached block of memory of size 'size' via the vcsm memory -++** allocator. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** On success, the user must invoke vcsm_lock with the returned opaque -++** handle to gain access to the memory associated with the opaque handle. -++** When finished using the memory, the user calls vcsm_unlock_xx (see those -++** function definition for more details on the one that can be used). -++** -++** A well behaved application should make every attempt to lock/unlock -++** only for the duration it needs to access the memory data associated with -++** the opaque handle. -++*/ -++unsigned int vcsm_malloc( unsigned int size, char *name ); -++ -++ -++/* Allocates a cached block of memory of size 'size' via the vcsm memory -++** allocator, the type of caching requested is passed as argument of the -++** function call. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** On success, the user must invoke vcsm_lock with the returned opaque -++** handle to gain access to the memory associated with the opaque handle. -++** When finished using the memory, the user calls vcsm_unlock_xx (see those -++** function definition for more details on the one that can be used). -++** -++** A well behaved application should make every attempt to lock/unlock -++** only for the duration it needs to access the memory data associated with -++** the opaque handle. -++*/ -++unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char *name ); -++ -++ -++/* Shares an allocated block of memory via the vcsm memory allocator. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** On success, the user must invoke vcsm_lock with the returned opaque -++** handle to gain access to the memory associated with the opaque handle. -++** When finished using the memory, the user calls vcsm_unlock_xx (see those -++** function definition for more details on the one that can be used). -++** -++** A well behaved application should make every attempt to lock/unlock -++** only for the duration it needs to access the memory data associated with -++** the opaque handle. -++*/ -++unsigned int vcsm_malloc_share( unsigned int handle ); -++ -++ -++/* Resizes a block of memory allocated previously by vcsm_alloc. -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** The handle must be unlocked by user prior to attempting any -++** resize action. -++** -++** On error, the original size allocated against the handle -++** remains available the same way it would be following a -++** successful vcsm_malloc. -++*/ -++int vcsm_resize( unsigned int handle, unsigned int new_size ); -++ -++ -++/* Frees a block of memory that was successfully allocated by -++** a prior call the vcms_alloc. -++** -++** The handle should be considered invalid upon return from this -++** call. -++** -++** Whether any memory is actually freed up or not as the result of -++** this call will depends on many factors, if all goes well it will -++** be freed. If something goes wrong, the memory will likely end up -++** being freed up as part of the vcsm_exit process. In the end the -++** memory is guaranteed to be freed one way or another. -++*/ -++void vcsm_free( unsigned int handle ); -++ -++ -++/* Retrieves a videocore opaque handle from a mapped user address -++** pointer. The videocore handle will correspond to the actual -++** memory mapped in videocore. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** Note: the videocore opaque handle is distinct from the user -++** opaque handle (allocated via vcsm_malloc) and it is only -++** significant for such application which knows what to do -++** with it, for the others it is just a number with little -++** use since nothing can be done with it (in particular -++** for safety reason it cannot be used to map anything). -++*/ -++unsigned int vcsm_vc_hdl_from_ptr( void *usr_ptr ); -++ -++ -++/* Retrieves a videocore opaque handle from a opaque handle -++** pointer. The videocore handle will correspond to the actual -++** memory mapped in videocore. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** Note: the videocore opaque handle is distinct from the user -++** opaque handle (allocated via vcsm_malloc) and it is only -++** significant for such application which knows what to do -++** with it, for the others it is just a number with little -++** use since nothing can be done with it (in particular -++** for safety reason it cannot be used to map anything). -++*/ -++unsigned int vcsm_vc_hdl_from_hdl( unsigned int handle ); -++ -++ -++/* Retrieves a user opaque handle from a mapped user address -++** pointer. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++*/ -++unsigned int vcsm_usr_handle( void *usr_ptr ); -++ -++ -++/* Retrieves a mapped user address from an opaque user -++** handle. -++** -++** Returns: 0 on error -++** a non-zero address on success. -++** -++** On success, the address corresponds to the pointer -++** which can access the data allocated via the vcsm_malloc -++** call. -++*/ -++void *vcsm_usr_address( unsigned int handle ); -++ -++ -++/* Locks the memory associated with this opaque handle. -++** -++** Returns: NULL on error -++** a valid pointer on success. -++** -++** A user MUST lock the handle received from vcsm_malloc -++** in order to be able to use the memory associated with it. -++** -++** On success, the pointer returned is only valid within -++** the lock content (ie until a corresponding vcsm_unlock_xx -++** is invoked). -++*/ -++void *vcsm_lock( unsigned int handle ); -++ -++ -++/* Locks the memory associated with this opaque handle. The lock -++** also gives a chance to update the *host* cache behavior of the -++** allocated buffer if so desired. The *videocore* cache behavior -++** of the allocated buffer cannot be changed by this call and such -++** attempt will be ignored. -++** -++** The system will attempt to honour the cache_update mode request, -++** the cache_result mode will provide the final answer on which cache -++** mode is really in use. Failing to change the cache mode will not -++** result in a failure to lock the buffer as it is an application -++** decision to choose what to do if (cache_result != cache_update) -++** -++** The value returned in cache_result can only be considered valid if -++** the returned pointer is non NULL. The cache_result pointer may be -++** NULL if the application does not care about the actual outcome of -++** its action with regards to the cache behavior change. -++** -++** Returns: NULL on error -++** a valid pointer on success. -++** -++** A user MUST lock the handle received from vcsm_malloc -++** in order to be able to use the memory associated with it. -++** -++** On success, the pointer returned is only valid within -++** the lock content (ie until a corresponding vcsm_unlock_xx -++** is invoked). -++*/ -++void *vcsm_lock_cache( unsigned int handle, -++ VCSM_CACHE_TYPE_T cache_update, -++ VCSM_CACHE_TYPE_T *cache_result ); -++ -++ -++/* Unlocks the memory associated with this user mapped address. -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** After unlocking a mapped address, the user should no longer -++** attempt to reference it. -++*/ -++int vcsm_unlock_ptr( void *usr_ptr ); -++ -++ -++/* Unlocks the memory associated with this user mapped address. -++** Apply special processing that would override the otherwise -++** default behavior. -++** -++** If 'cache_no_flush' is specified: -++** Do not flush cache as the result of the unlock (if cache -++** flush was otherwise applicable in this case). -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** After unlocking a mapped address, the user should no longer -++** attempt to reference it. -++*/ -++int vcsm_unlock_ptr_sp( void *usr_ptr, int cache_no_flush ); -++ -++ -++/* Unlocks the memory associated with this user opaque handle. -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** After unlocking an opaque handle, the user should no longer -++** attempt to reference the mapped addressed once associated -++** with it. -++*/ -++int vcsm_unlock_hdl( unsigned int handle ); -++ -++ -++/* Unlocks the memory associated with this user opaque handle. -++** Apply special processing that would override the otherwise -++** default behavior. -++** -++** If 'cache_no_flush' is specified: -++** Do not flush cache as the result of the unlock (if cache -++** flush was otherwise applicable in this case). -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** After unlocking an opaque handle, the user should no longer -++** attempt to reference the mapped addressed once associated -++** with it. -++*/ -++int vcsm_unlock_hdl_sp( unsigned int handle, int cache_no_flush ); -++ -++#ifdef __cplusplus -++} -++#endif -++ -++#endif /* __USER_VCSM__H__INCLUDED__ */ -+-- -+2.7.4 -+ -+ -+From 6cfa5910be47865aaaf58c185587189c332765a6 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Sat, 2 May 2015 21:15:37 +0100 -+Subject: [PATCH 04/68] First working version with uncached memory -+ -+--- -+ libavcodec/hevc.c | 61 +++++- -+ libavcodec/hevc.h | 12 +- -+ libavcodec/hevc_cabac.c | 39 +++- -+ libavcodec/hevc_filter.c | 16 ++ -+ libavcodec/hevcpred_template.c | 6 + -+ libavcodec/rpi_hevc_transform.h | 422 +++++++++++++++++++++++++++++++++++++++- -+ libavcodec/rpi_hevc_transform.s | 153 +++++++++++++-- -+ libavcodec/rpi_qpu.c | 72 +++++++ -+ libavcodec/rpi_qpu.h | 1 + -+ 9 files changed, 736 insertions(+), 46 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index ab55df1..94ff709 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -45,6 +45,8 @@ -+ #include "rpi_qpu.h" -+ #endif -+ -++// #define DISABLE_MC -++ -+ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; -+ -+ /** -+@@ -1079,11 +1081,15 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (size * size); i++) { -+ coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -++ printf("Cross component not supported\n"); // TODO -++ exit(-1); -+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride); -+ } -+ } -+ -+ if (lc->tu.cross_pf) { -++ printf("Cross component not supported\n"); // TODO -++ exit(-1); -+ hls_cross_component_pred(s, 1); -+ } -+ for (i = 0; i < (s->ps.sps->chroma_format_idc == 2 ? 2 : 1); i++) { -+@@ -1112,6 +1118,8 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (size * size); i++) { -+ coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -++ printf("Cross component not supported\n"); // TODO -++ exit(-1); -+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride); -+ } -+ } -+@@ -1409,6 +1417,10 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ int idx = ff_hevc_pel_weight[block_w]; -+ -++#ifdef DISABLE_MC -++ return; -++#endif -++ -+ x_off += mv->x >> 2; -+ y_off += mv->y >> 2; -+ src += y_off * srcstride + (x_off * (1 << s->ps.sps->pixel_shift)); -+@@ -1479,6 +1491,10 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ uint8_t *src0 = ref0->data[0] + y_off0 * src0stride + (int)((unsigned)x_off0 << s->ps.sps->pixel_shift); -+ uint8_t *src1 = ref1->data[0] + y_off1 * src1stride + (int)((unsigned)x_off1 << s->ps.sps->pixel_shift); -+ -++#ifdef DISABLE_MC -++ return; -++#endif -++ -+ if (x_off0 < QPEL_EXTRA_BEFORE || y_off0 < QPEL_EXTRA_AFTER || -+ x_off0 >= pic_width - block_w - QPEL_EXTRA_AFTER || -+ y_off0 >= pic_height - block_h - QPEL_EXTRA_AFTER) { -+@@ -1564,6 +1580,10 @@ static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ intptr_t _mx = mx << (1 - hshift); -+ intptr_t _my = my << (1 - vshift); -+ -++#ifdef DISABLE_MC -++ return; -++#endif -++ -+ x_off += mv->x >> (2 + hshift); -+ y_off += mv->y >> (2 + vshift); -+ src0 += y_off * srcstride + (x_off * (1 << s->ps.sps->pixel_shift)); -+@@ -1628,6 +1648,10 @@ static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVF -+ int hshift = s->ps.sps->hshift[1]; -+ int vshift = s->ps.sps->vshift[1]; -+ -++#ifdef DISABLE_MC -++ return; -++#endif -++ -+ intptr_t mx0 = av_mod_uintp2(mv0->x, 2 + hshift); -+ intptr_t my0 = av_mod_uintp2(mv0->y, 2 + vshift); -+ intptr_t mx1 = av_mod_uintp2(mv1->x, 2 + hshift); -+@@ -2367,6 +2391,22 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ } -+ -+ #ifdef RPI -++static void rpi_execute_transform(HEVCContext *s) -++{ -++ int i=2; -++ //int j; -++ //int16_t *coeffs = s->coeffs_buf_arm[i]; -++ //for(j=s->num_coeffs[i]; j > 0; j-= 16*16, coeffs+=16*16) { -++ // s->hevcdsp.idct[4-2](coeffs, 16); -++ //} -++ -++ //gpu_cache_flush(&s->coeffs_buf[i]); -++ vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[i].vc, s->num_coeffs[i] >> 8, 0, 0, 0); -++ -++ for(i=0;i<4;i++) -++ s->num_coeffs[i] = 0; -++} -++ -+ static void rpi_execute_pred_cmds(HEVCContext *s) -+ { -+ int i; -+@@ -2387,7 +2427,6 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ } -+ } -+ s->num_pred_cmds = 0; -+- s->num_coeffs = 0; -+ } -+ #endif -+ -+@@ -2434,7 +2473,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ #ifdef RPI -+- if (x_ctb + ctb_size >= s->ps.sps->width) { -++ if (1 || x_ctb + ctb_size >= s->ps.sps->width) { // TODO watch out for deblocking! -++ rpi_execute_transform(s); -+ rpi_execute_pred_cmds(s); -+ } -+ #endif -+@@ -3179,7 +3219,9 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->unif_mv_cmds); -+ av_freep(&s->unif_xfm_cmds); -+ av_freep(&s->univ_pred_cmds); -+- av_freep(&s->coeffs_buf); -++ for(i = 0; i < 4; i++) { -++ gpu_free(&s->coeffs_buf[i]); -++ } -+ #endif -+ -+ for (i = 0; i < 3; i++) { -+@@ -3246,13 +3288,16 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -+ if (!s->univ_pred_cmds) -+ goto fail; -+- s->coeffs_buf = av_mallocz(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16); -+- if (!s->coeffs_buf) -+- goto fail; -++ for(i = 0; i < 4; i++) { -++ gpu_malloc_uncached(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16, &s->coeffs_buf[i]); // TODO slim this down and share across sizes -++ s->coeffs_buf_arm[i] = (int16_t*) s->coeffs_buf[i].arm; -++ if (!s->coeffs_buf_arm[i]) -++ goto fail; -++ } -+ s->enable_rpi = 0; -+ -+ // A little test program -+- { -++ /*{ -+ GPU_MEM_PTR_T p; -+ int err = gpu_malloc_cached(16, &p); -+ short *q = (short *)p.arm; -+@@ -3273,7 +3318,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ printf(")\n"); -+ gpu_free(&p); -+ goto fail; // Early out -+- } -++ }*/ -+ -+ #endif -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 7a1c35f..4167985 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -40,6 +40,11 @@ -+ #include "thread.h" -+ #include "videodsp.h" -+ -++// define RPI to split the CABAC/prediction/transform into separate stages -++#ifdef RPI -++#include "rpi_qpu.h" -++#endif -++ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+ #define MAX_REFS 16 -+ -+@@ -856,11 +861,12 @@ typedef struct HEVCContext { -+ HEVCMvCmd *unif_mv_cmds; -+ HEVCXfmCmd *unif_xfm_cmds; -+ HEVCPredCmd *univ_pred_cmds; -+- int16_t *coeffs_buf; -+- int num_mv_cmds; -++ GPU_MEM_PTR_T coeffs_buf[4]; -++ int16_t *coeffs_buf_arm[4]; -++ int num_coeffs[4]; -+ int num_xfm_cmds; -++ int num_mv_cmds; -+ int num_pred_cmds; -+- int num_coeffs; -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 4e97f06..d1cba86 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1031,6 +1031,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int vshift = s->ps.sps->vshift[c_idx]; -+ uint8_t *dst = &s->frame->data[c_idx][(y0 >> vshift) * stride + -+ ((x0 >> hshift) << s->ps.sps->pixel_shift)]; -++ int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag && !transform_skip_flag && !lc->tu.cross_pf && log2_trafo_size==4; -+ int16_t *coeffs = (int16_t*)(c_idx ? lc->edge_emu_buffer2 : lc->edge_emu_buffer); -+ uint8_t significant_coeff_group_flag[8][8] = {{0}}; -+ int explicit_rdpcm_flag = 0; -+@@ -1044,6 +1045,18 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ uint8_t dc_scale; -+ int pred_mode_intra = (c_idx == 0) ? lc->tu.intra_pred_mode : -+ lc->tu.intra_pred_mode_c; -++#ifdef RPI -++ if (s->enable_rpi) { -++ int n = trafo_size * trafo_size; -++ if (use_vpu) { -++ coeffs = s->coeffs_buf_arm[log2_trafo_size - 2] + s->num_coeffs[log2_trafo_size - 2]; -++ s->num_coeffs[log2_trafo_size - 2] += n; -++ } else { -++ coeffs = s->coeffs_buf_arm[0] + s->num_coeffs[0]; -++ s->num_coeffs[0] += n; -++ } -++ } -++#endif -+ -+ memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -+ -+@@ -1488,6 +1501,24 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } else if (lc->cu.pred_mode == MODE_INTRA && c_idx == 0 && log2_trafo_size == 2) { -+ s->hevcdsp.idct_4x4_luma(coeffs); -+ } else { -++#ifdef RPI -++ if (!use_vpu) { -++ int max_xy = FFMAX(last_significant_coeff_x, last_significant_coeff_y); -++ if (max_xy == 0) -++ s->hevcdsp.idct_dc[log2_trafo_size-2](coeffs); -++ else { -++ int col_limit = last_significant_coeff_x + last_significant_coeff_y + 4; -++ if (max_xy < 4) -++ col_limit = FFMIN(4, col_limit); -++ else if (max_xy < 8) -++ col_limit = FFMIN(8, col_limit); -++ else if (max_xy < 12) -++ col_limit = FFMIN(24, col_limit); -++ -++ s->hevcdsp.idct[log2_trafo_size-2](coeffs, col_limit); -++ } -++ } -++#else -+ int max_xy = FFMAX(last_significant_coeff_x, last_significant_coeff_y); -+ if (max_xy == 0) -+ s->hevcdsp.idct_dc[log2_trafo_size-2](coeffs); -+@@ -1501,6 +1532,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ col_limit = FFMIN(24, col_limit); -+ s->hevcdsp.idct[log2_trafo_size-2](coeffs, col_limit); -+ } -++#endif -+ } -+ } -+ if (lc->tu.cross_pf) { -+@@ -1512,14 +1544,11 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ #ifdef RPI -+ if (s->enable_rpi) { -+- int16_t *c = s->coeffs_buf + s->num_coeffs; -+- int n = trafo_size * trafo_size; -+ HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -+- memcpy(c, coeffs, n * sizeof(int16_t)); // TODO change pointer earlier and we can avoid this copy -+- s->num_coeffs += n; -++ //memcpy(coeffs2, coeffs, sizeof(int16_t) * trafo_size * trafo_size); // TODO -+ cmd->type = RPI_PRED_TRANSFORM_ADD; -+ cmd->size = log2_trafo_size; -+- cmd->buf = c; -++ cmd->buf = coeffs; -+ cmd->dst = dst; -+ cmd->stride = stride; -+ return; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 1f33b0c..e4c3da7 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -22,6 +22,10 @@ -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -++//#define DISABLE_SAO -++//#define DISABLE_DEBLOCK -++//#define DISABLE_STRENGTHS -++ -+ #include "libavutil/common.h" -+ #include "libavutil/internal.h" -+ -+@@ -273,6 +277,10 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y) -+ edges[2] = x_ctb == s->ps.sps->ctb_width - 1; -+ edges[3] = y_ctb == s->ps.sps->ctb_height - 1; -+ -++#ifdef DISABLE_SAO -++ return; -++#endif -++ -+ if (restore) { -+ if (!edges[0]) { -+ left_tile_edge = no_tile_filter && s->ps.pps->tile_id[ctb_addr_ts] != s->ps.pps->tile_id[s->ps.pps->ctb_addr_rs_to_ts[ctb_addr_rs-1]]; -+@@ -496,6 +504,10 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->ps.sps->pcm.loop_filter_disable_flag) || -+ s->ps.pps->transquant_bypass_enable_flag; -+ -++#ifdef DISABLE_DEBLOCK -++ return; -++#endif -++ -+ if (x0) { -+ left_tc_offset = s->deblock[ctb - 1].tc_offset; -+ left_beta_offset = s->deblock[ctb - 1].beta_offset; -+@@ -726,6 +738,10 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ int boundary_upper, boundary_left; -+ int i, j, bs; -+ -++#ifdef DISABLE_STRENGTHS -++ return; -++#endif -++ -+ boundary_upper = y0 > 0 && !(y0 & 7); -+ if (boundary_upper && -+ ((!s->sh.slice_loop_filter_across_slices_enabled_flag && -+diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c -+index 6ae87cc..71c6d52 100644 -+--- a/libavcodec/hevcpred_template.c -++++ b/libavcodec/hevcpred_template.c -+@@ -20,6 +20,8 @@ -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -++//#define DISABLE_INTRA -++ -+ #include "libavutil/pixdesc.h" -+ -+ #include "bit_depth_template.c" -+@@ -114,6 +116,10 @@ do { \ -+ int top_right_size = (FFMIN(x0 + 2 * size_in_luma_h, s->ps.sps->width) - -+ (x0 + size_in_luma_h)) >> hshift; -+ -++#ifdef DISABLE_INTRA -++ return; -++#endif -++ -+ if (s->ps.pps->constrained_intra_pred_flag == 1) { -+ int size_in_luma_pu_v = PU(size_in_luma_v); -+ int size_in_luma_pu_h = PU(size_in_luma_h); -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index 85a9102..c0c279f 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -3,11 +3,11 @@ unsigned char rpi_hevc_transform [] = { -+ 3, -+ 3, -+ 232, -+-128, -++32, -+ 0, -+ 0, -+ 0, -+-20, -++12, -+ 248, -+ 0, -+ 136, -+@@ -56,9 +56,9 @@ unsigned char rpi_hevc_transform [] = { -+ 5, -+ 232, -+ 0, -+-0, -+ 8, -+ 0, -++0, -+ 128, -+ 69, -+ 113, -+@@ -108,8 +108,8 @@ unsigned char rpi_hevc_transform [] = { -+ 128, -+ 2, -+ 0, -+-248, -+-62, -++8, -++2, -+ 0, -+ 128, -+ 144, -+@@ -123,13 +123,13 @@ unsigned char rpi_hevc_transform [] = { -+ 3, -+ 32, -+ 8, -+-16, -++20, -+ 0, -+ 76, -+ 254, -+ 48, -+ 192, -+-9, -++4, -+ 4, -+ 32, -+ 8, -+@@ -155,14 +155,46 @@ unsigned char rpi_hevc_transform [] = { -+ 192, -+ 41, -+ 3, -+-68, -++70, -++192, -++80, -++7, -++164, -++255, -++36, -++204, -++96, -++2, -++0, -++248, -++62, -++0, -++3, -++255, -++55, -++208, -++120, -++3, -++224, -++3, -++190, -++11, -++16, -++139, -++246, -++91, -++0, -++103, -++90, -++0, -++70, -+ 192, -+ 80, -+ 7, -+ 164, -+ 255, -+ 36, -+-220, -++204, -+ 96, -+ 2, -+ 0, -+@@ -182,7 +214,7 @@ unsigned char rpi_hevc_transform [] = { -+ 16, -+ 139, -+ 246, -+-83, -++91, -+ 0, -+ 103, -+ 90, -+@@ -209,4 +241,374 @@ unsigned char rpi_hevc_transform [] = { -+ 96, -+ 90, -+ 0, -++169, -++3, -++3, -++232, -++32, -++0, -++0, -++0, -++12, -++248, -++0, -++136, -++0, -++0, -++192, -++248, -++0, -++0, -++64, -++232, -++0, -++2, -++0, -++0, -++12, -++248, -++0, -++168, -++0, -++0, -++192, -++248, -++0, -++0, -++3, -++232, -++128, -++0, -++0, -++0, -++7, -++232, -++0, -++2, -++0, -++0, -++4, -++232, -++64, -++0, -++0, -++0, -++5, -++232, -++0, -++8, -++0, -++0, -++57, -++239, -++224, -++247, -++255, -++255, -++72, -++192, -++95, -++207, -++88, -++122, -++88, -++124, -++137, -++64, -++26, -++64, -++161, -++64, -++152, -++64, -++128, -++144, -++31, -++0, -++72, -++232, -++32, -++0, -++0, -++0, -++65, -++232, -++32, -++0, -++0, -++0, -++128, -++144, -++23, -++0, -++145, -++64, -++168, -++64, -++128, -++144, -++19, -++0, -++72, -++232, -++32, -++0, -++0, -++0, -++65, -++232, -++32, -++0, -++0, -++0, -++128, -++144, -++11, -++0, -++74, -++232, -++0, -++8, -++0, -++0, -++242, -++140, -++229, -++192, -++57, -++239, -++32, -++8, -++0, -++0, -++41, -++3, -++12, -++248, -++0, -++128, -++0, -++0, -++192, -++8, -++4, -++0, -++12, -++248, -++0, -++132, -++64, -++0, -++192, -++8, -++4, -++0, -++0, -++96, -++255, -++159, -++131, -++255, -++0, -++232, -++0, -++4, -++0, -++0, -++255, -++159, -++142, -++255, -++4, -++255, -++48, -++204, -++16, -++3, -++224, -++251, -++62, -++0, -++5, -++255, -++51, -++204, -++128, -++3, -++224, -++251, -++16, -++0, -++77, -++254, -++51, -++204, -++9, -++4, -++224, -++251, -++0, -++0, -++128, -++64, -++6, -++232, -++64, -++0, -++0, -++0, -++140, -++248, -++47, -++0, -++0, -++0, -++224, -++99, -++0, -++0, -++4, -++254, -++0, -++144, -++128, -++2, -++0, -++8, -++2, -++0, -++32, -++247, -++240, -++207, -++16, -++3, -++32, -++247, -++176, -++207, -++17, -++3, -++32, -++247, -++112, -++207, -++18, -++3, -++32, -++247, -++48, -++207, -++19, -++3, -++32, -++247, -++240, -++206, -++20, -++3, -++32, -++247, -++176, -++206, -++21, -++3, -++32, -++247, -++112, -++206, -++22, -++3, -++32, -++247, -++48, -++206, -++23, -++3, -++32, -++247, -++240, -++205, -++24, -++3, -++32, -++247, -++176, -++205, -++25, -++3, -++32, -++247, -++112, -++205, -++26, -++3, -++32, -++247, -++48, -++205, -++27, -++3, -++32, -++247, -++240, -++204, -++28, -++3, -++32, -++247, -++176, -++204, -++29, -++3, -++32, -++247, -++112, -++204, -++30, -++3, -++32, -++247, -++48, -++204, -++31, -++3, -++5, -++255, -++51, -++204, -++128, -++3, -++224, -++251, -++16, -++0, -++77, -++254, -++51, -++204, -++9, -++4, -++224, -++251, -++0, -++0, -++0, -++237, -++0, -++4, -++0, -++0, -++140, -++248, -++47, -++0, -++0, -++0, -++224, -++99, -++0, -++0, -++90, -++0, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index 5e2728d..1e389c7 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -58,13 +58,6 @@ -+ # -+ # -+ -+-test_add: -+- vldh HX(0,0),(r0) -+- vadd HX(0,0),HX(0,0),10 -+- vsth HX(0,0),(r0) -+- mov r0,7 # return value -+- b lr -+- -+ # Columns are transformed first -+ # -+ # Store top left half of transMatrix2 in -+@@ -79,7 +72,7 @@ test_add: -+ # -+ -+ -+-# hevc_trans_16x16(short *transMatrix2, short *coeffs, int num) -++# hevc_trans_16x16(short *transMatrix2, short *coeffs, int num) # TODO add size so we can branch to correct implementation (or perhaps have coeffs32 and num32 as secondary inputs!) -+ # transMatrix2: address of the constant matrix (must be at 32 byte aligned address in Videocore memory) -+ # coeffs: address of the transform coefficients (must be at 32 byte aligned address in Videocore memory) -+ # num: number of 16x16 transforms to be done -+@@ -87,17 +80,17 @@ test_add: -+ hevc_trans_16x16: -+ push r6-r15, lr # TODO cut down number of used registers -+ -+- mov r3, 2*32*2 # Twice Stride of transMatrix2 in bytes -+- vld HX(32++,0),(r0 += r3) REP 16 # This is the 16x16 matrix, a transform is equivalent to multiplying input row vector * matrix -++ mov r3, 16*2 # Stride of transMatrix2 in bytes -++ vldh HX(32++,0),(r0 += r3) REP 16 # This is the 16x16 matrix, a transform is equivalent to multiplying input row vector * matrix -+ # Now use r0 to describe which matrix we are working on. -+ # Allows us to prefetch the next block of coefficients for efficiency. -+ mov r0,0 # This describes the location where we read our coefficients from -+- mov r3,16*2 # Stride of coefficients in bytes -++ mov r3,16*2 # Stride of coefficients in bytes (TODO remove) -+ mov r7,16*16*2 # Total block size -+ mov r8,64*16 # Value used to swap from current to next VRF location -+ vldh HX(0++,0)+r0,(r1 += r3) REP 16 -+ mov r4,64 # Constant used for rounding first pass -+- mov r5,1<<19 # Constant used for rounding second pass -++ mov r5,1<<11 # Constant used for rounding second pass -+ -+ # At start of block r0,r1 point to the current block (that has already been loaded) -+ block_loop: -+@@ -113,12 +106,12 @@ block_loop: -+ vadd HY(0++,0)+r0,HY(0++,0)+r0,r4 REP 16 # Now add on rounding, shift down by 7, and saturate -+ #vsasls HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # 9+7=16 so this ends up with the output saturated and in the top half of the word. -+ vasl HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # This should be saturating, but the instruction above does not assemble? -+- vmov VX(0,0++), HX(0++,32) REP 16 # For simplicity transpose this back to the original position -++ vmov VX(0,0++)+r0, HX(0++,32)+r0 REP 16 # For simplicity transpose this back to the original position -+ -+ bl col_trans_16 -+- vadd HY(0++,0)+r0,HY(0++,0)+r0,r4 REP 16 # Now add on rounding, shift down by 7, and saturate -+- #vsasls HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # 9+7=16 so this ends up with the output saturated and in the top half of the word. -+- vasl HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # This should be saturating, but the instruction above does not assemble? -++ vadd HY(0++,0)+r0,HY(0++,0)+r0,r5 REP 16 # Now add on rounding, shift down by 7, and saturate -++ #vsasls HY(0++,0)+r0,HY(0++,0)+r0,4 REP 16 # 4+12=16 so this ends up with the output saturated and in the top half of the word. -++ vasl HY(0++,0)+r0,HY(0++,0)+r0,4 REP 16 # This should be saturating, but the instruction above does not assemble? (Probably because it ends with ls which is interpreted as a condition flag) -+ -+ # Save results - note there has been a transposition during the processing so we save columns -+ vsth VX(0,32++)+r0, (r1 += r3) REP 16 -+@@ -132,16 +125,136 @@ block_loop: -+ -+ # r1,r2,r3 r7,r8 should be preserved -+ # HX(0++,0)+r0 is the block to be transformed -+-# HX(32++,0) is the 16x16 matrix of transform coefficients -++# HX(32++,0)+r6 is the 16x16 matrix of transform coefficients -+ # Use HY(48,0) for intermediate results -+ # r0 can be used, but should be returned to its original value at the end -+ col_trans_16: -+- add r4,r0,16 # Final value for this loop -++ add r6,r0,16 # Final value for this loop -+ col_trans_16_loop: -+ # First compute partial products for a single column -+- vmul32s VY(48,0++), VX(0,0)+r0, VX(32,0++) REP 16 -++ vmul32s HY(48++,0), VX(0,0)+r0, VX(32,0++) REP 16 -+ # Then sum up the results and place back -+ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -+- addcmpblt r0,1,r4,col_trans_16_loop -++ addcmpblt r0,1,r6,col_trans_16_loop -+ sub r0,16 # but r0 back to its original value -+ b lr -++ -++col_trans_odd_16: -++ add r6,r0,16 # Final value for this loop -++col_trans_odd_16_loop: -++ # First compute partial products for a single column -++ vmul32s HY(48++,0), VX(0,0)+r0, VX(32,0++) REP 16 -++ # Then sum up the results and place back -++ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -++ addcmpblt r0,1,r6,col_trans_odd_16_loop -++ sub r0,16 # but r0 back to its original value -++ b lr -++ -++ -++test_add: -++ vldh HX(0,0),(r0) -++ vadd HX(0,0),HX(0,0),10 -++ vsth HX(0,0),(r0) -++ mov r0,7 # return value -++ b lr -++ -++# hevc_trans_32x32(short *transMatrix2, short *coeffs, int num) -++# transMatrix2: address of the constant matrix (must be at 32 byte aligned address in Videocore memory) Even followed by odd -++# coeffs: address of the transform coefficients (must be at 32 byte aligned address in Videocore memory) -++# num: number of 16x16 transforms to be done -++# -++hevc_trans_32x32: -++ push r6-r15, lr # TODO cut down number of used registers -++ -++ # Fetch transform matrices -++ mov r3, 16*2 # Stride of transMatrix2 in bytes (and of coefficients) -++ vldh HX(32++,0),(r0 += r3) REP 16 # This is the even 16x16 matrix -++ add r0, 16*16*2 -++ vldh HX(32++,32),(r0 += r3) REP 16 # This is the odd 16x16 matrix -++ -++ mov r3, 32*2*2 # Stride used to fetch alternate rows of our input coefficient buffer -++ mov r7, 16*16*2 # Total block size -++ mov r4, 64 # Constant used for rounding first pass -++ mov r5, 1<<11 # Constant used for rounding second pass -++ sub sp,sp,32*32*2+32 # Allocate some space on the stack for us to store 32*32 shorts as temporary results (needs to be aligned) -++ # set r8 to 32byte aligned stack pointer -++ add r8,sp,31 -++ lsr r8,5 -++ lsl r8,5 -++ mov r9,r8 # Backup of the temporary storage -++ mov r10,r1 # Backup of the coefficient buffer -++block_loop32: -++ -++ # COLUMN TRANSFORM -++ # Transform the first 16 columns -++ mov r1,r10 # Input Coefficient buffer -++ mov r8,r9 # Output temporary storage -++ bl trans32 -++ # Transform the second 16 columns -++ add r8,32 -++ add r1,32 -++ bl trans32 -++ -++ # ROW TRANSFORM -++ mov r1,r9 # Input temporary storage -++ mov r8,r10 # Output Coefficient buffer -++ bl trans32 -++ # Transform the second 16 columns -++ add r8,32 -++ add r1,32 -++ bl trans32 -++ -++ add r10, 32*32*2 # move onto next block of coefficients -++ addcmpbgt r2,-1,0,block_loop32 -++ -++ add sp,sp,32*32*2+32 # Restore stack -++ -++ pop r6-r15, pc -++ -++trans32: -++ # We can no longer afford the VRF space to do prefetching when doing 32x32 -++ # Fetch the even rows -++ vldh HX(0++,0)+r0,(r1 += r3) REP 16 -++ # Fetch the odd rows -++ vldh HX(16++,0)+r0,64(r1 += r3) REP 16 # First odd row is 32 shorts ahead of r1 -++ -++ # Transform the even rows using even matrix -++ mov r0, 0 # Even rows -++ bl col_trans_16 -++ -++ # Now transform the odd rows using odd matrix -++ mov r0, 64*16 # Odd rows -++ bl col_trans_odd_16 -++ -++ # Now apply butterfly to compute the first 16 results -++ vadd HY(48++,0),HY(0++,0),HY(16++,0) REP 16 -++ vadd HY(48++,0),HY(48++,0),r4 REP 32 # add on rounding, -++ vasl HY(48++,0),HY(48++,0),9 REP 32 # shift down by 7, and saturate -++ # 16bit results now in HX(48,32) -++ mov r0,r8 -++ mov r6,32*2 -++ vsth VX(48,32++),(r0+=r6) REP 16 -++ vmov VX(0,0++)+r0, HX(0++,32)+r0 REP 16 # Store transposed -++ -++ # Now apply butterfly to compute the second 16 results (in reverse order) -++ vsub HY(63,0),HY(0,0),HY(16,0) -++ vsub HY(62,0),HY(0,0),HY(17,0) -++ vsub HY(61,0),HY(0,0),HY(18,0) -++ vsub HY(60,0),HY(0,0),HY(19,0) -++ vsub HY(59,0),HY(0,0),HY(20,0) -++ vsub HY(58,0),HY(0,0),HY(21,0) -++ vsub HY(57,0),HY(0,0),HY(22,0) -++ vsub HY(56,0),HY(0,0),HY(23,0) -++ vsub HY(55,0),HY(0,0),HY(24,0) -++ vsub HY(54,0),HY(0,0),HY(25,0) -++ vsub HY(53,0),HY(0,0),HY(26,0) -++ vsub HY(52,0),HY(0,0),HY(27,0) -++ vsub HY(51,0),HY(0,0),HY(28,0) -++ vsub HY(50,0),HY(0,0),HY(29,0) -++ vsub HY(49,0),HY(0,0),HY(30,0) -++ vsub HY(48,0),HY(0,0),HY(31,0) -++ vadd HY(48++,0),HY(48++,0),r4 REP 32 # add on rounding, -++ vasl HY(48++,0),HY(48++,0),9 REP 32 # shift down by 7, and saturate -++ add r0,r8,16*32*2 # Move to 16th row -++ vsth VX(48,32++),(r0+=r6) REP 16 -++ b lr -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index b1f50ee..d720546 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -3,6 +3,7 @@ -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+ #define RPI_USE_VCSM -+ #define RPI_TIME_TOTAL_QPU -++#define RPI_TIME_TOTAL_VPU -+ -+ #include -+ #include -+@@ -48,10 +49,47 @@ typedef int int32_t; -+ #define QPU_CODE_SIZE 2048 -+ #define VPU_CODE_SIZE 2048 -+ -++const short rpi_transMatrix2even[32][16] = { // Even rows first -++{64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64}, -++{90, 87, 80, 70, 57, 43, 25, 9, -9, -25, -43, -57, -70, -80, -87, -90}, -++{89, 75, 50, 18, -18, -50, -75, -89, -89, -75, -50, -18, 18, 50, 75, 89}, -++{87, 57, 9, -43, -80, -90, -70, -25, 25, 70, 90, 80, 43, -9, -57, -87}, -++{83, 36, -36, -83, -83, -36, 36, 83, 83, 36, -36, -83, -83, -36, 36, 83}, -++{80, 9, -70, -87, -25, 57, 90, 43, -43, -90, -57, 25, 87, 70, -9, -80}, -++{75, -18, -89, -50, 50, 89, 18, -75, -75, 18, 89, 50, -50, -89, -18, 75}, -++{70, -43, -87, 9, 90, 25, -80, -57, 57, 80, -25, -90, -9, 87, 43, -70}, -++{64, -64, -64, 64, 64, -64, -64, 64, 64, -64, -64, 64, 64, -64, -64, 64}, -++{57, -80, -25, 90, -9, -87, 43, 70, -70, -43, 87, 9, -90, 25, 80, -57}, -++{50, -89, 18, 75, -75, -18, 89, -50, -50, 89, -18, -75, 75, 18, -89, 50}, -++{43, -90, 57, 25, -87, 70, 9, -80, 80, -9, -70, 87, -25, -57, 90, -43}, -++{36, -83, 83, -36, -36, 83, -83, 36, 36, -83, 83, -36, -36, 83, -83, 36}, -++{25, -70, 90, -80, 43, 9, -57, 87, -87, 57, -9, -43, 80, -90, 70, -25}, -++{18, -50, 75, -89, 89, -75, 50, -18, -18, 50, -75, 89, -89, 75, -50, 18}, -++{ 9, -25, 43, -57, 70, -80, 87, -90, 90, -87, 80, -70, 57, -43, 25, -9}, -++// Odd rows -++{90, 90, 88, 85, 82, 78, 73, 67, 61, 54, 46, 38, 31, 22, 13, 4}, -++{90, 82, 67, 46, 22, -4, -31, -54, -73, -85, -90, -88, -78, -61, -38, -13}, -++{88, 67, 31, -13, -54, -82, -90, -78, -46, -4, 38, 73, 90, 85, 61, 22}, -++{85, 46, -13, -67, -90, -73, -22, 38, 82, 88, 54, -4, -61, -90, -78, -31}, -++{82, 22, -54, -90, -61, 13, 78, 85, 31, -46, -90, -67, 4, 73, 88, 38}, -++{78, -4, -82, -73, 13, 85, 67, -22, -88, -61, 31, 90, 54, -38, -90, -46}, -++{73, -31, -90, -22, 78, 67, -38, -90, -13, 82, 61, -46, -88, -4, 85, 54}, -++{67, -54, -78, 38, 85, -22, -90, 4, 90, 13, -88, -31, 82, 46, -73, -61}, -++{61, -73, -46, 82, 31, -88, -13, 90, -4, -90, 22, 85, -38, -78, 54, 67}, -++{54, -85, -4, 88, -46, -61, 82, 13, -90, 38, 67, -78, -22, 90, -31, -73}, -++{46, -90, 38, 54, -90, 31, 61, -88, 22, 67, -85, 13, 73, -82, 4, 78}, -++{38, -88, 73, -4, -67, 90, -46, -31, 85, -78, 13, 61, -90, 54, 22, -82}, -++{31, -78, 90, -61, 4, 54, -88, 82, -38, -22, 73, -90, 67, -13, -46, 85}, -++{22, -61, 85, -90, 73, -38, -4, 46, -78, 90, -82, 54, -13, -31, 67, -88}, -++{13, -38, 61, -78, 88, -90, 85, -73, 54, -31, 4, 22, -46, 67, -82, 90}, -++{ 4, -13, 22, -31, 38, -46, 54, -61, 67, -73, 78, -82, 85, -88, 90, -90} -++}; -++ -+ struct GPU -+ { -+ unsigned int qpu_code[QPU_CODE_SIZE]; -+ unsigned int vpu_code[VPU_CODE_SIZE]; -++ short transMatrix2even[16*16]; -+ int open_count; // Number of allocated video buffers -+ unsigned int vc_handle; // Handle of this memory -+ int mb; // Mailbox handle -+@@ -123,6 +161,8 @@ static int gpu_init(volatile struct GPU **gpu) { -+ assert(num_bytes<=VPU_CODE_SIZE*sizeof(unsigned int)); -+ memcpy((void*)ptr->vpu_code, rpi_hevc_transform, num_bytes); -+ } -++ // And the transform coefficients -++ memcpy((void*)ptr->transMatrix2even, rpi_transMatrix2even, 16*16*sizeof(short)); -+ -+ return 0; -+ } -+@@ -274,11 +314,43 @@ unsigned int vpu_get_fn(void) { -+ return gpu->vc + offsetof(struct GPU,vpu_code); -+ } -+ -++unsigned int vpu_get_constants(void) { -++ if (gpu==NULL) { -++ gpu_lock(); -++ gpu_unlock(); -++ } -++ return gpu->vc + offsetof(struct GPU,transMatrix2even); -++} -++ -+ unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5) -+ { -+ unsigned r; -++#ifdef RPI_TIME_TOTAL_VPU -++ static int last_time=0; -++ static long long on_time=0; -++ static long long off_time=0; -++ int start_time; -++ int end_time; -++ static int count=0; -++ static long long countr2=0; -++#endif -+ gpu_lock(); -++#ifdef RPI_TIME_TOTAL_VPU -++ start_time = Microseconds(); -++ if (last_time==0) -++ last_time = start_time; -++ off_time += start_time-last_time; -++#endif -+ r = execute_code(gpu->mb, code, r0, r1, r2, r3, r4, r5); -++#ifdef RPI_TIME_TOTAL_VPU -++ end_time = Microseconds(); -++ last_time = end_time; -++ on_time += end_time - start_time; -++ count++; -++ countr2 += r2; -++ if ((count&0x7f)==0) -++ printf("VPU %d %lld On=%dms, Off=%dms\n",count,countr2,(int)(on_time/1000),(int)(off_time/1000)); -++#endif -+ gpu_unlock(); -+ return r; -+ } -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 4e3c35c..814fc3c 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -34,6 +34,7 @@ extern unsigned int qpu_get_fn(int num); -+ -+ // VPU specific functions -+ extern unsigned int vpu_get_fn(void); -++extern unsigned int vpu_get_constants(void); -+ extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -+ -+ // Simple test of shader code -+-- -+2.7.4 -+ -+ -+From 4bb0a7ba6723650e74d63cec2123f76da4c3eb0e Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 5 May 2015 09:41:23 +0100 -+Subject: [PATCH 05/68] Fixed deblocking -+ -+--- -+ libavcodec/hevc.c | 20 +++++++++++++++++--- -+ 1 file changed, 17 insertions(+), 3 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 94ff709..391c57a 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2400,8 +2400,9 @@ static void rpi_execute_transform(HEVCContext *s) -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- //gpu_cache_flush(&s->coeffs_buf[i]); -++ gpu_cache_flush(&s->coeffs_buf[i]); -+ vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[i].vc, s->num_coeffs[i] >> 8, 0, 0, 0); -++ gpu_cache_flush(&s->coeffs_buf[i]); -+ -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+@@ -2440,6 +2441,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -+ #ifdef RPI -++ int start_ctb_x = (s->sh.slice_ctb_addr_rs % ((s->ps.sps->width + ctb_size - 1) >> s->ps.sps->log2_ctb_size)) << s->ps.sps->log2_ctb_size; -+ s->enable_rpi = 1; // TODO this should depend on cross component and frame width etc. -+ #endif -+ -+@@ -2473,9 +2475,17 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ #ifdef RPI -+- if (1 || x_ctb + ctb_size >= s->ps.sps->width) { // TODO watch out for deblocking! -++ if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -++ int x; -++ // Transform all blocks -+ rpi_execute_transform(s); -++ // Perform intra prediction and residual reconstruction -+ rpi_execute_pred_cmds(s); -++ // Perform deblocking for CTBs in this row -++ for(x = start_ctb_x; x <= x_ctb; x += ctb_size) { // TODO this will fail for tiles -++ ff_hevc_hls_filters(s, x, y_ctb, ctb_size); -++ } -++ start_ctb_x = 0; -+ } -+ #endif -+ if (more_data < 0) { -+@@ -2486,6 +2496,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ ctb_addr_ts++; -+ ff_hevc_save_states(s, ctb_addr_ts); -++#ifdef RPI -++ if (s->enable_rpi) -++ continue; -++#endif -+ ff_hevc_hls_filters(s, x_ctb, y_ctb, ctb_size); -+ } -+ -+@@ -3289,7 +3303,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ if (!s->univ_pred_cmds) -+ goto fail; -+ for(i = 0; i < 4; i++) { -+- gpu_malloc_uncached(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16, &s->coeffs_buf[i]); // TODO slim this down and share across sizes -++ gpu_malloc_cached(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16, &s->coeffs_buf[i]); // TODO slim this down and share across sizes -+ s->coeffs_buf_arm[i] = (int16_t*) s->coeffs_buf[i].arm; -+ if (!s->coeffs_buf_arm[i]) -+ goto fail; -+-- -+2.7.4 -+ -+ -+From 9079ef888e3d81a69f3c802ddc3c5134679e74a6 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 5 May 2015 11:32:30 +0100 -+Subject: [PATCH 06/68] Added 32x32 transform -+ -+--- -+ libavcodec/hevc.c | 8 +- -+ libavcodec/hevc_cabac.c | 4 +- -+ libavcodec/rpi_hevc_transform.h | 200 +++++++++++++++++----------------------- -+ libavcodec/rpi_hevc_transform.s | 102 ++++++++++---------- -+ libavcodec/rpi_qpu.c | 4 +- -+ 5 files changed, 148 insertions(+), 170 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 391c57a..0dde6f2 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2400,9 +2400,11 @@ static void rpi_execute_transform(HEVCContext *s) -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- gpu_cache_flush(&s->coeffs_buf[i]); -+- vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[i].vc, s->num_coeffs[i] >> 8, 0, 0, 0); -+- gpu_cache_flush(&s->coeffs_buf[i]); -++ gpu_cache_flush(&s->coeffs_buf[2]); -++ gpu_cache_flush(&s->coeffs_buf[3]); -++ vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[2].vc, s->num_coeffs[2] >> 8, s->coeffs_buf[3].vc, s->num_coeffs[3] >> 10, 0); -++ gpu_cache_flush(&s->coeffs_buf[2]); -++ gpu_cache_flush(&s->coeffs_buf[3]); -+ -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index d1cba86..88aa959 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1031,7 +1031,9 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int vshift = s->ps.sps->vshift[c_idx]; -+ uint8_t *dst = &s->frame->data[c_idx][(y0 >> vshift) * stride + -+ ((x0 >> hshift) << s->ps.sps->pixel_shift)]; -+- int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag && !transform_skip_flag && !lc->tu.cross_pf && log2_trafo_size==4; -++#ifdef RPI -++ int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag && !transform_skip_flag && !lc->tu.cross_pf && log2_trafo_size>=4; -++#endif -+ int16_t *coeffs = (int16_t*)(c_idx ? lc->edge_emu_buffer2 : lc->edge_emu_buffer); -+ uint8_t significant_coeff_group_flag[8][8] = {{0}}; -+ int explicit_rdpcm_flag = 0; -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index c0c279f..6d772d7 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -1,6 +1,10 @@ -+ unsigned char rpi_hevc_transform [] = { -+ 169, -+ 3, -++62, -++64, -++79, -++64, -+ 3, -+ 232, -+ 32, -+@@ -17,6 +21,22 @@ unsigned char rpi_hevc_transform [] = { -+ 248, -+ 0, -+ 0, -++64, -++232, -++0, -++2, -++0, -++0, -++12, -++248, -++0, -++168, -++0, -++0, -++192, -++248, -++0, -++0, -+ 0, -+ 96, -+ 3, -+@@ -79,7 +99,7 @@ unsigned char rpi_hevc_transform [] = { -+ 70, -+ 128, -+ 144, -+-39, -++40, -+ 0, -+ 4, -+ 255, -+@@ -113,7 +133,7 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 128, -+ 144, -+-22, -++23, -+ 0, -+ 4, -+ 255, -+@@ -153,6 +173,8 @@ unsigned char rpi_hevc_transform [] = { -+ 140, -+ 211, -+ 192, -++34, -++31, -+ 41, -+ 3, -+ 70, -+@@ -195,7 +217,7 @@ unsigned char rpi_hevc_transform [] = { -+ 255, -+ 36, -+ 204, -+-96, -++224, -+ 2, -+ 0, -+ 248, -+@@ -219,62 +241,10 @@ unsigned char rpi_hevc_transform [] = { -+ 103, -+ 90, -+ 0, -+-8, -+-240, -+-0, -+-128, -+-128, -+-3, -+-0, -+-247, -+-32, -+-128, -+-10, -+-4, -+-136, -+-240, -+-32, -+-0, -+-128, -+-3, -+-112, -+-96, -+-90, -+-0, -+-169, -+-3, -+-3, -+-232, -+-32, -+-0, -+-0, -+-0, -+-12, -+-248, -+-0, -+-136, -+-0, -+-0, -+-192, -+-248, -+-0, -+-0, -++225, -++64, -++242, -+ 64, -+-232, -+-0, -+-2, -+-0, -+-0, -+-12, -+-248, -+-0, -+-168, -+-0, -+-0, -+-192, -+-248, -+-0, -+-0, -+ 3, -+ 232, -+ 128, -+@@ -287,18 +257,6 @@ unsigned char rpi_hevc_transform [] = { -+ 2, -+ 0, -+ 0, -+-4, -+-232, -+-64, -+-0, -+-0, -+-0, -+-5, -+-232, -+-0, -+-8, -+-0, -+-0, -+ 57, -+ 239, -+ 224, -+@@ -317,18 +275,26 @@ unsigned char rpi_hevc_transform [] = { -+ 64, -+ 26, -+ 64, -++4, -++232, -++64, -++0, -++0, -++0, -++149, -++96, -+ 161, -+ 64, -+ 152, -+ 64, -+ 128, -+ 144, -+-31, -++35, -+ 0, -+ 72, -+ 232, -+-32, -+ 0, -++4, -+ 0, -+ 0, -+ 65, -+@@ -339,8 +305,16 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 128, -+ 144, -+-23, -++27, -++0, -++4, -++232, -++0, -++8, -+ 0, -++0, -++69, -++96, -+ 145, -+ 64, -+ 168, -+@@ -351,8 +325,8 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 72, -+ 232, -+-32, -+ 0, -++4, -+ 0, -+ 0, -+ 65, -+@@ -373,7 +347,7 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 242, -+ 140, -+-229, -++221, -+ 192, -+ 57, -+ 239, -+@@ -383,6 +357,8 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 41, -+ 3, -++239, -++3, -+ 12, -+ 248, -+ 0, -+@@ -390,7 +366,7 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 0, -+ 192, -+-8, -++248, -+ 4, -+ 0, -+ 12, -+@@ -400,14 +376,14 @@ unsigned char rpi_hevc_transform [] = { -+ 64, -+ 0, -+ 192, -+-8, -++248, -+ 4, -+ 0, -+ 0, -+ 96, -+ 255, -+ 159, -+-131, -++154, -+ 255, -+ 0, -+ 232, -+@@ -417,7 +393,7 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 255, -+ 159, -+-142, -++165, -+ 255, -+ 4, -+ 255, -+@@ -429,7 +405,7 @@ unsigned char rpi_hevc_transform [] = { -+ 251, -+ 62, -+ 0, -+-5, -++4, -+ 255, -+ 51, -+ 204, -+@@ -439,15 +415,15 @@ unsigned char rpi_hevc_transform [] = { -+ 251, -+ 16, -+ 0, -+-77, -++76, -+ 254, -+ 51, -+ 204, -+-9, -+-4, -++128, -++3, -+ 224, -+ 251, -+-0, -++20, -+ 0, -+ 128, -+ 64, -+@@ -467,16 +443,6 @@ unsigned char rpi_hevc_transform [] = { -+ 99, -+ 0, -+ 0, -+-4, -+-254, -+-0, -+-144, -+-128, -+-2, -+-0, -+-8, -+-2, -+-0, -+ 32, -+ 247, -+ 240, -+@@ -488,92 +454,92 @@ unsigned char rpi_hevc_transform [] = { -+ 176, -+ 207, -+ 17, -+-3, -++19, -+ 32, -+ 247, -+ 112, -+ 207, -+ 18, -+-3, -++35, -+ 32, -+ 247, -+ 48, -+ 207, -+ 19, -+-3, -++51, -+ 32, -+ 247, -+ 240, -+ 206, -+ 20, -+-3, -++67, -+ 32, -+ 247, -+ 176, -+ 206, -+ 21, -+-3, -++83, -+ 32, -+ 247, -+ 112, -+ 206, -+ 22, -+-3, -++99, -+ 32, -+ 247, -+ 48, -+ 206, -+ 23, -+-3, -++115, -+ 32, -+ 247, -+ 240, -+ 205, -+ 24, -+-3, -++131, -+ 32, -+ 247, -+ 176, -+ 205, -+ 25, -+-3, -++147, -+ 32, -+ 247, -+ 112, -+ 205, -+ 26, -+-3, -++163, -+ 32, -+ 247, -+ 48, -+ 205, -+ 27, -+-3, -++179, -+ 32, -+ 247, -+ 240, -+ 204, -+ 28, -+-3, -++195, -+ 32, -+ 247, -+ 176, -+ 204, -+ 29, -+-3, -++211, -+ 32, -+ 247, -+ 112, -+ 204, -+ 30, -+-3, -++227, -+ 32, -+ 247, -+ 48, -+ 204, -+ 31, -+-3, -+-5, -++243, -++4, -+ 255, -+ 51, -+ 204, -+@@ -583,20 +549,20 @@ unsigned char rpi_hevc_transform [] = { -+ 251, -+ 16, -+ 0, -+-77, -++76, -+ 254, -+ 51, -+ 204, -+-9, -+-4, -++128, -++3, -+ 224, -+ 251, -+-0, -++20, -+ 0, -+ 0, -+ 237, -++32, -+ 0, -+-4, -+ 0, -+ 0, -+ 140, -+@@ -609,6 +575,6 @@ unsigned char rpi_hevc_transform [] = { -+ 99, -+ 0, -+ 0, -+-90, -+-0, -++111, -++3, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index 1e389c7..afdb32a 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -76,12 +76,19 @@ -+ # transMatrix2: address of the constant matrix (must be at 32 byte aligned address in Videocore memory) -+ # coeffs: address of the transform coefficients (must be at 32 byte aligned address in Videocore memory) -+ # num: number of 16x16 transforms to be done -++# coeffs32 -++# num32: number of 32x32 transforms -+ # -+ hevc_trans_16x16: -+ push r6-r15, lr # TODO cut down number of used registers -+- -++ mov r14,r3 # coeffs32 -++ mov r15,r4 # num32 -+ mov r3, 16*2 # Stride of transMatrix2 in bytes -+ vldh HX(32++,0),(r0 += r3) REP 16 # This is the 16x16 matrix, a transform is equivalent to multiplying input row vector * matrix -++ -++ add r0, 16*16*2 # For 32x32 transforms we also need this matrix -++ vldh HX(32++,32),(r0 += r3) REP 16 # This is the odd 16x16 matrix -++ -+ # Now use r0 to describe which matrix we are working on. -+ # Allows us to prefetch the next block of coefficients for efficiency. -+ mov r0,0 # This describes the location where we read our coefficients from -+@@ -121,6 +128,10 @@ block_loop: -+ add r1,r7 -+ -+ addcmpbgt r2,-1,0,block_loop -++ -++ # Now go and do any 32x32 transforms -++ b hevc_trans_32x32 -++ -+ pop r6-r15, pc -+ -+ # r1,r2,r3 r7,r8 should be preserved -+@@ -136,26 +147,18 @@ col_trans_16_loop: -+ # Then sum up the results and place back -+ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -+ addcmpblt r0,1,r6,col_trans_16_loop -+- sub r0,16 # but r0 back to its original value -++ sub r0,16 # put r0 back to its original value -+ b lr -+ -+ col_trans_odd_16: -+ add r6,r0,16 # Final value for this loop -+ col_trans_odd_16_loop: -+ # First compute partial products for a single column -+- vmul32s HY(48++,0), VX(0,0)+r0, VX(32,0++) REP 16 -++ vmul32s HY(48++,0), VX(0,0)+r0, VX(32,32++) REP 16 -+ # Then sum up the results and place back -+ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -+ addcmpblt r0,1,r6,col_trans_odd_16_loop -+- sub r0,16 # but r0 back to its original value -+- b lr -+- -+- -+-test_add: -+- vldh HX(0,0),(r0) -+- vadd HX(0,0),HX(0,0),10 -+- vsth HX(0,0),(r0) -+- mov r0,7 # return value -++ sub r0,16 # put r0 back to its original value -+ b lr -+ -+ # hevc_trans_32x32(short *transMatrix2, short *coeffs, int num) -+@@ -164,18 +167,17 @@ test_add: -+ # num: number of 16x16 transforms to be done -+ # -+ hevc_trans_32x32: -+- push r6-r15, lr # TODO cut down number of used registers -++ mov r1,r14 # coeffs -++ mov r2,r15 # num -+ -+- # Fetch transform matrices -+- mov r3, 16*2 # Stride of transMatrix2 in bytes (and of coefficients) -+- vldh HX(32++,0),(r0 += r3) REP 16 # This is the even 16x16 matrix -+- add r0, 16*16*2 -+- vldh HX(32++,32),(r0 += r3) REP 16 # This is the odd 16x16 matrix -++ # Fetch odd transform matrix -++ #mov r3, 16*2 # Stride of transMatrix2 in bytes (and of coefficients) -++ #vldh HX(32++,0),(r0 += r3) REP 16 # This is the even 16x16 matrix -++ #add r0, 16*16*2 -++ #vldh HX(32++,32),(r0 += r3) REP 16 # This is the odd 16x16 matrix -+ -+ mov r3, 32*2*2 # Stride used to fetch alternate rows of our input coefficient buffer -+ mov r7, 16*16*2 # Total block size -+- mov r4, 64 # Constant used for rounding first pass -+- mov r5, 1<<11 # Constant used for rounding second pass -+ sub sp,sp,32*32*2+32 # Allocate some space on the stack for us to store 32*32 shorts as temporary results (needs to be aligned) -+ # set r8 to 32byte aligned stack pointer -+ add r8,sp,31 -+@@ -186,21 +188,27 @@ hevc_trans_32x32: -+ block_loop32: -+ -+ # COLUMN TRANSFORM -++ mov r4, 64 # Constant used for rounding first pass -++ mov r5, 9 # left shift used for rounding first pass -++ -+ # Transform the first 16 columns -+ mov r1,r10 # Input Coefficient buffer -+ mov r8,r9 # Output temporary storage -+ bl trans32 -+ # Transform the second 16 columns -+- add r8,32 -++ add r8,32*16*2 -+ add r1,32 -+ bl trans32 -+ -+ # ROW TRANSFORM -++ mov r4, 1<<11 # Constant used for rounding second pass -++ mov r5, 4 # left shift used for rounding second pass -++ -+ mov r1,r9 # Input temporary storage -+ mov r8,r10 # Output Coefficient buffer -+ bl trans32 -+ # Transform the second 16 columns -+- add r8,32 -++ add r8,32*16*2 -+ add r1,32 -+ bl trans32 -+ -+@@ -212,11 +220,12 @@ block_loop32: -+ pop r6-r15, pc -+ -+ trans32: -++ push lr -+ # We can no longer afford the VRF space to do prefetching when doing 32x32 -+ # Fetch the even rows -+- vldh HX(0++,0)+r0,(r1 += r3) REP 16 -++ vldh HX(0++,0),(r1 += r3) REP 16 -+ # Fetch the odd rows -+- vldh HX(16++,0)+r0,64(r1 += r3) REP 16 # First odd row is 32 shorts ahead of r1 -++ vldh HX(16++,0),64(r1 += r3) REP 16 # First odd row is 32 shorts ahead of r1 -+ -+ # Transform the even rows using even matrix -+ mov r0, 0 # Even rows -+@@ -228,33 +237,32 @@ trans32: -+ -+ # Now apply butterfly to compute the first 16 results -+ vadd HY(48++,0),HY(0++,0),HY(16++,0) REP 16 -+- vadd HY(48++,0),HY(48++,0),r4 REP 32 # add on rounding, -+- vasl HY(48++,0),HY(48++,0),9 REP 32 # shift down by 7, and saturate -++ vadd HY(48++,0),HY(48++,0),r4 REP 16 # add on rounding, -++ vasl HY(48++,0),HY(48++,0),r5 REP 16 # shift down by 7, and saturate -+ # 16bit results now in HX(48,32) -+ mov r0,r8 -+ mov r6,32*2 -+ vsth VX(48,32++),(r0+=r6) REP 16 -+- vmov VX(0,0++)+r0, HX(0++,32)+r0 REP 16 # Store transposed -+ -+ # Now apply butterfly to compute the second 16 results (in reverse order) -+- vsub HY(63,0),HY(0,0),HY(16,0) -+- vsub HY(62,0),HY(0,0),HY(17,0) -+- vsub HY(61,0),HY(0,0),HY(18,0) -+- vsub HY(60,0),HY(0,0),HY(19,0) -+- vsub HY(59,0),HY(0,0),HY(20,0) -+- vsub HY(58,0),HY(0,0),HY(21,0) -+- vsub HY(57,0),HY(0,0),HY(22,0) -+- vsub HY(56,0),HY(0,0),HY(23,0) -+- vsub HY(55,0),HY(0,0),HY(24,0) -+- vsub HY(54,0),HY(0,0),HY(25,0) -+- vsub HY(53,0),HY(0,0),HY(26,0) -+- vsub HY(52,0),HY(0,0),HY(27,0) -+- vsub HY(51,0),HY(0,0),HY(28,0) -+- vsub HY(50,0),HY(0,0),HY(29,0) -+- vsub HY(49,0),HY(0,0),HY(30,0) -+- vsub HY(48,0),HY(0,0),HY(31,0) -+- vadd HY(48++,0),HY(48++,0),r4 REP 32 # add on rounding, -+- vasl HY(48++,0),HY(48++,0),9 REP 32 # shift down by 7, and saturate -+- add r0,r8,16*32*2 # Move to 16th row -++ vsub HY(63,0),HY(0 ,0),HY(16,0) -++ vsub HY(62,0),HY(1 ,0),HY(17,0) -++ vsub HY(61,0),HY(2 ,0),HY(18,0) -++ vsub HY(60,0),HY(3 ,0),HY(19,0) -++ vsub HY(59,0),HY(4 ,0),HY(20,0) -++ vsub HY(58,0),HY(5 ,0),HY(21,0) -++ vsub HY(57,0),HY(6 ,0),HY(22,0) -++ vsub HY(56,0),HY(7 ,0),HY(23,0) -++ vsub HY(55,0),HY(8 ,0),HY(24,0) -++ vsub HY(54,0),HY(9 ,0),HY(25,0) -++ vsub HY(53,0),HY(10,0),HY(26,0) -++ vsub HY(52,0),HY(11,0),HY(27,0) -++ vsub HY(51,0),HY(12,0),HY(28,0) -++ vsub HY(50,0),HY(13,0),HY(29,0) -++ vsub HY(49,0),HY(14,0),HY(30,0) -++ vsub HY(48,0),HY(15,0),HY(31,0) -++ vadd HY(48++,0),HY(48++,0),r4 REP 16 # add on rounding, -++ vasl HY(48++,0),HY(48++,0),r5 REP 16 # shift down by 7, and saturate -++ add r0,r8,32 -+ vsth VX(48,32++),(r0+=r6) REP 16 -+- b lr -++ pop pc -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index d720546..12ad5fb 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -89,7 +89,7 @@ struct GPU -+ { -+ unsigned int qpu_code[QPU_CODE_SIZE]; -+ unsigned int vpu_code[VPU_CODE_SIZE]; -+- short transMatrix2even[16*16]; -++ short transMatrix2even[16*16*2]; -+ int open_count; // Number of allocated video buffers -+ unsigned int vc_handle; // Handle of this memory -+ int mb; // Mailbox handle -+@@ -162,7 +162,7 @@ static int gpu_init(volatile struct GPU **gpu) { -+ memcpy((void*)ptr->vpu_code, rpi_hevc_transform, num_bytes); -+ } -+ // And the transform coefficients -+- memcpy((void*)ptr->transMatrix2even, rpi_transMatrix2even, 16*16*sizeof(short)); -++ memcpy((void*)ptr->transMatrix2even, rpi_transMatrix2even, sizeof(rpi_transMatrix2even)); -+ -+ return 0; -+ } -+-- -+2.7.4 -+ -+ -+From 6c2ed6109c4dd5c8ab16bf16e0ae3be6ae166e50 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 5 May 2015 16:57:03 +0100 -+Subject: [PATCH 07/68] Clear coefficients in advance -+ -+--- -+ libavcodec/hevc.c | 129 ++++++++++++++++++++++++++++------------ -+ libavcodec/hevc.h | 6 +- -+ libavcodec/hevc_cabac.c | 7 ++- -+ libavcodec/rpi_hevc_transform.h | 50 ++++++++++++++++ -+ libavcodec/rpi_hevc_transform.s | 16 +++++ -+ 5 files changed, 168 insertions(+), 40 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 0dde6f2..1424007 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -43,6 +43,8 @@ -+ -+ #ifdef RPI -+ #include "rpi_qpu.h" -++// For some unknown reason, the code seems to crash if I do a late malloc -++#define EARLY_MALLOC -+ #endif -+ -+ // #define DISABLE_MC -+@@ -61,6 +63,20 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ /* free everything allocated by pic_arrays_init() */ -+ static void pic_arrays_free(HEVCContext *s) -+ { -++#ifdef RPI -++#ifdef EARLY_MALLOC -++#else -++ printf("pic_arrays_free\n"); -++ if (s->coeffs_buf_arm[0]) { -++ gpu_free(&s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = 0; -++ } -++ if (s->coeffs_buf_arm[2]) { -++ gpu_free(&s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = 0; -++ } -++#endif -++#endif -+ av_freep(&s->sao); -+ av_freep(&s->deblock); -+ -+@@ -97,6 +113,28 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ int ctb_count = sps->ctb_width * sps->ctb_height; -+ int min_pu_size = sps->min_pu_width * sps->min_pu_height; -+ -++#ifdef RPI -++#ifdef EARLY_MALLOC -++#else -++ int coeffs_in_ctb = (1 << s->ps.sps->log2_ctb_size) * (1 << s->ps.sps->log2_ctb_size); -++ int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -++ printf("pic_arrays_init\n"); -++ printf("Allocated %d\n",coefs_per_row); -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -++ if (!s->coeffs_buf_arm[0]) -++ goto fail; -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -++ s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -++ if (!s->coeffs_buf_arm[2]) -++ goto fail; -++ s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -++ s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -++ printf("Done\n"); -++#endif -++#endif -++ -+ s->bs_width = (width >> 2) + 1; -+ s->bs_height = (height >> 2) + 1; -+ -+@@ -2400,11 +2438,10 @@ static void rpi_execute_transform(HEVCContext *s) -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- gpu_cache_flush(&s->coeffs_buf[2]); -+- gpu_cache_flush(&s->coeffs_buf[3]); -+- vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[2].vc, s->num_coeffs[2] >> 8, s->coeffs_buf[3].vc, s->num_coeffs[3] >> 10, 0); -+- gpu_cache_flush(&s->coeffs_buf[2]); -+- gpu_cache_flush(&s->coeffs_buf[3]); -++ -++ gpu_cache_flush(&s->coeffs_buf_accelerated); -++ vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -++ //gpu_cache_flush(&s->coeffs_buf_accelerated); -+ -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+@@ -2426,7 +2463,9 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ lc->na.cand_up_right = (cmd->na >> 0) & 1; -+ s->hpc.intra_pred[cmd->size - 2](s, cmd->x, cmd->y, cmd->c_idx); -+ } else { -++ int trafo_size = 1 << cmd->size; -+ s->hevcdsp.transform_add[cmd->size-2](cmd->dst, cmd->buf, cmd->stride); -++ memset(cmd->buf, 0, trafo_size * trafo_size * sizeof(int16_t)); // Clear coefficients here while they are in the cache -+ } -+ } -+ s->num_pred_cmds = 0; -+@@ -3235,10 +3274,18 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->unif_mv_cmds); -+ av_freep(&s->unif_xfm_cmds); -+ av_freep(&s->univ_pred_cmds); -+- for(i = 0; i < 4; i++) { -+- gpu_free(&s->coeffs_buf[i]); -++ -++#ifdef EARLY_MALLOC -++ if (s->coeffs_buf_arm[0]) { -++ gpu_free(&s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = 0; -++ } -++ if (s->coeffs_buf_arm[2]) { -++ gpu_free(&s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = 0; -+ } -+ #endif -++#endif -+ -+ for (i = 0; i < 3; i++) { -+ av_freep(&s->sao_pixel_buffer_h[i]); -+@@ -3281,6 +3328,16 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ return 0; -+ } -+ -++#ifdef RPI -++static av_cold void memclear16(int16_t *p, int n) -++{ -++ vpu_execute_code( vpu_get_fn(), p, n, 0, 0, 0, 1); -++ //int i; -++ //for(i=0;ipriv_data; -+@@ -3304,37 +3361,35 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -+ if (!s->univ_pred_cmds) -+ goto fail; -+- for(i = 0; i < 4; i++) { -+- gpu_malloc_cached(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16, &s->coeffs_buf[i]); // TODO slim this down and share across sizes -+- s->coeffs_buf_arm[i] = (int16_t*) s->coeffs_buf[i].arm; -+- if (!s->coeffs_buf_arm[i]) -+- goto fail; -+- } -+- s->enable_rpi = 0; -+ -+- // A little test program -+- /*{ -+- GPU_MEM_PTR_T p; -+- int err = gpu_malloc_cached(16, &p); -+- short *q = (short *)p.arm; -+- int i; -+- int r; -+- printf("Allocated memory %d ARM 0x%x, VC 0x%x, Code 0x%x\n",err,(int)p.arm,p.vc,(int)vpu_get_fn()); -+- printf("Allocated memory %d ARM 0x%x, VC 0x%x\n",err,(int)p.arm,p.vc); -+- printf("Preparing data %p\n",q); -+- for(i=0;i<16;i++) -+- q[i] = i; -+- printf("Flush cache\n"); -+- gpu_cache_flush(&p); -+- printf("Executing code\n"); -+- r = vpu_execute_code( vpu_get_fn(), p.vc, 0, 0, 0, 0, 0); -+- printf("Return value %d (",r); -+- for(i=0;i<16;i++) -+- printf("%d ",q[i]); -+- printf(")\n"); -+- gpu_free(&p); -+- goto fail; // Early out -+- }*/ -++ s->coeffs_buf_arm[0] = 0; -++ s->coeffs_buf_arm[2] = 0; -++ -++#ifdef EARLY_MALLOC -++ int coeffs_in_ctb = 64*64; -++ int coefs_per_row = (2048/64) * coeffs_in_ctb * 3; // Allow space for chroma -++ printf("Allocated %d\n",coefs_per_row); -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -++ if (!s->coeffs_buf_arm[0]) -++ goto fail; -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -++ s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -++ if (!s->coeffs_buf_arm[2]) -++ goto fail; -++ s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -++ s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -++ printf("Done\n"); -++ //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[0], coefs_per_row); -++ //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[2], coefs_per_row); -++ //memset(s->coeffs_buf_arm[3],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[3], coefs_per_row); -++#endif -++ -++ s->enable_rpi = 0; -+ -+ #endif -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 4167985..9a228f6 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -861,8 +861,12 @@ typedef struct HEVCContext { -+ HEVCMvCmd *unif_mv_cmds; -+ HEVCXfmCmd *unif_xfm_cmds; -+ HEVCPredCmd *univ_pred_cmds; -+- GPU_MEM_PTR_T coeffs_buf[4]; -++ int buf_width; -++ GPU_MEM_PTR_T coeffs_buf_default; -++ GPU_MEM_PTR_T coeffs_buf_accelerated; -+ int16_t *coeffs_buf_arm[4]; -++ unsigned int coeffs_buf_vc[4]; -++ -+ int num_coeffs[4]; -+ int num_xfm_cmds; -+ int num_mv_cmds; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 88aa959..dbfee85 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1058,9 +1058,13 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ s->num_coeffs[0] += n; -+ } -+ } -++ // We now do the memset after transform_add while we know the data is cached. -++ //memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -++#else -++ memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -+ #endif -+ -+- memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -++ -+ -+ // Derive QP for dequant -+ if (!lc->cu.cu_transquant_bypass_flag) { -+@@ -1547,7 +1551,6 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ #ifdef RPI -+ if (s->enable_rpi) { -+ HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -+- //memcpy(coeffs2, coeffs, sizeof(int16_t) * trafo_size * trafo_size); // TODO -+ cmd->type = RPI_PRED_TRANSFORM_ADD; -+ cmd->size = log2_trafo_size; -+ cmd->buf = coeffs; -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index 6d772d7..4f13622 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -1,4 +1,10 @@ -+ unsigned char rpi_hevc_transform [] = { -++21, -++106, -++0, -++144, -++35, -++1, -+ 169, -+ 3, -+ 62, -+@@ -577,4 +583,48 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 111, -+ 3, -++4, -++254, -++0, -++128, -++0, -++4, -++0, -++248, -++0, -++0, -++2, -++232, -++32, -++0, -++0, -++0, -++140, -++248, -++32, -++0, -++0, -++0, -++224, -++35, -++0, -++0, -++64, -++232, -++0, -++2, -++0, -++0, -++193, -++232, -++0, -++1, -++0, -++0, -++1, -++106, -++116, -++30, -++90, -++0, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index afdb32a..fd159bc 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -78,8 +78,11 @@ -+ # num: number of 16x16 transforms to be done -+ # coeffs32 -+ # num32: number of 32x32 transforms -++# command 0 for transform, 1 for memclear16(int16_t *dst,num16) -+ # -+ hevc_trans_16x16: -++ cmp r5,1 -++ beq memclear16 -+ push r6-r15, lr # TODO cut down number of used registers -+ mov r14,r3 # coeffs32 -+ mov r15,r4 # num32 -+@@ -266,3 +269,16 @@ trans32: -+ add r0,r8,32 -+ vsth VX(48,32++),(r0+=r6) REP 16 -+ pop pc -++ -++memclear16: -++ # r0 is address -++ # r1 is number of 16bits values to set to 0 (may overrun past end and clear more than specified) -++ vmov HX(0++,0),0 REP 16 -++ mov r2,32 -++loop: -++ vsth HX(0++,0),(r0+=r2) REP 16 -++ add r0,16*16*2 -++ sub r1,16*16 -++ cmp r1,0 -++ bgt loop -++ b lr -+-- -+2.7.4 -+ -+ -+From 48282c2fb55c0d9a72222f384c03c432f78a3016 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 6 May 2015 09:56:43 +0100 -+Subject: [PATCH 08/68] Prepared inter offload -+ -+--- -+ libavcodec/hevc.c | 116 +++++++++++++++++++++++++++++++++++++++++++----- -+ libavcodec/hevc.h | 29 +++++++++++- -+ libavcodec/hevc_cabac.c | 5 ++- -+ 3 files changed, 137 insertions(+), 13 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 1424007..8215201 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -45,6 +45,8 @@ -+ #include "rpi_qpu.h" -+ // For some unknown reason, the code seems to crash if I do a late malloc -+ #define EARLY_MALLOC -++// Move Inter prediction into separate pass -++//#define RPI_INTER -+ #endif -+ -+ // #define DISABLE_MC -+@@ -1440,6 +1442,95 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size) -+ * @param luma_offset additive offset applied to the luma prediction value -+ */ -+ -++#ifdef RPI_INTER -++#define RPI_REDIRECT(fn) rpi_ ## fn -++static void rpi_luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -++ AVFrame *ref, const Mv *mv, int x_off, int y_off, -++ int block_w, int block_h, int luma_weight, int luma_offset) -++{ -++ HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ cmd->cmd = RPI_CMD_LUMA_UNI; -++ cmd->dst = dst; -++ cmd->dststride = dststride; -++ cmd->src = ref->data[0]; -++ cmd->srcstride = ref->linesize[0]; -++ cmd->mv = *mv; -++ cmd->x_off = x_off; -++ cmd->y_off = y_off; -++ cmd->block_w = block_w; -++ cmd->block_h = block_h; -++ cmd->weight = luma_weight; -++ cmd->offset = luma_offset; -++} -++ -++static void rpi_luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -++ AVFrame *ref0, const Mv *mv0, int x_off, int y_off, -++ int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) -++{ -++ HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ cmd->cmd = RPI_CMD_LUMA_BI; -++ cmd->dst = dst; -++ cmd->dststride = dststride; -++ cmd->src = ref->data[0]; -++ cmd->srcstride = ref->linesize[0]; -++ cmd->mv = *mv; -++ cmd->x_off = x_off; -++ cmd->y_off = y_off; -++ cmd->block_w = block_w; -++ cmd->block_h = block_h; -++ cmd->weight = luma_weight; -++ cmd->offset = luma_offset; -++ cmd->src1 = ref1->data[]; -++ cmd->srcstride1 = ref1->linesize[0]; -++ cmd->mv1 = *mv1; -++ cmd->ref_idx[0] = current_mv->ref_idx[0]; -++ cmd->ref_idx[1] = current_mv->ref_idx[1]; -++} -++ -++static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -++ ptrdiff_t dststride, uint8_t *src0, ptrdiff_t srcstride, int reflist, -++ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int chroma_weight, int chroma_offset) -++{ -++ HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ cmd->cmd = RPI_CMD_CHROMA_UNI; -++ cmd->dst = dst0; -++ cmd->dststride = dststride; -++ cmd->src = src0; -++ cmd->srcstride = srcstride; -++ cmd->mv = current_mv->mv[reflist]; -++ cmd->x_off = x_off; -++ cmd->y_off = y_off; -++ cmd->block_w = block_w; -++ cmd->block_h = block_h; -++ cmd->weight = chroma_weight; -++ cmd->offset = chroma_offset; -++} -++ -++static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, -++ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int cidx) -++{ -++ HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ cmd->cmd = RPI_CMD_CHROMA_BI+cidx; -++ cmd->dst = dst0; -++ cmd->dststride = dststride; -++ cmd->src = ref0->data[cidx+1]; -++ cmd->srcstride = ref0->linesize[cidx+1]; -++ cmd->mv = current_mv->mv[reflist]; -++ cmd->x_off = x_off; -++ cmd->y_off = y_off; -++ cmd->block_w = block_w; -++ cmd->block_h = block_h; -++ cmd->weight = chroma_weight; -++ cmd->offset = chroma_offset; -++ cmd->src = ref1->data[cidx+1]; -++ cmd->srcstride1 = ref1->linesize[cidx+1]; -++ cmd->ref_idx[0] = current_mv->ref_idx[0]; -++ cmd->ref_idx[1] = current_mv->ref_idx[1]; -++} -++#else -++#define RPI_REDIRECT(fn) fn -++#endif -++ -+ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref, const Mv *mv, int x_off, int y_off, -+ int block_w, int block_h, int luma_weight, int luma_offset) -+@@ -1505,7 +1596,7 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ * @param mv1 motion vector1 (relative to block position) to get pixel data from -+ * @param current_mv current motion vector structure -+ */ -+- static void luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -++static void luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref0, const Mv *mv0, int x_off, int y_off, -+ int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) -+ { -+@@ -1887,16 +1978,16 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- luma_mc_uni(s, dst0, s->frame->linesize[0], ref0->frame, -++ RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref0->frame, -+ ¤t_mv.mv[0], x0, y0, nPbW, nPbH, -+ s->sh.luma_weight_l0[current_mv.ref_idx[0]], -+ s->sh.luma_offset_l0[current_mv.ref_idx[0]]); -+ -+ if (s->ps.sps->chroma_format_idc) { -+- chroma_mc_uni(s, dst1, s->frame->linesize[1], ref0->frame->data[1], ref0->frame->linesize[1], -++ RPI_REDIRECT(chroma_mc_uni)(s, dst1, s->frame->linesize[1], ref0->frame->data[1], ref0->frame->linesize[1], -+ 0, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0]); -+- chroma_mc_uni(s, dst2, s->frame->linesize[2], ref0->frame->data[2], ref0->frame->linesize[2], -++ RPI_REDIRECT(chroma_mc_uni)(s, dst2, s->frame->linesize[2], ref0->frame->data[2], ref0->frame->linesize[2], -+ 0, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][1], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][1]); -+ } -+@@ -1906,17 +1997,17 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- luma_mc_uni(s, dst0, s->frame->linesize[0], ref1->frame, -++ RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref1->frame, -+ ¤t_mv.mv[1], x0, y0, nPbW, nPbH, -+ s->sh.luma_weight_l1[current_mv.ref_idx[1]], -+ s->sh.luma_offset_l1[current_mv.ref_idx[1]]); -+ -+ if (s->ps.sps->chroma_format_idc) { -+- chroma_mc_uni(s, dst1, s->frame->linesize[1], ref1->frame->data[1], ref1->frame->linesize[1], -++ RPI_REDIRECT(chroma_mc_uni)(s, dst1, s->frame->linesize[1], ref1->frame->data[1], ref1->frame->linesize[1], -+ 1, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][0], s->sh.chroma_offset_l1[current_mv.ref_idx[1]][0]); -+ -+- chroma_mc_uni(s, dst2, s->frame->linesize[2], ref1->frame->data[2], ref1->frame->linesize[2], -++ RPI_REDIRECT(chroma_mc_uni)(s, dst2, s->frame->linesize[2], ref1->frame->data[2], ref1->frame->linesize[2], -+ 1, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][1], s->sh.chroma_offset_l1[current_mv.ref_idx[1]][1]); -+ } -+@@ -1926,15 +2017,15 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- luma_mc_bi(s, dst0, s->frame->linesize[0], ref0->frame, -++ RPI_REDIRECT(luma_mc_bi)(s, dst0, s->frame->linesize[0], ref0->frame, -+ ¤t_mv.mv[0], x0, y0, nPbW, nPbH, -+ ref1->frame, ¤t_mv.mv[1], ¤t_mv); -+ -+ if (s->ps.sps->chroma_format_idc) { -+- chroma_mc_bi(s, dst1, s->frame->linesize[1], ref0->frame, ref1->frame, -++ RPI_REDIRECT(chroma_mc_bi)(s, dst1, s->frame->linesize[1], ref0->frame, ref1->frame, -+ x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, 0); -+ -+- chroma_mc_bi(s, dst2, s->frame->linesize[2], ref0->frame, ref1->frame, -++ RPI_REDIRECT(chroma_mc_bi)(s, dst2, s->frame->linesize[2], ref0->frame, ref1->frame, -+ x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, 1); -+ } -+ } -+@@ -2465,7 +2556,9 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ } else { -+ int trafo_size = 1 << cmd->size; -+ s->hevcdsp.transform_add[cmd->size-2](cmd->dst, cmd->buf, cmd->stride); -++#ifdef RPI_PRECLEAR -+ memset(cmd->buf, 0, trafo_size * trafo_size * sizeof(int16_t)); // Clear coefficients here while they are in the cache -++#endif -+ } -+ } -+ s->num_pred_cmds = 0; -+@@ -3381,6 +3474,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -+ s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -+ printf("Done\n"); -++#ifdef RPI_PRECLEAR -+ //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -+ memclear16(s->coeffs_buf_arm[0], coefs_per_row); -+ //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -+@@ -3389,6 +3483,8 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ memclear16(s->coeffs_buf_arm[3], coefs_per_row); -+ #endif -+ -++#endif -++ -+ s->enable_rpi = 0; -+ -+ #endif -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 9a228f6..1ac119a 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -803,14 +803,39 @@ typedef struct HEVCLocalContext { -+ // RPI_MAX_WIDTH is maximum width in pixels supported by the accelerated code -+ #define RPI_MAX_WIDTH 2048 -+ -+-// Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane -+-#define RPI_MAX_MV_CMDS (16*3*(RPI_MAX_WIDTH/4)) -++// Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane, * 2 for bi -++#define RPI_MAX_MV_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+ #define RPI_MAX_XFM_CMDS (16*3*(RPI_MAX_WIDTH/4)) -+ // Each block can have an intra prediction and a transform_add command -+ #define RPI_MAX_PRED_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+ -++#define RPI_CMD_LUMA_UNI 0 -++#define RPI_CMD_CHROMA_UNI 1 -++#define RPI_CMD_LUMA_BI 2 -++#define RPI_CMD_U_BI 3 -++#define RPI_CMD_V_BI 4 -++ -++// RPI_PRECLEAR is not working yet - perhaps clearing on VPUs is flawed? -++// #define RPI_PRECLEAR -++ -+ // Command for inter prediction -+ typedef struct HEVCMvCmd { -++ int cmd; -++ uint8_t *dst; -++ ptrdiff_t dststride; -++ uint8_t *src; -++ ptrdiff_t srcstride; -++ Mv mv; -++ int x_off; -++ int y_off; -++ int block_w; -++ int block_h; -++ int weight; -++ int offset; -++ uint8_t *src1; -++ ptrdiff_t srcstride1; -++ Mv mv1; -++ int8_t ref_idx[2]; -+ } HEVCMvCmd; -+ -+ // Command for transform to process a block of coefficients -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index dbfee85..4f072be 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1059,7 +1059,10 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ } -+ // We now do the memset after transform_add while we know the data is cached. -+- //memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -++ #ifdef RPI_PRECLEAR -++ #else -++ memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -++ #endif -+ #else -+ memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -+ #endif -+-- -+2.7.4 -+ -+ -+From 25d3b4e876febe08302a01abd85d5009160ead3e Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 6 May 2015 11:08:50 +0100 -+Subject: [PATCH 09/68] Inter prediction in separate pass -+ -+--- -+ libavcodec/hevc.c | 93 +++++++++++++++++++++++++++++++++++++++++++++---------- -+ libavcodec/hevc.h | 2 +- -+ 2 files changed, 77 insertions(+), 18 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 8215201..b7bc6ad 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -46,7 +46,7 @@ -+ // For some unknown reason, the code seems to crash if I do a late malloc -+ #define EARLY_MALLOC -+ // Move Inter prediction into separate pass -+-//#define RPI_INTER -++#define RPI_INTER -+ #endif -+ -+ // #define DISABLE_MC -+@@ -1448,7 +1448,7 @@ static void rpi_luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref, const Mv *mv, int x_off, int y_off, -+ int block_w, int block_h, int luma_weight, int luma_offset) -+ { -+- HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -+ cmd->cmd = RPI_CMD_LUMA_UNI; -+ cmd->dst = dst; -+ cmd->dststride = dststride; -+@@ -1467,31 +1467,29 @@ static void rpi_luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref0, const Mv *mv0, int x_off, int y_off, -+ int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) -+ { -+- HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -+ cmd->cmd = RPI_CMD_LUMA_BI; -+ cmd->dst = dst; -+ cmd->dststride = dststride; -+- cmd->src = ref->data[0]; -+- cmd->srcstride = ref->linesize[0]; -+- cmd->mv = *mv; -++ cmd->src = ref0->data[0]; -++ cmd->srcstride = ref0->linesize[0]; -++ cmd->mv = *mv0; -+ cmd->x_off = x_off; -+ cmd->y_off = y_off; -+ cmd->block_w = block_w; -+ cmd->block_h = block_h; -+- cmd->weight = luma_weight; -+- cmd->offset = luma_offset; -+- cmd->src1 = ref1->data[]; -++ cmd->src1 = ref1->data[0]; -+ cmd->srcstride1 = ref1->linesize[0]; -+ cmd->mv1 = *mv1; -+ cmd->ref_idx[0] = current_mv->ref_idx[0]; -+ cmd->ref_idx[1] = current_mv->ref_idx[1]; -+ } -+ -+-static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -++static void rpi_chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ ptrdiff_t dststride, uint8_t *src0, ptrdiff_t srcstride, int reflist, -+ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int chroma_weight, int chroma_offset) -+ { -+- HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -+ cmd->cmd = RPI_CMD_CHROMA_UNI; -+ cmd->dst = dst0; -+ cmd->dststride = dststride; -+@@ -1506,27 +1504,27 @@ static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ cmd->offset = chroma_offset; -+ } -+ -+-static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, -++static void rpi_chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, -+ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int cidx) -+ { -+- HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -+ cmd->cmd = RPI_CMD_CHROMA_BI+cidx; -+ cmd->dst = dst0; -+ cmd->dststride = dststride; -+ cmd->src = ref0->data[cidx+1]; -+ cmd->srcstride = ref0->linesize[cidx+1]; -+- cmd->mv = current_mv->mv[reflist]; -++ cmd->mv = current_mv->mv[0]; -++ cmd->mv1 = current_mv->mv[1]; -+ cmd->x_off = x_off; -+ cmd->y_off = y_off; -+ cmd->block_w = block_w; -+ cmd->block_h = block_h; -+- cmd->weight = chroma_weight; -+- cmd->offset = chroma_offset; -+- cmd->src = ref1->data[cidx+1]; -++ cmd->src1 = ref1->data[cidx+1]; -+ cmd->srcstride1 = ref1->linesize[cidx+1]; -+ cmd->ref_idx[0] = current_mv->ref_idx[0]; -+ cmd->ref_idx[1] = current_mv->ref_idx[1]; -+ } -++ -+ #else -+ #define RPI_REDIRECT(fn) fn -+ #endif -+@@ -2554,7 +2552,9 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ lc->na.cand_up_right = (cmd->na >> 0) & 1; -+ s->hpc.intra_pred[cmd->size - 2](s, cmd->x, cmd->y, cmd->c_idx); -+ } else { -++#ifdef RPI_PRECLEAR -+ int trafo_size = 1 << cmd->size; -++#endif -+ s->hevcdsp.transform_add[cmd->size-2](cmd->dst, cmd->buf, cmd->stride); -+ #ifdef RPI_PRECLEAR -+ memset(cmd->buf, 0, trafo_size * trafo_size * sizeof(int16_t)); // Clear coefficients here while they are in the cache -+@@ -2563,6 +2563,61 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ } -+ s->num_pred_cmds = 0; -+ } -++ -++static void rpi_execute_inter_cmds(HEVCContext *s) -++{ -++ HEVCMvCmd *cmd = s->unif_mv_cmds; -++ int n,cidx; -++ AVFrame myref; -++ AVFrame myref1; -++ struct MvField mymv; -++ if (s->num_mv_cmds > RPI_MAX_MV_CMDS) { -++ printf("Overflow inter_cmds\n"); -++ exit(-1); -++ } -++ for(n = s->num_mv_cmds; n>0 ; n--, cmd++) { -++ switch(cmd->cmd) { -++ case RPI_CMD_LUMA_UNI: -++ myref.data[0] = cmd->src; -++ myref.linesize[0] = cmd->srcstride; -++ luma_mc_uni(s, cmd->dst, cmd->dststride, &myref, &cmd->mv, cmd->x_off, cmd->y_off, cmd->block_w, cmd->block_h, cmd->weight, cmd->offset); -++ break; -++ case RPI_CMD_LUMA_BI: -++ myref.data[0] = cmd->src; -++ myref.linesize[0] = cmd->srcstride; -++ myref1.data[0] = cmd->src1; -++ myref1.linesize[0] = cmd->srcstride1; -++ mymv.ref_idx[0] = cmd->ref_idx[0]; -++ mymv.ref_idx[1] = cmd->ref_idx[1]; -++ luma_mc_bi(s, cmd->dst, cmd->dststride, -++ &myref, &cmd->mv, cmd->x_off, cmd->y_off, cmd->block_w, cmd->block_h, -++ &myref1, &cmd->mv1, &mymv); -++ break; -++ case RPI_CMD_CHROMA_UNI: -++ mymv.mv[0] = cmd->mv; -++ chroma_mc_uni(s, cmd->dst, -++ cmd->dststride, cmd->src, cmd->srcstride, 0, -++ cmd->x_off, cmd->y_off, cmd->block_w, cmd->block_h, &mymv, cmd->weight, cmd->offset); -++ break; -++ case RPI_CMD_CHROMA_BI: -++ case RPI_CMD_CHROMA_BI+1: -++ cidx = cmd->cmd - RPI_CMD_CHROMA_BI; -++ myref.data[cidx+1] = cmd->src; -++ myref.linesize[cidx+1] = cmd->srcstride; -++ myref1.data[cidx+1] = cmd->src1; -++ myref1.linesize[cidx+1] = cmd->srcstride1; -++ mymv.ref_idx[0] = cmd->ref_idx[0]; -++ mymv.ref_idx[1] = cmd->ref_idx[1]; -++ mymv.mv[0] = cmd->mv; -++ mymv.mv[1] = cmd->mv1; -++ chroma_mc_bi(s, cmd->dst, cmd->dststride, &myref, &myref1, -++ cmd->x_off, cmd->y_off, cmd->block_w, cmd->block_h, &mymv, cidx); -++ break; -++ } -++ } -++ s->num_mv_cmds = 0; -++} -++ -+ #endif -+ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+@@ -2611,6 +2666,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI -+ if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -+ int x; -++ // Perform inter prediction -++ rpi_execute_inter_cmds(s); -+ // Transform all blocks -+ rpi_execute_transform(s); -+ // Perform intra prediction and residual reconstruction -+@@ -3422,6 +3479,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ } -+ -+ #ifdef RPI -++#ifdef RPI_PRECLEAR -+ static av_cold void memclear16(int16_t *p, int n) -+ { -+ vpu_execute_code( vpu_get_fn(), p, n, 0, 0, 0, 1); -+@@ -3430,6 +3488,7 @@ static av_cold void memclear16(int16_t *p, int n) -+ // p[i] = 0; -+ } -+ #endif -++#endif -+ -+ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ { -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 1ac119a..a0eb71b 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -812,7 +812,7 @@ typedef struct HEVCLocalContext { -+ #define RPI_CMD_LUMA_UNI 0 -+ #define RPI_CMD_CHROMA_UNI 1 -+ #define RPI_CMD_LUMA_BI 2 -+-#define RPI_CMD_U_BI 3 -++#define RPI_CMD_CHROMA_BI 3 -+ #define RPI_CMD_V_BI 4 -+ -+ // RPI_PRECLEAR is not working yet - perhaps clearing on VPUs is flawed? -+-- -+2.7.4 -+ -+ -+From 8af0a0a036e4bb3883f144d0567bc527772dd65b Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 6 May 2015 13:03:50 +0100 -+Subject: [PATCH 10/68] Added VPU thread -+ -+--- -+ libavcodec/hevc.c | 11 +++-- -+ libavcodec/hevc.h | 1 + -+ libavcodec/rpi_qpu.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++-- -+ libavcodec/rpi_qpu.h | 2 + -+ 4 files changed, 133 insertions(+), 6 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index b7bc6ad..98dbd69 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2529,8 +2529,10 @@ static void rpi_execute_transform(HEVCContext *s) -+ -+ -+ gpu_cache_flush(&s->coeffs_buf_accelerated); -+- vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -++ s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, &s->coeffs_buf_accelerated); -++ //vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -+ //gpu_cache_flush(&s->coeffs_buf_accelerated); -++ //vpu_wait(s->vpu_id); -+ -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+@@ -2666,10 +2668,12 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI -+ if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -+ int x; -+- // Perform inter prediction -+- rpi_execute_inter_cmds(s); -+ // Transform all blocks -+ rpi_execute_transform(s); -++ // Perform inter prediction -++ rpi_execute_inter_cmds(s); -++ // Wait for transform completion -++ vpu_wait(s->vpu_id); -+ // Perform intra prediction and residual reconstruction -+ rpi_execute_pred_cmds(s); -+ // Perform deblocking for CTBs in this row -+@@ -3426,6 +3430,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->univ_pred_cmds); -+ -+ #ifdef EARLY_MALLOC -++ printf("hevc_decode_free\n"); -+ if (s->coeffs_buf_arm[0]) { -+ gpu_free(&s->coeffs_buf_default); -+ s->coeffs_buf_arm[0] = 0; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index a0eb71b..0d8dfe9 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -896,6 +896,7 @@ typedef struct HEVCContext { -+ int num_xfm_cmds; -+ int num_mv_cmds; -+ int num_pred_cmds; -++ int vpu_id; -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 12ad5fb..378dd74 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -1,9 +1,13 @@ -+ #ifdef RPI -+-// Use the vcsm device for shared memory -++// define RPI_USE_VCSM to use the vcsm device for shared memory -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+ #define RPI_USE_VCSM -+-#define RPI_TIME_TOTAL_QPU -+-#define RPI_TIME_TOTAL_VPU -++// define RPI_TIME_TOTAL_QPU to print out how much time is spent in the QPU code -++//#define RPI_TIME_TOTAL_QPU -++// define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -++//#define RPI_TIME_TOTAL_VPU -++// define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -++#define RPI_ASYNC -+ -+ #include -+ #include -+@@ -113,6 +117,19 @@ static unsigned int Microseconds(void) { -+ } -+ #endif -+ -++#ifdef RPI_ASYNC -++pthread_t vpu_thread; -++static void *vpu_start(void *arg); -++ -++#define MAXCMDS 128 -++static pthread_cond_t post_cond = PTHREAD_COND_INITIALIZER; -++static pthread_mutex_t post_mutex = PTHREAD_MUTEX_INITIALIZER; -++ -++static int vpu_cmds[MAXCMDS][8]; -++static volatile int vpu_async_tail=0; // Contains the number of posted jobs -++static volatile int vpu_async_head=0; -++#endif -++ -+ // Connect to QPU, returns 0 on success. -+ static int gpu_init(volatile struct GPU **gpu) { -+ int mb = mbox_open(); -+@@ -164,12 +181,27 @@ static int gpu_init(volatile struct GPU **gpu) { -+ // And the transform coefficients -+ memcpy((void*)ptr->transMatrix2even, rpi_transMatrix2even, sizeof(rpi_transMatrix2even)); -+ -++#ifdef RPI_ASYNC -++ { -++ int err; -++ vpu_async_tail = 0; -++ vpu_async_head = 0; -++ err = pthread_create(&vpu_thread, NULL, vpu_start, NULL); -++ //printf("Created thread\n"); -++ if (err) { -++ printf("Failed to create vpu thread\n"); -++ return -4; -++ } -++ } -++#endif -++ -+ return 0; -+ } -+ -+ // Make sure we have exclusive access to the mailbox, and enable qpu if necessary. -+ static void gpu_lock(void) { -+ pthread_mutex_lock(&gpu_mutex); -++ -+ if (gpu==NULL) { -+ gpu_init(&gpu); -+ } -+@@ -264,6 +296,16 @@ static void gpu_term(void) -+ unsigned handle = gpu->vc_handle; -+ if (gpu==NULL) -+ return; -++ -++#ifdef RPI_ASYNC -++ { -++ void *res; -++ vpu_post_code(0, 0, 0, 0, 0, 0, -1, NULL); -++ pthread_join(vpu_thread, &res); -++ } -++#endif -++ -++ -+ unmapmem((void*)gpu, sizeof(struct GPU)); -+ mem_unlock(mb, handle); -+ mem_free(mb, handle); -+@@ -322,6 +364,79 @@ unsigned int vpu_get_constants(void) { -+ return gpu->vc + offsetof(struct GPU,transMatrix2even); -+ } -+ -++#ifdef RPI_ASYNC -++ -++static void *vpu_start(void *arg) { -++ while(1) { -++ pthread_mutex_lock(&post_mutex); -++ while( vpu_async_tail - vpu_async_head <= 0) -++ { -++ //printf("Checking number %d %d\n",vpu_async_head,vpu_async_tail); -++ pthread_cond_wait(&post_cond, &post_mutex); -++ } -++ int *p = vpu_cmds[vpu_async_head%MAXCMDS]; -++ pthread_mutex_unlock(&post_mutex); -++ -++ if (p[6] == -1) { -++ break; // Last job -++ } -++ if (p[7]) { -++ GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -++ //gpu_cache_flush(buf); -++ } -++ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -++ -++ pthread_mutex_lock(&post_mutex); -++ vpu_async_head++; -++ pthread_cond_broadcast(&post_cond); -++ pthread_mutex_unlock(&post_mutex); -++ } -++ -++ return NULL; -++} -++ -++// Post a command to the queue -++// Returns an id which we can use to wait for completion -++int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf) -++{ -++ pthread_mutex_lock(&post_mutex); -++ { -++ int id = vpu_async_tail++; -++ int *p = vpu_cmds[id%MAXCMDS]; -++ int num = vpu_async_tail - vpu_async_head; -++ if (num>MAXCMDS) { -++ printf("Too many commands submitted\n"); -++ exit(-1); -++ } -++ p[0] = code; -++ p[1] = r0; -++ p[2] = r1; -++ p[3] = r2; -++ p[4] = r3; -++ p[5] = r4; -++ p[6] = r5; -++ p[7] = (int) buf; -++ if (num<=1) -++ pthread_cond_broadcast(&post_cond); // Otherwise the vpu thread must already be awake -++ pthread_mutex_unlock(&post_mutex); -++ return id; -++ } -++} -++ -++// Wait for completion of the given command -++void vpu_wait(int id) -++{ -++ pthread_mutex_lock(&post_mutex); -++ while( id + 1 - vpu_async_head > 0) -++ { -++ pthread_cond_wait(&post_cond, &post_mutex); -++ } -++ pthread_mutex_unlock(&post_mutex); -++} -++ -++#endif -++ -++ -+ unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5) -+ { -+ unsigned r; -+@@ -334,7 +449,9 @@ unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, -+ static int count=0; -+ static long long countr2=0; -+ #endif -++#ifndef RPI_ASYNC -+ gpu_lock(); -++#endif -+ #ifdef RPI_TIME_TOTAL_VPU -+ start_time = Microseconds(); -+ if (last_time==0) -+@@ -351,7 +468,9 @@ unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, -+ if ((count&0x7f)==0) -+ printf("VPU %d %lld On=%dms, Off=%dms\n",count,countr2,(int)(on_time/1000),(int)(off_time/1000)); -+ #endif -++#ifndef RPI_ASYNC -+ gpu_unlock(); -++#endif -+ return r; -+ } -+ -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 814fc3c..3526fce 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -36,6 +36,8 @@ extern unsigned int qpu_get_fn(int num); -+ extern unsigned int vpu_get_fn(void); -+ extern unsigned int vpu_get_constants(void); -+ extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -++extern int vpu_post_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf); -++extern void vpu_wait( int id); -+ -+ // Simple test of shader code -+ extern int rpi_test_shader(void); -+-- -+2.7.4 -+ -+ -+From 016d3db644e60fbe272bfcf1d7c3670c82422317 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 6 May 2015 15:03:37 +0100 -+Subject: [PATCH 11/68] Added different signal when tail moves -+ -+--- -+ libavcodec/rpi_qpu.c | 11 ++++++----- -+ 1 file changed, 6 insertions(+), 5 deletions(-) -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 378dd74..d1c3e20 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -122,7 +122,8 @@ pthread_t vpu_thread; -+ static void *vpu_start(void *arg); -+ -+ #define MAXCMDS 128 -+-static pthread_cond_t post_cond = PTHREAD_COND_INITIALIZER; -++static pthread_cond_t post_cond_head = PTHREAD_COND_INITIALIZER; -++static pthread_cond_t post_cond_tail = PTHREAD_COND_INITIALIZER; -+ static pthread_mutex_t post_mutex = PTHREAD_MUTEX_INITIALIZER; -+ -+ static int vpu_cmds[MAXCMDS][8]; -+@@ -372,7 +373,7 @@ static void *vpu_start(void *arg) { -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+ //printf("Checking number %d %d\n",vpu_async_head,vpu_async_tail); -+- pthread_cond_wait(&post_cond, &post_mutex); -++ pthread_cond_wait(&post_cond_tail, &post_mutex); -+ } -+ int *p = vpu_cmds[vpu_async_head%MAXCMDS]; -+ pthread_mutex_unlock(&post_mutex); -+@@ -388,7 +389,7 @@ static void *vpu_start(void *arg) { -+ -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+- pthread_cond_broadcast(&post_cond); -++ pthread_cond_broadcast(&post_cond_head); -+ pthread_mutex_unlock(&post_mutex); -+ } -+ -+@@ -417,7 +418,7 @@ int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned -+ p[6] = r5; -+ p[7] = (int) buf; -+ if (num<=1) -+- pthread_cond_broadcast(&post_cond); // Otherwise the vpu thread must already be awake -++ pthread_cond_broadcast(&post_cond_tail); // Otherwise the vpu thread must already be awake -+ pthread_mutex_unlock(&post_mutex); -+ return id; -+ } -+@@ -429,7 +430,7 @@ void vpu_wait(int id) -+ pthread_mutex_lock(&post_mutex); -+ while( id + 1 - vpu_async_head > 0) -+ { -+- pthread_cond_wait(&post_cond, &post_mutex); -++ pthread_cond_wait(&post_cond_head, &post_mutex); -+ } -+ pthread_mutex_unlock(&post_mutex); -+ } -+-- -+2.7.4 -+ -+ -+From b04a72641253dc89fd1ec688035c3e2a946aa370 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 7 May 2015 08:57:11 +0100 -+Subject: [PATCH 12/68] Add option to test for gpu_idle -+ -+--- -+ libavcodec/hevc.c | 3 ++- -+ libavcodec/rpi_qpu.c | 18 ++++++++++++++++++ -+ 2 files changed, 20 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 98dbd69..2e269b6 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2527,7 +2527,6 @@ static void rpi_execute_transform(HEVCContext *s) -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- -+ gpu_cache_flush(&s->coeffs_buf_accelerated); -+ s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, &s->coeffs_buf_accelerated); -+ //vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -+@@ -2669,6 +2668,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -+ int x; -+ // Transform all blocks -++ //printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -++ -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index d1c3e20..85f49db 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -199,6 +199,17 @@ static int gpu_init(volatile struct GPU **gpu) { -+ return 0; -+ } -+ -++// Returns 1 if the gpu is currently idle -++static int gpu_idle(void) -++{ -++ int ret = pthread_mutex_trylock(&gpu_mutex); -++ if (ret==0) { -++ pthread_mutex_unlock(&gpu_mutex); -++ return 1; -++ } -++ return 0; -++} -++ -+ // Make sure we have exclusive access to the mailbox, and enable qpu if necessary. -+ static void gpu_lock(void) { -+ pthread_mutex_lock(&gpu_mutex); -+@@ -400,6 +411,13 @@ static void *vpu_start(void *arg) { -+ // Returns an id which we can use to wait for completion -+ int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf) -+ { -++ // If the gpu is idle then just run the command immediately -++ // This works, but doesn't seem to give any benefit -++ // if (gpu_idle()) { -++ // vpu_execute_code( code, r0, r1, r2, r3, r4, r5); -++ // return -1; // TODO perhaps a wraparound bug here? -++ // } -++ -+ pthread_mutex_lock(&post_mutex); -+ { -+ int id = vpu_async_tail++; -+-- -+2.7.4 -+ -+ -+From e7b457e683d4ca92bf2677b69708fbfc3849847b Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 7 May 2015 11:01:35 +0100 -+Subject: [PATCH 13/68] Added deblocking pass -+ -+--- -+ libavcodec/hevc.c | 33 +++++++++++++++++++++++++++------ -+ libavcodec/hevc.h | 7 ++++++- -+ libavcodec/hevc_filter.c | 6 +++++- -+ libavcodec/rpi_qpu.c | 2 +- -+ 4 files changed, 39 insertions(+), 9 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 2e269b6..29f8415 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2518,6 +2518,17 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ } -+ -+ #ifdef RPI -++static void rpi_execute_dblk_cmds(HEVCContext *s) -++{ -++ int n; -++ int ctb_size = 1 << s->ps.sps->log2_ctb_size; -++ int (*p)[2] = s->dblk_cmds; -++ for(n = s->num_dblk_cmds; n>0 ;n--,p++) { -++ ff_hevc_hls_filters(s, (*p)[0], (*p)[1], ctb_size); -++ } -++ s->num_dblk_cmds = 0; -++} -++ -+ static void rpi_execute_transform(HEVCContext *s) -+ { -+ int i=2; -+@@ -2631,7 +2642,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -+ #ifdef RPI -+- int start_ctb_x = (s->sh.slice_ctb_addr_rs % ((s->ps.sps->width + ctb_size - 1) >> s->ps.sps->log2_ctb_size)) << s->ps.sps->log2_ctb_size; -+ s->enable_rpi = 1; // TODO this should depend on cross component and frame width etc. -+ #endif -+ -+@@ -2665,7 +2675,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ #ifdef RPI -+- if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -++ if (s->enable_rpi) { -++ s->dblk_cmds[s->num_dblk_cmds][0] = x_ctb; -++ s->dblk_cmds[s->num_dblk_cmds++][1] = y_ctb; -++ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+ int x; -+ // Transform all blocks -+ //printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+@@ -2678,10 +2691,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ // Perform intra prediction and residual reconstruction -+ rpi_execute_pred_cmds(s); -+ // Perform deblocking for CTBs in this row -+- for(x = start_ctb_x; x <= x_ctb; x += ctb_size) { // TODO this will fail for tiles -+- ff_hevc_hls_filters(s, x, y_ctb, ctb_size); -+- } -+- start_ctb_x = 0; -++ rpi_execute_dblk_cmds(s); -++ } -+ } -+ #endif -+ if (more_data < 0) { -+@@ -2699,6 +2710,16 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ ff_hevc_hls_filters(s, x_ctb, y_ctb, ctb_size); -+ } -+ -++#ifdef RPI -++ if (s->enable_rpi && s->num_dblk_cmds) { -++ rpi_execute_transform(s); -++ rpi_execute_inter_cmds(s); -++ vpu_wait(s->vpu_id); -++ rpi_execute_pred_cmds(s); -++ rpi_execute_dblk_cmds(s); -++ } -++#endif -++ -+ if (x_ctb + ctb_size >= s->ps.sps->width && -+ y_ctb + ctb_size >= s->ps.sps->height) -+ ff_hevc_hls_filter(s, x_ctb, y_ctb, ctb_size); -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 0d8dfe9..990bd8c 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -808,6 +808,8 @@ typedef struct HEVCLocalContext { -+ #define RPI_MAX_XFM_CMDS (16*3*(RPI_MAX_WIDTH/4)) -+ // Each block can have an intra prediction and a transform_add command -+ #define RPI_MAX_PRED_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -++// Worst case is 16x16 CTUs -++#define RPI_MAX_DEBLOCK_CMDS (RPI_MAX_WIDTH*4/16) -+ -+ #define RPI_CMD_LUMA_UNI 0 -+ #define RPI_CMD_CHROMA_UNI 1 -+@@ -867,6 +869,9 @@ typedef struct HEVCPredCmd { -+ #endif -+ -+ typedef struct HEVCContext { -++#ifdef RPI -++ int dblk_cmds[RPI_MAX_DEBLOCK_CMDS][2]; -++#endif -+ const AVClass *c; // needed by private avoptions -+ AVCodecContext *avctx; -+ -+@@ -891,11 +896,11 @@ typedef struct HEVCContext { -+ GPU_MEM_PTR_T coeffs_buf_accelerated; -+ int16_t *coeffs_buf_arm[4]; -+ unsigned int coeffs_buf_vc[4]; -+- -+ int num_coeffs[4]; -+ int num_xfm_cmds; -+ int num_mv_cmds; -+ int num_pred_cmds; -++ int num_dblk_cmds; -+ int vpu_id; -+ #endif -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index e4c3da7..ea0af91 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -877,8 +877,12 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ if (s->threads_type & FF_THREAD_FRAME ) -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -+ } -+- } else if (s->threads_type & FF_THREAD_FRAME && x_end) -++ } else if (s->threads_type & FF_THREAD_FRAME && x_end) { -++ int newh = y + ctb_size - 4; -++ //int currh = s->ref->tf.progress->data[0]; -++ //if (((y + ctb_size)&63)==0) -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -++ } -+ } -+ -+ void ff_hevc_hls_filters(HEVCContext *s, int x_ctb, int y_ctb, int ctb_size) -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 85f49db..3b6dae7 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -105,7 +105,7 @@ struct GPU -+ static pthread_mutex_t gpu_mutex = PTHREAD_MUTEX_INITIALIZER; -+ static volatile struct GPU* gpu = NULL; -+ -+-#ifdef RPI_TIME_TOTAL_QPU -++#if defined(RPI_TIME_TOTAL_QPU) || defined(RPI_TIME_TOTAL_VPU) -+ static unsigned int Microseconds(void) { -+ struct timespec ts; -+ unsigned int x; -+-- -+2.7.4 -+ -+ -+From 7a443df9115f21b4428de378bd146dcdba3dd42a Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 7 May 2015 16:47:47 +0100 -+Subject: [PATCH 14/68] Added option to disable deblocking for non-ref frames -+ -+--- -+ libavcodec/hevc_filter.c | 10 ++++++++++ -+ 1 file changed, 10 insertions(+) -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index ea0af91..2cdd621 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -25,6 +25,8 @@ -+ //#define DISABLE_SAO -+ //#define DISABLE_DEBLOCK -+ //#define DISABLE_STRENGTHS -++// define DISABLE_DEBLOCK_NONREF for a 6% speed boost (by skipping deblocking on unimportant frames) -++//#define DISABLE_DEBLOCK_NONREF -+ -+ #include "libavutil/common.h" -+ #include "libavutil/internal.h" -+@@ -504,6 +506,14 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->ps.sps->pcm.loop_filter_disable_flag) || -+ s->ps.pps->transquant_bypass_enable_flag; -+ -++#ifdef DISABLE_DEBLOCK_NONREF -++ if ( s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N ) -++ return; // Don't deblock non-reference frames -++#endif -+ #ifdef DISABLE_DEBLOCK -+ return; -+ #endif -+-- -+2.7.4 -+ -+ -+From 9606e160a582db64ccf981d971cdc258d8cc02f7 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 11 May 2015 10:00:27 +0100 -+Subject: [PATCH 15/68] Moved buffers to VPU memory -+ -+--- -+ libavcodec/hevc_filter.c | 17 +++++++++++++- -+ libavcodec/utils.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ -+ libavutil/buffer.c | 6 +++++ -+ libavutil/buffer.h | 3 +++ -+ 4 files changed, 84 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 2cdd621..e1b32d4 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -866,6 +866,13 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ #undef CB -+ #undef CR -+ -++#ifdef RPI_INTER_QPU -++static void flush_buffer(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ gpu_cache_flush(p); -++} -++#endif -++ -+ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ { -+ int x_end = x >= s->ps.sps->width - ctb_size; -+@@ -888,9 +895,17 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -+ } -+ } else if (s->threads_type & FF_THREAD_FRAME && x_end) { -+- int newh = y + ctb_size - 4; -++ //int newh = y + ctb_size - 4; -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -++ if (!( s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N )) { -++ flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[2]); -++ } -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+ } -+diff --git a/libavcodec/utils.c b/libavcodec/utils.c -+index f7adb52..708526e 100644 -+--- a/libavcodec/utils.c -++++ b/libavcodec/utils.c -+@@ -26,6 +26,12 @@ -+ */ -+ -+ #include "config.h" -++ -++#ifdef RPI -++// Move video buffers to GPU memory -++#define RPI_GPU_BUFFERS -++#endif -++ -+ #include "libavutil/atomic.h" -+ #include "libavutil/attributes.h" -+ #include "libavutil/avassert.h" -+@@ -64,6 +70,10 @@ -+ #include "libavutil/ffversion.h" -+ const char av_codec_ffversion[] = "FFmpeg version " FFMPEG_VERSION; -+ -++#ifdef RPI_GPU_BUFFERS -++#include "rpi_qpu.h" -++#endif -++ -+ #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS -+ static int default_lockmgr_cb(void **arg, enum AVLockOp op) -+ { -+@@ -503,6 +513,47 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, -+ return ret; -+ } -+ -++#ifdef RPI_GPU_BUFFERS -++static void rpi_buffer_default_free(void *opaque, uint8_t *data) -++{ -++ GPU_MEM_PTR_T *p = opaque; -++ gpu_free(p); -++ av_free(p); -++} -++ -++static AVBufferRef *rpi_buffer_alloc(int size) -++{ -++ AVBufferRef *ret = NULL; -++ uint8_t *data = NULL; -++ GPU_MEM_PTR_T *p; -++ -++ static int total=0; -++ total+=size; -++ -++ p = av_malloc(sizeof *p); -++ if (!p) -++ return NULL; -++ -++ if (gpu_malloc_cached(size,p)<0) // Change this line to choose cached or uncached memory. The caching here refers to the ARM data cache. -++ return NULL; -++ -++ data = p->arm; -++ printf("Rpi alloc %d/%d ARM=%p VC=%x->%x\n",size,total,p->arm,p->vc,p->vc+size); -++ //memset(data, 64, size); -++ -++ if (!data) -++ return NULL; -++ -++ ret = av_buffer_create(data, size, rpi_buffer_default_free, p, 0); -++ if (!ret) { -++ gpu_free(p); -++ av_freep(&p); -++ } -++ -++ return ret; -++} -++#endif -++ -+ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) -+ { -+ FramePool *pool = avctx->internal->pool; -+@@ -550,6 +601,14 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) -+ av_buffer_pool_uninit(&pool->pools[i]); -+ pool->linesize[i] = linesize[i]; -+ if (size[i]) { -++#ifdef RPI_GPU_BUFFERS -++ if (avctx->codec_id == AV_CODEC_ID_HEVC) -++ pool->pools[i] = av_buffer_pool_init(size[i] + 16 + STRIDE_ALIGN - 1, -++ CONFIG_MEMORY_POISONING ? -++ NULL : -++ rpi_buffer_alloc); -++ else -++#endif -+ pool->pools[i] = av_buffer_pool_init(size[i] + 16 + STRIDE_ALIGN - 1, -+ CONFIG_MEMORY_POISONING ? -+ NULL : -+diff --git a/libavutil/buffer.c b/libavutil/buffer.c -+index 694e116..203ca7b 100644 -+--- a/libavutil/buffer.c -++++ b/libavutil/buffer.c -+@@ -425,3 +425,9 @@ AVBufferRef *av_buffer_pool_get(AVBufferPool *pool) -+ -+ return ret; -+ } -++ -++// Return the opaque for the underlying frame (gives us a GPU_MEM_PTR_T) -++void *av_buffer_pool_opaque(AVBufferRef *ref) { -++ BufferPoolEntry *buf = av_buffer_get_opaque(ref); -++ return buf->opaque; -++} -+diff --git a/libavutil/buffer.h b/libavutil/buffer.h -+index 0c0ce12..82e0bc3 100644 -+--- a/libavutil/buffer.h -++++ b/libavutil/buffer.h -+@@ -283,6 +283,9 @@ void av_buffer_pool_uninit(AVBufferPool **pool); -+ */ -+ AVBufferRef *av_buffer_pool_get(AVBufferPool *pool); -+ -++// Return the opaque for the underlying frame -++void *av_buffer_pool_opaque(AVBufferRef *ref); -++ -+ /** -+ * @} -+ */ -+-- -+2.7.4 -+ -+ -+From f56515b9a720c829ba3ddf6da4232a91b13e0f03 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 11 May 2015 14:04:37 +0100 -+Subject: [PATCH 16/68] Prepared QPU execute code -+ -+--- -+ libavcodec/hevc.c | 227 ++++++++++++++++++++++++++++++++++++++++------- -+ libavcodec/hevc.h | 22 ++++- -+ libavcodec/hevc_filter.c | 7 +- -+ libavcodec/rpi_qpu.c | 55 +++++++++++- -+ libavcodec/rpi_qpu.h | 2 + -+ 5 files changed, 276 insertions(+), 37 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 29f8415..66ed37a 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -42,17 +42,45 @@ -+ #include "profiles.h" -+ -+ #ifdef RPI -+-#include "rpi_qpu.h" -+-// For some unknown reason, the code seems to crash if I do a late malloc -+-#define EARLY_MALLOC -+-// Move Inter prediction into separate pass -+-#define RPI_INTER -++ #include "rpi_qpu.h" -++ // For some unknown reason, the code seems to crash if I do a late malloc -++ #define EARLY_MALLOC -++ // Move Inter prediction into separate pass -++ #define RPI_INTER -+ #endif -+ -+ // #define DISABLE_MC -+ -+ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; -+ -++ -++#ifdef RPI_INTER_QPU -++ -++#define RPI_CHROMA_COMMAND_WORDS 12 -++// The QPU code for UV blocks only works up to a block width of 8 -++#define RPI_CHROMA_BLOCK_WIDTH 8 -++ -++#define ENCODE_COEFFS(c0, c1, c2, c3) (((-c0) & 0xff) | ((-c1) & 0xff) << 8 | ((-c2) & 0xff) << 16 | ((-c3) & 0xff) << 24) -++ -++// TODO Chroma only needs 4 taps -++static uint32_t rpi_filter_coefs[8][2] = { -++ { ENCODE_COEFFS( 0, 0, 0, 128), ENCODE_COEFFS( 0, 0, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -2, 58), ENCODE_COEFFS( 10, -2, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -4, 54), ENCODE_COEFFS( 16, -2, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -6, 46), ENCODE_COEFFS( 28, -4, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -4, 36), ENCODE_COEFFS( 36, -4, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -4, 28), ENCODE_COEFFS( 46, -6, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -2, 16), ENCODE_COEFFS( 54, -4, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -2, 10), ENCODE_COEFFS( 58, -2, 0, 0 ) } -++}; -++ -++static uint32_t get_vc_address(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ return p->vc; -++} -++ -++#endif -++ -+ /** -+ * NOTE: Each function hls_foo correspond to the function foo in the -+ * specification (HLS stands for High Level Syntax). -+@@ -66,6 +94,7 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ static void pic_arrays_free(HEVCContext *s) -+ { -+ #ifdef RPI -++ -+ #ifdef EARLY_MALLOC -+ #else -+ printf("pic_arrays_free\n"); -+@@ -1982,6 +2011,43 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ s->sh.luma_offset_l0[current_mv.ref_idx[0]]); -+ -+ if (s->ps.sps->chroma_format_idc) { -++#ifdef RPI_INTER_QPU -++ if (s->enable_rpi) { -++ int reflist = 0; -++ int hshift = s->ps.sps->hshift[1]; -++ int vshift = s->ps.sps->vshift[1]; -++ const Mv *mv = ¤t_mv.mv[reflist]; -++ intptr_t mx = av_mod_uintp2(mv->x, 2 + hshift); -++ intptr_t my = av_mod_uintp2(mv->y, 2 + vshift); -++ intptr_t _mx = mx << (1 - hshift); -++ intptr_t _my = my << (1 - vshift); // Fractional part of motion vector -++ -++ int x1_c = x0_c + (mv->x >> (2 + hshift)); -++ int y1_c = y0_c + (mv->y >> (2 + hshift)); -++ int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ -++ uint32_t *u = s->u_mvs[chan & 7]; -++ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -++ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -++ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -++ *u++ = rpi_filter_coefs[_mx][0]; -++ *u++ = rpi_filter_coefs[_mx][1]; -++ *u++ = rpi_filter_coefs[_my][0]; -++ *u++ = rpi_filter_coefs[_my][1]; -++ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ } -++ } -++ s->u_mvs[chan & 7] = u; -++ return; -++ } -++#endif -+ RPI_REDIRECT(chroma_mc_uni)(s, dst1, s->frame->linesize[1], ref0->frame->data[1], ref0->frame->linesize[1], -+ 0, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0]); -+@@ -2632,6 +2698,54 @@ static void rpi_execute_inter_cmds(HEVCContext *s) -+ -+ #endif -+ -++#ifdef RPI_INTER_QPU -++static void rpi_inter_clear(HEVCContext *s) -++{ -++ int i; -++ int pic_width = s->ps.sps->width >> s->ps.sps->hshift[1]; -++ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[1]; -++ for(i=0;i<8;i++) { -++ s->u_mvs[i] = s->mvs_base[i]; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = pic_width; -++ *s->u_mvs[i]++ = pic_height; -++ *s->u_mvs[i]++ = s->frame->linesize[1]; -++ *s->u_mvs[i]++ = s->frame->linesize[2]; -++ s->u_mvs[i] += 3; // Padding words -++ } -++} -++ -++static void rpi_execute_inter_qpu(HEVCContext *s) -++{ -++ int k; -++ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -++ -++ if (s->sh.slice_type == I_SLICE) -++ return; -++ for(k=0;k<8;k++) { -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ } -++ -++ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++ -++ qpu_run_shader8(qpu_get_fn(QPU_MC_SETUP_UV), -++ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ ); -++} -++#endif -++ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ { -+ HEVCContext *s = avctxt->priv_data; -+@@ -2658,6 +2772,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ } -+ -++#ifdef RPI_INTER_QPU -++ rpi_inter_clear(s); -++#endif -++ -+ while (more_data && ctb_addr_ts < s->ps.sps->ctb_size) { -+ int ctb_addr_rs = s->ps.pps->ctb_addr_ts_to_rs[ctb_addr_ts]; -+ -+@@ -2679,19 +2797,30 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->dblk_cmds[s->num_dblk_cmds][0] = x_ctb; -+ s->dblk_cmds[s->num_dblk_cmds++][1] = y_ctb; -+ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+- int x; -++#ifdef RPI_INTER_QPU -++ // Kick off inter prediction on QPUs -++ rpi_execute_inter_qpu(s); -++#endif -+ // Transform all blocks -+ //printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+- -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -++ -++ // Copy back reconstructed data -++ //memcpy(s->frame->data[0],s->dummy.arm,2048*64); -++ //memcpy(s->frame->data[1],s->dummy.arm,1024*32); -++ //memcpy(s->frame->data[2],s->dummy.arm,1024*32); -++ -+ // Perform intra prediction and residual reconstruction -+ rpi_execute_pred_cmds(s); -+ // Perform deblocking for CTBs in this row -+ rpi_execute_dblk_cmds(s); -++#ifdef RPI_INTER_QPU -++ rpi_inter_clear(s); -++#endif -+ } -+ } -+ #endif -+@@ -2712,6 +2841,9 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ #ifdef RPI -+ if (s->enable_rpi && s->num_dblk_cmds) { -++#ifdef RPI_INTER_QPU -++ rpi_execute_inter_qpu(s); -++#endif -+ rpi_execute_transform(s); -+ rpi_execute_inter_cmds(s); -+ vpu_wait(s->vpu_id); -+@@ -3451,6 +3583,14 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->unif_xfm_cmds); -+ av_freep(&s->univ_pred_cmds); -+ -++#ifdef RPI_INTER_QPU -++ if (s->unif_mvs) { -++ gpu_free( &s->unif_mvs_ptr ); -++ s->unif_mvs = 0; -++ } -++#endif -++ //gpu_free(&s->dummy); -++ -+ #ifdef EARLY_MALLOC -+ printf("hevc_decode_free\n"); -+ if (s->coeffs_buf_arm[0]) { -+@@ -3541,34 +3681,59 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ if (!s->univ_pred_cmds) -+ goto fail; -+ -+- s->coeffs_buf_arm[0] = 0; -+- s->coeffs_buf_arm[2] = 0; -++#ifdef RPI_INTER_QPU -++ // We divide the image into blocks 256 wide and 64 high -++ // We support up to 2048 widths -++ // We compute the number of chroma motion vector commands for 4:4:4 format and 4x4 chroma blocks - assuming all blocks are B predicted -++ // Also add space for the startup command for each stream. -++ -++ { -++ int uv_commands_per_qpu = (1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS; -++ uint32_t *p; -++ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++ s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -++ -++ // Set up initial locations for uniform streams -++ p = s->unif_mvs; -++ for(i = 0; i < 8; i++) { -++ s->mvs_base[i] = p; -++ p += uv_commands_per_qpu; -++ } -++ s->mc_filter_uv = qpu_get_fn(QPU_MC_FILTER_UV); -++ s->mc_filter_uv_b = qpu_get_fn(QPU_MC_FILTER_UV_B); -++ -++ } -++#endif -++ //gpu_malloc_uncached(2048*64,&s->dummy); -+ -+ #ifdef EARLY_MALLOC -+- int coeffs_in_ctb = 64*64; -+- int coefs_per_row = (2048/64) * coeffs_in_ctb * 3; // Allow space for chroma -+- printf("Allocated %d\n",coefs_per_row); -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -+- if (!s->coeffs_buf_arm[0]) -+- goto fail; -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -+- s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -+- if (!s->coeffs_buf_arm[2]) -+- goto fail; -+- s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -+- s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -+- printf("Done\n"); -++ { -++ int coeffs_in_ctb = 64*64; -++ int coefs_per_row = (2048/64) * coeffs_in_ctb * 3; // Allow space for chroma -++ s->coeffs_buf_arm[0] = 0; -++ s->coeffs_buf_arm[2] = 0; -++ printf("Allocated %d\n",coefs_per_row); -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -++ if (!s->coeffs_buf_arm[0]) -++ goto fail; -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -++ s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -++ if (!s->coeffs_buf_arm[2]) -++ goto fail; -++ s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -++ s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -++ printf("Done\n"); -+ #ifdef RPI_PRECLEAR -+- //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[0], coefs_per_row); -+- //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[2], coefs_per_row); -+- //memset(s->coeffs_buf_arm[3],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[3], coefs_per_row); -++ //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[0], coefs_per_row); -++ //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[2], coefs_per_row); -++ //memset(s->coeffs_buf_arm[3],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[3], coefs_per_row); -+ #endif -+- -++ } -+ #endif -+ -+ s->enable_rpi = 0; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 990bd8c..da345f6 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -42,7 +42,11 @@ -+ -+ // define RPI to split the CABAC/prediction/transform into separate stages -+ #ifdef RPI -+-#include "rpi_qpu.h" -++ -++ #include "rpi_qpu.h" -++ // Use QPU for inter prediction -++ //#define RPI_INTER_QPU -++ -+ #endif -+ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+@@ -888,7 +892,7 @@ typedef struct HEVCContext { -+ -+ #ifdef RPI -+ int enable_rpi; -+- HEVCMvCmd *unif_mv_cmds; -++ HEVCMvCmd *unif_mv_cmds; // TODO rename -+ HEVCXfmCmd *unif_xfm_cmds; -+ HEVCPredCmd *univ_pred_cmds; -+ int buf_width; -+@@ -902,6 +906,20 @@ typedef struct HEVCContext { -+ int num_pred_cmds; -+ int num_dblk_cmds; -+ int vpu_id; -++ //GPU_MEM_PTR_T dummy; -++#ifdef RPI_INTER_QPU -++ GPU_MEM_PTR_T unif_mvs_ptr; -++ uint32_t *unif_mvs; // Base of memory for motion vector commands -++ -++ // _base pointers are to the start of the row -++ uint32_t *mvs_base[8]; -++ // these pointers are to the next free space -++ uint32_t *u_mvs[8]; -++ // Function pointers -++ uint32_t mc_filter_uv; -++ uint32_t mc_filter_uv_b; -++#endif -++ -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index e1b32d4..5b3d759 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -903,8 +903,11 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ s->nal_unit_type == NAL_STSA_N || -+ s->nal_unit_type == NAL_RADL_N || -+ s->nal_unit_type == NAL_RASL_N )) { -+- flush_buffer(s->frame->buf[1]); -+- flush_buffer(s->frame->buf[2]); -++ //flush_buffer(s->frame->buf[1]); -++ //flush_buffer(s->frame->buf[2]); -++ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -++ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -++ //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -+ } -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 3b6dae7..e4dd58a 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -3,7 +3,7 @@ -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+ #define RPI_USE_VCSM -+ // define RPI_TIME_TOTAL_QPU to print out how much time is spent in the QPU code -+-//#define RPI_TIME_TOTAL_QPU -++#define RPI_TIME_TOTAL_QPU -+ // define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -+ //#define RPI_TIME_TOTAL_VPU -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+@@ -30,7 +30,7 @@ -+ #endif -+ -+ // On Pi2 there is no way to access the VPU L2 cache -+-// GPU_MEM_FLG should be 4 for uncached memory. -++// GPU_MEM_FLG should be 4 for uncached memory. (Or C for alias to allocate in the VPU L2 cache) -+ // However, if using VCSM allocated buffers, need to use C at the moment because VCSM does not allocate uncached memory correctly -+ // The QPU crashes if we mix L2 cached and L2 uncached accesses due to a HW bug. -+ #define GPU_MEM_FLG 0xC -+@@ -549,6 +549,54 @@ void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int un -+ gpu_unlock(); -+ } -+ -++// Run a program on 8 QPUs with the given code and uniform stream (given in GPU addresses) -++void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8) -++{ -++ int i; -++#ifdef RPI_TIME_TOTAL_QPU -++ static int last_time=0; -++ static long long on_time=0; -++ static long long off_time=0; -++ int start_time; -++ int end_time; -++ static int count=0; -++#endif -++ -++ gpu_lock(); -++#ifdef RPI_TIME_TOTAL_QPU -++ start_time = Microseconds(); -++ if (last_time==0) -++ last_time = start_time; -++ off_time += start_time-last_time; -++#endif -++ for(i=0;i<8;i++) { -++ gpu->mail[i*2 + 1] = code; -++ } -++ gpu->mail[0 ] = unifs1; -++ gpu->mail[2 ] = unifs2; -++ gpu->mail[4 ] = unifs3; -++ gpu->mail[6 ] = unifs4; -++ gpu->mail[8 ] = unifs5; -++ gpu->mail[10] = unifs6; -++ gpu->mail[12] = unifs7; -++ gpu->mail[14] = unifs8; -++ execute_qpu( -++ gpu->mb, -++ 8 /* Number of QPUs */, -++ gpu->vc + offsetof(struct GPU, mail), -++ 1 /* no flush */, // Don't flush VPU L1 cache -++ 5000 /* timeout ms */); -++#ifdef RPI_TIME_TOTAL_QPU -++ end_time = Microseconds(); -++ last_time = end_time; -++ on_time += end_time - start_time; -++ count++; -++ if ((count&0x7f)==0) -++ printf("On=%dms, Off=%dms\n",(int)(on_time/1000),(int)(off_time/1000)); -++#endif -++ gpu_unlock(); -++} -++ -+ unsigned int qpu_get_fn(int num) { -+ // Make sure that the gpu is initialized -+ unsigned int *fn; -+@@ -585,6 +633,9 @@ unsigned int qpu_get_fn(int num) { -+ case QPU_MC_FILTER_UV_B: -+ fn = mc_filter_uv_b; -+ break; -++ case QPU_MC_INTERRUPT_EXIT8: -++ fn = mc_interrupt_exit8; -++ break; -+ case QPU_MC_END: -+ fn = mc_end; -+ break; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 3526fce..2b22d98 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -16,6 +16,7 @@ extern void gpu_free(GPU_MEM_PTR_T *p); -+ extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -+ -+ // QPU specific functions -++extern void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+ extern void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12); -+ -+ enum { -+@@ -28,6 +29,7 @@ enum { -+ QPU_MC_SETUP_UV, -+ QPU_MC_FILTER_UV, -+ QPU_MC_FILTER_UV_B, -++ QPU_MC_INTERRUPT_EXIT8, -+ QPU_MC_END -+ }; -+ extern unsigned int qpu_get_fn(int num); -+-- -+2.7.4 -+ -+ -+From bd651e1569ebe0cdc41a6be169e139758cce069d Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 11:47:23 +0100 -+Subject: [PATCH 17/68] Drafted chroma interpolation on QPUs -+ -+--- -+ libavcodec/hevc.c | 5 ++- -+ libavcodec/hevc.h | 2 +- -+ libavcodec/hevc_filter.c | 6 ++- -+ libavcodec/rpi_qpu.c | 101 +++++++++++++++++++++++++++++++++++++++++++-- -+ libavcodec/rpi_qpu.h | 1 + -+ libavcodec/rpi_shader.c | 42 +++++++++---------- -+ libavcodec/rpi_shader.qasm | 42 +++++++++---------- -+ 7 files changed, 149 insertions(+), 50 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 66ed37a..d5ea45e 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -60,11 +60,11 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+ -+-#define ENCODE_COEFFS(c0, c1, c2, c3) (((-c0) & 0xff) | ((-c1) & 0xff) << 8 | ((-c2) & 0xff) << 16 | ((-c3) & 0xff) << 24) -++#define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+ // TODO Chroma only needs 4 taps -+ static uint32_t rpi_filter_coefs[8][2] = { -+- { ENCODE_COEFFS( 0, 0, 0, 128), ENCODE_COEFFS( 0, 0, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, 0, 64), ENCODE_COEFFS( 0, 0, 0, 0 ) }, -+ { ENCODE_COEFFS( 0, 0, -2, 58), ENCODE_COEFFS( 10, -2, 0, 0 ) }, -+ { ENCODE_COEFFS( 0, 0, -4, 54), ENCODE_COEFFS( 16, -2, 0, 0 ) }, -+ { ENCODE_COEFFS( 0, 0, -6, 46), ENCODE_COEFFS( 28, -4, 0, 0 ) }, -+@@ -2729,6 +2729,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ for(k=0;k<8;k++) { -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP); // Also need a dummy for V -+ } -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index da345f6..2497c47 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -45,7 +45,7 @@ -+ -+ #include "rpi_qpu.h" -+ // Use QPU for inter prediction -+- //#define RPI_INTER_QPU -++ // #define RPI_INTER_QPU -+ -+ #endif -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 5b3d759..9b6e26d 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -903,8 +903,10 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ s->nal_unit_type == NAL_STSA_N || -+ s->nal_unit_type == NAL_RADL_N || -+ s->nal_unit_type == NAL_RASL_N )) { -+- //flush_buffer(s->frame->buf[1]); -+- //flush_buffer(s->frame->buf[2]); -++#ifdef RPI_INTER_QPU -++ flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[2]); -++#endif -+ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -+ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -+ //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index e4dd58a..4d9eda8 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -33,7 +33,8 @@ -+ // GPU_MEM_FLG should be 4 for uncached memory. (Or C for alias to allocate in the VPU L2 cache) -+ // However, if using VCSM allocated buffers, need to use C at the moment because VCSM does not allocate uncached memory correctly -+ // The QPU crashes if we mix L2 cached and L2 uncached accesses due to a HW bug. -+-#define GPU_MEM_FLG 0xC -++#define GPU_MEM_FLG 0x4 -++// GPU_MEM_MAP is meaningless on the Pi2 and should be left at 0 (On Pi1 it allows ARM to access VPU L2 cache) -+ #define GPU_MEM_MAP 0x0 -+ -+ #define vcos_verify(x) ((x)>=0) -+@@ -165,6 +166,8 @@ static int gpu_init(volatile struct GPU **gpu) { -+ ptr->vc_handle = handle; -+ ptr->vc = vc; -+ -++ printf("GPU allocated at 0x%x\n",vc); -++ -+ *gpu = ptr; -+ -+ // Now copy over the QPU code into GPU memory -+@@ -304,10 +307,13 @@ int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p) { -+ -+ static void gpu_term(void) -+ { -+- int mb = gpu->mb; -+- unsigned handle = gpu->vc_handle; -++ int mb; -++ unsigned handle; -++ -+ if (gpu==NULL) -+ return; -++ mb = gpu->mb; -++ handle = gpu->vc_handle; -+ -+ #ifdef RPI_ASYNC -+ { -+@@ -648,6 +654,95 @@ unsigned int qpu_get_fn(int num) { -+ } -+ -+ #if 0 -++typedef unsigned int uint32_t; -++ -++typedef struct mvs_s { -++ GPU_MEM_PTR_T unif_mvs_ptr; -++ uint32_t *unif_mvs; // Base of memory for motion vector commands -++ -++ // _base pointers are to the start of the row -++ uint32_t *mvs_base[8]; -++ // these pointers are to the next free space -++ uint32_t *u_mvs[8]; -++ -++} HEVCContext; -++ -++#define RPI_CHROMA_COMMAND_WORDS 12 -++ -++static void rpi_inter_clear(HEVCContext *s) -++{ -++ int i; -++ for(i=0;i<8;i++) { -++ s->u_mvs[i] = s->mvs_base[i]; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 128; // w -++ *s->u_mvs[i]++ = 128; // h -++ *s->u_mvs[i]++ = 128; // stride u -++ *s->u_mvs[i]++ = 128; // stride v -++ s->u_mvs[i] += 3; // Padding words -++ } -++} -++ -++static void rpi_execute_inter_qpu(HEVCContext *s) -++{ -++ int k; -++ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -++ -++ for(k=0;k<8;k++) { -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP); // dummy location for V -++ } -++ -++ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++ -++ qpu_run_shader8(qpu_get_fn(QPU_MC_SETUP_UV), -++ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ ); -++} -++ -++void rpi_test_qpu(void) -++{ -++ HEVCContext mvs; -++ HEVCContext *s = &mvs; -++ int i; -++ int uv_commands_per_qpu = (1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS; -++ uint32_t *p; -++ printf("Allocate memory\n"); -++ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++ s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; -++ -++ // Set up initial locations for uniform streams -++ p = s->unif_mvs; -++ for(i = 0; i < 8; i++) { -++ s->mvs_base[i] = p; -++ p += uv_commands_per_qpu; -++ } -++ // Now run a simple program that should just quit immediately after a single texture fetch -++ rpi_inter_clear(s); -++ for(i=0;i<4;i++) { -++ printf("Launch QPUs\n"); -++ rpi_execute_inter_qpu(s); -++ printf("Done\n"); -++ } -++ printf("Free memory\n"); -++ gpu_free(&s->unif_mvs_ptr); -++ return; -++} -++#endif -++ -++#if 0 -+ -+ int32_t hcoeffs[] = {-4, 10, -21, 70, 90, -24, 11, -4}; -+ //int32_t hcoeffs[] = {1, 1, 1, 1, 1, 1, 1, 1}; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 2b22d98..f9ad333 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -18,6 +18,7 @@ extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -+ // QPU specific functions -+ extern void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+ extern void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12); -++extern void rpi_test_qpu(void); -+ -+ enum { -+ QPU_MC_SETUP, -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 41cc2e1..d7ed297 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -152,23 +152,23 @@ unsigned int rpi_shader[] = { -+ /* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+ /* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+ /* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000400] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000408] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-/* [0x00000410] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000400] */ 0x55015fc6, 0x100248a2, // mov r2, rb21 ; mul24 r2, r0, ra0 -++/* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+ /* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000420] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000420] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ /* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000430] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000430] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ /* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000440] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000440] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+ /* [0x00000448] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000450] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000450] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+ /* [0x00000458] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000460] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000460] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+ /* [0x00000468] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000470] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000470] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+ /* [0x00000478] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000480] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000480] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+ /* [0x00000488] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+ /* [0x00000490] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+ /* [0x00000498] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+@@ -179,20 +179,20 @@ unsigned int rpi_shader[] = { -+ /* [0x000004c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+ /* [0x000004c8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+ /* [0x000004d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x000004d8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x000004d8] */ 0x8f54e1f6, 0xd0024821, // asr r0, r0, 14 ; mov r1, ra21 -+ /* [0x000004e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x000004e8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x000004f0] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x000004f8] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000500] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000508] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000510] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000518] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000520] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000528] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000004e8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x000004f0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x000004f8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000500] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000508] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000510] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000518] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000520] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000528] */ 0x8c9f223f, 0x100a0867, // add.ifnn r1, r1, r0 ; mov -, vw_wait -+ /* [0x00000530] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ /* [0x00000538] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000540] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00000540] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+ /* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+ /* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+ /* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 6851e83..02fdcb2 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -270,23 +270,23 @@ add t0s, ra_x2_base, r2 -+ -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++mov r2, rb21 ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -+ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+ nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+ nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+ nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+ nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 -++add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+@@ -302,23 +302,23 @@ sub.setf -, r3, 8 ; mov r1, ra22 -+ # apply horizontal filter -+ brr.anyn -, r:uvloop -+ max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -++asr r0, r0, 14 ; mov r1, ra21 -+ min.setf ra15, r0, rb22 -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -++nop ; mul24 r1, ra14, rb14 -++nop ; mul24 r0, ra13, rb13 -++add r1, r1, r0 ; mul24 r0, ra12, rb12 -++add r1, r1, r0 ; mul24 r0, ra11, rb11 -++add r1, r1, r0 ; mul24 r0, ra10, rb10 -++add r1, r1, r0 ; mul24 r0, ra9, rb9 -++add r1, r1, r0 ; mul24 r0, ra8, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb15 -++add.ifnn r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ brr.anyn -, r:uvloop -+-asr r1, r1, 15 -++asr r1, r1, 14 -+ min r1, r1, rb22 -+ max vpm, r1, 0 -+ -+-- -+2.7.4 -+ -+ -+From 61628063461ee5d891af6dbedfd495efcf464012 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 13:54:11 +0100 -+Subject: [PATCH 18/68] Fixed chroma inter prediction -+ -+--- -+ libavcodec/hevc.c | 8 +- -+ libavcodec/hevc.h | 2 +- -+ libavcodec/rpi_shader.c | 1170 ++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 22 +- -+ libavcodec/rpi_shader.qasm | 24 +- -+ 5 files changed, 617 insertions(+), 609 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index d5ea45e..d6d78ee 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -57,9 +57,11 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ #ifdef RPI_INTER_QPU -+ -+ #define RPI_CHROMA_COMMAND_WORDS 12 -++#define UV_COMMANDS_PER_QPU ((1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS) -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+ -++ -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+ // TODO Chroma only needs 4 taps -+@@ -2024,7 +2026,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ -+ int x1_c = x0_c + (mv->x >> (2 + hshift)); -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+- int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ int chan = x0>>8; -+ -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+@@ -2730,6 +2733,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP); // Also need a dummy for V -++ assert(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -+ } -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+@@ -3689,7 +3693,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ // Also add space for the startup command for each stream. -+ -+ { -+- int uv_commands_per_qpu = (1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS; -++ int uv_commands_per_qpu = UV_COMMANDS_PER_QPU; -+ uint32_t *p; -+ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -+ s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 2497c47..d513579 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -45,7 +45,7 @@ -+ -+ #include "rpi_qpu.h" -+ // Use QPU for inter prediction -+- // #define RPI_INTER_QPU -++ #define RPI_INTER_QPU -+ -+ #endif -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index d7ed297..831633b 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -33,7 +33,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000040] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+ /* [0x00000048] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+ /* [0x00000050] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000058] */ 0x00000040, 0xe0020567, // mov ra21, 64 -++/* [0x00000058] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+ /* [0x00000060] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+ /* [0x00000068] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+ /* [0x00000070] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+@@ -152,7 +152,7 @@ unsigned int rpi_shader[] = { -+ /* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+ /* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+ /* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000400] */ 0x55015fc6, 0x100248a2, // mov r2, rb21 ; mul24 r2, r0, ra0 -++/* [0x00000400] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+ /* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+ /* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+ /* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+@@ -178,9 +178,9 @@ unsigned int rpi_shader[] = { -+ /* [0x000004b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+ /* [0x000004c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+ /* [0x000004c8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x000004d8] */ 0x8f54e1f6, 0xd0024821, // asr r0, r0, 14 ; mov r1, ra21 -+-/* [0x000004e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x000004d0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000004d8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000004e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ /* [0x000004e8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+ /* [0x000004f0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+ /* [0x000004f8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+@@ -189,400 +189,400 @@ unsigned int rpi_shader[] = { -+ /* [0x00000510] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+ /* [0x00000518] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+ /* [0x00000520] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000528] */ 0x8c9f223f, 0x100a0867, // add.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000528] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+ /* [0x00000530] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000538] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000540] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000560] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000568] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000570] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000578] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000580] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000588] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000590] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000598] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000538] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000540] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000548] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000550] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000558] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000560] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000568] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000570] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000578] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000580] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000588] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000590] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000598] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000005a0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000005a8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter -+-/* [0x000005a0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005a8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005b0] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x000005b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005c0] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x000005c8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005d0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x000005d8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005e0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x000005e8] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x000005f0] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x000005f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000600] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000608] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000610] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000618] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000620] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000628] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000630] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000638] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000640] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000648] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000650] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000658] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000660] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000668] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000670] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000678] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000680] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000688] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000690] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000698] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000006b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000006d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000006f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000700] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000708] */ 0x000001d0, 0xf07809e7, // brr.anynn -, r:fast_path -+-/* [0x00000710] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000718] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000720] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000728] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000005b0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005b8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005c0] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x000005c8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005d0] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x000005d8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005e0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x000005e8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005f0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x000005f8] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000600] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000608] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000610] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000618] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000620] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000628] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000630] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000638] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000640] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000648] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000650] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000658] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000660] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000668] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000670] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000678] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000680] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000688] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000690] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000698] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000006a0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000006c0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000006e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000700] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000708] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000710] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000718] */ 0x000001d0, 0xf07809e7, // brr.anynn -, r:fast_path -++/* [0x00000720] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000728] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000730] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000738] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :loop -+-/* [0x00000730] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000738] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000740] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000748] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000750] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000758] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000760] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000768] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000770] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000778] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000780] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000788] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000790] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000798] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000007a0] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000007a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007b0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000007b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007c0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000007c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007d0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000007d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007e0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000007e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000007f0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000007f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000800] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x00000808] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000810] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000818] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000820] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000828] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000830] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000838] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000840] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000848] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:loop -+-/* [0x00000850] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000858] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000860] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000868] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000870] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000878] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000880] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000888] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000890] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000898] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x000008a0] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008a8] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x000008b0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008b8] */ 0xfffffe58, 0xf06809e7, // brr.anyn -, r:loop -+-/* [0x000008c0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000008c8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008d0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000008d8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000008e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000008f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000740] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000748] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000750] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000758] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000760] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000768] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000770] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000778] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000780] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000788] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000790] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000798] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x000007a0] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000007a8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000007b0] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000007b8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000007c0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007c8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000007d0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007d8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000007e0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007e8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000007f0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007f8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000800] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000808] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000810] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000818] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000820] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000828] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000830] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000838] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000840] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000848] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000850] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000858] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:loop -++/* [0x00000860] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000868] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000870] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000878] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000880] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000888] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000890] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000898] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x000008a0] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x000008a8] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x000008b0] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008b8] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000008c0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000008c8] */ 0xfffffe58, 0xf06809e7, // brr.anyn -, r:loop -++/* [0x000008d0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000008d8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008e0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000008e8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000008f0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008f8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000900] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // :fast_path -+-/* [0x000008f8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000908] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :fast_loop -+-/* [0x00000900] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000908] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000910] */ 0x95727d9b, 0x1004475f, // mov.ifz ra_y, ra_y_next ; mov rb31, r3 -+-/* [0x00000918] */ 0x95690dbf, 0x10044623, // mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -+-/* [0x00000920] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000928] */ 0x929de5e4, 0x100248a1, // min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 -+-/* [0x00000930] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000938] */ 0xec414c87, 0x10024e20, // add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000940] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000948] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000950] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000958] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000960] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000968] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000970] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000978] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000980] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000988] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000990] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000998] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000009a0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000009a8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000009b0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000009b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000009c8] */ 0xffffff18, 0xf06809e7, // brr.anyn -, r:fast_loop -+-/* [0x000009d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x000009d8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x000009e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x000009e8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x000009f0] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x000009f8] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000a00] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000a08] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000a10] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000a18] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000a20] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000a28] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000a30] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000a38] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:fast_loop -+-/* [0x00000a40] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x00000a48] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a50] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a60] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000910] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000918] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000920] */ 0x95727d9b, 0x1004475f, // mov.ifz ra_y, ra_y_next ; mov rb31, r3 -++/* [0x00000928] */ 0x95690dbf, 0x10044623, // mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -++/* [0x00000930] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000938] */ 0x929de5e4, 0x100248a1, // min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 -++/* [0x00000940] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000948] */ 0xec414c87, 0x10024e20, // add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00000950] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000958] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000960] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000968] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000970] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000978] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000980] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000988] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000990] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000998] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -++/* [0x000009a0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x000009a8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000009b0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000009b8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000009c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000009c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009d0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000009d8] */ 0xffffff18, 0xf06809e7, // brr.anyn -, r:fast_loop -++/* [0x000009e0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x000009e8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x000009f0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x000009f8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000a00] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000a08] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000a10] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000a18] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000a20] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000a28] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000a30] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000a38] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000a40] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000a48] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:fast_loop -++/* [0x00000a50] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00000a58] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a60] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a68] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a70] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a78] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a80] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_b -+-/* [0x00000a78] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000a80] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000a88] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x00000a90] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000a98] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000aa0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000aa8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x00000ab0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000ab8] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x00000ac0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000ac8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000ad0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000ad8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000ae0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000ae8] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000af0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000af8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000b00] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000b08] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000b10] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000b18] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000b20] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000b28] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000b30] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000b38] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000b40] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000b48] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000b50] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000b58] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000b60] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000b68] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000b70] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -+-/* [0x00000b78] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000b80] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000b88] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000b90] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000b98] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000ba0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ba8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bb0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bb8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000bc0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bc8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bd0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bd8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000be0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000be8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bf0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bf8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000c00] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000c08] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000c10] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000a88] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000a90] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000a98] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x00000aa0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000aa8] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000ab0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000ab8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x00000ac0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000ac8] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000ad0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000ad8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000ae0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000ae8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000af0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000af8] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000b00] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000b08] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000b10] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000b18] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b20] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000b28] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000b30] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000b38] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000b40] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000b48] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000b50] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000b58] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000b60] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000b68] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000b70] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000b78] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000b80] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00000b88] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b90] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000b98] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ba0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ba8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000bb0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bb8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bc0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bc8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000bd0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bd8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000be0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000be8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000bf0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bf8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000c00] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000c08] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000c10] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000c18] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000c20] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :bloop -+-/* [0x00000c18] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000c20] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000c28] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000c30] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000c38] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000c40] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000c48] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000c50] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000c58] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000c60] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000c68] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000c70] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000c78] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000c80] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000c88] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000c90] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000c98] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000ca0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000ca8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000cb0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000cb8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000cc0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000cc8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000cd0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000cd8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000ce0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000ce8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x00000cf0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000cf8] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000d00] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000d08] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000d10] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000d18] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000d20] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000d28] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000d30] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:bloop -+-/* [0x00000d38] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000d40] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000d48] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000d50] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000d58] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000d60] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000d68] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000d70] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000d78] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000d80] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000d88] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000d90] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000d98] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000da0] */ 0x8fc8f3f6, 0xd0020867, // asr r1, r1, 15 ; mov -, vr_wait -+-/* [0x00000da8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000db0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x00000db8] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:bloop -+-/* [0x00000dc0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000dc8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00000dd0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x00000dd8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000de0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000de8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000df0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000c28] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000c30] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000c38] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000c40] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000c48] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000c50] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000c58] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000c60] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000c68] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000c70] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000c78] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000c80] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000c88] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000c90] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000c98] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000ca0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000ca8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000cb0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000cb8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000cc0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000cc8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000cd0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000cd8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000ce0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000ce8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000cf0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000cf8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000d00] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000d08] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000d10] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000d18] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000d20] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000d28] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000d30] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000d38] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000d40] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:bloop -++/* [0x00000d48] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000d50] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000d58] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000d60] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000d68] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000d70] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000d78] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000d80] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000d88] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000d90] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000d98] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000da0] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000da8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000db0] */ 0x8fc8f3f6, 0xd0020867, // asr r1, r1, 15 ; mov -, vr_wait -++/* [0x00000db8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000dc0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x00000dc8] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:bloop -++/* [0x00000dd0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000dd8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00000de0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x00000de8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000df0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000df8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000e00] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_honly -+-/* [0x00000df8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000e00] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000e08] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x00000e10] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000e18] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000e20] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000e28] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x00000e30] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000e38] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x00000e40] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000e48] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000e50] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000e58] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000e60] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000e68] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000e70] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000e78] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000e80] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000e88] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e90] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000e98] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000ea0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000ea8] */ 0x0c9de1c0, 0xd0021467, // add rb17, r0, -2 -+-/* [0x00000eb0] */ 0x919c71c0, 0xd0024812, // shl r0, r0, 7 ; mov rb18,r0 -+-/* [0x00000eb8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000ec0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000ec8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000ed0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000ed8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000ef8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f00] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f08] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f10] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000f18] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000f20] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000f28] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000f30] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000e08] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000e10] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000e18] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x00000e20] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000e28] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000e30] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000e38] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x00000e40] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000e48] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000e50] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000e58] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000e60] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000e68] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000e70] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000e78] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000e80] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000e88] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e90] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000e98] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000ea0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000ea8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000eb0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000eb8] */ 0x0c9de1c0, 0xd0021467, // add rb17, r0, -2 -++/* [0x00000ec0] */ 0x919c71c0, 0xd0024812, // shl r0, r0, 7 ; mov rb18,r0 -++/* [0x00000ec8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000ed0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000ed8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000ee0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000ee8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f00] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000f08] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f10] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f18] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f20] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000f28] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000f30] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000f38] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000f40] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :loop_honly -+-/* [0x00000f38] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000f40] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000f48] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000f50] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000f58] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000f60] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000f68] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000f70] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000f78] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000f80] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000f88] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000f90] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000f98] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000fa0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000fa8] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000fb0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000fb8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000fc0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000fc8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000fd0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000fd8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000fe0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000fe8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000ff0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000ff8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001000] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001008] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001010] */ 0x8d5927f6, 0x100269e1, // sub.setf -, r3, rb18 ; mov r1, ra22 -+-/* [0x00001018] */ 0x559f2fc1, 0x100049e0, // mov -, vw_wait ; mul24 r0, r0, r1 -+-/* [0x00001020] */ 0xfffffef8, 0xf06809e7, // brr.anyn -, r:loop_honly -+-/* [0x00001028] */ 0x0f9cf1c0, 0xd0020827, // asr r0, r0, 15 -+-/* [0x00001030] */ 0x129d61c0, 0x10020827, // min r0, r0, rb22 -+-/* [0x00001038] */ 0x139c01c0, 0xd0020c27, // max vpm, r0, 0 -+-/* [0x00001040] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001048] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001050] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001058] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000f48] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000f50] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000f58] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000f60] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000f68] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000f70] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000f78] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000f80] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000f88] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000f90] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000f98] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000fa0] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000fa8] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000fb0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000fb8] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000fc0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000fc8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000fd0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000fd8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000fe0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000fe8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000ff0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000ff8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001000] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001008] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001010] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001018] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -++/* [0x00001020] */ 0x8d5927f6, 0x100269e1, // sub.setf -, r3, rb18 ; mov r1, ra22 -++/* [0x00001028] */ 0x559f2fc1, 0x100049e0, // mov -, vw_wait ; mul24 r0, r0, r1 -++/* [0x00001030] */ 0xfffffef8, 0xf06809e7, // brr.anyn -, r:loop_honly -++/* [0x00001038] */ 0x0f9cf1c0, 0xd0020827, // asr r0, r0, 15 -++/* [0x00001040] */ 0x129d61c0, 0x10020827, // min r0, r0, rb22 -++/* [0x00001048] */ 0x139c01c0, 0xd0020c27, // max vpm, r0, 0 -++/* [0x00001050] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001058] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001060] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001068] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00001060] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001068] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00001070] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001078] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001070] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001078] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+ /* [0x00001080] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001088] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001090] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001098] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000010a0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00001090] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001098] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010a0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000010a8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000010b0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_exit1 -+-/* [0x000010a8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000010b0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010b8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010b8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x000010c0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000010c8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000010d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000010e0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000010d0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010d8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010e0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000010e8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000010f0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit -+-/* [0x000010e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000010f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010f8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x00001100] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001108] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001110] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001118] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001110] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001118] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001120] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001128] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001130] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+@@ -592,225 +592,227 @@ unsigned int rpi_shader[] = { -+ /* [0x00001150] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001158] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001160] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001168] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001170] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00001178] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00001168] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001170] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001178] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001180] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001188] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit4 -+-/* [0x00001180] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001188] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001190] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001190] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x00001198] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000011a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011a8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011b0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000011b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011c0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000011c8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000011d0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000011c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000011d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000011e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x000011d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000011e0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011e8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x000011f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000011f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001200] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001208] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001200] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001208] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001210] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001218] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001220] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001228] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001230] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001238] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001240] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00001248] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00001238] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001240] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001248] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001250] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001258] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_setup_uv -+-/* [0x00001250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001258] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -+-/* [0x00001260] */ 0x15827d80, 0x10020767, // mov ra_y, unif -+-/* [0x00001268] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -+-/* [0x00001270] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00001278] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -+-/* [0x00001280] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00001288] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x00001290] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x00001298] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000012a0] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x000012a8] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x000012b0] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x000012b8] */ 0x00000040, 0xe0020567, // mov ra21, 64 -+-/* [0x000012c0] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x000012c8] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x000012d0] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x000012d8] */ 0x00000040, 0xe0021567, // mov rb21, 64 -+-/* [0x000012e0] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x000012e8] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x000012f0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x000012f8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x00001300] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x00001308] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x00001310] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x00001318] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x00001320] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x00001328] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x00001330] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00001338] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00001340] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00001348] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00001350] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00001358] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00001360] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00001368] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001370] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00001378] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00001380] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00001388] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00001390] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00001398] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000013a0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x000013a8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x000013b0] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x000013b8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x000013c0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000013c8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x000013d0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x000013d8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x000013e0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000013e8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x000013f0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000013f8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x00001400] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00001408] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00001410] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x00001418] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00001420] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x00001428] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x00001430] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00001438] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001440] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001268] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -++/* [0x00001270] */ 0x15827d80, 0x10020767, // mov ra_y, unif -++/* [0x00001278] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -++/* [0x00001280] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00001288] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -++/* [0x00001290] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00001298] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x000012a0] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x000012a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000012b0] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x000012b8] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x000012c0] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x000012c8] */ 0x00000020, 0xe0020567, // mov ra21, 32 -++/* [0x000012d0] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x000012d8] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -++/* [0x000012e0] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x000012e8] */ 0x00000040, 0xe0021567, // mov rb21, 64 -++/* [0x000012f0] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x000012f8] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00001300] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00001308] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00001310] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00001318] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00001320] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00001328] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00001330] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00001338] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00001340] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00001348] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00001350] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00001358] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00001360] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00001368] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00001370] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00001378] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001380] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00001388] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00001390] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00001398] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000013a0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000013a8] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000013b0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x000013b8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x000013c0] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x000013c8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x000013d0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000013d8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x000013e0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x000013e8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x000013f0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000013f8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x00001400] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x00001408] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00001410] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00001418] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00001420] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -++/* [0x00001428] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00001430] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x00001438] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x00001440] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+ /* [0x00001448] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001450] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00001458] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00001460] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00001468] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001470] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00001478] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00001480] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00001450] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001458] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001460] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00001468] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00001470] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00001478] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001480] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00001488] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00001490] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv_b -+-/* [0x00001488] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001490] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00001498] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000014a0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000014a8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000014b0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000014b8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000014c0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000014c8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000014d0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000014d8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000014e0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000014e8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000014f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000014f8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00001500] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00001508] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00001510] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00001518] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00001520] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00001528] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00001530] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00001538] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00001540] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001548] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001550] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00001558] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -+-/* [0x00001560] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00001568] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001570] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001578] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001580] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001588] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00001590] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001598] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015a0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015a8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000015b0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015b8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015c0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015c8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000015d0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015d8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015e0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015e8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x000015f0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000015f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001600] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00001498] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000014a0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000014a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000014b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000014b8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000014c0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000014c8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000014d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000014d8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000014e0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000014e8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000014f0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000014f8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00001500] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001508] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00001510] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00001518] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00001520] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00001528] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00001530] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00001538] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00001540] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00001548] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00001550] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001558] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001560] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00001568] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00001570] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00001578] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001580] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001588] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001590] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001598] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000015a0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015a8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015b0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015b8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000015c0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015c8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015d0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015d8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000015e0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015e8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015f0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015f8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00001600] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00001608] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001610] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00001608] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00001610] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00001618] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00001620] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00001628] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00001630] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00001638] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00001640] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00001648] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00001650] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00001658] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001660] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00001668] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-/* [0x00001670] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00001678] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00001680] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00001688] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00001690] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00001698] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000016a0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000016a8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000016b0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000016b8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000016c0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000016c8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000016d0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000016d8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x000016e0] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x000016e8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000016f0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x000016f8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001700] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001708] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001710] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001718] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001720] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00001728] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00001730] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00001738] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00001740] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00001748] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00001750] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00001758] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00001760] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00001768] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00001770] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00001778] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00001780] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00001788] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00001790] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00001798] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000017a0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000017a8] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x000017b0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000017b8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x000017c0] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x000017c8] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x000017d0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000017d8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000017e0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000017e8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000017f0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000017f8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001800] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00001808] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001810] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00001618] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001620] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00001628] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00001630] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001638] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00001640] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001648] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001650] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00001658] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00001660] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00001668] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001670] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00001678] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++/* [0x00001680] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00001688] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00001690] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00001698] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000016a0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000016a8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000016b0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000016b8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000016c0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000016c8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000016d0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000016d8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000016e0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000016e8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x000016f0] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x000016f8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00001700] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00001708] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001710] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001718] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001720] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001728] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001730] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00001738] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00001740] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00001748] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00001750] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00001758] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00001760] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00001768] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00001770] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00001778] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00001780] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00001788] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00001790] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00001798] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000017a0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000017a8] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000017b0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000017b8] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x000017c0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000017c8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000017d0] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x000017d8] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x000017e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000017e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000017f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000017f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00001800] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001808] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001810] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00001818] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001820] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index db971f4..3464cdb 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -5,16 +5,16 @@ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 146) -+-#define mc_filter (rpi_shader + 360) -+-#define mc_filter_b (rpi_shader + 670) -+-#define mc_filter_honly (rpi_shader + 894) -+-#define mc_exit (rpi_shader + 1048) -+-#define mc_exit1 (rpi_shader + 1066) -+-#define mc_interrupt_exit (rpi_shader + 1082) -+-#define mc_interrupt_exit4 (rpi_shader + 1120) -+-#define mc_interrupt_exit8 (rpi_shader + 1142) -+-#define mc_setup_uv (rpi_shader + 1172) -+-#define mc_filter_uv_b (rpi_shader + 1314) -+-#define mc_end (rpi_shader + 1542) -++#define mc_filter (rpi_shader + 364) -++#define mc_filter_b (rpi_shader + 674) -++#define mc_filter_honly (rpi_shader + 898) -++#define mc_exit (rpi_shader + 1052) -++#define mc_exit1 (rpi_shader + 1070) -++#define mc_interrupt_exit (rpi_shader + 1086) -++#define mc_interrupt_exit4 (rpi_shader + 1124) -++#define mc_interrupt_exit8 (rpi_shader + 1146) -++#define mc_setup_uv (rpi_shader + 1176) -++#define mc_filter_uv_b (rpi_shader + 1318) -++#define mc_end (rpi_shader + 1546) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 02fdcb2..4809e1d 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -21,7 +21,7 @@ -+ # rb19 next ra16 -+ # -+ # ra20 1 -+-# ra21 64 -++# ra21 32 -+ # ra22 256 -+ # ra23 8 -+ # -+@@ -97,7 +97,7 @@ add rb24, r1, r0 -+ # load constants -+ -+ mov ra20, 1 -+-mov ra21, 64 -++mov ra21, 32 -+ mov ra22, 256 -+ mov ra23, 8 -+ -+@@ -270,7 +270,7 @@ add t0s, ra_x2_base, r2 -+ -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+-mov r2, rb21 ; mul24 r2, r0, ra0 -++nop ; mul24 r2, r0, ra0 -+ nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+ nop ; mul24 r3, ra1 << 1, r0 << 1 -+ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+@@ -301,9 +301,9 @@ sub.setf -, r3, 8 ; mov r1, ra22 -+ -+ # apply horizontal filter -+ brr.anyn -, r:uvloop -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 14 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -++mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -++asr ra15, r0, 8 ; nop -++nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -+ -+ # apply vertical filter and write to VPM -+ -+@@ -315,12 +315,14 @@ add r1, r1, r0 ; mul24 r0, ra10, rb10 -+ add r1, r1, r0 ; mul24 r0, ra9, rb9 -+ add r1, r1, r0 ; mul24 r0, ra8, rb8 -+ add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-add.ifnn r1, r1, r0 ; mov -, vw_wait -++add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-brr.anyn -, r:uvloop -+ asr r1, r1, 14 -+-min r1, r1, rb22 -+-max vpm, r1, 0 -++add r1, r1, ra21 -++brr.anyn -, r:uvloop -++asr r1, r1, 6 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -+ -+ # DMA out for U -+ -+@@ -1161,7 +1163,7 @@ add rb24, r1, r0 -+ # load constants -+ -+ mov ra20, 1 -+-mov ra21, 64 -++mov ra21, 32 -+ mov ra22, 256 -+ mov ra23, 8 -+ -+-- -+2.7.4 -+ -+ -+From b7321192751956ed7deceeb3dabe22ccedb8e08d Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 14:37:32 +0100 -+Subject: [PATCH 19/68] Removed unused luma functions -+ -+--- -+ libavcodec/hevc.c | 4 +- -+ libavcodec/rpi_qpu.c | 32 +- -+ libavcodec/rpi_shader.c | 1097 +++++++++++++------------------------------- -+ libavcodec/rpi_shader.h | 19 +- -+ libavcodec/rpi_shader.qasm | 970 +++------------------------------------ -+ 5 files changed, 396 insertions(+), 1726 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index d6d78ee..31b8b2f 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2731,8 +2731,8 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ return; -+ for(k=0;k<8;k++) { -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP); // Also need a dummy for V -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for V -+ assert(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -+ } -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 4d9eda8..4e90cc1 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -172,7 +172,7 @@ static int gpu_init(volatile struct GPU **gpu) { -+ -+ // Now copy over the QPU code into GPU memory -+ { -+- int num_bytes = qpu_get_fn(QPU_MC_END) - qpu_get_fn(QPU_MC_SETUP); -++ int num_bytes = qpu_get_fn(QPU_MC_END) - qpu_get_fn(QPU_MC_SETUP_UV); -+ assert(num_bytes<=QPU_CODE_SIZE*sizeof(unsigned int)); -+ memcpy((void*)ptr->qpu_code, rpi_shader, num_bytes); -+ } -+@@ -612,24 +612,24 @@ unsigned int qpu_get_fn(int num) { -+ gpu_unlock(); -+ } -+ switch(num) { -+- case QPU_MC_SETUP: -+- fn = mc_setup; -+- break; -+- case QPU_MC_FILTER: -+- fn = mc_filter; -+- break; -++ //case QPU_MC_SETUP: -++ // fn = mc_setup; -++ // break; -++ //case QPU_MC_FILTER: -++ // fn = mc_filter; -++ // break; -+ case QPU_MC_EXIT: -+ fn = mc_exit; -+ break; -+- case QPU_MC_INTERRUPT_EXIT: -+- fn = mc_interrupt_exit; -+- break; -+- case QPU_MC_FILTER_B: -+- fn = mc_filter_b; -+- break; -+- case QPU_MC_FILTER_HONLY: -+- fn = mc_filter_honly; -+- break; -++ //case QPU_MC_INTERRUPT_EXIT: -++ // fn = mc_interrupt_exit; -++ // break; -++ //case QPU_MC_FILTER_B: -++ // fn = mc_filter_b; -++ // break; -++ //case QPU_MC_FILTER_HONLY: -++ // fn = mc_filter_honly; -++ // break; -+ case QPU_MC_SETUP_UV: -+ fn = mc_setup_uv; -+ break; -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 831633b..170e8ac 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -21,798 +21,331 @@ __declspec(align(8)) -+ __attribute__((aligned(8))) -+ #endif -+ unsigned int rpi_shader[] = { -+-// ::mc_setup -++// ::mc_setup_uv -+ /* [0x00000000] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+ /* [0x00000008] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -+ /* [0x00000010] */ 0x15827d80, 0x10020767, // mov ra_y, unif -+ /* [0x00000018] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -+-/* [0x00000020] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00000028] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x00000030] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x00000038] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000040] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x00000048] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x00000050] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000058] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+-/* [0x00000060] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x00000068] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x00000070] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000078] */ 0x00000040, 0xe0021567, // mov rb21, 64 -+-/* [0x00000080] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000088] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00000090] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x00000098] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x000000a0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x000000a8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x000000b0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000d0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000000d8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000000e0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000000e8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x000000f0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x000000f8] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000100] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000108] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000110] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000118] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000120] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000128] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000130] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000138] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000140] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000148] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000150] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000158] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000160] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000168] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000170] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000178] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x00000180] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000188] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x00000190] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x00000198] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000001a0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000020] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000028] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -++/* [0x00000030] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00000038] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00000040] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00000048] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000050] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000058] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000060] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000068] */ 0x00000020, 0xe0020567, // mov ra21, 32 -++/* [0x00000070] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000078] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -++/* [0x00000080] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000088] */ 0x00000040, 0xe0021567, // mov rb21, 64 -++/* [0x00000090] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000098] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x000000a0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x000000a8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000b0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000b8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000c0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000c8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000d0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000d8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000e0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000e8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000000f0] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000000f8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000100] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000108] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000110] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000118] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000120] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000128] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000130] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000138] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000140] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000148] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000150] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000158] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000160] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000168] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000170] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000178] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000180] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000188] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x00000190] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x00000198] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x000001a0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+ /* [0x000001a8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001b0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x000001b8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x000001c0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000001b0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001b8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001c0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+ /* [0x000001c8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001d0] */ 0x4c9d00cf, 0x10024821, // add r0, r0, r3; mul24 r1, r1, rb_pitch -+-/* [0x000001d8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x000001e0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001e8] */ 0x949dc5c0, 0xd0025890, // and r2, r2, ~3; mov ra_x_base, r0 -+-/* [0x000001f0] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x000001f8] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000200] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000208] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000210] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000218] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000220] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000228] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000230] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000238] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000240] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x000001d0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x000001d8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x000001e0] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x000001e8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000001f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000001f8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000200] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000208] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000210] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000218] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000220] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000228] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000230] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000248] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000250] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000258] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000260] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000268] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000270] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000278] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000280] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000288] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000290] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000298] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002a0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002b0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002d0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000002d8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000002e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002e8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002f0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000002f8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000300] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000330] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000340] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000350] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000360] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000368] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000370] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000378] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000380] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000388] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000390] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000398] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003a0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000238] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000240] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000248] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000250] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000258] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000260] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000268] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000270] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000278] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000280] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000288] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000290] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000298] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002a0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002a8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002b0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002b8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002c0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000002c8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002d0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000002e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000002f0] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x000002f8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000300] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000308] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000310] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000340] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000360] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000368] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000370] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000378] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000380] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000388] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000390] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003a8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003b0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003b8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003c0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003c8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003d0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003d8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003e0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000400] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000420] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000430] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000440] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000448] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000450] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000458] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000460] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000468] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000470] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000478] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000480] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000488] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000490] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000498] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000004a0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000004a8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000004b0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000004b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000004c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000004c8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004d0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000004d8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000004e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000004e8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x000004f0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x000004f8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000500] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000508] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000510] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000518] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000520] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000528] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000530] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000538] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000540] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000548] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000550] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000558] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000560] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000568] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000570] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000578] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000580] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000588] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000590] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000598] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000005a0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000005a8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_filter -+-/* [0x000005b0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005b8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005c0] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x000005c8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005d0] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x000005d8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005e0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x000005e8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005f0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x000005f8] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000600] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000608] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000610] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000618] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000620] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000628] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000630] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000638] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000640] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000648] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000650] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000658] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000660] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000668] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000670] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000678] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000680] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000688] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000690] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000698] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000006a0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000006c0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000006e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000700] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000708] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000710] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000718] */ 0x000001d0, 0xf07809e7, // brr.anynn -, r:fast_path -+-/* [0x00000720] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000728] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000730] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000738] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :loop -+-/* [0x00000740] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000748] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000750] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000758] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000760] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000768] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000770] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000778] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000780] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000788] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000790] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000798] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x000007a0] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000007a8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000007b0] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000007b8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007c0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000007c8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007d0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000007d8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007e0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000007e8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007f0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000007f8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000800] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000808] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000810] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x00000818] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000820] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000828] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000830] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000838] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000840] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000848] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000850] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000858] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:loop -+-/* [0x00000860] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000868] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000870] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000878] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000880] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000888] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000890] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000898] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x000008a0] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x000008a8] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x000008b0] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008b8] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x000008c0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008c8] */ 0xfffffe58, 0xf06809e7, // brr.anyn -, r:loop -+-/* [0x000008d0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000008d8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008e0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000008e8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000008f0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008f8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000900] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// :fast_path -+-/* [0x00000908] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :fast_loop -+-/* [0x00000910] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000918] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000920] */ 0x95727d9b, 0x1004475f, // mov.ifz ra_y, ra_y_next ; mov rb31, r3 -+-/* [0x00000928] */ 0x95690dbf, 0x10044623, // mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -+-/* [0x00000930] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000938] */ 0x929de5e4, 0x100248a1, // min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 -+-/* [0x00000940] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000948] */ 0xec414c87, 0x10024e20, // add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000950] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000958] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000960] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000968] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000970] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000978] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000980] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000988] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000990] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000998] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -+-/* [0x000009a0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x000009a8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000009b0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000009b8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000009c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000009c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009d0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000009d8] */ 0xffffff18, 0xf06809e7, // brr.anyn -, r:fast_loop -+-/* [0x000009e0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x000009e8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x000009f0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x000009f8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000a00] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000a08] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000a10] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000a18] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000a20] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000a28] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000a30] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000a38] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000a40] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000a48] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:fast_loop -+-/* [0x00000a50] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x00000a58] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a60] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a68] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a70] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a78] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a80] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_filter_b -+-/* [0x00000a88] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000a90] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000a98] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x00000aa0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000aa8] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000ab0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000ab8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x00000ac0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000ac8] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x00000ad0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000ad8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000ae0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000ae8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000af0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000af8] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000b00] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000b08] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000b10] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000b18] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000b20] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000b28] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000b30] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000b38] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000b40] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000b48] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000b50] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000b58] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000b60] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000b68] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000b70] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000b78] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000b80] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -+-/* [0x00000b88] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000b90] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000b98] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ba0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ba8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000bb0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bb8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bc0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bc8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000bd0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bd8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000be0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000be8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000bf0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bf8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000c00] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000c08] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000c10] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000c18] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000c20] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :bloop -+-/* [0x00000c28] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000c30] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000c38] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000c40] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000c48] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000c50] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000c58] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000c60] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000c68] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000c70] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000c78] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000c80] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000c88] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000c90] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000c98] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000ca0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000ca8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000cb0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000cb8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000cc0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000cc8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000cd0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000cd8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000ce0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000ce8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000cf0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000cf8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x00000d00] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000d08] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000d10] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000d18] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000d20] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000d28] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000d30] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000d38] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000d40] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:bloop -+-/* [0x00000d48] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000d50] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000d58] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000d60] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000d68] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000d70] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000d78] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000d80] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000d88] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000d90] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000d98] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000da0] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000da8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000db0] */ 0x8fc8f3f6, 0xd0020867, // asr r1, r1, 15 ; mov -, vr_wait -+-/* [0x00000db8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000dc0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x00000dc8] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:bloop -+-/* [0x00000dd0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000dd8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00000de0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x00000de8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000df0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000df8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000e00] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_filter_honly -+-/* [0x00000e08] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000e10] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000e18] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x00000e20] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000e28] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000e30] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000e38] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x00000e40] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000e48] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x00000e50] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000e58] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000e60] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000e68] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000e70] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000e78] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000e80] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000e88] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000e90] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000e98] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000ea0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000ea8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000eb0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000eb8] */ 0x0c9de1c0, 0xd0021467, // add rb17, r0, -2 -+-/* [0x00000ec0] */ 0x919c71c0, 0xd0024812, // shl r0, r0, 7 ; mov rb18,r0 -+-/* [0x00000ec8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000ed0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000ed8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000ee0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000ee8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f00] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000f08] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f10] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f18] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f20] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000f28] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000f30] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000f38] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000f40] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :loop_honly -+-/* [0x00000f48] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000f50] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000f58] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000f60] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000f68] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000f70] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000f78] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000f80] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000f88] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000f90] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000f98] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000fa0] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000fa8] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000fb0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000fb8] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000fc0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000fc8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000fd0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000fd8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000fe0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000fe8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000ff0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000ff8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001000] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001008] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001010] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001018] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001020] */ 0x8d5927f6, 0x100269e1, // sub.setf -, r3, rb18 ; mov r1, ra22 -+-/* [0x00001028] */ 0x559f2fc1, 0x100049e0, // mov -, vw_wait ; mul24 r0, r0, r1 -+-/* [0x00001030] */ 0xfffffef8, 0xf06809e7, // brr.anyn -, r:loop_honly -+-/* [0x00001038] */ 0x0f9cf1c0, 0xd0020827, // asr r0, r0, 15 -+-/* [0x00001040] */ 0x129d61c0, 0x10020827, // min r0, r0, rb22 -+-/* [0x00001048] */ 0x139c01c0, 0xd0020c27, // max vpm, r0, 0 -+-/* [0x00001050] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001058] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001060] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001068] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_exit -+-/* [0x00001070] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001078] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00001080] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001088] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001090] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001098] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010a0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000010a8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000010b0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_exit1 -+-/* [0x000010b8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000010c0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010c8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010d0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010d8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010e0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000010e8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000010f0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_interrupt_exit -+-/* [0x000010f8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001100] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001108] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001110] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001118] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001120] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001128] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001130] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001138] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001140] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001148] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001150] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001158] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001160] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001168] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001170] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001178] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001180] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00001188] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_interrupt_exit4 -+-/* [0x00001190] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001198] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011a8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011b0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000011d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000011e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_interrupt_exit8 -+-/* [0x000011e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000011f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001200] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001208] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001210] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001218] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001220] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001228] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001230] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001238] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001240] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001248] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001250] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00001258] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_setup_uv -+-/* [0x00001260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001268] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -+-/* [0x00001270] */ 0x15827d80, 0x10020767, // mov ra_y, unif -+-/* [0x00001278] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -+-/* [0x00001280] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00001288] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -+-/* [0x00001290] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00001298] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x000012a0] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x000012a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000012b0] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x000012b8] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x000012c0] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x000012c8] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+-/* [0x000012d0] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x000012d8] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x000012e0] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x000012e8] */ 0x00000040, 0xe0021567, // mov rb21, 64 -+-/* [0x000012f0] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x000012f8] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00001300] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x00001308] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x00001310] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x00001318] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x00001320] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x00001328] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x00001330] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x00001338] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x00001340] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00001348] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00001350] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00001358] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00001360] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00001368] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00001370] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00001378] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001380] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00001388] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00001390] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00001398] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000013a0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000013a8] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000013b0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x000013b8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x000013c0] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x000013c8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x000013d0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000013d8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x000013e0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x000013e8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x000013f0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000013f8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x00001400] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x00001408] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x00001410] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00001418] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00001420] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x00001428] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00001430] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x00001438] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x00001440] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00001448] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001450] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001458] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001460] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00001468] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00001470] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00001478] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001480] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00001488] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00001490] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000398] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003a0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003a8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003b0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003b8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003c0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003c8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003d0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003d8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003e0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003e8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003f0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003f8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000400] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000408] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000410] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000418] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000420] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000428] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000430] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000438] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000440] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000448] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000450] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000458] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000460] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000468] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000470] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000478] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000480] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000488] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000490] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000498] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000004a0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000004a8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000004b0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000004b8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004c0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000004c8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000004d0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000004d8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x000004e0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x000004e8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x000004f0] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x000004f8] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000500] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000508] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000510] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000518] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000520] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000528] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000530] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000538] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000540] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000560] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000568] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000570] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000578] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000580] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000588] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000590] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000598] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00001498] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000014a0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000014a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000014b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000014b8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000014c0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000014c8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000014d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000014d8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000014e0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000014e8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000014f0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000014f8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00001500] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001508] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00001510] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00001518] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00001520] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00001528] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00001530] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00001538] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00001540] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00001548] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00001550] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001558] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001560] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00001568] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -+-/* [0x00001570] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00001578] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001580] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001588] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001590] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001598] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000015a0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015a8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015b0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015b8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000015c0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015c8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015d0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015d8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000015e0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015e8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015f0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015f8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00001600] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00001608] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001610] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000005a0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005a8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005b0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005b8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005c0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000005c8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005d0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000005d8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000005e0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000005e8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000005f0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000005f8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000600] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000608] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000610] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000618] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000620] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000628] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000630] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000638] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000640] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000648] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000650] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000658] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000660] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000668] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000670] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00000678] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000680] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000688] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000690] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000698] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000006a8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000006c8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000006e8] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f0] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f8] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000700] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000708] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000710] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000718] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00001618] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00001620] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00001628] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00001630] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00001638] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00001640] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00001648] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00001650] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00001658] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00001660] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00001668] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001670] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00001678] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-/* [0x00001680] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00001688] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00001690] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00001698] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000016a0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000016a8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000016b0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000016b8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000016c0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000016c8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000016d0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000016d8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000016e0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000016e8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x000016f0] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x000016f8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00001700] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00001708] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001710] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001718] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001720] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001728] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001730] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00001738] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00001740] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00001748] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00001750] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00001758] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00001760] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00001768] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00001770] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00001778] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00001780] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00001788] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00001790] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00001798] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x000017a0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000017a8] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000017b0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000017b8] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x000017c0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000017c8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x000017d0] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x000017d8] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x000017e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000017e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000017f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000017f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00001800] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001808] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001810] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00001818] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001820] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000720] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000728] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000730] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000738] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000740] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000748] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000750] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000758] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000760] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000768] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000770] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000778] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000780] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++/* [0x00000788] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000790] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000798] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000007a0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000007a8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007b0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000007b8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007c0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000007c8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007d0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000007d8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007e0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000007e8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000007f0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x000007f8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000800] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000808] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000810] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000818] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000820] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000828] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000830] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000838] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000848] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000850] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000858] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000860] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000868] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000870] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000878] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000880] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000888] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000890] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000898] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008a0] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000008a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000008b0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000008b8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008c0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x000008c8] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000008d0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000008d8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x000008e0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x000008e8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000008f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000900] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000908] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000910] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000918] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000920] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000928] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_exit -++/* [0x00000930] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000938] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000940] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000948] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000950] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000958] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000960] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000968] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000970] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit8 -++/* [0x00000978] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000980] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000988] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000990] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000998] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000009a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009d0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009d8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000009e0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000009e8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 3464cdb..9de4535 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -3,18 +3,11 @@ -+ -+ extern unsigned int rpi_shader[]; -+ -+-#define mc_setup (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 146) -+-#define mc_filter (rpi_shader + 364) -+-#define mc_filter_b (rpi_shader + 674) -+-#define mc_filter_honly (rpi_shader + 898) -+-#define mc_exit (rpi_shader + 1052) -+-#define mc_exit1 (rpi_shader + 1070) -+-#define mc_interrupt_exit (rpi_shader + 1086) -+-#define mc_interrupt_exit4 (rpi_shader + 1124) -+-#define mc_interrupt_exit8 (rpi_shader + 1146) -+-#define mc_setup_uv (rpi_shader + 1176) -+-#define mc_filter_uv_b (rpi_shader + 1318) -+-#define mc_end (rpi_shader + 1546) -++#define mc_setup_uv (rpi_shader + 0) -++#define mc_filter_uv (rpi_shader + 142) -++#define mc_filter_uv_b (rpi_shader + 360) -++#define mc_exit (rpi_shader + 588) -++#define mc_interrupt_exit8 (rpi_shader + 606) -++#define mc_end (rpi_shader + 636) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 4809e1d..cd7346d 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -71,8 +71,10 @@ -+ -+ .set rb_const_64, rb21 -+ -+-# mc_setup(next_kernel, x, y, ref_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1) -+-::mc_setup -++ -++################################################################################ -++# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -++::mc_setup_uv -+ -+ # Read starting kernel -+ mov ra31, unif -+@@ -80,7 +82,9 @@ mov ra31, unif -+ # Load first request location -+ add ra_x_base, unif, elem_num # Store x -+ mov ra_y, unif # Store y -+-mov ra_x2_base, unif # Store frame base -++mov ra_x2_base, unif # Store frame u base -++nop -++sub ra_u2v_ref_offset, unif, ra_x2_base # Store offset to add to move from u to v in reference frame -+ -+ # Read image dimensions -+ sub rb25,unif,1 -+@@ -143,29 +147,24 @@ mov r1, vpm_setup(0, 4, h8p(0, 0)) -+ add rb28, r0, r1 -+ -+ # Compute base address for first and second access -+-#add r0, unif, elem_num # x -+ mov r0, ra_x_base # Load x -+-add r2, r0, 8 # x+8 -+ max r0, r0, 0; mov r1, ra_y # Load y -+ min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -+-shl ra_xshift_next, r0, 3 -+-max r2, r2, 0 -++shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+ add ra_y, r1, 1 -+-min r2, r2, rb_frame_width_minus_1 -+-shl ra_x2shift_next, r2, 3 -+-max r1, r1, 0 # y -+-min r1, r1, rb_frame_height_minus_1 -+-add r0, r0, r3; mul24 r1, r1, rb_pitch -+-add r2, r2, r3 -++add r0, r0, r3 -+ and r0, r0, ~3 -+-and r2, r2, ~3; mov ra_x_base, r0 -++max r1, r1, 0 ; mov ra_x_base, r0 # y -++min r1, r1, rb_frame_height_minus_1 -+ # submit texture requests for first line -++add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+ add t0s, r0, r1 ; mov ra_x2_base, r2 -+ add t0s, r2, r1 -+ -+ # Dump padding words -+ mov r0, unif -+ mov r0, unif -++mov r0, unif -+ -+ # submit texture requests for second line -+ max r1, ra_y, 0 -+@@ -176,6 +175,8 @@ nop ; mul24 r1, r1, rb_pitch -+ add t0s, r1, ra_x_base -+ add t0s, r1, ra_x2_base -+ -++ -++ -+ ################################################################################ -+ -+ # mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -+@@ -341,453 +342,26 @@ add vw_setup, rb26, r0 # VDW setup 0 -+ mov vw_setup, rb29 # Stride -+ mov vw_addr, unif # start the VDW -+ -+-################################################################################ -+- -+- -+-# mc_filter(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -+- -+-# At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -+-::mc_filter -+-mov ra31, unif -+- -+-# per-channel shifts were calculated on the *previous* invocation -+- -+-mov ra_xshift, ra_xshift_next -+-mov ra_x2shift, ra_x2shift_next -+- -+-# get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # x -+-add r2, r0, 8 # x+8 -+-max r0, r0, 0; mov r1, unif # y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -+-shl ra_xshift_next, r0, 3 -+-max r2, r2, 0 -+-min r2, r2, rb_frame_width_minus_1 -+-shl ra_x2shift_next, r2, 3 -+-add r0, r0, r3 -+-add r2, r2, r3 -+-and rb_x_base_next, r0, ~3 -+-and ra_x2_base_next, r2, ~3 -+-mov ra_y_next, r1 -+- -+-# set up VPM write -+-mov vw_setup, rb28 -+- -+-# get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -+-shl r0, r0, 7 -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -+- -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+-# get filter coefficients -+- -+-mov r0, unif -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -+-asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-brr.anynn -, r:fast_path -+-asr rb12, r0, rb23 # delay slot 1 -+- -+-# r2 is elem_num -+-# r3 is loop counter -+- -+-mov r5rep, -8 # delay slot 2 -+- -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] # delay slot 3 -+- -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-## nop ; ldtmu0 # loop counter increment -+-## shr r0, r4, ra17 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 ; mul24 r3, r0, ra0 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-## sub r2, r2, r3 ; ldtmu0 -+-## -+-## mov r0, ra22 -+-## shr r0, r4, ra17 ; mul24 r2, r2, r0 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # apply horizontal filter -+-## -+-## asr r2, r2, 15 ; mul24 r3, r0, ra0 -+-## min r2, r2, rb22 -+-## max ra13, r2, 0 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-## sub r0, r2, r3 -+-## -+-## # apply horizontal filter -+-## -+-## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -+-## asr r0, r0, 15 -+-## min r0, r0, rb22 -+-## max ra14, r0, 0 -+-## -+-## -+-## -+-## -+-## nop ; ldtmu0 # loop counter increment -+-## shr r0, r4, ra17 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 ; mul24 r3, r0, ra0 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-## sub r0, r2, r3 -+-## -+-## # apply horizontal filter -+-## -+-## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -+-## asr r0, r0, 15 -+-## min r0, r0, rb22 -+-## max ra15, r0, 0 -+- -+- -+- -+- -+-mov r3, 0 -+- -+-:loop -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -+- -+-# generate seven shifted versions -+-# interleave with scroll of vertical context -+- -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+- -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 8 ; mov r1, ra22 -+- -+-# apply horizontal filter -+-brr.anyn -, r:loop -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -+- -+-# apply vertical filter and write to VPM -+- -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-brr.anyn -, r:loop -+-asr r1, r1, 15 -+-min r1, r1, rb22 -+-max vpm, r1, 0 -+- -+-# DMA out -+- -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -+-mov vw_setup, rb29 -+-mov vw_addr, unif # start the VDW -+- -+-#################################################### -+- -+-:fast_path -+-## nop ; ldtmu0 # loop counter increment -+-## shr r0, r4, ra17 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 ; mul24 r3, r0, ra0 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## sub r2, r2, r3 ; ldtmu0 -+-## -+-## mov r0, ra22 -+-## shr r0, r4, ra17 ; mul24 r2, r2, r0 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # apply horizontal filter -+-## -+-## asr r2, r2, 15 ; mul24 r3, r0, ra0 -+-## min r2, r2, rb22 -+-## max ra13, r2, 0 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## sub r0, r2, r3 -+-## -+-## # apply horizontal filter -+-## -+-## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -+-## asr r0, r0, 15 -+-## min r0, r0, rb22 -+-## max ra14, r0, 0 -+-## -+-## -+-## -+-## -+-## nop ; ldtmu0 # loop counter increment -+-## shr r0, r4, ra17 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 ; mul24 r3, r0, ra0 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## sub r0, r2, r3 -+-## -+-## # apply horizontal filter -+-## -+-## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -+-## asr r0, r0, 15 -+-## min r0, r0, rb22 -+-## max ra15, r0, 0 -+- -+- -+-mov r3, 0 # This signifies the amount of unrolling -+- -+-:fast_loop -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-# Due to pipelining we can only skip second pipeline instructions related to the fetched pixels -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_y, ra_y_next ; mov rb31, r3 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -+- -+-max r2, ra_y, 0 -+-min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 # discard texture read -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -+-add t0s, ra_x2_base, r2 -+- -+-# generate seven shifted versions -+-# interleave with scroll of vertical context -+- -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-sub r0, r2, r3 ; mov r3, rb31 -+- -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 8 ; mov r1, ra22 -+- -+-# apply horizontal filter -+- -+-brr.anyn -, r:fast_loop -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -+- -+-# apply vertical filter and write to VPM -+- -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-brr.anyn -, r:fast_loop -+-asr r1, r1, 15 -+-min r1, r1, rb22 -+-max vpm, r1, 0 -+- -+-# DMA out -+- -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -+-mov vw_setup, rb29 -+-mov vw_addr, unif # start the VDW -+ -+ ################################################################################ -+ -+-# mc_filter_b(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -+- -+-# At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -+-::mc_filter_b -++::mc_filter_uv_b -+ mov ra31, unif -+ -+ # per-channel shifts were calculated on the *previous* invocation -+ -+ mov ra_xshift, ra_xshift_next -+-mov ra_x2shift, ra_x2shift_next -+ -+ # get base addresses and per-channel shifts for *next* invocation -+ add r0, unif, elem_num # x -+-add r2, r0, 8 # x+8 -+ max r0, r0, 0; mov r1, unif # y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -++min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+ shl ra_xshift_next, r0, 3 -+-max r2, r2, 0 -+-min r2, r2, rb_frame_width_minus_1 -+-shl ra_x2shift_next, r2, 3 -++sub r2, unif, r3 # compute offset from frame base u to frame base v -+ add r0, r0, r3 -+-add r2, r2, r3 -+ and rb_x_base_next, r0, ~3 -+-and ra_x2_base_next, r2, ~3 -+ mov ra_y_next, r1 -++add ra_x2_base_next, rb_x_base_next, r2 -+ -+ # set up VPM write -+ mov vw_setup, rb28 -+@@ -801,17 +375,22 @@ and r0, r0, rb22 # Extract height -+ add rb17, r0, 5 -+ add rb18, r0, 7 -+ shl r0, r0, 7 -++ -+ # r0 is currently height<<7 -+ # For vr_setup we want height<<20 (so 20-7=13 additional bits) -+ shl r3, r0, 13 -+ shl r3, r3, 8 # Mask off top 8 bits -+ shr r3, r3, 8 -++ -+ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+ add rb26, r0, rb27 -++ -+ # In a B frame, so also set up VPM read -+ add vr_setup, r3, rb28 -+ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -+ # get filter coefficients -+ -+ mov r0, unif -+@@ -837,9 +416,13 @@ asr rb12, r0, rb23 -+ -+ mov r5rep, -8 -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -+ mov r3, 0 -+ -+-:bloop -++:uvloop_b -+ # retrieve texture results and pick out bytes -+ # then submit two more texture requests -+ -+@@ -847,7 +430,7 @@ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+ shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+ mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -+ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+@@ -861,6 +444,7 @@ add t0s, ra_x2_base, r2 -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+ mov r2, rb21 ; mul24 r3, r0, ra0 -++nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+ sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+ sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+@@ -889,7 +473,7 @@ mov ra13, ra14 -+ sub.setf -, r3, 8 ; mov r1, ra22 -+ -+ # apply horizontal filter -+-brr.anyn -, r:bloop -++brr.anyn -, r:uvloop_b -+ max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+ asr r0, r0, 15 ; mov r1, ra21 -+ min.setf ra15, r0, rb22 -+@@ -906,213 +490,50 @@ sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+ sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+ sub.ifnn r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 15 ; mov -, vr_wait -++asr r1, r1, 15 -+ min r1, r1, rb22 -+ add r0, vpm, 1 # Blend in previous VPM contents at this location -+-brr.anyn -, r:bloop -++brr.anyn -, r:uvloop_b -+ max r1, r1, 0 -+ add r1, r1, r0 -+ shr vpm, r1, 1 -+ -+-# DMA out -++ -++# DMA out for U -++ -++mov vw_setup, rb26 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++# DMA out for V -++# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -++# Could potentially push this write into the start of the next pipeline stage. -++mov r0, 16 -++mov -, vw_wait -+ -+ bra -, ra31 -+-mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -+-mov vw_setup, rb29 -++add vw_setup, rb26, r0 # VDW setup 0 -++mov vw_setup, rb29 # Stride -+ mov vw_addr, unif # start the VDW -+ -+ ################################################################################ -+ -+-# mc_filter_honly(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -+-# This filter only does horizontal filtering. -+-# It is assumed that the region to fetch does not include extra rows above. -++# mc_exit() -+ -+-# At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -+-::mc_filter_honly -+-mov ra31, unif -++::mc_exit -++mov -, vw_wait # wait on the VDW -+ -+-# per-channel shifts were calculated on the *previous* invocation -++mov -,srel(0) -+ -+-mov ra_xshift, ra_xshift_next -+-mov ra_x2shift, ra_x2shift_next -+- -+-# get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # x -+-add r2, r0, 8 # x+8 -+-max r0, r0, 0; mov r1, unif # y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -+-shl ra_xshift_next, r0, 3 -+-max r2, r2, 0 -+-min r2, r2, rb_frame_width_minus_1 -+-shl ra_x2shift_next, r2, 3 -+-add r0, r0, r3 -+-add r2, r2, r3 -+-and rb_x_base_next, r0, ~3 -+-and ra_x2_base_next, r2, ~3 -+-mov ra_y_next, r1 -+- -+-# set up VPM write -+-mov vw_setup, rb28 -+- -+-# get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, -2 # Pipelining means we move data across 2 iterations early -+-shl r0, r0, 7 ; mov rb18,r0 -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -+- -+-# get filter coefficients -+- -+-mov r0, unif -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -+-mov r0, unif -+- -+-# r2 is elem_num -+-# r3 is loop counter -+-mov r5rep, -8 -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] # delay slot 3 -+-mov r3, 0 -+- -+-:loop_honly -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -+- -+-# generate seven shifted versions -+-# interleave with scroll of vertical context -+- -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+- -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 ; mov r3, rb31 -+- -+-sub.setf -, r3, rb18 ; mov r1, ra22 -+- -+-mov -, vw_wait ; mul24 r0, r0, r1 -+-brr.anyn -, r:loop_honly -+-asr r0, r0, 15 # delay 1 -+-min r0, r0, rb22 # delay 2 -+-max vpm, r0, 0 # delay 3 -+- -+-# DMA out -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -+-mov vw_setup, rb29 -+-mov vw_addr, unif # start the VDW -+- -+- -+-################################################################################ -+- -+-# mc_exit() -+- -+-::mc_exit -+-mov -, vw_wait # wait on the VDW -+- -+-mov -,srel(0) -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -+ -+ nop ; nop ; thrend -+ nop ; nop # delay slot 1 -+ nop ; nop # delay slot 2 -+ -+-::mc_exit1 -+-mov -, vw_wait # wait on the VDW -+- -+-#mov -,srel(1) -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+- -+-nop ; nop ; thrend -+-mov interrupt, 1; nop # delay slot 1 -+-nop ; nop # delay slot 2 -+- -+-# mc_interrupt_exit() -+-::mc_interrupt_exit -+-mov -, vw_wait # wait on the VDW -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+- -+-mov -,sacq(0) # 1 -+-mov -,sacq(0) # 2 -+-mov -,sacq(0) # 3 -+-mov -,sacq(0) # 4 -+-mov -,sacq(0) # 5 -+-mov -,sacq(0) # 6 -+-mov -,sacq(0) # 7 -+-mov -,sacq(0) # 8 -+-mov -,sacq(0) # 9 -+-mov -,sacq(0) # 10 -+-mov -,sacq(0) # 11 -+- -+-nop ; nop ; thrend -+-mov interrupt, 1; nop # delay slot 1 -+-nop ; nop # delay slot 2 -+- -+-# mc_interrupt_exit4() -+-::mc_interrupt_exit4 -+-mov -, vw_wait # wait on the VDW -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+- -+-mov -,sacq(0) # 1 -+-mov -,sacq(0) # 2 -+-mov -,sacq(0) # 3 -+- -+-nop ; nop ; thrend -+-mov interrupt, 1; nop # delay slot 1 -+-nop ; nop # delay slot 2 -+- -+ # mc_interrupt_exit8() -+ ::mc_interrupt_exit8 -+ mov -, vw_wait # wait on the VDW -+@@ -1134,282 +555,5 @@ nop ; nop ; thrend -+ mov interrupt, 1; nop # delay slot 1 -+ nop ; nop # delay slot 2 -+ -+-################################################################################ -+-# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -+-::mc_setup_uv -+- -+-# Read starting kernel -+-mov ra31, unif -+- -+-# Load first request location -+-add ra_x_base, unif, elem_num # Store x -+-mov ra_y, unif # Store y -+-mov ra_x2_base, unif # Store frame u base -+-nop -+-sub ra_u2v_ref_offset, unif, ra_x2_base # Store offset to add to move from u to v in reference frame -+- -+-# Read image dimensions -+-sub rb25,unif,1 -+-sub rb30,unif,1 -+- -+-# get source pitch -+-mov rb16, unif -+- -+-# get destination pitch -+-mov r0, unif -+-mov r1, vdw_setup_1(0) -+-add rb24, r1, r0 -+- -+-# load constants -+- -+-mov ra20, 1 -+-mov ra21, 32 -+-mov ra22, 256 -+-mov ra23, 8 -+- -+-mov rb20, 0xffffff00 -+-mov rb21, 64 -+-mov rb22, 255 -+-mov rb23, 24 -+- -+-# touch vertical context to keep simulator happy -+- -+-mov ra8, 0 -+-mov ra9, 0 -+-mov ra10, 0 -+-mov ra11, 0 -+-mov ra12, 0 -+-mov ra13, 0 -+-mov ra14, 0 -+-mov ra15, 0 -+- -+-# Compute part of VPM to use for DMA output -+-mov r2, qpu_num -+-and r2, r2, 15 -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -+-shl r0, r0, 5 -+-add rb27, r0, r1 -+- -+-# Compute part of VPM to save data into -+-mov r2, qpu_num -+-and r2, r2, 15 -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-add rb28, r0, r1 -+- -+-# Compute base address for first and second access -+-mov r0, ra_x_base # Load x -+-max r0, r0, 0; mov r1, ra_y # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -+-shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-add ra_y, r1, 1 -+-add r0, r0, r3 -+-and r0, r0, ~3 -+-max r1, r1, 0 ; mov ra_x_base, r0 # y -+-min r1, r1, rb_frame_height_minus_1 -+-# submit texture requests for first line -+-add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-add t0s, r0, r1 ; mov ra_x2_base, r2 -+-add t0s, r2, r1 -+- -+-# Dump padding words -+-mov r0, unif -+-mov r0, unif -+-mov r0, unif -+- -+-# submit texture requests for second line -+-max r1, ra_y, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 -+-bra -, ra31 -+-nop ; mul24 r1, r1, rb_pitch -+-add t0s, r1, ra_x_base -+-add t0s, r1, ra_x2_base -+- -+- -+- -+-################################################################################ -+- -+-::mc_filter_uv_b -+-mov ra31, unif -+- -+-# per-channel shifts were calculated on the *previous* invocation -+- -+-mov ra_xshift, ra_xshift_next -+- -+-# get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # x -+-max r0, r0, 0; mov r1, unif # y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+-shl ra_xshift_next, r0, 3 -+-sub r2, unif, r3 # compute offset from frame base u to frame base v -+-add r0, r0, r3 -+-and rb_x_base_next, r0, ~3 -+-mov ra_y_next, r1 -+-add ra_x2_base_next, rb_x_base_next, r2 -+- -+-# set up VPM write -+-mov vw_setup, rb28 -+- -+-# get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -+-shl r0, r0, 7 -+- -+-# r0 is currently height<<7 -+-# For vr_setup we want height<<20 (so 20-7=13 additional bits) -+-shl r3, r0, 13 -+-shl r3, r3, 8 # Mask off top 8 bits -+-shr r3, r3, 8 -+- -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -+- -+-# In a B frame, so also set up VPM read -+-add vr_setup, r3, rb28 -+- -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+-# get filter coefficients -+- -+-mov r0, unif -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -+-asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-asr rb12, r0, rb23 -+- -+-# r2 is elem_num -+-# r3 is loop counter -+- -+-mov r5rep, -8 -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+- -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-mov r3, 0 -+- -+-:uvloop_b -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -+- -+-# generate seven shifted versions -+-# interleave with scroll of vertical context -+- -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+- -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 8 ; mov r1, ra22 -+- -+-# apply horizontal filter -+-brr.anyn -, r:uvloop_b -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -+- -+-# apply vertical filter and write to VPM -+- -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 15 -+-min r1, r1, rb22 -+-add r0, vpm, 1 # Blend in previous VPM contents at this location -+-brr.anyn -, r:uvloop_b -+-max r1, r1, 0 -+-add r1, r1, r0 -+-shr vpm, r1, 1 -+- -+- -+-# DMA out for U -+- -+-mov vw_setup, rb26 # VDW setup 0 -+-mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW -+- -+-# DMA out for V -+-# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -+-# Could potentially push this write into the start of the next pipeline stage. -+-mov r0, 16 -+-mov -, vw_wait -+- -+-bra -, ra31 -+-add vw_setup, rb26, r0 # VDW setup 0 -+-mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW -+- -+ ::mc_end -++# Do not add code here because mc_end must appear after all other code. -+-- -+2.7.4 -+ -+ -+From d40d59de0f09fd1a6e7146532418b63d8e2711b7 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 14:54:25 +0100 -+Subject: [PATCH 20/68] Moved chroma P1 to QPUs -+ -+--- -+ libavcodec/hevc.c | 38 ++++++++++++++++++++++++++++++++++++++ -+ 1 file changed, 38 insertions(+) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 31b8b2f..391d139 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2070,6 +2070,44 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ s->sh.luma_offset_l1[current_mv.ref_idx[1]]); -+ -+ if (s->ps.sps->chroma_format_idc) { -++#ifdef RPI_INTER_QPU -++ if (s->enable_rpi) { -++ int reflist = 1; -++ int hshift = s->ps.sps->hshift[1]; -++ int vshift = s->ps.sps->vshift[1]; -++ const Mv *mv = ¤t_mv.mv[reflist]; -++ intptr_t mx = av_mod_uintp2(mv->x, 2 + hshift); -++ intptr_t my = av_mod_uintp2(mv->y, 2 + vshift); -++ intptr_t _mx = mx << (1 - hshift); -++ intptr_t _my = my << (1 - vshift); // Fractional part of motion vector -++ -++ int x1_c = x0_c + (mv->x >> (2 + hshift)); -++ int y1_c = y0_c + (mv->y >> (2 + hshift)); -++ //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ int chan = x0>>8; -++ -++ uint32_t *u = s->u_mvs[chan & 7]; -++ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -++ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -++ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -++ *u++ = rpi_filter_coefs[_mx][0]; -++ *u++ = rpi_filter_coefs[_mx][1]; -++ *u++ = rpi_filter_coefs[_my][0]; -++ *u++ = rpi_filter_coefs[_my][1]; -++ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ } -++ } -++ s->u_mvs[chan & 7] = u; -++ return; -++ } -++#endif -+ RPI_REDIRECT(chroma_mc_uni)(s, dst1, s->frame->linesize[1], ref1->frame->data[1], ref1->frame->linesize[1], -+ 1, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][0], s->sh.chroma_offset_l1[current_mv.ref_idx[1]][0]); -+-- -+2.7.4 -+ -+ -+From 75777ba7927086e862104b14f6446e81bc789611 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 15:13:47 +0100 -+Subject: [PATCH 21/68] Added B prediction - not quite right -+ -+--- -+ libavcodec/hevc.c | 58 ++++++++++++++++++++++++ -+ libavcodec/rpi_shader.c | 108 +++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 6 +-- -+ libavcodec/rpi_shader.qasm | 48 ++++++++++---------- -+ 4 files changed, 141 insertions(+), 79 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 391d139..47ddfff 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2127,6 +2127,64 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ ref1->frame, ¤t_mv.mv[1], ¤t_mv); -+ -+ if (s->ps.sps->chroma_format_idc) { -++#ifdef RPI_INTER_QPU -++ if (s->enable_rpi) { -++ int hshift = s->ps.sps->hshift[1]; -++ int vshift = s->ps.sps->vshift[1]; -++ const Mv *mv = ¤t_mv.mv[0]; -++ intptr_t mx = av_mod_uintp2(mv->x, 2 + hshift); -++ intptr_t my = av_mod_uintp2(mv->y, 2 + vshift); -++ intptr_t _mx = mx << (1 - hshift); -++ intptr_t _my = my << (1 - vshift); // Fractional part of motion vector -++ int x1_c = x0_c + (mv->x >> (2 + hshift)); -++ int y1_c = y0_c + (mv->y >> (2 + hshift)); -++ -++ const Mv *mv2 = ¤t_mv.mv[1]; -++ intptr_t mx2 = av_mod_uintp2(mv2->x, 2 + hshift); -++ intptr_t my2 = av_mod_uintp2(mv2->y, 2 + vshift); -++ intptr_t _mx2 = mx2 << (1 - hshift); -++ intptr_t _my2 = my2 << (1 - vshift); // Fractional part of motion vector -++ -++ int x2_c = x0_c + (mv2->x >> (2 + hshift)); -++ int y2_c = y0_c + (mv2->y >> (2 + hshift)); -++ -++ int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ -++ uint32_t *u = s->u_mvs[chan & 7]; -++ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -++ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -++ *u++ = ( (nPbW_cframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); // TODO this will become unused once we have a dedicated pass0 filter -++ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 3 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y2_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -++ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -++ *u++ = rpi_filter_coefs[_mx2][0]; -++ *u++ = rpi_filter_coefs[_mx2][1]; -++ *u++ = rpi_filter_coefs[_my2][0]; -++ *u++ = rpi_filter_coefs[_my2][1]; -++ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ } -++ } -++ s->u_mvs[chan & 7] = u; -++ return; -++ } -++#endif -+ RPI_REDIRECT(chroma_mc_bi)(s, dst1, s->frame->linesize[1], ref0->frame, ref1->frame, -+ x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, 0); -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 170e8ac..5d00cb2 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -265,23 +265,23 @@ unsigned int rpi_shader[] = { -+ /* [0x00000760] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+ /* [0x00000768] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+ /* [0x00000770] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000778] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000780] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-/* [0x00000788] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000778] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000780] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000788] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+ /* [0x00000790] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000798] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000798] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ /* [0x000007a0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007a8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007a8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ /* [0x000007b0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007b8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007b8] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+ /* [0x000007c0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007c8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007c8] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+ /* [0x000007d0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007d8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007d8] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+ /* [0x000007e0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000007e8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000007e8] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+ /* [0x000007f0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x000007f8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x000007f8] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+ /* [0x00000800] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+ /* [0x00000808] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+ /* [0x00000810] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+@@ -291,61 +291,63 @@ unsigned int rpi_shader[] = { -+ /* [0x00000830] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+ /* [0x00000838] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+ /* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000848] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000850] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000858] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000860] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000868] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000870] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000878] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000880] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000888] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000890] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000898] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008a0] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000848] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000850] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000858] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000860] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000868] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000870] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000878] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000880] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000888] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000890] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000898] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008a0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+ /* [0x000008a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008b0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000008b8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008c0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x000008c8] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000008d0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x000008d8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x000008e0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x000008e8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000008f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000900] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000908] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000910] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000918] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000920] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000928] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000008b8] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x000008c0] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x000008c8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008d0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x000008d8] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000008e0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000008e8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x000008f0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x000008f8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000900] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000908] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000910] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000918] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000920] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000928] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000930] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000938] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000930] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000938] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000940] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000948] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000940] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000948] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+ /* [0x00000950] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000958] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000960] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000968] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000970] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000960] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000968] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000970] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000978] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000980] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000978] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000980] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000988] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000988] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x00000990] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000998] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000009a8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000009b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000009b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000009c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000009c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000009d0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009d8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000009e0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000009e8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000009d8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009e0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009e8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000009f0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000009f8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 9de4535..e36c4ae 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -6,8 +6,8 @@ extern unsigned int rpi_shader[]; -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 142) -+ #define mc_filter_uv_b (rpi_shader + 360) -+-#define mc_exit (rpi_shader + 588) -+-#define mc_interrupt_exit8 (rpi_shader + 606) -+-#define mc_end (rpi_shader + 636) -++#define mc_exit (rpi_shader + 592) -++#define mc_interrupt_exit8 (rpi_shader + 610) -++#define mc_end (rpi_shader + 640) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index cd7346d..870437d2 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -443,23 +443,23 @@ add t0s, ra_x2_base, r2 -+ -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -+ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+ nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+ nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+ nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+ nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 -++add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+@@ -474,23 +474,25 @@ sub.setf -, r3, 8 ; mov r1, ra22 -+ -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -++mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr ra15, r0, 8 ; nop -++nop ; nop -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -++nop ; mul24 r1, ra14, rb14 -++nop ; mul24 r0, ra13, rb13 -++add r1, r1, r0 ; mul24 r0, ra12, rb12 -++add r1, r1, r0 ; mul24 r0, ra11, rb11 -++add r1, r1, r0 ; mul24 r0, ra10, rb10 -++add r1, r1, r0 ; mul24 r0, ra9, rb9 -++add r1, r1, r0 ; mul24 r0, ra8, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb15 -++add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 15 -++asr r1, r1, 14 -++add r1, r1, ra21 -++asr r1, r1, 6 -+ min r1, r1, rb22 -+ add r0, vpm, 1 # Blend in previous VPM contents at this location -+ brr.anyn -, r:uvloop_b -+-- -+2.7.4 -+ -+ -+From 3d4e94b8f0b08fe4c0b582fc7f1dbe9d1d9d60ed Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 08:15:55 +0100 -+Subject: [PATCH 22/68] Added flush for SAO -+ -+--- -+ libavcodec/hevc.c | 2 +- -+ libavcodec/hevc_filter.c | 39 ++++++++++++++++++++++++++------------- -+ 2 files changed, 27 insertions(+), 14 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 47ddfff..93e1eba 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2903,7 +2903,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ rpi_execute_inter_qpu(s); -+ #endif -+ // Transform all blocks -+- //printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -++ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 9b6e26d..92a8271 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -871,6 +871,21 @@ static void flush_buffer(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+ gpu_cache_flush(p); -+ } -++ -++static void ff_hevc_flush_chroma(HEVCContext *s) -++{ -++ if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N )) { -++ flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[2]); -++ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -++ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -++ //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -++ } -++} -+ #endif -+ -+ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+@@ -886,31 +901,29 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x - ctb_size, y); -+ if (y && x_end) { -+ sao_filter_CTB(s, x, y - ctb_size); -+- if (s->threads_type & FF_THREAD_FRAME ) -++ if (s->threads_type & FF_THREAD_FRAME ) { -++#ifdef RPI_INTER_QPU -++ ff_hevc_flush_chroma(s); -++#endif -+ ff_thread_report_progress(&s->ref->tf, y, 0); -++ } -+ } -+ if (x_end && y_end) { -+ sao_filter_CTB(s, x , y); -+- if (s->threads_type & FF_THREAD_FRAME ) -++ if (s->threads_type & FF_THREAD_FRAME ) { -++#ifdef RPI_INTER_QPU -++ ff_hevc_flush_chroma(s); -++#endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -++ } -+ } -+ } else if (s->threads_type & FF_THREAD_FRAME && x_end) { -+ //int newh = y + ctb_size - 4; -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -+- if (!( s->nal_unit_type == NAL_TRAIL_N || -+- s->nal_unit_type == NAL_TSA_N || -+- s->nal_unit_type == NAL_STSA_N || -+- s->nal_unit_type == NAL_RADL_N || -+- s->nal_unit_type == NAL_RASL_N )) { -+ #ifdef RPI_INTER_QPU -+- flush_buffer(s->frame->buf[1]); -+- flush_buffer(s->frame->buf[2]); -++ ff_hevc_flush_chroma(s); -+ #endif -+- //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -+- //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -+- //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -+- } -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+ } -+-- -+2.7.4 -+ -+ -+From 3e337b9c4ef0c356a0259be2254ad1bc4d5bbe29 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 09:17:28 +0100 -+Subject: [PATCH 23/68] Stopped using acceleration in unsupported cases -+ -+--- -+ libavcodec/hevc.c | 14 +++++++------- -+ libavcodec/hevc_cabac.c | 4 ++-- -+ 2 files changed, 9 insertions(+), 9 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 93e1eba..bfd5a55 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -1152,15 +1152,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (size * size); i++) { -+ coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -+- printf("Cross component not supported\n"); // TODO -+- exit(-1); -+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride); -+ } -+ } -+ -+ if (lc->tu.cross_pf) { -+- printf("Cross component not supported\n"); // TODO -+- exit(-1); -+ hls_cross_component_pred(s, 1); -+ } -+ for (i = 0; i < (s->ps.sps->chroma_format_idc == 2 ? 2 : 1); i++) { -+@@ -1189,8 +1185,6 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (size * size); i++) { -+ coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -+- printf("Cross component not supported\n"); // TODO -+- exit(-1); -+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride); -+ } -+ } -+@@ -2857,7 +2851,13 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -+ #ifdef RPI -+- s->enable_rpi = 1; // TODO this should depend on cross component and frame width etc. -++ s->enable_rpi = s->ps.sps->bit_depth == 8 -++ && s->ps.sps->width <= RPI_MAX_WIDTH -++ && !s->ps.pps->cross_component_prediction_enabled_flag -++ && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1 -++ && !(s->ps.pps->weighted_pred_flag && s->sh.slice_type == P_SLICE) -++ && !(s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE); -++ -+ #endif -+ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 4f072be..38f53de 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1513,9 +1513,9 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ #ifdef RPI -+ if (!use_vpu) { -+ int max_xy = FFMAX(last_significant_coeff_x, last_significant_coeff_y); -+- if (max_xy == 0) -++ if (max_xy == 0) { -+ s->hevcdsp.idct_dc[log2_trafo_size-2](coeffs); -+- else { -++ } else { -+ int col_limit = last_significant_coeff_x + last_significant_coeff_y + 4; -+ if (max_xy < 4) -+ col_limit = FFMIN(4, col_limit); -+-- -+2.7.4 -+ -+ -+From 3941d3e4c2305fa037e8aba5a14cf698ac8673db Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 09:42:16 +0100 -+Subject: [PATCH 24/68] Split B prediction into two passes -+ -+--- -+ libavcodec/hevc.c | 1 + -+ libavcodec/hevc.h | 1 + -+ libavcodec/rpi_qpu.c | 3 + -+ libavcodec/rpi_qpu.h | 1 + -+ libavcodec/rpi_shader.c | 559 +++++++++++++++++++++++++++------------------ -+ libavcodec/rpi_shader.h | 11 +- -+ libavcodec/rpi_shader.qasm | 196 ++++++++++++++-- -+ 7 files changed, 531 insertions(+), 241 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index bfd5a55..4b133d2 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3801,6 +3801,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ p += uv_commands_per_qpu; -+ } -+ s->mc_filter_uv = qpu_get_fn(QPU_MC_FILTER_UV); -++ s->mc_filter_uv_b0 = qpu_get_fn(QPU_MC_FILTER_UV_B0); -+ s->mc_filter_uv_b = qpu_get_fn(QPU_MC_FILTER_UV_B); -+ -+ } -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index d513579..4a39e39 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -917,6 +917,7 @@ typedef struct HEVCContext { -+ uint32_t *u_mvs[8]; -+ // Function pointers -+ uint32_t mc_filter_uv; -++ uint32_t mc_filter_uv_b0; -+ uint32_t mc_filter_uv_b; -+ #endif -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 4e90cc1..60bf079 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -636,6 +636,9 @@ unsigned int qpu_get_fn(int num) { -+ case QPU_MC_FILTER_UV: -+ fn = mc_filter_uv; -+ break; -++ case QPU_MC_FILTER_UV_B0: -++ fn = mc_filter_uv_b0; -++ break; -+ case QPU_MC_FILTER_UV_B: -+ fn = mc_filter_uv_b; -+ break; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index f9ad333..543c84b 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -29,6 +29,7 @@ enum { -+ QPU_MC_FILTER_HONLY, -+ QPU_MC_SETUP_UV, -+ QPU_MC_FILTER_UV, -++ QPU_MC_FILTER_UV_B0, -+ QPU_MC_FILTER_UV_B, -+ QPU_MC_INTERRUPT_EXIT8, -+ QPU_MC_END -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 5d00cb2..88ad20b 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -39,18 +39,18 @@ unsigned int rpi_shader[] = { -+ /* [0x00000070] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+ /* [0x00000078] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+ /* [0x00000080] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000088] */ 0x00000040, 0xe0021567, // mov rb21, 64 -+-/* [0x00000090] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000098] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x000000a0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x000000a8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x000000b0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x000000b8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x000000c0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x000000c8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x000000d0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x000000d8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000e0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000088] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000090] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000098] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x000000a0] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000a8] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000b0] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000b8] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000c0] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000c8] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000d0] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000d8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000e0] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+ /* [0x000000e8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+ /* [0x000000f0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+ /* [0x000000f8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+@@ -62,176 +62,176 @@ unsigned int rpi_shader[] = { -+ /* [0x00000128] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+ /* [0x00000130] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+ /* [0x00000138] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000140] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000148] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000150] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000158] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000160] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000168] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000170] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000178] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000180] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000188] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x00000190] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x00000198] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x000001a0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001a8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001b0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001b8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001c0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x000001c8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001d0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x000001d8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x000001e0] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x000001e8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000001f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000001f8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000200] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000208] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000210] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000218] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000220] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000228] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000230] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000140] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x00000148] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000150] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000158] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000160] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000168] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000170] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000178] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000180] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000188] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000190] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -++/* [0x00000198] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x000001a0] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -++/* [0x000001a8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x000001b0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000001b8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x000001c0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000001c8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001d8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001e0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -++/* [0x000001e8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001f0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x000001f8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x00000200] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x00000208] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000218] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000220] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000228] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000230] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000238] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000240] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000248] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000250] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000238] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000240] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000248] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000250] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000258] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000260] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000268] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000270] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000278] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000280] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000288] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000290] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000298] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002a0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002a8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002b0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002b8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002c0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000002c8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000002d0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000002e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000002f0] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x000002f8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000300] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000308] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000310] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000340] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000360] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000368] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000370] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000378] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000380] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000388] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000390] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000258] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000260] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000268] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000270] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000278] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000280] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000288] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000290] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000298] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000002a0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002a8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002b0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002b8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002c0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002c8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002d0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002d8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002e0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000002e8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002f0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000300] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000308] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000310] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000340] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000360] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000368] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000370] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000378] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000380] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000388] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000390] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000398] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x000003a0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000003a8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003b0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000398] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003a0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003a8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003b0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003b8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003c0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003c8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003d0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003d8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003e0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003e8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003f0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003f8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000400] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000408] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000410] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000418] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000420] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000428] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000430] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000438] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000440] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000448] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000450] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000458] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000460] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000468] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000470] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000478] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000480] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000488] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000490] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000498] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000004a0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000004a8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000004b0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000004b8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004c0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000004c8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000004d0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000004d8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x000004e0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x000004e8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x000004f0] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x000004f8] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000500] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000508] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000510] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000518] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000520] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000528] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000530] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000538] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000540] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000560] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000568] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000570] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000578] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000580] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000588] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000590] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000598] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_filter_uv_b -+-/* [0x000005a0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005a8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005b0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005b8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005c0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000005c8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005d0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000005d8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000005e0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000005e8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000005f0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000005f8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000600] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000608] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000610] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000618] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000620] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000628] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000630] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000638] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000640] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000648] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000650] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000658] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000660] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000668] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000670] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x000003b8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003c0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003c8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003d0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003d8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003e0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003e8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003f0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003f8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000400] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000408] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000410] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000418] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000420] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000428] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000430] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000438] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000440] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000448] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000450] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000458] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000460] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000468] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000470] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000478] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000480] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000488] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000490] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000498] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000004a0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x000004a8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000004b0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000004b8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000004c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000004c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000004d0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000004d8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004e0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000004e8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000004f0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000004f8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000500] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000508] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000510] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000518] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000520] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000528] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000530] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000538] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000540] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000548] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000550] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000558] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000560] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000568] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000570] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000578] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000580] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000588] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000590] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000598] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000005a0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000005a8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000005b0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000005b8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_uv_b0 -++/* [0x000005c0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005c8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005d0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005d8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005e0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000005e8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005f0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000005f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000600] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000608] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000610] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000618] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000620] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000628] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000630] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000638] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000640] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000648] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000650] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000658] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000660] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000668] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000670] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+ /* [0x00000678] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+ /* [0x00000680] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000688] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+@@ -253,7 +253,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000708] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+ /* [0x00000710] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ /* [0x00000718] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :uvloop_b -++// :uvloop_b0 -+ /* [0x00000720] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+ /* [0x00000728] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+ /* [0x00000730] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+@@ -290,7 +290,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000828] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+ /* [0x00000830] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+ /* [0x00000838] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+ /* [0x00000848] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+ /* [0x00000850] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+ /* [0x00000858] */ 0x009e7000, 0x100009e7, // nop ; nop -+@@ -306,48 +306,163 @@ unsigned int rpi_shader[] = { -+ /* [0x000008a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ /* [0x000008b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+ /* [0x000008b8] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x000008c0] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x000008c8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008d0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x000008d8] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000008e0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x000008e8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x000008f0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x000008f8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000900] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000908] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000910] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000918] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000920] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000928] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000930] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000938] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008c0] */ 0xfffffad8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000008c8] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x000008d0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008d8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000008e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000008f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000900] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000908] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000910] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000918] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000920] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_uv_b -++/* [0x00000928] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000930] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000938] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000940] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000948] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000950] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000958] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000960] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000968] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000970] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000978] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000980] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000988] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000990] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000998] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000009a0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000009a8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000009b0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000009b8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000009c0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000009c8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000009d0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000009d8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x000009e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000009e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000009f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000009f8] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00000a00] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000a08] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000a10] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a18] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a20] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a28] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000a30] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a38] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a40] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a48] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000a50] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a58] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a60] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a68] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000a70] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a78] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a80] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a88] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000a90] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000a98] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000aa0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :uvloop_b -++/* [0x00000aa8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000ab0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000ab8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000ac0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000ac8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000ad0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000ad8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000ae0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000ae8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000af0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000af8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000b00] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000b08] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000b10] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000b18] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000b20] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000b28] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000b30] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000b38] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000b40] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000b48] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000b50] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000b58] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000b60] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000b68] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000b70] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000b78] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000b80] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000b88] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000b90] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000b98] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000ba0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000ba8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000bb0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000bb8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000bc0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000bc8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000bd0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000bd8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000be0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000be8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000bf0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000bf8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000c00] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000c08] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000c10] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000c18] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000c20] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000c28] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000c30] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000c38] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000c40] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000c48] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000c50] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000c58] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x00000c60] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000c68] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000c70] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00000c78] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x00000c80] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000c88] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000c90] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000c98] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000ca0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ca8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000cb0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000cb8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000cc0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000940] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000948] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000950] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000958] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000960] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000968] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000970] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000978] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000980] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000cc8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000cd0] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000cd8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ce0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ce8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000cf0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000cf8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000d00] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000d08] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000988] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000990] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000998] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009a8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009d0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009d8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009e0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009e8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000009f0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000009f8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000d10] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000d18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d30] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d38] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d40] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d58] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d60] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d70] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000d78] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000d80] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index e36c4ae..809e582 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,10 +4,11 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 142) -+-#define mc_filter_uv_b (rpi_shader + 360) -+-#define mc_exit (rpi_shader + 592) -+-#define mc_interrupt_exit8 (rpi_shader + 610) -+-#define mc_end (rpi_shader + 640) -++#define mc_filter_uv (rpi_shader + 150) -++#define mc_filter_uv_b0 (rpi_shader + 368) -++#define mc_filter_uv_b (rpi_shader + 586) -++#define mc_exit (rpi_shader + 818) -++#define mc_interrupt_exit8 (rpi_shader + 836) -++#define mc_end (rpi_shader + 866) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 870437d2..635b894 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -26,7 +26,7 @@ -+ # ra23 8 -+ # -+ # rb20 0xffffff00 -+-# rb21 64 -++# rb21 vpm_setup for writing 16bit results into VPM -+ # rb22 255 -+ # rb23 24 -+ # -+@@ -34,7 +34,7 @@ -+ # rb25 frame width-1 -+ # rb26 height<<23 + width<<16 + vdw_setup_0 -+ # rb27 vdw_setup_0 (depends on QPU number) -+-# rb28 vpm_setup (depends on QPU number) -++# rb28 vpm_setup (depends on QPU number) for writing 8bit results into VPM -+ # rb29 vdw_setup_1(dst_pitch-width) -+ # rb30 frame height-1 -+ # rb31 used as temp to count loop iterations -+@@ -69,8 +69,6 @@ -+ .set ra_y_next, ra28 -+ .set ra_y, ra29 -+ -+-.set rb_const_64, rb21 -+- -+ -+ ################################################################################ -+ # mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -+@@ -106,7 +104,6 @@ mov ra22, 256 -+ mov ra23, 8 -+ -+ mov rb20, 0xffffff00 -+-mov rb21, 64 -+ mov rb22, 255 -+ mov rb23, 24 -+ -+@@ -123,6 +120,7 @@ mov ra15, 0 -+ -+ # Compute part of VPM to use for DMA output -+ mov r2, qpu_num -++shl r2, r2, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -+ and r2, r2, 15 -+ mov r1, r2 -+ asr r1, r1, 2 -+@@ -135,16 +133,21 @@ shl r0, r0, 5 -+ add rb27, r0, r1 -+ -+ # Compute part of VPM to save data into -+-mov r2, qpu_num -+-and r2, r2, 15 -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vpm_setup(0, 4, h8p(0, 0)) -++mov r2, qpu_num # qpu_num = abcd -++shl r2, r2, 1 -++and r2, r2, 15 # r2 = bcd0 -++mov r1, r2 # r1 = bcd0 -++asr r1, r1, 2 # r1 = bc -++shl r1, r1, 6 # r1 = bc000000 -++mov r0, r2 # r0 = bcd0 -++and r0, r0, 3 # r0 = d0 -++add r0, r0, r1 # r0 = bc0000d0 -++mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -+ add rb28, r0, r1 -++asr r0, r0, 1 # r0 = bc0000d -++# Prepare VPM command for 16bit intermediates -++mov r1, vpm_setup(0, 2, h16p(0, 0)) # 2 is stride - stride acts on ADDR which is Y[5:0],H[0] for 16 bit -++add rb21, r0, r1 -+ -+ # Compute base address for first and second access -+ mov r0, ra_x_base # Load x -+@@ -345,6 +348,171 @@ mov vw_addr, unif # start the VDW -+ -+ ################################################################################ -+ -++# mc_filter_uv_b0(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter_uv_b0 -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -++shl ra_xshift_next, r0, 3 -++sub r2, unif, r3 # compute offset from frame base u to frame base v -++add r0, r0, r3 -++and rb_x_base_next, r0, ~3 -++mov ra_y_next, r1 -++add ra_x2_base_next, rb_x_base_next, r2 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++asr rb12, r0, rb23 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:uvloop_b0 -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++nop ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++add r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:uvloop_b0 -++mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -++asr ra15, r0, 8 ; nop -++nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r1, ra14, rb14 -++nop ; mul24 r0, ra13, rb13 -++add r1, r1, r0 ; mul24 r0, ra12, rb12 -++add r1, r1, r0 ; mul24 r0, ra11, rb11 -++add r1, r1, r0 ; mul24 r0, ra10, rb10 -++add r1, r1, r0 ; mul24 r0, ra9, rb9 -++add r1, r1, r0 ; mul24 r0, ra8, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb15 -++add r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 14 -++add r1, r1, ra21 -++brr.anyn -, r:uvloop -++asr r1, r1, 6 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -++ -++# DMA out for U -++ -++mov vw_setup, rb26 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++# DMA out for V -++# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -++# Could potentially push this write into the start of the next pipeline stage. -++mov r0, 16 -++mov -, vw_wait -++ -++bra -, ra31 -++add vw_setup, rb26, r0 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++################################################################################ -++ -+ ::mc_filter_uv_b -+ mov ra31, unif -+ -+-- -+2.7.4 -+ -+ -+From 85d0ffa2bcf6a2b94c1a0c8f84241cda9ac92ce2 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 10:04:55 +0100 -+Subject: [PATCH 25/68] Switch to using 16bit temp buffers -+ -+--- -+ libavcodec/hevc.c | 2 +- -+ libavcodec/rpi_shader.c | 4 ++-- -+ libavcodec/rpi_shader.qasm | 10 +++++----- -+ 3 files changed, 8 insertions(+), 8 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 4b133d2..28a6660 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2147,7 +2147,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+- u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b0; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 88ad20b..ffd3a07 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -220,7 +220,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000600] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+ /* [0x00000608] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+ /* [0x00000610] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000618] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000618] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+ /* [0x00000620] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+ /* [0x00000628] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000630] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+@@ -346,7 +346,7 @@ unsigned int rpi_shader[] = { -+ /* [0x000009e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+ /* [0x000009e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+ /* [0x000009f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000009f8] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x000009f8] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+ /* [0x00000a00] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+ /* [0x00000a08] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000a10] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 635b894..9577121 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -26,7 +26,7 @@ -+ # ra23 8 -+ # -+ # rb20 0xffffff00 -+-# rb21 vpm_setup for writing 16bit results into VPM -++# rb21 vpm_setup for reading/writing 16bit results into VPM -+ # rb22 255 -+ # rb23 24 -+ # -+@@ -370,8 +370,8 @@ and rb_x_base_next, r0, ~3 -+ mov ra_y_next, r1 -+ add ra_x2_base_next, rb_x_base_next, r2 -+ -+-# set up VPM write -+-mov vw_setup, rb28 -++# set up VPM write, we need to save 16bit precision -++mov vw_setup, rb21 -+ -+ # get width,height of block -+ mov r2, 16 -+@@ -554,8 +554,8 @@ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+ add rb26, r0, rb27 -+ -+-# In a B frame, so also set up VPM read -+-add vr_setup, r3, rb28 -++# In a B frame, so also set up VPM read (reading back 16bit precision) -++add vr_setup, r3, rb21 -+ -+ sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+ -+-- -+2.7.4 -+ -+ -+From abc51bf61df597082fbd7cf1bba5031e4d44318b Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 10:30:44 +0100 -+Subject: [PATCH 26/68] Corrected B prediction: matching md5 sum for hobbit50 -+ -+--- -+ libavcodec/rpi_shader.c | 815 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 12 +- -+ libavcodec/rpi_shader.qasm | 36 +- -+ 3 files changed, 429 insertions(+), 434 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index ffd3a07..77cca46 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -38,431 +38,428 @@ unsigned int rpi_shader[] = { -+ /* [0x00000068] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+ /* [0x00000070] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+ /* [0x00000078] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x00000080] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000088] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000090] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00000098] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x000000a0] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x000000a8] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x000000b0] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x000000b8] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x000000c0] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x000000c8] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x000000d0] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000d8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000000e0] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x000000e8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000000f0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000000f8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000100] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000108] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000110] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000118] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000120] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000128] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000130] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000138] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000140] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x00000148] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000150] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000158] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000160] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000168] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000170] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000178] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000180] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000188] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000190] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -+-/* [0x00000198] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -+-/* [0x000001a0] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -+-/* [0x000001a8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x000001b0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000001b8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x000001c0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001c8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001d8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001e0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x000001e8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001f0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x000001f8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x00000200] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000208] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000080] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000088] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000090] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000098] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x000000a0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x000000a8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000b0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000b8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000c0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000c8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000d0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000d8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000e0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000e8] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x000000f0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000000f8] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000100] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000108] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000110] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000118] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000120] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000128] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000130] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000138] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000140] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000148] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x00000150] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000158] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000160] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000168] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000170] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000178] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000180] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000188] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000190] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000198] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -++/* [0x000001a0] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x000001a8] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -++/* [0x000001b0] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x000001b8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000001c0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x000001c8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000001d0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001d8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001e0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001e8] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -++/* [0x000001f0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001f8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x00000200] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x00000208] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+ /* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000218] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000220] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000228] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000230] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000238] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000240] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000248] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000250] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000220] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000228] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000230] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000238] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000240] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000248] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000250] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000258] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000258] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000260] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000268] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000270] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000278] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000280] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000288] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000290] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000298] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000002a0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002a8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002b0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002b8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002c0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002c8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002d0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002d8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002e0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000002e8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000002f0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000300] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000308] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000310] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000340] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000360] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000368] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000370] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000378] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000380] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000388] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000390] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000398] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x000003a0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000003a8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003b0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000268] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000270] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000278] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000280] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000288] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000290] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000298] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000002a0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000002a8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002b0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002b8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002c0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002c8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002e8] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000002f0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000318] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000320] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000328] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000340] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000348] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000360] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000368] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000370] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000378] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000380] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000388] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000390] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000398] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000003a0] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x000003a8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000003b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003b8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003b8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003c0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003c8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003d0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003d8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003e0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003e8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003f0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003f8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000400] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000408] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000410] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000418] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000420] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000428] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000430] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000438] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000440] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000448] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000450] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000458] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000460] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000468] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000470] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000478] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000480] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000488] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000490] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000498] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000004a0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x000004a8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000004b0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000004b8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000004c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000004c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000004d0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000004d8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004e0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000004e8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000004f0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000004f8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000500] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000508] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000510] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000518] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000520] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000528] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000530] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000538] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000540] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000548] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000550] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000558] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000560] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000568] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000570] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000578] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000580] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000588] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000590] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000598] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000005a0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000005a8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000005b0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000005b8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000003c0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003c8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003d0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003d8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003e0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003e8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003f0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003f8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000400] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000408] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000410] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000418] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000420] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000428] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000430] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000438] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000440] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000448] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000450] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000458] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000460] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000468] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000470] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000478] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000480] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000488] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000490] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000498] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x000004a0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000004a8] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x000004b0] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000004b8] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000004c0] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000004c8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000004d0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000004d8] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000004e0] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004e8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000004f0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000004f8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000500] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000508] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000510] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000518] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000520] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000528] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000530] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000538] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000540] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000548] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000550] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000558] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000560] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000568] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000570] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000578] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000580] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000588] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000590] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000598] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000005a0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000005a8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000005b0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000005b8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000005c0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000005c0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005c8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005d0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005d8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005e0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000005e8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005f0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000005f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000600] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000608] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000610] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000618] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000620] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000628] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000630] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000638] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000640] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000648] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000650] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000658] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000660] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000668] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000670] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000678] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000680] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000688] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000690] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000698] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000006a8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000006c8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000006e8] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f0] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f8] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000700] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000708] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000710] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000718] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000005c8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005d0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005d8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005e0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005e8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000005f0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005f8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000600] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000608] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000610] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000618] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000620] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000628] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000630] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000638] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000640] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000648] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000650] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000658] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000660] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000668] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000670] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000678] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000680] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000688] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000690] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000698] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000006b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000006d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000006f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000700] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000708] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000710] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000718] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000720] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000720] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000728] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000730] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000738] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000740] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000748] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000750] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000758] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000760] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000768] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000770] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000778] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000780] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000788] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000790] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000798] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000007a0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007a8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000007b0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007b8] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000007c0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007c8] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000007d0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007d8] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000007e0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000007e8] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000007f0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x000007f8] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000800] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000808] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000810] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000818] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000820] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000828] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000830] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000838] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000848] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000850] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000858] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000860] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000868] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000870] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000878] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000880] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000888] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000890] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000898] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008a0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000008a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000008b8] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x000008c0] */ 0xfffffad8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000008c8] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x000008d0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008d8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000008e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000008f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000008f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000900] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000908] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000910] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000918] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000920] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000728] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000730] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000738] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000740] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000748] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000750] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000758] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000760] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000768] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000770] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000778] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000780] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000788] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000790] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000798] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000007a0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000007a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000007b0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000007c0] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000007d0] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000007e0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000007f0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000007f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000800] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000808] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000810] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000818] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000820] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000828] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000830] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000838] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000840] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000848] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000850] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000858] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000860] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000868] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000870] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000878] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000880] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000888] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000890] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000898] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x000008a0] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008a8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000008b0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000008b8] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000008c0] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -++/* [0x000008c8] */ 0x009e7000, 0x100009e7, // nop -++/* [0x000008d0] */ 0x009e7000, 0x100009e7, // nop -++/* [0x000008d8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008e0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000008e8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008f0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000008f8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000900] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000908] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000910] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000918] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00000928] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000930] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000938] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000940] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000948] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000950] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000958] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000960] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000968] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000970] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000978] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000980] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000988] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000990] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000998] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000009a0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000009a8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000009b0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000009b8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000009c0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000009c8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x000009d0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x000009d8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x000009e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000009e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000009f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000009f8] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000a00] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000a08] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000a10] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a18] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a20] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a28] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000a30] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a38] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a40] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a48] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000a50] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a58] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a60] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a68] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000a70] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a78] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a80] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a88] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000a90] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000a98] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000aa0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000920] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000928] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000930] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000938] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000940] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000948] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000950] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000958] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000960] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000968] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000970] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000978] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000980] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000988] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000990] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000998] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000009a0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000009a8] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000009b0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000009b8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000009c0] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000009c8] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000009d0] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x000009d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000009e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000009e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000009f0] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x000009f8] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000a00] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000a08] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a10] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a18] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a20] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000a28] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a30] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a38] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a40] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000a48] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a50] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a58] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a60] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000a68] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a70] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a78] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a80] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000a88] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000a90] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000a98] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000aa8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000ab0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000ab8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000ac0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000ac8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000ad0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000ad8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000ae0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000ae8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000af0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000af8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000b00] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000b08] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000b10] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000b18] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000b20] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000b28] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000b30] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000b38] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000b40] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000b48] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000b50] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000b58] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000b60] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000b68] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000b70] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000b78] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000b80] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000b88] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000b90] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000b98] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000ba0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000ba8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000bb0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000bb8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000bc0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000bc8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000bd0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000bd8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000be0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000be8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000bf0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000bf8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000c00] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000c08] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000c10] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000c18] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000c20] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000c28] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000c30] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000c38] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000c40] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000c48] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000c50] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000c58] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x00000c60] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000c68] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000c70] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00000c78] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x00000c80] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000c88] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000c90] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000c98] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000ca0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000ca8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000cb0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000cb8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000cc0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000aa0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000aa8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000ab0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000ab8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000ac0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000ac8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000ad0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000ad8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000ae0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000ae8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000af0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000af8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000b00] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000b08] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000b10] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000b18] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000b20] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000b28] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000b30] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000b38] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000b40] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000b48] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000b50] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000b58] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000b60] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000b68] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000b70] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000b78] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000b80] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000b88] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000b90] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000b98] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000ba0] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000ba8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000bb0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000bb8] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000bc0] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000bc8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000bd0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000bd8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000be0] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000be8] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000bf0] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000bf8] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000c00] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000c08] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000c10] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000c18] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000c20] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000c28] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000c30] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000c38] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000c40] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000c48] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000c50] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000c58] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000c60] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000c68] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000c70] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000c78] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000c80] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000c88] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000c90] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000c98] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000ca0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000ca8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000cc8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000cd0] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000cb0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000cb8] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000cc0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000cc8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000cd0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000cd8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ce0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ce8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cf0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cf8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000d00] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000d08] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ce0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ce8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000cf0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000d10] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000cf8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000d00] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d08] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000d18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d30] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d20] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d28] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d30] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000d38] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000d40] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000d48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000d50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d58] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d60] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d70] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000d78] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000d80] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000d58] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000d60] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000d68] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 809e582..6562fa9 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,11 +4,11 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 150) -+-#define mc_filter_uv_b0 (rpi_shader + 368) -+-#define mc_filter_uv_b (rpi_shader + 586) -+-#define mc_exit (rpi_shader + 818) -+-#define mc_interrupt_exit8 (rpi_shader + 836) -+-#define mc_end (rpi_shader + 866) -++#define mc_filter_uv (rpi_shader + 152) -++#define mc_filter_uv_b0 (rpi_shader + 370) -++#define mc_filter_uv_b (rpi_shader + 584) -++#define mc_exit (rpi_shader + 812) -++#define mc_interrupt_exit8 (rpi_shader + 830) -++#define mc_end (rpi_shader + 860) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 9577121..562dc35 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -39,13 +39,13 @@ -+ # rb30 frame height-1 -+ # rb31 used as temp to count loop iterations -+ # -+-# ra24...ra30 15, 14, 13, 12, 11, 10, 9 -+ # ra24 clipped(row start address+8+elem_num)&~3 -+ # ra25 per-channel shifts 2 -+ # ra26 next ra24 -+ # ra27 next ra25 -+ # ra28 next y -+ # ra29 y for next texture access -++# ra30 64 -+ # -+ # ra31 next kernel address -+ -+@@ -102,6 +102,7 @@ mov ra20, 1 -+ mov ra21, 32 -+ mov ra22, 256 -+ mov ra23, 8 -++mov ra30, 64 -+ -+ mov rb20, 0xffffff00 -+ mov rb22, 255 -+@@ -472,7 +473,7 @@ sub.setf -, r3, 8 ; mov r1, ra22 -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b0 -+ mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -+-asr ra15, r0, 8 ; nop -++asr ra15, r0, 8 ; nop # TODO isn't ra15 already in 24bit precision, may not need the sign extension here? -+ nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -+ -+ # apply vertical filter and write to VPM -+@@ -487,18 +488,18 @@ add r1, r1, r0 ; mul24 r0, ra8, rb8 -+ add r1, r1, r0 ; mul24 r0, ra15, rb15 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 14 -+-add r1, r1, ra21 -+-brr.anyn -, r:uvloop -+-asr r1, r1, 6 # Delay 1 -+-min r1, r1, rb22 # Delay 2 -+-max vpm, r1, 0 # Delay 3 -++#asr r1, r1, 14 -++#add r1, r1, ra21 -++brr.anyn -, r:uvloop_b0 -++asr vpm, r1, 14 # Delay 1 shifts down by shift2=6, but results are still in 16bit precision TODO may be able to avoid the mul24 and use more delay slots -++nop # Delay 2 -++nop # Delay 3 -+ -+ # DMA out for U -+ -+ mov vw_setup, rb26 # VDW setup 0 -+ mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW -++mov vw_addr, unif # start the VDW # TODO in pass0 we don't need to save any results -+ -+ # DMA out for V -+ # We need to wait for the U to complete first, but have nothing useful to compute while we wait. -+@@ -639,12 +640,11 @@ mov ra12, ra13 -+ mov ra13, ra14 -+ -+ sub.setf -, r3, 8 ; mov r1, ra22 -+- -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b -+ mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+ asr ra15, r0, 8 ; nop -+-nop ; nop -++nop ; nop # TODO improve use of delay slots -+ -+ # apply vertical filter and write to VPM -+ -+@@ -658,15 +658,13 @@ add r1, r1, r0 ; mul24 r0, ra8, rb8 -+ add r1, r1, r0 ; mul24 r0, ra15, rb15 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 14 -+-add r1, r1, ra21 -+-asr r1, r1, 6 -+-min r1, r1, rb22 -+-add r0, vpm, 1 # Blend in previous VPM contents at this location -++asr r1, r1, 14 # shift2=6 -++add r1, r1, vpm # Blend in previous VPM contents at this location -++add r1, r1, ra30 -+ brr.anyn -, r:uvloop_b -+-max r1, r1, 0 -+-add r1, r1, r0 -+-shr vpm, r1, 1 -++asr r1, r1, 7 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -+ -+ -+ # DMA out for U -+-- -+2.7.4 -+ -+ -+From ea60373134f98099c4ebaf0d23cca666008b4bba Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 10:55:07 +0100 -+Subject: [PATCH 27/68] P prediction uses 4 tap filters -+ -+--- -+ libavcodec/hevc.c | 50 ++-- -+ libavcodec/rpi_shader.c | 631 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 10 +- -+ libavcodec/rpi_shader.qasm | 43 +-- -+ 4 files changed, 344 insertions(+), 390 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 28a6660..a47ebc5 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -65,15 +65,15 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+ // TODO Chroma only needs 4 taps -+-static uint32_t rpi_filter_coefs[8][2] = { -+- { ENCODE_COEFFS( 0, 0, 0, 64), ENCODE_COEFFS( 0, 0, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -2, 58), ENCODE_COEFFS( 10, -2, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -4, 54), ENCODE_COEFFS( 16, -2, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -6, 46), ENCODE_COEFFS( 28, -4, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -4, 36), ENCODE_COEFFS( 36, -4, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -4, 28), ENCODE_COEFFS( 46, -6, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -2, 16), ENCODE_COEFFS( 54, -4, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -2, 10), ENCODE_COEFFS( 58, -2, 0, 0 ) } -++static uint32_t rpi_filter_coefs[8][1] = { -++ { ENCODE_COEFFS( 0, 64, 0, 0) }, -++ { ENCODE_COEFFS( -2, 58, 10, -2) }, -++ { ENCODE_COEFFS( -4, 54, 16, -2) }, -++ { ENCODE_COEFFS( -6, 46, 28, -4) }, -++ { ENCODE_COEFFS( -4, 36, 36, -4) }, -++ { ENCODE_COEFFS( -4, 28, 46, -6) }, -++ { ENCODE_COEFFS( -2, 16, 54, -4) }, -++ { ENCODE_COEFFS( -2, 10, 58, -2) } -+ }; -+ -+ static uint32_t get_vc_address(AVBufferRef *bref) { -+@@ -2027,16 +2027,16 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+- *u++ = rpi_filter_coefs[_mx][1]; -++ u++; -+ *u++ = rpi_filter_coefs[_my][0]; -+- *u++ = rpi_filter_coefs[_my][1]; -++ u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2084,16 +2084,16 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+- *u++ = rpi_filter_coefs[_mx][1]; -++ u++; -+ *u++ = rpi_filter_coefs[_my][0]; -+- *u++ = rpi_filter_coefs[_my][1]; -++ u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2148,29 +2148,29 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b0; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+ *u++ = ( (nPbW_cframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); // TODO this will become unused once we have a dedicated pass0 filter -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 3 + start_x; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = y2_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 1 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y2_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx2][0]; -+- *u++ = rpi_filter_coefs[_mx2][1]; -++ u++; -+ *u++ = rpi_filter_coefs[_my2][0]; -+- *u++ = rpi_filter_coefs[_my2][1]; -++ u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 77cca46..c8d0728 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -116,8 +116,8 @@ unsigned int rpi_shader[] = { -+ /* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+ /* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+ /* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002e8] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000002f0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002e8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002f0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+ /* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+ /* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+ /* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+@@ -128,338 +128,315 @@ unsigned int rpi_shader[] = { -+ /* [0x00000330] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ /* [0x00000338] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ /* [0x00000340] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000348] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000360] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000368] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000370] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000378] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000380] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000388] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000390] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000398] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000003a0] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x000003a8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000003b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003b8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000348] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000350] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000360] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000368] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000370] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000378] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000380] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003c0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003c8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003d0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003d8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003e0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003e8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003f0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003f8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000400] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000408] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000410] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000418] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000420] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000428] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000430] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000438] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000440] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000448] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000450] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000458] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000460] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000468] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000470] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000478] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000480] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000488] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000490] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000498] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x000004a0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000004a8] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x000004b0] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000004b8] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000004c0] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000004c8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000004d0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000004d8] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000004e0] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004e8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000004f0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000004f8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000500] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000508] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000510] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000518] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000520] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000528] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000530] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000538] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000540] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000548] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000550] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000558] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000560] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000568] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000570] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000578] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000580] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000588] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000590] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000598] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000005a0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000005a8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000005b0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000005b8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000005c0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000388] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000390] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000398] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003d0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000003f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000003f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000400] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000408] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000410] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000418] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000420] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000428] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000430] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000438] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000440] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x00000448] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000450] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000458] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000460] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000468] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000470] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000478] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000480] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000488] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000490] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000498] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000004a0] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x000004a8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004b0] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x000004b8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004c0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000004c8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004d0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004d8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004e0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004f0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004f8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000500] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000508] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000005c8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005d0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005d8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005e0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005e8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000005f0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005f8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000600] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000608] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000610] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000618] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000620] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000628] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000630] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000638] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000640] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000648] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000650] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000658] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000660] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000668] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000670] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000678] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000680] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000688] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000690] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000698] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000006b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000006d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000006f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000700] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000708] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000710] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000718] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000720] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000510] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000518] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000520] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000528] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000530] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000538] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000540] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000548] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000550] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000558] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000560] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000568] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000570] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000578] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000580] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000588] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000590] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000598] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000005a0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000005a8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000005b0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000005b8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005c0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000005c8] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x000005d0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005d8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005f0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005f8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000600] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000608] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000610] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000618] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000620] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000628] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000630] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000638] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000640] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000648] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000650] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000658] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000668] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000728] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000730] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000738] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000740] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000748] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000750] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000758] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000760] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000768] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000770] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000778] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000780] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000788] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000790] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000798] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000007a0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000007a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007b0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000007b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007c0] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000007c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007d0] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000007d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007e0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000007e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000007f0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000007f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000800] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000808] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000810] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000818] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000820] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000828] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000830] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000838] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000840] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000848] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000850] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000858] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000860] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000868] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000870] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000878] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000880] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000888] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000890] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000898] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x000008a0] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008a8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000008b0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008b8] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000008c0] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -+-/* [0x000008c8] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x000008d0] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x000008d8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008e0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000008e8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000008f0] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000008f8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000900] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000908] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000910] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000918] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000670] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000678] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000680] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000688] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000690] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000698] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000006a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000006a8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000006b0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000006b8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000006c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000006c8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000006d0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000006d8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006e0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006e8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000006f0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006f8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000700] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000708] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000710] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000718] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000720] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000728] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000730] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000738] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000740] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000748] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000750] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000758] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000760] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000768] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000770] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000778] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000780] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000788] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000790] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000798] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000007a0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000007a8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000007b0] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x000007b8] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x000007c0] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x000007c8] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x000007d0] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x000007d8] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x000007e0] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x000007e8] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000007f0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000007f8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000800] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000808] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -++/* [0x00000810] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000818] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000820] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000828] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000830] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000838] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000840] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000848] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000850] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000858] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000860] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00000920] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000928] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000930] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000938] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000940] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000948] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000950] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000958] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000960] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000968] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000970] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000978] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000980] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000988] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000990] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000998] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000009a0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000009a8] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000009b0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000009b8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000009c0] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x000009c8] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x000009d0] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x000009d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000009e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000009e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000009f0] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x000009f8] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000a00] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000a08] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a10] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a18] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a20] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000a28] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a30] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a38] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a40] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000a48] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a50] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a58] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a60] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000a68] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a70] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a78] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a80] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000a88] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000a90] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000a98] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000868] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000870] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000878] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000880] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000888] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000890] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000898] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000008a0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000008a8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000008b0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000008b8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000008c0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000008c8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000008d0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008d8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000008e0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000008e8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000008f0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000008f8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000900] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000908] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000910] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000918] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000920] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000928] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000930] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000938] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000940] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000948] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000950] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000958] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000960] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000968] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000970] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000978] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000980] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000988] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000990] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000998] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009a0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009a8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000009b0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009b8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009c0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009c8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x000009d0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000009d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000009e0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000aa0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000aa8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000ab0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000ab8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000ac0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000ac8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000ad0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000ad8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000ae0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000ae8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000af0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000af8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000b00] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000b08] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000b10] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000b18] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000b20] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000b28] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000b30] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000b38] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000b40] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000b48] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000b50] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000b58] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000b60] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000b68] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000b70] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000b78] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000b80] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000b88] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000b90] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000b98] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000ba0] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000ba8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000bb0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000bb8] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000bc0] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000bc8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000bd0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000bd8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000be0] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000be8] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000bf0] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000bf8] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000c00] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000c08] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000c10] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000c18] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000c20] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000c28] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000c30] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000c38] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000c40] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000c48] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000c50] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000c58] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000c60] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000c68] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000c70] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000c78] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000c80] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000c88] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000c90] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000c98] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000ca0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000ca8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009e8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000009f0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000009f8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000a00] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000a08] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000a10] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000a18] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000a20] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000a28] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000a30] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000a38] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000a40] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000a48] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000a50] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000a58] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000a60] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000a68] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000a70] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000a78] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000a80] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000a88] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000a90] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000a98] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000aa0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000aa8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000ab0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000ab8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000ac0] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000ac8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000ad0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000ad8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000ae0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000ae8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000af0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000af8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000b00] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000b08] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000b10] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000b18] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000b20] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b28] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000b30] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000b38] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000b40] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000b48] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000b50] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000b58] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000b60] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000b68] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000b70] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000b78] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000b80] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000b88] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000b90] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000b98] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000ba0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000ba8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000bb0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000bb8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000bc0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000bc8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000bd0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000bd8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000be0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000be8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000bf0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000cb0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000cb8] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000cc0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cc8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cd0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cd8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ce0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ce8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000cf0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000bf8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000c00] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000c08] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c28] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000c30] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000c38] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000cf8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000d00] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d08] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d20] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d28] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d30] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d38] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d40] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d58] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000d60] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000d68] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000c40] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000c48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ca0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ca8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000cb0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 6562fa9..1bf7a68 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -5,10 +5,10 @@ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 370) -+-#define mc_filter_uv_b (rpi_shader + 584) -+-#define mc_exit (rpi_shader + 812) -+-#define mc_interrupt_exit8 (rpi_shader + 830) -+-#define mc_end (rpi_shader + 860) -++#define mc_filter_uv_b0 (rpi_shader + 324) -++#define mc_filter_uv_b (rpi_shader + 538) -++#define mc_exit (rpi_shader + 766) -++#define mc_interrupt_exit8 (rpi_shader + 784) -++#define mc_end (rpi_shader + 814) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 562dc35..8e4f18f 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -16,8 +16,8 @@ -+ # ra19 next ra17 -+ # -+ # rb16 pitch -+-# rb17 height + 5 -+-# rb18 height + 7 -++# rb17 height + 1 -++# rb18 height + 3 -+ # rb19 next ra16 -+ # -+ # ra20 1 -+@@ -214,8 +214,8 @@ mov r0, unif -+ shr r1, r0, r2 # Extract width -+ sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+ and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -++add rb17, r0, 1 -++add rb18, r0, 3 -+ shl r0, r0, 7 -+ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+@@ -230,18 +230,11 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -++ mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-asr rb12, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -283,26 +276,14 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+ add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+ mov ra12, ra13 -+ mov ra13, ra14 -+ -+-sub.setf -, r3, 8 ; mov r1, ra22 -++sub.setf -, r3, 4 ; mov r1, ra22 -+ -+ # apply horizontal filter -+ brr.anyn -, r:uvloop -+@@ -312,14 +293,10 @@ nop ; nop # Delay slot 3 (TODO move more of the context scr -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r1, ra14, rb14 -+-nop ; mul24 r0, ra13, rb13 -+-add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb15 -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ asr r1, r1, 14 -+-- -+2.7.4 -+ -+ -+From e4bdd110d4640519b751ab428e7976a1e9a15802 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:03:51 +0100 -+Subject: [PATCH 28/68] Optimised B0 pass -+ -+--- -+ libavcodec/rpi_shader.c | 424 +++++++++++++++++++++------------------------ -+ libavcodec/rpi_shader.h | 8 +- -+ libavcodec/rpi_shader.qasm | 43 +---- -+ 3 files changed, 212 insertions(+), 263 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index c8d0728..1f63ee0 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -204,239 +204,215 @@ unsigned int rpi_shader[] = { -+ /* [0x00000580] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+ /* [0x00000588] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+ /* [0x00000590] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000598] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000005a0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000598] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000005a0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+ /* [0x000005a8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+ /* [0x000005b0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+ /* [0x000005b8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+ /* [0x000005c0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005c8] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x000005d0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005d8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005f0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005f8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000600] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000608] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000610] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000618] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000620] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000628] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000630] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000638] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000640] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000648] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000650] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000658] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000668] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000005c8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005d0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005f8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000600] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000608] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000610] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000618] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000620] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000628] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000670] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000678] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000680] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000688] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000690] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000698] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000006a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000006a8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000006b0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000006b8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000006c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000006c8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000006d0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000006d8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006e0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006e8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000006f0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006f8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000700] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000708] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000710] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000718] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000720] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000728] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000730] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000738] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000740] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000748] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000750] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000758] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000760] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000768] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000770] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000778] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000780] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000788] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000790] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000798] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000007a0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000007a8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000007b0] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x000007b8] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x000007c0] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x000007c8] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x000007d0] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x000007d8] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x000007e0] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x000007e8] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000007f0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000007f8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000800] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000808] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -+-/* [0x00000810] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000818] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000820] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000828] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000830] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000838] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000840] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000848] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000850] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000858] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000860] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000630] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000638] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000640] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000648] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000650] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000658] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000660] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000668] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000670] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000678] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000680] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000688] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000690] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000698] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006a0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006a8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000006b0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006b8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000006c0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006c8] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x000006d0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000006d8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000006e0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006e8] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x000006f0] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006f8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000700] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000708] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000710] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000718] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000720] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000728] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000730] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000738] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000740] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000748] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -++/* [0x00000750] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000758] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000760] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000768] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000770] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000778] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000780] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000788] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000790] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000798] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000007a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00000868] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000870] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000878] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000880] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000888] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000890] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000898] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000008a0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000008a8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000008b0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000008b8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000008c0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000008c8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000008d0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008d8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000008e0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000008e8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000008f0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000008f8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000900] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000908] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000910] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000918] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000920] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000928] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000930] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000938] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000940] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000948] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000950] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000958] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000960] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000968] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000970] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000978] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000980] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000988] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000990] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000998] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009a0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009a8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000009b0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009b8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009c0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009c8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x000009d0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000009d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000009e0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000007a8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000007b0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007c0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007c8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007d0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007d8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007e0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007e8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000007f0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007f8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000800] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000808] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000810] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000830] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000838] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000858] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000860] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000880] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000888] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000890] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000898] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000008b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000008d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000008f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000900] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000908] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000910] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000918] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000920] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000009e8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000009f0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000009f8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000a00] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000a08] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000a10] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000a18] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000a20] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000a28] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000a30] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000a38] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000a40] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000a48] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000a50] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000a58] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000a60] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000a68] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000a70] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000a78] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000a80] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000a88] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000a90] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000a98] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000aa0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000aa8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000ab0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000ab8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000ac0] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000ac8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000ad0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000ad8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000ae0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000ae8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000af0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000af8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000b00] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000b08] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000b10] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000b18] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000b20] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000b28] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000b30] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000b38] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000b40] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000b48] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000b50] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000b58] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000b60] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000b68] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000b70] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000b78] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000b80] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000b88] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000b90] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000b98] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000ba0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000ba8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000bb0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000bb8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000bc0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000bc8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000bd0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000bd8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000be0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000be8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000bf0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000928] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000930] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000938] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000940] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000948] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000950] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000958] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000960] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000968] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000970] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000978] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000980] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000988] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000990] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000998] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000009a0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000009a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000009b0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000009b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000009c0] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000009c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000009d0] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000009d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000009e0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000009e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000009f0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000009f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000a00] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000a08] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000a10] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000a18] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000a20] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000a28] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000a30] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000a38] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000a40] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000a48] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a50] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000a58] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000a60] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a68] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000a70] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000a78] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000a80] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000a88] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000a90] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000a98] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000aa0] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000aa8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000ab0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000ab8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000ac0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000ac8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000ad0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000ad8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000ae0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000ae8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000af0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000af8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000b00] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000b08] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000b10] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000b18] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000b20] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000b28] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000b30] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000bf8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000c00] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000c08] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c28] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000c30] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000c38] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b38] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000b40] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000b48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b68] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b70] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b78] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000c40] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000c48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ca0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ca8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000cb0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b80] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000b88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ba0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ba8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bb0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bb8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bc0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bc8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bd0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bd8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000be0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000be8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000bf0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 1bf7a68..cb74887 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -6,9 +6,9 @@ extern unsigned int rpi_shader[]; -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+ #define mc_filter_uv_b0 (rpi_shader + 324) -+-#define mc_filter_uv_b (rpi_shader + 538) -+-#define mc_exit (rpi_shader + 766) -+-#define mc_interrupt_exit8 (rpi_shader + 784) -+-#define mc_end (rpi_shader + 814) -++#define mc_filter_uv_b (rpi_shader + 490) -++#define mc_exit (rpi_shader + 718) -++#define mc_interrupt_exit8 (rpi_shader + 736) -++#define mc_end (rpi_shader + 766) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 8e4f18f..faa5755 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -357,15 +357,13 @@ mov r0, unif -+ shr r1, r0, r2 # Extract width -+ sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+ and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -++add rb17, r0, 1 -++add rb18, r0, 3 -+ shl r0, r0, 7 -+ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+ add rb26, r0, rb27 -+ -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+ # get filter coefficients -+ -+ mov r0, unif -+@@ -373,18 +371,11 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -++ mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-asr rb12, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -426,26 +417,14 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+ add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+ mov ra12, ra13 -+ mov ra13, ra14 -+ -+-sub.setf -, r3, 8 ; mov r1, ra22 -++sub.setf -, r3, 4 ; mov r1, ra22 -+ -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b0 -+@@ -455,18 +434,12 @@ nop ; nop # Delay slot 3 (TODO move more of the context scr -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r1, ra14, rb14 -+-nop ; mul24 r0, ra13, rb13 -+-add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb15 -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-#asr r1, r1, 14 -+-#add r1, r1, ra21 -+ brr.anyn -, r:uvloop_b0 -+ asr vpm, r1, 14 # Delay 1 shifts down by shift2=6, but results are still in 16bit precision TODO may be able to avoid the mul24 and use more delay slots -+ nop # Delay 2 -+-- -+2.7.4 -+ -+ -+From 93805e78a13d36e28ed84a0e8456da2eac45be89 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:12:43 +0100 -+Subject: [PATCH 29/68] Optimised B pass -+ -+--- -+ libavcodec/rpi_shader.c | 202 ++++++++++++++++++++------------------------- -+ libavcodec/rpi_shader.h | 6 +- -+ libavcodec/rpi_shader.qasm | 41 ++------- -+ 3 files changed, 100 insertions(+), 149 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 1f63ee0..4e6c5ea 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -289,8 +289,8 @@ unsigned int rpi_shader[] = { -+ /* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+ /* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+ /* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000830] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000838] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000830] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000838] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+ /* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+ /* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+ /* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+@@ -299,120 +299,96 @@ unsigned int rpi_shader[] = { -+ /* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+ /* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+ /* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000880] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000888] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000890] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000898] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000008b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000008d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000008f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000900] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000908] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000910] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000918] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000920] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000880] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000888] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000890] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000898] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000008a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008b0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000008d0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008e0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000928] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000930] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000938] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000940] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000948] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000950] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000958] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000960] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000968] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000970] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000978] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000980] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000988] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000990] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000998] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000009a0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000009a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000009b0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000009b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000009c0] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000009c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000009d0] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000009d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000009e0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000009e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000009f0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000009f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000a00] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000a08] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000a10] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000a18] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000a20] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000a28] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000a30] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000a38] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000a40] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000a48] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a50] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000a58] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000a60] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a68] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000a70] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000a78] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000a80] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000a88] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000a90] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000a98] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000aa0] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000aa8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000ab0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000ab8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000ac0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000ac8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000ad0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000ad8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000ae0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000ae8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000af0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000af8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000b00] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000b08] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000b10] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000b18] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000b20] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000b28] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000b30] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008e8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008f0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000008f8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000900] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000908] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000910] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000918] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000920] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000928] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000930] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000938] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000940] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000948] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000950] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000958] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000960] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000968] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000970] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000978] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000980] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000988] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000990] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000998] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009a0] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x000009a8] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009b0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000009b8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000009c0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000009c8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009d0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009d8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009e0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000a00] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000a08] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000a10] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a18] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a20] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a28] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a30] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a38] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a40] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a48] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a50] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a60] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000b38] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000b40] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000b48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b68] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b70] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000b78] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a78] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a80] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000aa0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ab0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000b80] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000b88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ba0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ba8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bb0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bb8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bc0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bc8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bd0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bd8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000be0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000be8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000bf0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ac0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ae0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b10] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b18] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b20] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b28] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b30] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index cb74887..53da629 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -7,8 +7,8 @@ extern unsigned int rpi_shader[]; -+ #define mc_filter_uv (rpi_shader + 152) -+ #define mc_filter_uv_b0 (rpi_shader + 324) -+ #define mc_filter_uv_b (rpi_shader + 490) -+-#define mc_exit (rpi_shader + 718) -+-#define mc_interrupt_exit8 (rpi_shader + 736) -+-#define mc_end (rpi_shader + 766) -++#define mc_exit (rpi_shader + 670) -++#define mc_interrupt_exit8 (rpi_shader + 688) -++#define mc_end (rpi_shader + 718) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index faa5755..f38c926 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -491,8 +491,8 @@ mov r0, unif -+ shr r1, r0, r2 # Extract width -+ sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+ and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -++add rb17, r0, 1 -++add rb18, r0, 3 -+ shl r0, r0, 7 -+ -+ # r0 is currently height<<7 -+@@ -508,8 +508,6 @@ add rb26, r0, rb27 -+ # In a B frame, so also set up VPM read (reading back 16bit precision) -+ add vr_setup, r3, rb21 -+ -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+ # get filter coefficients -+ -+ mov r0, unif -+@@ -517,18 +515,11 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -++ mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-asr rb12, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -570,26 +561,14 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+ add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+ mov ra12, ra13 -+ mov ra13, ra14 -+ -+-sub.setf -, r3, 8 ; mov r1, ra22 -++sub.setf -, r3, 4 ; mov r1, ra22 -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b -+ mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+@@ -598,14 +577,10 @@ nop ; nop # TODO improve use of delay slots -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r1, ra14, rb14 -+-nop ; mul24 r0, ra13, rb13 -+-add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb15 -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ asr r1, r1, 14 # shift2=6 -+-- -+2.7.4 -+ -+ -+From e48df43c16de74dddbc7c702d64dd01eaf8e6b39 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:17:09 +0100 -+Subject: [PATCH 30/68] Used P delay slots more efficiently -+ -+--- -+ libavcodec/rpi_shader.c | 437 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 10 +- -+ libavcodec/rpi_shader.qasm | 19 +- -+ 3 files changed, 228 insertions(+), 238 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 4e6c5ea..a1af4e3 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -156,239 +156,236 @@ unsigned int rpi_shader[] = { -+ /* [0x00000408] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ /* [0x00000410] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ /* [0x00000418] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000420] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000428] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000430] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000420] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000428] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000430] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+ /* [0x00000438] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000440] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x00000448] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000450] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000458] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000460] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000468] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000470] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000478] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000480] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000488] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000490] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000498] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000004a0] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x000004a8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004b0] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x000004b8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004c0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000004c8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000004d0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004d8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000004e0] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000004e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000004f0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000004f8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000500] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000508] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000440] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000448] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000450] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000458] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000460] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000468] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000470] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000478] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000480] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000488] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000490] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000498] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x000004a0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004a8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000004b0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004b8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004c0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004c8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004d0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004d8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004e0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000004e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x00000510] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000518] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000520] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000528] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000530] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000538] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000540] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000548] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000550] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000558] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000560] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000568] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000570] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000578] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000580] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000588] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000590] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000598] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000005a0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000005a8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000005b0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000005b8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005c0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005c8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005d0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005d8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005f8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000600] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000608] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000610] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000618] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000620] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000628] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000004f8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000500] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000508] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000510] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000518] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000520] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000528] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000530] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000538] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000540] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000548] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000550] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000558] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000560] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000568] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000570] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000578] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000580] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000588] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000590] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000598] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000005a0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005a8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000005b0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005b8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005d8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000600] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000608] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000610] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000630] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000638] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000640] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000648] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000650] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000658] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000660] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000668] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000670] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000678] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000680] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000688] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000690] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000698] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006a0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006a8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000006b0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006b8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000006c0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000006c8] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x000006d0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000006d8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000006e0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000006e8] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x000006f0] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006f8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000700] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000708] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000710] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000718] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000720] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000728] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000730] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000738] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000740] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000748] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -+-/* [0x00000750] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000758] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000760] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000768] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000770] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000778] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000780] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000788] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000790] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000798] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000007a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000618] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000620] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000628] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000630] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000638] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000640] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000648] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000650] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000658] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000660] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000668] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000670] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000678] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000680] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000688] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000690] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000698] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006a0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000006a8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006b0] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x000006b8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000006c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000006c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006d0] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x000006d8] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006e0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000006e8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000006f0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000006f8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000700] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000708] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000710] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000718] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000720] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000728] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000730] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -++/* [0x00000738] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000740] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000748] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000750] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000758] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000760] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000768] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000770] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000778] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000780] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000788] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x000007a8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000007b0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007c0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007c8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007d0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007d8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007e0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007e8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000007f0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007f8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000800] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000808] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000810] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000830] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000838] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000858] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000860] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000880] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000888] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000890] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000898] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000008a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008b0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000008d0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008e0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000790] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000798] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007a0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007a8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007b0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007b8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007c0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007c8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007d0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000007d8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007e0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000007e8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007f0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000007f8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000800] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000808] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000810] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000818] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000820] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000828] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000830] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000838] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000840] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000848] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000850] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000858] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000860] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000868] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000870] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000878] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000880] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000888] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000890] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000898] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000008b8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008c8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008e8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008f0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000008f8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000900] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000908] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000910] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000918] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000920] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000928] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000930] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000938] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000940] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000948] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000950] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000958] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000960] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000968] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000970] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000978] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000980] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000988] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000990] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000998] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009a0] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x000009a8] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009b0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000009b8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000009c0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000009c8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009d0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009d8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009e0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000a00] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000a08] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000a10] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a18] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a20] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a28] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a30] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a38] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a40] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a48] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a50] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a60] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008d0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008d8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000008e0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000008e8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000008f0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000008f8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000900] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000908] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000910] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000918] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000920] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000928] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000930] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000938] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000940] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000948] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000950] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000958] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000960] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000968] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000970] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000978] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000980] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000988] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x00000990] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000998] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000009a0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000009a8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000009b0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009b8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009c0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009c8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000009e8] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x000009f0] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x000009f8] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a00] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a08] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a10] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a18] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a20] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a28] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a30] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a38] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a40] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a48] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a50] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a58] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a78] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a80] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a60] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a68] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a70] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000aa0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ab0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a90] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a98] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000aa0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000ac0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000aa8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ab0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ae0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b10] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b18] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b20] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b28] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b30] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b08] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b10] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b18] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 53da629..1fb3e37 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -5,10 +5,10 @@ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 324) -+-#define mc_filter_uv_b (rpi_shader + 490) -+-#define mc_exit (rpi_shader + 670) -+-#define mc_interrupt_exit8 (rpi_shader + 688) -+-#define mc_end (rpi_shader + 718) -++#define mc_filter_uv_b0 (rpi_shader + 318) -++#define mc_filter_uv_b (rpi_shader + 484) -++#define mc_exit (rpi_shader + 664) -++#define mc_interrupt_exit8 (rpi_shader + 682) -++#define mc_end (rpi_shader + 712) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index f38c926..02e95dd 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -268,6 +268,7 @@ add t0s, ra_x2_base, r2 -+ -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -++# apply horizontal filter -+ nop ; mul24 r2, r0, ra0 -+ nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+ nop ; mul24 r3, ra1 << 1, r0 << 1 -+@@ -276,20 +277,12 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 4 ; mov r1, ra22 -+- -+-# apply horizontal filter -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 4 ; mov ra12, ra13 -+ brr.anyn -, r:uvloop -+-mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -+-asr ra15, r0, 8 ; nop -+-nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -+ -+ # apply vertical filter and write to VPM -+ -+-- -+2.7.4 -+ -+ -+From b33dfc243ff5509299685add3c532ab7f207fd73 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:22:25 +0100 -+Subject: [PATCH 31/68] Improved use of delay slots -+ -+--- -+ libavcodec/rpi_shader.c | 503 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 10 +- -+ libavcodec/rpi_shader.qasm | 41 ++-- -+ 3 files changed, 265 insertions(+), 289 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index a1af4e3..c498f28 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -122,270 +122,263 @@ unsigned int rpi_shader[] = { -+ /* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+ /* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+ /* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000318] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000320] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000328] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000340] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000348] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000350] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000360] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000368] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000370] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000378] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000380] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000340] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000348] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000360] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000368] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000370] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000378] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000388] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000390] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000398] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003d0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000003f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000003f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000400] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000408] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000410] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000418] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000420] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000428] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000430] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000438] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000440] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000448] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000450] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000458] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000460] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000468] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000470] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000478] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000480] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000488] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000490] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000498] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x000004a0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004a8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000004b0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000004b8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004c0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000004c8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000004d0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000004d8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000004e0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000004e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000380] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000388] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000390] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000398] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003a0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003a8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003b8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003c0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003c8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000003e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000003f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000003f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000400] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000408] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000410] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000418] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000420] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000428] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000430] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000438] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000440] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000448] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000450] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000458] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000460] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000468] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000470] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000478] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000480] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000488] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000490] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000498] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004a0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000004a8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004b0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004b8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004c0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004c8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004d0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004d8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000004e0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004e8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000004f8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000500] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000508] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000510] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000518] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000520] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000528] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000530] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000538] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000540] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000548] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000550] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000558] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000560] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000568] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000570] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000578] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000580] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000588] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000590] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000598] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000005a0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005a8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005b0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005b8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005d0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005d8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000600] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000608] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000610] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000004f0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000004f8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000500] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000508] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000510] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000518] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000520] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000528] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000530] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000538] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000540] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000548] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000550] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000558] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000560] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000568] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000570] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000578] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000580] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000588] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000590] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000598] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005a0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000005a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005b0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005b8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005d0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005d8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005f0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000005f8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000600] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000608] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000618] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000620] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000628] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000630] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000638] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000640] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000648] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000650] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000658] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000660] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000668] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000670] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000678] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000680] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000688] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000690] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000698] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006a0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000006a8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000006b0] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x000006b8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000006c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000006c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000006d0] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x000006d8] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006e0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000006e8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000006f0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000006f8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000700] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000708] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000710] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000718] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000720] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000728] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000730] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -+-/* [0x00000738] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000740] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000748] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000750] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000758] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000760] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000768] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000770] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000778] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000780] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000788] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000610] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000618] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000620] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000628] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000630] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000638] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000640] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000648] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000650] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000658] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000668] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000670] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000678] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000680] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000688] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000690] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000698] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000006a0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006a8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x000006b0] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x000006b8] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006c0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006c8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000006d0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000006d8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000006e0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000006e8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000006f0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000006f8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000700] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000708] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000710] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000718] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000720] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000728] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000730] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000738] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000740] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000748] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000750] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000758] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000760] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000768] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00000790] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000798] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007a0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007a8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007b0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007b8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007c0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007c8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007d0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000007d8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007e0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000007e8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000007f0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000007f8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000800] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000808] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000810] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000818] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000820] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000828] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000830] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000838] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000840] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000848] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000850] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000858] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000860] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000868] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000870] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000878] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000880] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000888] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000890] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000898] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000008b8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008c8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000770] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000778] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000780] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000788] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000790] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000798] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007a0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007a8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007b0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000007b8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007c0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000007c8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007d0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000007d8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007e0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000007e8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000007f0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000007f8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000800] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000808] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000810] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000818] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000820] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000828] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000830] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000838] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000840] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000848] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000850] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000858] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000860] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000868] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000870] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000878] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000880] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000888] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000890] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000898] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008a0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008a8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008d0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008d8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000008e0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000008e8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000008f0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000008f8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000900] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000908] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000910] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000918] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000920] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000928] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000930] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000938] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000940] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000948] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000950] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000958] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000960] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000968] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000970] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000978] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000980] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000988] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x00000990] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000998] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000009a0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000009a8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000009b0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009b8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009c0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009c8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000009e8] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x000009f0] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x000009f8] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a00] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a08] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a10] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a18] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a20] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a28] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a30] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a38] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a40] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a48] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a50] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a58] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008b0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008b8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000008c0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000008c8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000008d0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000008d8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000008e0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000008e8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000008f0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000008f8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000900] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000908] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000910] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000918] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000920] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000928] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000930] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000938] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000940] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000948] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000950] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000958] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000960] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000968] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000970] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000978] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000980] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000988] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000990] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000998] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009a0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009a8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000009b0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x000009b8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x000009c0] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009c8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x000009d0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000009d8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000009e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000009e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a08] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a10] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a18] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a20] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a60] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a68] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000a70] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a28] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a30] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a38] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a40] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a58] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a60] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a68] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit8 -++/* [0x00000a70] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a90] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a98] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000aa0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_interrupt_exit8 -+-/* [0x00000aa8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000ab0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b08] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b10] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b18] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000aa0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000aa8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ab0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ab8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ac0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ac8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ad0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ad8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000ae0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 1fb3e37..3fac45f 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -5,10 +5,10 @@ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 318) -+-#define mc_filter_uv_b (rpi_shader + 484) -+-#define mc_exit (rpi_shader + 664) -+-#define mc_interrupt_exit8 (rpi_shader + 682) -+-#define mc_end (rpi_shader + 712) -++#define mc_filter_uv_b0 (rpi_shader + 316) -++#define mc_filter_uv_b (rpi_shader + 476) -++#define mc_exit (rpi_shader + 650) -++#define mc_interrupt_exit8 (rpi_shader + 668) -++#define mc_end (rpi_shader + 698) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 02e95dd..10f5113 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -221,8 +221,6 @@ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+ add rb26, r0, rb27 -+ -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+ # get filter coefficients -+ -+ mov r0, unif -+@@ -410,20 +408,12 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 4 ; mov r1, ra22 -+- -+-# apply horizontal filter -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 4 ; mov ra12, ra13 -+ brr.anyn -, r:uvloop_b0 -+-mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -+-asr ra15, r0, 8 ; nop # TODO isn't ra15 already in 24bit precision, may not need the sign extension here? -+-nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -+ -+ # apply vertical filter and write to VPM -+ -+@@ -432,9 +422,9 @@ nop ; mul24 r0, ra13, rb9 -+ add r1, r1, r0 ; mul24 r0, ra12, rb8 -+ add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++sub.setf -, r3, rb18 -+ brr.anyn -, r:uvloop_b0 -+-asr vpm, r1, 14 # Delay 1 shifts down by shift2=6, but results are still in 16bit precision TODO may be able to avoid the mul24 and use more delay slots -++asr vpm, r1, 6 # Delay 1 shifts down by shift2=6, but results are still in 16bit precision -+ nop # Delay 2 -+ nop # Delay 3 -+ -+@@ -554,19 +544,12 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 4 ; mov r1, ra22 -+-# apply horizontal filter -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 4 ; mov ra12, ra13 -+ brr.anyn -, r:uvloop_b -+-mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr ra15, r0, 8 ; nop -+-nop ; nop # TODO improve use of delay slots -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -+ -+ # apply vertical filter and write to VPM -+ -+-- -+2.7.4 -+ -+ -+From af59f8e00eb977e97debc5e72ba47e0077db1787 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:31:23 +0100 -+Subject: [PATCH 32/68] Avoid writeback of first B results -+ -+--- -+ libavcodec/rpi_shader.c | 229 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 8 +- -+ libavcodec/rpi_shader.qasm | 18 +--- -+ 3 files changed, 121 insertions(+), 134 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index c498f28..ba453a2 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -255,130 +255,125 @@ unsigned int rpi_shader[] = { -+ /* [0x00000710] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+ /* [0x00000718] */ 0x009e7000, 0x100009e7, // nop -+ /* [0x00000720] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000728] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000730] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000738] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000740] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000748] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000750] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000758] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000760] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000768] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000728] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000730] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000738] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000740] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x00000770] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000778] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000780] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000788] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000790] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000798] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007a0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007a8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007b0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000007b8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007c0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000007c8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000007d0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000007d8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007e0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000007e8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000007f0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000007f8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000800] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000808] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000810] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000818] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000820] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000828] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000830] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000838] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000840] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000748] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000750] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000758] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000760] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000768] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000770] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000778] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000780] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000788] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000790] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000798] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000007a0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000007b0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000007c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000007c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000007d0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000007d8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000007e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000007e8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000007f0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000007f8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000800] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000808] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000810] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000818] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000820] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000828] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000830] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000838] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000840] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+ /* [0x00000848] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000850] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000858] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000860] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000868] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000870] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000878] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000880] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000888] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000890] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000898] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008a0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008a8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000850] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000858] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000860] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000868] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000870] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000878] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000880] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008b0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008b8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000008c0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000008c8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000008d0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000008d8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000008e0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000008e8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000008f0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000008f8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000900] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000908] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000910] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000918] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000920] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000928] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000930] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000938] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000940] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000948] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000950] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000958] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000960] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000968] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000970] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000978] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000980] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000988] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000990] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000998] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009a0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009a8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000009b0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x000009b8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x000009c0] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009c8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x000009d0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000009d8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000009e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000009e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000009f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a08] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a10] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a18] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a20] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000888] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000890] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000898] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000008a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000008a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000008b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000008b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000008c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000008c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000008d0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000008e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000008f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000008f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000900] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000908] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000910] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000918] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000920] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000928] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000930] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000938] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000940] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000948] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000950] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000958] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000960] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000968] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000970] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000978] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000980] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000988] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000990] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000998] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009a0] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x000009a8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000009b0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000009b8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000009c0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009c8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009d0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000009e0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000009e8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000009f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a28] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a30] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000a38] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a40] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a58] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a60] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a68] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a08] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a30] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a38] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a40] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000a70] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a48] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a68] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000a98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000aa0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000aa8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ab0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ab8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ac0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ac8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ad0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ad8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000ae0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ab0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 3fac45f..45dbe0e 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -6,9 +6,9 @@ extern unsigned int rpi_shader[]; -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+ #define mc_filter_uv_b0 (rpi_shader + 316) -+-#define mc_filter_uv_b (rpi_shader + 476) -+-#define mc_exit (rpi_shader + 650) -+-#define mc_interrupt_exit8 (rpi_shader + 668) -+-#define mc_end (rpi_shader + 698) -++#define mc_filter_uv_b (rpi_shader + 466) -++#define mc_exit (rpi_shader + 640) -++#define mc_interrupt_exit8 (rpi_shader + 658) -++#define mc_end (rpi_shader + 688) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 10f5113..e138c95 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -428,22 +428,14 @@ asr vpm, r1, 6 # Delay 1 shifts down by shift2=6, but results are still -+ nop # Delay 2 -+ nop # Delay 3 -+ -++# in pass0 we don't really need to save any results, but need to discard the uniforms -+ # DMA out for U -+ -+-mov vw_setup, rb26 # VDW setup 0 -+-mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW # TODO in pass0 we don't need to save any results -+- -+-# DMA out for V -+-# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -+-# Could potentially push this write into the start of the next pipeline stage. -+-mov r0, 16 -+-mov -, vw_wait -+- -+ bra -, ra31 -+-add vw_setup, rb26, r0 # VDW setup 0 -+-mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW -++mov r0, unif # Delay 1 -++mov r0, unif # Delay 2 -++nop # Delay 3 -++ -+ -+ ################################################################################ -+ -+-- -+2.7.4 -+ -+ -+From 12e57278cb19a769d2e1488e8e94003027493d09 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:36:24 +0100 -+Subject: [PATCH 33/68] Cutdown size of chroma prediction commands -+ -+--- -+ libavcodec/hevc.c | 17 +- -+ libavcodec/rpi_shader.c | 543 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 12 +- -+ libavcodec/rpi_shader.qasm | 11 +- -+ 4 files changed, 281 insertions(+), 302 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index a47ebc5..32b89d5 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -56,7 +56,7 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ -+ #ifdef RPI_INTER_QPU -+ -+-#define RPI_CHROMA_COMMAND_WORDS 12 -++#define RPI_CHROMA_COMMAND_WORDS 10 -+ #define UV_COMMANDS_PER_QPU ((1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS) -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+@@ -2032,11 +2032,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+- u++; -+ *u++ = rpi_filter_coefs[_my][0]; -+- u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2091,9 +2088,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+- u++; -+ *u++ = rpi_filter_coefs[_my][0]; -+- u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2154,11 +2149,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+ *u++ = ( (nPbW_cframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); // TODO this will become unused once we have a dedicated pass0 filter -+- *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ u+=2; // Intermediate results are not written back in first pass of B filtering -+ -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 1 + start_x; -+@@ -2166,11 +2158,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx2][0]; -+- u++; -+ *u++ = rpi_filter_coefs[_my2][0]; -+- u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2808,7 +2797,7 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = pic_height; -+ *s->u_mvs[i]++ = s->frame->linesize[1]; -+ *s->u_mvs[i]++ = s->frame->linesize[2]; -+- s->u_mvs[i] += 3; // Padding words -++ s->u_mvs[i] += 1; // Padding words -+ } -+ } -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index ba453a2..b0b93b5 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -89,291 +89,286 @@ unsigned int rpi_shader[] = { -+ /* [0x00000200] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+ /* [0x00000208] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+ /* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000218] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000220] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000228] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000230] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000238] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000240] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000248] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000250] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000258] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000218] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000220] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000228] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000230] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000238] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000240] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000248] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000268] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000270] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000278] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000280] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000288] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000290] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000298] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000002a0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000002a8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002b0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002b8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002c0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002c8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002e8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002f0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000340] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000348] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000360] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000368] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000370] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000378] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000258] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000260] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000268] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000270] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000278] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000280] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000288] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000290] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000298] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002a0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002a8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002b0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002b8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002c0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002c8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002d0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002d8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002e0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002e8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002f0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002f8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000300] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000330] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000340] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000350] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000358] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000360] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000380] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000388] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000390] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000398] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003a0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003a8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003b8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003c0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003c8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000003e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000003f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000003f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000400] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000408] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000410] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000418] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000420] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000428] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000430] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000438] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000440] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000448] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000450] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000458] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000460] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000468] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000470] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000478] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000480] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000488] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000490] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000498] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004a0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000004a8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000004b0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004b8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000004c0] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000004c8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000004d0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000004d8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000004e0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004e8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000368] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000370] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000378] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000380] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000388] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000390] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000398] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003a0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003a8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003b0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003b8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003c0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003c8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000003d0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000003d8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000003e0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000003e8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000003f0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000003f8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000400] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000408] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000410] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000418] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000420] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000428] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000430] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000438] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000440] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000448] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000450] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000458] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000460] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000468] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000470] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000478] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000480] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000488] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000490] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000498] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004a8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004b0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004b8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004c0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000004c8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004d0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000004f0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000004f8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000500] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000508] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000510] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000518] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000520] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000528] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000530] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000538] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000540] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000548] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000550] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000558] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000560] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000568] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000570] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000578] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000580] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000588] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000590] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000598] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005a0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005b0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005b8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005d0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005d8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005f0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000005f8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000600] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000608] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000004d8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000004e0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000004e8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000004f0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000004f8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000500] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000508] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000510] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000518] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000520] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000528] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000530] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000538] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000540] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000548] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000550] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000558] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000560] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000568] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000570] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000578] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000580] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000588] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000590] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000598] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005a0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005a8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005b0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005b8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000005d8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000005e0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000005e8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000610] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000618] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000620] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000628] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000630] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000638] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000640] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000648] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000650] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000658] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000668] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000670] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000678] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000680] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000688] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000690] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000698] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000006a0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000006a8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x000006b0] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x000006b8] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006c0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000006c8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000006d0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000006d8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000006e0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000006e8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000006f0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000006f8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000700] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x00000708] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000710] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x00000718] */ 0x009e7000, 0x100009e7, // nop -++/* [0x000005f0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000005f8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000600] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000608] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000610] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000618] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000620] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000628] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000630] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000638] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000640] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000648] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000650] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000658] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000660] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000668] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000670] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000678] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000680] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000688] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000690] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000698] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006a0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006a8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000006b0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000006b8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000006c0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000006c8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000006d0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000006d8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000006e0] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x000006e8] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006f0] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x000006f8] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000700] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000708] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000710] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000718] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000720] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000728] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000730] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000738] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000740] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x00000748] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000750] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000758] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000760] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000768] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000770] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000778] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000780] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000788] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000790] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000798] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000007a0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000007a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000007b0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000007c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000007c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000007d0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000007d8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000007e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000007e8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x000007f0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x000007f8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000800] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000808] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000810] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000818] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000820] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000828] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000830] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000838] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000840] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000848] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000850] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000858] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000860] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000868] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000870] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000878] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000880] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000728] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000730] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000738] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000740] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000748] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000750] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000758] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000760] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000768] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000770] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000778] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000780] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000788] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000790] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000798] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000007a0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000007a8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000007b0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000007b8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000007c0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000007c8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000007d0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000007d8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x000007e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000007e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000007f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000007f8] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000800] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000808] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000810] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000818] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000820] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000828] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000830] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000838] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000840] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000848] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000850] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000858] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000888] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000890] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000898] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000008a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000008a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000008b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000008b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000008c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000008c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000008d0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000008e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000008f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000008f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000900] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000908] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000910] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000918] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000920] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000928] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000930] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000938] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000940] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000948] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000950] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000958] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000960] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000968] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000970] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000978] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000980] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000988] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000990] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000998] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009a0] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x000009a8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000009b0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000009b8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000009c0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009c8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000009d0] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000009e0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000009e8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000009f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000860] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000868] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000870] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000878] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000880] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000888] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000890] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000898] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000008a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000008a8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000008b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000008c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000008c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000008d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000008d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000008e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000008e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000008f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000008f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000900] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000908] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000910] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000918] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000920] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000928] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000930] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000938] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000940] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000948] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000950] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000958] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000960] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000968] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000970] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000978] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000980] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000988] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000990] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000998] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009a8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000009b0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000009b8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000009c0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000009c8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009d0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a08] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000a10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a30] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a38] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a40] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000009e0] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x000009e8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000009f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000009f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a00] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a08] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a10] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a18] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000a48] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a68] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a20] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a30] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a38] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a40] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a58] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a60] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000a70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000a78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000aa0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ab0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a80] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a88] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000a90] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 45dbe0e..99927c4 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,11 +4,11 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 316) -+-#define mc_filter_uv_b (rpi_shader + 466) -+-#define mc_exit (rpi_shader + 640) -+-#define mc_interrupt_exit8 (rpi_shader + 658) -+-#define mc_end (rpi_shader + 688) -++#define mc_filter_uv (rpi_shader + 148) -++#define mc_filter_uv_b0 (rpi_shader + 310) -++#define mc_filter_uv_b (rpi_shader + 458) -++#define mc_exit (rpi_shader + 630) -++#define mc_interrupt_exit8 (rpi_shader + 648) -++#define mc_end (rpi_shader + 678) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index e138c95..d9ffcda 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -167,8 +167,6 @@ add t0s, r2, r1 -+ -+ # Dump padding words -+ mov r0, unif -+-mov r0, unif -+-mov r0, unif -+ -+ # submit texture requests for second line -+ max r1, ra_y, 0 -+@@ -228,11 +226,10 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+- mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -++asr rb8, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -362,11 +359,10 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+- mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -++asr rb8, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -490,11 +486,10 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+- mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -++asr rb8, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+-- -+2.7.4 -+ -+ -+From 3e8f02cf9d3e4bfcd07a5fcf321ace07c4f2e6f3 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 15:21:49 +0100 -+Subject: [PATCH 34/68] hevc: don't redirect when not rpi_enabled -+ -+--- -+ libavcodec/hevc.c | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 32b89d5..2459e34 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -1468,7 +1468,7 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size) -+ */ -+ -+ #ifdef RPI_INTER -+-#define RPI_REDIRECT(fn) rpi_ ## fn -++#define RPI_REDIRECT(fn) (s->enable_rpi ? rpi_ ## fn : fn) -+ static void rpi_luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref, const Mv *mv, int x_off, int y_off, -+ int block_w, int block_h, int luma_weight, int luma_offset) -+-- -+2.7.4 -+ -+ -+From 6da455b382b28c3c1f4e98c1703a695cdb946ad3 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 15:22:02 +0100 -+Subject: [PATCH 35/68] Use /dev/vcio for mailbox access -+ -+--- -+ libavcodec/rpi_mailbox.c | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/libavcodec/rpi_mailbox.c b/libavcodec/rpi_mailbox.c -+index 536896f..77a56dd 100644 -+--- a/libavcodec/rpi_mailbox.c -++++ b/libavcodec/rpi_mailbox.c -+@@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+ #define MAJOR_NUM 100 -+ #define IOCTL_MBOX_PROPERTY _IOWR(MAJOR_NUM, 0, char *) -+-#define DEVICE_FILE_NAME "/dev/char_dev" -++#define DEVICE_FILE_NAME "/dev/vcio" -+ -+ #include "rpi_mailbox.h" -+ -+-- -+2.7.4 -+ -+ -+From f96ef6131f16a4c03b8e2882bdf7319c3b646a6c Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 15:25:25 +0100 -+Subject: [PATCH 36/68] Use vcsm for all memory allocations -+ -+--- -+ libavcodec/rpi_qpu.c | 174 +++++++++++++++++++-------------------------------- -+ 1 file changed, 64 insertions(+), 110 deletions(-) -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 60bf079..f62051f 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -1,7 +1,5 @@ -+ #ifdef RPI -+-// define RPI_USE_VCSM to use the vcsm device for shared memory -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+-#define RPI_USE_VCSM -+ // define RPI_TIME_TOTAL_QPU to print out how much time is spent in the QPU code -+ #define RPI_TIME_TOTAL_QPU -+ // define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -+@@ -25,9 +23,7 @@ -+ #include "rpi_shader.h" -+ #include "rpi_hevc_transform.h" -+ -+-#ifdef RPI_USE_VCSM -+ #include "rpi_user_vcsm.h" -+-#endif -+ -+ // On Pi2 there is no way to access the VPU L2 cache -+ // GPU_MEM_FLG should be 4 for uncached memory. (Or C for alias to allocate in the VPU L2 cache) -+@@ -96,7 +92,6 @@ struct GPU -+ unsigned int vpu_code[VPU_CODE_SIZE]; -+ short transMatrix2even[16*16*2]; -+ int open_count; // Number of allocated video buffers -+- unsigned int vc_handle; // Handle of this memory -+ int mb; // Mailbox handle -+ int vc; // Address in GPU memory -+ int mail[12]; // These are used to pass pairs of code/unifs to the QPUs -+@@ -105,6 +100,7 @@ struct GPU -+ // Stop more than one thread trying to allocate memory or use the processing resources at once -+ static pthread_mutex_t gpu_mutex = PTHREAD_MUTEX_INITIALIZER; -+ static volatile struct GPU* gpu = NULL; -++static GPU_MEM_PTR_T gpu_mem_ptr; -+ -+ #if defined(RPI_TIME_TOTAL_QPU) || defined(RPI_TIME_TOTAL_VPU) -+ static unsigned int Microseconds(void) { -+@@ -132,39 +128,27 @@ static volatile int vpu_async_tail=0; // Contains the number of posted jobs -+ static volatile int vpu_async_head=0; -+ #endif -+ -++static int gpu_malloc_uncached_internal(int numbytes, GPU_MEM_PTR_T *p, int mb); -++static void gpu_free_internal(GPU_MEM_PTR_T *p); -++ -+ // Connect to QPU, returns 0 on success. -+ static int gpu_init(volatile struct GPU **gpu) { -+ int mb = mbox_open(); -+ int vc; -+- int handle; -+ volatile struct GPU* ptr; -+ if (mb < 0) -+ return -1; -+ -+ if (qpu_enable(mb, 1)) return -2; -+ -+-#ifdef RPI_USE_VCSM -+ vcsm_init(); -+-#endif -++ gpu_malloc_uncached_internal(sizeof(struct GPU), &gpu_mem_ptr, mb); -++ ptr = (volatile struct GPU*)gpu_mem_ptr.arm; -++ memset(ptr, 0, sizeof *ptr); -++ vc = gpu_mem_ptr.vc; -+ -+- handle = mem_alloc(mb, sizeof(struct GPU), 4096, GPU_MEM_FLG); -+- if (!handle) -+- { -+- qpu_enable(mb, 0); -+- return -3; -+- } -+- vc = mem_lock(mb, handle); -+- ptr = mapmem_shared((vc+GPU_MEM_MAP)&~0xc0000000, sizeof(struct GPU)); -+- if (ptr == NULL) -+- { mem_free(mb, handle); -+- mem_unlock(mb, handle); -+- qpu_enable(mb, 0); -+- return -4; -+- } -+- -+- ptr->mb = mb; -+- ptr->vc_handle = handle; -+- ptr->vc = vc; -++ ptr->mb = mb; -++ ptr->vc = vc; -+ -+ printf("GPU allocated at 0x%x\n",vc); -+ -+@@ -226,94 +210,74 @@ static void gpu_unlock(void) { -+ pthread_mutex_unlock(&gpu_mutex); -+ } -+ -++static int gpu_malloc_uncached_internal(int numbytes, GPU_MEM_PTR_T *p, int mb) { -++ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -++ assert(p->vcsm_handle); -++ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -++ assert(p->vc_handle); -++ p->arm = vcsm_lock(p->vcsm_handle); -++ assert(p->arm); -++ p->vc = mem_lock(mb, p->vc_handle); -++ assert(p->vc); -++ return 0; -++} -++ -+ // Allocate memory on GPU -+ // Fills in structure

containing ARM pointer, videocore handle, videocore memory address, numbytes -+ // Returns 0 on success. -+ // This allocates memory that will not be cached in ARM's data cache. -+ // Therefore safe to use without data cache flushing. -+-int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) { -++int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) -++{ -++ int r; -+ gpu_lock(); -+- p->vc_handle = mem_alloc(gpu->mb, numbytes, 4096, GPU_MEM_FLG); -+- p->vcsm_handle = 0; -+- if (!p->vc_handle) -+- { -+- qpu_enable(gpu->mb, 0); -+- return -3; -+- } -+- p->vc = mem_lock(gpu->mb, p->vc_handle); -+- p->arm = mapmem_shared((p->vc+GPU_MEM_MAP)&~0xc0000000,numbytes); -+- p->numbytes = numbytes; -+- if (p->arm == NULL) -+- { -+- mem_free(gpu->mb, p->vc_handle); -+- mem_unlock(gpu->mb, p->vc_handle); -+- gpu_unlock(); -+- qpu_enable(gpu->mb, 0); -+- return -4; -+- } -++ r = gpu_malloc_uncached_internal(numbytes, p, gpu->mb); -+ gpu->open_count++; -+ gpu_unlock(); -+- return 0; -++ return r; -+ } -+ -+ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ { -+- // This only works when using RPI_USE_VCSM -+ void *tmp = vcsm_lock(p->vcsm_handle); -+ vcsm_unlock_ptr(tmp); -+ } -+ -++static int gpu_malloc_cached_internal(int numbytes, GPU_MEM_PTR_T *p) { -++ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST_AND_VC, (char *)"Video Frame" ); -++ assert(p->vcsm_handle); -++ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -++ assert(p->vc_handle); -++ p->arm = vcsm_lock(p->vcsm_handle); -++ assert(p->arm); -++ p->vc = mem_lock(gpu->mb, p->vc_handle); -++ assert(p->vc); -++ return 0; -++} -++ -+ // This allocates data that will be -+ // Cached in ARM L2 -+ // Uncached in VPU L2 -+-int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p) { -++int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p) -++{ -++ int r; -+ gpu_lock(); -+-#ifdef RPI_USE_VCSM -+- { -+- p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); // f....... locks up for VP9 - retest this? -+- //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); // 3b...... works -+- //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); //fb...... locks up -+- //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST_AND_VC, (char *)"Video Frame" ); // 3b works (but corrupted due to caching) -+- p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -+- p->arm = vcsm_lock(p->vcsm_handle); -+- p->vc = mem_lock(gpu->mb, p->vc_handle); -+- } -+-#else -+- p->vc_handle = mem_alloc(gpu->mb, numbytes, 4096, GPU_MEM_FLG); -+- p->vcsm_handle = 0; -+- if (!p->handle) -+- { -+- qpu_enable(gpu->mb, 0); -+- return -3; -+- } -+- p->vc = mem_lock(gpu->mb, p->vc_handle); -+- printf("This mapmem_private does not seem to work\n"); -+- exit(-1); -+- p->arm = mapmem_private((p->vc+GPU_MEM_MAP)&~0xc0000000,numbytes); -+- p->numbytes = numbytes; -+- if (p->arm == NULL) -+- { -+- mem_free(gpu->mb, p->handle); -+- mem_unlock(gpu->mb, p->handle); -+- gpu_unlock(); -+- qpu_enable(gpu->mb, 0); -+- return -4; -+- } -+-#endif -++ r = gpu_malloc_cached_internal(numbytes, p); -+ gpu->open_count++; -+ gpu_unlock(); -+- return 0; -++ return r; -+ } -+ -+ static void gpu_term(void) -+ { -+- int mb; -+- unsigned handle; -++ int mb; -+ -+ if (gpu==NULL) -+ return; -+ mb = gpu->mb; -+- handle = gpu->vc_handle; -+ -+ #ifdef RPI_ASYNC -+ { -+@@ -323,37 +287,26 @@ static void gpu_term(void) -+ } -+ #endif -+ -++ qpu_enable(mb, 0); -++ gpu_free_internal(&gpu_mem_ptr); -+ -+- unmapmem((void*)gpu, sizeof(struct GPU)); -+- mem_unlock(mb, handle); -+- mem_free(mb, handle); -+- qpu_enable(mb, 0); -+-#ifdef RPI_USE_VCSM -+ vcsm_exit(); -+-#endif -+- mbox_close(mb); -++ -++ mbox_close(mb); -+ gpu = NULL; -+ } -+ -+-void gpu_free(GPU_MEM_PTR_T *p) { -++void gpu_free_internal(GPU_MEM_PTR_T *p) { -+ int mb = gpu->mb; -+- unsigned handle = p->vc_handle; -++ mem_unlock(mb,p->vc_handle); -++ vcsm_unlock_ptr(p->arm); -++ vcsm_free(p->vcsm_handle); -++} -++ -++void gpu_free(GPU_MEM_PTR_T *p) { -+ gpu_lock(); -+-#ifdef RPI_USE_VCSM -+- if (p->vcsm_handle) { -+- mem_unlock(mb,p->vc_handle); -+- vcsm_unlock_ptr(p->arm); -+- vcsm_free(p->vcsm_handle); -+- } else { -+- unmapmem((void*)p->arm, sizeof(struct GPU)); -+- mem_unlock(mb, handle); -+- mem_free(mb, handle); -+- } -+-#else -+- unmapmem((void*)p->arm, sizeof(struct GPU)); -+- mem_unlock(mb, handle); -+- mem_free(mb, handle); -+-#endif -++ -++ gpu_free_internal(p); -+ -+ gpu->open_count--; -+ if (gpu->open_count==0) { -+@@ -386,20 +339,21 @@ unsigned int vpu_get_constants(void) { -+ -+ static void *vpu_start(void *arg) { -+ while(1) { -++ int *p; -+ pthread_mutex_lock(&post_mutex); -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+ //printf("Checking number %d %d\n",vpu_async_head,vpu_async_tail); -+ pthread_cond_wait(&post_cond_tail, &post_mutex); -+ } -+- int *p = vpu_cmds[vpu_async_head%MAXCMDS]; -++ p = vpu_cmds[vpu_async_head%MAXCMDS]; -+ pthread_mutex_unlock(&post_mutex); -+ -+ if (p[6] == -1) { -+ break; // Last job -+ } -+ if (p[7]) { -+- GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -++ //GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -+ //gpu_cache_flush(buf); -+ } -+ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -+-- -+2.7.4 -+ -+ -+From 7c94b833b48a455d27d82eb2ca1b53a162705caf Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 15:43:17 +0100 -+Subject: [PATCH 37/68] Enable EARLY_MALLOC and fix sps access bug -+ -+--- -+ libavcodec/hevc.c | 5 +++-- -+ 1 file changed, 3 insertions(+), 2 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 2459e34..4e82a15 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -44,7 +44,7 @@ -+ #ifdef RPI -+ #include "rpi_qpu.h" -+ // For some unknown reason, the code seems to crash if I do a late malloc -+- #define EARLY_MALLOC -++ //#define EARLY_MALLOC -+ // Move Inter prediction into separate pass -+ #define RPI_INTER -+ #endif -+@@ -149,7 +149,8 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ #ifdef RPI -+ #ifdef EARLY_MALLOC -+ #else -+- int coeffs_in_ctb = (1 << s->ps.sps->log2_ctb_size) * (1 << s->ps.sps->log2_ctb_size); -++ assert(sps); -++ int coeffs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+ int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -+ printf("pic_arrays_init\n"); -+ printf("Allocated %d\n",coefs_per_row); -+-- -+2.7.4 -+ -+ -+From 0a0a92817a7959d213dca9c75a242b6ad88d6b80 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 16:40:51 +0100 -+Subject: [PATCH 38/68] Add copy of av_mod_uintp2 for use with stable ffmpeg -+ -+--- -+ libavcodec/hevc.c | 8 ++++++++ -+ 1 file changed, 8 insertions(+) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 4e82a15..80db603 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -51,6 +51,14 @@ -+ -+ // #define DISABLE_MC -+ -++#ifndef av_mod_uintp2 -++static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a, unsigned p) -++{ -++ return a & ((1 << p) - 1); -++} -++# define av_mod_uintp2 av_mod_uintp2_c -++#endif -++ -+ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; -+ -+ -+-- -+2.7.4 -+ -+ -+From c48d08e968b24c2e260b0cc76c7901a1b4d75bbf Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 18 May 2015 11:11:02 +0100 -+Subject: [PATCH 39/68] Added support for weighted prediction in P frames -+ -+--- -+ libavcodec/hevc.c | 52 ++++- -+ libavcodec/rpi_shader.c | 566 +++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 12 +- -+ libavcodec/rpi_shader.qasm | 39 +++- -+ 4 files changed, 384 insertions(+), 285 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 80db603..9668ef8 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -64,7 +64,7 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ -+ #ifdef RPI_INTER_QPU -+ -+-#define RPI_CHROMA_COMMAND_WORDS 10 -++#define RPI_CHROMA_COMMAND_WORDS 12 -+ #define UV_COMMANDS_PER_QPU ((1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS) -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+@@ -2031,6 +2031,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+ //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+ int chan = x0>>8; -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+@@ -2043,6 +2045,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = ( (nPbW_csh.chroma_offset_l0[current_mv.ref_idx[0]][0] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0] & 0xffff); -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[0]][1] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[0]][1] & 0xffff); -++ } else { -++ *u++ = 1; // Weight of 1 and offset of 0 -++ *u++ = 1; -++ } -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2085,6 +2094,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+ //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+ int chan = x0>>8; -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+@@ -2098,6 +2109,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ // TODO chroma weight and offset... s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+ *u++ = rpi_filter_coefs[_my][0]; -++ if (weight_flag) { -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[1]][0] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[1]][0] & 0xffff); -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[1]][1] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[1]][1] & 0xffff); -++ } else { -++ *u++ = 1; // Weight of 1 and offset of 0 -++ *u++ = 1; -++ } -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2159,6 +2177,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = ( (nPbW_cmc_filter_uv_b; -+@@ -2169,6 +2188,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = ( (nPbW_cframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2795,6 +2815,9 @@ static void rpi_inter_clear(HEVCContext *s) -+ int i; -+ int pic_width = s->ps.sps->width >> s->ps.sps->hshift[1]; -+ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[1]; -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -++ -+ for(i=0;i<8;i++) { -+ s->u_mvs[i] = s->mvs_base[i]; -+ *s->u_mvs[i]++ = 0; -+@@ -2806,6 +2829,13 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = pic_height; -+ *s->u_mvs[i]++ = s->frame->linesize[1]; -+ *s->u_mvs[i]++ = s->frame->linesize[2]; -++ if (weight_flag) { -++ *s->u_mvs[i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -++ *s->u_mvs[i]++ = s->sh.chroma_log2_weight_denom + 6; -++ } else { -++ *s->u_mvs[i]++ = 1 << 5; -++ *s->u_mvs[i]++ = 6; -++ } -+ s->u_mvs[i] += 1; // Padding words -+ } -+ } -+@@ -2849,12 +2879,29 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -+ #ifdef RPI -++#ifdef RPI_INTER_QPU -+ s->enable_rpi = s->ps.sps->bit_depth == 8 -+ && s->ps.sps->width <= RPI_MAX_WIDTH -+ && !s->ps.pps->cross_component_prediction_enabled_flag -+ && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1 -+- && !(s->ps.pps->weighted_pred_flag && s->sh.slice_type == P_SLICE) -+ && !(s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE); -++#else -++ s->enable_rpi = s->ps.sps->bit_depth == 8 -++ && s->ps.sps->width <= RPI_MAX_WIDTH -++ && !s->ps.pps->cross_component_prediction_enabled_flag -++ && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1; -++#endif -++ -++ /*if (!s->enable_rpi) { -++ if (s->ps.pps->cross_component_prediction_enabled_flag) -++ printf("Cross component\n"); -++ if (s->ps.pps->num_tile_rows > 1 || s->ps.pps->num_tile_columns > 1) -++ printf("Tiles\n"); -++ if (s->ps.pps->weighted_pred_flag && s->sh.slice_type == P_SLICE) -++ printf("Weighted P slice\n"); -++ if (s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE) -++ printf("Weighted B slice\n"); -++ }*/ -+ -+ #endif -+ -+@@ -2987,6 +3034,7 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int -+ -+ #ifdef RPI -+ s->enable_rpi = 0; -++ //printf("Wavefront\n"); -+ #endif -+ -+ if(ctb_row) { -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index b0b93b5..3f04d80 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -88,287 +88,307 @@ unsigned int rpi_shader[] = { -+ /* [0x000001f8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+ /* [0x00000200] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+ /* [0x00000208] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000218] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000220] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000228] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000230] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000238] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000240] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000248] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000210] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000218] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000220] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000228] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000230] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000238] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000240] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000248] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000250] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000258] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000258] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000260] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000268] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000270] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000278] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000280] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000288] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000290] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000298] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002a0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002a8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002b0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002b8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002c0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002c8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002d0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002d8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002e0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002e8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002f0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002f8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000300] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000330] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000340] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000350] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000358] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000360] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000268] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000270] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000278] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000280] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000288] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000290] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000298] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000002a0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000002a8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002b0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002b8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002c0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002c8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002e8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002f0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000340] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000360] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000368] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000370] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000378] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000380] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000388] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000390] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -++/* [0x00000398] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000003a0] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -++/* [0x000003a8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000003b0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000368] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000370] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000378] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000380] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000388] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000390] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000398] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003a0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003a8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003b0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003b8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003c0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003c8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000003d0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000003d8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000003e0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000003e8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000003f0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000003f8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000400] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000408] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000410] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000418] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000420] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000428] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000430] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000438] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000440] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000448] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000450] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000458] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000460] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000468] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000470] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000478] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000480] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000488] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000490] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000498] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000004a8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000004b0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000004b8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000004c0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000004c8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004d0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000003b8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003c0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003c8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003d0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003d8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003e0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003e8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003f0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003f8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000400] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000408] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000410] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000418] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000420] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000428] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000430] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000438] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000440] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000448] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000450] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000458] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000460] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000468] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000470] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000478] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000480] */ 0x00000020, 0xe0021327, // mov rb12,32 -++/* [0x00000488] */ 0x00000006, 0xe0021367, // mov rb13,6 -++/* [0x00000490] */ 0x00000001, 0xe00213a7, // mov rb14,1 -++/* [0x00000498] */ 0x00000000, 0xe00213e7, // mov rb15,0 -++/* [0x000004a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000004a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000004b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000004b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000004c0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000004c8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000004d0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000004d8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x000004e0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x000004e8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x000004f0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004f8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00000500] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000508] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000510] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000518] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000520] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000528] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000530] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000538] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000540] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000548] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000550] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000004d8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000004e0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000004e8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000004f0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000004f8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000500] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000508] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000510] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000518] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000520] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000528] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000530] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000538] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000540] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000548] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000550] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000558] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000560] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000568] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000570] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000578] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000580] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000588] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000590] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000598] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005a0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005a8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005b0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005b8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005d0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x000005d8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000005e0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000005e8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000558] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000560] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000568] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000570] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000578] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000580] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000588] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000590] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000598] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000005a0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000005a8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000005b0] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x000005b8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000005c0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005c8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000005d0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000005d8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000005e0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000005e8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000005f0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000005f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000600] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000608] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000610] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000618] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000620] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000628] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000630] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000638] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000640] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000648] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000650] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000658] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000660] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000668] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000670] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000678] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x000005f0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000005f8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000600] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000608] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000610] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000618] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000620] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000628] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000630] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000638] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000640] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000648] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000650] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000658] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000660] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000668] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000670] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000678] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000680] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000688] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000690] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000698] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006a0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000006a8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000006b0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000006b8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000006c0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000006c8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000006d0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000006d8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000006e0] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x000006e8] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006f0] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x000006f8] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000700] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000708] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000710] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000718] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000720] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000680] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000688] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000690] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000698] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000006a0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000006a8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000006b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000006b8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000006c0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000006c8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000006d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000006d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000006e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000006e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000700] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000708] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000710] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000718] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000720] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000728] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000730] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000738] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000740] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000748] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000750] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000758] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000760] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000768] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000770] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000778] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000780] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000788] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000790] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000798] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000007a0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007b0] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x00000728] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000730] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000738] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000740] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000748] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000750] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000758] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000760] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000768] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000770] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000778] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000780] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000788] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000790] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000798] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000007a0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000007a8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000007b0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000007b8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000007c0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000007c8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x000007d0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x000007d8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x000007e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000007e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000007f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000007f8] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000800] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000808] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000810] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000818] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000820] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000828] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000830] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000838] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000840] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000848] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000850] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000858] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000007b8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000007c0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007c8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007d0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007d8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007e0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007e8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007f0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007f8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000800] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000808] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000810] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000818] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000820] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000828] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000830] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000838] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000840] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000848] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000850] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000858] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000860] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000868] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000870] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000878] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000880] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000888] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000890] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000898] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000008b8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008d0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000008d8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008e0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008e8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008f0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008f8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000860] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000868] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000870] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000878] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000880] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000888] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000890] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000898] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000008a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000008a8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000008b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000008c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000008c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000008d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000008d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000008e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000008e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000008f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000008f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000900] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000908] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000910] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000918] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000920] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000928] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000930] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000938] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000940] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000948] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000950] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000958] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000960] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000968] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000970] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000978] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000980] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000988] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000990] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000998] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000009a8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000009b0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000009b8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000009c0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000009c8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009d0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000900] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000908] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000910] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000918] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000920] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000928] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000930] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000938] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000940] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000948] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000950] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000958] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000960] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000968] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000970] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000978] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000980] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000988] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000990] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000998] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x000009a0] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x000009a8] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009b0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009b8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000009c0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000009c8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009d0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009d8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009e0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000a00] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000a08] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000a10] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a18] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a20] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a28] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a30] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a38] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a40] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a48] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a50] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a60] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000009e0] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x000009e8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a00] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a08] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a10] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a18] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a78] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a80] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000aa0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ab0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000a20] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a30] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a38] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a40] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a58] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a60] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a80] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a88] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000a90] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ac0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ae0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b10] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b18] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b20] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b28] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b30] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 99927c4..cec9901 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,11 +4,11 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 148) -+-#define mc_filter_uv_b0 (rpi_shader + 310) -+-#define mc_filter_uv_b (rpi_shader + 458) -+-#define mc_exit (rpi_shader + 630) -+-#define mc_interrupt_exit8 (rpi_shader + 648) -+-#define mc_end (rpi_shader + 678) -++#define mc_filter_uv (rpi_shader + 152) -++#define mc_filter_uv_b0 (rpi_shader + 342) -++#define mc_filter_uv_b (rpi_shader + 494) -++#define mc_exit (rpi_shader + 670) -++#define mc_interrupt_exit8 (rpi_shader + 688) -++#define mc_end (rpi_shader + 718) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index d9ffcda..97c4c02 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -9,7 +9,12 @@ -+ # (ra15 isn't clamped to zero - this happens during the -+ # copy to ra14, and during its use in the vertical filter) -+ # -+-# rb8...rb15 eight vertical filter coefficients -++# rb8...rb11 eight vertical filter coefficients -++ -++# rb12 offset to add before shift -++# rb13 shift -++# rb14 weight (U on left, V on right) -++# rb15 offset (U on left, V on right) -+ # -+ # ra16 clipped(row start address+elem_num)&~3 -+ # ra17 per-channel shifts -+@@ -165,6 +170,9 @@ add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+ add t0s, r0, r1 ; mov ra_x2_base, r2 -+ add t0s, r2, r1 -+ -++mov rb12,unif # offset before shift -++mov rb13,unif # offset after shift -++ -+ # Dump padding words -+ mov r0, unif -+ -+@@ -231,11 +239,21 @@ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23 -+ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r0, unif # U offset/weight -++asr rb15, r0, r2 # Compute offset from MSBs -++shl r0, r0, r2 -++asr rb14, r0, r2 # Compute weight from LSBs -++mov r0, unif # V offset/weight -++asr.ifnz rb15, r0, r2 -++shl r0, r0, r2 -++asr.ifnz rb14, r0, r2 -++ -+ # r2 is elem_num -+ # r3 is loop counter -+ -+ mov r5rep, -8 -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+ # retrieve texture results and pick out bytes -+ # then submit two more texture requests -+@@ -279,6 +297,11 @@ mov ra13, ra14 # Delay slot 1 -+ mov ra14, ra15 # Delay slot 2 -+ mov ra15, r0 # Delay slot 3 -+ -++mov rb12,32 -++mov rb13,6 -++mov rb14,1 -++mov rb15,0 -++ -+ # apply vertical filter and write to VPM -+ -+ nop ; mul24 r1, ra14, rb10 -+@@ -288,9 +311,11 @@ add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ asr r1, r1, 14 -+-add r1, r1, ra21 -++nop ; mul24 r1, r1, rb14 -++add r1, r1, rb12 -++asr r1, r1, rb13 -+ brr.anyn -, r:uvloop -+-asr r1, r1, 6 # Delay 1 -++add r1, r1, rb15 # Delay 1 -+ min r1, r1, rb22 # Delay 2 -+ max vpm, r1, 0 # Delay 3 -+ -+@@ -364,6 +389,9 @@ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23 -+ -++mov r0, unif # U offset/weight -++mov r0, unif # V offset/weight -++ -+ # r2 is elem_num -+ # r3 is loop counter -+ -+@@ -491,6 +519,9 @@ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23 -+ -++mov r0, unif # U offset/weight -++mov r0, unif # V offset/weight -++ -+ # r2 is elem_num -+ # r3 is loop counter -+ -+-- -+2.7.4 -+ -+ -+From 310d994ea39e29b41a6a013abc4d94e6b90487b2 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 19 May 2015 08:43:30 +0100 -+Subject: [PATCH 40/68] Improved ordering of tasks -+ -+--- -+ libavcodec/hevc.c | 8 ++++---- -+ 1 file changed, 4 insertions(+), 4 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 9668ef8..951e2d3 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2943,15 +2943,15 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->dblk_cmds[s->num_dblk_cmds][0] = x_ctb; -+ s->dblk_cmds[s->num_dblk_cmds++][1] = y_ctb; -+ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+-#ifdef RPI_INTER_QPU -+- // Kick off inter prediction on QPUs -+- rpi_execute_inter_qpu(s); -+-#endif -+ // Transform all blocks -+ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -++#ifdef RPI_INTER_QPU -++ // Kick off inter prediction on QPUs -++ rpi_execute_inter_qpu(s); -++#endif -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -+ -+-- -+2.7.4 -+ -+ -+From d6e1ce7898196e49e52a6223c12979b3d0014588 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 20 May 2015 19:58:19 +0100 -+Subject: [PATCH 41/68] Drafted Luma inter prediction -+ -+--- -+ libavcodec/rpi_shader.qasm | 594 ++++++++++++++++++++++++++++++++++++++++++--- -+ 1 file changed, 554 insertions(+), 40 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 97c4c02..9cfc0d9 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -2,7 +2,10 @@ -+ # -+ # ra0...ra7 eight horizontal filter coefficients -+ # -+-# rb1...rb7 seven shifted copies of the current unfiltered row -++# rb0 rx_shift2 -++# rb1 ra_y2_next -++# -++# rb4...rb7 -+ # -+ # ra8...ra15 eight filtered rows of context (rb15 == most recent) -+ # -+@@ -26,9 +29,9 @@ -+ # rb19 next ra16 -+ # -+ # ra20 1 -+-# ra21 32 -++# ra21 ra_21 -+ # ra22 256 -+-# ra23 8 -++# ra23 rx_shift2_next -+ # -+ # rb20 0xffffff00 -+ # rb21 vpm_setup for reading/writing 16bit results into VPM -+@@ -57,16 +60,23 @@ -+ .set rb_frame_width_minus_1, rb25 -+ .set rb_frame_height_minus_1, rb30 -+ .set rb_pitch, rb16 -+-.set ra_x_base, ra16 -+-.set rb_x_base_next, rb19 -+-.set ra_x2_base, ra24 -+-.set ra_x2_base_next, ra26 -++.set ra_x, ra16 -++.set ra_y2, ra21 -++.set ra_y2_next, rb1 -++ -++.set rb_x_next, rb19 -++.set rx_frame_base2_next, rb19 -++ -++.set ra_frame_base, ra24 -++.set ra_frame_base_next, ra26 -+ .set ra_xshift, ra17 -+ -+-.set ra_x2shift, ra25 -+ .set ra_u2v_ref_offset, ra25 -++.set ra_frame_base2, ra25 -+ -+ .set ra_xshift_next, ra19 -++.set rx_xshift2, rb0 -++.set rx_xshift2_next, ra23 -+ -+ .set ra_x2shift_next, ra27 -+ .set ra_u2v_dst_offset, ra27 -+@@ -83,11 +93,11 @@ -+ mov ra31, unif -+ -+ # Load first request location -+-add ra_x_base, unif, elem_num # Store x -++add ra_x, unif, elem_num # Store x -+ mov ra_y, unif # Store y -+-mov ra_x2_base, unif # Store frame u base -++mov ra_frame_base, unif # Store frame u base -+ nop -+-sub ra_u2v_ref_offset, unif, ra_x2_base # Store offset to add to move from u to v in reference frame -++sub ra_u2v_ref_offset, unif, ra_frame_base # Store offset to add to move from u to v in reference frame -+ -+ # Read image dimensions -+ sub rb25,unif,1 -+@@ -104,9 +114,7 @@ add rb24, r1, r0 -+ # load constants -+ -+ mov ra20, 1 -+-mov ra21, 32 -+ mov ra22, 256 -+-mov ra23, 8 -+ mov ra30, 64 -+ -+ mov rb20, 0xffffff00 -+@@ -156,18 +164,18 @@ mov r1, vpm_setup(0, 2, h16p(0, 0)) # 2 is stride - stride acts on ADDR which i -+ add rb21, r0, r1 -+ -+ # Compute base address for first and second access -+-mov r0, ra_x_base # Load x -++mov r0, ra_x # Load x -+ max r0, r0, 0; mov r1, ra_y # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -++min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base # Load the frame base -+ shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+ add ra_y, r1, 1 -+ add r0, r0, r3 -+ and r0, r0, ~3 -+-max r1, r1, 0 ; mov ra_x_base, r0 # y -++max r1, r1, 0 ; mov ra_x, r0 # y -+ min r1, r1, rb_frame_height_minus_1 -+ # submit texture requests for first line -+ add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-add t0s, r0, r1 ; mov ra_x2_base, r2 -++add t0s, r0, r1 ; mov ra_frame_base, r2 -+ add t0s, r2, r1 -+ -+ mov rb12,unif # offset before shift -+@@ -182,8 +190,8 @@ min r1, r1, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 -+ bra -, ra31 -+ nop ; mul24 r1, r1, rb_pitch -+-add t0s, r1, ra_x_base -+-add t0s, r1, ra_x2_base -++add t0s, r1, ra_x -++add t0s, r1, ra_frame_base -+ -+ -+ -+@@ -192,7 +200,7 @@ add t0s, r1, ra_x2_base -+ # mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -+ -+ # At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -++# ra_x, ra_x16_base point to the current coordinates for this block -+ ::mc_filter_uv -+ mov ra31, unif -+ -+@@ -207,9 +215,9 @@ min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+ shl ra_xshift_next, r0, 3 -+ sub r2, unif, r3 # compute offset from frame base u to frame base v -+ add r0, r0, r3 -+-and rb_x_base_next, r0, ~3 -++and rb_x_next, r0, ~3 -+ mov ra_y_next, r1 -+-add ra_x2_base_next, rb_x_base_next, r2 -++add ra_frame_base_next, rb_x_next, r2 -+ -+ # set up VPM write -+ mov vw_setup, rb28 -+@@ -265,16 +273,16 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -+ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -++add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -297,7 +305,7 @@ mov ra13, ra14 # Delay slot 1 -+ mov ra14, ra15 # Delay slot 2 -+ mov ra15, r0 # Delay slot 3 -+ -+-mov rb12,32 -++mov rb12,32 # TODO remove these to make P weighted prediction work properly -+ mov rb13,6 -+ mov rb14,1 -+ mov rb15,0 -+@@ -342,7 +350,7 @@ mov vw_addr, unif # start the VDW -+ # mc_filter_uv_b0(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -+ -+ # At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -++# ra_x, ra_x16_base point to the current coordinates for this block -+ ::mc_filter_uv_b0 -+ mov ra31, unif -+ -+@@ -357,9 +365,9 @@ min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+ shl ra_xshift_next, r0, 3 -+ sub r2, unif, r3 # compute offset from frame base u to frame base v -+ add r0, r0, r3 -+-and rb_x_base_next, r0, ~3 -++and rb_x_next, r0, ~3 -+ mov ra_y_next, r1 -+-add ra_x2_base_next, rb_x_base_next, r2 -++add ra_frame_base_next, rb_x_next, r2 -+ -+ # set up VPM write, we need to save 16bit precision -+ mov vw_setup, rb21 -+@@ -408,16 +416,16 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -+ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -++add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -477,9 +485,9 @@ min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+ shl ra_xshift_next, r0, 3 -+ sub r2, unif, r3 # compute offset from frame base u to frame base v -+ add r0, r0, r3 -+-and rb_x_base_next, r0, ~3 -++and rb_x_next, r0, ~3 -+ mov ra_y_next, r1 -+-add ra_x2_base_next, rb_x_base_next, r2 -++add ra_frame_base_next, rb_x_next, r2 -+ -+ # set up VPM write -+ mov vw_setup, rb28 -+@@ -538,16 +546,16 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -+ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -++add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -642,5 +650,511 @@ nop ; nop ; thrend -+ mov interrupt, 1; nop # delay slot 1 -+ nop ; nop # delay slot 2 -+ -++ -++ -++ -++ -++# LUMA CODE -++ -++# The idea is to form B predictions by doing 8 pixels from ref0 in parallel with 8 pixels from ref1. -++# For P frames we make the second x,y coordinates offset by +8 -++ -++################################################################################ -++# mc_setup(next_kernel, x, y, ref_y_base, x2, y2, ref_y2_base, frame_width, frame_height, pitch, dst_pitch, offset, shift, pad2) -++::mc_setup -++ -++# Read starting kernel -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++mov ra31, unif -++ -++# Compute base address for first and second access -++add r0, unif, elem_num # Load x -++max r0, r0, 0; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl ra_xshift_next, r0, 3 # Compute shifts -++add ra_y, r1, 1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add r2, r2, r0 # r2 is address for frame0 (not including y offset) -++max r1, r1, 0 -++min r1, r1, rb_frame_height_minus_1 -++nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -++add t0s, r2, r1 ; mov ra_frame_base, r2 -++ -++add r0, unif, elem_num # Load x -++max r0, r0, 0; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl rx_xshift2_next, r0, 3 # Compute shifts -++add ra_y2, r1, 1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add r2, r2, r0 # r2 is address for frame1 (not including y offset) -++max r1, r1, 0 -++min r1, r1, rb_frame_height_minus_1 -++nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -++add t0s, r2, r1 ; mov ra_frame_base2, r2 -++ -++ -++# Read image dimensions -++sub rb25,unif,1 -++sub rb30,unif,1 -++ -++# get source pitch -++mov rb16, unif -++ -++# get destination pitch -++mov r0, unif -++mov r1, vdw_setup_1(0) -++add rb24, r1, r0 -++ -++# load constants -++ -++mov ra20, 1 -++mov ra22, 256 -++mov ra30, 64 -++ -++mov rb20, 0xffffff00 -++mov rb22, 255 -++mov rb23, 24 -++ -++# touch vertical context to keep simulator happy -++ -++mov ra8, 0 -++mov ra9, 0 -++mov ra10, 0 -++mov ra11, 0 -++mov ra12, 0 -++mov ra13, 0 -++mov ra14, 0 -++mov ra15, 0 -++ -++# Compute part of VPM to use for DMA output -++mov r2, qpu_num -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++shl r0, r0, 5 -++add rb27, r0, r1 -++ -++# Compute part of VPM to save data into -++mov r2, qpu_num # qpu_num = abcd -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -++add rb28, r0, r1 -++ -++mov rb12,unif # offset before shift -++mov rb13,unif # shift -++ -++# Dump padding words -++mov r0, unif -++ -++# submit texture requests for second line -++max r1, ra_y, 0 -++min r1, r1, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 -++nop ; mul24 r1, r1, rb_pitch -++add t0s, r1, ra_frame_base -++ -++max r1, ra_y2, 0 -++min r1, r1, rb_frame_height_minus_1 -++bra -, ra31 -++add ra_y2, ra_y2, 1 # Delay 1 -++nop ; mul24 r1, r1, rb_pitch # Delay 2 -++add t0s, r1, ra_frame_base2 # Delay 3 -++ -++ -++################################################################################ -++ -++# mc_filter(next_kernel, x, y, frame_base, x2, y2, frame_base2, height, hcoeffs[0], hcoeffs2[0], hcoeffs[1], hcoeffs2[1], vcoeffs[0], vcoeffs2[0], vcoeffs[1], vcoeffs2[1], offsetweight0, offsetweight1, this_dst) -++# In a P block, only the first half of coefficients contain used information. -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x, ra_x16_base point to the current coordinates for this block -++::mc_filter -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov rx_xshift2, rx_xshift2_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # Load x -++max r0, r0, 0; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl ra_xshift_next, r0, 3 # Compute shifts -++mov ra_y_next, r1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add ra_frame_base_next, r2, r0 # r2 is address for frame0 (not including y offset) -++ -++add r0, unif, elem_num # Load x -++max r0, r0, 0 ; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl rx_xshift2_next, r0, 3 # Compute shifts -++add ra_y2_next, r1, 1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -++ -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++# get filter coefficients and discard unused B frame values -++mov r0, unif -++mov.ifnz -, unif # Alternate coefficients are unused for P frames -++asr ra3, r0, rb23; mul24 r0, r0, ra22 # These may need some pre-rotation to be used in B frames correctly -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++mov.ifnz -, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++mov.ifnz -, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++mov.ifnz -, unif -++asr rb7, r0, rb23; mul24 r0, r0, ra22 -++asr rb6, r0, rb23; mul24 r0, r0, ra22 -++asr rb5, r0, rb23; mul24 r0, r0, ra22 -++asr rb4, r0, rb23 -++ -++mov r0, unif # Frame0 offset/weight -++mov.ifnz -, unif # Frame1 offset/weight unused -++asr rb15, r0, r2 # Compute offset from MSBs -++shl r0, r0, r2 -++asr rb14, r0, r2 # Compute weight from LSBs -++ -++# r3 is loop counter -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:yloop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++# If we knew there was no clipping then this code would get simpler. -++# Perhaps we could add on the pitch and clip using larger values? -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, rx_xshift2 -++mov.ifz ra_y2, ra_y2_next -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y2, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++ -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# apply horizontal filter -++nop ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 8 ; mov ra12, ra13 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++brr.anyn -, r:yloop -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -++add r1, r1, r0 ; mul24 r0, ra8, rb4 -++add r1, r1, r0 ; mul24 r0, ra9, rb5 -++add r1, r1, r0 ; mul24 r0, ra10, rb6 -++add r1, r1, r0 ; mul24 r0, ra11, rb7 -++ -++add r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 14 -++nop ; mul24 r1, r1, rb14 -++add r1, r1, rb12 -++asr r1, r1, rb13 -++brr.anyn -, r:yloop -++add r1, r1, rb15 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -++ -++# DMA out -++ -++bra -, ra31 -++mov vw_setup, rb26 # VDW setup 0 Delay 1 -++mov vw_setup, rb29 # Stride Delay 2 -++mov vw_addr, unif # start the VDW Delay 3 -++ -++ -++ -++################################################################################ -++ -++# mc_filter_b(next_kernel, x, y, frame_base, x2, y2, frame_base2, width_height, hcoeffs[0], hcoeffs2[0], hcoeffs[1], hcoeffs2[1], vcoeffs[0], vcoeffs2[0], vcoeffs[1], vcoeffs2[1], offsetweight0, offsetweight1, this_dst) -++# In a P block, only the first half of coefficients contain used information. -++# At this point we have already issued two pairs of texture requests for the current block -++# May be better to just send 16.16 motion vector and figure out the coefficients inside this block (only 4 cases so can compute hcoeffs in around 24 cycles?) -++# Can fill in the coefficients so only -++# Can also assume default weighted prediction for B frames. -++# Perhaps can unpack coefficients in a more efficient manner by doing H/V for a and b at the same time? -++# Or possibly by taking advantage of symmetry? -++# From 19->7 32bits per command. -++::mc_filter_b -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov rx_xshift2, rx_xshift2_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # Load x -++max r0, r0, 0; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl ra_xshift_next, r0, 3 # Compute shifts -++mov ra_y_next, r1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add ra_frame_base_next, r2, r0 # r2 is address for frame0 (not including y offset) -++ -++add r0, unif, elem_num # Load x -++max r0, r0, 0 ; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl rx_xshift2_next, r0, 3 # Compute shifts -++add ra_y2_next, r1, 1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -++ -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++# get filter coefficients and discard unused B frame values -++mov r0, unif -++mov r1, 1 -++mov.ifnz r0, unif # Alternate coefficients are unused for P frames -++nop ; mul24 r0, r0 << 13, r1 << 13 -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 14, r1 << 14 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 15, r1 << 15 # Adjust such that a rotate of 1 will produce the values with first 8 on left, second 8 on right -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++mov.ifnz r0, unif -++nop ; mul24 r0, r0 << 9, r1 << 9 -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 10, r1 << 10 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 11, r1 << 11 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 12, r1 << 12 -++asr ra4, r0, rb23; mov r0, unif -++mov.ifnz r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++mov.ifnz r0, unif -++asr rb7, r0, rb23; mul24 r0, r0, ra22 -++asr rb6, r0, rb23; mul24 r0, r0, ra22 -++asr rb5, r0, rb23; mul24 r0, r0, ra22 -++asr rb4, r0, rb23 -++ -++mov r0, unif # Frame0 offset/weight -++mov.ifnz r0, unif # Frame1 offset/weight unused -++asr rb15, r0, r2 # Compute offset from MSBs -++shl r0, r0, r2 -++asr rb14, r0, r2 # Compute weight from LSBs -++ -++# r3 is loop counter -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:yloopb -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++# If we knew there was no clipping then this code would get simpler. -++# Perhaps we could add on the pitch and clip using larger values? -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, rx_xshift2 -++mov.ifz ra_y2, ra_y2_next -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y2, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++ -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# apply horizontal filter -++nop ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 8 ; mov ra12, ra13 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++brr.anyn -, r:yloopb -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -++add r1, r1, r0 ; mul24 r0, ra8, rb4 -++add r1, r1, r0 ; mul24 r0, ra9, rb5 -++add r1, r1, r0 ; mul24 r0, ra10, rb6 -++add r1, r1, r0 ; mul24 r0, ra11, rb7 -++ -++add r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 14 -++nop ; mul24 r1, r1 << 8, ra20 << 8 # Rotate to align left and right halves -++add r1, r1, ra30 ; mul24 r0, r1, rb14 -++add r1, r1, r0 -++brr.anyn -, r:yloopb -++asr r1, r1, 7 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -++ -++# DMA out -++bra -, ra31 -++mov vw_setup, rb26 # VDW setup 0 Delay 1 -++mov vw_setup, rb29 # Stride Delay 2 -++mov vw_addr, unif # start the VDW Delay 3 -++ -++################################################################################ -++ -++# mc_interrupt_exit12() -++::mc_interrupt_exit12 -++mov -, vw_wait # wait on the VDW -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++mov -,sacq(0) # 1 -++mov -,sacq(0) # 2 -++mov -,sacq(0) # 3 -++mov -,sacq(0) # 4 -++mov -,sacq(0) # 5 -++mov -,sacq(0) # 6 -++mov -,sacq(0) # 7 -++mov -,sacq(0) # 8 -++mov -,sacq(0) # 9 -++mov -,sacq(0) # 10 -++mov -,sacq(0) # 11 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++ -+ ::mc_end -+ # Do not add code here because mc_end must appear after all other code. -+-- -+2.7.4 -+ -+ -+From f2ffe4186fa49cb27579953c276b51728a08a8b5 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 20 May 2015 19:58:30 +0100 -+Subject: [PATCH 42/68] Added support for fast cache flush in deblocker -+ -+--- -+ libavcodec/hevc_filter.c | 44 +- -+ libavcodec/rpi_qpu.c | 6 + -+ libavcodec/rpi_qpu.h | 2 + -+ libavcodec/rpi_shader.c | 1028 +++++++++++++++++++++++++++++--------------- -+ libavcodec/rpi_shader.h | 16 +- -+ libavcodec/rpi_user_vcsm.h | 22 + -+ 6 files changed, 768 insertions(+), 350 deletions(-) -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 92a8271..186317a 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -37,6 +37,11 @@ -+ -+ #include "bit_depth_template.c" -+ -++#ifdef RPI -++#include "rpi_user_vcsm.h" -++#include "rpi_qpu.h" -++#endif -++ -+ #define LUMA 0 -+ #define CB 1 -+ #define CR 2 -+@@ -872,15 +877,46 @@ static void flush_buffer(AVBufferRef *bref) { -+ gpu_cache_flush(p); -+ } -+ -+-static void ff_hevc_flush_chroma(HEVCContext *s) -++// Return Physical address for this image -++static int ff_hevc_buf_base(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ return p->vc & 0x3fffffff; -++} -++ -++static void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -+ { -+ if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -+ s->nal_unit_type == NAL_TSA_N || -+ s->nal_unit_type == NAL_STSA_N || -+ s->nal_unit_type == NAL_RADL_N || -+ s->nal_unit_type == NAL_RASL_N )) { -++#define RPI_FAST_CACHEFLUSH -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ int curr_y = f->progress->data[0]; -++ int sz,base; -++ if (curr_y < 0) curr_y = 0; -++ if (n<=curr_y) return; // Should not happen -++ sz = s->frame->linesize[1] * (n-curr_y); -++ base = s->frame->linesize[1] * curr_y; -++ iocache.s[0].cmd = 3; // Flush L1 cache -++ iocache.s[0].addr = 0; -++ iocache.s[0].size = 0; -++ -++ iocache.s[1].cmd = 2; -++ iocache.s[1].addr = ff_hevc_buf_base(s->frame->buf[1]) + base; -++ iocache.s[1].size = sz; -++ -++ iocache.s[2].cmd = 2; -++ iocache.s[2].addr = ff_hevc_buf_base(s->frame->buf[2]) + base; -++ iocache.s[2].size = sz; -++ -++ vcsm_clean_invalid( gpu_get_mailbox(), &iocache ); -++ -++#else -+ flush_buffer(s->frame->buf[1]); -+ flush_buffer(s->frame->buf[2]); -++#endif -+ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -+ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -+ //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -+@@ -903,7 +939,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x, y - ctb_size); -+ if (s->threads_type & FF_THREAD_FRAME ) { -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s); -++ ff_hevc_flush_chroma(s,&s->ref->tf, y); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y, 0); -+ } -+@@ -912,7 +948,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x , y); -+ if (s->threads_type & FF_THREAD_FRAME ) { -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s); -++ ff_hevc_flush_chroma(s, &s->ref->tf, y + ctb_size); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -+ } -+@@ -922,7 +958,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s); -++ ff_hevc_flush_chroma(s, &s->ref->tf, y + ctb_size - 4); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index f62051f..fd8a276 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -237,6 +237,12 @@ int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) -+ return r; -+ } -+ -++int gpu_get_mailbox(void) -++{ -++ assert(gpu); -++ return gpu->mb; -++} -++ -+ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ { -+ void *tmp = vcsm_lock(p->vcsm_handle); -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 543c84b..88965e5 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -49,4 +49,6 @@ extern int rpi_test_shader(void); -+ extern void rpi_do_block(const unsigned char *in_buffer_vc, int src_pitch, unsigned char *dst_vc, int dst_pitch, unsigned char *dst); -+ extern void rpi_do_block_arm(const unsigned char *in_buffer, int src_pitch, unsigned char *dst, int dst_pitch); -+ -++extern int gpu_get_mailbox(void); -++ -+ #endif -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 3f04d80..9c30e32 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -23,11 +23,11 @@ __attribute__((aligned(8))) -+ unsigned int rpi_shader[] = { -+ // ::mc_setup_uv -+ /* [0x00000000] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000008] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -++/* [0x00000008] */ 0x0c9a0f80, 0x10020427, // add ra_x, unif, elem_num -+ /* [0x00000010] */ 0x15827d80, 0x10020767, // mov ra_y, unif -+-/* [0x00000018] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -++/* [0x00000018] */ 0x15827d80, 0x10020627, // mov ra_frame_base, unif -+ /* [0x00000020] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000028] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -++/* [0x00000028] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_frame_base -+ /* [0x00000030] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+ /* [0x00000038] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+ /* [0x00000040] */ 0x15827d80, 0x10021427, // mov rb16, unif -+@@ -35,360 +35,708 @@ unsigned int rpi_shader[] = { -+ /* [0x00000050] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+ /* [0x00000058] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+ /* [0x00000060] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000068] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+-/* [0x00000070] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x00000078] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x00000080] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -+-/* [0x00000088] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000090] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000098] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x000000a0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x000000a8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x000000b0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x000000b8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x000000c0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x000000c8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x000000d0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x000000d8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000e0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000000e8] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x000000f0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000000f8] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000100] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000108] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000110] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000118] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000120] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000128] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000130] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000138] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000140] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000148] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x00000150] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000158] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000160] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000168] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000170] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000178] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000180] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000188] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000190] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000198] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -+-/* [0x000001a0] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -+-/* [0x000001a8] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -+-/* [0x000001b0] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x000001b8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000001c0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x000001c8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001d0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001d8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001e0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001e8] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x000001f0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001f8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x00000200] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x00000208] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000210] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000218] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000220] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000228] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000230] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000238] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000240] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000248] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000250] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000258] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000068] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000070] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000078] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000080] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000088] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000090] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000098] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000a0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000a8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000b0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000d0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000d8] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x000000e0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000000e8] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000000f0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x000000f8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000100] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000108] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000110] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000118] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000120] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000128] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000130] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000138] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x00000140] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000148] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000150] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000158] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000160] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000168] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000170] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000178] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000180] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000188] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -++/* [0x00000190] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x00000198] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -++/* [0x000001a0] */ 0x15427d80, 0x10020827, // mov r0, ra_x -++/* [0x000001a8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000001b0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -++/* [0x000001b8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000001c0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001c8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001d0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001d8] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -++/* [0x000001e0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001e8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x000001f0] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -++/* [0x000001f8] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x00000200] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000208] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000218] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000220] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000228] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000230] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000238] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000240] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -++/* [0x00000248] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -+ // ::mc_filter_uv -+-/* [0x00000260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000268] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000270] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000278] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000280] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000288] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000290] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000298] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000002a0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000002a8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002b0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002b8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002c0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002c8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002e8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002f0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000340] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000360] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000368] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000370] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000378] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000380] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000388] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000390] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -+-/* [0x00000398] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000003a0] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -+-/* [0x000003a8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000003b0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000258] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000260] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000268] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000270] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000278] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000280] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000288] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000290] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000298] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002a0] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x000002a8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002b0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002b8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002c0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002c8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002d0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002d8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002e0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002e8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002f0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002f8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000300] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000330] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000340] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000350] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000358] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000360] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000368] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000370] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000378] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000380] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -++/* [0x00000388] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000390] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -++/* [0x00000398] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000003a0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003b8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003c0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003c8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003d0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003d8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003e0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003e8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003f0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003f8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000400] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000408] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000410] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000418] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000420] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000428] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000430] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000438] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000440] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000448] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000450] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000458] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000460] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000468] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000470] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000478] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000480] */ 0x00000020, 0xe0021327, // mov rb12,32 -+-/* [0x00000488] */ 0x00000006, 0xe0021367, // mov rb13,6 -+-/* [0x00000490] */ 0x00000001, 0xe00213a7, // mov rb14,1 -+-/* [0x00000498] */ 0x00000000, 0xe00213e7, // mov rb15,0 -+-/* [0x000004a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000004a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000004b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000004b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000004c0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000004c8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000004d0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000004d8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x000004e0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x000004e8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x000004f0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004f8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x00000500] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000508] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000510] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000518] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000520] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000528] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000530] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000538] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000540] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000548] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000550] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000003a8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003b0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x000003b8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x000003c0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003c8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003d0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003d8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003e0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000400] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000420] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000430] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000440] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000448] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000450] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000458] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000460] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000468] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000470] */ 0x00000020, 0xe0021327, // mov rb12,32 -++/* [0x00000478] */ 0x00000006, 0xe0021367, // mov rb13,6 -++/* [0x00000480] */ 0x00000001, 0xe00213a7, // mov rb14,1 -++/* [0x00000488] */ 0x00000000, 0xe00213e7, // mov rb15,0 -++/* [0x00000490] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000498] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000004a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000004a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000004b0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000004b8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000004c0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000004c8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x000004d0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x000004d8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x000004e0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004e8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x000004f0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004f8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000500] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000508] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000510] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000518] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000520] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000528] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000530] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000538] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000540] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x00000558] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000560] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000568] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000570] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000578] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000580] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000588] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000590] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000598] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000005a0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000005a8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000005b0] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x000005b8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000005c0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005c8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000005d0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000005d8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000005e0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000005e8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000005f0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000005f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000600] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000608] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000610] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000618] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000620] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000628] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000630] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000638] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000640] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000648] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000650] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000658] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000660] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000668] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000670] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000678] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000548] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000550] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000558] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000560] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000568] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000570] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000578] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000580] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000588] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000590] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000598] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x000005a0] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x000005a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000005b0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000005c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000005c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000005d0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000005d8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000005e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000005e8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000005f0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005f8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000600] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000608] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000610] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000618] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000620] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000628] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000630] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000638] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000640] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000648] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000650] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000658] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000668] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000680] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000688] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000690] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000698] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000006a0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000006a8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000006b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000006b8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000006c0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000006c8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000006d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000006d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000006e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000006e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000700] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000708] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000710] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000718] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000720] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000728] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000730] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000738] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000740] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000748] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000750] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000758] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000760] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000768] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000770] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x00000778] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000780] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x00000788] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000790] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000798] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000007a0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007b0] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000670] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000678] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x00000680] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000688] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000690] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000698] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000006a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000006a8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000006b0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000006b8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x000006c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000006c8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000006d0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000006d8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006e0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006e8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000006f0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006f8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000700] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000708] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000710] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000718] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000720] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000728] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000730] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000738] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000740] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000748] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000750] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000758] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000760] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000768] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000770] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000778] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000780] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000788] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000790] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000798] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007a0] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x000007b8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000007c0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007c8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007d0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007d8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007e0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007e8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007f0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007f8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000800] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000808] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000810] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000818] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000820] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000828] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000830] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000838] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000840] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000848] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000850] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000858] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000860] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000868] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000870] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000878] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000880] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000888] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000890] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000898] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000008b8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008d0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x000008d8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008e0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008e8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008f0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008f8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000007a8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000007b0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007c0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007c8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007d0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007d8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007e0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007e8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x000007f0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007f8] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000800] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000808] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000810] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000830] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000838] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000858] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000860] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000880] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000888] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000890] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000898] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000008a8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000008c8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008d0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008d8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008e0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008e8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000900] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000908] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000910] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000918] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000920] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000928] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000930] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000938] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000940] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000948] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000950] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000958] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000960] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000968] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000970] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000978] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000980] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000988] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000990] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000998] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x000009a0] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x000009a8] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009b0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009b8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000009c0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000009c8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009d0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009d8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009e0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000a00] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000a08] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000a10] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a18] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a20] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a28] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a30] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a38] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a40] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a48] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a50] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a60] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008f0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008f8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x00000900] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000908] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000910] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000918] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000920] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000928] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000930] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x00000938] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x00000940] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000948] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000950] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000958] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000960] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000968] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000970] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000978] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000980] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000988] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000990] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000998] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009a0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009a8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000009b0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000009b8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009c0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009c8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009d0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009d8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009e0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009e8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000009f0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x000009f8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000a00] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a08] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a10] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a18] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a20] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a28] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a30] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a38] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a40] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a48] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a50] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a58] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a60] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a78] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a80] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a68] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a70] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000aa0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ab0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a98] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000aa0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000aa8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000ac0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ab0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ae0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b10] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b18] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b20] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b28] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b30] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b10] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b18] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b20] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_setup -++/* [0x00000b28] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000b30] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000b38] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000b40] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000b48] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000b50] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000b58] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00000b60] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000b68] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000b70] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000b78] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000b80] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000b88] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -++/* [0x00000b90] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000b98] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000ba0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000ba8] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000bb0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -++/* [0x00000bb8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000bc0] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000bc8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000bd0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000bd8] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000be0] */ 0x8c9e7452, 0x10025e19, // add t0s, r2, r1 ; mov ra_frame_base2, r2 -++/* [0x00000be8] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00000bf0] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00000bf8] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00000c00] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000c08] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000c10] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000c18] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000c20] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000c28] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000c30] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000c38] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000c40] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000c48] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000c50] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00000c58] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00000c60] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00000c68] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00000c70] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00000c78] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00000c80] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00000c88] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000c90] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000c98] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000ca0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000ca8] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000cb0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000cb8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000cc0] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000cc8] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000cd0] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000cd8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000ce0] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000ce8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000cf0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000cf8] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000d00] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000d08] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000d10] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000d18] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000d20] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000d28] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000d30] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000d38] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000d40] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d48] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000d50] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d58] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x00000d60] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -++/* [0x00000d68] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d70] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000d78] */ 0x0c541dc0, 0xd0020567, // add ra_y2, ra_y2, 1 -++/* [0x00000d80] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d88] */ 0x0c667380, 0x10020e27, // add t0s, r1, ra_frame_base2 -++// ::mc_filter -++/* [0x00000d90] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000d98] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000da0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000da8] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -++/* [0x00000db0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000db8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000dc0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000dc8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000dd0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000dd8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000de0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -++/* [0x00000de8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000df0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -++/* [0x00000df8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000e00] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000e08] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -++/* [0x00000e10] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000e18] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x00000e20] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e28] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000e30] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e38] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000e40] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000e48] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000e50] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000e58] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000e60] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000e68] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000e70] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000e78] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000e80] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e88] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000e90] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000e98] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ea0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ea8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000eb0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000eb8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ed0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000ed8] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000ee0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000f00] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000f08] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f10] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f18] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f20] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -++/* [0x00000f28] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000f30] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000f38] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000f40] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000f48] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000f50] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :yloop -++/* [0x00000f58] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000f60] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++/* [0x00000f68] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000f70] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000f78] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00000f80] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00000f88] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000f90] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000f98] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000fa0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00000fa8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x00000fb0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000fb8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x00000fc0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++/* [0x00000fc8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000fd0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000fd8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000fe0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000fe8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000ff0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000ff8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001000] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001008] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001010] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001018] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001020] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001028] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001030] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001038] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001040] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001048] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001050] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001058] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -++/* [0x00001060] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001068] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001070] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001078] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001080] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001088] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001090] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001098] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000010a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000010a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000010b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000010b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000010c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000010c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000010d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000010d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000010e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000010e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000010f0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000010f8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x00001100] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x00001108] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x00001110] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001118] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00001120] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001128] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001130] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001138] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001140] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001148] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_b -++/* [0x00001150] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001158] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001160] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00001168] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -++/* [0x00001170] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00001178] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00001180] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00001188] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00001190] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00001198] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000011a0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -++/* [0x000011a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000011b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -++/* [0x000011b8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x000011c0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x000011c8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -++/* [0x000011d0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000011d8] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x000011e0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000011e8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000011f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000011f8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00001200] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00001208] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00001210] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00001218] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00001220] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00001228] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001230] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001238] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00001240] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001248] */ 0x00000001, 0xe0020867, // mov r1, 1 -++/* [0x00001250] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001258] */ 0x409f3001, 0xd00049e0, // nop ; mul24 r0, r0 << 13, r1 << 13 -++/* [0x00001260] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001268] */ 0x409f2001, 0xd00049e0, // nop ; mul24 r0, r0 << 14, r1 << 14 -++/* [0x00001270] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001278] */ 0x409f1001, 0xd00049e0, // nop ; mul24 r0, r0 << 15, r1 << 15 -++/* [0x00001280] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001288] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00001290] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001298] */ 0x409f7001, 0xd00049e0, // nop ; mul24 r0, r0 << 9, r1 << 9 -++/* [0x000012a0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012a8] */ 0x409f6001, 0xd00049e0, // nop ; mul24 r0, r0 << 10, r1 << 10 -++/* [0x000012b0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012b8] */ 0x409f5001, 0xd00049e0, // nop ; mul24 r0, r0 << 11, r1 << 11 -++/* [0x000012c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012c8] */ 0x409f4001, 0xd00049e0, // nop ; mul24 r0, r0 << 12, r1 << 12 -++/* [0x000012d0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000012d8] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x000012e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00001300] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001308] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001310] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001318] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001320] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -++/* [0x00001328] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001330] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001338] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00001340] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001348] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00001350] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :yloopb -++/* [0x00001358] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001360] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++/* [0x00001368] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00001370] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001378] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00001380] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00001388] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001390] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001398] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000013a0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x000013a8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x000013b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000013b8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x000013c0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++/* [0x000013c8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000013d0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000013d8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000013e0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000013e8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000013f0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000013f8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001400] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001408] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001410] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001418] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001420] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001428] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001430] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001438] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001440] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001448] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001450] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001458] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -++/* [0x00001460] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001468] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001470] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001478] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001480] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001488] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001490] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001498] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000014a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000014a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000014b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000014b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000014c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000014c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000014d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000014d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000014e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000014e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000014f0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000014f8] */ 0x4053800e, 0xd00049e1, // nop ; mul24 r1, r1 << 8, ra20 << 8 -++/* [0x00001500] */ 0x4c78e38f, 0x10024860, // add r1, r1, ra30 ; mul24 r0, r1, rb14 -++/* [0x00001508] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00001510] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001518] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00001520] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001528] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001530] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001538] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001540] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001548] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_interrupt_exit12 -++/* [0x00001550] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001558] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001560] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001568] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001570] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001578] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001580] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001588] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001590] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001598] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000015d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000015e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index cec9901..3fa8531 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,11 +4,15 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 342) -+-#define mc_filter_uv_b (rpi_shader + 494) -+-#define mc_exit (rpi_shader + 670) -+-#define mc_interrupt_exit8 (rpi_shader + 688) -+-#define mc_end (rpi_shader + 718) -++#define mc_filter_uv (rpi_shader + 148) -++#define mc_filter_uv_b0 (rpi_shader + 338) -++#define mc_filter_uv_b (rpi_shader + 490) -++#define mc_exit (rpi_shader + 666) -++#define mc_interrupt_exit8 (rpi_shader + 684) -++#define mc_setup (rpi_shader + 714) -++#define mc_filter (rpi_shader + 868) -++#define mc_filter_b (rpi_shader + 1108) -++#define mc_interrupt_exit12 (rpi_shader + 1364) -++#define mc_end (rpi_shader + 1402) -+ -+ #endif -+diff --git a/libavcodec/rpi_user_vcsm.h b/libavcodec/rpi_user_vcsm.h -+index fbebbbe..95e6de1 100644 -+--- a/libavcodec/rpi_user_vcsm.h -++++ b/libavcodec/rpi_user_vcsm.h -+@@ -418,6 +418,28 @@ int vcsm_unlock_hdl( unsigned int handle ); -+ */ -+ int vcsm_unlock_hdl_sp( unsigned int handle, int cache_no_flush ); -+ -++/* Clean and/or invalidate the memory associated with this user opaque handle -++** -++** Returns: non-zero on error -++** -++** structure contains a list of flush/invalidate commands. Commands are: -++** 0: nop -++** 1: invalidate given physical range in L2 -++** 2: clean given physical range in L2 -++** 3: clean+invalidate all of L1 -++** 4: flush all of L2 and all of L1 -++*/ -++struct vcsm_user_clean_invalid_s { -++ struct { -++ unsigned int cmd; -++ unsigned int addr; -++ unsigned int size; -++ } s[8]; -++}; -++ -++int vcsm_clean_invalid( unsigned int handle, struct vcsm_user_clean_invalid_s *s ); -++ -++ -+ #ifdef __cplusplus -+ } -+ #endif -+-- -+2.7.4 -+ -+ -+From 09685ab55aecb9400e354522894e0fbbb6381ca9 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 20 May 2015 21:12:55 +0100 -+Subject: [PATCH 43/68] Added multi mailbox - not working -+ -+--- -+ libavcodec/hevc.c | 40 ++++++++++++++++++++++++++++--- -+ libavcodec/rpi_mailbox.c | 47 +++++++++++++++++++++++++++++++++++++ -+ libavcodec/rpi_mailbox.h | 5 ++++ -+ libavcodec/rpi_qpu.c | 61 ++++++++++++++++++++++++++++++++++++++++++++---- -+ libavcodec/rpi_qpu.h | 2 ++ -+ 5 files changed, 147 insertions(+), 8 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 951e2d3..ab63efd 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -47,6 +47,11 @@ -+ //#define EARLY_MALLOC -+ // Move Inter prediction into separate pass -+ #define RPI_INTER -++ -++ #ifdef RPI_INTER_QPU -++ // Define RPI_MULTI_MAILBOX to use the updated mailbox that can launch both QPU and VPU -++ #define RPI_MULTI_MAILBOX -++ #endif -+ #endif -+ -+ // #define DISABLE_MC -+@@ -2843,10 +2848,14 @@ static void rpi_inter_clear(HEVCContext *s) -+ static void rpi_execute_inter_qpu(HEVCContext *s) -+ { -+ int k; -++ int i; -+ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -+- -+- if (s->sh.slice_type == I_SLICE) -+- return; -++ if (s->sh.slice_type == I_SLICE) { -++#ifdef RPI_MULTI_MAILBOX -++ rpi_execute_transform(s); -++ return; -++#endif -++ } -+ for(k=0;k<8;k++) { -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+@@ -2856,6 +2865,22 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ -++#ifdef RPI_MULTI_MAILBOX -++ gpu_cache_flush(&s->coeffs_buf_accelerated); -++ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, -++ qpu_get_fn(QPU_MC_SETUP_UV), -++ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ ); -++ for(i=0;i<4;i++) -++ s->num_coeffs[i] = 0; -++#else -+ qpu_run_shader8(qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+@@ -2866,6 +2891,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -+ ); -++#endif -+ } -+ #endif -+ -+@@ -2945,6 +2971,12 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+ // Transform all blocks -+ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -++#ifdef RPI_MULTI_MAILBOX -++ // Kick off inter prediction on QPUs -++ rpi_execute_inter_qpu(s); -++ // Perform luma inter prediction -++ rpi_execute_inter_cmds(s); -++#else -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+@@ -2952,6 +2984,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ // Kick off inter prediction on QPUs -+ rpi_execute_inter_qpu(s); -+ #endif -++#endif -++ -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -+ -+diff --git a/libavcodec/rpi_mailbox.c b/libavcodec/rpi_mailbox.c -+index 77a56dd..3904efc 100644 -+--- a/libavcodec/rpi_mailbox.c -++++ b/libavcodec/rpi_mailbox.c -+@@ -276,6 +276,53 @@ unsigned execute_qpu(int file_desc, unsigned num_qpus, unsigned control, unsigne -+ return p[5]; -+ } -+ -++void execute_multi(int file_desc, -++ unsigned num_qpus, unsigned control, unsigned noflush, unsigned timeout, -++ unsigned num_qpus_2, unsigned control_2, unsigned noflush_2, unsigned timeout_2, -++ unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -++ unsigned code_2, unsigned r0_2, unsigned r1_2, unsigned r2_2, unsigned r3_2, unsigned r4_2, unsigned r5_2) { -++ int i=0; -++ unsigned p[32]; -++ -++ p[i++] = 0; // size -++ p[i++] = 0x00000000; // process request -++ p[i++] = 0x30018; // (the tag id) -++ p[i++] = 88; // (size of the buffer) -++ p[i++] = 88; // (size of the data) -++ -++ p[i++] = num_qpus; -++ p[i++] = control; -++ p[i++] = noflush; -++ p[i++] = timeout; // ms -++ -++ p[i++] = num_qpus_2; -++ p[i++] = control_2; -++ p[i++] = noflush_2; -++ p[i++] = timeout_2; // ms -++ -++ p[i++] = code; -++ p[i++] = r0; -++ p[i++] = r1; -++ p[i++] = r2; -++ p[i++] = r3; -++ p[i++] = r4; -++ p[i++] = r5; -++ -++ p[i++] = code_2; -++ p[i++] = r0_2; -++ p[i++] = r1_2; -++ p[i++] = r2_2; -++ p[i++] = r3_2; -++ p[i++] = r4_2; -++ p[i++] = r5_2; -++ -++ p[i++] = 0x00000000; // end tag -++ p[0] = i*sizeof *p; // actual size -++ -++ mbox_property(file_desc, p); -++ return; -++} -++ -+ int mbox_open() { -+ int file_desc; -+ -+diff --git a/libavcodec/rpi_mailbox.h b/libavcodec/rpi_mailbox.h -+index c264d2e..5898102 100644 -+--- a/libavcodec/rpi_mailbox.h -++++ b/libavcodec/rpi_mailbox.h -+@@ -15,6 +15,11 @@ extern void unmapmem(void *addr, unsigned size); -+ -+ extern unsigned execute_code(int file_desc, unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -+ extern unsigned execute_qpu(int file_desc, unsigned num_qpus, unsigned control, unsigned noflush, unsigned timeout); -++extern void execute_multi(int file_desc, -++ unsigned num_qpus, unsigned control, unsigned noflush, unsigned timeout, -++ unsigned num_qpus_2, unsigned control_2, unsigned noflush_2, unsigned timeout_2, -++ unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -++ unsigned code_2, unsigned r0_2, unsigned r1_2, unsigned r2_2, unsigned r3_2, unsigned r4_2, unsigned r5_2); -+ extern unsigned qpu_enable(int file_desc, unsigned enable); -+ -+ #endif -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index fd8a276..feb3284 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -123,7 +123,7 @@ static pthread_cond_t post_cond_head = PTHREAD_COND_INITIALIZER; -+ static pthread_cond_t post_cond_tail = PTHREAD_COND_INITIALIZER; -+ static pthread_mutex_t post_mutex = PTHREAD_MUTEX_INITIALIZER; -+ -+-static int vpu_cmds[MAXCMDS][8]; -++static int vpu_cmds[MAXCMDS][16]; -+ static volatile int vpu_async_tail=0; // Contains the number of posted jobs -+ static volatile int vpu_async_head=0; -+ #endif -+@@ -346,6 +346,7 @@ unsigned int vpu_get_constants(void) { -+ static void *vpu_start(void *arg) { -+ while(1) { -+ int *p; -++ int qpu_code; -+ pthread_mutex_lock(&post_mutex); -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+@@ -358,12 +359,25 @@ static void *vpu_start(void *arg) { -+ if (p[6] == -1) { -+ break; // Last job -+ } -+- if (p[7]) { -++ qpu_code = p[7]; -++ //if (p[7]) { -+ //GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -+ //gpu_cache_flush(buf); -+- } -+- vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -++ //} -++ if (!qpu_code) { -++ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -++ } else { -++ int i; -++ for(i=0;i<8;i++) { -++ gpu->mail[i*2] = p[8+i]; -++ gpu->mail[i*2 + 1] = qpu_code; -++ } -+ -++ execute_multi(gpu->mb,8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -++ 0, 0, 0, 0, -++ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -++ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -++ } -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+ pthread_cond_broadcast(&post_cond_head); -+@@ -400,7 +414,43 @@ int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned -+ p[4] = r3; -+ p[5] = r4; -+ p[6] = r5; -+- p[7] = (int) buf; -++ p[7] = 0; -++ if (num<=1) -++ pthread_cond_broadcast(&post_cond_tail); // Otherwise the vpu thread must already be awake -++ pthread_mutex_unlock(&post_mutex); -++ return id; -++ } -++} -++ -++int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -++ int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8) -++{ -++ -++ pthread_mutex_lock(&post_mutex); -++ { -++ int id = vpu_async_tail++; -++ int *p = vpu_cmds[id%MAXCMDS]; -++ int num = vpu_async_tail - vpu_async_head; -++ if (num>MAXCMDS) { -++ printf("Too many commands submitted\n"); -++ exit(-1); -++ } -++ p[0] = vpu_code; -++ p[1] = r0; -++ p[2] = r1; -++ p[3] = r2; -++ p[4] = r3; -++ p[5] = r4; -++ p[6] = r5; -++ p[7] = qpu_code; -++ p[8 ] = unifs1; -++ p[9 ] = unifs2; -++ p[10] = unifs3; -++ p[11] = unifs4; -++ p[12] = unifs5; -++ p[13] = unifs6; -++ p[14] = unifs7; -++ p[15] = unifs8; -+ if (num<=1) -+ pthread_cond_broadcast(&post_cond_tail); // Otherwise the vpu thread must already be awake -+ pthread_mutex_unlock(&post_mutex); -+@@ -966,6 +1016,7 @@ void rpi_do_block(const uint8_t *in_buffer_vc, int src_pitch, uint8_t *dst_vc, i -+ } -+ -+ -++ -+ #endif -+ -+ #endif // RPI -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 88965e5..2f08f03 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -41,6 +41,8 @@ extern unsigned int vpu_get_fn(void); -+ extern unsigned int vpu_get_constants(void); -+ extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -+ extern int vpu_post_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf); -++int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -++ int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+ extern void vpu_wait( int id); -+ -+ // Simple test of shader code -+-- -+2.7.4 -+ -+ -+From 311f2da06d13a98d9bdda2df8684d7cf55b9a08e Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 21 May 2015 16:50:02 +0100 -+Subject: [PATCH 44/68] Pass qpu number in as uniform -+ -+--- -+ libavcodec/hevc.c | 2 +- -+ libavcodec/rpi_shader.c | 1288 ++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 20 +- -+ libavcodec/rpi_shader.qasm | 10 +- -+ 4 files changed, 657 insertions(+), 663 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index ab63efd..caadfaa 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2834,6 +2834,7 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = pic_height; -+ *s->u_mvs[i]++ = s->frame->linesize[1]; -+ *s->u_mvs[i]++ = s->frame->linesize[2]; -++ *s->u_mvs[i]++ = i; -+ if (weight_flag) { -+ *s->u_mvs[i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -+ *s->u_mvs[i]++ = s->sh.chroma_log2_weight_denom + 6; -+@@ -2841,7 +2842,6 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = 1 << 5; -+ *s->u_mvs[i]++ = 6; -+ } -+- s->u_mvs[i] += 1; // Padding words -+ } -+ } -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 9c30e32..a0f0282 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -48,8 +48,8 @@ unsigned int rpi_shader[] = { -+ /* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+ /* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+ /* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000d0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000000d8] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x000000d0] */ 0x15827d80, 0x100208e7, // mov r3, unif -++/* [0x000000d8] */ 0x119c17c0, 0xd00208a7, // shl r2, r3, 1 -+ /* [0x000000e0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+ /* [0x000000e8] */ 0x159e7480, 0x10020867, // mov r1, r2 -+ /* [0x000000f0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+@@ -60,669 +60,669 @@ unsigned int rpi_shader[] = { -+ /* [0x00000118] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+ /* [0x00000120] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+ /* [0x00000128] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000130] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000138] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x00000140] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000148] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000150] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000158] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000160] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000168] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000170] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000178] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000180] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000188] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -+-/* [0x00000190] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -+-/* [0x00000198] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -+-/* [0x000001a0] */ 0x15427d80, 0x10020827, // mov r0, ra_x -+-/* [0x000001a8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000001b0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -+-/* [0x000001b8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001c0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001c8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001d0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001d8] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -+-/* [0x000001e0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001e8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x000001f0] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -+-/* [0x000001f8] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000200] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000208] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000218] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000220] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000228] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000230] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000238] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000240] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -+-/* [0x00000248] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x00000130] */ 0x119c17c0, 0xd00208a7, // shl r2, r3, 1 -++/* [0x00000138] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000140] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000148] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000150] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000158] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000160] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000168] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000170] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000178] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000180] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -++/* [0x00000188] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x00000190] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -++/* [0x00000198] */ 0x15427d80, 0x10020827, // mov r0, ra_x -++/* [0x000001a0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000001a8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -++/* [0x000001b0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000001b8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001c0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001c8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001d0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -++/* [0x000001d8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001e0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x000001e8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -++/* [0x000001f0] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x000001f8] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000200] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000208] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000210] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000218] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000220] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000228] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000230] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -++/* [0x00000238] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -+ // ::mc_filter_uv -+-/* [0x00000250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000258] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000260] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000268] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000270] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000278] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000280] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000288] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000290] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x00000298] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002a0] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x000002a8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002b0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002b8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002c0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002c8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002d0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002d8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002e0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002e8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002f0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002f8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000300] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000330] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000340] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000350] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000358] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000360] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000368] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000370] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000378] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000380] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -+-/* [0x00000388] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000390] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -+-/* [0x00000398] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000003a0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000240] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000248] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000250] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000258] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000260] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000268] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000270] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000278] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000280] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000288] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000290] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000298] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002a0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002b0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002b8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002c0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002c8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002d0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002d8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000002f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000002f8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000300] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000308] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000310] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000340] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000348] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000350] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000358] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000360] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000368] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000370] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -++/* [0x00000378] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000380] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -++/* [0x00000388] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000390] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003a8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003b0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x000003b8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x000003c0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003c8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003d0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003d8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003e0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000400] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000420] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000430] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000440] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000448] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000450] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000458] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000460] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000468] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000470] */ 0x00000020, 0xe0021327, // mov rb12,32 -+-/* [0x00000478] */ 0x00000006, 0xe0021367, // mov rb13,6 -+-/* [0x00000480] */ 0x00000001, 0xe00213a7, // mov rb14,1 -+-/* [0x00000488] */ 0x00000000, 0xe00213e7, // mov rb15,0 -+-/* [0x00000490] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000498] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000004a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000004a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000004b0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000004b8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000004c0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000004c8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x000004d0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x000004d8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x000004e0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004e8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x000004f0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004f8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000500] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000508] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000510] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000518] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000520] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000528] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000530] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000538] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000540] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000398] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003a0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x000003a8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x000003b0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003b8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003c0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003c8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003d0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003d8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000003e0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x000003e8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003f0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003f8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000400] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000408] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000410] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000418] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000420] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000428] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000430] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000438] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000440] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000448] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000450] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000458] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000460] */ 0x00000020, 0xe0021327, // mov rb12,32 -++/* [0x00000468] */ 0x00000006, 0xe0021367, // mov rb13,6 -++/* [0x00000470] */ 0x00000001, 0xe00213a7, // mov rb14,1 -++/* [0x00000478] */ 0x00000000, 0xe00213e7, // mov rb15,0 -++/* [0x00000480] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000488] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000490] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000498] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000004a0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000004a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000004b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000004b8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x000004c0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x000004c8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x000004d0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004d8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x000004e0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004e8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000004f0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004f8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000500] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000508] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000510] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000518] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000520] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000528] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000530] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x00000548] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000550] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000558] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000560] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000568] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000570] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000578] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000580] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000588] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x00000590] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000598] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x000005a0] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x000005a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000005b0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000005c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000005c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000005d0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000005d8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000005e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000005e8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000005f0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005f8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000600] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000608] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000610] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000618] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000620] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000628] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000630] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000638] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000640] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000648] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000650] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000658] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000668] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000538] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000540] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000548] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000550] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000558] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000560] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000568] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000570] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000578] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000580] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000588] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000590] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000598] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000005a0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005a8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000005b0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000005b8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000005c0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000005c8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000005d0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000005d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000005e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000005f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005f8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000600] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000608] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000610] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000618] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000620] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000628] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000630] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000638] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000640] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000648] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000650] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000658] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000670] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000678] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x00000680] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000688] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000690] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000698] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000006a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000006a8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000006b0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x000006b8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x000006c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000006c8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000006d0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000006d8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006e0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006e8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000006f0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006f8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000700] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000708] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000710] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000718] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000720] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000728] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000730] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000738] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000740] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000748] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000750] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000758] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000760] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x00000768] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000770] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x00000778] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000780] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000788] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000790] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000798] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007a0] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000660] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000668] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x00000670] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000678] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000680] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000688] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000690] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000698] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000006a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000006a8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x000006b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000006b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000006c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000006c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000006e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000006f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000700] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000708] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000710] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000718] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000720] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000728] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000730] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000738] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000740] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000748] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000750] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000758] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000760] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000768] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000770] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000778] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000780] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000788] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000790] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x000007a8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000007b0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007c0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007c8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007d0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007d8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007e0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007e8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x000007f0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007f8] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x00000800] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000808] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000810] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000830] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000838] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000858] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000860] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000880] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000888] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000890] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000898] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000008a8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x000008c8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008d0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008d8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008e0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008e8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000798] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000007a0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007b8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007c0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007c8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007d8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x000007e0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007e8] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x000007f0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007f8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000800] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000808] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000810] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000818] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000820] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000828] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000830] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000838] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000840] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000848] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000850] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000858] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000860] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000868] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000870] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000878] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000880] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000888] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000890] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000898] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000008b8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008c0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008c8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008d8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008f0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008f8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x00000900] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000908] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000910] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000918] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000920] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000928] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000930] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000938] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x00000940] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000948] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000950] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000958] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000960] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000968] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000970] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000978] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000980] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000988] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000990] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000998] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009a0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009a8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000009b0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000009b8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009c0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009c8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009d0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009d8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009e0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009e8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000009f0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x000009f8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000a00] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a08] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a10] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a18] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a20] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a28] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a30] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a38] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a40] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a48] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a50] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a58] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a60] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008e0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008e8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x000008f0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x000008f8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000900] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000908] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000910] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000918] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000920] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x00000928] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x00000930] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000938] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000940] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000948] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000950] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000958] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000960] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000968] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000970] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000978] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000980] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000988] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000990] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000998] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000009a0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000009a8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009b0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009b8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009c0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009c8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009d0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009d8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000009e0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x000009e8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x000009f0] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009f8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a00] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a08] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a10] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a18] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a20] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a28] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a30] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a38] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a40] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a48] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a50] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a68] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a70] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a58] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a60] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a68] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a70] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a98] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000aa0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000aa8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a88] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a90] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a98] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000ab0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000aa0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000aa8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ab0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ac8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ad0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b10] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b18] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b20] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b00] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b08] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b10] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_setup -+-/* [0x00000b28] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000b30] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000b38] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000b40] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000b48] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000b50] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000b58] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x00000b60] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000b68] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -+-/* [0x00000b70] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000b78] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000b80] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000b88] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -+-/* [0x00000b90] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000b98] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000ba0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000ba8] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x00000bb0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -+-/* [0x00000bb8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000bc0] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -+-/* [0x00000bc8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000bd0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000bd8] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000be0] */ 0x8c9e7452, 0x10025e19, // add t0s, r2, r1 ; mov ra_frame_base2, r2 -+-/* [0x00000be8] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00000bf0] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x00000bf8] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x00000c00] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000c08] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x00000c10] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x00000c18] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000c20] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x00000c28] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -+-/* [0x00000c30] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000c38] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000c40] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00000c48] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x00000c50] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x00000c58] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x00000c60] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x00000c68] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x00000c70] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x00000c78] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x00000c80] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x00000c88] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000c90] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000c98] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000ca0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000ca8] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000cb0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000cb8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000cc0] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000cc8] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000cd0] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000cd8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000ce0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000ce8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000cf0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000cf8] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000d00] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000d08] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000d10] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000d18] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000d20] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000d28] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000d30] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000d38] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000d40] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000d48] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000d50] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000d58] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -+-/* [0x00000d60] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -+-/* [0x00000d68] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000d70] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000d78] */ 0x0c541dc0, 0xd0020567, // add ra_y2, ra_y2, 1 -+-/* [0x00000d80] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000d88] */ 0x0c667380, 0x10020e27, // add t0s, r1, ra_frame_base2 -++/* [0x00000b18] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000b20] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000b28] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000b30] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000b38] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000b40] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000b48] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00000b50] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000b58] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000b60] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000b68] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000b70] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000b78] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -++/* [0x00000b80] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000b88] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000b90] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000b98] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000ba0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -++/* [0x00000ba8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000bb0] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000bb8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000bc0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000bc8] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000bd0] */ 0x8c9e7452, 0x10025e19, // add t0s, r2, r1 ; mov ra_frame_base2, r2 -++/* [0x00000bd8] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00000be0] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00000be8] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00000bf0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000bf8] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000c00] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000c08] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000c10] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000c18] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000c20] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000c28] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000c30] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000c38] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000c40] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00000c48] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00000c50] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00000c58] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00000c60] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00000c68] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00000c70] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00000c78] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000c80] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000c88] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000c90] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000c98] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000ca0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000ca8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000cb0] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000cb8] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000cc0] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000cc8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000cd0] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000cd8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000ce0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000ce8] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000cf0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000cf8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000d00] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000d08] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000d10] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000d18] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000d20] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000d28] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000d30] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d38] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000d40] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d48] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x00000d50] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -++/* [0x00000d58] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d60] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000d68] */ 0x0c541dc0, 0xd0020567, // add ra_y2, ra_y2, 1 -++/* [0x00000d70] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d78] */ 0x0c667380, 0x10020e27, // add t0s, r1, ra_frame_base2 -+ // ::mc_filter -+-/* [0x00000d90] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000d98] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000da0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000da8] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -+-/* [0x00000db0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000db8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000dc0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000dc8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000dd0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000dd8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000de0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -+-/* [0x00000de8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000df0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -+-/* [0x00000df8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000e00] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x00000e08] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -+-/* [0x00000e10] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000e18] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -+-/* [0x00000e20] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000e28] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000e30] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e38] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000e40] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000e48] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000e50] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000e58] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000e60] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000e68] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000e70] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000e78] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000e80] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e88] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000e90] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000e98] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ea0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ea8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000eb0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000eb8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ec0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ec8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ed0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000ed8] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000ee0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000f00] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000f08] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f10] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f18] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f20] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -+-/* [0x00000f28] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000f30] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000f38] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000f40] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000f48] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000f50] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000d80] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000d88] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000d90] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000d98] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -++/* [0x00000da0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000da8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000db0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000db8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000dc0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000dc8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000dd0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -++/* [0x00000dd8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000de0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -++/* [0x00000de8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000df0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000df8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -++/* [0x00000e00] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000e08] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x00000e10] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e18] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000e20] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e28] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000e30] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000e38] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000e40] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000e48] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000e50] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000e58] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000e60] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000e68] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000e70] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e78] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000e80] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000e88] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000e90] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000e98] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000ea0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000ea8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000eb0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000eb8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000ec8] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000ed0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ed8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000ef0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000ef8] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f00] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f08] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f10] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -++/* [0x00000f18] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000f20] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000f28] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000f30] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000f38] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000f40] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :yloop -+-/* [0x00000f58] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000f60] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-/* [0x00000f68] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000f70] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000f78] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -+-/* [0x00000f80] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -+-/* [0x00000f88] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000f90] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000f98] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000fa0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000fa8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -+-/* [0x00000fb0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000fb8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-/* [0x00000fc0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000fc8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000fd0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000fd8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000fe0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000fe8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000ff0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000ff8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00001000] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00001008] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00001010] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00001018] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00001020] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00001028] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00001030] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001038] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001040] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001048] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001050] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001058] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -+-/* [0x00001060] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001068] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001070] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001078] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001080] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -+-/* [0x00001088] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001090] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00001098] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000010a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000010a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000010b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000010b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000010c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-/* [0x000010c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-/* [0x000010d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-/* [0x000010d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -+-/* [0x000010e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000010e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000010f0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000010f8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x00001100] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x00001108] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x00001110] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -+-/* [0x00001118] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x00001120] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00001128] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00001130] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001138] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001140] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001148] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000f48] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000f50] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++/* [0x00000f58] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000f60] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000f68] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00000f70] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00000f78] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000f80] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000f88] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000f90] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00000f98] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x00000fa0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000fa8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x00000fb0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++/* [0x00000fb8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000fc0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000fc8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000fd0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000fd8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000fe0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000fe8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000ff0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000ff8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001000] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001008] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001010] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001018] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001020] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001028] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001030] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001038] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001040] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001048] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -++/* [0x00001050] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001058] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001060] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001068] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001070] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001078] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001080] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001088] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00001090] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00001098] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000010a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000010a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000010b0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000010b8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000010c0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000010c8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000010d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000010d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000010e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000010e8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x000010f0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x000010f8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x00001100] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001108] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00001110] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001118] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001120] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001128] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001130] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001138] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_b -+-/* [0x00001150] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001158] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001160] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00001168] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -+-/* [0x00001170] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00001178] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00001180] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00001188] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00001190] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00001198] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000011a0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -+-/* [0x000011a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000011b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -+-/* [0x000011b8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x000011c0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x000011c8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -+-/* [0x000011d0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000011d8] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -+-/* [0x000011e0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000011e8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000011f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000011f8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00001200] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00001208] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00001210] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00001218] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00001220] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00001228] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001230] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001238] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00001240] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001248] */ 0x00000001, 0xe0020867, // mov r1, 1 -+-/* [0x00001250] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001258] */ 0x409f3001, 0xd00049e0, // nop ; mul24 r0, r0 << 13, r1 << 13 -+-/* [0x00001260] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001268] */ 0x409f2001, 0xd00049e0, // nop ; mul24 r0, r0 << 14, r1 << 14 -+-/* [0x00001270] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001278] */ 0x409f1001, 0xd00049e0, // nop ; mul24 r0, r0 << 15, r1 << 15 -+-/* [0x00001280] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001288] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00001290] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001298] */ 0x409f7001, 0xd00049e0, // nop ; mul24 r0, r0 << 9, r1 << 9 -+-/* [0x000012a0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012a8] */ 0x409f6001, 0xd00049e0, // nop ; mul24 r0, r0 << 10, r1 << 10 -+-/* [0x000012b0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012b8] */ 0x409f5001, 0xd00049e0, // nop ; mul24 r0, r0 << 11, r1 << 11 -+-/* [0x000012c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012c8] */ 0x409f4001, 0xd00049e0, // nop ; mul24 r0, r0 << 12, r1 << 12 -+-/* [0x000012d0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000012d8] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x000012e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00001300] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001308] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001310] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001318] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001320] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -+-/* [0x00001328] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001330] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001338] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00001340] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001348] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00001350] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00001140] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001148] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001150] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00001158] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -++/* [0x00001160] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00001168] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00001170] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00001178] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00001180] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00001188] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00001190] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -++/* [0x00001198] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000011a0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -++/* [0x000011a8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x000011b0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x000011b8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -++/* [0x000011c0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000011c8] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x000011d0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000011d8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000011e0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000011e8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000011f0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000011f8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00001200] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00001208] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00001210] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00001218] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001220] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001228] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00001230] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001238] */ 0x00000001, 0xe0020867, // mov r1, 1 -++/* [0x00001240] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001248] */ 0x409f3001, 0xd00049e0, // nop ; mul24 r0, r0 << 13, r1 << 13 -++/* [0x00001250] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001258] */ 0x409f2001, 0xd00049e0, // nop ; mul24 r0, r0 << 14, r1 << 14 -++/* [0x00001260] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001268] */ 0x409f1001, 0xd00049e0, // nop ; mul24 r0, r0 << 15, r1 << 15 -++/* [0x00001270] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001278] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00001280] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001288] */ 0x409f7001, 0xd00049e0, // nop ; mul24 r0, r0 << 9, r1 << 9 -++/* [0x00001290] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001298] */ 0x409f6001, 0xd00049e0, // nop ; mul24 r0, r0 << 10, r1 << 10 -++/* [0x000012a0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012a8] */ 0x409f5001, 0xd00049e0, // nop ; mul24 r0, r0 << 11, r1 << 11 -++/* [0x000012b0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012b8] */ 0x409f4001, 0xd00049e0, // nop ; mul24 r0, r0 << 12, r1 << 12 -++/* [0x000012c0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000012c8] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x000012d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000012f0] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x000012f8] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001300] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001308] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001310] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -++/* [0x00001318] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001320] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001328] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00001330] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001338] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00001340] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :yloopb -+-/* [0x00001358] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00001360] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-/* [0x00001368] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00001370] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00001378] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -+-/* [0x00001380] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -+-/* [0x00001388] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00001390] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00001398] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000013a0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x000013a8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -+-/* [0x000013b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000013b8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-/* [0x000013c0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -+-/* [0x000013c8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000013d0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000013d8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000013e0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000013e8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000013f0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000013f8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00001400] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00001408] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00001410] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00001418] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00001420] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00001428] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00001430] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001438] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001440] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001448] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001450] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001458] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -+-/* [0x00001460] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001468] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001470] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001478] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001480] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -+-/* [0x00001488] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001490] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00001498] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000014a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000014a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000014b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000014b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000014c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-/* [0x000014c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-/* [0x000014d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-/* [0x000014d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -+-/* [0x000014e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000014e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000014f0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000014f8] */ 0x4053800e, 0xd00049e1, // nop ; mul24 r1, r1 << 8, ra20 << 8 -+-/* [0x00001500] */ 0x4c78e38f, 0x10024860, // add r1, r1, ra30 ; mul24 r0, r1, rb14 -+-/* [0x00001508] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00001510] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloopb -+-/* [0x00001518] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00001520] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00001528] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00001530] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001538] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001540] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001548] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00001348] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001350] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++/* [0x00001358] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00001360] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001368] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00001370] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00001378] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001380] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001388] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00001390] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00001398] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x000013a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000013a8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x000013b0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++/* [0x000013b8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000013c0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000013c8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000013d0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000013d8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000013e0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000013e8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000013f0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000013f8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001400] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001408] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001410] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001418] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001420] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001428] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001430] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001438] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001440] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001448] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -++/* [0x00001450] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001458] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001460] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001468] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001470] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001478] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001480] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001488] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00001490] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00001498] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000014a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000014a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000014b0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000014b8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000014c0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000014c8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000014d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000014d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000014e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000014e8] */ 0x4053800e, 0xd00049e1, // nop ; mul24 r1, r1 << 8, ra20 << 8 -++/* [0x000014f0] */ 0x4c78e38f, 0x10024860, // add r1, r1, ra30 ; mul24 r0, r1, rb14 -++/* [0x000014f8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00001500] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001508] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00001510] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001518] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001520] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001528] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001530] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001538] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_interrupt_exit12 -+-/* [0x00001550] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001540] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001548] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001550] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001558] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001560] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001568] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001570] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001568] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001570] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001578] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001580] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001588] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+@@ -732,11 +732,9 @@ unsigned int rpi_shader[] = { -+ /* [0x000015a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000015b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000015b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000015d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000015e0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000015c0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000015c8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000015d0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 3fa8531..6e552d9 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,15 +4,15 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 148) -+-#define mc_filter_uv_b0 (rpi_shader + 338) -+-#define mc_filter_uv_b (rpi_shader + 490) -+-#define mc_exit (rpi_shader + 666) -+-#define mc_interrupt_exit8 (rpi_shader + 684) -+-#define mc_setup (rpi_shader + 714) -+-#define mc_filter (rpi_shader + 868) -+-#define mc_filter_b (rpi_shader + 1108) -+-#define mc_interrupt_exit12 (rpi_shader + 1364) -+-#define mc_end (rpi_shader + 1402) -++#define mc_filter_uv (rpi_shader + 144) -++#define mc_filter_uv_b0 (rpi_shader + 334) -++#define mc_filter_uv_b (rpi_shader + 486) -++#define mc_exit (rpi_shader + 662) -++#define mc_interrupt_exit8 (rpi_shader + 680) -++#define mc_setup (rpi_shader + 710) -++#define mc_filter (rpi_shader + 864) -++#define mc_filter_b (rpi_shader + 1104) -++#define mc_interrupt_exit12 (rpi_shader + 1360) -++#define mc_end (rpi_shader + 1398) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 9cfc0d9..a0b8e5a 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -133,8 +133,8 @@ mov ra14, 0 -+ mov ra15, 0 -+ -+ # Compute part of VPM to use for DMA output -+-mov r2, qpu_num -+-shl r2, r2, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -++mov r3, unif -++shl r2, r3, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -+ and r2, r2, 15 -+ mov r1, r2 -+ asr r1, r1, 2 -+@@ -147,8 +147,7 @@ shl r0, r0, 5 -+ add rb27, r0, r1 -+ -+ # Compute part of VPM to save data into -+-mov r2, qpu_num # qpu_num = abcd -+-shl r2, r2, 1 -++shl r2, r3, 1 -+ and r2, r2, 15 # r2 = bcd0 -+ mov r1, r2 # r1 = bcd0 -+ asr r1, r1, 2 # r1 = bc -+@@ -181,9 +180,6 @@ add t0s, r2, r1 -+ mov rb12,unif # offset before shift -+ mov rb13,unif # offset after shift -+ -+-# Dump padding words -+-mov r0, unif -+- -+ # submit texture requests for second line -+ max r1, ra_y, 0 -+ min r1, r1, rb_frame_height_minus_1 -+-- -+2.7.4 -+ -+ -+From db6fe49d50e42c444b5833acc6206c0bbfaacef4 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sat, 23 May 2015 13:20:21 +0100 -+Subject: [PATCH 45/68] Add new cache flushing routine -+ -+--- -+ libavcodec/hevc.c | 8 +++-- -+ libavcodec/hevc_filter.c | 39 ++++++++++----------- -+ libavcodec/rpi_qpu.c | 17 +++++++-- -+ libavcodec/rpi_qpu.h | 2 ++ -+ libavcodec/rpi_user_vcsm.h | 86 ++++++++++++++++++++++++++-------------------- -+ 5 files changed, 91 insertions(+), 61 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index caadfaa..9d12583 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3575,9 +3575,13 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) -+ } -+ -+ fail: -+- if (s->ref && s->threads_type == FF_THREAD_FRAME) -++ if (s->ref && s->threads_type == FF_THREAD_FRAME) { -++#ifdef RPI_INTER_QPU -++ void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n); -++ ff_hevc_flush_chroma(s, &s->ref->tf, s->ps.sps->height); -++#endif -+ ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); -+- -++ } -+ return ret; -+ } -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 186317a..ec84e8a 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -883,36 +883,35 @@ static int ff_hevc_buf_base(AVBufferRef *bref) { -+ return p->vc & 0x3fffffff; -+ } -+ -+-static void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -++void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n); -++void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -+ { -+ if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -+ s->nal_unit_type == NAL_TSA_N || -+ s->nal_unit_type == NAL_STSA_N || -+ s->nal_unit_type == NAL_RADL_N || -+ s->nal_unit_type == NAL_RASL_N )) { -+-#define RPI_FAST_CACHEFLUSH -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+- int curr_y = f->progress->data[0]; -++ int curr_y = ((int *)f->progress->data)[0]; -++ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -++ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -+- if (curr_y < 0) curr_y = 0; -+- if (n<=curr_y) return; // Should not happen -+- sz = s->frame->linesize[1] * (n-curr_y); -+- base = s->frame->linesize[1] * curr_y; -+- iocache.s[0].cmd = 3; // Flush L1 cache -+- iocache.s[0].addr = 0; -+- iocache.s[0].size = 0; -+- -+- iocache.s[1].cmd = 2; -+- iocache.s[1].addr = ff_hevc_buf_base(s->frame->buf[1]) + base; -++ if (curr_uv < 0) curr_uv = 0; -++ if (n_uv<=curr_uv) { assert(0); return; } // Should not happen -++ sz = s->frame->linesize[1] * (n_uv-curr_uv); -++ base = s->frame->linesize[1] * curr_uv; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[1]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = p->arm + base; -++ iocache.s[0].size = sz; -++ p = av_buffer_pool_opaque(s->frame->buf[2]); -++ iocache.s[1].handle = p->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = p->arm + base; -+ iocache.s[1].size = sz; -+- -+- iocache.s[2].cmd = 2; -+- iocache.s[2].addr = ff_hevc_buf_base(s->frame->buf[2]) + base; -+- iocache.s[2].size = sz; -+- -+- vcsm_clean_invalid( gpu_get_mailbox(), &iocache ); -+- -++ vcsm_clean_invalid( &iocache ); -+ #else -+ flush_buffer(s->frame->buf[1]); -+ flush_buffer(s->frame->buf[2]); -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index feb3284..aa65a77 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -211,6 +211,7 @@ static void gpu_unlock(void) { -+ } -+ -+ static int gpu_malloc_uncached_internal(int numbytes, GPU_MEM_PTR_T *p, int mb) { -++ p->numbytes = numbytes; -+ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -+ assert(p->vcsm_handle); -+ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -+@@ -243,13 +244,25 @@ int gpu_get_mailbox(void) -+ return gpu->mb; -+ } -+ -++// Call this to clean and invalidate a region of memory -+ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ { -+- void *tmp = vcsm_lock(p->vcsm_handle); -+- vcsm_unlock_ptr(tmp); -++#define RPI_FAST_CACHEFLUSH -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = p->arm; -++ iocache.s[0].size = p->numbytes; -++ vcsm_clean_invalid( &iocache ); -++#else -++ void *tmp = vcsm_lock(p->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++#endif -+ } -+ -+ static int gpu_malloc_cached_internal(int numbytes, GPU_MEM_PTR_T *p) { -++ p->numbytes = numbytes; -+ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 2f08f03..0565a60 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -1,6 +1,8 @@ -+ #ifndef RPI_QPU_H -+ #define RPI_QPU_H -+ -++#define RPI_FAST_CACHEFLUSH -++ -+ typedef struct gpu_mem_ptr_s { -+ unsigned char *arm; // Pointer to memory mapped on ARM side -+ int vc_handle; // Videocore handle of relocatable memory -+diff --git a/libavcodec/rpi_user_vcsm.h b/libavcodec/rpi_user_vcsm.h -+index 95e6de1..db41a4d 100644 -+--- a/libavcodec/rpi_user_vcsm.h -++++ b/libavcodec/rpi_user_vcsm.h -+@@ -1,29 +1,41 @@ -+-/* -+-Copyright (c) 2012, Broadcom Europe 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. -+- * Neither the name of the copyright holder nor the -+- names of its contributors may be used to endorse or promote products -+- derived from this software without specific prior written permission. -+- -+-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -+-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -+-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+-*/ -++/***************************************************************************** -++* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. -++* -++* This program is the proprietary software of Broadcom Corporation and/or -++* its licensors, and may only be used, duplicated, modified or distributed -++* pursuant to the terms and conditions of a separate, written license -++* agreement executed between you and Broadcom (an "Authorized License"). -++* Except as set forth in an Authorized License, Broadcom grants no license -++* (express or implied), right to use, or waiver of any kind with respect to -++* the Software, and Broadcom expressly reserves all rights in and to the -++* Software and all intellectual property rights therein. IF YOU HAVE NO -++* AUTHORIZED LICENSE, THEN YOU HAVE NO RIGHT TO USE THIS SOFTWARE IN ANY -++* WAY, AND SHOULD IMMEDIATELY NOTIFY BROADCOM AND DISCONTINUE ALL USE OF -++* THE SOFTWARE. -++* -++* Except as expressly set forth in the Authorized License, -++* 1. This program, including its structure, sequence and organization, -++* constitutes the valuable trade secrets of Broadcom, and you shall use -++* all reasonable efforts to protect the confidentiality thereof, and to -++* use this information only in connection with your use of Broadcom -++* integrated circuit products. -++* 2. TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -++* AND WITH ALL FAULTS AND BROADCOM MAKES NO PROMISES, REPRESENTATIONS OR -++* WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH -++* RESPECT TO THE SOFTWARE. BROADCOM SPECIFICALLY DISCLAIMS ANY AND ALL -++* IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS -++* FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, -++* QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. YOU -++* ASSUME THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE. -++* 3. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL BROADCOM OR ITS -++* LICENSORS BE LIABLE FOR (i) CONSEQUENTIAL, INCIDENTAL, SPECIAL, INDIRECT, -++* OR EXEMPLARY DAMAGES WHATSOEVER ARISING OUT OF OR IN ANY WAY RELATING TO -++* YOUR USE OF OR INABILITY TO USE THE SOFTWARE EVEN IF BROADCOM HAS BEEN -++* ADVISED OF THE POSSIBILITY OF SUCH DAMAGES; OR (ii) ANY AMOUNT IN EXCESS -++* OF THE AMOUNT ACTUALLY PAID FOR THE SOFTWARE ITSELF OR U.S. $1, WHICHEVER -++* IS GREATER. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF -++* ESSENTIAL PURPOSE OF ANY LIMITED REMEDY. -++*****************************************************************************/ -+ -+ #ifndef __USER_VCSM__H__INCLUDED__ -+ #define __USER_VCSM__H__INCLUDED__ -+@@ -424,21 +436,21 @@ int vcsm_unlock_hdl_sp( unsigned int handle, int cache_no_flush ); -+ ** -+ ** structure contains a list of flush/invalidate commands. Commands are: -+ ** 0: nop -+-** 1: invalidate given physical range in L2 -+-** 2: clean given physical range in L2 -+-** 3: clean+invalidate all of L1 -+-** 4: flush all of L2 and all of L1 -++** 1: invalidate given virtual range in L1/L2 -++** 2: clean given virtual range in L1/L2 -++** 3: clean+invalidate given virtual range in L1/L2 -++** 4: flush all L1/L2 -+ */ -+ struct vcsm_user_clean_invalid_s { -+- struct { -+- unsigned int cmd; -+- unsigned int addr; -+- unsigned int size; -+- } s[8]; -++ struct { -++ unsigned int cmd; -++ unsigned int handle; -++ unsigned int addr; -++ unsigned int size; -++ } s[8]; -+ }; -+ -+-int vcsm_clean_invalid( unsigned int handle, struct vcsm_user_clean_invalid_s *s ); -+- -++int vcsm_clean_invalid( struct vcsm_user_clean_invalid_s *s ); -+ -+ #ifdef __cplusplus -+ } -+-- -+2.7.4 -+ -+ -+From 87a6cb3a4f7189e711c85de6d20077b6453b2ebe Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sat, 23 May 2015 21:10:10 +0100 -+Subject: [PATCH 46/68] Fix multi mailbox extra transform call -+ -+--- -+ libavcodec/hevc.c | 2 ++ -+ 1 file changed, 2 insertions(+) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 9d12583..30f5834 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3024,7 +3024,9 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI_INTER_QPU -+ rpi_execute_inter_qpu(s); -+ #endif -++#ifndef RPI_MULTI_MAILBOX -+ rpi_execute_transform(s); -++#endif -+ rpi_execute_inter_cmds(s); -+ vpu_wait(s->vpu_id); -+ rpi_execute_pred_cmds(s); -+-- -+2.7.4 -+ -+ -+From 2a3672a1bda0296453953bebe8b17d69445260b4 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 27 May 2015 16:44:29 +0100 -+Subject: [PATCH 47/68] Added support for running luma prediction on QPUs -+ -+--- -+ libavcodec/hevc.c | 237 +++++++- -+ libavcodec/hevc.h | 26 +- -+ libavcodec/hevc_filter.c | 23 +- -+ libavcodec/rpi_qpu.c | 156 ++++-- -+ libavcodec/rpi_qpu.h | 8 +- -+ libavcodec/rpi_shader.c | 1313 ++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 21 +- -+ libavcodec/rpi_shader.qasm | 883 ++++++++++++++--------------- -+ 8 files changed, 1464 insertions(+), 1203 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 30f5834..2da88ec 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -52,6 +52,11 @@ -+ // Define RPI_MULTI_MAILBOX to use the updated mailbox that can launch both QPU and VPU -+ #define RPI_MULTI_MAILBOX -+ #endif -++ -++ // Define RPI_CACHE_UNIF_MVS to write motion vector uniform stream to cached memory -++ // RPI_CACHE_UNIF_MVS doesn't seem to make much difference, so left undefined. -++ -++ -+ #endif -+ -+ // #define DISABLE_MC -+@@ -74,6 +79,13 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+ -++// Split image of 2048 into parts 64 wide -++// So some QPUs will have 3 blocks of 64 to do, and others 2 blocks for an image 2048 wide with 32 blocks across -++// Each block of 64*64 -++// Smallest CTU size is 16x16, so smallest block is 8x8 -++// Corresponds to a total of 83kbytes over all 12 QPUs -++#define RPI_LUMA_COMMAND_WORDS 9 -++#define Y_COMMANDS_PER_QPU ((1+3*(64*64)/(8*8)) * RPI_LUMA_COMMAND_WORDS) -+ -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+@@ -2015,10 +2027,46 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref0->frame, -++#ifdef RPI_LUMA_QPU -++ if (s->enable_rpi) { -++ int reflist = 0; -++ const Mv *mv = ¤t_mv.mv[reflist]; -++ int mx = mv->x & 3; -++ int my = mv->y & 3; -++ int my_mx = (my<<8) + mx; -++ int my2_mx2_my_mx = (my_mx << 16) + my_mx; -++ int x1 = x0 + (mv->x >> 2); -++ int y1 = y0 + (mv->y >> 2); -++ int chan = x0>>6; // 64 wide blocks per QPU -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -++ uint32_t *y = s->y_mvs[chan % 12]; -++ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -++ for(int start_x=0;start_x < nPbW;start_x+=16) { -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ *y++ = ( (nPbW<16 ? nPbW : 16) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = my2_mx2_my_mx; -++ if (weight_flag) { -++ *y++ = (s->sh.luma_offset_l0[current_mv.ref_idx[reflist]] << 16) + (s->sh.luma_weight_l0[current_mv.ref_idx[reflist]] & 0xffff); -++ } else { -++ *y++ = 1; // Weight of 1 and offset of 0 -++ } -++ *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -++ } -++ } -++ s->y_mvs[chan % 12] = y; -++ } else -++#endif -++ { -++ RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref0->frame, -+ ¤t_mv.mv[0], x0, y0, nPbW, nPbH, -+ s->sh.luma_weight_l0[current_mv.ref_idx[0]], -+ s->sh.luma_offset_l0[current_mv.ref_idx[0]]); -++ } -+ -+ if (s->ps.sps->chroma_format_idc) { -+ #ifdef RPI_INTER_QPU -+@@ -2078,10 +2126,47 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref1->frame, -++#ifdef RPI_LUMA_QPU -++ if (s->enable_rpi) { -++ int reflist = 1; -++ const Mv *mv = ¤t_mv.mv[reflist]; -++ int mx = mv->x & 3; -++ int my = mv->y & 3; -++ int my_mx = (my<<8) + mx; -++ int my2_mx2_my_mx = (my_mx << 16) + my_mx; -++ int x1 = x0 + (mv->x >> 2); -++ int y1 = y0 + (mv->y >> 2); -++ int chan = x0>>6; // 64 wide blocks per QPU -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -++ uint32_t *y = s->y_mvs[chan % 12]; -++ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -++ for(int start_x=0;start_x < nPbW;start_x+=16) { -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ *y++ = ( (nPbW<16 ? nPbW : 16) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = my2_mx2_my_mx; -++ if (weight_flag) { -++ *y++ = (s->sh.luma_offset_l0[current_mv.ref_idx[reflist]] << 16) + (s->sh.luma_weight_l0[current_mv.ref_idx[reflist]] & 0xffff); -++ } else { -++ *y++ = 1; // Weight of 1 and offset of 0 -++ } -++ *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -++ } -++ } -++ s->y_mvs[chan % 12] = y; -++ } else -++#endif -++ -++ { -++ RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref1->frame, -+ ¤t_mv.mv[1], x0, y0, nPbW, nPbH, -+ s->sh.luma_weight_l1[current_mv.ref_idx[1]], -+ s->sh.luma_offset_l1[current_mv.ref_idx[1]]); -++ } -+ -+ if (s->ps.sps->chroma_format_idc) { -+ #ifdef RPI_INTER_QPU -+@@ -2115,8 +2200,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = rpi_filter_coefs[_mx][0]; -+ *u++ = rpi_filter_coefs[_my][0]; -+ if (weight_flag) { -+- *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[1]][0] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[1]][0] & 0xffff); -+- *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[1]][1] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[1]][1] & 0xffff); -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[reflist]][0] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[reflist]][0] & 0xffff); -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[reflist]][1] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[reflist]][1] & 0xffff); -+ } else { -+ *u++ = 1; // Weight of 1 and offset of 0 -+ *u++ = 1; -+@@ -2143,9 +2228,44 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- RPI_REDIRECT(luma_mc_bi)(s, dst0, s->frame->linesize[0], ref0->frame, -++#ifdef RPI_LUMA_QPU -++ if (s->enable_rpi) { -++ const Mv *mv = ¤t_mv.mv[0]; -++ int mx = mv->x & 3; -++ int my = mv->y & 3; -++ int my_mx = (my<<8) + mx; -++ const Mv *mv2 = ¤t_mv.mv[1]; -++ int mx2 = mv2->x & 3; -++ int my2 = mv2->y & 3; -++ int my2_mx2 = (my2<<8) + mx2; -++ int my2_mx2_my_mx = (my2_mx2 << 16) + my_mx; -++ int x1 = x0 + (mv->x >> 2); -++ int y1 = y0 + (mv->y >> 2); -++ int x2 = x0 + (mv2->x >> 2); -++ int y2 = y0 + (mv2->y >> 2); -++ int chan = x0>>6; // 64 wide blocks per QPU -++ uint32_t *y = s->y_mvs[chan % 12]; -++ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -++ for(int start_x=0;start_x < nPbW;start_x+=8) { // B blocks work 8 at a time -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y2 - 3 + start_y) << 16) + ( (x2 - 3 + start_x) & 0xffff); // Second fetch is for ref1 -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ *y++ = ( (nPbW<8 ? nPbW : 8) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = my2_mx2_my_mx; -++ *y++ = 1; // B frame weighted prediction not supported -++ *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter_b; -++ } -++ } -++ s->y_mvs[chan % 12] = y; -++ } else -++#endif -++ { -++ RPI_REDIRECT(luma_mc_bi)(s, dst0, s->frame->linesize[0], ref0->frame, -+ ¤t_mv.mv[0], x0, y0, nPbW, nPbH, -+ ref1->frame, ¤t_mv.mv[1], ¤t_mv); -++ } -+ -+ if (s->ps.sps->chroma_format_idc) { -+ #ifdef RPI_INTER_QPU -+@@ -2834,7 +2954,6 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = pic_height; -+ *s->u_mvs[i]++ = s->frame->linesize[1]; -+ *s->u_mvs[i]++ = s->frame->linesize[2]; -+- *s->u_mvs[i]++ = i; -+ if (weight_flag) { -+ *s->u_mvs[i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -+ *s->u_mvs[i]++ = s->sh.chroma_log2_weight_denom + 6; -+@@ -2842,7 +2961,31 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = 1 << 5; -+ *s->u_mvs[i]++ = 6; -+ } -++ *s->u_mvs[i]++ = i; // Select section of VPM (avoid collisions with 3d unit) -++ } -++ -++#ifdef RPI_LUMA_QPU -++ for(i=0;i<12;i++) { -++ s->y_mvs[i] = s->y_mvs_base[i]; -++ *s->y_mvs[i]++ = 0; // y_x -++ *s->y_mvs[i]++ = 0; // ref_y_base -++ *s->y_mvs[i]++ = 0; // y2_x2 -++ *s->y_mvs[i]++ = 0; // ref_y2_base -++ *s->y_mvs[i]++ = (s->ps.sps->width << 16) + s->ps.sps->height; -++ *s->y_mvs[i]++ = s->frame->linesize[0]; // pitch -++ *s->y_mvs[i]++ = s->frame->linesize[0]; // dst_pitch -++ if (weight_flag) { -++ int offset = 1 << (s->sh.luma_log2_weight_denom + 6 - 1); -++ int shift = s->sh.luma_log2_weight_denom + 6; -++ *s->y_mvs[i]++ = (offset << 16) + shift; -++ } else { -++ int offset = 1 << 5; -++ int shift = 6; -++ *s->y_mvs[i]++ = (offset << 16) + shift; -++ } -++ *s->y_mvs[i]++ = 0; // Next kernel -+ } -++#endif -+ } -+ -+ static void rpi_execute_inter_qpu(HEVCContext *s) -+@@ -2850,6 +2993,9 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ int k; -+ int i; -+ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -++#ifdef RPI_LUMA_QPU -++ uint32_t *y_unif_vc = (uint32_t *)s->y_unif_mvs_ptr.vc; -++#endif -+ if (s->sh.slice_type == I_SLICE) { -+ #ifdef RPI_MULTI_MAILBOX -+ rpi_execute_transform(s); -+@@ -2865,8 +3011,23 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ -++#ifdef RPI_LUMA_QPU -++ for(k=0;k<12;k++) { -++ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+1] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for second request -++ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ assert(s->y_mvs[k] - s->y_mvs_base[k] < Y_COMMANDS_PER_QPU); -++ } -++ s->y_mvs[12-1][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT12); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++#endif -++ -++ -+ #ifdef RPI_MULTI_MAILBOX -++#ifdef RPI_CACHE_UNIF_MVS -++ gpu_cache_flush3(&s->coeffs_buf_accelerated,&s->y_unif_mvs_ptr, &s->unif_mvs_ptr); -++#else -+ gpu_cache_flush(&s->coeffs_buf_accelerated); -++#endif -+ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+@@ -2876,7 +3037,27 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++#ifdef RPI_LUMA_QPU -++ qpu_get_fn(QPU_MC_SETUP), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[0 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[1 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[2 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[3 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[4 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[5 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[6 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[7 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[8 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[9 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[10 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[11 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)) -++#else -++ 0, -++ 0,0,0,0, -++ 0,0,0,0, -++ 0,0,0,0 -++#endif -+ ); -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+@@ -2892,6 +3073,8 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -+ ); -+ #endif -++ -++ -+ } -+ #endif -+ -+@@ -3579,8 +3762,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) -+ fail: -+ if (s->ref && s->threads_type == FF_THREAD_FRAME) { -+ #ifdef RPI_INTER_QPU -+- void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n); -+- ff_hevc_flush_chroma(s, &s->ref->tf, s->ps.sps->height); -++ ff_hevc_flush_buffer(s, &s->ref->tf, s->ps.sps->height); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); -+ } -+@@ -3767,7 +3949,6 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ -+ #ifdef RPI -+ av_freep(&s->unif_mv_cmds); -+- av_freep(&s->unif_xfm_cmds); -+ av_freep(&s->univ_pred_cmds); -+ -+ #ifdef RPI_INTER_QPU -+@@ -3776,7 +3957,12 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ s->unif_mvs = 0; -+ } -+ #endif -+- //gpu_free(&s->dummy); -++#ifdef RPI_LUMA_QPU -++ if (s->y_unif_mvs) { -++ gpu_free( &s->y_unif_mvs_ptr ); -++ s->y_unif_mvs = 0; -++ } -++#endif -+ -+ #ifdef EARLY_MALLOC -+ printf("hevc_decode_free\n"); -+@@ -3861,9 +4047,6 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->unif_mv_cmds = av_mallocz(sizeof(HEVCMvCmd)*RPI_MAX_MV_CMDS); -+ if (!s->unif_mv_cmds) -+ goto fail; -+- s->unif_xfm_cmds = av_mallocz(sizeof(HEVCXfmCmd)*RPI_MAX_XFM_CMDS); -+- if (!s->unif_xfm_cmds) -+- goto fail; -+ s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -+ if (!s->univ_pred_cmds) -+ goto fail; -+@@ -3877,7 +4060,11 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ { -+ int uv_commands_per_qpu = UV_COMMANDS_PER_QPU; -+ uint32_t *p; -++#ifdef RPI_CACHE_UNIF_MVS -++ gpu_malloc_cached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++#else -+ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++#endif -+ s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -+ -+ // Set up initial locations for uniform streams -+@@ -3892,6 +4079,28 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ -+ } -+ #endif -++#ifdef RPI_LUMA_QPU -++ { -++ int y_commands_per_qpu = Y_COMMANDS_PER_QPU; -++ uint32_t *p; -++#ifdef RPI_CACHE_UNIF_MVS -++ gpu_malloc_cached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr ); -++#else -++ gpu_malloc_uncached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr ); -++#endif -++ s->y_unif_mvs = (uint32_t *) s->y_unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -++ -++ // Set up initial locations for uniform streams -++ p = s->y_unif_mvs; -++ for(i = 0; i < 12; i++) { -++ s->y_mvs_base[i] = p; -++ p += y_commands_per_qpu; -++ } -++ s->mc_filter = qpu_get_fn(QPU_MC_FILTER); -++ s->mc_filter_b = qpu_get_fn(QPU_MC_FILTER_B); -++ -++ } -++#endif -+ //gpu_malloc_uncached(2048*64,&s->dummy); -+ -+ #ifdef EARLY_MALLOC -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 4a39e39..5df9dcd 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -44,9 +44,13 @@ -+ #ifdef RPI -+ -+ #include "rpi_qpu.h" -+- // Use QPU for inter prediction -++ // Define RPI_INTER_QPU to use QPU for chroma inter prediction -+ #define RPI_INTER_QPU -+ -++ #ifdef RPI_INTER_QPU -++ // Define RPI_LUMA_QPU to also use QPU for luma inter prediction -++ #define RPI_LUMA_QPU -++ #endif -+ #endif -+ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+@@ -809,7 +813,6 @@ typedef struct HEVCLocalContext { -+ -+ // Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane, * 2 for bi -+ #define RPI_MAX_MV_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+-#define RPI_MAX_XFM_CMDS (16*3*(RPI_MAX_WIDTH/4)) -+ // Each block can have an intra prediction and a transform_add command -+ #define RPI_MAX_PRED_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+ // Worst case is 16x16 CTUs -+@@ -844,9 +847,6 @@ typedef struct HEVCMvCmd { -+ int8_t ref_idx[2]; -+ } HEVCMvCmd; -+ -+-// Command for transform to process a block of coefficients -+-typedef struct HEVCXfmCmd { -+-} HEVCXfmCmd; -+ -+ // Command for intra prediction and transform_add of predictions to coefficients -+ #define RPI_PRED_TRANSFORM_ADD 0 -+@@ -892,8 +892,7 @@ typedef struct HEVCContext { -+ -+ #ifdef RPI -+ int enable_rpi; -+- HEVCMvCmd *unif_mv_cmds; // TODO rename -+- HEVCXfmCmd *unif_xfm_cmds; -++ HEVCMvCmd *unif_mv_cmds; -+ HEVCPredCmd *univ_pred_cmds; -+ int buf_width; -+ GPU_MEM_PTR_T coeffs_buf_default; -+@@ -920,6 +919,15 @@ typedef struct HEVCContext { -+ uint32_t mc_filter_uv_b0; -+ uint32_t mc_filter_uv_b; -+ #endif -++#ifdef RPI_LUMA_QPU -++ GPU_MEM_PTR_T y_unif_mvs_ptr; -++ uint32_t *y_unif_mvs; // Base of memory for motion vector commands -++ uint32_t *y_mvs_base[12]; -++ uint32_t *y_mvs[12]; -++ // Function pointers -++ uint32_t mc_filter; -++ uint32_t mc_filter_b; -++#endif -+ -+ #endif -+ -+@@ -1166,6 +1174,10 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int log2_trafo_size, enum ScanType scan_idx, -+ int c_idx); -+ -++#ifdef RPI_INTER_QPU -++extern void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n); -++#endif -++ -+ void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size); -+ -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index ec84e8a..11629e4 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -883,8 +883,7 @@ static int ff_hevc_buf_base(AVBufferRef *bref) { -+ return p->vc & 0x3fffffff; -+ } -+ -+-void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n); -+-void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -++void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ { -+ if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -+ s->nal_unit_type == NAL_TSA_N || -+@@ -911,10 +910,24 @@ void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -+ iocache.s[1].cmd = 3; // clean+invalidate -+ iocache.s[1].addr = p->arm + base; -+ iocache.s[1].size = sz; -++ -++#ifdef RPI_LUMA_QPU -++ p = av_buffer_pool_opaque(s->frame->buf[0]); -++ sz = s->frame->linesize[0] * (n-curr_y); -++ base = s->frame->linesize[0] * curr_y; -++ iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = p->arm + base; -++ iocache.s[2].size = sz; -++#endif -+ vcsm_clean_invalid( &iocache ); -+ #else -+ flush_buffer(s->frame->buf[1]); -+ flush_buffer(s->frame->buf[2]); -++#ifdef RPI_LUMA_QPU -++ flush_buffer(s->frame->buf[1]); -++#endif -++ -+ #endif -+ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -+ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -+@@ -938,7 +951,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x, y - ctb_size); -+ if (s->threads_type & FF_THREAD_FRAME ) { -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s,&s->ref->tf, y); -++ ff_hevc_flush_buffer(s,&s->ref->tf, y); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y, 0); -+ } -+@@ -947,7 +960,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x , y); -+ if (s->threads_type & FF_THREAD_FRAME ) { -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s, &s->ref->tf, y + ctb_size); -++ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -+ } -+@@ -957,7 +970,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s, &s->ref->tf, y + ctb_size - 4); -++ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size - 4); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index aa65a77..e12304b 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -1,9 +1,11 @@ -+ #ifdef RPI -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+ // define RPI_TIME_TOTAL_QPU to print out how much time is spent in the QPU code -+-#define RPI_TIME_TOTAL_QPU -++//#define RPI_TIME_TOTAL_QPU -+ // define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -+ //#define RPI_TIME_TOTAL_VPU -++// define RPI_TIME_TOTAL_POSTED to print out how much time is spent in the multi execute QPU/VPU combined -++//#define RPI_TIME_TOTAL_POSTED -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+ #define RPI_ASYNC -+ -+@@ -94,7 +96,8 @@ struct GPU -+ int open_count; // Number of allocated video buffers -+ int mb; // Mailbox handle -+ int vc; // Address in GPU memory -+- int mail[12]; // These are used to pass pairs of code/unifs to the QPUs -++ int mail[12*2]; // These are used to pass pairs of code/unifs to the QPUs for the first QPU task -++ int mail2[12*2]; // These are used to pass pairs of code/unifs to the QPUs for the second QPU task -+ }; -+ -+ // Stop more than one thread trying to allocate memory or use the processing resources at once -+@@ -102,7 +105,7 @@ static pthread_mutex_t gpu_mutex = PTHREAD_MUTEX_INITIALIZER; -+ static volatile struct GPU* gpu = NULL; -+ static GPU_MEM_PTR_T gpu_mem_ptr; -+ -+-#if defined(RPI_TIME_TOTAL_QPU) || defined(RPI_TIME_TOTAL_VPU) -++#if defined(RPI_TIME_TOTAL_QPU) || defined(RPI_TIME_TOTAL_VPU) || defined(RPI_TIME_TOTAL_POSTED) -+ static unsigned int Microseconds(void) { -+ struct timespec ts; -+ unsigned int x; -+@@ -123,7 +126,7 @@ static pthread_cond_t post_cond_head = PTHREAD_COND_INITIALIZER; -+ static pthread_cond_t post_cond_tail = PTHREAD_COND_INITIALIZER; -+ static pthread_mutex_t post_mutex = PTHREAD_MUTEX_INITIALIZER; -+ -+-static int vpu_cmds[MAXCMDS][16]; -++static int vpu_cmds[MAXCMDS][32]; -+ static volatile int vpu_async_tail=0; // Contains the number of posted jobs -+ static volatile int vpu_async_head=0; -+ #endif -+@@ -247,7 +250,6 @@ int gpu_get_mailbox(void) -+ // Call this to clean and invalidate a region of memory -+ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ { -+-#define RPI_FAST_CACHEFLUSH -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ iocache.s[0].handle = p->vcsm_handle; -+@@ -261,6 +263,34 @@ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ #endif -+ } -+ -++void gpu_cache_flush3(GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2) -++{ -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ iocache.s[0].handle = p0->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = (int) p0->arm; -++ iocache.s[0].size = p0->numbytes; -++ iocache.s[1].handle = p1->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = (int) p1->arm; -++ iocache.s[1].size = p1->numbytes; -++ iocache.s[2].handle = p2->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = (int) p2->arm; -++ iocache.s[2].size = p2->numbytes; -++ vcsm_clean_invalid( &iocache ); -++#else -++ void *tmp; -++ tmp = vcsm_lock(p0->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++ tmp = vcsm_lock(p1->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++ tmp = vcsm_lock(p2->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++#endif -++} -++ -+ static int gpu_malloc_cached_internal(int numbytes, GPU_MEM_PTR_T *p) { -+ p->numbytes = numbytes; -+ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); -+@@ -357,9 +387,19 @@ unsigned int vpu_get_constants(void) { -+ #ifdef RPI_ASYNC -+ -+ static void *vpu_start(void *arg) { -++#ifdef RPI_TIME_TOTAL_POSTED -++ int last_time=0; -++ long long on_time=0; -++ long long off_time=0; -++ int start_time; -++ int end_time; -++ int count=0; -++#endif -+ while(1) { -++ int i; -+ int *p; -+ int qpu_code; -++ int qpu_codeb; -+ pthread_mutex_lock(&post_mutex); -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+@@ -373,24 +413,49 @@ static void *vpu_start(void *arg) { -+ break; // Last job -+ } -+ qpu_code = p[7]; -++ qpu_codeb = p[16]; -+ //if (p[7]) { -+ //GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -+ //gpu_cache_flush(buf); -+ //} -++ -++#ifdef RPI_TIME_TOTAL_POSTED -++ start_time = Microseconds(); -++ if (last_time==0) -++ last_time = start_time; -++ off_time += start_time-last_time; -++#endif -++ -+ if (!qpu_code) { -+ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -+ } else { -+- int i; -+ for(i=0;i<8;i++) { -+ gpu->mail[i*2] = p[8+i]; -+ gpu->mail[i*2 + 1] = qpu_code; -+ } -+- -+- execute_multi(gpu->mb,8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+- 0, 0, 0, 0, -++ for(i=0;i<12;i++) { -++ gpu->mail2[i*2] = p[17+i]; -++ gpu->mail2[i*2 + 1] = qpu_codeb; -++ } -++#if (0) -++ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -++ execute_qpu(gpu->mb,8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */); -++#else -++ execute_multi(gpu->mb, -++ 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -+ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -++#endif -+ } -++#ifdef RPI_TIME_TOTAL_POSTED -++ end_time = Microseconds(); -++ last_time = end_time; -++ on_time += end_time - start_time; -++ count++; -++ if ((count&0x7f)==0) -++ printf("Posted %d On=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(off_time/1000)); -++#endif -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+ pthread_cond_broadcast(&post_cond_head); -+@@ -436,7 +501,9 @@ int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned -+ } -+ -+ int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -+- int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8) -++ int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, -++ int qpu_codeb, int unifs1b, int unifs2b, int unifs3b, int unifs4b, int unifs5b, int unifs6b, int unifs7b, int unifs8b, int unifs9b, int unifs10b, int unifs11b, int unifs12b -++ ) -+ { -+ -+ pthread_mutex_lock(&post_mutex); -+@@ -464,6 +531,21 @@ int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, -+ p[13] = unifs6; -+ p[14] = unifs7; -+ p[15] = unifs8; -++ -++ p[16] = qpu_codeb; -++ p[17] = unifs1b; -++ p[18] = unifs2b; -++ p[19] = unifs3b; -++ p[20] = unifs4b; -++ p[21] = unifs5b; -++ p[22] = unifs6b; -++ p[23] = unifs7b; -++ p[24] = unifs8b; -++ p[25] = unifs9b; -++ p[26] = unifs10b; -++ p[27] = unifs11b; -++ p[28] = unifs12b; -++ -+ if (num<=1) -+ pthread_cond_broadcast(&post_cond_tail); // Otherwise the vpu thread must already be awake -+ pthread_mutex_unlock(&post_mutex); -+@@ -544,27 +626,27 @@ void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int un -+ off_time += start_time-last_time; -+ #endif -+ for(i=0;imail[i*2 + 1] = code; -++ gpu->mail2[i*2 + 1] = code; -+ } -+ for(;imail[i*2 + 1] = code2; -++ gpu->mail2[i*2 + 1] = code2; -+ } -+- gpu->mail[0 ] = unifs1; -+- gpu->mail[2 ] = unifs2; -+- gpu->mail[4 ] = unifs3; -+- gpu->mail[6 ] = unifs4; -+- gpu->mail[8 ] = unifs5; -+- gpu->mail[10] = unifs6; -+- gpu->mail[12] = unifs7; -+- gpu->mail[14] = unifs8; -+- gpu->mail[16] = unifs9; -+- gpu->mail[18] = unifs10; -+- gpu->mail[20] = unifs11; -+- gpu->mail[22] = unifs12; -++ gpu->mail2[0 ] = unifs1; -++ gpu->mail2[2 ] = unifs2; -++ gpu->mail2[4 ] = unifs3; -++ gpu->mail2[6 ] = unifs4; -++ gpu->mail2[8 ] = unifs5; -++ gpu->mail2[10] = unifs6; -++ gpu->mail2[12] = unifs7; -++ gpu->mail2[14] = unifs8; -++ gpu->mail2[16] = unifs9; -++ gpu->mail2[18] = unifs10; -++ gpu->mail2[20] = unifs11; -++ gpu->mail2[22] = unifs12; -+ execute_qpu( -+ gpu->mb, -+ 12 /* Number of QPUs */, -+- gpu->vc + offsetof(struct GPU, mail), -++ gpu->vc + offsetof(struct GPU, mail2), -+ 1 /* no flush */, // Don't flush VPU L1 cache -+ 5000 /* timeout ms */); -+ #ifdef RPI_TIME_TOTAL_QPU -+@@ -635,21 +717,21 @@ unsigned int qpu_get_fn(int num) { -+ gpu_unlock(); -+ } -+ switch(num) { -+- //case QPU_MC_SETUP: -+- // fn = mc_setup; -+- // break; -+- //case QPU_MC_FILTER: -+- // fn = mc_filter; -+- // break; -++ case QPU_MC_SETUP: -++ fn = mc_setup; -++ break; -++ case QPU_MC_FILTER: -++ fn = mc_filter; -++ break; -+ case QPU_MC_EXIT: -+ fn = mc_exit; -+ break; -+- //case QPU_MC_INTERRUPT_EXIT: -+- // fn = mc_interrupt_exit; -+- // break; -+- //case QPU_MC_FILTER_B: -+- // fn = mc_filter_b; -+- // break; -++ case QPU_MC_INTERRUPT_EXIT12: -++ fn = mc_interrupt_exit12; -++ break; -++ case QPU_MC_FILTER_B: -++ fn = mc_filter_b; -++ break; -+ //case QPU_MC_FILTER_HONLY: -+ // fn = mc_filter_honly; -+ // break; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 0565a60..81c2bb1 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -1,6 +1,7 @@ -+ #ifndef RPI_QPU_H -+ #define RPI_QPU_H -+ -++// Define RPI_FAST_CACHEFLUSH to use the VCSM cache flush code -+ #define RPI_FAST_CACHEFLUSH -+ -+ typedef struct gpu_mem_ptr_s { -+@@ -16,6 +17,7 @@ extern int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p); -+ extern int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p); -+ extern void gpu_free(GPU_MEM_PTR_T *p); -+ extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -++extern void gpu_cache_flush3(GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -+ -+ // QPU specific functions -+ extern void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+@@ -26,7 +28,7 @@ enum { -+ QPU_MC_SETUP, -+ QPU_MC_FILTER, -+ QPU_MC_EXIT, -+- QPU_MC_INTERRUPT_EXIT, -++ QPU_MC_INTERRUPT_EXIT12, -+ QPU_MC_FILTER_B, -+ QPU_MC_FILTER_HONLY, -+ QPU_MC_SETUP_UV, -+@@ -44,7 +46,9 @@ extern unsigned int vpu_get_constants(void); -+ extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -+ extern int vpu_post_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf); -+ int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -+- int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -++ int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, -++ int qpu_codeb, int unifs1b, int unifs2b, int unifs3b, int unifs4b, int unifs5b, int unifs6b, int unifs7b, int unifs8b, int unifs9b, int unifs10b, int unifs11b, int unifs12b -++ ); -+ extern void vpu_wait( int id); -+ -+ // Simple test of shader code -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index a0f0282..e86eb30 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -48,693 +48,674 @@ unsigned int rpi_shader[] = { -+ /* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+ /* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+ /* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000d0] */ 0x15827d80, 0x100208e7, // mov r3, unif -+-/* [0x000000d8] */ 0x119c17c0, 0xd00208a7, // shl r2, r3, 1 -+-/* [0x000000e0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000000e8] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000000f0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x000000f8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000100] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000108] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000110] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000118] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000120] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000128] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000130] */ 0x119c17c0, 0xd00208a7, // shl r2, r3, 1 -+-/* [0x00000138] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000140] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000148] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000150] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000158] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000160] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000168] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000170] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000178] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000180] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -+-/* [0x00000188] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -+-/* [0x00000190] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -+-/* [0x00000198] */ 0x15427d80, 0x10020827, // mov r0, ra_x -+-/* [0x000001a0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000001a8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -+-/* [0x000001b0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001b8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001c0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001c8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001d0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -++/* [0x000000d0] */ 0x15427d80, 0x10020827, // mov r0, ra_x -++/* [0x000000d8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000000e0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -++/* [0x000000e8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000000f0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000000f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000100] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000108] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -++/* [0x00000110] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000118] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x00000120] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -++/* [0x00000128] */ 0x0c9e7440, 0x10020f27, // add t1s, r2, r1 -++/* [0x00000130] */ 0x00000008, 0xe00208a7, // mov r2,8 -++/* [0x00000138] */ 0x11827c80, 0x10021327, // shl rb12,unif, r2 -++/* [0x00000140] */ 0x0c827c80, 0x10021367, // add rb13,unif,r2 -++/* [0x00000148] */ 0x15827d80, 0x100208a7, // mov r2, unif -++/* [0x00000150] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x00000158] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000160] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000168] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000170] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000178] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000180] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000188] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000190] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000198] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x000001a0] */ 0x0f9c11c0, 0xd00208a7, // asr r2, r0, 1 -++/* [0x000001a8] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x000001b0] */ 0x0c9e7440, 0x10021567, // add rb21, r2, r1 -++/* [0x000001b8] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x000001c0] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x000001c8] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x000001d0] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+ /* [0x000001d8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001e0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x000001e8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -+-/* [0x000001f0] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x000001f8] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000200] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000208] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000210] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000218] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000220] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000228] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000230] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -+-/* [0x00000238] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x000001e0] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x000001e8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000001f0] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x000001f8] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -++/* [0x00000200] */ 0x0c627380, 0x10020f27, // add t1s, r1, ra_frame_base -+ // ::mc_filter_uv -+-/* [0x00000240] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000248] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000250] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000258] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000260] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000268] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000270] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000278] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000280] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x00000288] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000290] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x00000298] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002a0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002b0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002b8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002c0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002c8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002d0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002d8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000002f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000002f8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000300] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000308] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000310] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000340] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000348] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000350] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000358] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000360] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000368] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000370] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -+-/* [0x00000378] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000380] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -+-/* [0x00000388] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000390] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000208] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000210] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000218] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000220] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000228] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000230] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000238] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000240] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000248] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000250] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000258] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000260] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000268] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000270] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000278] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000280] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000288] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000290] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000298] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002a0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002a8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002b0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000002b8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000002c0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002c8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002d0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002d8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002e0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000002e8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002f0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002f8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000300] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000308] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000310] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000318] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000320] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000328] */ 0x0f9e7080, 0x100208e7, // asr r3, r0, r2 -++/* [0x00000330] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000338] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -++/* [0x00000340] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000348] */ 0x0f9e7080, 0x100608e7, // asr.ifnz r3, r0, r2 -++/* [0x00000350] */ 0x119c87c0, 0xd00213a7, // shl rb14,r3,8 -++/* [0x00000358] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000398] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003a0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x000003a8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x000003b0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003b8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003c0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003c8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003d0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003d8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003e0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x000003e8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003f0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003f8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000400] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000408] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000410] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000418] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000420] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000428] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000430] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000438] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000440] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000448] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000450] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000458] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000460] */ 0x00000020, 0xe0021327, // mov rb12,32 -+-/* [0x00000468] */ 0x00000006, 0xe0021367, // mov rb13,6 -+-/* [0x00000470] */ 0x00000001, 0xe00213a7, // mov rb14,1 -+-/* [0x00000478] */ 0x00000000, 0xe00213e7, // mov rb15,0 -+-/* [0x00000480] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000488] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000490] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000498] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000004a0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000004a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000004b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000004b8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x000004c0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x000004c8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x000004d0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004d8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x000004e0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004e8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000004f0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000004f8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000500] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000508] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000510] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000518] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000520] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000528] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000530] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000360] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000368] */ 0x8e4539bf, 0xb0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -++/* [0x00000370] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000378] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000380] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000388] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000390] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000398] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000003a8] */ 0x0c627c80, 0x10020f27, // add t1s, ra_frame_base, r2 -++/* [0x000003b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000003c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000003d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000003d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000003e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000003e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000003f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000003f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000400] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000408] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000410] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000418] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000420] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000428] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000430] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000438] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000440] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000448] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000450] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000458] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000460] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x00000468] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x00000470] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x00000478] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000480] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00000488] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000490] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000498] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004a0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004a8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004b0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004b8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004c0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004c8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000004d0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004d8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x00000538] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000540] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000548] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000550] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000558] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000560] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000568] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000570] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000578] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x00000580] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000588] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x00000590] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000598] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000005a0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005a8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000005b0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000005b8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000005c0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000005c8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000005d0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000005d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000005e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005f8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000600] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000608] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000610] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000618] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000620] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000628] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000630] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000638] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000640] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000648] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000650] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000658] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000004e0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000004e8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000004f0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000004f8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000500] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000508] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000510] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000518] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000520] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000528] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000530] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000538] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000540] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000548] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000550] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000558] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000560] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000568] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000570] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000578] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000580] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000588] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000590] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000598] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005a0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005a8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005b0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005b8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005c0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d8] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000005e0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005e8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005f0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000005f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000600] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000660] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000668] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x00000670] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000678] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000680] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000688] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000690] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000698] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000006a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x000006a8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x000006b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000006b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000006c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000006c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000006e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000006f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000006f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000700] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000708] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000710] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000718] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000720] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000728] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000730] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000738] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000740] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000748] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000750] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x00000758] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000760] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x00000768] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000770] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000778] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000780] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000788] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000790] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000608] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000610] */ 0x8e4539bf, 0xb0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -++/* [0x00000618] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000620] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000628] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000630] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000638] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000640] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000648] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x00000650] */ 0x0c627c80, 0x10020f27, // add t1s, ra_frame_base, r2 -++/* [0x00000658] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000660] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000668] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000670] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000678] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000680] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000688] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000690] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000698] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006a0] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x000006a8] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x000006b0] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006c0] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000006c8] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000006d0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000006d8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000006e0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000006e8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000006f0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000006f8] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000700] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000708] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000710] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000718] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000720] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000728] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000730] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000738] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x00000798] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000007a0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007b8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007c0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007c8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007d8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x000007e0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007e8] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x000007f0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000007f8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000800] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000808] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000810] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000818] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000820] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000828] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000830] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000838] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000840] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000848] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000850] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000858] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000860] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000868] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000870] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000878] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000880] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000888] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000890] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000898] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x000008b8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008c0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008c8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008d8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000740] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000748] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000750] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000758] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000760] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000768] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000770] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000778] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000780] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000788] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000790] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000798] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007a0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000007a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007b0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000007b8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000007c0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000007c8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000007d0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000007d8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000007e0] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000007e8] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000007f0] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x000007f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000800] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000808] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000810] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000818] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000820] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000828] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000830] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000838] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000840] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000848] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000850] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000858] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000860] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000868] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000870] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000878] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000880] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008e0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008e8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x000008f0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x000008f8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000900] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000908] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000910] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000918] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000920] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000928] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x00000930] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000938] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000940] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000948] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000950] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000958] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000960] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000968] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000970] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000978] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000980] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000988] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000990] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000998] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000009a0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000009a8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009b0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009b8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009c0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009c8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009d0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009d8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000009e0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x000009e8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x000009f0] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009f8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a00] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a08] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a10] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a18] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a20] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a28] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a30] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a38] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a40] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a48] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a50] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000888] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000890] */ 0x8e4539bf, 0xb0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -++/* [0x00000898] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x000008a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000008a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000008b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000008b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000008c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000008c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000008d0] */ 0x0c627c80, 0x10020f27, // add t1s, ra_frame_base, r2 -++/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000008e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000008f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000008f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000900] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000908] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000910] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000918] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000920] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000928] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000930] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000938] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000940] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000948] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000950] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000958] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000960] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000968] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000970] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000978] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000980] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000988] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000990] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000998] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009a0] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x000009a8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000009b0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000009b8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000009c0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009c8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009d0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000009e0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000009e8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000009f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a58] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a60] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000a68] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a70] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a88] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a90] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a98] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a08] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a18] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00000a20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a28] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00000a30] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a38] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a40] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000aa0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000aa8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ab0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ad0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b00] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b08] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b10] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a48] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a58] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00000a60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a68] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00000a70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000aa0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ab0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_setup -+-/* [0x00000b18] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000b20] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000b28] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000b30] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000b38] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000b40] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000b48] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x00000b50] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000b58] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -+-/* [0x00000b60] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000b68] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000b70] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000b78] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -+-/* [0x00000b80] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000b88] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000b90] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000b98] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x00000ba0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -+-/* [0x00000ba8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000bb0] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -+-/* [0x00000bb8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000bc0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000bc8] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000bd0] */ 0x8c9e7452, 0x10025e19, // add t0s, r2, r1 ; mov ra_frame_base2, r2 -+-/* [0x00000bd8] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00000be0] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x00000be8] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x00000bf0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000bf8] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x00000c00] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x00000c08] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000c10] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x00000c18] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -+-/* [0x00000c20] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000c28] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000c30] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00000c38] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x00000c40] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x00000c48] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x00000c50] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x00000c58] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x00000c60] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x00000c68] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x00000c70] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x00000c78] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000c80] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000c88] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000c90] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000c98] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000ca0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000ca8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000cb0] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000cb8] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000cc0] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000cc8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000cd0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000cd8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000ce0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000ce8] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000cf0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000cf8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000d00] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000d08] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000d10] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000d18] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000d20] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000d28] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000d30] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000d38] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000d40] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000d48] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -+-/* [0x00000d50] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -+-/* [0x00000d58] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000d60] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000ac0] */ 0x00000010, 0xe00208e7, // mov r3, 16 -++/* [0x00000ac8] */ 0x15827d80, 0x10020227, // mov ra8, unif -++/* [0x00000ad0] */ 0x15827d80, 0x10020267, // mov ra9, unif -++/* [0x00000ad8] */ 0x15827d80, 0x100202a7, // mov ra10, unif -++/* [0x00000ae0] */ 0x15827d80, 0x100202e7, // mov ra11, unif -++/* [0x00000ae8] */ 0x15827d80, 0x10020867, // mov r1, unif -++/* [0x00000af0] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000af8] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000b00] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000b08] */ 0x0d9c13c0, 0xd0021667, // sub rb_frame_width_minus_1,r1,1 -++/* [0x00000b10] */ 0x0d9c11c0, 0xd00217a7, // sub rb_frame_height_minus_1,r0,1 -++/* [0x00000b18] */ 0x15827d80, 0x10021427, // mov rb_pitch, unif -++/* [0x00000b20] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b28] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000b30] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000b38] */ 0x15227d80, 0x10020867, // mov r1, ra8 -++/* [0x00000b40] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000b48] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000b50] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000b58] */ 0x0c9a7180, 0x10020827, // add r0, r0, elem_num -++/* [0x00000b60] */ 0x139c01c0, 0xd0020827, // max r0, r0, 0 -++/* [0x00000b68] */ 0x922591f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, ra9 -++/* [0x00000b70] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000b78] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00000b80] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000b88] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000b90] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000b98] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000ba0] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000ba8] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -++/* [0x00000bb0] */ 0x152a7d80, 0x10020867, // mov r1, ra10 -++/* [0x00000bb8] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000bc0] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000bc8] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000bd0] */ 0x0c9a7180, 0x10020827, // add r0, r0, elem_num -++/* [0x00000bd8] */ 0x139c01c0, 0xd0020827, // max r0, r0, 0 -++/* [0x00000be0] */ 0x922d91f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, ra11 -++/* [0x00000be8] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000bf0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -++/* [0x00000bf8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000c00] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000c08] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000c10] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000c18] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000c20] */ 0x8c9e7452, 0x10025f19, // add t1s, r2, r1 ; mov ra_frame_base2, r2 -++/* [0x00000c28] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000c30] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000c38] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000c40] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000c48] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000c50] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000c58] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000c60] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00000c68] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00000c70] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00000c78] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00000c80] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00000c88] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00000c90] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00000c98] */ 0x00004000, 0xe00204a7, // mov ra18, 0x4000 -++/* [0x00000ca0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000ca8] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000cb0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000cb8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000cc0] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000cc8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000cd0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000cd8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000ce0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000ce8] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000cf0] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000cf8] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000d00] */ 0x15827d80, 0x10020867, // mov r1, unif -++/* [0x00000d08] */ 0x919c82ff, 0xd0024822, // shl r0,r1,r3 ; mov r2,8 -++/* [0x00000d10] */ 0x0f9e70c0, 0x10021367, // asr rb13,r0,r3 -++/* [0x00000d18] */ 0x0f9e72c0, 0x10021327, // asr rb12,r1,r3 -++/* [0x00000d20] */ 0x0c9cde80, 0x10021367, // add rb13,rb13,r2 -++/* [0x00000d28] */ 0x119cce80, 0x10021327, // shl rb12, rb12, r2 -++/* [0x00000d30] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000d38] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d40] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000d48] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d50] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x00000d58] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -++/* [0x00000d60] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+ /* [0x00000d68] */ 0x0c541dc0, 0xd0020567, // add ra_y2, ra_y2, 1 -+ /* [0x00000d70] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000d78] */ 0x0c667380, 0x10020e27, // add t0s, r1, ra_frame_base2 -+-// ::mc_filter -++/* [0x00000d78] */ 0x0c667380, 0x10020f27, // add t1s, r1, ra_frame_base2 -++// :per_block_setup -+ /* [0x00000d80] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ /* [0x00000d88] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+ /* [0x00000d90] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+ /* [0x00000d98] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -+-/* [0x00000da0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000da8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000db0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000db8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000dc0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000dc8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000dd0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -+-/* [0x00000dd8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000de0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -+-/* [0x00000de8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000df0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x00000df8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -+-/* [0x00000e00] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000e08] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -+-/* [0x00000e10] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000e18] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000e20] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e28] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000e30] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000e38] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000e40] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000e48] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000e50] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000e58] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000e60] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000e68] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000e70] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e78] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000e80] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000e88] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000e90] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000e98] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000ea0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000ea8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000eb0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000eb8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ec0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000ec8] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000ed0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ed8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000ef0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000ef8] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f00] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f08] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000da0] */ 0x00000010, 0xe00208e7, // mov r3, 16 -++/* [0x00000da8] */ 0x15827d80, 0x10020867, // mov r1, unif -++/* [0x00000db0] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000db8] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000dc0] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000dc8] */ 0x0c9a7180, 0x10020827, // add r0, r0, elem_num -++/* [0x00000dd0] */ 0x139c01c0, 0xd0020827, // max r0, r0, 0 -++/* [0x00000dd8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000de0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000de8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000df0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000df8] */ 0x8c827436, 0x100246a1, // add ra_frame_base_next, r2, r0 ; mov r1, unif -++/* [0x00000e00] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000e08] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000e10] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000e18] */ 0x0c9a7180, 0x10020827, // add r0, r0, elem_num -++/* [0x00000e20] */ 0x139c01c0, 0xd0020827, // max r0, r0, 0 -++/* [0x00000e28] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000e30] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000e38] */ 0x159e7240, 0x10021067, // mov ra_y2_next, r1 -++/* [0x00000e40] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000e48] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x00000e50] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e58] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e60] */ 0x0e9e70c0, 0x10020867, // shr r1, r0, r3 -++/* [0x00000e68] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000e70] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000e78] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000e80] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000e88] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000e90] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000e98] */ 0x119e70c0, 0x10020827, // shl r0, r0, r3 -++/* [0x00000ea0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000ea8] */ 0x95801dbf, 0xd0024821, // mov r0, unif ; mov r1,1 -++/* [0x00000eb0] */ 0x4f5971c6, 0x10024260, // asr ra9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000eb8] */ 0x4f5971c6, 0x10024220, // asr ra8, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec0] */ 0x4f5971c6, 0x10044260, // asr.ifz ra9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec8] */ 0x0f9d71c0, 0x10040227, // asr.ifz ra8, r0, rb23 -++/* [0x00000ed0] */ 0x0d243f80, 0xd0020267, // sub ra9,3,ra9 -++/* [0x00000ed8] */ 0x0d203f80, 0xd0020227, // sub ra8,3,ra8 -++/* [0x00000ee0] */ 0x11243dc0, 0xd0020267, // shl ra9,ra9,3 -++/* [0x00000ee8] */ 0x11203dc0, 0xd0020227, // shl ra8,ra8,3 -++/* [0x00000ef0] */ 0x00ffff00, 0xe0020867, // mov r1,0xffff00 -++/* [0x00000ef8] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000f00] */ 0x0f9d71c0, 0x10020027, // asr ra0, r0, rb23 -++/* [0x00000f08] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -+ /* [0x00000f10] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -+-/* [0x00000f18] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000f20] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000f28] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000f30] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000f38] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000f40] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000f18] */ 0x01040400, 0xe0020867, // mov r1,0x1040400 -++/* [0x00000f20] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000f28] */ 0x0f9d71c0, 0x10020067, // asr ra1, r0, rb23 -++/* [0x00000f30] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000f38] */ 0x0f9d71c0, 0x10021167, // asr rb5, r0, rb23 -++/* [0x00000f40] */ 0xfbf5f600, 0xe0020867, // mov r1,0xfbf5f600 -++/* [0x00000f48] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000f50] */ 0x0f9d71c0, 0x100200a7, // asr ra2, r0, rb23 -++/* [0x00000f58] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000f60] */ 0x0f9d71c0, 0x100211a7, // asr rb6, r0, rb23 -++/* [0x00000f68] */ 0x11283a40, 0xe0020867, // mov r1,0x11283a40 -++/* [0x00000f70] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000f78] */ 0x0f9d71c0, 0x100200e7, // asr ra3, r0, rb23 -++/* [0x00000f80] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000f88] */ 0x0f9d71c0, 0x100211e7, // asr rb7, r0, rb23 -++/* [0x00000f90] */ 0x3a281100, 0xe0020867, // mov r1,0x3a281100 -++/* [0x00000f98] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000fa0] */ 0x0f9d71c0, 0x10020127, // asr ra4, r0, rb23 -++/* [0x00000fa8] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000fb0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000fb8] */ 0xf6f5fb00, 0xe0020867, // mov r1,0xf6f5fb00 -++/* [0x00000fc0] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000fc8] */ 0x0f9d71c0, 0x10020167, // asr ra5, r0, rb23 -++/* [0x00000fd0] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000fd8] */ 0x0f9d71c0, 0x10021267, // asr rb9, r0, rb23 -++/* [0x00000fe0] */ 0x04040100, 0xe0020867, // mov r1,0x4040100 -++/* [0x00000fe8] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000ff0] */ 0x0f9d71c0, 0x100201a7, // asr ra6, r0, rb23 -++/* [0x00000ff8] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00001000] */ 0x0f9d71c0, 0x100212a7, // asr rb10, r0, rb23 -++/* [0x00001008] */ 0xffff0000, 0xe0020867, // mov r1,0xffff0000 -++/* [0x00001010] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00001018] */ 0x0f9d71c0, 0x100201e7, // asr ra7, r0, rb23 -++/* [0x00001020] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00001028] */ 0x0f9d71c0, 0x100212e7, // asr rb11, r0, rb23 -++/* [0x00001030] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001038] */ 0x0f9e70c0, 0x100213e7, // asr rb15, r0, r3 -++/* [0x00001040] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001048] */ 0x119e70c0, 0x10020827, // shl r0, r0, r3 -++/* [0x00001050] */ 0x8f9c00ff, 0xd0024823, // asr r0, r0, r3 ; mov r3, 0 -++/* [0x00001058] */ 0x119c81c0, 0xd00213a7, // shl rb14, r0, 8 -++// ::mc_filter -+ // :yloop -+-/* [0x00000f48] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000f50] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-/* [0x00000f58] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000f60] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000f68] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -+-/* [0x00000f70] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -+-/* [0x00000f78] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000f80] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000f88] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000f90] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000f98] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -+-/* [0x00000fa0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000fa8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-/* [0x00000fb0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000fb8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000fc0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000fc8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000fd0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000fd8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000fe0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000fe8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000ff0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000ff8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00001000] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00001008] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00001010] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00001018] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00001020] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001028] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001030] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001038] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001040] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001048] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -+-/* [0x00001050] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001058] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001060] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001068] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001070] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -+-/* [0x00001078] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001080] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00001088] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00001090] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00001098] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000010a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000010a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000010b0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-/* [0x000010b8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-/* [0x000010c0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-/* [0x000010c8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -+-/* [0x000010d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000010d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000010e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000010e8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x000010f0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x000010f8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x00001100] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -+-/* [0x00001108] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x00001110] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00001118] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00001120] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001128] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001130] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001138] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00001060] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001068] */ 0x8e4539bf, 0xb0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu1 -++/* [0x00001070] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00001078] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001080] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00001088] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00001090] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001098] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000010a0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000010a8] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x000010b0] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x000010b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000010c0] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x000010c8] */ 0xec654c8f, 0x10024f21, // add t1s, ra_frame_base2, r2 ; v8subs r1, r1, rb20 -++/* [0x000010d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000010d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000010e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000010e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000010f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000010f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00001100] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001108] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001110] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001118] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001120] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001128] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001130] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001138] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001140] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001148] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001150] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001158] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001160] */ 0x8d2487f6, 0xd00279c8, // sub.setf -, r3, 8 ; mov ra8, ra9 -++/* [0x00001168] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001170] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001178] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001180] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001188] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001190] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001198] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000011a0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000011a8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000011b0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000011b8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000011c0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000011c8] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000011d0] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000011d8] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000011e0] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000011e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000011f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000011f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00001200] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x00001208] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x00001210] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x00001218] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001220] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00001228] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001230] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001238] */ 0xfffffb28, 0xf0f809e7, // brr -, r:per_block_setup -++/* [0x00001240] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001248] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001250] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_b -+-/* [0x00001140] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001148] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001150] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00001158] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -+-/* [0x00001160] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00001168] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00001170] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00001178] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00001180] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00001188] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00001190] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -+-/* [0x00001198] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000011a0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -+-/* [0x000011a8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x000011b0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x000011b8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -+-/* [0x000011c0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000011c8] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -+-/* [0x000011d0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000011d8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000011e0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000011e8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000011f0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000011f8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00001200] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00001208] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00001210] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00001218] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001220] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001228] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00001230] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001238] */ 0x00000001, 0xe0020867, // mov r1, 1 -+-/* [0x00001240] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001248] */ 0x409f3001, 0xd00049e0, // nop ; mul24 r0, r0 << 13, r1 << 13 -+-/* [0x00001250] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001258] */ 0x409f2001, 0xd00049e0, // nop ; mul24 r0, r0 << 14, r1 << 14 -+-/* [0x00001260] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001268] */ 0x409f1001, 0xd00049e0, // nop ; mul24 r0, r0 << 15, r1 << 15 -+-/* [0x00001270] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001278] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00001280] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001288] */ 0x409f7001, 0xd00049e0, // nop ; mul24 r0, r0 << 9, r1 << 9 -+-/* [0x00001290] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001298] */ 0x409f6001, 0xd00049e0, // nop ; mul24 r0, r0 << 10, r1 << 10 -+-/* [0x000012a0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012a8] */ 0x409f5001, 0xd00049e0, // nop ; mul24 r0, r0 << 11, r1 << 11 -+-/* [0x000012b0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012b8] */ 0x409f4001, 0xd00049e0, // nop ; mul24 r0, r0 << 12, r1 << 12 -+-/* [0x000012c0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000012c8] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x000012d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000012f0] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x000012f8] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001300] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001308] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001310] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -+-/* [0x00001318] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001320] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001328] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00001330] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001338] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00001340] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :yloopb -+-/* [0x00001348] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00001350] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-/* [0x00001358] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00001360] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00001368] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -+-/* [0x00001370] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -+-/* [0x00001378] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00001380] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00001388] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00001390] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00001398] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -+-/* [0x000013a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000013a8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-/* [0x000013b0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -+-/* [0x000013b8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000013c0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000013c8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000013d0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000013d8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000013e0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000013e8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000013f0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000013f8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00001400] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00001408] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00001410] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00001418] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00001420] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001428] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001430] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001438] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001440] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001448] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -+-/* [0x00001450] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001458] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001460] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001468] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001470] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -+-/* [0x00001478] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001480] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00001488] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00001490] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00001498] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000014a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000014a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000014b0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-/* [0x000014b8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-/* [0x000014c0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-/* [0x000014c8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -+-/* [0x000014d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000014d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000014e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000014e8] */ 0x4053800e, 0xd00049e1, // nop ; mul24 r1, r1 << 8, ra20 << 8 -+-/* [0x000014f0] */ 0x4c78e38f, 0x10024860, // add r1, r1, ra30 ; mul24 r0, r1, rb14 -+-/* [0x000014f8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00001500] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloopb -+-/* [0x00001508] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00001510] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00001518] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00001520] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001528] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001530] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001538] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00001258] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001260] */ 0x8e4539bf, 0xb0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu1 -++/* [0x00001268] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00001270] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001278] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00001280] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00001288] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001290] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001298] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000012a0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x000012a8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x000012b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000012b8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x000012c0] */ 0xec654c8f, 0x10024f21, // add t1s, ra_frame_base2, r2 ; v8subs r1, r1, rb20 -++/* [0x000012c8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000012d0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000012d8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000012e0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000012e8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000012f0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000012f8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001300] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001308] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001310] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001318] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001320] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001328] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001330] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001338] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001340] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001348] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001350] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001358] */ 0x8d2487f6, 0xd00279c8, // sub.setf -, r3, 8 ; mov ra8, ra9 -++/* [0x00001360] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001368] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001370] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001378] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001380] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001388] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001390] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001398] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000013a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000013a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000013b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000013b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000013c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000013c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000013d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000013d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000013e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000013e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000013f0] */ 0x0f9ce3c0, 0xd0020827, // asr r0, r1, 14 -++/* [0x000013f8] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00001400] */ 0x405b8006, 0xd00049e0, // nop ; mul24 r0, r0 << 8, ra22 << 8 -++/* [0x00001408] */ 0x0c4a7380, 0x10020867, // add r1, r1, ra18 -++/* [0x00001410] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00001418] */ 0xfffffe20, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001420] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00001428] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001430] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001438] */ 0xfffff928, 0xf0f809e7, // brr -, r:per_block_setup -++/* [0x00001440] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001448] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001450] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_interrupt_exit12 -+-/* [0x00001540] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001548] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001550] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001558] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001560] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001568] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001570] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001578] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001580] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001588] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001590] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001598] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015c0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000015c8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000015d0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00001458] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001460] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001468] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001470] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00001478] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00001480] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001488] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001490] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001498] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014d0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014d8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000014e0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000014e8] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_exit1 -++/* [0x000014f0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000014f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001500] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00001508] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001510] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00001518] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001520] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001528] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 6e552d9..760bd17 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,15 +4,16 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 144) -+-#define mc_filter_uv_b0 (rpi_shader + 334) -+-#define mc_filter_uv_b (rpi_shader + 486) -+-#define mc_exit (rpi_shader + 662) -+-#define mc_interrupt_exit8 (rpi_shader + 680) -+-#define mc_setup (rpi_shader + 710) -+-#define mc_filter (rpi_shader + 864) -+-#define mc_filter_b (rpi_shader + 1104) -+-#define mc_interrupt_exit12 (rpi_shader + 1360) -+-#define mc_end (rpi_shader + 1398) -++#define mc_filter_uv (rpi_shader + 130) -++#define mc_filter_uv_b0 (rpi_shader + 312) -++#define mc_filter_uv_b (rpi_shader + 464) -++#define mc_exit (rpi_shader + 640) -++#define mc_interrupt_exit8 (rpi_shader + 658) -++#define mc_setup (rpi_shader + 688) -++#define mc_filter (rpi_shader + 1048) -++#define mc_filter_b (rpi_shader + 1174) -++#define mc_interrupt_exit12 (rpi_shader + 1302) -++#define mc_exit1 (rpi_shader + 1340) -++#define mc_end (rpi_shader + 1356) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index a0b8e5a..60d1ec2 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -21,6 +21,7 @@ -+ # -+ # ra16 clipped(row start address+elem_num)&~3 -+ # ra17 per-channel shifts -++# ra18 0x4000 -+ # ra19 next ra17 -+ # -+ # rb16 pitch -+@@ -86,7 +87,7 @@ -+ -+ -+ ################################################################################ -+-# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -++# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, offset, denom, vpm_id) -+ ::mc_setup_uv -+ -+ # Read starting kernel -+@@ -132,36 +133,6 @@ mov ra13, 0 -+ mov ra14, 0 -+ mov ra15, 0 -+ -+-# Compute part of VPM to use for DMA output -+-mov r3, unif -+-shl r2, r3, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -+-and r2, r2, 15 -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -+-shl r0, r0, 5 -+-add rb27, r0, r1 -+- -+-# Compute part of VPM to save data into -+-shl r2, r3, 1 -+-and r2, r2, 15 # r2 = bcd0 -+-mov r1, r2 # r1 = bcd0 -+-asr r1, r1, 2 # r1 = bc -+-shl r1, r1, 6 # r1 = bc000000 -+-mov r0, r2 # r0 = bcd0 -+-and r0, r0, 3 # r0 = d0 -+-add r0, r0, r1 # r0 = bc0000d0 -+-mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -+-add rb28, r0, r1 -+-asr r0, r0, 1 # r0 = bc0000d -+-# Prepare VPM command for 16bit intermediates -+-mov r1, vpm_setup(0, 2, h16p(0, 0)) # 2 is stride - stride acts on ADDR which is Y[5:0],H[0] for 16 bit -+-add rb21, r0, r1 -+- -+ # Compute base address for first and second access -+ mov r0, ra_x # Load x -+ max r0, r0, 0; mov r1, ra_y # Load y -+@@ -175,10 +146,31 @@ min r1, r1, rb_frame_height_minus_1 -+ # submit texture requests for first line -+ add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+ add t0s, r0, r1 ; mov ra_frame_base, r2 -+-add t0s, r2, r1 -++add t1s, r2, r1 -++ -++mov r2,8 -++shl rb12,unif, r2 # offset before shift -++add rb13,unif,r2 # offset after shift -++ -++# Compute part of VPM to use for DMA output -++mov r2, unif -++shl r2, r2, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -+ -+-mov rb12,unif # offset before shift -+-mov rb13,unif # offset after shift -++mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -++add rb28, r0, r1 # VPM 8bit storage -++asr r2, r0, 1 # r0 = bc0000d -++mov r1, vpm_setup(0, 2, h16p(0, 0)) # 2 is stride - stride acts on ADDR which is Y[5:0],H[0] for 16 bit -++add rb21, r2, r1 # VPM for 16bit intermediates -++mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++shl r0, r0, 5 -++add rb27, r0, r1 # DMA out -+ -+ # submit texture requests for second line -+ max r1, ra_y, 0 -+@@ -187,7 +179,7 @@ add ra_y, ra_y, 1 -+ bra -, ra31 -+ nop ; mul24 r1, r1, rb_pitch -+ add t0s, r1, ra_x -+-add t0s, r1, ra_frame_base -++add t1s, r1, ra_frame_base -+ -+ -+ -+@@ -248,17 +240,15 @@ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ mov r0, unif # U offset/weight -+ asr rb15, r0, r2 # Compute offset from MSBs -+ shl r0, r0, r2 -+-asr rb14, r0, r2 # Compute weight from LSBs -++asr r3, r0, r2 # Compute weight from LSBs -+ mov r0, unif # V offset/weight -+ asr.ifnz rb15, r0, r2 -+ shl r0, r0, r2 -+-asr.ifnz rb14, r0, r2 -++asr.ifnz r3, r0, r2 -++shl rb14,r3,8 # Scale up weights so we can use mul24 in signed fashion -+ -+ # r2 is elem_num -+ # r3 is loop counter -+- -+-mov r5rep, -8 -+- -+ # retrieve texture results and pick out bytes -+ # then submit two more texture requests -+ -+@@ -269,7 +259,7 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -+ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+@@ -278,7 +268,7 @@ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+ add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_frame_base, r2 -++add t1s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -301,11 +291,6 @@ mov ra13, ra14 # Delay slot 1 -+ mov ra14, ra15 # Delay slot 2 -+ mov ra15, r0 # Delay slot 3 -+ -+-mov rb12,32 # TODO remove these to make P weighted prediction work properly -+-mov rb13,6 -+-mov rb14,1 -+-mov rb15,0 -+- -+ # apply vertical filter and write to VPM -+ -+ nop ; mul24 r1, ra14, rb10 -+@@ -412,7 +397,7 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -+ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+@@ -421,7 +406,7 @@ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+ add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_frame_base, r2 -++add t1s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -542,7 +527,7 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -+ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+@@ -551,7 +536,7 @@ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+ add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_frame_base, r2 -++add t1s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -617,9 +602,9 @@ mov -, vw_wait # wait on the VDW -+ mov -,srel(0) -+ -+ ldtmu0 -++ldtmu1 -+ ldtmu0 -+-ldtmu0 -+-ldtmu0 -++ldtmu1 -+ -+ nop ; nop ; thrend -+ nop ; nop # delay slot 1 -+@@ -630,9 +615,9 @@ nop ; nop # delay slot 2 -+ mov -, vw_wait # wait on the VDW -+ -+ ldtmu0 -++ldtmu1 -+ ldtmu0 -+-ldtmu0 -+-ldtmu0 -++ldtmu1 -+ -+ mov -,sacq(0) # 1 -+ mov -,sacq(0) # 2 -+@@ -656,200 +641,249 @@ nop ; nop # delay slot 2 -+ # For P frames we make the second x,y coordinates offset by +8 -+ -+ ################################################################################ -+-# mc_setup(next_kernel, x, y, ref_y_base, x2, y2, ref_y2_base, frame_width, frame_height, pitch, dst_pitch, offset, shift, pad2) -++# mc_setup(y_x, ref_y_base, y2_x2, ref_y2_base, frame_width_height, pitch, dst_pitch, offset_shift, next_kernel) -+ ::mc_setup -++ mov r3, 16 -+ -+-# Read starting kernel -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-mov ra31, unif -+- -+-# Compute base address for first and second access -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl ra_xshift_next, r0, 3 # Compute shifts -+-add ra_y, r1, 1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add r2, r2, r0 # r2 is address for frame0 (not including y offset) -+-max r1, r1, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -+-add t0s, r2, r1 ; mov ra_frame_base, r2 -+- -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl rx_xshift2_next, r0, 3 # Compute shifts -+-add ra_y2, r1, 1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add r2, r2, r0 # r2 is address for frame1 (not including y offset) -+-max r1, r1, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -+-add t0s, r2, r1 ; mov ra_frame_base2, r2 -+- -++ # Need to save these because we need to know the frame dimensions before computing texture coordinates -++ mov ra8, unif -++ mov ra9, unif -++ mov ra10, unif -++ mov ra11, unif -+ -+ # Read image dimensions -+-sub rb25,unif,1 -+-sub rb30,unif,1 -++ mov r1, unif # width_height -++ shl r0,r1,r3 -++ asr r1,r1,r3 # width -++ asr r0,r0,r3 # height -++ sub rb_frame_width_minus_1,r1,1 -++ sub rb_frame_height_minus_1,r0,1 -+ -+ # get source pitch -+-mov rb16, unif -++ mov rb_pitch, unif -+ -+ # get destination pitch -+-mov r0, unif -+-mov r1, vdw_setup_1(0) -+-add rb24, r1, r0 -++ mov r0, unif -++ mov r1, vdw_setup_1(0) -++ add rb24, r1, r0 -+ -+-# load constants -+- -+-mov ra20, 1 -+-mov ra22, 256 -+-mov ra30, 64 -+- -+-mov rb20, 0xffffff00 -+-mov rb22, 255 -+-mov rb23, 24 -++# Compute base address for first and second access -++ mov r1, ra8 # y_x -++ shl r0,r1,r3 # r0 is x<<16 -++ asr r1,r1,r3 # r1 is y -++ asr r0,r0,r3 # r0 is x -++ add r0, r0, elem_num # Load x -++ max r0, r0, 0 -++ min r0, r0, rb_frame_width_minus_1 ; mov r2, ra9 # Load the frame base -++ shl ra_xshift_next, r0, 3 # Compute shifts -++ add ra_y, r1, 1 -++ and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++ add r2, r2, r0 # r2 is address for frame0 (not including y offset) -++ max r1, r1, 0 -++ min r1, r1, rb_frame_height_minus_1 -++ nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -++ add t0s, r2, r1 ; mov ra_frame_base, r2 -++ -++ mov r1, ra10 # y_x -++ shl r0,r1,r3 # r0 is x<<16 -++ asr r1,r1,r3 # r1 is y -++ asr r0,r0,r3 # r0 is x -++ add r0, r0, elem_num # Load x -++ max r0, r0, 0 -++ min r0, r0, rb_frame_width_minus_1 ; mov r2, ra11 # Load the frame base -++ shl rx_xshift2_next, r0, 3 # Compute shifts -++ add ra_y2, r1, 1 -++ and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++ add r2, r2, r0 # r2 is address for frame1 (not including y offset) -++ max r1, r1, 0 -++ min r1, r1, rb_frame_height_minus_1 -++ nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -++ add t1s, r2, r1 ; mov ra_frame_base2, r2 -+ -+-# touch vertical context to keep simulator happy -+ -+-mov ra8, 0 -+-mov ra9, 0 -+-mov ra10, 0 -+-mov ra11, 0 -+-mov ra12, 0 -+-mov ra13, 0 -+-mov ra14, 0 -+-mov ra15, 0 -++# load constants -+ -+-# Compute part of VPM to use for DMA output -+-mov r2, qpu_num -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -+-shl r0, r0, 5 -+-add rb27, r0, r1 -++ mov ra20, 1 -++ mov ra22, 256 -++ mov ra30, 64 -+ -+-# Compute part of VPM to save data into -+-mov r2, qpu_num # qpu_num = abcd -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -+-add rb28, r0, r1 -++ mov rb20, 0xffffff00 -++ mov rb22, 255 -++ mov rb23, 24 -+ -+-mov rb12,unif # offset before shift -+-mov rb13,unif # shift -++# touch vertical context to keep simulator happy -+ -+-# Dump padding words -+-mov r0, unif -++ mov ra8, 0 -++ mov ra9, 0 -++ mov ra10, 0 -++ mov ra11, 0 -++ mov ra12, 0 -++ mov ra13, 0 -++ mov ra14, 0 -++ mov ra15, 0 -++ mov ra18, 0x4000 -++ -++# Compute part of VPM to use -++ mov r2, qpu_num -++ mov r1, r2 -++ asr r1, r1, 2 -++ shl r1, r1, 6 -++ mov r0, r2 -++ and r0, r0, 3 -++ add r0, r0, r1 -++ mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -++ add rb28, r0, r1 # VPM for saving data -++ mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++ shl r0, r0, 5 -++ add rb27, r0, r1 # Command for dma output -++ -++# Weighted prediction denom -++ -++ mov r1, unif # offset_shift -++ shl r0,r1,r3 ; mov r2,8 -++ asr rb13,r0,r3 # shift -++ asr rb12,r1,r3 # offset -++ add rb13,rb13,r2 # mul24 is unsigned so scale up into high bits -++ shl rb12, rb12, r2 # Account for larger shift -+ -+ # submit texture requests for second line -+-max r1, ra_y, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 -+-nop ; mul24 r1, r1, rb_pitch -+-add t0s, r1, ra_frame_base -+- -+-max r1, ra_y2, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-bra -, ra31 -+-add ra_y2, ra_y2, 1 # Delay 1 -+-nop ; mul24 r1, r1, rb_pitch # Delay 2 -+-add t0s, r1, ra_frame_base2 # Delay 3 -+- -+- -+-################################################################################ -+- -+-# mc_filter(next_kernel, x, y, frame_base, x2, y2, frame_base2, height, hcoeffs[0], hcoeffs2[0], hcoeffs[1], hcoeffs2[1], vcoeffs[0], vcoeffs2[0], vcoeffs[1], vcoeffs2[1], offsetweight0, offsetweight1, this_dst) -+-# In a P block, only the first half of coefficients contain used information. -+-# At this point we have already issued two pairs of texture requests for the current block -+-# ra_x, ra_x16_base point to the current coordinates for this block -+-::mc_filter -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-mov ra31, unif -++ max r1, ra_y, 0 -++ min r1, r1, rb_frame_height_minus_1 -++ add ra_y, ra_y, 1 -++ nop ; mul24 r1, r1, rb_pitch -++ add t0s, r1, ra_frame_base -++ -++ max r1, ra_y2, 0 -++ min r1, r1, rb_frame_height_minus_1 -++ add ra_y2, ra_y2, 1 -++ nop ; mul24 r1, r1, rb_pitch -++ add t1s, r1, ra_frame_base2 -++ -++# FALL THROUGHT TO PER-BLOCK SETUP -++ -++# Start of per-block setup code -++# P and B blocks share the same setup code to save on Icache space -++:per_block_setup -++ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ mov ra31, unif -+ -+ # per-channel shifts were calculated on the *previous* invocation -+- -+-mov ra_xshift, ra_xshift_next -+-mov rx_xshift2, rx_xshift2_next -++ mov ra_xshift, ra_xshift_next -++ mov rx_xshift2, rx_xshift2_next -+ -+ # get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl ra_xshift_next, r0, 3 # Compute shifts -+-mov ra_y_next, r1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add ra_frame_base_next, r2, r0 # r2 is address for frame0 (not including y offset) -+- -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0 ; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl rx_xshift2_next, r0, 3 # Compute shifts -+-add ra_y2_next, r1, 1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -+- -++ mov r3, 16 -++ mov r1, unif # y_x -++ shl r0,r1,r3 # r0 is x<<16 -++ asr r1,r1,r3 # r1 is y -++ asr r0,r0,r3 # r0 is x -++ add r0, r0, elem_num # Load x -++ max r0, r0, 0 -++ min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++ shl ra_xshift_next, r0, 3 # Compute shifts -++ mov ra_y_next, r1 -++ and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++ add ra_frame_base_next, r2, r0 ; mov r1, unif # y2_x2 -++ -++ shl r0,r1,r3 # r0 is x2<<16 -++ asr r1,r1,r3 # r1 is y2 -++ asr r0,r0,r3 # r0 is x2 -++ add r0, r0, elem_num # Load x -++ max r0, r0, 0 -++ min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++ shl rx_xshift2_next, r0, 3 # Compute shifts -++ mov ra_y2_next, r1 -++ and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++ add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -+ -+ # set up VPM write -+-mov vw_setup, rb28 -++ mov vw_setup, rb28 -+ -+ # get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -+-shl r0, r0, 7 -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -++ mov r0, unif -++ shr r1, r0, r3 # Extract width -++ sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++ and r0, r0, rb22 # Extract height -++ add rb17, r0, 5 -++ add rb18, r0, 7 -++ shl r0, r0, 7 -++ add r0, r0, r1 # Combine width and height of destination area -++ shl r0, r0, r3 # Shift into bits 16 upwards of the vdw_setup0 register -++ add rb26, r0, rb27 -+ -+ # get filter coefficients and discard unused B frame values -+-mov r0, unif -+-mov.ifnz -, unif # Alternate coefficients are unused for P frames -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 # These may need some pre-rotation to be used in B frames correctly -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-mov.ifnz -, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -+-mov.ifnz -, unif -+-asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -+-mov.ifnz -, unif -+-asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-asr rb4, r0, rb23 -+- -+-mov r0, unif # Frame0 offset/weight -+-mov.ifnz -, unif # Frame1 offset/weight unused -+-asr rb15, r0, r2 # Compute offset from MSBs -+-shl r0, r0, r2 -+-asr rb14, r0, r2 # Compute weight from LSBs -+- -+-# r3 is loop counter -++ mov r0, unif ; mov r1,1 # Packed filter offsets, unpack into ra8... (to be used for vertical context later) -++ asr ra9, r0, rb23; mul24 r0, r0, ra22 # my2 -++ asr ra8, r0, rb23; mul24 r0, r0, ra22 # mx2 -++ asr.ifz ra9, r0, rb23; mul24 r0, r0, ra22 # my:my2 -++ asr.ifz ra8, r0, rb23 # mx:mx2 -++ sub ra9,3,ra9 -++ sub ra8,3,ra8 -++ shl ra9,ra9,3 # Scale up by 8 -++ shl ra8,ra8,3 # Scale up by 8 -++# Now if we want aligned we have a mul of 1, so put 0 coefficients at the top -++ mov r1,0xffff00 -++ shl r0, r1, ra8 -++ asr ra0, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb4, r0, rb23 -++ -++ mov r1,0x1040400 -++ shl r0, r1, ra8 -++ asr ra1, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb5, r0, rb23 -++ -++ mov r1,0xfbf5f600 -++ shl r0, r1, ra8 -++ asr ra2, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb6, r0, rb23 -++ -++ mov r1,0x11283a40 -++ shl r0, r1, ra8 -++ asr ra3, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb7, r0, rb23 -++ -++ mov r1,0x3a281100 -++ shl r0, r1, ra8 -++ asr ra4, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb8, r0, rb23 -++ -++ mov r1,0xf6f5fb00 -++ shl r0, r1, ra8 -++ asr ra5, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb9, r0, rb23 -++ -++ mov r1,0x4040100 -++ shl r0, r1, ra8 -++ asr ra6, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb10, r0, rb23 -++ -++ mov r1,0xffff0000 -++ shl r0, r1, ra8 -++ asr ra7, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb11, r0, rb23 -++ -++# Extract weighted prediction information -++ mov r0, unif # offset/weight TODO move up -++ asr rb15, r0, r3 # Compute offset from MSBs -++ bra -, ra31 -++ shl r0, r0, r3 # Delay 1 -++ asr r0, r0, r3 ; mov r3, 0 # Compute weight from LSBs and reset loop counter Delay 2 -++ shl rb14, r0, 8 # Use a larger shift to avoid unsigned multiply problem Delay 3 -+ -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -++################################################################################ -++# mc_filter(y_x, frame_base, y2_x2, frame_base2, width_height, my2_mx2_my_mx, offsetweight0, this_dst, next_kernel) -++# In a P block, y2_x2 should be y_x+8 -++# At this point we have already issued two pairs of texture requests for the current block -+ -+-mov r3, 0 -++::mc_filter -+ -+ :yloop -+ # retrieve texture results and pick out bytes -+@@ -858,91 +892,90 @@ mov r3, 0 -+ # If we knew there was no clipping then this code would get simpler. -+ # Perhaps we could add on the pitch and clip using larger values? -+ -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, rx_xshift2 -+-mov.ifz ra_y2, ra_y2_next -++ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++ shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu1 -++ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++ shr r1, r4, rx_xshift2 -++ mov.ifz ra_y2, ra_y2_next -+ -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y2, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++ max r2, ra_y, 0 # y -++ min r2, r2, rb_frame_height_minus_1 -++ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++ add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -++ max r2, ra_y2, 0 # y -++ min r2, r2, rb_frame_height_minus_1 -++ add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++ add t1s, ra_frame_base2, r2 ; v8subs r1, r1, rb20 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+ -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+ # apply horizontal filter -+-nop ; mul24 r2, r0, ra0 -+-nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-nop ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-add r0, r2, r3 ; mov r3, rb31 -+-sub.setf -, r3, 8 ; mov ra12, ra13 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-brr.anyn -, r:yloop -+-mov ra13, ra14 # Delay slot 1 -+-mov ra14, ra15 # Delay slot 2 -+-mov ra15, r0 # Delay slot 3 -++ nop ; mul24 r2, r0, ra0 -++ nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++ nop ; mul24 r3, ra1 << 1, r0 << 1 -++ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++ add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++ nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++ add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++ nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++ add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++ nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++ add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++ nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++ add r0, r2, r3 ; mov r3, rb31 -++ sub.setf -, r3, 8 ; mov ra8, ra9 -++ mov ra9, ra10 -++ mov ra10, ra11 -++ mov ra11, ra12 -++ mov ra12, ra13 -++ brr.anyn -, r:yloop -++ mov ra13, ra14 # Delay slot 1 -++ mov ra14, ra15 # Delay slot 2 -++ mov ra15, r0 # Delay slot 3 -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r1, ra14, rb10 -+-nop ; mul24 r0, ra13, rb9 -+-add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-add r1, r1, r0 ; mul24 r0, ra11, rb7 -+- -+-add r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 14 -+-nop ; mul24 r1, r1, rb14 -+-add r1, r1, rb12 -+-asr r1, r1, rb13 -+-brr.anyn -, r:yloop -+-add r1, r1, rb15 # Delay 1 -+-min r1, r1, rb22 # Delay 2 -+-max vpm, r1, 0 # Delay 3 -++ nop ; mul24 r1, ra14, rb10 -++ nop ; mul24 r0, ra13, rb9 -++ add r1, r1, r0 ; mul24 r0, ra12, rb8 -++ add r1, r1, r0 ; mul24 r0, ra15, rb11 -++ add r1, r1, r0 ; mul24 r0, ra8, rb4 -++ add r1, r1, r0 ; mul24 r0, ra9, rb5 -++ add r1, r1, r0 ; mul24 r0, ra10, rb6 -++ add r1, r1, r0 ; mul24 r0, ra11, rb7 -++ -++ add r1, r1, r0 ; mov -, vw_wait -++ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++ asr r1, r1, 14 -++ nop ; mul24 r1, r1, rb14 -++ add r1, r1, rb12 -++ asr r1, r1, rb13 -++ brr.anyn -, r:yloop -++ add r1, r1, rb15 # Delay 1 -++ min r1, r1, rb22 # Delay 2 -++ max vpm, r1, 0 # Delay 3 -+ -+ # DMA out -+ -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW setup 0 Delay 1 -+-mov vw_setup, rb29 # Stride Delay 2 -+-mov vw_addr, unif # start the VDW Delay 3 -++ brr -, r:per_block_setup -++ mov vw_setup, rb26 # VDW setup 0 Delay 1 -++ mov vw_setup, rb29 # Stride Delay 2 -++ mov vw_addr, unif # start the VDW Delay 3 -+ -+ -+ -+ ################################################################################ -+ -+-# mc_filter_b(next_kernel, x, y, frame_base, x2, y2, frame_base2, width_height, hcoeffs[0], hcoeffs2[0], hcoeffs[1], hcoeffs2[1], vcoeffs[0], vcoeffs2[0], vcoeffs[1], vcoeffs2[1], offsetweight0, offsetweight1, this_dst) -++# mc_filter_b(y_x, frame_base, y2_x2, frame_base2, width_height, my2_mx2_my_mx, offsetweight0, this_dst, next_kernel) -+ # In a P block, only the first half of coefficients contain used information. -+ # At this point we have already issued two pairs of texture requests for the current block -+ # May be better to just send 16.16 motion vector and figure out the coefficients inside this block (only 4 cases so can compute hcoeffs in around 24 cycles?) -+@@ -952,92 +985,6 @@ mov vw_addr, unif # start the VDW Delay 3 -+ # Or possibly by taking advantage of symmetry? -+ # From 19->7 32bits per command. -+ ::mc_filter_b -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-mov ra31, unif -+- -+-# per-channel shifts were calculated on the *previous* invocation -+- -+-mov ra_xshift, ra_xshift_next -+-mov rx_xshift2, rx_xshift2_next -+- -+-# get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl ra_xshift_next, r0, 3 # Compute shifts -+-mov ra_y_next, r1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add ra_frame_base_next, r2, r0 # r2 is address for frame0 (not including y offset) -+- -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0 ; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl rx_xshift2_next, r0, 3 # Compute shifts -+-add ra_y2_next, r1, 1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -+- -+- -+-# set up VPM write -+-mov vw_setup, rb28 -+- -+-# get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -+-shl r0, r0, 7 -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -+- -+-# get filter coefficients and discard unused B frame values -+-mov r0, unif -+-mov r1, 1 -+-mov.ifnz r0, unif # Alternate coefficients are unused for P frames -+-nop ; mul24 r0, r0 << 13, r1 << 13 -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 14, r1 << 14 -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 15, r1 << 15 # Adjust such that a rotate of 1 will produce the values with first 8 on left, second 8 on right -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-mov.ifnz r0, unif -+-nop ; mul24 r0, r0 << 9, r1 << 9 -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 10, r1 << 10 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 11, r1 << 11 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 12, r1 << 12 -+-asr ra4, r0, rb23; mov r0, unif -+-mov.ifnz r0, unif -+-asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -+-mov.ifnz r0, unif -+-asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-asr rb4, r0, rb23 -+- -+-mov r0, unif # Frame0 offset/weight -+-mov.ifnz r0, unif # Frame1 offset/weight unused -+-asr rb15, r0, r2 # Compute offset from MSBs -+-shl r0, r0, r2 -+-asr rb14, r0, r2 # Compute weight from LSBs -+- -+-# r3 is loop counter -+- -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-mov r3, 0 -+- -+ :yloopb -+ # retrieve texture results and pick out bytes -+ # then submit two more texture requests -+@@ -1045,111 +992,123 @@ mov r3, 0 -+ # If we knew there was no clipping then this code would get simpler. -+ # Perhaps we could add on the pitch and clip using larger values? -+ -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, rx_xshift2 -+-mov.ifz ra_y2, ra_y2_next -++ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++ shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu1 -++ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++ shr r1, r4, rx_xshift2 -++ mov.ifz ra_y2, ra_y2_next -+ -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y2, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++ max r2, ra_y, 0 # y -++ min r2, r2, rb_frame_height_minus_1 -++ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++ add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -++ max r2, ra_y2, 0 # y -++ min r2, r2, rb_frame_height_minus_1 -++ add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++ add t1s, ra_frame_base2, r2 ; v8subs r1, r1, rb20 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+ -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+ # apply horizontal filter -+-nop ; mul24 r2, r0, ra0 -+-nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-nop ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-add r0, r2, r3 ; mov r3, rb31 -+-sub.setf -, r3, 8 ; mov ra12, ra13 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-brr.anyn -, r:yloopb -+-mov ra13, ra14 # Delay slot 1 -+-mov ra14, ra15 # Delay slot 2 -+-mov ra15, r0 # Delay slot 3 -+- -+-# apply vertical filter and write to VPM -+- -+-nop ; mul24 r1, ra14, rb10 -+-nop ; mul24 r0, ra13, rb9 -+-add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-add r1, r1, r0 ; mul24 r0, ra11, rb7 -+- -+-add r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 14 -+-nop ; mul24 r1, r1 << 8, ra20 << 8 # Rotate to align left and right halves -+-add r1, r1, ra30 ; mul24 r0, r1, rb14 -+-add r1, r1, r0 -+-brr.anyn -, r:yloopb -+-asr r1, r1, 7 # Delay 1 -+-min r1, r1, rb22 # Delay 2 -+-max vpm, r1, 0 # Delay 3 -++ nop ; mul24 r2, r0, ra0 -++ nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++ nop ; mul24 r3, ra1 << 1, r0 << 1 -++ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++ add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++ nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++ add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++ nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++ add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++ nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++ add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++ nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++ add r0, r2, r3 ; mov r3, rb31 -++ sub.setf -, r3, 8 ; mov ra8, ra9 -++ mov ra9, ra10 -++ mov ra10, ra11 -++ mov ra11, ra12 -++ mov ra12, ra13 -++ brr.anyn -, r:yloopb -++ mov ra13, ra14 # Delay slot 1 -++ mov ra14, ra15 # Delay slot 2 -++ mov ra15, r0 # Delay slot 3 -++ -++ # apply vertical filter and write to VPM -++ -++ nop ; mul24 r1, ra14, rb10 -++ nop ; mul24 r0, ra13, rb9 -++ add r1, r1, r0 ; mul24 r0, ra12, rb8 -++ add r1, r1, r0 ; mul24 r0, ra15, rb11 -++ add r1, r1, r0 ; mul24 r0, ra8, rb4 -++ add r1, r1, r0 ; mul24 r0, ra9, rb5 -++ add r1, r1, r0 ; mul24 r0, ra10, rb6 -++ add r1, r1, r0 ; mul24 r0, ra11, rb7 -++ -++ add r1, r1, r0 ; mov -, vw_wait -++ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++ asr r0, r1, 14 -++ asr r1, r1, 6 # Wait state so we can use the rotate instruction -++ nop ; mul24 r0, r0 << 8, ra22 << 8 # Rotate to align left and right halves -++ add r1, r1, ra18 -++ add r1, r1, r0 -++ brr.anyn -, r:yloopb -++ asr r1, r1, 15 # Delay 1 -++ min r1, r1, rb22 # Delay 2 -++ max vpm, r1, 0 # Delay 3 -+ -+ # DMA out -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW setup 0 Delay 1 -+-mov vw_setup, rb29 # Stride Delay 2 -+-mov vw_addr, unif # start the VDW Delay 3 -++ brr -, r:per_block_setup -++ mov vw_setup, rb26 # VDW setup 0 Delay 1 -++ mov vw_setup, rb29 # Stride Delay 2 -++ mov vw_addr, unif # start the VDW Delay 3 -+ -+ ################################################################################ -+ -+ # mc_interrupt_exit12() -+ ::mc_interrupt_exit12 -+-mov -, vw_wait # wait on the VDW -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+- -+-mov -,sacq(0) # 1 -+-mov -,sacq(0) # 2 -+-mov -,sacq(0) # 3 -+-mov -,sacq(0) # 4 -+-mov -,sacq(0) # 5 -+-mov -,sacq(0) # 6 -+-mov -,sacq(0) # 7 -+-mov -,sacq(0) # 8 -+-mov -,sacq(0) # 9 -+-mov -,sacq(0) # 10 -+-mov -,sacq(0) # 11 -+- -+-nop ; nop ; thrend -+-mov interrupt, 1; nop # delay slot 1 -+-nop ; nop # delay slot 2 -++ mov -, vw_wait # wait on the VDW -++ -++ ldtmu0 -++ ldtmu0 -++ ldtmu1 -++ ldtmu1 -++ -++ mov -,sacq(0) # 1 -++ mov -,sacq(0) # 2 -++ mov -,sacq(0) # 3 -++ mov -,sacq(0) # 4 -++ mov -,sacq(0) # 5 -++ mov -,sacq(0) # 6 -++ mov -,sacq(0) # 7 -++ mov -,sacq(0) # 8 -++ mov -,sacq(0) # 9 -++ mov -,sacq(0) # 10 -++ mov -,sacq(0) # 11 -++ -++ nop ; nop ; thrend -++ mov interrupt, 1; nop # delay slot 1 -++ nop ; nop # delay slot 2 -++ -++ -++::mc_exit1 -++ mov -, vw_wait # wait on the VDW -++ -++ ldtmu0 -++ ldtmu1 -++ ldtmu0 -++ ldtmu1 -++ nop ; nop ; thrend -++ mov interrupt, 1; nop # delay slot 1 -++ nop ; nop # delay slot 2 -+ -+ -+ ::mc_end -+-- -+2.7.4 -+ -+ -+From f02ec34c772aad3caa17432c6a4860f9ed0d5dc6 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 2 Jun 2015 10:58:25 +0100 -+Subject: [PATCH 48/68] Added option to simulate QPUs -+ -+--- -+ libavcodec/hevc.c | 288 +++++++++++++++++++++++++++++++++++++++++++-- -+ libavcodec/rpi_qpu.c | 24 ++-- -+ libavcodec/rpi_shader.qasm | 6 +- -+ 3 files changed, 295 insertions(+), 23 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 2da88ec..34d92e2 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -56,6 +56,8 @@ -+ // Define RPI_CACHE_UNIF_MVS to write motion vector uniform stream to cached memory -+ // RPI_CACHE_UNIF_MVS doesn't seem to make much difference, so left undefined. -+ -++ // Define RPI_SIMULATE_QPUS for debugging to run QPU code on the ARMs -++ //#define RPI_SIMULATE_QPUS -+ -+ #endif -+ -+@@ -124,7 +126,6 @@ static void pic_arrays_free(HEVCContext *s) -+ -+ #ifdef EARLY_MALLOC -+ #else -+- printf("pic_arrays_free\n"); -+ if (s->coeffs_buf_arm[0]) { -+ gpu_free(&s->coeffs_buf_default); -+ s->coeffs_buf_arm[0] = 0; -+@@ -174,11 +175,9 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ #ifdef RPI -+ #ifdef EARLY_MALLOC -+ #else -+- assert(sps); -++ av_assert0(sps); -+ int coeffs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+ int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -+- printf("pic_arrays_init\n"); -+- printf("Allocated %d\n",coefs_per_row); -+ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -+ s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -+ if (!s->coeffs_buf_arm[0]) -+@@ -2988,6 +2987,274 @@ static void rpi_inter_clear(HEVCContext *s) -+ #endif -+ } -+ -++ -++#ifdef RPI_SIMULATE_QPUS -++ -++static int32_t clipx(int x,int FRAME_WIDTH) -++{ -++ if (x<=0) return 0; -++ if (x>=FRAME_WIDTH) return FRAME_WIDTH-1; -++ return x; -++} -++ -++static int32_t clipy(int y,int FRAME_HEIGHT) -++{ -++ if (y<=0) return 0; -++ if (y>=FRAME_HEIGHT) return FRAME_HEIGHT-1; -++ return y; -++} -++ -++/*static int32_t filter8(uint8_t *data, int x0, int y0, int pitch, int mx, int my,int round,int denom,int weight,int offset) -++{ -++ int32_t vsum = 0; -++ int x, y; -++ -++ for (y = 0; y < 8; y++) { -++ int32_t hsum = 0; -++ -++ for (x = 0; x < 8; x++) -++ hsum += lumaFilter[mx][x]*data[clipx(x + x0) + clipy(y + y0) * pitch]; -++ -++ vsum += lumaFilter[my][y]*hsum; -++ } -++ vsum >>= 6; -++ vsum = (((vsum*weight)+round)>>denom)+offset; -++ -++ return av_clip_uint8( vsum ); -++}*/ -++ -++static int32_t filter8_chroma(uint8_t *data, int x0, int y0, int pitch, int hcoeffs, int vcoeffs,int offset_weight,int offset_before,int denom,int pic_width, int pic_height) -++{ -++ int32_t vsum = 0; -++ int x, y; -++ int chromaFilterH[4]; -++ int chromaFilterV[4]; -++ int i; -++ int offset_after = offset_weight>>16; -++ int weight = (offset_weight<<16)>>16; -++ for(i=0;i<4;i++) { -++ chromaFilterH[i] = ((hcoeffs>>(8*i))<<24)>>24; -++ chromaFilterV[i] = ((vcoeffs>>(8*i))<<24)>>24; -++ } -++ -++ for (y = 0; y < 4; y++) { -++ int32_t hsum = 0; -++ -++ for (x = 0; x < 4; x++) -++ hsum += chromaFilterH[x]*data[clipx(x + x0,pic_width) + clipy(y + y0,pic_height) * pitch]; -++ -++ vsum += chromaFilterV[y]*hsum; -++ } -++ vsum >>= 6; -++ vsum = (((vsum*weight)+offset_before)>>denom)+offset_after; -++ -++ return vsum; -++} -++ -++int lumaFilter[4][8]={ {0,0,0,64,0,0,0,0},{-1,4,-10,58,17,-5,1,0},{-1,4,-11,40,40,-11,4,-1},{0,1,-5,17,58,-10,4,-1} }; -++ -++static int32_t filter8_luma(uint8_t *data, int x0, int y0, int pitch, int my_mx,int offset_weight,int offset_before,int denom,int pic_width, int pic_height) -++{ -++ int32_t vsum = 0; -++ int x, y; -++ int i; -++ int offset_after = offset_weight>>16; -++ int weight = (offset_weight<<16)>>16; -++ -++ for (y = 0; y < 8; y++) { -++ int32_t hsum = 0; -++ -++ for (x = 0; x < 8; x++) -++ hsum += lumaFilter[my_mx&3][x]*data[clipx(x + x0,pic_width) + clipy(y + y0,pic_height) * pitch]; -++ -++ vsum += lumaFilter[(my_mx>>8)&3][y]*hsum; -++ } -++ vsum >>= 6; -++ vsum = (((vsum*weight)+offset_before)>>denom)+offset_after; -++ -++ return vsum; -++} -++ -++static uint8_t *test_frame(HEVCContext *s,uint32_t p, AVFrame *frame, int cIdx) -++{ -++ //int pic_width = s->ps.sps->width >> s->ps.sps->hshift[cIdx]; -++ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[cIdx]; -++ int pitch = frame->linesize[cIdx]; -++ uint32_t base = get_vc_address(frame->buf[cIdx]); -++ if (p>=base && pdata[cIdx] + (p-base); -++ } -++ return NULL; -++} -++ -++static uint8_t *compute_arm_addr(HEVCContext *s,uint32_t p, int cIdx) -++{ -++ SliceHeader *sh = &s->sh; -++ uint8_t *arm = test_frame(s,p,s->frame,cIdx); -++ int i; -++ if (arm) return arm; -++ if (sh->slice_type == P_SLICE || sh->slice_type == B_SLICE) -++ { -++ for(i=0;inb_refs[L0];i++) { -++ arm = test_frame(s,p,s->ref->refPicList[0].ref[i]->frame,cIdx); -++ if (arm) return arm; -++ } -++ } -++ if (sh->slice_type == B_SLICE) { -++ for(i=0;inb_refs[L1];i++) { -++ arm = test_frame(s,p,s->ref->refPicList[1].ref[i]->frame,cIdx); -++ if (arm) return arm; -++ } -++ } -++ printf("Frame 0x%x not found! Exit=%x\n",p,qpu_get_fn(QPU_MC_EXIT)); -++ exit(-1); -++ return NULL; -++} -++ -++static void rpi_simulate_inter_chroma(HEVCContext *s,uint32_t *p) -++{ -++ uint32_t next_kernel; -++ uint32_t x0; -++ uint32_t y0; -++ uint8_t *ref_u_base; -++ uint8_t *ref_v_base; -++ uint32_t frame_width = p[5]; -++ uint32_t frame_height = p[6]; -++ uint32_t pitch = p[7]; -++ uint32_t dst_pitch = p[8]; -++ int32_t offset_before = p[9]; -++ int32_t denom = p[10]; -++ uint32_t vpm_id = p[11]; -++ uint32_t tmp_u_dst[256]; -++ uint32_t tmp_v_dst[256]; -++ while(1) { -++ p += 12; -++ next_kernel = p[0-12]; -++ x0 = p[1-12]; -++ y0 = p[2-12]; -++ if (next_kernel==s->mc_filter_uv || next_kernel==s->mc_filter_uv_b0 || next_kernel==s->mc_filter_uv_b) { -++ int x,y; -++ uint32_t width_height = p[5]; -++ uint32_t hcoeffs = p[6]; -++ uint32_t vcoeffs = p[7]; -++ uint32_t offset_weight_u = p[8]; -++ uint32_t offset_weight_v = p[9]; -++ uint8_t *this_u_dst; -++ uint8_t *this_v_dst; -++ uint32_t width = width_height >> 16; -++ uint32_t height = (width_height << 16) >> 16; -++ ref_u_base = compute_arm_addr(s,p[3-12],1); -++ ref_v_base = compute_arm_addr(s,p[4-12],2); -++ if (next_kernel!=s->mc_filter_uv_b0) -++ { -++ this_u_dst = compute_arm_addr(s,p[10],1); -++ this_v_dst = compute_arm_addr(s,p[11],2); -++ } -++ for (y=0; ymc_filter_uv) { -++ int32_t refa = filter8_chroma(ref_u_base,x+x0, y+y0, pitch, hcoeffs, vcoeffs, offset_weight_u,offset_before,denom,frame_width,frame_height); -++ int32_t refb = filter8_chroma(ref_v_base,x+x0, y+y0, pitch, hcoeffs, vcoeffs, offset_weight_v,offset_before,denom,frame_width,frame_height); -++ this_u_dst[x+y*dst_pitch] = av_clip_uint8(refa); -++ this_v_dst[x+y*dst_pitch] = av_clip_uint8(refb); -++ } else if (next_kernel==s->mc_filter_uv_b0) { -++ int32_t refa = filter8_chroma(ref_u_base, x+x0, y+y0, pitch, hcoeffs, vcoeffs, 1,0,0,frame_width,frame_height); -++ int32_t refb = filter8_chroma(ref_v_base, x+x0, y+y0, pitch, hcoeffs, vcoeffs, 1,0,0,frame_width,frame_height); -++ tmp_u_dst[x+y*16] = refa; -++ tmp_v_dst[x+y*16] = refb; -++ } else { -++ int32_t refa = filter8_chroma(ref_u_base, x+x0, y+y0, pitch, hcoeffs, vcoeffs, 1, 64 + tmp_u_dst[x+y*16], 7, frame_width, frame_height); -++ int32_t refb = filter8_chroma(ref_v_base, x+x0, y+y0, pitch, hcoeffs, vcoeffs, 1, 64 + tmp_v_dst[x+y*16], 7, frame_width, frame_height); -++ this_u_dst[x+y*dst_pitch] = av_clip_uint8(refa); -++ this_v_dst[x+y*dst_pitch] = av_clip_uint8(refb); -++ } -++ } -++ } -++ } else { -++ av_assert0(next_kernel==qpu_get_fn(QPU_MC_INTERRUPT_EXIT8) || next_kernel==qpu_get_fn(QPU_MC_EXIT) ); -++ break; -++ } -++ } -++} -++ -++// mc_setup(y_x, ref_y_base, y2_x2, ref_y2_base, frame_width_height, pitch, dst_pitch, offset_shift, next_kernel) -++static void rpi_simulate_inter_luma(HEVCContext *s,uint32_t *p) -++{ -++ uint32_t next_kernel; -++ int y_x,y2_x2; -++ uint32_t x0; -++ uint32_t y0; -++ uint32_t x2; -++ uint32_t y2; -++ uint8_t *ref_y_base; -++ uint8_t *ref_y2_base; -++ uint32_t frame_width_height = p[4]; -++ uint32_t frame_width = frame_width_height>>16; -++ uint32_t frame_height = (frame_width_height<<16)>>16; -++ uint32_t pitch = p[5]; -++ uint32_t dst_pitch = p[6]; -++ int offset_shift = p[7]; -++ int32_t offset_before = offset_shift>>16; -++ int32_t denom = (offset_shift<<16)>>16; -++ while(1) { -++ p += 9; -++ next_kernel = p[8-9]; -++ y_x = p[0-9]; -++ x0 = (y_x<<16)>>16; -++ y0 = y_x>>16; -++ y2_x2 = p[2-9]; -++ x2 = (y2_x2<<16)>>16; -++ y2 = y2_x2>>16; -++ -++ if (next_kernel==s->mc_filter || next_kernel==s->mc_filter_b) { -++ // y_x, frame_base, y2_x2, frame_base2, width_height, my2_mx2_my_mx, offsetweight0, this_dst, next_kernel) -++ int x,y; -++ uint32_t width_height = p[4]; -++ uint32_t my2_mx2_my_mx = p[5]; -++ uint32_t offset_weight = p[6]; -++ uint8_t *this_dst = compute_arm_addr(s,p[7],0); -++ uint32_t width = width_height >> 16; -++ uint32_t height = (width_height << 16) >> 16; -++ ref_y_base = compute_arm_addr(s,p[1-9],0); -++ ref_y2_base = compute_arm_addr(s,p[3-9],0); -++ for (y=0; ymc_filter) { -++ int32_t refa = filter8_luma(ref_y_base,x+x0, y+y0, pitch, my2_mx2_my_mx, offset_weight,offset_before,denom,frame_width,frame_height); -++ this_dst[x+y*dst_pitch] = av_clip_uint8(refa); -++ } -++ else { -++ int32_t refa = filter8_luma(ref_y_base, x+x0, y+y0, pitch, my2_mx2_my_mx, 1, 0, 0, frame_width, frame_height); -++ int32_t refb = filter8_luma(ref_y2_base, x+x2, y+y2, pitch, my2_mx2_my_mx>>16, 1, 64 + refa, 7, frame_width, frame_height); -++ this_dst[x+y*dst_pitch] = av_clip_uint8(refb); -++ } -++ } -++ } -++ } else { -++ av_assert0(next_kernel==qpu_get_fn(QPU_MC_INTERRUPT_EXIT12) || next_kernel==qpu_get_fn(QPU_MC_EXIT) ); -++ break; -++ } -++ } -++} -++ -++static void rpi_simulate_inter_qpu(HEVCContext *s) -++{ -++ // First run the transform as normal -++ int i; -++ rpi_execute_transform(s); -++ for(i=0;i<8;i++) -++ { -++ rpi_simulate_inter_chroma(s,s->mvs_base[i]); -++ } -++ for(i=0;i<12;i++) -++ { -++ rpi_simulate_inter_luma(s,s->y_mvs_base[i]); -++ } -++} -++ -++#endif -++ -++ -+ static void rpi_execute_inter_qpu(HEVCContext *s) -+ { -+ int k; -+@@ -3006,7 +3273,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for V -+- assert(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -++ av_assert0(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -+ } -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+@@ -3016,11 +3283,16 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+1] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for second request -+ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+- assert(s->y_mvs[k] - s->y_mvs_base[k] < Y_COMMANDS_PER_QPU); -++ av_assert0(s->y_mvs[k] - s->y_mvs_base[k] < Y_COMMANDS_PER_QPU); -+ } -+ s->y_mvs[12-1][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT12); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ #endif -+ -++#ifdef RPI_SIMULATE_QPUS -++ rpi_simulate_inter_qpu(s); -++ s->vpu_id = -1; -++ return; -++#endif -+ -+ #ifdef RPI_MULTI_MAILBOX -+ #ifdef RPI_CACHE_UNIF_MVS -+@@ -3101,7 +3373,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1; -+ #endif -+ -+- /*if (!s->enable_rpi) { -++ if (!s->enable_rpi) { -+ if (s->ps.pps->cross_component_prediction_enabled_flag) -+ printf("Cross component\n"); -+ if (s->ps.pps->num_tile_rows > 1 || s->ps.pps->num_tile_columns > 1) -+@@ -3110,7 +3382,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ printf("Weighted P slice\n"); -+ if (s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE) -+ printf("Weighted B slice\n"); -+- }*/ -++ } -+ -+ #endif -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index e12304b..4480f72 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -13,7 +13,7 @@ -+ #include -+ #include -+ #include -+-#include -++#include "libavutil/avassert.h" -+ -+ #include "config.h" -+ -+@@ -160,13 +160,13 @@ static int gpu_init(volatile struct GPU **gpu) { -+ // Now copy over the QPU code into GPU memory -+ { -+ int num_bytes = qpu_get_fn(QPU_MC_END) - qpu_get_fn(QPU_MC_SETUP_UV); -+- assert(num_bytes<=QPU_CODE_SIZE*sizeof(unsigned int)); -++ av_assert0(num_bytes<=QPU_CODE_SIZE*sizeof(unsigned int)); -+ memcpy((void*)ptr->qpu_code, rpi_shader, num_bytes); -+ } -+ // And the VPU code -+ { -+ int num_bytes = sizeof(rpi_hevc_transform); -+- assert(num_bytes<=VPU_CODE_SIZE*sizeof(unsigned int)); -++ av_assert0(num_bytes<=VPU_CODE_SIZE*sizeof(unsigned int)); -+ memcpy((void*)ptr->vpu_code, rpi_hevc_transform, num_bytes); -+ } -+ // And the transform coefficients -+@@ -216,13 +216,13 @@ static void gpu_unlock(void) { -+ static int gpu_malloc_uncached_internal(int numbytes, GPU_MEM_PTR_T *p, int mb) { -+ p->numbytes = numbytes; -+ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -+- assert(p->vcsm_handle); -++ av_assert0(p->vcsm_handle); -+ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -+- assert(p->vc_handle); -++ av_assert0(p->vc_handle); -+ p->arm = vcsm_lock(p->vcsm_handle); -+- assert(p->arm); -++ av_assert0(p->arm); -+ p->vc = mem_lock(mb, p->vc_handle); -+- assert(p->vc); -++ av_assert0(p->vc); -+ return 0; -+ } -+ -+@@ -243,7 +243,7 @@ int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) -+ -+ int gpu_get_mailbox(void) -+ { -+- assert(gpu); -++ av_assert0(gpu); -+ return gpu->mb; -+ } -+ -+@@ -297,13 +297,13 @@ static int gpu_malloc_cached_internal(int numbytes, GPU_MEM_PTR_T *p) { -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST_AND_VC, (char *)"Video Frame" ); -+- assert(p->vcsm_handle); -++ av_assert0(p->vcsm_handle); -+ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -+- assert(p->vc_handle); -++ av_assert0(p->vc_handle); -+ p->arm = vcsm_lock(p->vcsm_handle); -+- assert(p->arm); -++ av_assert0(p->arm); -+ p->vc = mem_lock(gpu->mb, p->vc_handle); -+- assert(p->vc); -++ av_assert0(p->vc); -+ return 0; -+ } -+ -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 60d1ec2..0686249 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -149,8 +149,8 @@ add t0s, r0, r1 ; mov ra_frame_base, r2 -+ add t1s, r2, r1 -+ -+ mov r2,8 -+-shl rb12,unif, r2 # offset before shift -+-add rb13,unif,r2 # offset after shift -++shl rb12,unif,r2 # offset before shift -++add rb13,unif,r2 # denominator -+ -+ # Compute part of VPM to use for DMA output -+ mov r2, unif -+@@ -185,7 +185,7 @@ add t1s, r1, ra_frame_base -+ -+ ################################################################################ -+ -+-# mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -++# mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, width_height, hcoeffs, vcoeffs, offset_weight_u, offset_weight_v, this_u_dst, this_v_dst) -+ -+ # At this point we have already issued two pairs of texture requests for the current block -+ # ra_x, ra_x16_base point to the current coordinates for this block -+-- -+2.7.4 -+ -+ -+From 8bdf6b06c612ff4971c2ce99a62d093cf92468ca Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 2 Jun 2015 13:17:50 +0100 -+Subject: [PATCH 49/68] Increased motion vector memory and fixed block size -+ computation for non-multiple of 2 block sizes -+ -+--- -+ libavcodec/hevc.c | 50 +++++++++++++++++++++++++++++++------------------- -+ 1 file changed, 31 insertions(+), 19 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 34d92e2..3fb1e2a 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -83,11 +83,9 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ -+ // Split image of 2048 into parts 64 wide -+ // So some QPUs will have 3 blocks of 64 to do, and others 2 blocks for an image 2048 wide with 32 blocks across -+-// Each block of 64*64 -+-// Smallest CTU size is 16x16, so smallest block is 8x8 -+-// Corresponds to a total of 83kbytes over all 12 QPUs -++// For each block of 64*64 the smallest block size is 8x4 -+ #define RPI_LUMA_COMMAND_WORDS 9 -+-#define Y_COMMANDS_PER_QPU ((1+3*(64*64)/(8*8)) * RPI_LUMA_COMMAND_WORDS) -++#define Y_COMMANDS_PER_QPU ((1+3*(64*64)/(8*4)) * RPI_LUMA_COMMAND_WORDS) -+ -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+@@ -2042,11 +2040,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *y = s->y_mvs[chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -++ int bw = nPbW-start_x; -++ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -+- *y++ = ( (nPbW<16 ? nPbW : 16) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = ( (bw<16 ? bw : 16) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ if (weight_flag) { -+ *y++ = (s->sh.luma_offset_l0[current_mv.ref_idx[reflist]] << 16) + (s->sh.luma_weight_l0[current_mv.ref_idx[reflist]] & 0xffff); -+@@ -2089,12 +2089,14 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ int bw = nPbW_c-start_x; -++ int bh = nPbH_c-start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+- *u++ = ( (nPbW_cy_mvs[chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -++ int bw = nPbW-start_x; -++ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -+- *y++ = ( (nPbW<16 ? nPbW : 16) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = ( (bw<16 ? bw : 16) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ if (weight_flag) { -+ *y++ = (s->sh.luma_offset_l0[current_mv.ref_idx[reflist]] << 16) + (s->sh.luma_weight_l0[current_mv.ref_idx[reflist]] & 0xffff); -+@@ -2189,12 +2193,14 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ int bw = nPbW_c-start_x; -++ int bh = nPbH_c-start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+- *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+ *u++ = rpi_filter_coefs[_my][0]; -+@@ -2246,11 +2252,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *y = s->y_mvs[chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=8) { // B blocks work 8 at a time -++ int bw = nPbW-start_x; -++ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y2 - 3 + start_y) << 16) + ( (x2 - 3 + start_x) & 0xffff); // Second fetch is for ref1 -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -+- *y++ = ( (nPbW<8 ? nPbW : 8) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = ( (bw<8 ? bw : 8) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ *y++ = 1; // B frame weighted prediction not supported -+ *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -+@@ -2293,12 +2301,14 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ int bw = nPbW_c-start_x; -++ int bh = nPbH_c-start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b0; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+- *u++ = ( (nPbW_cframe->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+- *u++ = ( (nPbW_c> 16; -+ uint32_t height = (width_height << 16) >> 16; -++ uint8_t *dst_base = s->frame->data[0]; -+ ref_y_base = compute_arm_addr(s,p[1-9],0); -+ ref_y2_base = compute_arm_addr(s,p[3-9],0); -+ for (y=0; ymc_filter) { -+ int32_t refa = filter8_luma(ref_y_base,x+x0, y+y0, pitch, my2_mx2_my_mx, offset_weight,offset_before,denom,frame_width,frame_height); -+- this_dst[x+y*dst_pitch] = av_clip_uint8(refa); -++ refa = av_clip_uint8(refa); -++ this_dst[x+y*dst_pitch] = refa; -+ } -+ else { -+ int32_t refa = filter8_luma(ref_y_base, x+x0, y+y0, pitch, my2_mx2_my_mx, 1, 0, 0, frame_width, frame_height); -+@@ -3248,7 +3261,7 @@ static void rpi_simulate_inter_qpu(HEVCContext *s) -+ } -+ for(i=0;i<12;i++) -+ { -+- rpi_simulate_inter_luma(s,s->y_mvs_base[i]); -++ rpi_simulate_inter_luma(s,s->y_mvs_base[i],i); -+ } -+ } -+ -+@@ -3290,7 +3303,6 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ #ifdef RPI_SIMULATE_QPUS -+ rpi_simulate_inter_qpu(s); -+- s->vpu_id = -1; -+ return; -+ #endif -+ -+-- -+2.7.4 -+ -+ -+From da5ae7e96dd961ccc7bc162c8acf336d54a50092 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 2 Jun 2015 14:36:54 +0100 -+Subject: [PATCH 50/68] Added support for skip deblock -+ -+--- -+ libavcodec/hevc.c | 5 +++++ -+ libavcodec/hevc.h | 2 ++ -+ libavcodec/hevc_filter.c | 14 ++++---------- -+ 3 files changed, 11 insertions(+), 10 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 3fb1e2a..0ac4f4c 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3397,6 +3397,11 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ -+ #endif -++ s->used_for_ref = !(s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N); -+ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+ av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 5df9dcd..5cb90b5 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -890,6 +890,8 @@ typedef struct HEVCContext { -+ int width; -+ int height; -+ -++ int used_for_ref; -++ -+ #ifdef RPI -+ int enable_rpi; -+ HEVCMvCmd *unif_mv_cmds; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 11629e4..14a0952 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -512,16 +512,14 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->ps.pps->transquant_bypass_enable_flag; -+ -+ #ifdef DISABLE_DEBLOCK_NONREF -+- if ( s->nal_unit_type == NAL_TRAIL_N || -+- s->nal_unit_type == NAL_TSA_N || -+- s->nal_unit_type == NAL_STSA_N || -+- s->nal_unit_type == NAL_RADL_N || -+- s->nal_unit_type == NAL_RASL_N ) -++ if (!s->used_for_ref) -+ return; // Don't deblock non-reference frames -+ #endif -+ #ifdef DISABLE_DEBLOCK -+ return; -+ #endif -++ if (!s->used_for_ref && s->avctx->skip_loop_filter >= AVDISCARD_NONREF) -++ return; -+ -+ if (x0) { -+ left_tc_offset = s->deblock[ctb - 1].tc_offset; -+@@ -885,11 +883,7 @@ static int ff_hevc_buf_base(AVBufferRef *bref) { -+ -+ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ { -+- if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -+- s->nal_unit_type == NAL_TSA_N || -+- s->nal_unit_type == NAL_STSA_N || -+- s->nal_unit_type == NAL_RADL_N || -+- s->nal_unit_type == NAL_RASL_N )) { -++ if (s->enable_rpi && s->used_for_ref) { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ int curr_y = ((int *)f->progress->data)[0]; -+-- -+2.7.4 -+ -+ -+From 6401d88c310cd3bfec7be94bf3ceb6d0c5736c7e Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 2 Jun 2015 15:22:52 +0100 -+Subject: [PATCH 51/68] Added support for skip_frame -+ -+--- -+ libavcodec/hevc.c | 15 ++++++++++----- -+ 1 file changed, 10 insertions(+), 5 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 0ac4f4c..639e4df 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3397,11 +3397,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ -+ #endif -+- s->used_for_ref = !(s->nal_unit_type == NAL_TRAIL_N || -+- s->nal_unit_type == NAL_TSA_N || -+- s->nal_unit_type == NAL_STSA_N || -+- s->nal_unit_type == NAL_RADL_N || -+- s->nal_unit_type == NAL_RASL_N); -+ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+ av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); -+@@ -3925,6 +3920,16 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) -+ if (ret < 0) -+ return ret; -+ -++ s->used_for_ref = !(s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N); -++ -++ if (!s->used_for_ref && s->avctx->skip_frame >= AVDISCARD_NONREF) { -++ s->is_decoded = 0; -++ break; -++ } -+ if (s->max_ra == INT_MAX) { -+ if (s->nal_unit_type == NAL_CRA_NUT || IS_BLA(s)) { -+ s->max_ra = s->poc; -+-- -+2.7.4 -+ -+ -+From d2951e2ca73e234d1b775621e3993948a4a2c8ea Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 09:15:38 +0100 -+Subject: [PATCH 52/68] Fixed cache flushing of luma when using old method -+ -+--- -+ libavcodec/hevc_filter.c | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 14a0952..b286bbf 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -919,7 +919,7 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ flush_buffer(s->frame->buf[1]); -+ flush_buffer(s->frame->buf[2]); -+ #ifdef RPI_LUMA_QPU -+- flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[0]); -+ #endif -+ -+ #endif -+-- -+2.7.4 -+ -+ -+From 7ae612e69c1cabcc7d0b37b65efa8c5bdcfa7bf5 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 11:37:27 +0100 -+Subject: [PATCH 53/68] Option to parallelise coefficient decode and inter -+ prediction and deblock for each frame -+ -+--- -+ libavcodec/hevc.c | 701 +++++++++++++++++++++++++++-------------- -+ libavcodec/hevc.h | 74 +++-- -+ libavcodec/hevc_cabac.c | 12 +- -+ libavcodec/hevcpred_template.c | 5 +- -+ 4 files changed, 522 insertions(+), 270 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 639e4df..12aacc5 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -43,8 +43,6 @@ -+ -+ #ifdef RPI -+ #include "rpi_qpu.h" -+- // For some unknown reason, the code seems to crash if I do a late malloc -+- //#define EARLY_MALLOC -+ // Move Inter prediction into separate pass -+ #define RPI_INTER -+ -+@@ -58,6 +56,21 @@ -+ -+ // Define RPI_SIMULATE_QPUS for debugging to run QPU code on the ARMs -+ //#define RPI_SIMULATE_QPUS -++ #ifdef RPI_WORKER -++ #include "pthread.h" -++ #endif -++ -++ static void rpi_execute_dblk_cmds(HEVCContext *s); -++ static void rpi_execute_transform(HEVCContext *s); -++ static void rpi_execute_inter_qpu(HEVCContext *s); -++ static void rpi_execute_pred_cmds(HEVCContext *s); -++ static void rpi_execute_inter_cmds(HEVCContext *s); -++ static void rpi_inter_clear(HEVCContext *s); -++ -++ // Define INTER_PASS0 to do inter prediction in first pass -++ //#define INTER_PASS0 -++ // Define LAUNCH_PASS0 to launch QPU/VPU from pass0 -++ //#define LAUNCH_PASS0 -+ -+ #endif -+ -+@@ -105,6 +118,143 @@ static uint32_t get_vc_address(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+ return p->vc; -+ } -++#endif -++ -++ -++#ifdef RPI_WORKER -++ -++//#define LOG_ENTER printf("Enter %s: p0=%d p1=%d (%d jobs) %p\n", __func__,s->pass0_job,s->pass1_job,s->worker_tail-s->worker_head,s); -++//#define LOG_EXIT printf("Exit %s: p0=%d p1=%d (%d jobs) %p\n", __func__,s->pass0_job,s->pass1_job,s->worker_tail-s->worker_head,s); -++ -++#define LOG_ENTER -++#define LOG_EXIT -++ -++// Call this when we have completed pass0 and wish to trigger pass1 for the current job -++static void worker_submit_job(HEVCContext *s) -++{ -++ LOG_ENTER -++ //pthread_mutex_lock(&s->worker_mutex); -++ s->worker_tail++; // This is the only place that can change tail so we do not need the mutex -++ s->pass0_job = (s->pass0_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -++ pthread_cond_broadcast(&s->worker_cond_tail); // Let people know that the tail has moved -++ //pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++// Call this to say we have completed pass1 -++static void worker_complete_middle_job(HEVCContext *s) -++{ -++ LOG_ENTER -++ //pthread_mutex_lock(&s->worker_mutex); -++ s->worker_middle++; // This is the only place that can change head so we do not need the mutex -++ s->pass1_job = (s->pass1_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -++ pthread_cond_broadcast(&s->worker_cond_middle); // Let people know that the tail has moved -++ //pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++// Call this to say we have completed pass2 -++static void worker_complete_job(HEVCContext *s) -++{ -++ LOG_ENTER -++ //pthread_mutex_lock(&s->worker_mutex); -++ s->worker_head++; // This is the only place that can change head so we do not need the mutex -++ s->pass2_job = (s->pass2_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -++ pthread_cond_broadcast(&s->worker_cond_head); // Let people know that the tail has moved -++ //pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++// Call this to wait for all jobs to have completed at the end of a frame -++static void worker_wait(HEVCContext *s) -++{ -++ LOG_ENTER -++ pthread_mutex_lock(&s->worker_mutex); -++ while( s->worker_head !=s->worker_tail) -++ { -++ pthread_cond_wait(&s->worker_cond_head, &s->worker_mutex); -++ } -++ pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++// Call worker_pass0_ready to wait until the s->pass0_job slot becomes -++// available to receive the next job. -++static void worker_pass0_ready(HEVCContext *s) -++{ -++ LOG_ENTER -++ pthread_mutex_lock(&s->worker_mutex); -++ // tail is number of submitted jobs -++ // head is number of completed jobs -++ // tail-head is number of outstanding jobs in the queue -++ // we need to ensure there is at least 1 space left for us to use -++ while( s->worker_tail - s->worker_head >= RPI_MAX_JOBS) -++ { -++ // Wait until another job is completed -++ pthread_cond_wait(&s->worker_cond_head, &s->worker_mutex); -++ } -++ pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++static void *worker_start(void *arg) -++{ -++ HEVCContext *s = (HEVCContext *)arg; -++ while(1) { -++ pthread_mutex_lock(&s->worker_mutex); -++ -++ while( !s->kill_worker && s->worker_tail - s->worker_middle <= 0) -++ { -++ pthread_cond_wait(&s->worker_cond_tail, &s->worker_mutex); -++ } -++ pthread_mutex_unlock(&s->worker_mutex); -++ -++ if (s->kill_worker) { -++ break; -++ } -++ LOG_ENTER -++ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -++#ifndef LAUNCH_PASS0 -++ rpi_execute_inter_qpu(s); -++#endif -++#ifndef INTER_PASS0 -++ // Perform inter prediction -++ rpi_execute_inter_cmds(s); -++#endif -++ // Wait for transform completion -++ vpu_wait(s->vpu_id); -++ -++ worker_complete_middle_job(s); -++ LOG_EXIT -++ } -++ return NULL; -++} -++ -++static void *worker_deblock_start(void *arg) -++{ -++ HEVCContext *s = (HEVCContext *)arg; -++ while(1) { -++ pthread_mutex_lock(&s->worker_mutex); -++ while( !s->kill_worker && s->worker_middle - s->worker_head <= 0) -++ { -++ pthread_cond_wait(&s->worker_cond_middle, &s->worker_mutex); -++ } -++ pthread_mutex_unlock(&s->worker_mutex); -++ -++ if (s->kill_worker) { -++ break; -++ } -++ LOG_ENTER -++ // Perform intra prediction and residual reconstruction -++ rpi_execute_pred_cmds(s); -++ // Perform deblocking for CTBs in this row -++ rpi_execute_dblk_cmds(s); -++ -++ worker_complete_job(s); -++ LOG_EXIT -++ } -++ return NULL; -++} -+ -+ #endif -+ -+@@ -121,19 +271,18 @@ static uint32_t get_vc_address(AVBufferRef *bref) { -+ static void pic_arrays_free(HEVCContext *s) -+ { -+ #ifdef RPI -+- -+-#ifdef EARLY_MALLOC -+-#else -+- if (s->coeffs_buf_arm[0]) { -+- gpu_free(&s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = 0; -+- } -+- if (s->coeffs_buf_arm[2]) { -+- gpu_free(&s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = 0; -++ int job; -++ for(job=0;jobcoeffs_buf_arm[job][0]) { -++ gpu_free(&s->coeffs_buf_default[job]); -++ s->coeffs_buf_arm[job][0] = 0; -++ } -++ if (s->coeffs_buf_arm[job][2]) { -++ gpu_free(&s->coeffs_buf_accelerated[job]); -++ s->coeffs_buf_arm[job][2] = 0; -++ } -+ } -+ #endif -+-#endif -+ av_freep(&s->sao); -+ av_freep(&s->deblock); -+ -+@@ -171,24 +320,26 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ int min_pu_size = sps->min_pu_width * sps->min_pu_height; -+ -+ #ifdef RPI -+-#ifdef EARLY_MALLOC -+-#else -+ av_assert0(sps); -+ int coeffs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+ int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -+- if (!s->coeffs_buf_arm[0]) -+- goto fail; -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -+- s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -+- if (!s->coeffs_buf_arm[2]) -+- goto fail; -+- s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -+- s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -+- printf("Done\n"); -+-#endif -++ int job; -++ for(job=0;jobcoeffs_buf_default[job]); -++ s->coeffs_buf_arm[job][0] = (int16_t*) s->coeffs_buf_default[job].arm; -++ if (!s->coeffs_buf_arm[job][0]) -++ goto fail; -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated[job]); -++ s->coeffs_buf_arm[job][2] = (int16_t*) s->coeffs_buf_accelerated[job].arm; -++ s->coeffs_buf_vc[job][2] = s->coeffs_buf_accelerated[job].vc; -++ if (!s->coeffs_buf_arm[job][2]) -++ goto fail; -++ s->coeffs_buf_arm[job][3] = coefs_per_row + s->coeffs_buf_arm[job][2]; -++ s->coeffs_buf_vc[job][3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[job][2]; -++ } -++ } -+ #endif -+ -+ s->bs_width = (width >> 2) + 1; -+@@ -1036,7 +1187,7 @@ static void rpi_intra_pred(HEVCContext *s, int log2_trafo_size, int x0, int y0, -+ { -+ if (s->enable_rpi) { -+ HEVCLocalContext *lc = s->HEVClc; -+- HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -++ HEVCPredCmd *cmd = s->univ_pred_cmds[s->pass0_job] + s->num_pred_cmds[s->pass0_job]++; -+ cmd->type = RPI_PRED_INTRA; -+ cmd->size = log2_trafo_size; -+ cmd->c_idx = c_idx; -+@@ -1496,7 +1647,7 @@ static void rpi_luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref, const Mv *mv, int x_off, int y_off, -+ int block_w, int block_h, int luma_weight, int luma_offset) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds[s->pass0_job] + s->num_mv_cmds[s->pass0_job]++; -+ cmd->cmd = RPI_CMD_LUMA_UNI; -+ cmd->dst = dst; -+ cmd->dststride = dststride; -+@@ -1515,7 +1666,7 @@ static void rpi_luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref0, const Mv *mv0, int x_off, int y_off, -+ int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds[s->pass0_job] + s->num_mv_cmds[s->pass0_job]++; -+ cmd->cmd = RPI_CMD_LUMA_BI; -+ cmd->dst = dst; -+ cmd->dststride = dststride; -+@@ -1537,7 +1688,7 @@ static void rpi_chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ ptrdiff_t dststride, uint8_t *src0, ptrdiff_t srcstride, int reflist, -+ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int chroma_weight, int chroma_offset) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds[s->pass0_job] + s->num_mv_cmds[s->pass0_job]++; -+ cmd->cmd = RPI_CMD_CHROMA_UNI; -+ cmd->dst = dst0; -+ cmd->dststride = dststride; -+@@ -1555,7 +1706,7 @@ static void rpi_chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ static void rpi_chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, -+ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int cidx) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds[s->pass0_job] + s->num_mv_cmds[s->pass0_job]++; -+ cmd->cmd = RPI_CMD_CHROMA_BI+cidx; -+ cmd->dst = dst0; -+ cmd->dststride = dststride; -+@@ -2037,7 +2188,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int chan = x0>>6; // 64 wide blocks per QPU -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+- uint32_t *y = s->y_mvs[chan % 12]; -++ uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -+ int bw = nPbW-start_x; -+@@ -2057,7 +2208,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+- s->y_mvs[chan % 12] = y; -++ s->y_mvs[s->pass0_job][chan % 12] = y; -+ } else -+ #endif -+ { -+@@ -2086,7 +2237,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+- uint32_t *u = s->u_mvs[chan & 7]; -++ uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2110,7 +2261,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[chan & 7] = u; -++ s->u_mvs[s->pass0_job][chan & 7] = u; -+ return; -+ } -+ #endif -+@@ -2140,7 +2291,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int chan = x0>>6; // 64 wide blocks per QPU -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+- uint32_t *y = s->y_mvs[chan % 12]; -++ uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -+ int bw = nPbW-start_x; -+@@ -2160,7 +2311,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+- s->y_mvs[chan % 12] = y; -++ s->y_mvs[s->pass0_job][chan % 12] = y; -+ } else -+ #endif -+ -+@@ -2190,7 +2341,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+- uint32_t *u = s->u_mvs[chan & 7]; -++ uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2215,7 +2366,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[chan & 7] = u; -++ s->u_mvs[s->pass0_job][chan & 7] = u; -+ return; -+ } -+ #endif -+@@ -2249,7 +2400,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int x2 = x0 + (mv2->x >> 2); -+ int y2 = y0 + (mv2->y >> 2); -+ int chan = x0>>6; // 64 wide blocks per QPU -+- uint32_t *y = s->y_mvs[chan % 12]; -++ uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=8) { // B blocks work 8 at a time -+ int bw = nPbW-start_x; -+@@ -2265,7 +2416,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter_b; -+ } -+ } -+- s->y_mvs[chan % 12] = y; -++ s->y_mvs[s->pass0_job][chan % 12] = y; -+ } else -+ #endif -+ { -+@@ -2298,7 +2449,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ -+ int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+ -+- uint32_t *u = s->u_mvs[chan & 7]; -++ uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2327,7 +2478,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[chan & 7] = u; -++ s->u_mvs[s->pass0_job][chan & 7] = u; -+ return; -+ } -+ #endif -+@@ -2832,40 +2983,54 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ static void rpi_execute_dblk_cmds(HEVCContext *s) -+ { -+ int n; -++ int job = s->pass2_job; -+ int ctb_size = 1 << s->ps.sps->log2_ctb_size; -+- int (*p)[2] = s->dblk_cmds; -+- for(n = s->num_dblk_cmds; n>0 ;n--,p++) { -++ int (*p)[2] = s->dblk_cmds[job]; -++ for(n = s->num_dblk_cmds[job]; n>0 ;n--,p++) { -+ ff_hevc_hls_filters(s, (*p)[0], (*p)[1], ctb_size); -+ } -+- s->num_dblk_cmds = 0; -++ s->num_dblk_cmds[job] = 0; -+ } -+ -+ static void rpi_execute_transform(HEVCContext *s) -+ { -+ int i=2; -++#ifdef LAUNCH_PASS0 -++ int job = s->pass0_job; -++#else -++ int job = s->pass1_job; -++#endif -+ //int j; -+ //int16_t *coeffs = s->coeffs_buf_arm[i]; -+ //for(j=s->num_coeffs[i]; j > 0; j-= 16*16, coeffs+=16*16) { -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- gpu_cache_flush(&s->coeffs_buf_accelerated); -+- s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, &s->coeffs_buf_accelerated); -++ gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -++ s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], -++ s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], -++ s->num_coeffs[job][3] >> 10, 0, &s->coeffs_buf_accelerated[job]); -+ //vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -+ //gpu_cache_flush(&s->coeffs_buf_accelerated); -+ //vpu_wait(s->vpu_id); -+ -+ for(i=0;i<4;i++) -+- s->num_coeffs[i] = 0; -++ s->num_coeffs[job][i] = 0; -+ } -+ -+ static void rpi_execute_pred_cmds(HEVCContext *s) -+ { -+ int i; -+- HEVCPredCmd *cmd = s->univ_pred_cmds; -++ int job = s->pass2_job; -++ HEVCPredCmd *cmd = s->univ_pred_cmds[job]; -++#ifdef RPI_WORKER -++ HEVCLocalContextIntra *lc = &s->HEVClcIntra; -++#else -+ HEVCLocalContext *lc = s->HEVClc; -++#endif -+ -+- for(i = s->num_pred_cmds; i > 0; i--, cmd++) { -++ for(i = s->num_pred_cmds[job]; i > 0; i--, cmd++) { -++ //printf("i=%d cmd=%p job1=%d job0=%d\n",i,cmd,s->pass1_job,s->pass0_job); -+ if (cmd->type == RPI_PRED_INTRA) { -+ lc->tu.intra_pred_mode_c = lc->tu.intra_pred_mode = cmd->mode; -+ lc->na.cand_bottom_left = (cmd->na >> 4) & 1; -+@@ -2884,21 +3049,26 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ #endif -+ } -+ } -+- s->num_pred_cmds = 0; -++ s->num_pred_cmds[job] = 0; -+ } -+ -+ static void rpi_execute_inter_cmds(HEVCContext *s) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds; -++#ifdef INTER_PASS0 -++ int job = s->pass0_job; -++#else -++ int job = s->pass1_job; -++#endif -++ HEVCMvCmd *cmd = s->unif_mv_cmds[job]; -+ int n,cidx; -+ AVFrame myref; -+ AVFrame myref1; -+ struct MvField mymv; -+- if (s->num_mv_cmds > RPI_MAX_MV_CMDS) { -++ if (s->num_mv_cmds[job] > RPI_MAX_MV_CMDS) { -+ printf("Overflow inter_cmds\n"); -+ exit(-1); -+ } -+- for(n = s->num_mv_cmds; n>0 ; n--, cmd++) { -++ for(n = s->num_mv_cmds[job]; n>0 ; n--, cmd++) { -+ switch(cmd->cmd) { -+ case RPI_CMD_LUMA_UNI: -+ myref.data[0] = cmd->src; -+@@ -2938,7 +3108,28 @@ static void rpi_execute_inter_cmds(HEVCContext *s) -+ break; -+ } -+ } -+- s->num_mv_cmds = 0; -++ s->num_mv_cmds[job] = 0; -++} -++ -++static void rpi_do_all_passes(HEVCContext *s) -++{ -++#ifdef RPI_INTER_QPU -++ // Kick off inter prediction on QPUs -++ rpi_execute_inter_qpu(s); -++#else -++ rpi_execute_transform(s); -++#endif -++ // Perform luma inter prediction -++ rpi_execute_inter_cmds(s); -++ // Wait for transform completion -++ vpu_wait(s->vpu_id); -++ // Perform intra prediction and residual reconstruction -++ rpi_execute_pred_cmds(s); -++ // Perform deblocking for CTBs in this row -++ rpi_execute_dblk_cmds(s); -++#ifdef RPI_INTER_QPU -++ rpi_inter_clear(s); -++#endif -+ } -+ -+ #endif -+@@ -2946,6 +3137,7 @@ static void rpi_execute_inter_cmds(HEVCContext *s) -+ #ifdef RPI_INTER_QPU -+ static void rpi_inter_clear(HEVCContext *s) -+ { -++ int job = s->pass0_job; -+ int i; -+ int pic_width = s->ps.sps->width >> s->ps.sps->hshift[1]; -+ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[1]; -+@@ -2953,51 +3145,50 @@ static void rpi_inter_clear(HEVCContext *s) -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+ for(i=0;i<8;i++) { -+- s->u_mvs[i] = s->mvs_base[i]; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = pic_width; -+- *s->u_mvs[i]++ = pic_height; -+- *s->u_mvs[i]++ = s->frame->linesize[1]; -+- *s->u_mvs[i]++ = s->frame->linesize[2]; -++ s->u_mvs[job][i] = s->mvs_base[job][i]; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = pic_width; -++ *s->u_mvs[job][i]++ = pic_height; -++ *s->u_mvs[job][i]++ = s->frame->linesize[1]; -++ *s->u_mvs[job][i]++ = s->frame->linesize[2]; -+ if (weight_flag) { -+- *s->u_mvs[i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -+- *s->u_mvs[i]++ = s->sh.chroma_log2_weight_denom + 6; -++ *s->u_mvs[job][i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -++ *s->u_mvs[job][i]++ = s->sh.chroma_log2_weight_denom + 6; -+ } else { -+- *s->u_mvs[i]++ = 1 << 5; -+- *s->u_mvs[i]++ = 6; -++ *s->u_mvs[job][i]++ = 1 << 5; -++ *s->u_mvs[job][i]++ = 6; -+ } -+- *s->u_mvs[i]++ = i; // Select section of VPM (avoid collisions with 3d unit) -++ *s->u_mvs[job][i]++ = i; // Select section of VPM (avoid collisions with 3d unit) -+ } -+ -+ #ifdef RPI_LUMA_QPU -+ for(i=0;i<12;i++) { -+- s->y_mvs[i] = s->y_mvs_base[i]; -+- *s->y_mvs[i]++ = 0; // y_x -+- *s->y_mvs[i]++ = 0; // ref_y_base -+- *s->y_mvs[i]++ = 0; // y2_x2 -+- *s->y_mvs[i]++ = 0; // ref_y2_base -+- *s->y_mvs[i]++ = (s->ps.sps->width << 16) + s->ps.sps->height; -+- *s->y_mvs[i]++ = s->frame->linesize[0]; // pitch -+- *s->y_mvs[i]++ = s->frame->linesize[0]; // dst_pitch -++ s->y_mvs[job][i] = s->y_mvs_base[job][i]; -++ *s->y_mvs[job][i]++ = 0; // y_x -++ *s->y_mvs[job][i]++ = 0; // ref_y_base -++ *s->y_mvs[job][i]++ = 0; // y2_x2 -++ *s->y_mvs[job][i]++ = 0; // ref_y2_base -++ *s->y_mvs[job][i]++ = (s->ps.sps->width << 16) + s->ps.sps->height; -++ *s->y_mvs[job][i]++ = s->frame->linesize[0]; // pitch -++ *s->y_mvs[job][i]++ = s->frame->linesize[0]; // dst_pitch -+ if (weight_flag) { -+ int offset = 1 << (s->sh.luma_log2_weight_denom + 6 - 1); -+ int shift = s->sh.luma_log2_weight_denom + 6; -+- *s->y_mvs[i]++ = (offset << 16) + shift; -++ *s->y_mvs[job][i]++ = (offset << 16) + shift; -+ } else { -+ int offset = 1 << 5; -+ int shift = 6; -+- *s->y_mvs[i]++ = (offset << 16) + shift; -++ *s->y_mvs[job][i]++ = (offset << 16) + shift; -+ } -+- *s->y_mvs[i]++ = 0; // Next kernel -++ *s->y_mvs[job][i]++ = 0; // Next kernel -+ } -+ #endif -+ } -+ -+- -+ #ifdef RPI_SIMULATE_QPUS -+ -+ static int32_t clipx(int x,int FRAME_WIDTH) -+@@ -3271,10 +3462,15 @@ static void rpi_simulate_inter_qpu(HEVCContext *s) -+ static void rpi_execute_inter_qpu(HEVCContext *s) -+ { -+ int k; -++#ifdef LAUNCH_PASS0 -++ int job = s->pass0_job; -++#else -++ int job = s->pass1_job; -++#endif -+ int i; -+- uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -++ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr[job].vc; -+ #ifdef RPI_LUMA_QPU -+- uint32_t *y_unif_vc = (uint32_t *)s->y_unif_mvs_ptr.vc; -++ uint32_t *y_unif_vc = (uint32_t *)s->y_unif_mvs_ptr[job].vc; -+ #endif -+ if (s->sh.slice_type == I_SLICE) { -+ #ifdef RPI_MULTI_MAILBOX -+@@ -3283,22 +3479,22 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ #endif -+ } -+ for(k=0;k<8;k++) { -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for V -+- av_assert0(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -++ s->u_mvs[job][k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ s->u_mvs[job][k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->u_mvs[job][k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for V -++ av_assert0(s->u_mvs[job][k] - s->mvs_base[job][k] < UV_COMMANDS_PER_QPU); -+ } -+ -+- s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++ s->u_mvs[job][8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ -+ #ifdef RPI_LUMA_QPU -+ for(k=0;k<12;k++) { -+- s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+1] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+- s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for second request -+- s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+- av_assert0(s->y_mvs[k] - s->y_mvs_base[k] < Y_COMMANDS_PER_QPU); -++ s->y_mvs[job][k][-RPI_LUMA_COMMAND_WORDS+1] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->y_mvs[job][k][-RPI_LUMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for second request -++ s->y_mvs[job][k][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ av_assert0(s->y_mvs[job][k] - s->y_mvs_base[job][k] < Y_COMMANDS_PER_QPU); -+ } -+- s->y_mvs[12-1][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT12); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++ s->y_mvs[job][12-1][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT12); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ #endif -+ -+ #ifdef RPI_SIMULATE_QPUS -+@@ -3308,34 +3504,34 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ #ifdef RPI_MULTI_MAILBOX -+ #ifdef RPI_CACHE_UNIF_MVS -+- gpu_cache_flush3(&s->coeffs_buf_accelerated,&s->y_unif_mvs_ptr, &s->unif_mvs_ptr); -++ gpu_cache_flush3(&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job]); -+ #else -+- gpu_cache_flush(&s->coeffs_buf_accelerated); -++ gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -+ #endif -+- s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, -++ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+- (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][1 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][2 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][3 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][4 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][5 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][6 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][7 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+ #ifdef RPI_LUMA_QPU -+ qpu_get_fn(QPU_MC_SETUP), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[0 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[1 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[2 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[3 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[4 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[5 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[6 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[7 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[8 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[9 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[10 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[11 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)) -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][0 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][1 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][2 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][3 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][4 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][5 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][6 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][7 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][8 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][9 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][10 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][11 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)) -+ #else -+ 0, -+ 0,0,0,0, -+@@ -3344,17 +3540,17 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ #endif -+ ); -+ for(i=0;i<4;i++) -+- s->num_coeffs[i] = 0; -++ s->num_coeffs[job][i] = 0; -+ #else -+ qpu_run_shader8(qpu_get_fn(QPU_MC_SETUP_UV), -+- (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][1 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][2 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][3 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][4 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][5 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][6 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][7 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)) -+ ); -+ #endif -+ -+@@ -3411,6 +3607,11 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ } -+ -++#ifdef RPI_WORKER -++ s->pass0_job = 0; -++ s->pass1_job = 0; -++ s->pass2_job = 0; -++#endif -+ #ifdef RPI_INTER_QPU -+ rpi_inter_clear(s); -+ #endif -+@@ -3431,46 +3632,42 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -++ -+ #ifdef RPI -+ if (s->enable_rpi) { -+- s->dblk_cmds[s->num_dblk_cmds][0] = x_ctb; -+- s->dblk_cmds[s->num_dblk_cmds++][1] = y_ctb; -++ s->dblk_cmds[s->pass0_job][s->num_dblk_cmds[s->pass0_job]][0] = x_ctb; -++ s->dblk_cmds[s->pass0_job][s->num_dblk_cmds[s->pass0_job]++][1] = y_ctb; -+ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+- // Transform all blocks -+- // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+-#ifdef RPI_MULTI_MAILBOX -+- // Kick off inter prediction on QPUs -+- rpi_execute_inter_qpu(s); -+- // Perform luma inter prediction -+- rpi_execute_inter_cmds(s); -+-#else -+- rpi_execute_transform(s); -+- // Perform inter prediction -+- rpi_execute_inter_cmds(s); -+-#ifdef RPI_INTER_QPU -+- // Kick off inter prediction on QPUs -+- rpi_execute_inter_qpu(s); -+-#endif -+-#endif -+- -+- // Wait for transform completion -+- vpu_wait(s->vpu_id); -+- -+- // Copy back reconstructed data -+- //memcpy(s->frame->data[0],s->dummy.arm,2048*64); -+- //memcpy(s->frame->data[1],s->dummy.arm,1024*32); -+- //memcpy(s->frame->data[2],s->dummy.arm,1024*32); -++#ifdef RPI_WORKER -++ if (s->used_for_ref) { -++ // Split work load onto separate threads so we make as rapid progress as possible with this frame -++ #ifdef INTER_PASS0 -++ rpi_execute_inter_cmds(s); -++ #endif -++ #ifdef LAUNCH_PASS0 -++ rpi_execute_inter_qpu(s); -++ #endif -++ // Pass on this job to worker thread -++ worker_submit_job(s); -++ // Make sure we have space to prepare the next job -++ worker_pass0_ready(s); -+ -+- // Perform intra prediction and residual reconstruction -+- rpi_execute_pred_cmds(s); -+- // Perform deblocking for CTBs in this row -+- rpi_execute_dblk_cmds(s); -++ // Prepare the next batch of commands -+ #ifdef RPI_INTER_QPU -+- rpi_inter_clear(s); -++ rpi_inter_clear(s); -++#endif -++ } else { -++ // Non-ref frame so do it all on this thread -++ rpi_do_all_passes(s); -++ } -++#else -++ rpi_do_all_passes(s); -+ #endif -+ } -+ } -+ #endif -++ -++ -+ if (more_data < 0) { -+ s->tab_slice_address[ctb_addr_rs] = -1; -+ return more_data; -+@@ -3487,18 +3684,21 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ -+ #ifdef RPI -+- if (s->enable_rpi && s->num_dblk_cmds) { -+-#ifdef RPI_INTER_QPU -+- rpi_execute_inter_qpu(s); -+-#endif -+-#ifndef RPI_MULTI_MAILBOX -+- rpi_execute_transform(s); -++ -++#ifdef RPI_WORKER -++ // Wait for the worker to finish all its jobs -++ if (s->enable_rpi) { -++ worker_wait(s); -++ av_assert0(s->pass0_job==s->pass1_job); -++ av_assert0(s->pass1_job==s->pass2_job); -++ } -+ #endif -+- rpi_execute_inter_cmds(s); -+- vpu_wait(s->vpu_id); -+- rpi_execute_pred_cmds(s); -+- rpi_execute_dblk_cmds(s); -++ -++ // Finish off any half-completed rows -++ if (s->enable_rpi && s->num_dblk_cmds[s->pass0_job]) { -++ rpi_do_all_passes(s); -+ } -++ -+ #endif -+ -+ if (x_ctb + ctb_size >= s->ps.sps->width && -+@@ -4230,6 +4430,48 @@ fail: -+ return AVERROR(ENOMEM); -+ } -+ -++#ifdef RPI_WORKER -++static av_cold void hevc_init_worker(HEVCContext *s) -++{ -++ int err; -++ pthread_cond_init(&s->worker_cond_head, NULL); -++ pthread_cond_init(&s->worker_cond_middle, NULL); -++ pthread_cond_init(&s->worker_cond_tail, NULL); -++ pthread_mutex_init(&s->worker_mutex, NULL); -++ -++ s->worker_tail=0; -++ s->worker_middle=0; -++ s->worker_head=0; -++ s->kill_worker=0; -++ err = pthread_create(&s->worker_thread, NULL, worker_start, s); -++ err = pthread_create(&s->worker_deblock_thread, NULL, worker_deblock_start, s); -++ if (err) { -++ printf("Failed to create worker thread\n"); -++ exit(-1); -++ } -++} -++ -++static av_cold void hevc_exit_worker(HEVCContext *s) -++{ -++ void *res; -++ s->kill_worker=1; -++ pthread_cond_broadcast(&s->worker_cond_tail); -++ pthread_cond_broadcast(&s->worker_cond_middle); -++ pthread_join(s->worker_thread, &res); -++ pthread_join(s->worker_deblock_thread, &res); -++ -++ pthread_cond_destroy(&s->worker_cond_head); -++ pthread_cond_destroy(&s->worker_cond_middle); -++ pthread_cond_destroy(&s->worker_cond_tail); -++ pthread_mutex_destroy(&s->worker_mutex); -++ -++ s->worker_tail=0; -++ s->worker_middle=0; -++ s->worker_head=0; -++ s->kill_worker=0; -++} -++#endif -++ -+ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ { -+ HEVCContext *s = avctx->priv_data; -+@@ -4242,33 +4484,29 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->cabac_state); -+ -+ #ifdef RPI -+- av_freep(&s->unif_mv_cmds); -+- av_freep(&s->univ_pred_cmds); -++ -++#ifdef RPI_WORKER -++ hevc_exit_worker(s); -++#endif -++ -++ for(i=0;iunif_mv_cmds[i]); -++ av_freep(&s->univ_pred_cmds[i]); -+ -+ #ifdef RPI_INTER_QPU -+- if (s->unif_mvs) { -+- gpu_free( &s->unif_mvs_ptr ); -+- s->unif_mvs = 0; -+- } -++ if (s->unif_mvs[i]) { -++ gpu_free( &s->unif_mvs_ptr[i] ); -++ s->unif_mvs[i] = 0; -++ } -+ #endif -+ #ifdef RPI_LUMA_QPU -+- if (s->y_unif_mvs) { -+- gpu_free( &s->y_unif_mvs_ptr ); -+- s->y_unif_mvs = 0; -+- } -++ if (s->y_unif_mvs[i]) { -++ gpu_free( &s->y_unif_mvs_ptr[i] ); -++ s->y_unif_mvs[i] = 0; -++ } -+ #endif -+- -+-#ifdef EARLY_MALLOC -+- printf("hevc_decode_free\n"); -+- if (s->coeffs_buf_arm[0]) { -+- gpu_free(&s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = 0; -+- } -+- if (s->coeffs_buf_arm[2]) { -+- gpu_free(&s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = 0; -+ } -+-#endif -++ -+ #endif -+ -+ for (i = 0; i < 3; i++) { -+@@ -4328,6 +4566,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ { -+ HEVCContext *s = avctx->priv_data; -+ int i; -++ int job; -+ -+ s->avctx = avctx; -+ -+@@ -4338,12 +4577,14 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->sList[0] = s; -+ -+ #ifdef RPI -+- s->unif_mv_cmds = av_mallocz(sizeof(HEVCMvCmd)*RPI_MAX_MV_CMDS); -+- if (!s->unif_mv_cmds) -+- goto fail; -+- s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -+- if (!s->univ_pred_cmds) -+- goto fail; -++ for(job=0;jobunif_mv_cmds[job] = av_mallocz(sizeof(HEVCMvCmd)*RPI_MAX_MV_CMDS); -++ if (!s->unif_mv_cmds[job]) -++ goto fail; -++ s->univ_pred_cmds[job] = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -++ if (!s->univ_pred_cmds[job]) -++ goto fail; -++ } -+ -+ #ifdef RPI_INTER_QPU -+ // We divide the image into blocks 256 wide and 64 high -+@@ -4354,18 +4595,20 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ { -+ int uv_commands_per_qpu = UV_COMMANDS_PER_QPU; -+ uint32_t *p; -++ for(job=0;jobunif_mvs_ptr ); -++ gpu_malloc_cached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr[job] ); -+ #else -+- gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr[job] ); -+ #endif -+- s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -++ s->unif_mvs[job] = (uint32_t *) s->unif_mvs_ptr[job].arm; -+ -+- // Set up initial locations for uniform streams -+- p = s->unif_mvs; -+- for(i = 0; i < 8; i++) { -+- s->mvs_base[i] = p; -++ // Set up initial locations for uniform streams -++ p = s->unif_mvs[job]; -++ for(i = 0; i < 8; i++) { -++ s->mvs_base[job][i] = p; -+ p += uv_commands_per_qpu; -++ } -+ } -+ s->mc_filter_uv = qpu_get_fn(QPU_MC_FILTER_UV); -+ s->mc_filter_uv_b0 = qpu_get_fn(QPU_MC_FILTER_UV_B0); -+@@ -4374,61 +4617,35 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ } -+ #endif -+ #ifdef RPI_LUMA_QPU -++ for(job=0;joby_unif_mvs_ptr ); -++ gpu_malloc_cached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr[job] ); -+ #else -+- gpu_malloc_uncached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr ); -++ gpu_malloc_uncached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr[job] ); -+ #endif -+- s->y_unif_mvs = (uint32_t *) s->y_unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -++ s->y_unif_mvs[job] = (uint32_t *) s->y_unif_mvs_ptr[job].arm; -+ -+ // Set up initial locations for uniform streams -+- p = s->y_unif_mvs; -++ p = s->y_unif_mvs[job]; -+ for(i = 0; i < 12; i++) { -+- s->y_mvs_base[i] = p; -++ s->y_mvs_base[job][i] = p; -+ p += y_commands_per_qpu; -+ } -+- s->mc_filter = qpu_get_fn(QPU_MC_FILTER); -+- s->mc_filter_b = qpu_get_fn(QPU_MC_FILTER_B); -+- -+ } -++ s->mc_filter = qpu_get_fn(QPU_MC_FILTER); -++ s->mc_filter_b = qpu_get_fn(QPU_MC_FILTER_B); -+ #endif -+ //gpu_malloc_uncached(2048*64,&s->dummy); -+ -+-#ifdef EARLY_MALLOC -+- { -+- int coeffs_in_ctb = 64*64; -+- int coefs_per_row = (2048/64) * coeffs_in_ctb * 3; // Allow space for chroma -+- s->coeffs_buf_arm[0] = 0; -+- s->coeffs_buf_arm[2] = 0; -+- printf("Allocated %d\n",coefs_per_row); -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -+- if (!s->coeffs_buf_arm[0]) -+- goto fail; -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -+- s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -+- if (!s->coeffs_buf_arm[2]) -+- goto fail; -+- s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -+- s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -+- printf("Done\n"); -+-#ifdef RPI_PRECLEAR -+- //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[0], coefs_per_row); -+- //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[2], coefs_per_row); -+- //memset(s->coeffs_buf_arm[3],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[3], coefs_per_row); -+-#endif -+- } -+-#endif -+- -+ s->enable_rpi = 0; -+ -++#ifdef RPI_WORKER -++ hevc_init_worker(s); -++#endif -++ -+ #endif -+ -+ s->cabac_state = av_malloc(HEVC_CONTEXTS); -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 5cb90b5..7bd295a 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -51,6 +51,12 @@ -+ // Define RPI_LUMA_QPU to also use QPU for luma inter prediction -+ #define RPI_LUMA_QPU -+ #endif -++ -++ // By passing jobs to a worker thread we hope to be able to catch up during slow frames -++ #define RPI_MAX_JOBS 2 -++ // Define RPI_WORKER to launch a worker thread for pixel processing tasks -++ #define RPI_WORKER -++ -+ #endif -+ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+@@ -806,6 +812,13 @@ typedef struct HEVCLocalContext { -+ int boundary_flags; -+ } HEVCLocalContext; -+ -++#ifdef RPI_WORKER -++typedef struct HEVCLocalContextIntra { -++ TransformUnit tu; -++ NeighbourAvailable na; -++} HEVCLocalContextIntra; -++#endif -++ -+ #ifdef RPI -+ -+ // RPI_MAX_WIDTH is maximum width in pixels supported by the accelerated code -+@@ -874,7 +887,7 @@ typedef struct HEVCPredCmd { -+ -+ typedef struct HEVCContext { -+ #ifdef RPI -+- int dblk_cmds[RPI_MAX_DEBLOCK_CMDS][2]; -++ int dblk_cmds[RPI_MAX_JOBS][RPI_MAX_DEBLOCK_CMDS][2]; -+ #endif -+ const AVClass *c; // needed by private avoptions -+ AVCodecContext *avctx; -+@@ -883,7 +896,9 @@ typedef struct HEVCContext { -+ -+ HEVCLocalContext *HEVClcList[MAX_NB_THREADS]; -+ HEVCLocalContext *HEVClc; -+- -++#ifdef RPI_WORKER -++ HEVCLocalContextIntra HEVClcIntra; -++#endif -+ uint8_t threads_type; -+ uint8_t threads_number; -+ -+@@ -894,43 +909,60 @@ typedef struct HEVCContext { -+ -+ #ifdef RPI -+ int enable_rpi; -+- HEVCMvCmd *unif_mv_cmds; -+- HEVCPredCmd *univ_pred_cmds; -++ HEVCMvCmd *unif_mv_cmds[RPI_MAX_JOBS]; -++ HEVCPredCmd *univ_pred_cmds[RPI_MAX_JOBS]; -+ int buf_width; -+- GPU_MEM_PTR_T coeffs_buf_default; -+- GPU_MEM_PTR_T coeffs_buf_accelerated; -+- int16_t *coeffs_buf_arm[4]; -+- unsigned int coeffs_buf_vc[4]; -+- int num_coeffs[4]; -+- int num_xfm_cmds; -+- int num_mv_cmds; -+- int num_pred_cmds; -+- int num_dblk_cmds; -++ GPU_MEM_PTR_T coeffs_buf_default[RPI_MAX_JOBS]; -++ GPU_MEM_PTR_T coeffs_buf_accelerated[RPI_MAX_JOBS]; -++ int16_t *coeffs_buf_arm[RPI_MAX_JOBS][4]; -++ unsigned int coeffs_buf_vc[RPI_MAX_JOBS][4]; -++ int num_coeffs[RPI_MAX_JOBS][4]; -++ int num_xfm_cmds[RPI_MAX_JOBS]; -++ int num_mv_cmds[RPI_MAX_JOBS]; -++ int num_pred_cmds[RPI_MAX_JOBS]; -++ int num_dblk_cmds[RPI_MAX_JOBS]; -+ int vpu_id; -+ //GPU_MEM_PTR_T dummy; -++ int pass0_job; // Pass0 does coefficient decode -++ int pass1_job; // Pass1 does pixel processing -++ int pass2_job; // Pass2 does reconstruction and deblocking -+ #ifdef RPI_INTER_QPU -+- GPU_MEM_PTR_T unif_mvs_ptr; -+- uint32_t *unif_mvs; // Base of memory for motion vector commands -++ GPU_MEM_PTR_T unif_mvs_ptr[RPI_MAX_JOBS]; -++ uint32_t *unif_mvs[RPI_MAX_JOBS]; // Base of memory for motion vector commands -+ -+ // _base pointers are to the start of the row -+- uint32_t *mvs_base[8]; -++ uint32_t *mvs_base[RPI_MAX_JOBS][8]; -+ // these pointers are to the next free space -+- uint32_t *u_mvs[8]; -++ uint32_t *u_mvs[RPI_MAX_JOBS][8]; -+ // Function pointers -+ uint32_t mc_filter_uv; -+ uint32_t mc_filter_uv_b0; -+ uint32_t mc_filter_uv_b; -+ #endif -+ #ifdef RPI_LUMA_QPU -+- GPU_MEM_PTR_T y_unif_mvs_ptr; -+- uint32_t *y_unif_mvs; // Base of memory for motion vector commands -+- uint32_t *y_mvs_base[12]; -+- uint32_t *y_mvs[12]; -++ GPU_MEM_PTR_T y_unif_mvs_ptr[RPI_MAX_JOBS]; -++ uint32_t *y_unif_mvs[RPI_MAX_JOBS]; // Base of memory for motion vector commands -++ uint32_t *y_mvs_base[RPI_MAX_JOBS][12]; -++ uint32_t *y_mvs[RPI_MAX_JOBS][12]; -+ // Function pointers -+ uint32_t mc_filter; -+ uint32_t mc_filter_b; -+ #endif -+ -++#ifdef RPI_WORKER -++ pthread_t worker_thread; -++ pthread_t worker_deblock_thread; -++ pthread_cond_t worker_cond_head; -++ pthread_cond_t worker_cond_tail; -++ pthread_cond_t worker_cond_middle; -++ pthread_mutex_t worker_mutex; -++ -++ int worker_tail; // Contains the number of posted jobs -++ int worker_head; // Contains the number of completed jobs -++ int worker_middle; // Contains the number of completed jobs -++ int kill_worker; // set to 1 to terminate the worker -++#endif -++ -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 38f53de..f0982cd 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1051,11 +1051,11 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ if (s->enable_rpi) { -+ int n = trafo_size * trafo_size; -+ if (use_vpu) { -+- coeffs = s->coeffs_buf_arm[log2_trafo_size - 2] + s->num_coeffs[log2_trafo_size - 2]; -+- s->num_coeffs[log2_trafo_size - 2] += n; -++ coeffs = s->coeffs_buf_arm[s->pass0_job][log2_trafo_size - 2] + s->num_coeffs[s->pass0_job][log2_trafo_size - 2]; -++ s->num_coeffs[s->pass0_job][log2_trafo_size - 2] += n; -+ } else { -+- coeffs = s->coeffs_buf_arm[0] + s->num_coeffs[0]; -+- s->num_coeffs[0] += n; -++ coeffs = s->coeffs_buf_arm[s->pass0_job][0] + s->num_coeffs[s->pass0_job][0]; -++ s->num_coeffs[s->pass0_job][0] += n; -+ } -+ } -+ // We now do the memset after transform_add while we know the data is cached. -+@@ -1508,7 +1508,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ s->hevcdsp.transform_rdpcm(coeffs, log2_trafo_size, mode); -+ } -+ } else if (lc->cu.pred_mode == MODE_INTRA && c_idx == 0 && log2_trafo_size == 2) { -+- s->hevcdsp.idct_4x4_luma(coeffs); -++ s->hevcdsp.idct_4x4_luma(coeffs); -+ } else { -+ #ifdef RPI -+ if (!use_vpu) { -+@@ -1553,7 +1553,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ #ifdef RPI -+ if (s->enable_rpi) { -+- HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -++ HEVCPredCmd *cmd = s->univ_pred_cmds[s->pass0_job] + s->num_pred_cmds[s->pass0_job]++; -+ cmd->type = RPI_PRED_TRANSFORM_ADD; -+ cmd->size = log2_trafo_size; -+ cmd->buf = coeffs; -+diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c -+index 71c6d52..344e021 100644 -+--- a/libavcodec/hevcpred_template.c -++++ b/libavcodec/hevcpred_template.c -+@@ -71,8 +71,11 @@ do { \ -+ AV_WN4P(&ptr[i], a); \ -+ else \ -+ a = PIXEL_SPLAT_X4(ptr[i + 3]) -+- -++#ifdef RPI_WORKER -++ HEVCLocalContextIntra *lc = &s->HEVClcIntra; -++#else -+ HEVCLocalContext *lc = s->HEVClc; -++#endif -+ int i; -+ int hshift = s->ps.sps->hshift[c_idx]; -+ int vshift = s->ps.sps->vshift[c_idx]; -+-- -+2.7.4 -+ -+ -+From 1e0885f8d98175777fff65b4cedd708176c2abcf Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 13:43:48 +0100 -+Subject: [PATCH 54/68] Avoid lockup bug with RPI_WORKER enabled -+ -+--- -+ libavcodec/hevc.c | 22 +++++++++++----------- -+ libavcodec/hevc_cabac.c | 1 - -+ 2 files changed, 11 insertions(+), 12 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 12aacc5..182a82f 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -133,11 +133,11 @@ static uint32_t get_vc_address(AVBufferRef *bref) { -+ static void worker_submit_job(HEVCContext *s) -+ { -+ LOG_ENTER -+- //pthread_mutex_lock(&s->worker_mutex); -+- s->worker_tail++; // This is the only place that can change tail so we do not need the mutex -++ pthread_mutex_lock(&s->worker_mutex); -++ s->worker_tail++; -+ s->pass0_job = (s->pass0_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+ pthread_cond_broadcast(&s->worker_cond_tail); // Let people know that the tail has moved -+- //pthread_mutex_unlock(&s->worker_mutex); -++ pthread_mutex_unlock(&s->worker_mutex); -+ LOG_EXIT -+ } -+ -+@@ -145,11 +145,11 @@ static void worker_submit_job(HEVCContext *s) -+ static void worker_complete_middle_job(HEVCContext *s) -+ { -+ LOG_ENTER -+- //pthread_mutex_lock(&s->worker_mutex); -+- s->worker_middle++; // This is the only place that can change head so we do not need the mutex -++ pthread_mutex_lock(&s->worker_mutex); -++ s->worker_middle++; -+ s->pass1_job = (s->pass1_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+- pthread_cond_broadcast(&s->worker_cond_middle); // Let people know that the tail has moved -+- //pthread_mutex_unlock(&s->worker_mutex); -++ pthread_cond_broadcast(&s->worker_cond_middle); // Let people know that the middle has moved -++ pthread_mutex_unlock(&s->worker_mutex); -+ LOG_EXIT -+ } -+ -+@@ -157,11 +157,11 @@ static void worker_complete_middle_job(HEVCContext *s) -+ static void worker_complete_job(HEVCContext *s) -+ { -+ LOG_ENTER -+- //pthread_mutex_lock(&s->worker_mutex); -+- s->worker_head++; // This is the only place that can change head so we do not need the mutex -++ pthread_mutex_lock(&s->worker_mutex); -++ s->worker_head++; -+ s->pass2_job = (s->pass2_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+- pthread_cond_broadcast(&s->worker_cond_head); // Let people know that the tail has moved -+- //pthread_mutex_unlock(&s->worker_mutex); -++ pthread_cond_broadcast(&s->worker_cond_head); // Let people know that the head has moved -++ pthread_mutex_unlock(&s->worker_mutex); -+ LOG_EXIT -+ } -+ -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index f0982cd..6523e66 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1497,7 +1497,6 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < 8; i++) -+ FFSWAP(int16_t, coeffs[i], coeffs[16 - i - 1]); -+ } -+- -+ s->hevcdsp.transform_skip(coeffs, log2_trafo_size); -+ -+ if (explicit_rdpcm_flag || (s->ps.sps->implicit_rdpcm_enabled_flag && -+-- -+2.7.4 -+ -+ -+From 1d7ad81069dec6914ec7e9983855d7a1b5e4b123 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 15:37:19 +0100 -+Subject: [PATCH 55/68] Added code to flush buffers at start of frame -+ -+--- -+ libavcodec/hevc.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -+ 1 file changed, 72 insertions(+) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 182a82f..e5b9f1e 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -43,6 +43,7 @@ -+ -+ #ifdef RPI -+ #include "rpi_qpu.h" -++ #include "rpi_user_vcsm.h" -+ // Move Inter prediction into separate pass -+ #define RPI_INTER -+ -+@@ -3508,6 +3509,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ #else -+ gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -+ #endif -++ -+ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+@@ -3558,6 +3560,71 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ } -+ #endif -+ -++#ifdef RPI -++ -++static void flush_buffer(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ gpu_cache_flush(p); -++} -++ -++static void flush_frame(HEVCContext *s,AVFrame *frame) -++{ -++#if 1 -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ int n = s->ps.sps->height; -++ int curr_y = 0; -++ int curr_uv = 0; -++ int n_uv = n >> s->ps.sps->vshift[1]; -++ int sz,base; -++ sz = s->frame->linesize[1] * (n_uv-curr_uv); -++ base = s->frame->linesize[1] * curr_uv; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = p->arm + base; -++ iocache.s[0].size = sz; -++ p = av_buffer_pool_opaque(frame->buf[2]); -++ iocache.s[1].handle = p->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = p->arm + base; -++ iocache.s[1].size = sz; -++ p = av_buffer_pool_opaque(frame->buf[0]); -++ sz = s->frame->linesize[0] * (n-curr_y); -++ base = s->frame->linesize[0] * curr_y; -++ iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = p->arm + base; -++ iocache.s[2].size = sz; -++ vcsm_clean_invalid( &iocache ); -++#else -++ flush_buffer(frame->buf[0]); -++ flush_buffer(frame->buf[1]); -++ flush_buffer(frame->buf[2]); -++#endif -++} -++ -++static void flush_all(HEVCContext *s) -++{ -++#if 0 -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[0]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 4; // Flush all -++ iocache.s[0].addr = p->arm; -++ iocache.s[0].size = 4096; -++ vcsm_clean_invalid( &iocache ); -++#else -++ int i,k; -++ for(i=0;i<2;i++) { -++ for (k = 0; k < s->sh.nb_refs[i]; k++) { -++ flush_frame(s,s->ref->refPicList[i].ref[k]->frame); -++ } -++ } -++ flush_frame(s,s->frame); -++#endif -++} -++#endif -++ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ { -+ HEVCContext *s = avctxt->priv_data; -+@@ -3592,8 +3659,12 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ printf("Weighted B slice\n"); -+ } -+ -++ // Now flush all reference frames and our destination frame to get everything ready for decode -++ flush_all(s); -+ #endif -+ -++ //printf("L0=%d L1=%d\n",s->sh.nb_refs[L1],s->sh.nb_refs[L1]); -++ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+ av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); -+ return AVERROR_INVALIDDATA; -+@@ -3664,6 +3735,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ rpi_do_all_passes(s); -+ #endif -+ } -++ -+ } -+ #endif -+ -+-- -+2.7.4 -+ -+ -+From 7a57f233dcd4048e20a0b5bc06bc20abb589d3fa Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 16:42:24 +0100 -+Subject: [PATCH 56/68] Reduce the amount that needs to be flushed -+ -+--- -+ libavcodec/hevc.c | 35 +++++++++++------------------------ -+ 1 file changed, 11 insertions(+), 24 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index e5b9f1e..73d7f74 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3569,7 +3569,7 @@ static void flush_buffer(AVBufferRef *bref) { -+ -+ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ { -+-#if 1 -++#ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ int n = s->ps.sps->height; -+ int curr_y = 0; -+@@ -3603,26 +3603,6 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ #endif -+ } -+ -+-static void flush_all(HEVCContext *s) -+-{ -+-#if 0 -+- struct vcsm_user_clean_invalid_s iocache = {}; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[0]); -+- iocache.s[0].handle = p->vcsm_handle; -+- iocache.s[0].cmd = 4; // Flush all -+- iocache.s[0].addr = p->arm; -+- iocache.s[0].size = 4096; -+- vcsm_clean_invalid( &iocache ); -+-#else -+- int i,k; -+- for(i=0;i<2;i++) { -+- for (k = 0; k < s->sh.nb_refs[i]; k++) { -+- flush_frame(s,s->ref->refPicList[i].ref[k]->frame); -+- } -+- } -+- flush_frame(s,s->frame); -+-#endif -+-} -+ #endif -+ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+@@ -3658,9 +3638,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ if (s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE) -+ printf("Weighted B slice\n"); -+ } -+- -+- // Now flush all reference frames and our destination frame to get everything ready for decode -+- flush_all(s); -+ #endif -+ -+ //printf("L0=%d L1=%d\n",s->sh.nb_refs[L1],s->sh.nb_refs[L1]); -+@@ -4130,6 +4107,11 @@ static int hevc_frame_start(HEVCContext *s) -+ if (!s->avctx->hwaccel) -+ ff_thread_finish_setup(s->avctx); -+ -++#ifdef RPI_INTER_QPU -++ // Invalidate the output data buffer so it is ready for the QPUs to write into it. -++ flush_frame(s,s->frame); -++#endif -++ -+ return 0; -+ -+ fail: -+@@ -4331,6 +4313,11 @@ fail: -+ ff_hevc_flush_buffer(s, &s->ref->tf, s->ps.sps->height); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); -++ } else if (s->ref) { -++#ifdef RPI_INTER_QPU -++ // When running single threaded we need to flush the whole frame -++ flush_frame(s,s->frame); -++#endif -+ } -+ return ret; -+ } -+-- -+2.7.4 -+ -+ -+From 26eba8e3266cc5f2120e8284a1ce486d6a402010 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 4 Jun 2015 07:59:28 +0100 -+Subject: [PATCH 57/68] Corrected support for disabled rpi when using -+ RPI_WORKER -+ -+--- -+ libavcodec/hevc.h | 18 ++++++++++-------- -+ libavcodec/hevcpred_template.c | 2 +- -+ 2 files changed, 11 insertions(+), 9 deletions(-) -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 7bd295a..3cb34bd 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -769,7 +769,17 @@ typedef struct HEVCFrame { -+ uint8_t flags; -+ } HEVCFrame; -+ -++#ifdef RPI_WORKER -++typedef struct HEVCLocalContextIntra { -++ TransformUnit tu; -++ NeighbourAvailable na; -++} HEVCLocalContextIntra; -++#endif -++ -+ typedef struct HEVCLocalContext { -++ TransformUnit tu; -++ NeighbourAvailable na; // WARNING tu and na must be the first two fields to match HEVCLocalContextIntra -++ -+ uint8_t cabac_state[HEVC_CONTEXTS]; -+ -+ uint8_t stat_coeff[4]; -+@@ -784,7 +794,6 @@ typedef struct HEVCLocalContext { -+ -+ int qPy_pred; -+ -+- TransformUnit tu; -+ -+ uint8_t ctb_left_flag; -+ uint8_t ctb_up_flag; -+@@ -801,7 +810,6 @@ typedef struct HEVCLocalContext { -+ int ct_depth; -+ CodingUnit cu; -+ PredictionUnit pu; -+- NeighbourAvailable na; -+ -+ #define BOUNDARY_LEFT_SLICE (1 << 0) -+ #define BOUNDARY_LEFT_TILE (1 << 1) -+@@ -812,12 +820,6 @@ typedef struct HEVCLocalContext { -+ int boundary_flags; -+ } HEVCLocalContext; -+ -+-#ifdef RPI_WORKER -+-typedef struct HEVCLocalContextIntra { -+- TransformUnit tu; -+- NeighbourAvailable na; -+-} HEVCLocalContextIntra; -+-#endif -+ -+ #ifdef RPI -+ -+diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c -+index 344e021..325b60e 100644 -+--- a/libavcodec/hevcpred_template.c -++++ b/libavcodec/hevcpred_template.c -+@@ -72,7 +72,7 @@ do { \ -+ else \ -+ a = PIXEL_SPLAT_X4(ptr[i + 3]) -+ #ifdef RPI_WORKER -+- HEVCLocalContextIntra *lc = &s->HEVClcIntra; -++ HEVCLocalContextIntra *lc = s->enable_rpi ? &s->HEVClcIntra : (HEVCLocalContextIntra *)s->HEVClc ; -+ #else -+ HEVCLocalContext *lc = s->HEVClc; -+ #endif -+-- -+2.7.4 -+ -+ -+From 5b3eee9be88a5326df7621de95095def969e05a8 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 4 Jun 2015 11:52:55 +0100 -+Subject: [PATCH 58/68] Draft support for tiles -+ -+--- -+ libavcodec/hevc.c | 140 +++++++++++++++++++++++------------------ -+ libavcodec/hevc.h | 21 +++++-- -+ libavcodec/hevc_filter.c | 2 +- -+ libavcodec/hevcpred_template.c | 2 +- -+ 4 files changed, 99 insertions(+), 66 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 73d7f74..ec67252 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -63,10 +63,10 @@ -+ -+ static void rpi_execute_dblk_cmds(HEVCContext *s); -+ static void rpi_execute_transform(HEVCContext *s); -+- static void rpi_execute_inter_qpu(HEVCContext *s); -++ static void rpi_launch_vpu_qpu(HEVCContext *s); -+ static void rpi_execute_pred_cmds(HEVCContext *s); -+ static void rpi_execute_inter_cmds(HEVCContext *s); -+- static void rpi_inter_clear(HEVCContext *s); -++ static void rpi_begin(HEVCContext *s); -+ -+ // Define INTER_PASS0 to do inter prediction in first pass -+ //#define INTER_PASS0 -+@@ -90,16 +90,18 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ -+ #ifdef RPI_INTER_QPU -+ -++// Each luma QPU processes 2*RPI_NUM_CHUNKS 64x64 blocks -++// Each chroma QPU processes 3*RPI_NUM_CHUNKS 64x64 blocks, but requires two commands for B blocks -++// For each block of 64*64 the smallest block size is 8x4 -++// We also need an extra command for the setup information -++ -+ #define RPI_CHROMA_COMMAND_WORDS 12 -+-#define UV_COMMANDS_PER_QPU ((1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS) -++#define UV_COMMANDS_PER_QPU ((1 + 3*RPI_NUM_CHUNKS*(64*64)*2/(8*4)) * RPI_CHROMA_COMMAND_WORDS) -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+ -+-// Split image of 2048 into parts 64 wide -+-// So some QPUs will have 3 blocks of 64 to do, and others 2 blocks for an image 2048 wide with 32 blocks across -+-// For each block of 64*64 the smallest block size is 8x4 -+ #define RPI_LUMA_COMMAND_WORDS 9 -+-#define Y_COMMANDS_PER_QPU ((1+3*(64*64)/(8*4)) * RPI_LUMA_COMMAND_WORDS) -++#define Y_COMMANDS_PER_QPU ((1+2*RPI_NUM_CHUNKS*(64*64)/(8*4)) * RPI_LUMA_COMMAND_WORDS) -+ -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+@@ -216,7 +218,7 @@ static void *worker_start(void *arg) -+ LOG_ENTER -+ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+ #ifndef LAUNCH_PASS0 -+- rpi_execute_inter_qpu(s); -++ rpi_launch_vpu_qpu(s); -+ #endif -+ #ifndef INTER_PASS0 -+ // Perform inter prediction -+@@ -322,9 +324,14 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ -+ #ifdef RPI -+ av_assert0(sps); -+- int coeffs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+- int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -++ int coefs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -++ int coefs_per_luma = 64*64*24*RPI_NUM_CHUNKS; -++ int coefs_per_chroma = (coefs_per_luma * 2) >> sps->vshift[1] >> sps->hshift[1]; -++ int coefs_per_row = coefs_per_luma + coefs_per_chroma; -+ int job; -++ s->max_ctu_count = coefs_per_luma / coefs_in_ctb; -++ s->ctu_per_y_chan = s->max_ctu_count / 12; -++ s->ctu_per_uv_chan = s->max_ctu_count / 8; -+ for(job=0;jobx >> 2); -+ int y1 = y0 + (mv->y >> 2); -+- int chan = x0>>6; // 64 wide blocks per QPU -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+- uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -++ uint32_t *y = s->curr_y_mvs; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -+ int bw = nPbW-start_x; -+@@ -2209,7 +2215,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+- s->y_mvs[s->pass0_job][chan % 12] = y; -++ s->curr_y_mvs = y; -+ } else -+ #endif -+ { -+@@ -2233,12 +2239,10 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ -+ int x1_c = x0_c + (mv->x >> (2 + hshift)); -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+- //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+- int chan = x0>>8; -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+- uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -++ uint32_t *u = s->curr_u_mvs; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2262,7 +2266,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[s->pass0_job][chan & 7] = u; -++ s->curr_u_mvs = u; -+ return; -+ } -+ #endif -+@@ -2289,10 +2293,9 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int my2_mx2_my_mx = (my_mx << 16) + my_mx; -+ int x1 = x0 + (mv->x >> 2); -+ int y1 = y0 + (mv->y >> 2); -+- int chan = x0>>6; // 64 wide blocks per QPU -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+- uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -++ uint32_t *y = s->curr_y_mvs; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -+ int bw = nPbW-start_x; -+@@ -2312,7 +2315,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+- s->y_mvs[s->pass0_job][chan % 12] = y; -++ s->curr_y_mvs = y; -+ } else -+ #endif -+ -+@@ -2337,12 +2340,10 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ -+ int x1_c = x0_c + (mv->x >> (2 + hshift)); -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+- //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+- int chan = x0>>8; -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+- uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -++ uint32_t *u = s->curr_u_mvs; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2367,7 +2368,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[s->pass0_job][chan & 7] = u; -++ s->curr_u_mvs = u; -+ return; -+ } -+ #endif -+@@ -2400,8 +2401,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int y1 = y0 + (mv->y >> 2); -+ int x2 = x0 + (mv2->x >> 2); -+ int y2 = y0 + (mv2->y >> 2); -+- int chan = x0>>6; // 64 wide blocks per QPU -+- uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -++ uint32_t *y = s->curr_y_mvs; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=8) { // B blocks work 8 at a time -+ int bw = nPbW-start_x; -+@@ -2417,7 +2417,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter_b; -+ } -+ } -+- s->y_mvs[s->pass0_job][chan % 12] = y; -++ s->curr_y_mvs = y; -+ } else -+ #endif -+ { -+@@ -2448,9 +2448,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int x2_c = x0_c + (mv2->x >> (2 + hshift)); -+ int y2_c = y0_c + (mv2->y >> (2 + hshift)); -+ -+- int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+ -+- uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -++ uint32_t *u = s->curr_u_mvs; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2479,7 +2478,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[s->pass0_job][chan & 7] = u; -++ s->curr_u_mvs = u; -+ return; -+ } -+ #endif -+@@ -3114,12 +3113,8 @@ static void rpi_execute_inter_cmds(HEVCContext *s) -+ -+ static void rpi_do_all_passes(HEVCContext *s) -+ { -+-#ifdef RPI_INTER_QPU -+- // Kick off inter prediction on QPUs -+- rpi_execute_inter_qpu(s); -+-#else -+- rpi_execute_transform(s); -+-#endif -++ // Kick off QPUs and VPUs -++ rpi_launch_vpu_qpu(s); -+ // Perform luma inter prediction -+ rpi_execute_inter_cmds(s); -+ // Wait for transform completion -+@@ -3128,18 +3123,18 @@ static void rpi_do_all_passes(HEVCContext *s) -+ rpi_execute_pred_cmds(s); -+ // Perform deblocking for CTBs in this row -+ rpi_execute_dblk_cmds(s); -+-#ifdef RPI_INTER_QPU -+- rpi_inter_clear(s); -+-#endif -++ // Prepare next batch -++ rpi_begin(s); -+ } -+ -+ #endif -+ -+-#ifdef RPI_INTER_QPU -+-static void rpi_inter_clear(HEVCContext *s) -++#ifdef RPI -++static void rpi_begin(HEVCContext *s) -+ { -+ int job = s->pass0_job; -+ int i; -++#ifdef RPI_INTER_QPU -+ int pic_width = s->ps.sps->width >> s->ps.sps->hshift[1]; -+ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[1]; -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+@@ -3165,6 +3160,8 @@ static void rpi_inter_clear(HEVCContext *s) -+ } -+ *s->u_mvs[job][i]++ = i; // Select section of VPM (avoid collisions with 3d unit) -+ } -++ s->curr_u_mvs = s->u_mvs[job][0]; -++#endif -+ -+ #ifdef RPI_LUMA_QPU -+ for(i=0;i<12;i++) { -+@@ -3187,8 +3184,11 @@ static void rpi_inter_clear(HEVCContext *s) -+ } -+ *s->y_mvs[job][i]++ = 0; // Next kernel -+ } -++ s->curr_y_mvs = s->y_mvs[job][0]; -+ #endif -++ s->ctu_count = 0; -+ } -++#endif -+ -+ #ifdef RPI_SIMULATE_QPUS -+ -+@@ -3459,8 +3459,9 @@ static void rpi_simulate_inter_qpu(HEVCContext *s) -+ -+ #endif -+ -++#ifdef RPI_INTER_QPU -+ -+-static void rpi_execute_inter_qpu(HEVCContext *s) -++static void rpi_launch_vpu_qpu(HEVCContext *s) -+ { -+ int k; -+ #ifdef LAUNCH_PASS0 -+@@ -3558,6 +3559,15 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ -+ } -++#else -++ -++#ifdef RPI -++static void rpi_launch_vpu_qpu(HEVCContext *s) -++{ -++ rpi_execute_transform(s); -++} -++#endif -++ -+ #endif -+ -+ #ifdef RPI -+@@ -3617,29 +3627,20 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI -+ #ifdef RPI_INTER_QPU -+ s->enable_rpi = s->ps.sps->bit_depth == 8 -+- && s->ps.sps->width <= RPI_MAX_WIDTH -+ && !s->ps.pps->cross_component_prediction_enabled_flag -+- && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1 -+ && !(s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE); -+ #else -+ s->enable_rpi = s->ps.sps->bit_depth == 8 -+- && s->ps.sps->width <= RPI_MAX_WIDTH -+- && !s->ps.pps->cross_component_prediction_enabled_flag -+- && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1; -++ && !s->ps.pps->cross_component_prediction_enabled_flag; -+ #endif -+ -+ if (!s->enable_rpi) { -+ if (s->ps.pps->cross_component_prediction_enabled_flag) -+ printf("Cross component\n"); -+- if (s->ps.pps->num_tile_rows > 1 || s->ps.pps->num_tile_columns > 1) -+- printf("Tiles\n"); -+- if (s->ps.pps->weighted_pred_flag && s->sh.slice_type == P_SLICE) -+- printf("Weighted P slice\n"); -+ if (s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE) -+ printf("Weighted B slice\n"); -+ } -+ #endif -+- -+ //printf("L0=%d L1=%d\n",s->sh.nb_refs[L1],s->sh.nb_refs[L1]); -+ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+@@ -3660,8 +3661,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->pass1_job = 0; -+ s->pass2_job = 0; -+ #endif -+-#ifdef RPI_INTER_QPU -+- rpi_inter_clear(s); -++#ifdef RPI -++ rpi_begin(s); -+ #endif -+ -+ while (more_data && ctb_addr_ts < s->ps.sps->ctb_size) { -+@@ -3679,13 +3680,34 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->deblock[ctb_addr_rs].tc_offset = s->sh.tc_offset; -+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; -+ -++#ifdef RPI_INTER_QPU -++ s->curr_u_mvs = s->u_mvs[s->pass0_job][s->ctu_count / s->ctu_per_uv_chan]; -++#endif -++#ifdef RPI_LUMA_QPU -++ s->curr_y_mvs = s->y_mvs[s->pass0_job][s->ctu_count / s->ctu_per_y_chan]; -++#endif -++ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ -++#ifdef RPI_INTER_QPU -++ s->u_mvs[s->pass0_job][s->ctu_count / s->ctu_per_uv_chan] = s->curr_u_mvs; -++#endif -++#ifdef RPI_LUMA_QPU -++ s->y_mvs[s->pass0_job][s->ctu_count / s->ctu_per_y_chan] = s->curr_y_mvs; -++#endif -++ -+ #ifdef RPI -+ if (s->enable_rpi) { -++ //av_assert0(s->num_dblk_cmds[s->pass0_job]>=0); -++ //av_assert0(s->num_dblk_cmds[s->pass0_job]pass0_jobpass0_job>=0); -+ s->dblk_cmds[s->pass0_job][s->num_dblk_cmds[s->pass0_job]][0] = x_ctb; -+ s->dblk_cmds[s->pass0_job][s->num_dblk_cmds[s->pass0_job]++][1] = y_ctb; -+- if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -++ s->ctu_count++; -++ //printf("%d %d/%d job=%d\n",s->ctu_count,s->num_dblk_cmds[s->pass0_job],RPI_MAX_DEBLOCK_CMDS,s->pass0_job); -++ -++ if ( s->ctu_count >= s->max_ctu_count ) { -+ #ifdef RPI_WORKER -+ if (s->used_for_ref) { -+ // Split work load onto separate threads so we make as rapid progress as possible with this frame -+@@ -3693,7 +3715,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ rpi_execute_inter_cmds(s); -+ #endif -+ #ifdef LAUNCH_PASS0 -+- rpi_execute_inter_qpu(s); -++ rpi_launch_vpu_qpu(s); -+ #endif -+ // Pass on this job to worker thread -+ worker_submit_job(s); -+@@ -3701,9 +3723,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ worker_pass0_ready(s); -+ -+ // Prepare the next batch of commands -+-#ifdef RPI_INTER_QPU -+- rpi_inter_clear(s); -+-#endif -++ rpi_begin(s); -+ } else { -+ // Non-ref frame so do it all on this thread -+ rpi_do_all_passes(s); -+@@ -3744,7 +3764,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #endif -+ -+ // Finish off any half-completed rows -+- if (s->enable_rpi && s->num_dblk_cmds[s->pass0_job]) { -++ if (s->enable_rpi && s->ctu_count) { -+ rpi_do_all_passes(s); -+ } -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 3cb34bd..a141316 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -823,8 +823,15 @@ typedef struct HEVCLocalContext { -+ -+ #ifdef RPI -+ -++// The processing is done in chunks -++// Each chunk corresponds to 24 64x64 luma blocks (24 so it is divisible by 8 for chroma and 12 for luma) -++// This is a distance of 1536 pixels across the screen -++// Increasing RPI_NUM_CHUNKS will reduce time spent activating QPUs and cache flushing, -++// but allocate more memory and increase the latency before data in the next frame can be processed -++#define RPI_NUM_CHUNKS 1 -++ -+ // RPI_MAX_WIDTH is maximum width in pixels supported by the accelerated code -+-#define RPI_MAX_WIDTH 2048 -++#define RPI_MAX_WIDTH (RPI_NUM_CHUNKS*64*24) -+ -+ // Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane, * 2 for bi -+ #define RPI_MAX_MV_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+@@ -888,9 +895,6 @@ typedef struct HEVCPredCmd { -+ #endif -+ -+ typedef struct HEVCContext { -+-#ifdef RPI -+- int dblk_cmds[RPI_MAX_JOBS][RPI_MAX_DEBLOCK_CMDS][2]; -+-#endif -+ const AVClass *c; // needed by private avoptions -+ AVCodecContext *avctx; -+ -+@@ -928,6 +932,10 @@ typedef struct HEVCContext { -+ int pass0_job; // Pass0 does coefficient decode -+ int pass1_job; // Pass1 does pixel processing -+ int pass2_job; // Pass2 does reconstruction and deblocking -++ int ctu_count; // Number of CTUs done in pass0 so far -++ int max_ctu_count; // Number of CTUs when we trigger a round of processing -++ int ctu_per_y_chan; // Number of CTUs per luma QPU -++ int ctu_per_uv_chan; // Number of CTUs per chroma QPU -+ #ifdef RPI_INTER_QPU -+ GPU_MEM_PTR_T unif_mvs_ptr[RPI_MAX_JOBS]; -+ uint32_t *unif_mvs[RPI_MAX_JOBS]; // Base of memory for motion vector commands -+@@ -936,6 +944,7 @@ typedef struct HEVCContext { -+ uint32_t *mvs_base[RPI_MAX_JOBS][8]; -+ // these pointers are to the next free space -+ uint32_t *u_mvs[RPI_MAX_JOBS][8]; -++ uint32_t *curr_u_mvs; // Current uniform stream to use for chroma -+ // Function pointers -+ uint32_t mc_filter_uv; -+ uint32_t mc_filter_uv_b0; -+@@ -946,6 +955,7 @@ typedef struct HEVCContext { -+ uint32_t *y_unif_mvs[RPI_MAX_JOBS]; // Base of memory for motion vector commands -+ uint32_t *y_mvs_base[RPI_MAX_JOBS][12]; -+ uint32_t *y_mvs[RPI_MAX_JOBS][12]; -++ uint32_t *curr_y_mvs; // Current uniform stream for luma -+ // Function pointers -+ uint32_t mc_filter; -+ uint32_t mc_filter_b; -+@@ -1084,6 +1094,9 @@ typedef struct HEVCContext { -+ uint32_t max_mastering_luminance; -+ uint32_t min_mastering_luminance; -+ -++#ifdef RPI -++ int dblk_cmds[RPI_MAX_JOBS][RPI_MAX_DEBLOCK_CMDS][2]; -++#endif -+ } HEVCContext; -+ -+ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx, -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index b286bbf..1f04790 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -891,7 +891,7 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -+ if (curr_uv < 0) curr_uv = 0; -+- if (n_uv<=curr_uv) { assert(0); return; } // Should not happen -++ if (n_uv<=curr_uv) { return; } -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[1]); -+diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c -+index 325b60e..28d2653 100644 -+--- a/libavcodec/hevcpred_template.c -++++ b/libavcodec/hevcpred_template.c -+@@ -72,7 +72,7 @@ do { \ -+ else \ -+ a = PIXEL_SPLAT_X4(ptr[i + 3]) -+ #ifdef RPI_WORKER -+- HEVCLocalContextIntra *lc = s->enable_rpi ? &s->HEVClcIntra : (HEVCLocalContextIntra *)s->HEVClc ; -++ HEVCLocalContextIntra *lc = (s->enable_rpi) ? &s->HEVClcIntra : (HEVCLocalContextIntra *)s->HEVClc ; -+ #else -+ HEVCLocalContext *lc = s->HEVClc; -+ #endif -+-- -+2.7.4 -+ -+ -+From 1674a80d147e5342ef6ea9a4fb4ddfc640c15a05 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 4 Jun 2015 15:48:10 +0100 -+Subject: [PATCH 59/68] Move deblocker into second pass -+ -+--- -+ libavcodec/hevc.c | 79 +++++++++++++++++++++++++++++++++++++++++++++---------- -+ 1 file changed, 65 insertions(+), 14 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index ec67252..6cecbdd 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -67,6 +67,8 @@ -+ static void rpi_execute_pred_cmds(HEVCContext *s); -+ static void rpi_execute_inter_cmds(HEVCContext *s); -+ static void rpi_begin(HEVCContext *s); -++ static void flush_frame(HEVCContext *s,AVFrame *frame); -++ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -+ -+ // Define INTER_PASS0 to do inter prediction in first pass -+ //#define INTER_PASS0 -+@@ -227,6 +229,11 @@ static void *worker_start(void *arg) -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -+ -++ // Perform intra prediction and residual reconstruction -++ rpi_execute_pred_cmds(s); -++ // Perform deblocking for CTBs in this row -++ rpi_execute_dblk_cmds(s); -++ -+ worker_complete_middle_job(s); -+ LOG_EXIT -+ } -+@@ -248,10 +255,6 @@ static void *worker_deblock_start(void *arg) -+ break; -+ } -+ LOG_ENTER -+- // Perform intra prediction and residual reconstruction -+- rpi_execute_pred_cmds(s); -+- // Perform deblocking for CTBs in this row -+- rpi_execute_dblk_cmds(s); -+ -+ worker_complete_job(s); -+ LOG_EXIT -+@@ -2983,7 +2986,7 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ static void rpi_execute_dblk_cmds(HEVCContext *s) -+ { -+ int n; -+- int job = s->pass2_job; -++ int job = s->pass1_job; -+ int ctb_size = 1 << s->ps.sps->log2_ctb_size; -+ int (*p)[2] = s->dblk_cmds[job]; -+ for(n = s->num_dblk_cmds[job]; n>0 ;n--,p++) { -+@@ -3021,7 +3024,7 @@ static void rpi_execute_transform(HEVCContext *s) -+ static void rpi_execute_pred_cmds(HEVCContext *s) -+ { -+ int i; -+- int job = s->pass2_job; -++ int job = s->pass1_job; -+ HEVCPredCmd *cmd = s->univ_pred_cmds[job]; -+ #ifdef RPI_WORKER -+ HEVCLocalContextIntra *lc = &s->HEVClcIntra; -+@@ -3506,11 +3509,10 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ -+ #ifdef RPI_MULTI_MAILBOX -+ #ifdef RPI_CACHE_UNIF_MVS -+- gpu_cache_flush3(&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job]); -++ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job]); -+ #else -+- gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -++ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],NULL,NULL); -+ #endif -+- -+ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+@@ -3613,6 +3615,60 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ #endif -+ } -+ -++static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2) -++{ -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ int n = s->ps.sps->height; -++ int curr_y = 0; -++ int curr_uv = 0; -++ int n_uv = n >> s->ps.sps->vshift[1]; -++ int sz,base; -++ sz = s->frame->linesize[1] * (n_uv-curr_uv); -++ base = s->frame->linesize[1] * curr_uv; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = p->arm + base; -++ iocache.s[0].size = sz; -++ p = av_buffer_pool_opaque(frame->buf[2]); -++ iocache.s[1].handle = p->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = p->arm + base; -++ iocache.s[1].size = sz; -++ p = av_buffer_pool_opaque(frame->buf[0]); -++ sz = s->frame->linesize[0] * (n-curr_y); -++ base = s->frame->linesize[0] * curr_y; -++ iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = p->arm + base; -++ iocache.s[2].size = sz; -++ -++ iocache.s[3].handle = p0->vcsm_handle; -++ iocache.s[3].cmd = 3; // clean+invalidate -++ iocache.s[3].addr = (int) p0->arm; -++ iocache.s[3].size = p0->numbytes; -++ if (p1) { -++ iocache.s[4].handle = p1->vcsm_handle; -++ iocache.s[4].cmd = 3; // clean+invalidate -++ iocache.s[4].addr = (int) p1->arm; -++ iocache.s[4].size = p1->numbytes; -++ } -++ if (p2) { -++ iocache.s[5].handle = p2->vcsm_handle; -++ iocache.s[5].cmd = 3; // clean+invalidate -++ iocache.s[5].addr = (int) p2->arm; -++ iocache.s[5].size = p2->numbytes; -++ } -++ vcsm_clean_invalid( &iocache ); -++#else -++ flush_buffer(frame->buf[0]); -++ flush_buffer(frame->buf[1]); -++ flush_buffer(frame->buf[2]); -++ gpu_cache_flush3(p0, p1, p2); -++#endif -++} -++ -+ #endif -+ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+@@ -4127,11 +4183,6 @@ static int hevc_frame_start(HEVCContext *s) -+ if (!s->avctx->hwaccel) -+ ff_thread_finish_setup(s->avctx); -+ -+-#ifdef RPI_INTER_QPU -+- // Invalidate the output data buffer so it is ready for the QPUs to write into it. -+- flush_frame(s,s->frame); -+-#endif -+- -+ return 0; -+ -+ fail: -+-- -+2.7.4 -+ -+ -+From a453fe438c4ab311d6476955d0a40a5d2ed8a1c6 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 4 Jun 2015 16:10:23 +0100 -+Subject: [PATCH 60/68] Change order of ctu accesses to improve qpu performance -+ -+--- -+ libavcodec/hevc.c | 8 ++++---- -+ 1 file changed, 4 insertions(+), 4 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 6cecbdd..ec17e64 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3737,19 +3737,19 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; -+ -+ #ifdef RPI_INTER_QPU -+- s->curr_u_mvs = s->u_mvs[s->pass0_job][s->ctu_count / s->ctu_per_uv_chan]; -++ s->curr_u_mvs = s->u_mvs[s->pass0_job][s->ctu_count % 8]; -+ #endif -+ #ifdef RPI_LUMA_QPU -+- s->curr_y_mvs = s->y_mvs[s->pass0_job][s->ctu_count / s->ctu_per_y_chan]; -++ s->curr_y_mvs = s->y_mvs[s->pass0_job][s->ctu_count % 12]; -+ #endif -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ -+ #ifdef RPI_INTER_QPU -+- s->u_mvs[s->pass0_job][s->ctu_count / s->ctu_per_uv_chan] = s->curr_u_mvs; -++ s->u_mvs[s->pass0_job][s->ctu_count % 8]= s->curr_u_mvs; -+ #endif -+ #ifdef RPI_LUMA_QPU -+- s->y_mvs[s->pass0_job][s->ctu_count / s->ctu_per_y_chan] = s->curr_y_mvs; -++ s->y_mvs[s->pass0_job][s->ctu_count % 12] = s->curr_y_mvs; -+ #endif -+ -+ #ifdef RPI -+-- -+2.7.4 -+ -+ -+From 504de0435e8f660c1b7b2d6ec053dc922a2d2896 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 8 Jun 2015 09:36:59 +0100 -+Subject: [PATCH 61/68] Removed deblocker thread -+ -+--- -+ libavcodec/hevc.c | 77 +++---------------------------------------------------- -+ libavcodec/hevc.h | 4 --- -+ 2 files changed, 4 insertions(+), 77 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index ec17e64..1868532 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -70,11 +70,6 @@ -+ static void flush_frame(HEVCContext *s,AVFrame *frame); -+ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -+ -+- // Define INTER_PASS0 to do inter prediction in first pass -+- //#define INTER_PASS0 -+- // Define LAUNCH_PASS0 to launch QPU/VPU from pass0 -+- //#define LAUNCH_PASS0 -+- -+ #endif -+ -+ // #define DISABLE_MC -+@@ -147,24 +142,12 @@ static void worker_submit_job(HEVCContext *s) -+ } -+ -+ // Call this to say we have completed pass1 -+-static void worker_complete_middle_job(HEVCContext *s) -+-{ -+- LOG_ENTER -+- pthread_mutex_lock(&s->worker_mutex); -+- s->worker_middle++; -+- s->pass1_job = (s->pass1_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+- pthread_cond_broadcast(&s->worker_cond_middle); // Let people know that the middle has moved -+- pthread_mutex_unlock(&s->worker_mutex); -+- LOG_EXIT -+-} -+- -+-// Call this to say we have completed pass2 -+ static void worker_complete_job(HEVCContext *s) -+ { -+ LOG_ENTER -+ pthread_mutex_lock(&s->worker_mutex); -+ s->worker_head++; -+- s->pass2_job = (s->pass2_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -++ s->pass1_job = (s->pass1_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+ pthread_cond_broadcast(&s->worker_cond_head); // Let people know that the head has moved -+ pthread_mutex_unlock(&s->worker_mutex); -+ LOG_EXIT -+@@ -208,7 +191,7 @@ static void *worker_start(void *arg) -+ while(1) { -+ pthread_mutex_lock(&s->worker_mutex); -+ -+- while( !s->kill_worker && s->worker_tail - s->worker_middle <= 0) -++ while( !s->kill_worker && s->worker_tail - s->worker_head <= 0) -+ { -+ pthread_cond_wait(&s->worker_cond_tail, &s->worker_mutex); -+ } -+@@ -219,13 +202,9 @@ static void *worker_start(void *arg) -+ } -+ LOG_ENTER -+ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+-#ifndef LAUNCH_PASS0 -+ rpi_launch_vpu_qpu(s); -+-#endif -+-#ifndef INTER_PASS0 -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+-#endif -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -+ -+@@ -234,28 +213,6 @@ static void *worker_start(void *arg) -+ // Perform deblocking for CTBs in this row -+ rpi_execute_dblk_cmds(s); -+ -+- worker_complete_middle_job(s); -+- LOG_EXIT -+- } -+- return NULL; -+-} -+- -+-static void *worker_deblock_start(void *arg) -+-{ -+- HEVCContext *s = (HEVCContext *)arg; -+- while(1) { -+- pthread_mutex_lock(&s->worker_mutex); -+- while( !s->kill_worker && s->worker_middle - s->worker_head <= 0) -+- { -+- pthread_cond_wait(&s->worker_cond_middle, &s->worker_mutex); -+- } -+- pthread_mutex_unlock(&s->worker_mutex); -+- -+- if (s->kill_worker) { -+- break; -+- } -+- LOG_ENTER -+- -+ worker_complete_job(s); -+ LOG_EXIT -+ } -+@@ -2998,11 +2955,7 @@ static void rpi_execute_dblk_cmds(HEVCContext *s) -+ static void rpi_execute_transform(HEVCContext *s) -+ { -+ int i=2; -+-#ifdef LAUNCH_PASS0 -+- int job = s->pass0_job; -+-#else -+ int job = s->pass1_job; -+-#endif -+ //int j; -+ //int16_t *coeffs = s->coeffs_buf_arm[i]; -+ //for(j=s->num_coeffs[i]; j > 0; j-= 16*16, coeffs+=16*16) { -+@@ -3057,11 +3010,7 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ -+ static void rpi_execute_inter_cmds(HEVCContext *s) -+ { -+-#ifdef INTER_PASS0 -+- int job = s->pass0_job; -+-#else -+ int job = s->pass1_job; -+-#endif -+ HEVCMvCmd *cmd = s->unif_mv_cmds[job]; -+ int n,cidx; -+ AVFrame myref; -+@@ -3467,11 +3416,7 @@ static void rpi_simulate_inter_qpu(HEVCContext *s) -+ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ { -+ int k; -+-#ifdef LAUNCH_PASS0 -+- int job = s->pass0_job; -+-#else -+ int job = s->pass1_job; -+-#endif -+ int i; -+ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr[job].vc; -+ #ifdef RPI_LUMA_QPU -+@@ -3574,10 +3519,12 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ -+ #ifdef RPI -+ -++#ifndef RPI_FAST_CACHEFLUSH -+ static void flush_buffer(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+ gpu_cache_flush(p); -+ } -++#endif -+ -+ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ { -+@@ -3715,7 +3662,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI_WORKER -+ s->pass0_job = 0; -+ s->pass1_job = 0; -+- s->pass2_job = 0; -+ #endif -+ #ifdef RPI -+ rpi_begin(s); -+@@ -3767,12 +3713,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI_WORKER -+ if (s->used_for_ref) { -+ // Split work load onto separate threads so we make as rapid progress as possible with this frame -+- #ifdef INTER_PASS0 -+- rpi_execute_inter_cmds(s); -+- #endif -+- #ifdef LAUNCH_PASS0 -+- rpi_launch_vpu_qpu(s); -+- #endif -+ // Pass on this job to worker thread -+ worker_submit_job(s); -+ // Make sure we have space to prepare the next job -+@@ -3814,8 +3754,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ // Wait for the worker to finish all its jobs -+ if (s->enable_rpi) { -+ worker_wait(s); -+- av_assert0(s->pass0_job==s->pass1_job); -+- av_assert0(s->pass1_job==s->pass2_job); -+ } -+ #endif -+ -+@@ -4565,16 +4503,13 @@ static av_cold void hevc_init_worker(HEVCContext *s) -+ { -+ int err; -+ pthread_cond_init(&s->worker_cond_head, NULL); -+- pthread_cond_init(&s->worker_cond_middle, NULL); -+ pthread_cond_init(&s->worker_cond_tail, NULL); -+ pthread_mutex_init(&s->worker_mutex, NULL); -+ -+ s->worker_tail=0; -+- s->worker_middle=0; -+ s->worker_head=0; -+ s->kill_worker=0; -+ err = pthread_create(&s->worker_thread, NULL, worker_start, s); -+- err = pthread_create(&s->worker_deblock_thread, NULL, worker_deblock_start, s); -+ if (err) { -+ printf("Failed to create worker thread\n"); -+ exit(-1); -+@@ -4586,17 +4521,13 @@ static av_cold void hevc_exit_worker(HEVCContext *s) -+ void *res; -+ s->kill_worker=1; -+ pthread_cond_broadcast(&s->worker_cond_tail); -+- pthread_cond_broadcast(&s->worker_cond_middle); -+ pthread_join(s->worker_thread, &res); -+- pthread_join(s->worker_deblock_thread, &res); -+ -+ pthread_cond_destroy(&s->worker_cond_head); -+- pthread_cond_destroy(&s->worker_cond_middle); -+ pthread_cond_destroy(&s->worker_cond_tail); -+ pthread_mutex_destroy(&s->worker_mutex); -+ -+ s->worker_tail=0; -+- s->worker_middle=0; -+ s->worker_head=0; -+ s->kill_worker=0; -+ } -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index a141316..ef5bfb1 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -931,7 +931,6 @@ typedef struct HEVCContext { -+ //GPU_MEM_PTR_T dummy; -+ int pass0_job; // Pass0 does coefficient decode -+ int pass1_job; // Pass1 does pixel processing -+- int pass2_job; // Pass2 does reconstruction and deblocking -+ int ctu_count; // Number of CTUs done in pass0 so far -+ int max_ctu_count; // Number of CTUs when we trigger a round of processing -+ int ctu_per_y_chan; // Number of CTUs per luma QPU -+@@ -963,15 +962,12 @@ typedef struct HEVCContext { -+ -+ #ifdef RPI_WORKER -+ pthread_t worker_thread; -+- pthread_t worker_deblock_thread; -+ pthread_cond_t worker_cond_head; -+ pthread_cond_t worker_cond_tail; -+- pthread_cond_t worker_cond_middle; -+ pthread_mutex_t worker_mutex; -+ -+ int worker_tail; // Contains the number of posted jobs -+ int worker_head; // Contains the number of completed jobs -+- int worker_middle; // Contains the number of completed jobs -+ int kill_worker; // set to 1 to terminate the worker -+ #endif -+ -+-- -+2.7.4 -+ -+ -+From 74892301cdb0829de959b798debac6ffe1c71603 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 8 Jun 2015 11:04:43 +0100 -+Subject: [PATCH 62/68] Reduced amount of output frame that is invalidated -+ -+--- -+ libavcodec/hevc.c | 45 +++++++++++++++++++++++++++++---------------- -+ 1 file changed, 29 insertions(+), 16 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 1868532..cbb4f46 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -68,7 +68,7 @@ -+ static void rpi_execute_inter_cmds(HEVCContext *s); -+ static void rpi_begin(HEVCContext *s); -+ static void flush_frame(HEVCContext *s,AVFrame *frame); -+- static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -++ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2, int job); -+ -+ #endif -+ -+@@ -3454,9 +3454,9 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ -+ #ifdef RPI_MULTI_MAILBOX -+ #ifdef RPI_CACHE_UNIF_MVS -+- flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job]); -++ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job], job); -+ #else -+- flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],NULL,NULL); -++ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],NULL,NULL, job); -+ #endif -+ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+@@ -3530,6 +3530,7 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -+ int n = s->ps.sps->height; -+ int curr_y = 0; -+ int curr_uv = 0; -+@@ -3537,22 +3538,21 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ int sz,base; -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -+ iocache.s[0].handle = p->vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = p->arm + base; -++ iocache.s[0].addr = (int)(p->arm) + base; -+ iocache.s[0].size = sz; -+ p = av_buffer_pool_opaque(frame->buf[2]); -+ iocache.s[1].handle = p->vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = p->arm + base; -++ iocache.s[1].addr = (int)(p->arm) + base; -+ iocache.s[1].size = sz; -+ p = av_buffer_pool_opaque(frame->buf[0]); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+ iocache.s[2].handle = p->vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = p->arm + base; -++ iocache.s[2].addr = (int)(p->arm) + base; -+ iocache.s[2].size = sz; -+ vcsm_clean_invalid( &iocache ); -+ #else -+@@ -3562,33 +3562,46 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ #endif -+ } -+ -+-static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2) -++static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2, int job) -+ { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+- int n = s->ps.sps->height; -+- int curr_y = 0; -+- int curr_uv = 0; -+- int n_uv = n >> s->ps.sps->vshift[1]; -++ int n; -++ int curr_y; -++ int curr_uv; -++ int n_uv; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -+ int sz,base; -++ int (*d)[2] = s->dblk_cmds[job]; -++ int low=(*d)[1]; -++ int high=(*d)[1]; -++ for(n = s->num_dblk_cmds[job]; n>0 ;n--,d++) { -++ int y = (*d)[1]; -++ low=FFMIN(low,y); -++ high=FFMAX(high,y); -++ } -++ curr_y = low; -++ n = high+(1 << s->ps.sps->log2_ctb_size); -++ curr_uv = curr_y >> s->ps.sps->vshift[1]; -++ n_uv = n >> s->ps.sps->vshift[1]; -++ -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -+ iocache.s[0].handle = p->vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = p->arm + base; -++ iocache.s[0].addr = (int)(p->arm) + base; -+ iocache.s[0].size = sz; -+ p = av_buffer_pool_opaque(frame->buf[2]); -+ iocache.s[1].handle = p->vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = p->arm + base; -++ iocache.s[1].addr = (int)(p->arm) + base; -+ iocache.s[1].size = sz; -+ p = av_buffer_pool_opaque(frame->buf[0]); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+ iocache.s[2].handle = p->vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = p->arm + base; -++ iocache.s[2].addr = (int)(p->arm) + base; -+ iocache.s[2].size = sz; -+ -+ iocache.s[3].handle = p0->vcsm_handle; -+-- -+2.7.4 -+ -+ -+From 090b6be5b501bd3c547700926e540397f0b39e69 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 8 Jun 2015 11:55:29 +0100 -+Subject: [PATCH 63/68] Packed 16x16 and 32x32 into the same buffer -+ -+--- -+ libavcodec/hevc.c | 24 +++++++++++++++--------- -+ libavcodec/hevc_cabac.c | 9 ++++++++- -+ libavcodec/rpi_qpu.c | 2 +- -+ 3 files changed, 24 insertions(+), 11 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index cbb4f46..a596534 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -299,12 +299,12 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ s->coeffs_buf_arm[job][0] = (int16_t*) s->coeffs_buf_default[job].arm; -+ if (!s->coeffs_buf_arm[job][0]) -+ goto fail; -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated[job]); -++ gpu_malloc_cached(sizeof(int16_t) * (coefs_per_row + 32*32), &s->coeffs_buf_accelerated[job]); // We prefetch past the end so provide an extra blocks worth of data -+ s->coeffs_buf_arm[job][2] = (int16_t*) s->coeffs_buf_accelerated[job].arm; -+ s->coeffs_buf_vc[job][2] = s->coeffs_buf_accelerated[job].vc; -+ if (!s->coeffs_buf_arm[job][2]) -+ goto fail; -+- s->coeffs_buf_arm[job][3] = coefs_per_row + s->coeffs_buf_arm[job][2]; -++ s->coeffs_buf_arm[job][3] = coefs_per_row + s->coeffs_buf_arm[job][2]; // This points to just beyond the end of the buffer. Coefficients fill in backwards. -+ s->coeffs_buf_vc[job][3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[job][2]; -+ } -+ } -+@@ -2956,15 +2956,20 @@ static void rpi_execute_transform(HEVCContext *s) -+ { -+ int i=2; -+ int job = s->pass1_job; -+- //int j; -+- //int16_t *coeffs = s->coeffs_buf_arm[i]; -+- //for(j=s->num_coeffs[i]; j > 0; j-= 16*16, coeffs+=16*16) { -+- // s->hevcdsp.idct[4-2](coeffs, 16); -+- //} -++ /*int j; -++ int16_t *coeffs = s->coeffs_buf_arm[job][i]; -++ for(j=s->num_coeffs[job][i]; j > 0; j-= 16*16, coeffs+=16*16) { -++ s->hevcdsp.idct[4-2](coeffs, 16); -++ } -++ i=3; -++ coeffs = s->coeffs_buf_arm[job][i] - s->num_coeffs[job][i]; -++ for(j=s->num_coeffs[job][i]; j > 0; j-= 32*32, coeffs+=32*32) { -++ s->hevcdsp.idct[5-2](coeffs, 32); -++ }*/ -+ -+ gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -+ s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], -+- s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], -++ s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3] - sizeof(int16_t) * s->num_coeffs[job][3], -+ s->num_coeffs[job][3] >> 10, 0, &s->coeffs_buf_accelerated[job]); -+ //vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -+ //gpu_cache_flush(&s->coeffs_buf_accelerated); -+@@ -3458,7 +3463,8 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ #else -+ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],NULL,NULL, job); -+ #endif -+- s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -++ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, -++ s->coeffs_buf_vc[job][3] - sizeof(int16_t) * s->num_coeffs[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[job][1 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 6523e66..8656917 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1051,7 +1051,14 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ if (s->enable_rpi) { -+ int n = trafo_size * trafo_size; -+ if (use_vpu) { -+- coeffs = s->coeffs_buf_arm[s->pass0_job][log2_trafo_size - 2] + s->num_coeffs[s->pass0_job][log2_trafo_size - 2]; -++ // We support size 4 and size 5. -++ // Size 4 grows from the front (Coeffs_buf_arm[2] points to start of buf) -++ // Size 5 grows from the back (Coeffs_buf_arm[3] points to end of buf) -++ // num_coeffs is indexed by log2_trafo_size-2 -++ if (log2_trafo_size == 4) -++ coeffs = s->coeffs_buf_arm[s->pass0_job][log2_trafo_size - 2] + s->num_coeffs[s->pass0_job][log2_trafo_size - 2]; -++ else -++ coeffs = s->coeffs_buf_arm[s->pass0_job][log2_trafo_size - 2] - s->num_coeffs[s->pass0_job][log2_trafo_size - 2] - n; -+ s->num_coeffs[s->pass0_job][log2_trafo_size - 2] += n; -+ } else { -+ coeffs = s->coeffs_buf_arm[s->pass0_job][0] + s->num_coeffs[s->pass0_job][0]; -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 4480f72..0121fca 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -5,7 +5,7 @@ -+ // define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -+ //#define RPI_TIME_TOTAL_VPU -+ // define RPI_TIME_TOTAL_POSTED to print out how much time is spent in the multi execute QPU/VPU combined -+-//#define RPI_TIME_TOTAL_POSTED -++#define RPI_TIME_TOTAL_POSTED -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+ #define RPI_ASYNC -+ -+-- -+2.7.4 -+ -+ -+From ed359bbce56817bf9db0e54701103bd0505c353b Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 25 Jun 2015 09:02:47 +0100 -+Subject: [PATCH 64/68] Moved luma deblock to VPU -+ -+--- -+ libavcodec/hevc.c | 18 +- -+ libavcodec/hevc.h | 11 + -+ libavcodec/hevc_filter.c | 120 ++- -+ libavcodec/rpi_hevc_transform.h | 1802 ++++++++++++++++++++++++++++++++++++++- -+ libavcodec/rpi_hevc_transform.s | 426 +++++++++ -+ libavcodec/rpi_qpu.c | 12 +- -+ libavcodec/rpi_shader.c | 2 +- -+ 7 files changed, 2378 insertions(+), 13 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index a596534..4ce94a7 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -246,6 +246,12 @@ static void pic_arrays_free(HEVCContext *s) -+ } -+ } -+ #endif -++#ifdef RPI_DEBLOCK_VPU -++ if (s->y_setup_arm) { -++ gpu_free(&s->y_setup_ptr); -++ s->y_setup_arm = 0; -++ } -++#endif -+ av_freep(&s->sao); -+ av_freep(&s->deblock); -+ -+@@ -283,12 +289,12 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ int min_pu_size = sps->min_pu_width * sps->min_pu_height; -+ -+ #ifdef RPI -+- av_assert0(sps); -+ int coefs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+ int coefs_per_luma = 64*64*24*RPI_NUM_CHUNKS; -+ int coefs_per_chroma = (coefs_per_luma * 2) >> sps->vshift[1] >> sps->hshift[1]; -+ int coefs_per_row = coefs_per_luma + coefs_per_chroma; -+ int job; -++ av_assert0(sps); -+ s->max_ctu_count = coefs_per_luma / coefs_in_ctb; -+ s->ctu_per_y_chan = s->max_ctu_count / 12; -+ s->ctu_per_uv_chan = s->max_ctu_count / 8; -+@@ -309,6 +315,16 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ } -+ } -+ #endif -++#ifdef RPI_DEBLOCK_VPU -++ s->enable_rpi_deblock = !sps->sao_enabled; -++ s->setup_width = (sps->width+15) / 16; -++ s->setup_height = (sps->height+15) / 16; -++ gpu_malloc_uncached(sizeof(*s->y_setup_arm) * s->setup_width * s->setup_height, &s->y_setup_ptr); // TODO make this cached -++ s->y_setup_arm = (void*)s->y_setup_ptr.arm; -++ s->y_setup_vc = (void*)s->y_setup_ptr.vc; -++ memset(s->y_setup_arm, 0, s->y_setup_ptr.numbytes); -++ printf("Setup %d by %d by %d\n",s->setup_width,s->setup_height,sizeof(*s->y_setup_arm)); -++#endif -+ -+ s->bs_width = (width >> 2) + 1; -+ s->bs_height = (height >> 2) + 1; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index ef5bfb1..cf08489 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -57,6 +57,8 @@ -+ // Define RPI_WORKER to launch a worker thread for pixel processing tasks -+ #define RPI_WORKER -+ -++ #define RPI_DEBLOCK_VPU -++ -+ #endif -+ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+@@ -971,6 +973,15 @@ typedef struct HEVCContext { -+ int kill_worker; // set to 1 to terminate the worker -+ #endif -+ -++#ifdef RPI_DEBLOCK_VPU -++ int enable_rpi_deblock; -++ GPU_MEM_PTR_T y_setup_ptr; -++ uint8_t (*y_setup_arm)[2][2][2][4]; -++ uint8_t (*y_setup_vc)[2][2][2][4]; -++ int setup_width; // Number of 16x16 blocks across the image -++ int setup_height; // Number of 16x16 blocks down the image -++#endif -++ -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 1f04790..06371da 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -564,6 +564,19 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->frame->linesize[LUMA], -+ beta, tc, no_p, no_q); -+ } else -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ uint8_t (*setup)[2][2][4]; -++ int num16 = (y>>4)*s->setup_width + (x>>4); -++ int a = ((y>>3) & 1) << 1; -++ int b = (x>>3) & 1; -++ setup = s->y_setup_arm[num16]; -++ setup[0][b][0][a] = beta; -++ setup[0][b][0][a + 1] = beta; -++ setup[0][b][1][a] = tc[0]; -++ setup[0][b][1][a + 1] = tc[1]; -++ } else -++#endif -+ s->hevcdsp.hevc_v_loop_filter_luma(src, -+ s->frame->linesize[LUMA], -+ beta, tc, no_p, no_q); -+@@ -596,6 +609,19 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->frame->linesize[LUMA], -+ beta, tc, no_p, no_q); -+ } else -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ uint8_t (*setup)[2][2][4]; -++ int num16 = (y>>4)*s->setup_width + (x>>4); -++ int a = ((x>>3) & 1) << 1; -++ int b = (y>>3) & 1; -++ setup = s->y_setup_arm[num16]; -++ setup[1][b][0][a] = beta; -++ setup[1][b][0][a + 1] = beta; -++ setup[1][b][1][a] = tc[0]; -++ setup[1][b][1][a + 1] = tc[1]; -++ } else -++#endif -+ s->hevcdsp.hevc_h_loop_filter_luma(src, -+ s->frame->linesize[LUMA], -+ beta, tc, no_p, no_q); -+@@ -876,33 +902,85 @@ static void flush_buffer(AVBufferRef *bref) { -+ } -+ -+ // Return Physical address for this image -+-static int ff_hevc_buf_base(AVBufferRef *bref) { -++static uint32_t get_vc_address(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- return p->vc & 0x3fffffff; -++ return p->vc; -+ } -+ -++// ff_hevc_flush_buffer_lines -++// flushes and invalidates all pixel rows in [start,end-1] -++static void ff_hevc_flush_buffer_lines(HEVCContext *s, int start, int end, int flush_luma, int flush_chroma) -++{ -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ int curr_y = start; -++ int n = end; -++ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -++ int n_uv = n >> s->ps.sps->vshift[1]; -++ int sz,base; -++ GPU_MEM_PTR_T *p; -++ if (curr_uv < 0) curr_uv = 0; -++ if (n_uv<=curr_uv) { return; } -++ sz = s->frame->linesize[1] * (n_uv-curr_uv); -++ base = s->frame->linesize[1] * curr_uv; -++ if (flush_chroma) { -++ p = av_buffer_pool_opaque(s->frame->buf[1]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = (int)p->arm + base; -++ iocache.s[0].size = sz; -++ p = av_buffer_pool_opaque(s->frame->buf[2]); -++ iocache.s[1].handle = p->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = (int)p->arm + base; -++ iocache.s[1].size = sz; -++ } -++ if (flush_luma) { -++ p = av_buffer_pool_opaque(s->frame->buf[0]); -++ sz = s->frame->linesize[0] * (n-curr_y); -++ base = s->frame->linesize[0] * curr_y; -++ iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = (int)p->arm + base; -++ iocache.s[2].size = sz; -++ } -++ vcsm_clean_invalid( &iocache ); -++#else -++ if (flush_chroma) { -++ flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[2]); -++ } -++ if (flush_luma) { -++ flush_buffer(s->frame->buf[0]); -++ } -++#endif -++} -++ -++ -+ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ { -+ if (s->enable_rpi && s->used_for_ref) { -++ // TODO make this use ff_hevc_flush_buffer_lines -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ int curr_y = ((int *)f->progress->data)[0]; -+ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -+ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -++ GPU_MEM_PTR_T *p; -+ if (curr_uv < 0) curr_uv = 0; -+ if (n_uv<=curr_uv) { return; } -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[1]); -++ p = av_buffer_pool_opaque(s->frame->buf[1]); -+ iocache.s[0].handle = p->vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = p->arm + base; -++ iocache.s[0].addr = (int)p->arm + base; -+ iocache.s[0].size = sz; -+ p = av_buffer_pool_opaque(s->frame->buf[2]); -+ iocache.s[1].handle = p->vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = p->arm + base; -++ iocache.s[1].addr = (int)p->arm + base; -+ iocache.s[1].size = sz; -+ -+ #ifdef RPI_LUMA_QPU -+@@ -911,7 +989,7 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ base = s->frame->linesize[0] * curr_y; -+ iocache.s[2].handle = p->vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = p->arm + base; -++ iocache.s[2].addr = (int)p->arm + base; -+ iocache.s[2].size = sz; -+ #endif -+ vcsm_clean_invalid( &iocache ); -+@@ -930,11 +1008,40 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ } -+ #endif -+ -++#ifdef RPI_DEBLOCK_VPU -++/* rpi_deblock deblocks an entire row of ctbs using the VPU */ -++static void rpi_deblock(HEVCContext *s, int y, int ctb_size) -++{ -++ // Flush image, 4 lines above to bottom of ctb stripe -++ ff_hevc_flush_buffer_lines(s, FFMAX(y-4,0), y+ctb_size, 1, 0); -++ // TODO flush buffer of beta/tc setup when it becomes cached -++ // Call VPU -++ // TODO add this to a separate pipeline of VPU jobs that can be run in parallel and wait for completion -++ vpu_wait(vpu_post_code( vpu_get_fn(), get_vc_address(s->frame->buf[0]) + s->frame->linesize[0] * y, s->frame->linesize[0], -++ s->setup_width, (int) ( s->y_setup_vc + s->setup_width * (y>>4) ), -++ ctb_size>>4, 2, 0)); // 2 means to do the deblocking code -++} -++ -++static void rpi_deblock2(HEVCContext *s, int y, int ctb_size) -++{ -++ int y2; -++ for(y2=y;y2= s->ps.sps->width - ctb_size; -+ if (s->avctx->skip_loop_filter < AVDISCARD_ALL) -+ deblocking_filter_CTB(s, x, y); -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock && x_end) -++ { -++ rpi_deblock(s, y, ctb_size); -++ } -++#endif -+ if (s->ps.sps->sao_enabled) { -+ int y_end = y >= s->ps.sps->height - ctb_size; -+ if (y && x) -+@@ -965,6 +1072,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ //if (((y + ctb_size)&63)==0) -+ #ifdef RPI_INTER_QPU -+ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size - 4); -++ // TODO we no longer need to flush the luma buffer as it is in GPU memory when using deblocking on the rpi -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index 4f13622..b3f155f 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -3,7 +3,13 @@ unsigned char rpi_hevc_transform [] = { -+ 106, -+ 0, -+ 144, -+-35, -++38, -++1, -++37, -++106, -++0, -++144, -++57, -+ 1, -+ 169, -+ 3, -+@@ -627,4 +633,1798 @@ unsigned char rpi_hevc_transform [] = { -+ 30, -+ 90, -+ 0, -++169, -++3, -++73, -++64, -++52, -++64, -++45, -++64, -++2, -++64, -++10, -++64, -++64, -++198, -++1, -++7, -++8, -++232, -++63, -++0, -++0, -++0, -++6, -++232, -++253, -++255, -++255, -++255, -++0, -++246, -++0, -++0, -++0, -++4, -++215, -++64, -++3, -++96, -++2, -++248, -++0, -++35, -++0, -++0, -++64, -++56, -++0, -++0, -++4, -++248, -++0, -++36, -++0, -++0, -++64, -++56, -++8, -++0, -++0, -++240, -++64, -++0, -++132, -++3, -++128, -++240, -++0, -++0, -++132, -++3, -++128, -++144, -++137, -++0, -++131, -++98, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++129, -++0, -++131, -++102, -++0, -++158, -++67, -++0, -++2, -++248, -++0, -++35, -++0, -++0, -++64, -++56, -++0, -++0, -++4, -++248, -++0, -++36, -++0, -++0, -++64, -++56, -++8, -++0, -++0, -++240, -++64, -++0, -++132, -++3, -++128, -++240, -++0, -++0, -++132, -++3, -++128, -++144, -++108, -++0, -++131, -++98, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++100, -++0, -++131, -++102, -++0, -++248, -++64, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++248, -++0, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++144, -++161, -++0, -++188, -++64, -++67, -++232, -++0, -++2, -++0, -++0, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++150, -++0, -++195, -++232, -++0, -++2, -++0, -++0, -++12, -++128, -++7, -++192, -++130, -++248, -++0, -++0, -++112, -++192, -++224, -++16, -++195, -++31, -++132, -++248, -++1, -++0, -++112, -++0, -++224, -++16, -++203, -++31, -++3, -++99, -++131, -++71, -++68, -++232, -++32, -++0, -++0, -++0, -++0, -++99, -++2, -++99, -++23, -++102, -++7, -++106, -++127, -++156, -++182, -++255, -++0, -++248, -++64, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++248, -++0, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++144, -++112, -++0, -++188, -++64, -++67, -++232, -++0, -++2, -++0, -++0, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++101, -++0, -++195, -++232, -++0, -++2, -++0, -++0, -++12, -++128, -++7, -++192, -++130, -++248, -++0, -++0, -++112, -++192, -++224, -++16, -++195, -++31, -++132, -++248, -++1, -++0, -++112, -++0, -++224, -++16, -++203, -++31, -++25, -++102, -++9, -++106, -++2, -++30, -++41, -++3, -++26, -++87, -++162, -++64, -++64, -++198, -++1, -++23, -++127, -++158, -++103, -++255, -++239, -++3, -++0, -++254, -++0, -++143, -++92, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++64, -++143, -++93, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++143, -++94, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++143, -++95, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++142, -++208, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++142, -++209, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++64, -++142, -++210, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++0, -++142, -++211, -++0, -++0, -++240, -++12, -++0, -++128, -++144, -++107, -++0, -++8, -++255, -++99, -++23, -++0, -++212, -++192, -++51, -++0, -++0, -++8, -++255, -++163, -++23, -++0, -++228, -++192, -++51, -++0, -++0, -++8, -++255, -++227, -++23, -++0, -++244, -++192, -++51, -++0, -++0, -++8, -++255, -++35, -++52, -++0, -++180, -++192, -++51, -++0, -++0, -++8, -++255, -++99, -++52, -++0, -++164, -++192, -++51, -++0, -++0, -++8, -++255, -++163, -++52, -++0, -++148, -++192, -++51, -++0, -++0, -++111, -++3, -++239, -++3, -++0, -++254, -++0, -++143, -++12, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++64, -++143, -++13, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++143, -++14, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++143, -++15, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++142, -++16, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++142, -++17, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++64, -++142, -++18, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++0, -++142, -++19, -++0, -++0, -++240, -++12, -++0, -++128, -++144, -++33, -++0, -++8, -++255, -++99, -++3, -++0, -++212, -++192, -++51, -++0, -++0, -++8, -++255, -++163, -++3, -++0, -++228, -++192, -++51, -++0, -++0, -++8, -++255, -++227, -++3, -++0, -++244, -++192, -++51, -++0, -++0, -++8, -++255, -++35, -++4, -++0, -++180, -++192, -++51, -++0, -++0, -++8, -++255, -++99, -++4, -++0, -++164, -++192, -++51, -++0, -++0, -++8, -++255, -++163, -++4, -++0, -++148, -++192, -++51, -++0, -++0, -++111, -++3, -++32, -++246, -++192, -++11, -++1, -++16, -++32, -++246, -++2, -++137, -++47, -++240, -++40, -++246, -++2, -++140, -++47, -++240, -++128, -++245, -++99, -++140, -++5, -++4, -++0, -++247, -++99, -++140, -++1, -++20, -++88, -++246, -++99, -++140, -++1, -++20, -++0, -++247, -++35, -++136, -++62, -++226, -++32, -++247, -++35, -++136, -++32, -++210, -++0, -++247, -++34, -++136, -++63, -++2, -++208, -++246, -++34, -++136, -++0, -++4, -++0, -++247, -++99, -++136, -++58, -++162, -++32, -++247, -++99, -++136, -++33, -++146, -++0, -++247, -++98, -++136, -++59, -++18, -++208, -++246, -++98, -++136, -++0, -++20, -++0, -++247, -++162, -++136, -++33, -++2, -++88, -++246, -++98, -++137, -++2, -++68, -++88, -++246, -++162, -++137, -++3, -++68, -++208, -++254, -++227, -++136, -++60, -++242, -++192, -++243, -++188, -++11, -++208, -++254, -++227, -++136, -++56, -++178, -++192, -++243, -++188, -++10, -++32, -++255, -++226, -++136, -++38, -++58, -++192, -++243, -++60, -++0, -++208, -++254, -++227, -++136, -++59, -++242, -++192, -++243, -++60, -++128, -++32, -++255, -++226, -++136, -++49, -++58, -++192, -++243, -++60, -++128, -++0, -++255, -++226, -++136, -++34, -++34, -++192, -++243, -++60, -++128, -++32, -++255, -++226, -++136, -++37, -++58, -++192, -++243, -++60, -++128, -++0, -++254, -++192, -++136, -++1, -++4, -++0, -++240, -++0, -++160, -++0, -++255, -++194, -++8, -++0, -++52, -++195, -++243, -++0, -++128, -++0, -++255, -++202, -++40, -++0, -++52, -++195, -++243, -++0, -++128, -++0, -++254, -++0, -++240, -++35, -++10, -++0, -++240, -++60, -++0, -++0, -++254, -++192, -++136, -++1, -++4, -++0, -++240, -++0, -++160, -++0, -++255, -++226, -++140, -++34, -++34, -++195, -++243, -++60, -++0, -++32, -++255, -++227, -++140, -++36, -++58, -++192, -++243, -++60, -++0, -++0, -++254, -++192, -++136, -++0, -++4, -++0, -++240, -++0, -++160, -++16, -++246, -++226, -++136, -++35, -++50, -++16, -++246, -++226, -++136, -++35, -++50, -++32, -++246, -++226, -++136, -++35, -++50, -++32, -++254, -++226, -++136, -++35, -++58, -++192, -++243, -++60, -++0, -++11, -++96, -++0, -++254, -++0, -++240, -++1, -++4, -++0, -++240, -++64, -++115, -++5, -++106, -++0, -++144, -++173, -++1, -++27, -++96, -++0, -++254, -++0, -++240, -++1, -++4, -++0, -++240, -++64, -++147, -++5, -++106, -++0, -++144, -++227, -++0, -++64, -++246, -++163, -++140, -++1, -++4, -++0, -++246, -++192, -++175, -++63, -++2, -++0, -++246, -++192, -++174, -++59, -++2, -++0, -++246, -++128, -++175, -++62, -++2, -++0, -++246, -++128, -++174, -++58, -++2, -++0, -++246, -++64, -++175, -++61, -++2, -++0, -++246, -++64, -++174, -++57, -++2, -++0, -++255, -++43, -++240, -++4, -++212, -++192, -++243, -++128, -++11, -++64, -++254, -++43, -++240, -++1, -++228, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++240, -++1, -++244, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++240, -++1, -++180, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++141, -++0, -++164, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++32, -++247, -++35, -++141, -++191, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++235, -++143, -++52, -++242, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++2, -++212, -++192, -++243, -++128, -++11, -++0, -++255, -++43, -++240, -++191, -++226, -++192, -++243, -++188, -++10, -++64, -++254, -++43, -++141, -++0, -++180, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++2, -++68, -++32, -++247, -++35, -++141, -++190, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++171, -++143, -++52, -++226, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++4, -++180, -++192, -++243, -++128, -++11, -++0, -++255, -++43, -++240, -++191, -++226, -++192, -++243, -++188, -++10, -++128, -++253, -++43, -++240, -++3, -++212, -++192, -++243, -++128, -++10, -++64, -++254, -++35, -++141, -++1, -++196, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++32, -++247, -++35, -++141, -++189, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++107, -++143, -++52, -++210, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++4, -++148, -++192, -++243, -++128, -++11, -++64, -++254, -++43, -++240, -++1, -++164, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++240, -++1, -++180, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++240, -++1, -++244, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++141, -++0, -++228, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++32, -++247, -++35, -++141, -++187, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++235, -++142, -++52, -++178, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++2, -++148, -++192, -++243, -++128, -++11, -++0, -++255, -++43, -++240, -++187, -++162, -++192, -++243, -++188, -++10, -++64, -++254, -++43, -++141, -++0, -++244, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++2, -++68, -++32, -++247, -++35, -++141, -++186, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++171, -++142, -++52, -++162, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++4, -++244, -++192, -++243, -++128, -++11, -++0, -++255, -++43, -++240, -++187, -++162, -++192, -++243, -++188, -++10, -++128, -++253, -++43, -++240, -++3, -++148, -++192, -++243, -++128, -++10, -++64, -++254, -++35, -++141, -++1, -++132, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++32, -++247, -++35, -++141, -++185, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++107, -++142, -++52, -++146, -++192, -++243, -++60, -++128, -++64, -++255, -++98, -++141, -++0, -++52, -++192, -++243, -++0, -++0, -++0, -++254, -++0, -++240, -++53, -++10, -++0, -++240, -++60, -++0, -++0, -++254, -++0, -++240, -++1, -++4, -++0, -++240, -++64, -++147, -++5, -++106, -++0, -++144, -++177, -++0, -++88, -++246, -++163, -++140, -++1, -++4, -++128, -++245, -++99, -++141, -++10, -++4, -++88, -++246, -++162, -++138, -++1, -++68, -++0, -++247, -++162, -++138, -++36, -++162, -++88, -++254, -++162, -++138, -++3, -++164, -++192, -++243, -++128, -++11, -++0, -++255, -++226, -++137, -++32, -++2, -++195, -++243, -++60, -++0, -++32, -++247, -++226, -++137, -++42, -++114, -++0, -++255, -++34, -++138, -++33, -++18, -++195, -++243, -++60, -++0, -++32, -++247, -++34, -++138, -++42, -++130, -++16, -++246, -++98, -++138, -++40, -++114, -++16, -++246, -++98, -++138, -++41, -++146, -++32, -++246, -++98, -++138, -++41, -++146, -++32, -++246, -++226, -++137, -++41, -++146, -++40, -++246, -++34, -++138, -++41, -++146, -++32, -++247, -++163, -++141, -++63, -++178, -++32, -++247, -++227, -++141, -++62, -++162, -++0, -++254, -++0, -++240, -++8, -++4, -++0, -++240, -++128, -++11, -++128, -++253, -++35, -++240, -++9, -++100, -++192, -++243, -++128, -++10, -++128, -++253, -++163, -++141, -++128, -++115, -++192, -++243, -++152, -++10, -++88, -++246, -++163, -++141, -++4, -++100, -++208, -++246, -++35, -++139, -++0, -++100, -++32, -++255, -++34, -++139, -++53, -++202, -++192, -++243, -++60, -++128, -++0, -++254, -++0, -++139, -++0, -++4, -++0, -++240, -++0, -++160, -++240, -++246, -++163, -++141, -++48, -++98, -++0, -++247, -++99, -++139, -++63, -++210, -++0, -++247, -++98, -++139, -++1, -++212, -++88, -++254, -++98, -++139, -++1, -++212, -++192, -++243, -++128, -++11, -++32, -++255, -++99, -++139, -++62, -++98, -++192, -++243, -++188, -++10, -++88, -++246, -++98, -++139, -++1, -++212, -++240, -++246, -++98, -++139, -++50, -++210, -++0, -++247, -++163, -++128, -++59, -++146, -++0, -++247, -++160, -++128, -++1, -++36, -++88, -++254, -++160, -++128, -++1, -++36, -++192, -++243, -++128, -++11, -++0, -++247, -++163, -++128, -++58, -++98, -++64, -++255, -++35, -++240, -++0, -++100, -++192, -++243, -++128, -++10, -++64, -++255, -++163, -++128, -++0, -++164, -++192, -++243, -++128, -++10, -++88, -++246, -++160, -++128, -++1, -++36, -++240, -++246, -++160, -++128, -++50, -++34, -++8, -++255, -++227, -++143, -++54, -++242, -++192, -++243, -++60, -++128, -++40, -++255, -++227, -++142, -++54, -++178, -++192, -++243, -++60, -++128, -++0, -++254, -++0, -++240, -++39, -++10, -++0, -++240, -++60, -++128, -++8, -++255, -++163, -++143, -++45, -++226, -++192, -++243, -++60, -++128, -++0, -++254, -++0, -++240, -++44, -++10, -++0, -++240, -++60, -++0, -++0, -++254, -++0, -++240, -++40, -++10, -++0, -++240, -++60, -++128, -++8, -++255, -++163, -++142, -++2, -++162, -++192, -++243, -++60, -++128, -++90, -++0, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index fd159bc..b055208 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -83,6 +83,8 @@ -+ hevc_trans_16x16: -+ cmp r5,1 -+ beq memclear16 -++ cmp r5,2 -++ beq hevc_deblock_16x16 -+ push r6-r15, lr # TODO cut down number of used registers -+ mov r14,r3 # coeffs32 -+ mov r15,r4 # num32 -+@@ -282,3 +284,427 @@ loop: -+ cmp r1,0 -+ bgt loop -+ b lr -++ -++ -++################################################################################ -++# HEVC VPU Deblock -++# -++# Vertical edges before horizontal -++# Decision can change every 4 pixels, but only 8 pixel boundaries are deblocked -++# -++# ARM is responsible for storing beta and tc for each 4 pixels horiz and vert edge. -++# The VPU code works in units of 16x16 blocks. -++# We do vertical filtering for the current block followed by horizontal filtering for the previous (except for the first time). -++# One final horizontal filter is required at the end. -++# PCM is not allowed in this code. -++# -++# -++# H(16-4:16+15,0) contains previous block (note that we need 4 lines above of context that may get altered during filtering) -++# H(16:31,16) contains current block (note that we do not need the upper lines until the horizontal filtering. -++ -++.set P0,63 -++.set P1,62 -++.set P2,61 -++.set P3,60 -++.set Q0,59 -++.set Q1,58 -++.set Q2,57 -++.set Q3,56 -++ -++.set dp,32 -++.set dq,33 -++.set d,34 -++.set decision,35 -++.set beta,36 -++.set beta2,37 -++.set beta3,38 -++.set ptest,39 -++.set qtest,40 -++.set pqtest,41 -++.set thresh,42 -++.set deltatest, 44 -++.set deltap1, 45 -++.set tc25, 46 -++.set setup,47 -++.set tc,48 -++.set tc25,49 -++.set tc2, 50 -++.set do_filter, 51 -++.set delta, 52 -++.set tc10, 53 -++.set delta0, 54 -++.set delta1, 55 -++.set zeros, 0 -++.set setup_input, 1 -++.set deltaq1, 2 -++ -++ -++ -++# hevc_deblock_16x16 deblocks an entire row that is 16 pixels high by the full width of the image. -++# Row has num16 16x16 blocks across -++# Beta goes from 0 to 64 -++# tc goes from 0 to 24 -++# setup[block_idx][0=vert,1=horz][0=first edge, 1=second edge][0=beta,1=tc][0..3=edge number] -++# has 8 bytes per edge -++# has 16 bytes per direction -++# has 32 bytes per 16x16 block -++# hevc_deblock_16x16(uint8_t *img (r0), int stride (r1), int num16w (r2), uint8_t setup[num16][2][2][2][4](r3),int num16h(r4)) -++hevc_deblock_16x16: -++ push r6-r15, lr -++ mov r9,r4 -++ mov r4,r3 -++ mov r13,r2 -++ mov r2,r0 -++ mov r10,r0 -++ subscale4 r0,r1 -++ mov r8,63 -++ mov r6,-3 -++ vmov H(zeros,0),0 -++# r7 is number of blocks still to load -++# r0 is location of current block - 4 * stride -++# r1 is stride -++# r2 is location of current block -++# r3 is offset of start of block (actual edges start at H(16,16)+r3 for horizontal and H(16,0)+r3 for vertical -++# r4 is setup -++# r5 is for temporary calculations -++# r8 holds 63 -++# r6 holds -3 -++# r9 holds the number of 16 high rows to process -++# r10 holds the original img base -++# r11 returns 0 if no filtering was done on the edge -++# r12 saves a copy of this -++# r13 is copy of width -++ -++process_row: -++ # First iteration does not do horizontal filtering on previous -++ mov r7, r13 -++ mov r3,0 -++ vldb H(12++,16)+r3,(r0 += r1) REP 4 # Load the current block -++ vldb H(16++,16)+r3,(r2 += r1) REP 16 -++ vldb H(setup_input,0), (r4) # We may wish to prefetch these -++ vstb H(zeros,0),(r4) -++ bl vert_filter -++ add r3,8 -++ vadd H(setup_input,0),H(setup_input,8),0 # Rotate to second set of 8 -++ bl vert_filter -++ sub r3,8 -++ b start_deblock_loop -++deblock_loop: -++ # Middle iterations do vertical on current block and horizontal on preceding -++ vldb H(12++,16)+r3,(r0 += r1) REP 4 # load the current block -++ vldb H(16++,16)+r3,(r2 += r1) REP 16 -++ vldb H(setup_input,0), (r4) -++ vstb H(zeros,0),(r4) -++ bl vert_filter -++ add r3,8 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl vert_filter -++ sub r3,8 -++ vldb H(setup_input,0), -16(r4) -++ vstb H(zeros,0),-16(r4) -++ bl horz_filter -++ mov r12,r11 -++ add r3,8*64 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl horz_filter -++ sub r3,8*64 -++ addcmpbeq r12,0,0,skip_save_top -++ vstb H(12++,0)+r3,-16(r0 += r1) REP 4 # Save the deblocked pixels for the previous block -++skip_save_top: -++ vstb H(16++,0)+r3,-16(r2 += r1) REP 16 -++start_deblock_loop: -++ # move onto next 16x16 (could do this with circular buffer support instead) -++ add r3,16 -++ and r3,r8 -++ add r4,32 -++ # Perform loop counter operations (may work with an addcmpbgt as well?) -++ add r0,16 -++ add r2,16 -++ sub r7,1 -++ cmp r7,0 # Are there still more blocks to load -++ bgt deblock_loop -++ -++ # Final iteration needs to just do horizontal filtering -++ vldb H(setup_input,0), -16(r4) -++ vstb H(zeros,0),-16(r4) -++ bl horz_filter -++ mov r12,r11 -++ add r3,8*64 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl horz_filter -++ sub r3,64*8 -++ addcmpbeq r12,0,0,skip_save_top2 -++ vstb H(12++,0)+r3,-16(r0 += r1) REP 4 # Save the deblocked pixels for the previous block -++skip_save_top2: -++ vstb H(16++,0)+r3,-16(r2 += r1) REP 16 -++ -++# Now look to see if we should do another row -++ sub r9,1 -++ cmp r9,0 -++ bgt start_again -++ pop r6-r15, pc -++start_again: -++ # Need to sort out r0,r2 to point to next row down -++ addscale16 r10,r1 -++ mov r2,r10 -++ subscale4 r0,r2,r1 -++ b process_row -++ -++ -++# At this stage H(16,16)+r3 points to the first pixel of the 16 high edge to be filtered -++# So we can reuse the code we move the parts to be filtered into HX(P0/P1/P2/P3/Q0/Q1/Q2/Q3,0) - we will perform a final saturation step on placing them back into the correct locations -++ -++vert_filter: -++ push lr -++ -++ vmov HX(P3,0), V(16,12)+r3 -++ vmov HX(P2,0), V(16,13)+r3 -++ vmov HX(P1,0), V(16,14)+r3 -++ vmov HX(P0,0), V(16,15)+r3 -++ vmov HX(Q0,0), V(16,16)+r3 -++ vmov HX(Q1,0), V(16,17)+r3 -++ vmov HX(Q2,0), V(16,18)+r3 -++ vmov HX(Q3,0), V(16,19)+r3 -++ -++ bl do_luma_filter -++ -++ vadds V(16,13)+r3, HX(P2,0), 0 -++ vadds V(16,14)+r3, HX(P1,0), 0 -++ vadds V(16,15)+r3, HX(P0,0), 0 -++ # P3 and Q3 never change so don't bother saving back -++ vadds V(16,16)+r3, HX(Q0,0), 0 -++ vadds V(16,17)+r3, HX(Q1,0), 0 -++ vadds V(16,18)+r3, HX(Q2,0), 0 -++ -++ pop pc -++ -++# Filter edge at H(16,0)+r3 -++horz_filter: -++ push lr -++ -++ vmov HX(P3,0), H(12,0)+r3 -++ vmov HX(P2,0), H(13,0)+r3 -++ vmov HX(P1,0), H(14,0)+r3 -++ vmov HX(P0,0), H(15,0)+r3 -++ vmov HX(Q0,0), H(16,0)+r3 -++ vmov HX(Q1,0), H(17,0)+r3 -++ vmov HX(Q2,0), H(18,0)+r3 -++ vmov HX(Q3,0), H(19,0)+r3 -++ -++ bl do_luma_filter -++ -++ vadds H(13,0)+r3, HX(P2,0), 0 -++ vadds H(14,0)+r3, HX(P1,0), 0 -++ vadds H(15,0)+r3, HX(P0,0), 0 -++ # P3 and Q3 never change so don't bother saving back -++ vadds H(16,0)+r3, HX(Q0,0), 0 -++ vadds H(17,0)+r3, HX(Q1,0), 0 -++ vadds H(18,0)+r3, HX(Q2,0), 0 -++ -++ pop pc -++ -++# r4 points to array of beta/tc for each 4 length edge -++do_luma_filter: -++ valtl H(setup,0),H(setup_input,0),H(setup_input,0) # b*8tc*8 -++ valtl HX(beta,0),H(setup,0),H(setup,0) -++ valtu HX(tc,0),H(setup,0),H(setup,0) -++ vmul HX(tc25,0), HX(tc,0), 5 -++ vadd HX(tc25,0),HX(tc25,0), 1 -++ vasr HX(tc25,0), HX(tc25,0), 1 -++ -++ # Compute decision -++ vadd HX(dp,0),HX(P1,0),HX(P1,0) # 2*P1 -++ vsub HX(dp,0),HX(P2,0),HX(dp,0) # P2-2*P1 -++ vadd HX(dp,0),HX(dp,0),HX(P0,0) # P2-2*P1+P0 -++ vdist HX(dp,0),HX(dp,0),0 # abs(P2-2*P1+P0) # dp0 -++ -++ vadd HX(dq,0),HX(Q1,0),HX(Q1,0) # 2*Q1 -++ vsub HX(dq,0),HX(Q2,0),HX(dq,0) # Q2-2*Q1 -++ vadd HX(dq,0),HX(dq,0),HX(Q0,0) # Q2-2*Q1+Q0 -++ vdist HX(dq,0),HX(dq,0),0 # abs(Q2-2*Q1+Q0) # dq0 -++ -++ vadd HX(d,0), HX(dp,0), HX(dq,0) -++ vasr HX(beta2,0),HX(beta,0),2 -++ vasr HX(beta3,0),HX(beta,0),3 -++ -++ # Compute flags that are negative if all conditions pass -++ vdist HX(decision,0), HX(P0,0), HX(P3,0) CLRA SACC -++ vdist HX(decision,0), HX(Q0,0), HX(Q3,0) SACC -++ vsub HX(decision,0), HX(decision,0), HX(beta3,0) SETF -++ -++ vdist HX(decision,0), HX(P0,0), HX(Q0,0) IFN -++ vsub HX(decision,0), HX(decision,0), HX(tc25,0) IFN SETF -++ vadd HX(decision,0), HX(d,0), HX(d,0) IFN -++ vsub HX(decision,0), HX(decision,0), HX(beta2,0) IFN SETF -++ vmov HX(decision,0), 1 IFNN -++ vadd H(decision,0),H(decision,3),0 IFN -++ vadd H(decision,16),H(decision,19),0 IFN -++ vmov -,HX(decision,0) SETF # N marks strong filter -++ vmov HX(decision,0), 1 IFNN # NN marks normal filter -++ -++ vadd HX(do_filter,0), HX(d,3), HX(d,0) -++ vsub HX(do_filter,0), HX(do_filter,0), HX(beta,0) SETF # IFNN means no filter -++ vmov HX(decision,0),0 IFNN # Z marks no filter -++ -++ # Expand out decision (currently valid one every 4 pixels) 0...1...2...3 -++ # First extract out even terms -++ vodd HX(decision,0),HX(decision,0),HX(decision,0) # 0.1.2.3 -++ vodd HX(decision,0),HX(decision,0),HX(decision,0) # 0123 -++ # Now expand back -++ valtl HX(decision,0),HX(decision,0),HX(decision,0) # 00112233 -++ valtl HX(decision,0),HX(decision,0),HX(decision,0) SETF # 0000111122223333 -++ -++ # HX(decision,0) is negative if want strong filtering, 1 if want normal filtering, 0 if want no filtering -++ -++ # Do a quick check to see if there is anything to do -++ mov r11, 0 # Signal no filtering -++ vmov -,1 IFNZ SUMS r5 -++ cmp r5,0 -++ beq filtering_done -++ mov r11, 1 # Signal some filtering -++ # And whether there is any strong filtering -++ vmov -,1 IFN SUMS r5 -++ cmp r5,0 -++ beq normal_filtering -++ -++ ############################################################################## -++ # Strong filtering - could maybe fast case if all have same sign? (especially if all disabled!) -++ vshl HX(tc2,0), HX(tc,0), 1 # Note that in normal filtering tx2 is tc/2, while here it is tc*2 -++ -++ # Take a copy of the original pixels for use in decision calculation -++ vmov HX(P0,32),HX(P0,0) -++ vmov HX(Q0,32),HX(Q0,0) -++ vmov HX(P1,32),HX(P1,0) -++ vmov HX(Q1,32),HX(Q1,0) -++ vmov HX(P2,32),HX(P2,0) -++ vmov HX(Q2,32),HX(Q2,0) -++ -++ vadd -,HX(P2,32),4 CLRA SACC -++ vshl -,HX(P1,32),1 SACC -++ vshl -,HX(P0,32),1 SACC -++ vshl -,HX(Q0,32),1 SACC -++ vshl HX(delta,0),HX(Q1,32),0 SACC -++ vasr HX(delta,0),HX(delta,0), 3 -++ vsub HX(delta,0),HX(delta,0),HX(P0,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(P0,0),HX(P0,32),HX(delta,0) IFN -++ -++ vadd -,HX(P2,32),2 CLRA SACC -++ vadd -,HX(P1,32),HX(P0,32) SACC -++ vshl HX(delta,0),HX(Q0,32),0 SACC -++ vasr HX(delta,0),HX(delta,0), 2 -++ vsub HX(delta,0),HX(delta,0),HX(P1,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(P1,0),HX(P1,32),HX(delta,0) IFN -++ -++ vadd -,HX(Q0,32),4 CLRA SACC -++ vadd -,HX(P1,32),HX(P0,32) SACC -++ vmul -,HX(P2,32),3 SACC -++ vshl HX(delta,0),HX(P3,0),1 SACC # Note that we have not made a copy of P3, so using P3,0 is correct -++ vasr HX(delta,0),HX(delta,0), 3 -++ vsub HX(delta,0),HX(delta,0),HX(P2,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(P2,0),HX(P2,32),HX(delta,0) IFN -++ #vmov HX(P2,0),3 IFN -++ -++ # Now reverse all P/Qs -++ -++ vadd -,HX(Q2,32),4 CLRA SACC -++ vshl -,HX(Q1,32),1 SACC -++ vshl -,HX(Q0,32),1 SACC -++ vshl -,HX(P0,32),1 SACC -++ vshl HX(delta,0),HX(P1,32),0 SACC -++ vasr HX(delta,0),HX(delta,0), 3 -++ vsub HX(delta,0),HX(delta,0),HX(Q0,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(Q0,0),HX(Q0,32),HX(delta,0) IFN -++ -++ vadd -,HX(Q2,32),2 CLRA SACC -++ vadd -,HX(Q1,32),HX(Q0,32) SACC -++ vshl HX(delta,0),HX(P0,32),0 SACC -++ vasr HX(delta,0),HX(delta,0), 2 -++ vsub HX(delta,0),HX(delta,0),HX(Q1,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(Q1,0),HX(Q1,32),HX(delta,0) IFN -++ -++ vadd -,HX(P0,32),4 CLRA SACC -++ vadd -,HX(Q1,32),HX(Q0,32) SACC -++ vmul -,HX(Q2,32),3 SACC -++ vshl HX(delta,0),HX(Q3,0),1 SACC # Note that we have not made a copy of Q3, so using Q3,0 is correct -++ vasr HX(delta,0),HX(delta,0), 3 -++ vsub HX(delta,0),HX(delta,0),HX(Q2,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(Q2,0),HX(Q2,32),HX(delta,0) IFN -++ -++ ############################################################################## -++ # Normal filtering -++normal_filtering: -++ # Invert the decision flags -++ # make instruction more complicated as assembler has error and loses SETF -++ vrsub HX(tc10,0), HX(decision,0), 0 SETF # IFN means normal filtering -++ vmov -, HX(tc10,0) SETF # IFN means normal filtering -++ -++ vmov -,1 IFN SUMS r5 -++ cmp r5,0 -++ beq filtering_done -++ -++ vasr HX(tc2,0), HX(tc,0), 1 -++ vmul HX(tc10,0), HX(tc,0), 10 -++ -++ vasr HX(thresh,0), HX(beta,0), 1 -++ vadd HX(thresh,0), HX(thresh,0), HX(beta,0) -++ vasr HX(thresh,0), HX(thresh,0), 3 CLRA SACC -++ -++ vadd HX(ptest,0),HX(dp,3),HX(dp,0) -++ vsub HX(ptest,0),HX(ptest,0),HX(thresh,0) # ptest is negative if we need to do the P2 pixel -++ vadd HX(qtest,0),HX(dq,3),HX(dq,0) -++ vsub HX(qtest,0),HX(qtest,0),HX(thresh,0) # qtest is negative if we need to do the Q2 pixel -++ # Expand ptest and qtest together -++ vodd HX(pqtest,0),HX(ptest,0),HX(qtest,0) # p.p.p.p.q.q.q.q -++ vodd HX(pqtest,0),HX(pqtest,0),HX(pqtest,0) # ppppqqqq........ -++ valtl HX(pqtest,0),HX(pqtest,0),HX(pqtest,0) # ppppppppqqqqqqqq -++ valtl HX(ptest,0),HX(pqtest,0),HX(pqtest,0) -++ valtu HX(qtest,0),HX(pqtest,0),HX(pqtest,0) -++ -++ vsub HX(delta0,0), HX(Q0,0), HX(P0,0) -++ vsub HX(delta1,0), HX(Q1,0), HX(P1,0) -++ vmov -,8 CLRA SACC -++ vmul -,HX(delta0,0), 9 SACC -++ vmul HX(delta0,0),HX(delta1,0), r6 SACC -++ vasr HX(delta0,0), HX(delta0,0), 4 -++ vdist HX(deltatest,0), HX(delta0,0), 0 -++ vsub HX(deltatest,0), HX(deltatest,0), HX(tc10,0) IFN SETF # negative if still need to do something -++ vmov HX(deltatest,0), 0 IFNN # clear if no need to do anything so we can reload flags later -++ -++ vclamps HX(delta0,0), HX(delta0,0), HX(tc,0) -++ -++ vadd HX(deltap1,0), HX(P2,0), HX(P0,0) -++ vadd HX(deltap1,0), HX(deltap1,0), 1 -++ vasr HX(deltap1,0), HX(deltap1,0), 1 CLRA SACC -++ vsub HX(deltap1,0), HX(delta0,0), HX(P1,0) SACC -++ vasr HX(deltap1,0), HX(deltap1,0), 1 -++ vclamps HX(deltap1,0), HX(deltap1,0), HX(tc2,0) -++ -++ vadd HX(deltaq1,0), HX(Q2,0), HX(Q0,0) -++ vadd HX(deltaq1,0), HX(deltaq1,0), 1 -++ vasr HX(deltaq1,0), HX(deltaq1,0), 1 CLRA SACC -++ vadd HX(deltaq1,0), HX(delta0,0), HX(Q1,0) -++ vrsub -, HX(delta0,0), 0 SACC -++ vrsub HX(deltaq1,0), HX(Q1,0), 0 SACC -++ vasr HX(deltaq1,0), HX(deltaq1,0), 1 -++ vclamps HX(deltaq1,0), HX(deltaq1,0), HX(tc2,0) -++ -++ vadds HX(P0,0), HX(P0,0), HX(delta0,0) IFN -++ vsubs HX(Q0,0), HX(Q0,0), HX(delta0,0) IFN -++ -++ vmov -,HX(ptest,0) IFN SETF # Negative if need to do p1 -++ vadds HX(P1,0), HX(P1,0), HX(deltap1,0) IFN -++ -++ vmov -,HX(deltatest,0) SETF -++ vmov -,HX(qtest,0) IFN SETF # Negative if need to do q1 -++ vadds HX(Q1,0), HX(Q1,0), HX(deltaq1,0) IFN -++ -++ #vmov HX(P2,0),1 IFN -++ -++filtering_done: -++ b lr -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 0121fca..05b2169 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -147,7 +147,7 @@ static int gpu_init(volatile struct GPU **gpu) { -+ vcsm_init(); -+ gpu_malloc_uncached_internal(sizeof(struct GPU), &gpu_mem_ptr, mb); -+ ptr = (volatile struct GPU*)gpu_mem_ptr.arm; -+- memset(ptr, 0, sizeof *ptr); -++ memset((void*)ptr, 0, sizeof *ptr); -+ vc = gpu_mem_ptr.vc; -+ -+ ptr->mb = mb; -+@@ -254,7 +254,7 @@ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ iocache.s[0].handle = p->vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = p->arm; -++ iocache.s[0].addr = (int) p->arm; -+ iocache.s[0].size = p->numbytes; -+ vcsm_clean_invalid( &iocache ); -+ #else -+@@ -390,6 +390,7 @@ static void *vpu_start(void *arg) { -+ #ifdef RPI_TIME_TOTAL_POSTED -+ int last_time=0; -+ long long on_time=0; -++ long long on_time_deblock=0; -+ long long off_time=0; -+ int start_time; -+ int end_time; -+@@ -451,10 +452,13 @@ static void *vpu_start(void *arg) { -+ #ifdef RPI_TIME_TOTAL_POSTED -+ end_time = Microseconds(); -+ last_time = end_time; -+- on_time += end_time - start_time; -++ if (p[6]==2) -++ on_time_deblock += end_time - start_time; -++ else -++ on_time += end_time - start_time; -+ count++; -+ if ((count&0x7f)==0) -+- printf("Posted %d On=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(off_time/1000)); -++ printf("Posted %d On=%dms, On_deblock=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(on_time_deblock/1000),(int)(off_time/1000)); -+ #endif -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index e86eb30..c5d8b29 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -61,7 +61,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000120] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -+ /* [0x00000128] */ 0x0c9e7440, 0x10020f27, // add t1s, r2, r1 -+ /* [0x00000130] */ 0x00000008, 0xe00208a7, // mov r2,8 -+-/* [0x00000138] */ 0x11827c80, 0x10021327, // shl rb12,unif, r2 -++/* [0x00000138] */ 0x11827c80, 0x10021327, // shl rb12,unif,r2 -+ /* [0x00000140] */ 0x0c827c80, 0x10021367, // add rb13,unif,r2 -+ /* [0x00000148] */ 0x15827d80, 0x100208a7, // mov r2, unif -+ /* [0x00000150] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-- -+2.7.4 -+ -+ -+From e9c59f0d7b42dfb10d85ab2477f95b44484a8d70 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 1 Jul 2015 09:21:17 +0100 -+Subject: [PATCH 65/68] Added ability to combine jobs -+ -+--- -+ libavcodec/rpi_qpu.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++- -+ 1 file changed, 80 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 05b2169..91777be 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -8,6 +8,8 @@ -+ #define RPI_TIME_TOTAL_POSTED -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+ #define RPI_ASYNC -++// Define RPI_COMBINE_JOBS to find jobs that can be executed in parallel -++#define RPI_COMBINE_JOBS -+ -+ #include -+ #include -+@@ -398,9 +400,15 @@ static void *vpu_start(void *arg) { -+ #endif -+ while(1) { -+ int i; -+- int *p; -++ int *p; // Pointer for a QPU/VPU job -++#ifdef RPI_COMBINE_JOBS -++ int *q = NULL; // Pointer for a VPU only job -++ int have_qpu = 0; -++ int have_vpu = 0; -++#endif -+ int qpu_code; -+ int qpu_codeb; -++ int num_jobs; // Number of jobs available -+ pthread_mutex_lock(&post_mutex); -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+@@ -408,13 +416,38 @@ static void *vpu_start(void *arg) { -+ pthread_cond_wait(&post_cond_tail, &post_mutex); -+ } -+ p = vpu_cmds[vpu_async_head%MAXCMDS]; -++ num_jobs = vpu_async_tail - vpu_async_head; -+ pthread_mutex_unlock(&post_mutex); -+ -+ if (p[6] == -1) { -+ break; // Last job -+ } -++ if (p[7] == 0 && p[0] == 0 && p[16]==0) -++ goto job_done_early; -++ -++#ifdef RPI_COMBINE_JOBS -++ // First scan for a qpu job -++ for (int x=0;xmail[i*2] = p[8+i]; -++ gpu->mail[i*2 + 1] = qpu_code; -++ } -++ for(i=0;i<12;i++) { -++ gpu->mail2[i*2] = p[17+i]; -++ gpu->mail2[i*2 + 1] = qpu_codeb; -++ } -++ if (have_vpu) { -++ execute_multi(gpu->mb, -++ 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -++ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -++ q[0], q[1], q[2], q[3], q[4], q[5], q[6]); // VPU1 -++ q[0] = 0; -++ } else { -++ execute_multi(gpu->mb, -++ 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -++ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -++ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -++ } -++ p[0] = 0; -++ p[7] = 0; -++ p[16] = 0; -++ } else { -++ av_assert0(have_vpu); -++ vpu_execute_code(q[0], q[1], q[2], q[3], q[4], q[5], q[6]); -++ q[0] = 0; -++ } -++#else -++ -+ if (!qpu_code) { -+ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -+ } else { -+@@ -449,17 +516,29 @@ static void *vpu_start(void *arg) { -+ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -+ #endif -+ } -++#endif -++ -+ #ifdef RPI_TIME_TOTAL_POSTED -+ end_time = Microseconds(); -+ last_time = end_time; -++#ifdef RPI_COMBINE_JOBS -++ // There are three cases we may wish to distinguish of VPU/QPU activity -++ on_time += end_time - start_time; -++#else -+ if (p[6]==2) -+ on_time_deblock += end_time - start_time; -+ else -+ on_time += end_time - start_time; -++#endif -+ count++; -+ if ((count&0x7f)==0) -++#ifdef RPI_COMBINE_JOBS -+ printf("Posted %d On=%dms, On_deblock=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(on_time_deblock/1000),(int)(off_time/1000)); -++#else -++ printf("Posted %d On=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(off_time/1000)); -++#endif -+ #endif -++job_done_early: -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+ pthread_cond_broadcast(&post_cond_head); -+-- -+2.7.4 -+ -+ -+From 0d54661f303b2a8903e806648ed54a34dcf315dc Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 1 Jul 2015 12:53:10 +0100 -+Subject: [PATCH 66/68] Added chroma deblocking -+ -+--- -+ libavcodec/hevc.c | 20 ++ -+ libavcodec/hevc.h | 12 +- -+ libavcodec/hevc_filter.c | 92 +++++- -+ libavcodec/rpi_hevc_transform.h | 644 +++++++++++++++++++++++++++++++++++++++- -+ libavcodec/rpi_hevc_transform.s | 207 +++++++++++++ -+ libavcodec/rpi_qpu.c | 27 +- -+ libavcodec/rpi_shader.qasm | 11 + -+ 7 files changed, 988 insertions(+), 25 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 4ce94a7..8437e10 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -251,6 +251,14 @@ static void pic_arrays_free(HEVCContext *s) -+ gpu_free(&s->y_setup_ptr); -+ s->y_setup_arm = 0; -+ } -++ if (s->uv_setup_arm) { -++ gpu_free(&s->uv_setup_ptr); -++ s->uv_setup_arm = 0; -++ } -++ if (s->vpu_cmds_arm) { -++ gpu_free(&s->vpu_cmds_ptr); -++ s->vpu_cmds_arm = 0; -++ } -+ #endif -+ av_freep(&s->sao); -+ av_freep(&s->deblock); -+@@ -324,6 +332,18 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ s->y_setup_vc = (void*)s->y_setup_ptr.vc; -+ memset(s->y_setup_arm, 0, s->y_setup_ptr.numbytes); -+ printf("Setup %d by %d by %d\n",s->setup_width,s->setup_height,sizeof(*s->y_setup_arm)); -++ -++ s->uv_setup_width = ( (sps->width >> sps->hshift[1]) + 15) / 16; -++ s->uv_setup_height = ( (sps->height >> sps->vshift[1]) + 15) / 16; -++ gpu_malloc_uncached(sizeof(*s->uv_setup_arm) * s->uv_setup_width * s->uv_setup_height, &s->uv_setup_ptr); // TODO make this cached -++ s->uv_setup_arm = (void*)s->uv_setup_ptr.arm; -++ s->uv_setup_vc = (void*)s->uv_setup_ptr.vc; -++ memset(s->uv_setup_arm, 0, s->uv_setup_ptr.numbytes); -++ printf("Setup uv %d by %d by %d\n",s->uv_setup_width,s->uv_setup_height,sizeof(*s->uv_setup_arm)); -++ -++ gpu_malloc_uncached(sizeof(*s->vpu_cmds_arm) * 3,&s->vpu_cmds_ptr); -++ s->vpu_cmds_arm = (void*) s->vpu_cmds_ptr.arm; -++ s->vpu_cmds_vc = s->vpu_cmds_ptr.vc; -+ #endif -+ -+ s->bs_width = (width >> 2) + 1; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index cf08489..7eb37e6 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -56,7 +56,7 @@ -+ #define RPI_MAX_JOBS 2 -+ // Define RPI_WORKER to launch a worker thread for pixel processing tasks -+ #define RPI_WORKER -+- -++ // Define RPI_DEBLOCK_VPU to perform deblocking on the VPUs -+ #define RPI_DEBLOCK_VPU -+ -+ #endif -+@@ -980,6 +980,16 @@ typedef struct HEVCContext { -+ uint8_t (*y_setup_vc)[2][2][2][4]; -+ int setup_width; // Number of 16x16 blocks across the image -+ int setup_height; // Number of 16x16 blocks down the image -++ -++ GPU_MEM_PTR_T uv_setup_ptr; -++ uint8_t (*uv_setup_arm)[2][2][2][4]; // Half of this is unused [][][1][], but easier for the VPU as it allows us to store with zeros and addresses are aligned -++ uint8_t (*uv_setup_vc)[2][2][2][4]; -++ int uv_setup_width; -++ int uv_setup_height; -++ -++ GPU_MEM_PTR_T vpu_cmds_ptr; -++ int (*vpu_cmds_arm)[6]; // r0-r5 for each command -++ int vpu_cmds_vc; -+ #endif -+ -+ #endif -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 06371da..6367068 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -656,9 +656,23 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->frame->linesize[chroma], -+ c_tc, no_p, no_q); -+ } else -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ uint8_t (*setup)[2][2][4]; -++ int xc = x>>s->ps.sps->hshift[chroma]; -++ int yc = y>>s->ps.sps->vshift[chroma]; -++ int num16 = (yc>>4)*s->uv_setup_width + (xc>>4); -++ int a = ((yc>>3) & 1) << 1; -++ int b = (xc>>3) & 1; -++ setup = s->uv_setup_arm[num16]; -++ setup[0][b][0][a] = c_tc[0]; -++ setup[0][b][0][a + 1] = c_tc[1]; -++ } else -++#endif -+ s->hevcdsp.hevc_v_loop_filter_chroma(src, -+ s->frame->linesize[chroma], -+ c_tc, no_p, no_q); -++ -+ } -+ } -+ -+@@ -689,6 +703,19 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->frame->linesize[chroma], -+ c_tc, no_p, no_q); -+ } else -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ uint8_t (*setup)[2][2][4]; -++ int xc = x>>s->ps.sps->hshift[chroma]; -++ int yc = y>>s->ps.sps->vshift[chroma]; -++ int num16 = (yc>>4)*s->uv_setup_width + (xc>>4); -++ int a = ((xc>>3) & 1) << 1; -++ int b = (yc>>3) & 1; -++ setup = s->uv_setup_arm[num16]; -++ setup[1][b][0][a] = c_tc[0]; -++ setup[1][b][0][a + 1] = c_tc[1]; -++ } else -++#endif -+ s->hevcdsp.hevc_h_loop_filter_chroma(src, -+ s->frame->linesize[chroma], -+ c_tc, no_p, no_q); -+@@ -1013,33 +1040,56 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ static void rpi_deblock(HEVCContext *s, int y, int ctb_size) -+ { -+ // Flush image, 4 lines above to bottom of ctb stripe -+- ff_hevc_flush_buffer_lines(s, FFMAX(y-4,0), y+ctb_size, 1, 0); -++ ff_hevc_flush_buffer_lines(s, FFMAX(y-4,0), y+ctb_size, 1, 1); -+ // TODO flush buffer of beta/tc setup when it becomes cached -++ -++ // Prepare three commands at once to avoid calling overhead -++ s->vpu_cmds_arm[0][0] = get_vc_address(s->frame->buf[0]) + s->frame->linesize[0] * y; -++ s->vpu_cmds_arm[0][1] = s->frame->linesize[0]; -++ s->vpu_cmds_arm[0][2] = s->setup_width; -++ s->vpu_cmds_arm[0][3] = (int) ( s->y_setup_vc + s->setup_width * (y>>4) ); -++ s->vpu_cmds_arm[0][4] = ctb_size>>4; -++ s->vpu_cmds_arm[0][5] = 2; -++ -++ s->vpu_cmds_arm[1][0] = get_vc_address(s->frame->buf[1]) + s->frame->linesize[1] * (y>> s->ps.sps->vshift[1]); -++ s->vpu_cmds_arm[1][1] = s->frame->linesize[1]; -++ s->vpu_cmds_arm[1][2] = s->uv_setup_width; -++ s->vpu_cmds_arm[1][3] = (int) ( s->uv_setup_vc + s->uv_setup_width * ((y>>4)>> s->ps.sps->vshift[1]) ); -++ s->vpu_cmds_arm[1][4] = (ctb_size>>4)>> s->ps.sps->vshift[1]; -++ s->vpu_cmds_arm[1][5] = 3; -++ -++ s->vpu_cmds_arm[2][0] = get_vc_address(s->frame->buf[2]) + s->frame->linesize[2] * (y>> s->ps.sps->vshift[2]); -++ s->vpu_cmds_arm[2][1] = s->frame->linesize[2]; -++ s->vpu_cmds_arm[2][2] = s->uv_setup_width; -++ s->vpu_cmds_arm[2][3] = (int) ( s->uv_setup_vc + s->uv_setup_width * ((y>>4)>> s->ps.sps->vshift[1]) ); -++ s->vpu_cmds_arm[2][4] = (ctb_size>>4)>> s->ps.sps->vshift[1]; -++ s->vpu_cmds_arm[2][5] = 4; -++ -+ // Call VPU -+- // TODO add this to a separate pipeline of VPU jobs that can be run in parallel and wait for completion -+- vpu_wait(vpu_post_code( vpu_get_fn(), get_vc_address(s->frame->buf[0]) + s->frame->linesize[0] * y, s->frame->linesize[0], -+- s->setup_width, (int) ( s->y_setup_vc + s->setup_width * (y>>4) ), -+- ctb_size>>4, 2, 0)); // 2 means to do the deblocking code -++ vpu_wait(vpu_post_code( vpu_get_fn(), s->vpu_cmds_vc, 3, 0, 0, 0, 5, 0)); // 5 means to do all the commands -+ } -+ -+-static void rpi_deblock2(HEVCContext *s, int y, int ctb_size) -+-{ -+- int y2; -+- for(y2=y;y2= s->ps.sps->width - ctb_size; -++#ifdef RPI_DEBLOCK_VPU -++ int done_deblock = 0; -++#endif -+ if (s->avctx->skip_loop_filter < AVDISCARD_ALL) -+ deblocking_filter_CTB(s, x, y); -+ #ifdef RPI_DEBLOCK_VPU -+ if (s->enable_rpi_deblock && x_end) -+ { -+- rpi_deblock(s, y, ctb_size); -++ int y_at_end = y >= s->ps.sps->height - ctb_size; -++ int height = 64; // Deblock in units 64 high to avoid too many VPU calls -++ int y_start = y&~63; -++ if (y_at_end) height = s->ps.sps->height - y_start; -++ if ((((y+ctb_size)&63)==0) || y_at_end) { -++ done_deblock = 1; -++ rpi_deblock(s, y_start, height); -++ } -+ } -+ #endif -+ if (s->ps.sps->sao_enabled) { -+@@ -1070,11 +1120,25 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ //int newh = y + ctb_size - 4; -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ // we no longer need to flush the luma buffer as it is in GPU memory when using deblocking on the rpi -++ if (done_deblock) { -++ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -++ } -++ } else { -++#ifdef RPI_INTER_QPU -++ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size - 4); -++#endif -++ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -++ } -++#else -+ #ifdef RPI_INTER_QPU -+ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size - 4); -+- // TODO we no longer need to flush the luma buffer as it is in GPU memory when using deblocking on the rpi -++ // we no longer need to flush the luma buffer as it is in GPU memory when using deblocking on the rpi -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -++#endif -+ } -+ } -+ -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index b3f155f..4309f1c 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -3,14 +3,32 @@ unsigned char rpi_hevc_transform [] = { -+ 106, -+ 0, -+ 144, -+-38, -++47, -+ 1, -+ 37, -+ 106, -+ 0, -+ 144, -+-57, -++66, -+ 1, -++53, -++106, -++0, -++144, -++192, -++4, -++69, -++106, -++0, -++144, -++192, -++4, -++85, -++106, -++0, -++144, -++220, -++5, -+ 169, -+ 3, -+ 62, -+@@ -2427,4 +2445,626 @@ unsigned char rpi_hevc_transform [] = { -+ 128, -+ 90, -+ 0, -++169, -++3, -++14, -++96, -++4, -++31, -++169, -++3, -++30, -++96, -++1, -++31, -++73, -++64, -++52, -++64, -++45, -++64, -++2, -++64, -++10, -++64, -++64, -++198, -++1, -++7, -++8, -++232, -++63, -++0, -++0, -++0, -++6, -++232, -++253, -++255, -++255, -++255, -++0, -++246, -++0, -++0, -++0, -++4, -++215, -++64, -++3, -++96, -++2, -++248, -++0, -++35, -++0, -++0, -++64, -++56, -++0, -++0, -++4, -++248, -++0, -++36, -++0, -++0, -++64, -++56, -++8, -++0, -++0, -++240, -++64, -++0, -++132, -++3, -++30, -++106, -++132, -++24, -++128, -++240, -++0, -++0, -++132, -++3, -++128, -++144, -++143, -++0, -++131, -++98, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++135, -++0, -++131, -++102, -++0, -++158, -++71, -++0, -++2, -++248, -++0, -++35, -++0, -++0, -++64, -++56, -++0, -++0, -++4, -++248, -++0, -++36, -++0, -++0, -++64, -++56, -++8, -++0, -++0, -++240, -++64, -++0, -++132, -++3, -++30, -++106, -++132, -++24, -++128, -++240, -++0, -++0, -++132, -++3, -++128, -++144, -++112, -++0, -++131, -++98, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++104, -++0, -++131, -++102, -++0, -++248, -++64, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++30, -++106, -++134, -++24, -++128, -++248, -++0, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++144, -++123, -++0, -++188, -++64, -++67, -++232, -++0, -++2, -++0, -++0, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++112, -++0, -++195, -++232, -++0, -++2, -++0, -++0, -++12, -++128, -++7, -++192, -++130, -++248, -++0, -++0, -++112, -++192, -++224, -++16, -++195, -++31, -++132, -++248, -++1, -++0, -++112, -++0, -++224, -++16, -++203, -++31, -++3, -++99, -++131, -++71, -++68, -++232, -++32, -++0, -++0, -++0, -++0, -++99, -++2, -++99, -++23, -++102, -++7, -++106, -++127, -++156, -++178, -++255, -++0, -++248, -++64, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++30, -++106, -++134, -++24, -++128, -++248, -++0, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++144, -++72, -++0, -++188, -++64, -++67, -++232, -++0, -++2, -++0, -++0, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++61, -++0, -++195, -++232, -++0, -++2, -++0, -++0, -++12, -++128, -++7, -++192, -++130, -++248, -++0, -++0, -++112, -++192, -++224, -++16, -++195, -++31, -++132, -++248, -++1, -++0, -++112, -++0, -++224, -++16, -++203, -++31, -++25, -++102, -++9, -++106, -++2, -++30, -++41, -++3, -++26, -++87, -++162, -++64, -++64, -++198, -++1, -++23, -++127, -++158, -++95, -++255, -++239, -++3, -++0, -++254, -++128, -++143, -++94, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++143, -++95, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++142, -++208, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++142, -++209, -++0, -++0, -++240, -++12, -++0, -++128, -++144, -++47, -++0, -++8, -++255, -++227, -++23, -++0, -++244, -++192, -++51, -++0, -++0, -++8, -++255, -++35, -++52, -++0, -++180, -++192, -++51, -++0, -++0, -++111, -++3, -++239, -++3, -++0, -++254, -++128, -++143, -++14, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++143, -++15, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++142, -++16, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++142, -++17, -++0, -++0, -++240, -++12, -++0, -++128, -++144, -++13, -++0, -++8, -++255, -++227, -++3, -++0, -++244, -++192, -++51, -++0, -++0, -++8, -++255, -++35, -++4, -++0, -++180, -++192, -++51, -++0, -++0, -++111, -++3, -++32, -++246, -++192, -++11, -++1, -++16, -++32, -++246, -++2, -++140, -++47, -++240, -++32, -++247, -++35, -++141, -++63, -++178, -++64, -++254, -++35, -++141, -++2, -++68, -++192, -++243, -++128, -++11, -++32, -++255, -++35, -++240, -++58, -++226, -++192, -++243, -++188, -++10, -++0, -++254, -++0, -++141, -++4, -++4, -++0, -++240, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++240, -++246, -++35, -++141, -++48, -++66, -++0, -++247, -++227, -++143, -++52, -++242, -++32, -++247, -++227, -++142, -++52, -++178, -++90, -++0, -++161, -++3, -++6, -++64, -++23, -++64, -++96, -++8, -++70, -++98, -++97, -++8, -++70, -++98, -++98, -++8, -++70, -++98, -++99, -++8, -++70, -++98, -++100, -++8, -++70, -++98, -++101, -++8, -++70, -++98, -++255, -++159, -++8, -++250, -++23, -++102, -++7, -++106, -++112, -++30, -++33, -++3, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index b055208..5543093 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -85,6 +85,13 @@ hevc_trans_16x16: -+ beq memclear16 -+ cmp r5,2 -+ beq hevc_deblock_16x16 -++ cmp r5,3 -++ beq hevc_uv_deblock_16x16 -++ cmp r5,4 -++ beq hevc_uv_deblock_16x16_with_clear -++ cmp r5,5 -++ beq hevc_run_command_list -++ -+ push r6-r15, lr # TODO cut down number of used registers -+ mov r14,r3 # coeffs32 -+ mov r15,r4 # num32 -+@@ -708,3 +715,203 @@ normal_filtering: -+ -+ filtering_done: -+ b lr -++ -++ -++hevc_uv_deblock_16x16: -++ push r6-r15, lr -++ mov r14,0 -++ b hevc_uv_start -++hevc_uv_deblock_16x16_with_clear: -++ push r6-r15, lr -++ mov r14,1 -++ b hevc_uv_start -++ -++hevc_uv_start: -++ mov r9,r4 -++ mov r4,r3 -++ mov r13,r2 -++ mov r2,r0 -++ mov r10,r0 -++ subscale4 r0,r1 -++ mov r8,63 -++ mov r6,-3 -++ vmov H(zeros,0),0 -++# r7 is number of blocks still to load -++# r0 is location of current block - 4 * stride -++# r1 is stride -++# r2 is location of current block -++# r3 is offset of start of block (actual edges start at H(16,16)+r3 for horizontal and H(16,0)+r3 for vertical -++# r4 is setup -++# r5 is for temporary calculations -++# r8 holds 63 -++# r6 holds -3 -++# r9 holds the number of 16 high rows to process -++# r10 holds the original img base -++# r11 returns 0 if no filtering was done on the edge -++# r12 saves a copy of this -++# r13 is copy of width -++# r14 is 1 if we should clear the old contents, or 0 if not -++ -++uv_process_row: -++ # First iteration does not do horizontal filtering on previous -++ mov r7, r13 -++ mov r3,0 -++ vldb H(12++,16)+r3,(r0 += r1) REP 4 # Load the current block -++ vldb H(16++,16)+r3,(r2 += r1) REP 16 -++ vldb H(setup_input,0), (r4) # We may wish to prefetch these -++ cmp r14,1 -++ bne uv_skip0 -++ vstb H(zeros,0),(r4) -++uv_skip0: -++ bl uv_vert_filter -++ add r3,8 -++ vadd H(setup_input,0),H(setup_input,8),0 # Rotate to second set of 8 -++ bl uv_vert_filter -++ sub r3,8 -++ b uv_start_deblock_loop -++uv_deblock_loop: -++ # Middle iterations do vertical on current block and horizontal on preceding -++ vldb H(12++,16)+r3,(r0 += r1) REP 4 # load the current block -++ vldb H(16++,16)+r3,(r2 += r1) REP 16 -++ vldb H(setup_input,0), (r4) -++ cmp r14,1 -++ bne uv_skip1 -++ vstb H(zeros,0),(r4) -++uv_skip1: -++ bl uv_vert_filter -++ add r3,8 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl uv_vert_filter -++ sub r3,8 -++ vldb H(setup_input,0), -16(r4) -++ cmp r14,1 -++ bne uv_skip3 -++ vstb H(zeros,0),-16(r4) -++uv_skip3: -++ bl uv_horz_filter -++ mov r12,r11 -++ add r3,8*64 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl uv_horz_filter -++ sub r3,8*64 -++ addcmpbeq r12,0,0,uv_skip_save_top -++ vstb H(12++,0)+r3,-16(r0 += r1) REP 4 # Save the deblocked pixels for the previous block -++uv_skip_save_top: -++ vstb H(16++,0)+r3,-16(r2 += r1) REP 16 -++uv_start_deblock_loop: -++ # move onto next 16x16 (could do this with circular buffer support instead) -++ add r3,16 -++ and r3,r8 -++ add r4,32 -++ # Perform loop counter operations (may work with an addcmpbgt as well?) -++ add r0,16 -++ add r2,16 -++ sub r7,1 -++ cmp r7,0 # Are there still more blocks to load -++ bgt uv_deblock_loop -++ -++ # Final iteration needs to just do horizontal filtering -++ vldb H(setup_input,0), -16(r4) -++ cmp r14,1 -++ bne uv_skip2 -++ vstb H(zeros,0),-16(r4) -++uv_skip2: -++ bl uv_horz_filter -++ mov r12,r11 -++ add r3,8*64 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl uv_horz_filter -++ sub r3,64*8 -++ addcmpbeq r12,0,0,uv_skip_save_top2 -++ vstb H(12++,0)+r3,-16(r0 += r1) REP 4 # Save the deblocked pixels for the previous block -++uv_skip_save_top2: -++ vstb H(16++,0)+r3,-16(r2 += r1) REP 16 -++ -++# Now look to see if we should do another row -++ sub r9,1 -++ cmp r9,0 -++ bgt uv_start_again -++ pop r6-r15, pc -++uv_start_again: -++ # Need to sort out r0,r2 to point to next row down -++ addscale16 r10,r1 -++ mov r2,r10 -++ subscale4 r0,r2,r1 -++ b uv_process_row -++ -++ -++# At this stage H(16,16)+r3 points to the first pixel of the 16 high edge to be filtered -++# So we can reuse the code we move the parts to be filtered into HX(P0/P1/P2/P3/Q0/Q1/Q2/Q3,0) - we will perform a final saturation step on placing them back into the correct locations -++ -++uv_vert_filter: -++ push lr -++ -++ vmov HX(P1,0), V(16,14)+r3 -++ vmov HX(P0,0), V(16,15)+r3 -++ vmov HX(Q0,0), V(16,16)+r3 -++ vmov HX(Q1,0), V(16,17)+r3 -++ -++ bl do_chroma_filter -++ -++ vadds V(16,15)+r3, HX(P0,0), 0 -++ vadds V(16,16)+r3, HX(Q0,0), 0 -++ -++ pop pc -++ -++# Filter edge at H(16,0)+r3 -++uv_horz_filter: -++ push lr -++ -++ vmov HX(P1,0), H(14,0)+r3 -++ vmov HX(P0,0), H(15,0)+r3 -++ vmov HX(Q0,0), H(16,0)+r3 -++ vmov HX(Q1,0), H(17,0)+r3 -++ -++ bl do_chroma_filter -++ -++ vadds H(15,0)+r3, HX(P0,0), 0 -++ # P3 and Q3 never change so don't bother saving back -++ vadds H(16,0)+r3, HX(Q0,0), 0 -++ -++ pop pc -++ -++# r4 points to array of beta/tc for each 4 length edge -++do_chroma_filter: -++ valtl H(setup,0),H(setup_input,0),H(setup_input,0) # tc*8 -++ valtl HX(tc,0),H(setup,0),H(setup,0) -++ -++ vsub HX(delta,0),HX(Q0,0),HX(P0,0) -++ vshl HX(delta,0),HX(delta,0),2 CLRA SACC -++ vsub -,HX(P1,0),HX(Q1,0) SACC -++ vmov HX(delta,0),4 SACC -++ vasr HX(delta,0),HX(delta,0),3 -++ vclamps HX(delta,0), HX(delta,0), HX(tc,0) -++ vadd HX(P0,0),HX(P0,0),HX(delta,0) -++ vsub HX(Q0,0),HX(Q0,0),HX(delta,0) -++ b lr -++ -++# r0 = list -++# r1 = number -++hevc_run_command_list: -++ push r6-r7, lr -++ mov r6, r0 -++ mov r7, r1 -++loop_cmds: -++ ld r0,(r6) # How to encode r6++? -++ add r6,4 -++ ld r1,(r6) -++ add r6,4 -++ ld r2,(r6) -++ add r6,4 -++ ld r3,(r6) -++ add r6,4 -++ ld r4,(r6) -++ add r6,4 -++ ld r5,(r6) -++ add r6,4 -++ bl hevc_trans_16x16 -++ sub r7,1 -++ cmp r7,0 -++ bgt loop_cmds -++ -++ pop r6-r7, pc -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 91777be..5aa0432 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -397,6 +397,8 @@ static void *vpu_start(void *arg) { -+ int start_time; -+ int end_time; -+ int count=0; -++ int count_deblock=0; -++ int count_qpu=0; -+ #endif -+ while(1) { -+ int i; -+@@ -442,7 +444,7 @@ static void *vpu_start(void *arg) { -+ break; -+ } -+ } -+- printf("Have_qpu = %d, have_vpu=%d\n",have_qpu,have_vpu); -++ //printf("Have_qpu = %d, have_vpu=%d\n",have_qpu,have_vpu); -+ #endif -+ qpu_code = p[7]; -+ qpu_codeb = p[16]; -+@@ -460,6 +462,12 @@ static void *vpu_start(void *arg) { -+ off_time += start_time-last_time; -+ #endif -+ -++#define NO_FLUSH 1 -++#define CLEAR_PROFILE 2 -++#define OUTPUT_COUNTS 4 -++ -++#define FLAGS_FOR_PROFILING (NO_FLUSH) -++ -+ #ifdef RPI_COMBINE_JOBS -+ if (have_qpu) { -+ for(i=0;i<8;i++) { -+@@ -472,14 +480,14 @@ static void *vpu_start(void *arg) { -+ } -+ if (have_vpu) { -+ execute_multi(gpu->mb, -+- 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 12,gpu->vc + offsetof(struct GPU, mail2), FLAGS_FOR_PROFILING, 5000, -+ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -+ q[0], q[1], q[2], q[3], q[4], q[5], q[6]); // VPU1 -+ q[0] = 0; -+ } else { -+ execute_multi(gpu->mb, -+- 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 12,gpu->vc + offsetof(struct GPU, mail2), FLAGS_FOR_PROFILING, 5000, -+ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -+ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -+@@ -510,7 +518,7 @@ static void *vpu_start(void *arg) { -+ execute_qpu(gpu->mb,8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */); -+ #else -+ execute_multi(gpu->mb, -+- 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 12,gpu->vc + offsetof(struct GPU, mail2), FLAGS_FOR_PROFILING , 5000, -+ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -+ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -+@@ -525,17 +533,20 @@ static void *vpu_start(void *arg) { -+ // There are three cases we may wish to distinguish of VPU/QPU activity -+ on_time += end_time - start_time; -+ #else -+- if (p[6]==2) -++ if (p[6]>1) { -++ count_deblock++; -+ on_time_deblock += end_time - start_time; -+- else -++ } else { -+ on_time += end_time - start_time; -++ count_qpu++; -++ } -+ #endif -+ count++; -+ if ((count&0x7f)==0) -+ #ifdef RPI_COMBINE_JOBS -+- printf("Posted %d On=%dms, On_deblock=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(on_time_deblock/1000),(int)(off_time/1000)); -+-#else -+ printf("Posted %d On=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(off_time/1000)); -++#else -++ printf("Posted %d On=%dms (%d calls), On_deblock=%dms (%d calls), Off=%dms\n",count,(int)(on_time/1000),count_qpu,(int)(on_time_deblock/1000),count_deblock,(int)(off_time/1000)); -+ #endif -+ #endif -+ job_done_early: -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 0686249..64bf5b0 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -1077,6 +1077,17 @@ nop ; nop # delay slot 2 -+ ::mc_interrupt_exit12 -+ mov -, vw_wait # wait on the VDW -+ -++ # Dummy wait to test instructions -++# mov r3,1000000 -++#:dummy_loop -++# sub.setf r3, r3, 1 -++# nop -++# nop -++# brr.anynn -, r:dummy_loop -++# nop -++# nop -++# nop -++ -+ ldtmu0 -+ ldtmu0 -+ ldtmu1 -+-- -+2.7.4 -+ -+ -+From 12a194bddd049ab97154e9fbdd46b63b558a3bee Mon Sep 17 00:00:00 2001 -+From: Ben Avison -+Date: Tue, 23 Jun 2015 23:42:03 +0100 -+Subject: [PATCH 67/68] armv7/hevc: Optimise deblocking boundary strength -+ calculation -+ -+--- -+ libavcodec/arm/hevcdsp_deblock_neon.S | 115 +++++++++++++++++ -+ libavcodec/arm/hevcdsp_init_neon.c | 9 ++ -+ libavcodec/hevc.h | 11 -- -+ libavcodec/hevc_filter.c | 224 ++++++++++++++-------------------- -+ libavcodec/hevcdsp.c | 116 ++++++++++++++++++ -+ libavcodec/hevcdsp.h | 14 +++ -+ 6 files changed, 344 insertions(+), 145 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_deblock_neon.S b/libavcodec/arm/hevcdsp_deblock_neon.S -+index 166bddb..bad4589 100644 -+--- a/libavcodec/arm/hevcdsp_deblock_neon.S -++++ b/libavcodec/arm/hevcdsp_deblock_neon.S -+@@ -383,3 +383,118 @@ function ff_hevc_h_loop_filter_chroma_neon, export=1 -+ vst1.8 {d4}, [r0] -+ bx lr -+ endfunc -++ -++/* ff_hevc_deblocking_boundary_strengths_neon(int pus, int dup, int in_inc, int out_inc, -++ * int *curr_rpl0, int *curr_rpl1, int *neigh_rpl0, int *neigh_rpl1, -++ * MvField *curr, MvField *neigh, uint8_t *bs) -++ */ -++function ff_hevc_deblocking_boundary_strengths_neon, export=1 -++ add ip, sp, #4*4 -++ push {a2-a4,v1-v8,lr} -++ ldmia ip, {v5-v7} -++1: ldmdb ip, {v1-v4} -++ ldrsb a3, [v5, #8] @ curr->ref_idx -++ ldrsb v8, [v5, #9] -++ ldrsb ip, [v6, #8] @ neigh->ref_idx -++ ldrsb lr, [v6, #9] -++ ldr v1, [v1, a3, lsl #2] -++ ldrb a3, [v5, #10] @ curr->pred_flag -++ ldr v2, [v2, v8, lsl #2] -++ ldrb v8, [v6, #10] @ neigh->pred_flag -++ ldr v3, [v3, ip, lsl #2] -++ ldr v4, [v4, lr, lsl #2] -++ teq a3, #3 -++ beq 20f -++ teq v8, #3 -++ beq 90f -++ -++ tst a3, #1 -++ ldrne a3, [v5, #0] @ curr->mv[0] -++ ldreq a3, [v5, #4] @ curr->mv[1] -++ moveq v1, v2 -++ tst v8, #1 -++ ldrne v8, [v6, #0] @ neigh->mv[0] -++ ldreq v8, [v6, #4] @ neigh->mv[1] -++ moveq v3, v4 -++ teq v1, v3 -++ bne 10f -++ ldr lr, =0xFFFCFFFC -++ ssub16 ip, v8, a3 -++ ssub16 a3, a3, v8 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ @ drop through -++10: movne a3, #1 -++11: subs a2, a2, #1 -++12: strbhs a3, [v7], a4 -++ subs a2, a2, #1 -++ bhs 12b -++ -++ ldm sp, {a2, a3} -++ add ip, sp, #16*4 -++ subs a1, a1, #1 -++ add v5, v5, a3 -++ add v6, v6, a3 -++ bhi 1b -++ pop {a2-a4,v1-v8,pc} -++ -++20: teq v8, #3 -++ bne 10b -++ -++ teq v1, v3 -++ teqeq v2, v4 -++ bne 40f -++ teq v1, v2 -++ bne 30f -++ -++ ldrd v1, v2, [v5] @ curr->mv -++ ldrd v3, v4, [v6] @ neigh->mv -++ ldr lr, =0xFFFCFFFC -++ ssub16 ip, v3, v1 -++ ssub16 a3, v1, v3 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ bne 25f -++ ssub16 ip, v4, v2 -++ ssub16 a3, v2, v4 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ beq 11b -++ @ drop through -++25: ssub16 ip, v4, v1 -++ ssub16 a3, v1, v4 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ bne 10b -++ ssub16 ip, v3, v2 -++ ssub16 a3, v2, v3 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ b 10b -++ -++30: ldrd v1, v2, [v5] @ curr->mv -++ ldrd v3, v4, [v6] @ neigh->mv -++ ldr lr, =0xFFFCFFFC -++ ssub16 ip, v3, v1 -++ ssub16 a3, v1, v3 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ bne 10b -++ ssub16 ip, v4, v2 -++ ssub16 a3, v2, v4 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ b 10b -++ -++40: teq v1, v4 -++ teqeq v2, v3 -++ bne 10b -++ -++ ldrd v1, v2, [v5] @ curr->mv -++ ldrd v3, v4, [v6] @ neigh->mv -++ ldr lr, =0xFFFCFFFC -++ b 25b -++ -++90: mov a3, #1 -++ b 11b -++endfunc -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index e5da7e9..49c70dd 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -290,6 +290,10 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ } -+ #undef CMP -+ -++void ff_hevc_deblocking_boundary_strengths_neon(int pus, int dup, int in_inc, int out_inc, -++ int *curr_rpl0, int *curr_rpl1, int *neigh_rpl0, int *neigh_rpl1, -++ MvField *curr, MvField *neigh, uint8_t *bs); -++ -+ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ { -+ if (bit_depth == 8) { -+@@ -387,4 +391,9 @@ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ c->put_hevc_qpel_uni[8][0][0] = ff_hevc_put_qpel_uw_pixels_w48_neon_8; -+ c->put_hevc_qpel_uni[9][0][0] = ff_hevc_put_qpel_uw_pixels_w64_neon_8; -+ } -++ -++ assert(offsetof(MvField, mv) == 0); -++ assert(offsetof(MvField, ref_idx) == 8); -++ assert(offsetof(MvField, pred_flag) == 10); -++ c->hevc_deblocking_boundary_strengths = ff_hevc_deblocking_boundary_strengths_neon; -+ } -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 7eb37e6..496c0e1 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -684,17 +684,6 @@ typedef struct CodingUnit { -+ uint8_t cu_transquant_bypass_flag; -+ } CodingUnit; -+ -+-typedef struct Mv { -+- int16_t x; ///< horizontal component of motion vector -+- int16_t y; ///< vertical component of motion vector -+-} Mv; -+- -+-typedef struct MvField { -+- DECLARE_ALIGNED(4, Mv, mv)[2]; -+- int8_t ref_idx[2]; -+- int8_t pred_flag; -+-} MvField; -+- -+ typedef struct NeighbourAvailable { -+ int cand_bottom_left; -+ int cand_left; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 6367068..826a82f 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -726,69 +726,6 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ } -+ } -+ -+-static int boundary_strength(HEVCContext *s, MvField *curr, MvField *neigh, -+- RefPicList *neigh_refPicList) -+-{ -+- if (curr->pred_flag == PF_BI && neigh->pred_flag == PF_BI) { -+- // same L0 and L1 -+- if (s->ref->refPicList[0].list[curr->ref_idx[0]] == neigh_refPicList[0].list[neigh->ref_idx[0]] && -+- s->ref->refPicList[0].list[curr->ref_idx[0]] == s->ref->refPicList[1].list[curr->ref_idx[1]] && -+- neigh_refPicList[0].list[neigh->ref_idx[0]] == neigh_refPicList[1].list[neigh->ref_idx[1]]) { -+- if ((FFABS(neigh->mv[0].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[0].y) >= 4 || -+- FFABS(neigh->mv[1].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[1].y) >= 4) && -+- (FFABS(neigh->mv[1].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[0].y) >= 4 || -+- FFABS(neigh->mv[0].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[1].y) >= 4)) -+- return 1; -+- else -+- return 0; -+- } else if (neigh_refPicList[0].list[neigh->ref_idx[0]] == s->ref->refPicList[0].list[curr->ref_idx[0]] && -+- neigh_refPicList[1].list[neigh->ref_idx[1]] == s->ref->refPicList[1].list[curr->ref_idx[1]]) { -+- if (FFABS(neigh->mv[0].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[0].y) >= 4 || -+- FFABS(neigh->mv[1].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[1].y) >= 4) -+- return 1; -+- else -+- return 0; -+- } else if (neigh_refPicList[1].list[neigh->ref_idx[1]] == s->ref->refPicList[0].list[curr->ref_idx[0]] && -+- neigh_refPicList[0].list[neigh->ref_idx[0]] == s->ref->refPicList[1].list[curr->ref_idx[1]]) { -+- if (FFABS(neigh->mv[1].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[0].y) >= 4 || -+- FFABS(neigh->mv[0].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[1].y) >= 4) -+- return 1; -+- else -+- return 0; -+- } else { -+- return 1; -+- } -+- } else if ((curr->pred_flag != PF_BI) && (neigh->pred_flag != PF_BI)){ // 1 MV -+- Mv A, B; -+- int ref_A, ref_B; -+- -+- if (curr->pred_flag & 1) { -+- A = curr->mv[0]; -+- ref_A = s->ref->refPicList[0].list[curr->ref_idx[0]]; -+- } else { -+- A = curr->mv[1]; -+- ref_A = s->ref->refPicList[1].list[curr->ref_idx[1]]; -+- } -+- -+- if (neigh->pred_flag & 1) { -+- B = neigh->mv[0]; -+- ref_B = neigh_refPicList[0].list[neigh->ref_idx[0]]; -+- } else { -+- B = neigh->mv[1]; -+- ref_B = neigh_refPicList[1].list[neigh->ref_idx[1]]; -+- } -+- -+- if (ref_A == ref_B) { -+- if (FFABS(A.x - B.x) >= 4 || FFABS(A.y - B.y) >= 4) -+- return 1; -+- else -+- return 0; -+- } else -+- return 1; -+- } -+- -+- return 1; -+-} -+ -+ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ int log2_trafo_size) -+@@ -799,10 +736,17 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ int log2_min_tu_size = s->ps.sps->log2_min_tb_size; -+ int min_pu_width = s->ps.sps->min_pu_width; -+ int min_tu_width = s->ps.sps->min_tb_width; -+- int is_intra = tab_mvf[(y0 >> log2_min_pu_size) * min_pu_width + -+- (x0 >> log2_min_pu_size)].pred_flag == PF_INTRA; -+ int boundary_upper, boundary_left; -+- int i, j, bs; -++ int i, j; -++ RefPicList *rpl = s->ref->refPicList; -++ int min_pu_in_4pix = (1 << log2_min_pu_size) >> 2; -++ int trafo_in_min_pus = (1 << log2_trafo_size) >> log2_min_pu_size; -++ int y_pu = y0 >> log2_min_pu_size; -++ int x_pu = x0 >> log2_min_pu_size; -++ MvField *curr = &tab_mvf[y_pu * min_pu_width + x_pu]; -++ int is_intra = curr->pred_flag == PF_INTRA; -++ int inc = log2_min_pu_size == 2 ? 2 : 1; -++ uint8_t *bs; -+ -+ #ifdef DISABLE_STRENGTHS -+ return; -+@@ -818,34 +762,56 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ (y0 % (1 << s->ps.sps->log2_ctb_size)) == 0))) -+ boundary_upper = 0; -+ -++ bs = &s->horizontal_bs[(x0 + y0 * s->bs_width) >> 2]; -++ -+ if (boundary_upper) { -+ RefPicList *rpl_top = (lc->boundary_flags & BOUNDARY_UPPER_SLICE) ? -+ ff_hevc_get_ref_list(s, s->ref, x0, y0 - 1) : -+- s->ref->refPicList; -+- int yp_pu = (y0 - 1) >> log2_min_pu_size; -+- int yq_pu = y0 >> log2_min_pu_size; -+- int yp_tu = (y0 - 1) >> log2_min_tu_size; -+- int yq_tu = y0 >> log2_min_tu_size; -++ rpl; -++ MvField *top = curr - min_pu_width; -++ -++ if (is_intra) { -++ for (i = 0; i < (1 << log2_trafo_size); i += 4) -++ bs[i >> 2] = 2; -++ -++ } else { -++ int y_tu = y0 >> log2_min_tu_size; -++ int x_tu = x0 >> log2_min_tu_size; -++ uint8_t *curr_cbf_luma = &s->cbf_luma[y_tu * min_tu_width + x_tu]; -++ uint8_t *top_cbf_luma = curr_cbf_luma - min_tu_width; -++ -++ s->hevcdsp.hevc_deblocking_boundary_strengths(trafo_in_min_pus, -++ min_pu_in_4pix, sizeof (MvField), 4 >> 2, -++ rpl[0].list, rpl[1].list, rpl_top[0].list, rpl_top[1].list, -++ curr, top, bs); -+ -+ for (i = 0; i < (1 << log2_trafo_size); i += 4) { -+- int x_pu = (x0 + i) >> log2_min_pu_size; -+- int x_tu = (x0 + i) >> log2_min_tu_size; -+- MvField *top = &tab_mvf[yp_pu * min_pu_width + x_pu]; -+- MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu]; -+- uint8_t top_cbf_luma = s->cbf_luma[yp_tu * min_tu_width + x_tu]; -+- uint8_t curr_cbf_luma = s->cbf_luma[yq_tu * min_tu_width + x_tu]; -+- -+- if (curr->pred_flag == PF_INTRA || top->pred_flag == PF_INTRA) -+- bs = 2; -+- else if (curr_cbf_luma || top_cbf_luma) -+- bs = 1; -+- else -+- bs = boundary_strength(s, curr, top, rpl_top); -+- s->horizontal_bs[((x0 + i) + y0 * s->bs_width) >> 2] = bs; -++ int i_pu = i >> log2_min_pu_size; -++ int i_tu = i >> log2_min_tu_size; -++ -++ if (top[i_pu].pred_flag == PF_INTRA) -++ bs[i >> 2] = 2; -++ else if (curr_cbf_luma[i_tu] || top_cbf_luma[i_tu]) -++ bs[i >> 2] = 1; -+ } -++ } -++ } -++ -++ if (!is_intra) { -++ for (j = inc; j < trafo_in_min_pus; j += inc) { -++ MvField *top; -++ -++ curr += min_pu_width * inc; -++ top = curr - min_pu_width; -++ bs += s->bs_width * inc << log2_min_pu_size >> 2; -++ -++ s->hevcdsp.hevc_deblocking_boundary_strengths(trafo_in_min_pus, -++ min_pu_in_4pix, sizeof (MvField), 4 >> 2, -++ rpl[0].list, rpl[1].list, rpl[0].list, rpl[1].list, -++ curr, top, bs); -++ } -+ } -+ -+- // bs for vertical TU boundaries -+ boundary_left = x0 > 0 && !(x0 & 7); -+ if (boundary_left && -+ ((!s->sh.slice_loop_filter_across_slices_enabled_flag && -+@@ -856,64 +822,54 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ (x0 % (1 << s->ps.sps->log2_ctb_size)) == 0))) -+ boundary_left = 0; -+ -++ curr = &tab_mvf[y_pu * min_pu_width + x_pu]; -++ bs = &s->vertical_bs[(x0 + y0 * s->bs_width) >> 2]; -++ -+ if (boundary_left) { -+ RefPicList *rpl_left = (lc->boundary_flags & BOUNDARY_LEFT_SLICE) ? -+ ff_hevc_get_ref_list(s, s->ref, x0 - 1, y0) : -+- s->ref->refPicList; -+- int xp_pu = (x0 - 1) >> log2_min_pu_size; -+- int xq_pu = x0 >> log2_min_pu_size; -+- int xp_tu = (x0 - 1) >> log2_min_tu_size; -+- int xq_tu = x0 >> log2_min_tu_size; -+- -+- for (i = 0; i < (1 << log2_trafo_size); i += 4) { -+- int y_pu = (y0 + i) >> log2_min_pu_size; -+- int y_tu = (y0 + i) >> log2_min_tu_size; -+- MvField *left = &tab_mvf[y_pu * min_pu_width + xp_pu]; -+- MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu]; -+- uint8_t left_cbf_luma = s->cbf_luma[y_tu * min_tu_width + xp_tu]; -+- uint8_t curr_cbf_luma = s->cbf_luma[y_tu * min_tu_width + xq_tu]; -+- -+- if (curr->pred_flag == PF_INTRA || left->pred_flag == PF_INTRA) -+- bs = 2; -+- else if (curr_cbf_luma || left_cbf_luma) -+- bs = 1; -+- else -+- bs = boundary_strength(s, curr, left, rpl_left); -+- s->vertical_bs[(x0 + (y0 + i) * s->bs_width) >> 2] = bs; -+- } -+- } -++ rpl; -++ MvField *left = curr - 1; -+ -+- if (log2_trafo_size > log2_min_pu_size && !is_intra) { -+- RefPicList *rpl = s->ref->refPicList; -++ if (is_intra) { -++ for (j = 0; j < (1 << log2_trafo_size); j += 4) -++ bs[j * s->bs_width >> 2] = 2; -+ -+- // bs for TU internal horizontal PU boundaries -+- for (j = 8; j < (1 << log2_trafo_size); j += 8) { -+- int yp_pu = (y0 + j - 1) >> log2_min_pu_size; -+- int yq_pu = (y0 + j) >> log2_min_pu_size; -+- -+- for (i = 0; i < (1 << log2_trafo_size); i += 4) { -+- int x_pu = (x0 + i) >> log2_min_pu_size; -+- MvField *top = &tab_mvf[yp_pu * min_pu_width + x_pu]; -+- MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu]; -+- -+- bs = boundary_strength(s, curr, top, rpl); -+- s->horizontal_bs[((x0 + i) + (y0 + j) * s->bs_width) >> 2] = bs; -++ } else { -++ int y_tu = y0 >> log2_min_tu_size; -++ int x_tu = x0 >> log2_min_tu_size; -++ uint8_t *curr_cbf_luma = &s->cbf_luma[y_tu * min_tu_width + x_tu]; -++ uint8_t *left_cbf_luma = curr_cbf_luma - 1; -++ -++ s->hevcdsp.hevc_deblocking_boundary_strengths(trafo_in_min_pus, -++ min_pu_in_4pix, min_pu_width * sizeof (MvField), 4 * s->bs_width >> 2, -++ rpl[0].list, rpl[1].list, rpl_left[0].list, rpl_left[1].list, -++ curr, left, bs); -++ -++ for (j = 0; j < (1 << log2_trafo_size); j += 4) { -++ int j_pu = j >> log2_min_pu_size; -++ int j_tu = j >> log2_min_tu_size; -++ -++ if (left[j_pu * min_pu_width].pred_flag == PF_INTRA) -++ bs[j * s->bs_width >> 2] = 2; -++ else if (curr_cbf_luma[j_tu * min_tu_width] || left_cbf_luma[j_tu * min_tu_width]) -++ bs[j * s->bs_width >> 2] = 1; -+ } -+ } -++ } -+ -+- // bs for TU internal vertical PU boundaries -+- for (j = 0; j < (1 << log2_trafo_size); j += 4) { -+- int y_pu = (y0 + j) >> log2_min_pu_size; -++ if (!is_intra) { -++ for (i = inc; i < trafo_in_min_pus; i += inc) { -++ MvField *left; -+ -+- for (i = 8; i < (1 << log2_trafo_size); i += 8) { -+- int xp_pu = (x0 + i - 1) >> log2_min_pu_size; -+- int xq_pu = (x0 + i) >> log2_min_pu_size; -+- MvField *left = &tab_mvf[y_pu * min_pu_width + xp_pu]; -+- MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu]; -++ curr += inc; -++ left = curr - 1; -++ bs += inc << log2_min_pu_size >> 2; -+ -+- bs = boundary_strength(s, curr, left, rpl); -+- s->vertical_bs[((x0 + i) + (y0 + j) * s->bs_width) >> 2] = bs; -+- } -++ s->hevcdsp.hevc_deblocking_boundary_strengths(trafo_in_min_pus, -++ min_pu_in_4pix, min_pu_width * sizeof (MvField), 4 * s->bs_width >> 2, -++ rpl[0].list, rpl[1].list, rpl[0].list, rpl[1].list, -++ curr, left, bs); -+ } -+ } -+ } -+diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c -+index 9d773d9..a6534a9 100644 -+--- a/libavcodec/hevcdsp.c -++++ b/libavcodec/hevcdsp.c -+@@ -123,6 +123,120 @@ DECLARE_ALIGNED(16, const int8_t, ff_hevc_qpel_filters[3][16]) = { -+ #include "hevcdsp_template.c" -+ #undef BIT_DEPTH -+ -++static void hevc_deblocking_boundary_strengths(int pus, int dup, int in_inc, int out_inc, -++ int *curr_rpl0, int *curr_rpl1, int *neigh_rpl0, int *neigh_rpl1, -++ MvField *curr, MvField *neigh, uint8_t *bs) -++{ -++ for (; pus > 0; pus--) { -++ int strength, out; -++ int curr_refL0 = curr_rpl0[curr->ref_idx[0]]; -++ int curr_refL1 = curr_rpl1[curr->ref_idx[1]]; -++ int neigh_refL0 = neigh_rpl0[neigh->ref_idx[0]]; -++ int neigh_refL1 = neigh_rpl1[neigh->ref_idx[1]]; -++ -++#if 1 // This more directly matches the original implementation -++ if (curr->pred_flag == PF_BI && neigh->pred_flag == PF_BI) { -++ // same L0 and L1 -++ if (curr_refL0 == neigh_refL0 && -++ curr_refL0 == curr_refL1 && -++ neigh_refL0 == neigh_refL1) { -++ if ((FFABS(neigh->mv[0].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[0].y) >= 4 || -++ FFABS(neigh->mv[1].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[1].y) >= 4) && -++ (FFABS(neigh->mv[1].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[0].y) >= 4 || -++ FFABS(neigh->mv[0].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[1].y) >= 4)) -++ strength = 1; -++ else -++ strength = 0; -++ } else if (neigh_refL0 == curr_refL0 && -++ neigh_refL1 == curr_refL1) { -++ if (FFABS(neigh->mv[0].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[0].y) >= 4 || -++ FFABS(neigh->mv[1].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[1].y) >= 4) -++ strength = 1; -++ else -++ strength = 0; -++ } else if (neigh_refL1 == curr_refL0 && -++ neigh_refL0 == curr_refL1) { -++ if (FFABS(neigh->mv[1].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[0].y) >= 4 || -++ FFABS(neigh->mv[0].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[1].y) >= 4) -++ strength = 1; -++ else -++ strength = 0; -++ } else { -++ strength = 1; -++ } -++ } else if ((curr->pred_flag != PF_BI) && (neigh->pred_flag != PF_BI)){ // 1 MV -++ Mv curr_mv0, neigh_mv0; -++ -++ if (curr->pred_flag & 1) { -++ curr_mv0 = curr->mv[0]; -++ } else { -++ curr_mv0 = curr->mv[1]; -++ curr_refL0 = curr_refL1; -++ } -++ -++ if (neigh->pred_flag & 1) { -++ neigh_mv0 = neigh->mv[0]; -++ } else { -++ neigh_mv0 = neigh->mv[1]; -++ neigh_refL0 = neigh_refL1; -++ } -++ -++ if (curr_refL0 == neigh_refL0) { -++ if (FFABS(curr_mv0.x - neigh_mv0.x) >= 4 || FFABS(curr_mv0.y - neigh_mv0.y) >= 4) -++ strength = 1; -++ else -++ strength = 0; -++ } else -++ strength = 1; -++ } else -++ strength = 1; -++#else // This has exactly the same effect, but is more suitable for vectorisation -++ Mv curr_mv[2]; -++ Mv neigh_mv[2]; -++ memcpy(curr_mv, curr->mv, sizeof curr_mv); -++ memcpy(neigh_mv, neigh->mv, sizeof neigh_mv); -++ -++ if (!(curr->pred_flag & 2)) { -++ curr_mv[1] = curr_mv[0]; -++ curr_refL1 = curr_refL0; -++ } -++ if (!(neigh->pred_flag & 2)) { -++ neigh_mv[1] = neigh_mv[0]; -++ neigh_refL1 = neigh_refL0; -++ } -++ if (!(curr->pred_flag & 1)) { -++ curr_mv[0] = curr_mv[1]; -++ curr_refL0 = curr_refL1; -++ } -++ if (!(neigh->pred_flag & 1)) { -++ neigh_mv[0] = neigh_mv[1]; -++ neigh_refL0 = neigh_refL1; -++ } -++ -++ strength = 1; -++ -++ strength &= (neigh_refL0 != curr_refL0) | (neigh_refL1 != curr_refL1) | -++ (FFABS(neigh_mv[0].x - curr_mv[0].x) >= 4) | (FFABS(neigh_mv[0].y - curr_mv[0].y) >= 4) | -++ (FFABS(neigh_mv[1].x - curr_mv[1].x) >= 4) | (FFABS(neigh_mv[1].y - curr_mv[1].y) >= 4); -++ -++ strength &= (neigh_refL1 != curr_refL0) | (neigh_refL0 != curr_refL1) | -++ (FFABS(neigh_mv[1].x - curr_mv[0].x) >= 4) | (FFABS(neigh_mv[1].y - curr_mv[0].y) >= 4) | -++ (FFABS(neigh_mv[0].x - curr_mv[1].x) >= 4) | (FFABS(neigh_mv[0].y - curr_mv[1].y) >= 4); -++ -++ strength |= (((curr->pred_flag + 1) ^ (neigh->pred_flag + 1)) >> 2); -++#endif -++ -++ curr += in_inc / sizeof (MvField); -++ neigh += in_inc / sizeof (MvField); -++ -++ for (out = dup; out > 0; out--) -++ { -++ *bs = strength; -++ bs += out_inc; -++ } -++ } -++} -++ -+ void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth) -+ { -+ #undef FUNC -+@@ -257,6 +371,8 @@ int i = 0; -+ break; -+ } -+ -++ hevcdsp->hevc_deblocking_boundary_strengths = hevc_deblocking_boundary_strengths; -++ -+ if (ARCH_X86) -+ ff_hevc_dsp_init_x86(hevcdsp, bit_depth); -+ if (ARCH_ARM) -+diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h -+index 9f1f6dd..e221e54 100644 -+--- a/libavcodec/hevcdsp.h -++++ b/libavcodec/hevcdsp.h -+@@ -42,6 +42,17 @@ typedef struct SAOParams { -+ uint8_t type_idx[3]; ///< sao_type_idx -+ } SAOParams; -+ -++typedef struct Mv { -++ int16_t x; ///< horizontal component of motion vector -++ int16_t y; ///< vertical component of motion vector -++} Mv; -++ -++typedef struct MvField { -++ DECLARE_ALIGNED(4, Mv, mv)[2]; -++ int8_t ref_idx[2]; -++ int8_t pred_flag; -++} MvField; -++ -+ typedef struct HEVCDSPContext { -+ void (*put_pcm)(uint8_t *_dst, ptrdiff_t _stride, int width, int height, -+ struct GetBitContext *gb, int pcm_bit_depth); -+@@ -120,6 +131,9 @@ typedef struct HEVCDSPContext { -+ void (*hevc_v_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride, -+ int32_t *tc, uint8_t *no_p, -+ uint8_t *no_q); -++ void (*hevc_deblocking_boundary_strengths)(int pus, int dup, int in_inc, int out_inc, -++ int *curr_rpl0, int *curr_rpl1, int *neigh_rpl0, int *neigh_rpl1, -++ MvField *curr, MvField *neigh, uint8_t *bs); -+ } HEVCDSPContext; -+ -+ void ff_hevc_dsp_init(HEVCDSPContext *hpc, int bit_depth); -+-- -+2.7.4 -+ -+ -+From 619366d6acfd5f040a3116fda97b1146c8e40250 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 15 Jul 2015 09:09:11 +0100 -+Subject: [PATCH 68/68] Only enable qpu when needed -+ -+--- -+ libavcodec/hevc.h | 2 +- -+ libavcodec/rpi_qpu.c | 21 ++++++++++++++++----- -+ 2 files changed, 17 insertions(+), 6 deletions(-) -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 496c0e1..ce14975 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -57,7 +57,7 @@ -+ // Define RPI_WORKER to launch a worker thread for pixel processing tasks -+ #define RPI_WORKER -+ // Define RPI_DEBLOCK_VPU to perform deblocking on the VPUs -+- #define RPI_DEBLOCK_VPU -++ //#define RPI_DEBLOCK_VPU -+ -+ #endif -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 5aa0432..ffd13ca 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -9,7 +9,7 @@ -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+ #define RPI_ASYNC -+ // Define RPI_COMBINE_JOBS to find jobs that can be executed in parallel -+-#define RPI_COMBINE_JOBS -++//#define RPI_COMBINE_JOBS -+ -+ #include -+ #include -+@@ -143,9 +143,9 @@ static int gpu_init(volatile struct GPU **gpu) { -+ volatile struct GPU* ptr; -+ if (mb < 0) -+ return -1; -+- -++#ifndef RPI_ASYNC -+ if (qpu_enable(mb, 1)) return -2; -+- -++#endif -+ vcsm_init(); -+ gpu_malloc_uncached_internal(sizeof(struct GPU), &gpu_mem_ptr, mb); -+ ptr = (volatile struct GPU*)gpu_mem_ptr.arm; -+@@ -336,9 +336,9 @@ static void gpu_term(void) -+ vpu_post_code(0, 0, 0, 0, 0, 0, -1, NULL); -+ pthread_join(vpu_thread, &res); -+ } -+-#endif -+- -++#else -+ qpu_enable(mb, 0); -++#endif -+ gpu_free_internal(&gpu_mem_ptr); -+ -+ vcsm_exit(); -+@@ -400,6 +400,7 @@ static void *vpu_start(void *arg) { -+ int count_deblock=0; -+ int count_qpu=0; -+ #endif -++ int qpu_started = 0; -+ while(1) { -+ int i; -+ int *p; // Pointer for a QPU/VPU job -+@@ -427,6 +428,12 @@ static void *vpu_start(void *arg) { -+ if (p[7] == 0 && p[0] == 0 && p[16]==0) -+ goto job_done_early; -+ -++ if (!qpu_started) { -++ int result = qpu_enable(gpu->mb, 1); -++ av_assert0(result==0); -++ qpu_started = 1; -++ } -++ -+ #ifdef RPI_COMBINE_JOBS -+ // First scan for a qpu job -+ for (int x=0;xmb, 0); -++ } -++ -+ return NULL; -+ } -+ -+-- -+2.7.4 -+ -+From a0d0946951b53e64ce103dd61b455f8d1f72caf9 Mon Sep 17 00:00:00 2001 -+From: John Cox -+Date: Tue, 9 Feb 2016 11:57:40 +0000 -+Subject: [PATCH 1/2] Zero copy code v6 -+ -+This version has GPU buffer pooling code -+--- -+ ffmpeg.c | 123 +++++++++----- -+ libavcodec/Makefile | 2 + -+ libavcodec/avcodec.h | 6 + -+ libavcodec/hevc.c | 92 ++++++----- -+ libavcodec/hevc_filter.c | 83 +++++----- -+ libavcodec/rpi_qpu.c | 2 +- -+ libavcodec/rpi_qpu.h | 109 ++++++++++++- -+ libavcodec/rpi_zc.c | 406 +++++++++++++++++++++++++++++++++++++++++++++++ -+ libavcodec/rpi_zc.h | 83 ++++++++++ -+ 9 files changed, 779 insertions(+), 127 deletions(-) -+ create mode 100644 libavcodec/rpi_zc.c -+ create mode 100644 libavcodec/rpi_zc.h -+ -+diff --git a/ffmpeg.c b/ffmpeg.c -+index 50c6e86..953e5b8 100644 -+--- a/ffmpeg.c -++++ b/ffmpeg.c -+@@ -25,7 +25,7 @@ -+ -+ #ifdef RPI -+ #define RPI_DISPLAY -+-//#define RPI_ZERO_COPY -++#define RPI_ZERO_COPY -+ #endif -+ -+ #include "config.h" -+@@ -80,9 +80,7 @@ -+ #include -+ #include -+ #include -+-#ifdef RPI_ZERO_COPY -+-#include "libavcodec/rpi_qpu.h" -+-#endif -++#include "libavcodec/rpi_zc.h" -+ #endif -+ -+ #if HAVE_SYS_RESOURCE_H -+@@ -183,13 +181,7 @@ static void free_input_threads(void); -+ -+ static MMAL_COMPONENT_T* rpi_display = NULL; -+ static MMAL_POOL_T *rpi_pool = NULL; -+- -+-#ifdef RPI_ZERO_COPY -+-static uint8_t *get_vc_handle(AVBufferRef *bref) { -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- return (uint8_t *)p->vc_handle; -+-} -+-#endif -++static volatile int rpi_display_count = 0; -+ -+ static MMAL_POOL_T* display_alloc_pool(MMAL_PORT_T* port, size_t w, size_t h) -+ { -+@@ -206,7 +198,7 @@ static MMAL_POOL_T* display_alloc_pool(MMAL_PORT_T* port, size_t w, size_t h) -+ for (i = 0; i < NUM_BUFFERS; ++i) -+ { -+ MMAL_BUFFER_HEADER_T* buffer = pool->header[i]; -+- void* bufPtr = buffer->data; -++ char * bufPtr = buffer->data; -+ memset(bufPtr, i*30, w*h); -+ memset(bufPtr+w*h, 128, (w*h)/2); -+ } -+@@ -215,23 +207,31 @@ static MMAL_POOL_T* display_alloc_pool(MMAL_PORT_T* port, size_t w, size_t h) -+ return pool; -+ } -+ -+-static void display_cb_input(MMAL_PORT_T *port,MMAL_BUFFER_HEADER_T *buffer) { -++static void display_cb_input(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) { -++#ifdef RPI_ZERO_COPY -++ av_rpi_zc_unref(buffer->user_data); -++ --rpi_display_count; -++#endif -++ mmal_buffer_header_release(buffer); -++} -++ -++static void display_cb_control(MMAL_PORT_T *port,MMAL_BUFFER_HEADER_T *buffer) { -+ mmal_buffer_header_release(buffer); -+ } -+ -+ static MMAL_COMPONENT_T* display_init(size_t x, size_t y, size_t w, size_t h) -+ { -+ MMAL_COMPONENT_T* display; -+- int w2 = (w+31)&~31; -+- int h2 = (h+15)&~15; -+ MMAL_DISPLAYREGION_T region = -+ { -+- {MMAL_PARAMETER_DISPLAYREGION, sizeof(region)}, -++ .hdr = {MMAL_PARAMETER_DISPLAYREGION, sizeof(region)}, -+ .set = MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_FULLSCREEN | MMAL_DISPLAY_SET_DEST_RECT, -+ .layer = 2, -+ .fullscreen = 0, -+ .dest_rect = {x, y, w, h} -+ }; -++ const AVRpiZcFrameGeometry geo = av_rpi_zc_frame_geometry(w, h); -++ -+ bcm_host_init(); // TODO is this needed? -+ mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_RENDERER, &display); -+ assert(display); -+@@ -240,8 +240,8 @@ static MMAL_COMPONENT_T* display_init(size_t x, size_t y, size_t w, size_t h) -+ -+ MMAL_ES_FORMAT_T* format = display->input[0]->format; -+ format->encoding = MMAL_ENCODING_I420; -+- format->es->video.width = w2; -+- format->es->video.height = h2; -++ format->es->video.width = geo.stride_y; -++ format->es->video.height = geo.height_y; -+ format->es->video.crop.x = 0; -+ format->es->video.crop.y = 0; -+ format->es->video.crop.width = w; -+@@ -250,46 +250,75 @@ static MMAL_COMPONENT_T* display_init(size_t x, size_t y, size_t w, size_t h) -+ -+ mmal_component_enable(display); -+ -+- rpi_pool = display_alloc_pool(display->input[0], w2, h2); -++ rpi_pool = display_alloc_pool(display->input[0], geo.stride_y, geo.height_y); -+ -+ mmal_port_enable(display->input[0],display_cb_input); -+- mmal_port_enable(display->control,display_cb_input); -++ mmal_port_enable(display->control,display_cb_control); -+ -+- printf("Allocated display %d %d\n",w,h); -++ printf("Allocated display %dx%d in %dx%d\n", w, h, geo.stride_y, geo.height_y); -+ -+ return display; -+ } -+ -+-static void display_frame(MMAL_COMPONENT_T* display,AVFrame* fr) -++static void display_frame(struct AVCodecContext * const s, MMAL_COMPONENT_T* const display, const AVFrame* const fr) -+ { -+- int w = fr->width; -+- int h = fr->height; -+- int w2 = (w+31)&~31; -+- int h2 = (h+15)&~15; -+ if (!display || !rpi_pool) -+ return; -++ -++ if (rpi_display_count >= 3) { -++ av_log(s, AV_LOG_VERBOSE, "Frame dropped\n"); -++ return; -++ } -++ -+ MMAL_BUFFER_HEADER_T* buf = mmal_queue_get(rpi_pool->queue); -+ if (!buf) { -+- // Running too fast so drop the frame -+- return; -++ // Running too fast so drop the frame -++ printf("Q alloc failure\n"); -++ return; -+ } -+ assert(buf); -+ buf->cmd = 0; -+- buf->length = (w2 * h2 * 3)/2; -+ buf->offset = 0; // Offset to valid data -+ buf->flags = 0; -+ #ifdef RPI_ZERO_COPY -+- buf->data = get_vc_handle(fr->buf[0]); -+- buf->alloc_size = (w2*h2*3)/2; -++{ -++ const AVRpiZcRefPtr fr_buf = av_rpi_zc_ref(s, fr, 1); -++ -++ buf->user_data = fr_buf; -++ buf->data = av_rpi_zc_vc_handle(fr_buf); -++ buf->alloc_size = -++ buf->length = av_rpi_zc_numbytes(fr_buf); -++ -++ ++rpi_display_count; -++} -+ #else -++{ -++#error YYY -++ int w = fr->width; -++ int h = fr->height; -++ int w2 = (w+31)&~31; -++ int h2 = (h+15)&~15; -++ -++ buf->length = (w2 * h2 * 3)/2; -++ buf->user_data = NULL; -++ -+ //mmal_buffer_header_mem_lock(buf); -+ memcpy(buf->data, fr->data[0], w2 * h); -+ memcpy(buf->data+w2*h2, fr->data[1], w2 * h / 4); -+ memcpy(buf->data+w2*h2*5/4, fr->data[2], w2 * h / 4); -+ //mmal_buffer_header_mem_unlock(buf); -++} -+ #endif -+ -+- mmal_port_send_buffer(display->input[0], buf); // I assume this will automatically get released -++ while (rpi_display_count >= 3) { -++ usleep(5000); -++ } -++ -++ if (mmal_port_send_buffer(display->input[0], buf) != MMAL_SUCCESS) -++ { -++ printf("** send failed: depth=%d\n", rpi_display_count); -++ display_cb_input(NULL, buf); -++ } -+ } -+ -+ static void display_exit(MMAL_COMPONENT_T* display) -+@@ -687,6 +716,11 @@ static void ffmpeg_cleanup(int ret) -+ avformat_close_input(&input_files[i]->ctx); -+ av_freep(&input_files[i]); -+ } -++ -++#ifdef RPI_DISPLAY -++ display_exit(rpi_display); -++#endif -++ -+ for (i = 0; i < nb_input_streams; i++) { -+ InputStream *ist = input_streams[i]; -+ -+@@ -698,6 +732,9 @@ static void ffmpeg_cleanup(int ret) -+ av_freep(&ist->filters); -+ av_freep(&ist->hwaccel_device); -+ -++#ifdef RPI_ZERO_COPY -++ av_rpi_zc_uninit(ist->dec_ctx); -++#endif -+ avcodec_free_context(&ist->dec_ctx); -+ -+ av_freep(&input_streams[i]); -+@@ -729,9 +766,6 @@ static void ffmpeg_cleanup(int ret) -+ term_exit(); -+ ffmpeg_exited = 1; -+ -+-#ifdef RPI_DISPLAY -+- display_exit(rpi_display); -+-#endif -+ } -+ -+ void remove_avoptions(AVDictionary **a, AVDictionary *b) -+@@ -1091,18 +1125,19 @@ static void do_video_out(AVFormatContext *s, -+ int frame_size = 0; -+ InputStream *ist = NULL; -+ AVFilterContext *filter = ost->filter->filter; -++ -++ if (ost->source_index >= 0) -++ ist = input_streams[ost->source_index]; -++ -+ #ifdef RPI_DISPLAY -+- if (next_picture) -++ if (next_picture && ist != NULL) -+ { -+- if (!rpi_display) -++ if (!rpi_display) -+ rpi_display = display_init(0,0,next_picture->width,next_picture->height); -+- display_frame(rpi_display,next_picture); -++ display_frame(ist->dec_ctx, rpi_display, next_picture); -+ } -+ #endif -+ -+- if (ost->source_index >= 0) -+- ist = input_streams[ost->source_index]; -+- -+ if (filter->inputs[0]->frame_rate.num > 0 && -+ filter->inputs[0]->frame_rate.den > 0) -+ duration = 1/(av_q2d(filter->inputs[0]->frame_rate) * av_q2d(enc->time_base)); -+@@ -2708,6 +2743,12 @@ static int init_input_stream(int ist_index, char *error, int error_len) -+ ist->dec_ctx->opaque = ist; -+ ist->dec_ctx->get_format = get_format; -+ ist->dec_ctx->get_buffer2 = get_buffer; -++ -++#ifdef RPI_ZERO_COPY -++ // Overrides the above get_buffer2 -++ av_rpi_zc_init(ist->dec_ctx); -++#endif -++ -+ ist->dec_ctx->thread_safe_callbacks = 1; -+ -+ av_opt_set_int(ist->dec_ctx, "refcounted_frames", 1, 0); -+diff --git a/libavcodec/Makefile b/libavcodec/Makefile -+index 03065cd..21e4514 100644 -+--- a/libavcodec/Makefile -++++ b/libavcodec/Makefile -+@@ -9,6 +9,7 @@ HEADERS = avcodec.h \ -+ rpi_shader.h \ -+ rpi_mailbox.h \ -+ rpi_hevc_transform.h \ -++ rpi_zc.h \ -+ d3d11va.h \ -+ dirac.h \ -+ dv_profile.h \ -+@@ -50,6 +51,7 @@ OBJS = allcodecs.o \ -+ rpi_qpu.o \ -+ rpi_shader.o \ -+ rpi_mailbox.o \ -++ rpi_zc.o \ -+ vorbis_parser.o \ -+ xiph.o \ -+ -+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -+index 39713ed..a1ba217 100644 -+--- a/libavcodec/avcodec.h -++++ b/libavcodec/avcodec.h -+@@ -3505,6 +3505,12 @@ typedef struct AVCodecContext { -+ #define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1 -+ #endif -+ -++ /** -++ * Opaque pointer for use by replacement get_buffer2 code -++ * -++ * @author jc (08/02/2016) -++ */ -++ void * get_buffer_context; -+ } AVCodecContext; -+ -+ AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 8437e10..51736c7 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -114,10 +114,6 @@ static uint32_t rpi_filter_coefs[8][1] = { -+ { ENCODE_COEFFS( -2, 10, 58, -2) } -+ }; -+ -+-static uint32_t get_vc_address(AVBufferRef *bref) { -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- return p->vc; -+-} -+ #endif -+ -+ -+@@ -2197,9 +2193,9 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int bw = nPbW-start_x; -+ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref0->frame); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref0->frame); -+ *y++ = ( (bw<16 ? bw : 16) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ if (weight_flag) { -+@@ -2207,7 +2203,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ } else { -+ *y++ = 1; // Weight of 1 and offset of 0 -+ } -+- *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ *y++ = (get_vc_address_y(s->frame) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+@@ -2246,8 +2242,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_u(ref0->frame); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_v(ref0->frame); -+ *u++ = ( (bwframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+- *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ *u++ = (get_vc_address_u(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address_v(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+ s->curr_u_mvs = u; -+@@ -2297,9 +2293,9 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int bw = nPbW-start_x; -+ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref1->frame); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref1->frame); -+ *y++ = ( (bw<16 ? bw : 16) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ if (weight_flag) { -+@@ -2307,7 +2303,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ } else { -+ *y++ = 1; // Weight of 1 and offset of 0 -+ } -+- *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ *y++ = (get_vc_address_y(s->frame) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+@@ -2347,8 +2343,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_u(ref1->frame); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_v(ref1->frame); -+ *u++ = ( (bwsh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+@@ -2360,8 +2356,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = 1; // Weight of 1 and offset of 0 -+ *u++ = 1; -+ } -+- *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+- *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ *u++ = (get_vc_address_u(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address_v(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+ s->curr_u_mvs = u; -+@@ -2403,13 +2399,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int bw = nPbW-start_x; -+ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref0->frame); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y2 - 3 + start_y) << 16) + ( (x2 - 3 + start_x) & 0xffff); // Second fetch is for ref1 -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref1->frame); -+ *y++ = ( (bw<8 ? bw : 8) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ *y++ = 1; // B frame weighted prediction not supported -+- *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ *y++ = (get_vc_address_y(s->frame) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter_b; -+ } -+ } -+@@ -2453,8 +2449,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b0; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_u(ref0->frame); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_v(ref0->frame); -+ *u++ = ( (bwmc_filter_uv_b; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y2_c - 1 + start_y; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_u(ref1->frame); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_v(ref1->frame); -+ *u++ = ( (bwframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+- *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ *u++ = (get_vc_address_u(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address_v(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+ s->curr_u_mvs = u; -+@@ -3270,12 +3266,13 @@ static int32_t filter8_luma(uint8_t *data, int x0, int y0, int pitch, int my_mx, -+ return vsum; -+ } -+ -+-static uint8_t *test_frame(HEVCContext *s,uint32_t p, AVFrame *frame, int cIdx) -++static uint8_t *test_frame(HEVCContext *s,uint32_t p, AVFrame *frame, const int cIdx) -+ { -+ //int pic_width = s->ps.sps->width >> s->ps.sps->hshift[cIdx]; -+ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[cIdx]; -+ int pitch = frame->linesize[cIdx]; -+- uint32_t base = get_vc_address(frame->buf[cIdx]); -++ uint32_t base = c_idx == 0 ? get_vc_address_y(frame); -++ c_idx == 1 ? get_vc_address_u(frame) : get_vc_address_v(frame); -+ if (p>=base && pdata[cIdx] + (p-base); -+ } -+@@ -3562,6 +3559,7 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ #ifdef RPI -+ -+ #ifndef RPI_FAST_CACHEFLUSH -++#error RPI_FAST_CACHEFLUSH is broken -+ static void flush_buffer(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+ gpu_cache_flush(p); -+@@ -3572,7 +3570,7 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_u(s->frame); -+ int n = s->ps.sps->height; -+ int curr_y = 0; -+ int curr_uv = 0; -+@@ -3580,21 +3578,21 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ int sz,base; -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].handle = p.vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = (int)(p->arm) + base; -++ iocache.s[0].addr = (int)(p.arm) + base; -+ iocache.s[0].size = sz; -+- p = av_buffer_pool_opaque(frame->buf[2]); -+- iocache.s[1].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_v(s->frame); -++ iocache.s[1].handle = p.vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = (int)(p->arm) + base; -++ iocache.s[1].addr = (int)(p.arm) + base; -+ iocache.s[1].size = sz; -+- p = av_buffer_pool_opaque(frame->buf[0]); -++ p = get_gpu_mem_ptr_y(s->frame); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+- iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].handle = p.vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = (int)(p->arm) + base; -++ iocache.s[2].addr = (int)(p.arm) + base; -+ iocache.s[2].size = sz; -+ vcsm_clean_invalid( &iocache ); -+ #else -+@@ -3612,7 +3610,7 @@ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM -+ int curr_y; -+ int curr_uv; -+ int n_uv; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_u(s->frame); -+ int sz,base; -+ int (*d)[2] = s->dblk_cmds[job]; -+ int low=(*d)[1]; -+@@ -3629,21 +3627,21 @@ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM -+ -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].handle = p.vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = (int)(p->arm) + base; -++ iocache.s[0].addr = (int)(p.arm) + base; -+ iocache.s[0].size = sz; -+- p = av_buffer_pool_opaque(frame->buf[2]); -+- iocache.s[1].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_v(s->frame); -++ iocache.s[1].handle = p.vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = (int)(p->arm) + base; -++ iocache.s[1].addr = (int)(p.arm) + base; -+ iocache.s[1].size = sz; -+- p = av_buffer_pool_opaque(frame->buf[0]); -++ p = get_gpu_mem_ptr_y(s->frame); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+- iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].handle = p.vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = (int)(p->arm) + base; -++ iocache.s[2].addr = (int)(p.arm) + base; -+ iocache.s[2].size = sz; -+ -+ iocache.s[3].handle = p0->vcsm_handle; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 826a82f..c4fa305 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -879,17 +879,25 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ #undef CR -+ -+ #ifdef RPI_INTER_QPU -+-static void flush_buffer(AVBufferRef *bref) { -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- gpu_cache_flush(p); -++static void flush_buffer_y(const AVFrame * const frame) { -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_y(frame); -++ gpu_cache_flush(&p); -+ } -+ -+-// Return Physical address for this image -+-static uint32_t get_vc_address(AVBufferRef *bref) { -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- return p->vc; -++static void flush_buffer_u(const AVFrame * const frame) { -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_u(frame); -++ gpu_cache_flush(&p); -+ } -+ -++static void flush_buffer_v(const AVFrame * const frame) { -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_v(frame); -++ gpu_cache_flush(&p); -++} -++ -++ -++#ifdef RPI_DEBLOCK_VPU -++#error Not fixed yet -++ -+ // ff_hevc_flush_buffer_lines -+ // flushes and invalidates all pixel rows in [start,end-1] -+ static void ff_hevc_flush_buffer_lines(HEVCContext *s, int start, int end, int flush_luma, int flush_chroma) -+@@ -901,44 +909,44 @@ static void ff_hevc_flush_buffer_lines(HEVCContext *s, int start, int end, int f -+ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -+ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -+- GPU_MEM_PTR_T *p; -++ GPU_MEM_PTR_T p; -+ if (curr_uv < 0) curr_uv = 0; -+ if (n_uv<=curr_uv) { return; } -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+ if (flush_chroma) { -+- p = av_buffer_pool_opaque(s->frame->buf[1]); -+- iocache.s[0].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_u(s->frame); -++ iocache.s[0].handle = p.vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = (int)p->arm + base; -++ iocache.s[0].addr = (int)p.arm + base; -+ iocache.s[0].size = sz; -+- p = av_buffer_pool_opaque(s->frame->buf[2]); -+- iocache.s[1].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_v(s->frame); -++ iocache.s[1].handle = p.vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = (int)p->arm + base; -++ iocache.s[1].addr = (int)p.arm + base; -+ iocache.s[1].size = sz; -+ } -+ if (flush_luma) { -+- p = av_buffer_pool_opaque(s->frame->buf[0]); -++ p = get_gpu_mem_ptr_y(s->frame); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+- iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].handle = p.vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = (int)p->arm + base; -++ iocache.s[2].addr = (int)p.arm + base; -+ iocache.s[2].size = sz; -+ } -+ vcsm_clean_invalid( &iocache ); -+ #else -+ if (flush_chroma) { -+- flush_buffer(s->frame->buf[1]); -+- flush_buffer(s->frame->buf[2]); -++ flush_buffer_u(s->frame); -++ flush_buffer_v(s->frame); -+ } -+ if (flush_luma) { -+- flush_buffer(s->frame->buf[0]); -++ flush_buffer_y(s->frame); -+ } -+ #endif -+ } -+- -++#endif -+ -+ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ { -+@@ -950,37 +958,37 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -+ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -+- GPU_MEM_PTR_T *p; -++ GPU_MEM_PTR_T p; -+ if (curr_uv < 0) curr_uv = 0; -+ if (n_uv<=curr_uv) { return; } -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- p = av_buffer_pool_opaque(s->frame->buf[1]); -+- iocache.s[0].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_u(s->frame); -++ iocache.s[0].handle = p.vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = (int)p->arm + base; -++ iocache.s[0].addr = (int)p.arm + base; -+ iocache.s[0].size = sz; -+- p = av_buffer_pool_opaque(s->frame->buf[2]); -+- iocache.s[1].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_v(s->frame); -++ iocache.s[1].handle = p.vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = (int)p->arm + base; -++ iocache.s[1].addr = (int)p.arm + base; -+ iocache.s[1].size = sz; -+ -+ #ifdef RPI_LUMA_QPU -+- p = av_buffer_pool_opaque(s->frame->buf[0]); -++ p = get_gpu_mem_ptr_y(s->frame); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+- iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].handle = p.vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = (int)p->arm + base; -++ iocache.s[2].addr = (int)p.arm + base; -+ iocache.s[2].size = sz; -+ #endif -+ vcsm_clean_invalid( &iocache ); -+ #else -+- flush_buffer(s->frame->buf[1]); -+- flush_buffer(s->frame->buf[2]); -++ flush_buffer_u(s->frame); -++ flush_buffer_v(s->frame); -+ #ifdef RPI_LUMA_QPU -+- flush_buffer(s->frame->buf[0]); -++ flush_buffer_y(s->frame); -+ #endif -+ -+ #endif -+@@ -992,6 +1000,7 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ #endif -+ -+ #ifdef RPI_DEBLOCK_VPU -++#error XXX -+ /* rpi_deblock deblocks an entire row of ctbs using the VPU */ -+ static void rpi_deblock(HEVCContext *s, int y, int ctb_size) -+ { -+@@ -1000,21 +1009,21 @@ static void rpi_deblock(HEVCContext *s, int y, int ctb_size) -+ // TODO flush buffer of beta/tc setup when it becomes cached -+ -+ // Prepare three commands at once to avoid calling overhead -+- s->vpu_cmds_arm[0][0] = get_vc_address(s->frame->buf[0]) + s->frame->linesize[0] * y; -++ s->vpu_cmds_arm[0][0] = get_vc_address_y(s->frame) + s->frame->linesize[0] * y; -+ s->vpu_cmds_arm[0][1] = s->frame->linesize[0]; -+ s->vpu_cmds_arm[0][2] = s->setup_width; -+ s->vpu_cmds_arm[0][3] = (int) ( s->y_setup_vc + s->setup_width * (y>>4) ); -+ s->vpu_cmds_arm[0][4] = ctb_size>>4; -+ s->vpu_cmds_arm[0][5] = 2; -+ -+- s->vpu_cmds_arm[1][0] = get_vc_address(s->frame->buf[1]) + s->frame->linesize[1] * (y>> s->ps.sps->vshift[1]); -++ s->vpu_cmds_arm[1][0] = get_vc_address_u(s->frame) + s->frame->linesize[1] * (y>> s->ps.sps->vshift[1]); -+ s->vpu_cmds_arm[1][1] = s->frame->linesize[1]; -+ s->vpu_cmds_arm[1][2] = s->uv_setup_width; -+ s->vpu_cmds_arm[1][3] = (int) ( s->uv_setup_vc + s->uv_setup_width * ((y>>4)>> s->ps.sps->vshift[1]) ); -+ s->vpu_cmds_arm[1][4] = (ctb_size>>4)>> s->ps.sps->vshift[1]; -+ s->vpu_cmds_arm[1][5] = 3; -+ -+- s->vpu_cmds_arm[2][0] = get_vc_address(s->frame->buf[2]) + s->frame->linesize[2] * (y>> s->ps.sps->vshift[2]); -++ s->vpu_cmds_arm[2][0] = get_vc_address_v(s->frame) + s->frame->linesize[2] * (y>> s->ps.sps->vshift[2]); -+ s->vpu_cmds_arm[2][1] = s->frame->linesize[2]; -+ s->vpu_cmds_arm[2][2] = s->uv_setup_width; -+ s->vpu_cmds_arm[2][3] = (int) ( s->uv_setup_vc + s->uv_setup_width * ((y>>4)>> s->ps.sps->vshift[1]) ); -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index ffd13ca..b0c9bc5 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -250,7 +250,7 @@ int gpu_get_mailbox(void) -+ } -+ -+ // Call this to clean and invalidate a region of memory -+-void gpu_cache_flush(GPU_MEM_PTR_T *p) -++void gpu_cache_flush(const GPU_MEM_PTR_T * const p) -+ { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 81c2bb1..b913f79 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -2,8 +2,11 @@ -+ #define RPI_QPU_H -+ -+ // Define RPI_FAST_CACHEFLUSH to use the VCSM cache flush code -++// *** N.B. Code has rotted & crashes if this is unset (before this set of changes) -+ #define RPI_FAST_CACHEFLUSH -+ -++#define RPI_ONE_BUF 1 -++ -+ typedef struct gpu_mem_ptr_s { -+ unsigned char *arm; // Pointer to memory mapped on ARM side -+ int vc_handle; // Videocore handle of relocatable memory -+@@ -16,9 +19,113 @@ typedef struct gpu_mem_ptr_s { -+ extern int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p); -+ extern int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p); -+ extern void gpu_free(GPU_MEM_PTR_T *p); -+-extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -++extern void gpu_cache_flush(const GPU_MEM_PTR_T * const p); -+ extern void gpu_cache_flush3(GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -+ -++#include "libavutil/frame.h" -++#if !RPI_ONE_BUF -++static inline uint32_t get_vc_address_y(const AVFrame * const frame) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[0]); -++ return p->vc; -++} -++ -++static inline uint32_t get_vc_address_u(const AVFrame * const frame) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ return p->vc; -++} -++ -++static inline uint32_t get_vc_address_v(const AVFrame * const frame) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[2]); -++ return p->vc; -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_y(const AVFrame * const frame) { -++ return *(GPU_MEM_PTR_T *)av_buffer_pool_opaque(frame->buf[0]); -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_u(const AVFrame * const frame) { -++ return *(GPU_MEM_PTR_T *)av_buffer_pool_opaque(frame->buf[1]); -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_v(const AVFrame * const frame) { -++ return *(GPU_MEM_PTR_T *)av_buffer_pool_opaque(frame->buf[2]); -++} -++ -++#else -++ -++static inline int gpu_is_buf1(const AVFrame * const frame) -++{ -++ return frame->buf[1] == NULL; -++} -++ -++static inline GPU_MEM_PTR_T * gpu_buf1_gmem(const AVFrame * const frame) -++{ -++ return av_buffer_get_opaque(frame->buf[0]); -++} -++ -++static inline GPU_MEM_PTR_T * gpu_buf3_gmem(const AVFrame * const frame, const int n) -++{ -++ return av_buffer_pool_opaque(frame->buf[n]); -++} -++ -++ -++static inline uint32_t get_vc_address_y(const AVFrame * const frame) { -++ return gpu_is_buf1(frame) ? gpu_buf1_gmem(frame)->vc : gpu_buf3_gmem(frame, 0)->vc; -++} -++ -++static inline uint32_t get_vc_address_u(const AVFrame * const frame) { -++ return gpu_is_buf1(frame) ? -++ gpu_buf1_gmem(frame)->vc + frame->data[1] - frame->data[0] : -++ gpu_buf3_gmem(frame, 1)->vc; -++} -++ -++static inline uint32_t get_vc_address_v(const AVFrame * const frame) { -++ return gpu_is_buf1(frame) ? -++ gpu_buf1_gmem(frame)->vc + frame->data[2] - frame->data[0] : -++ gpu_buf3_gmem(frame, 2)->vc; -++} -++ -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_y(const AVFrame * const frame) { -++ if (gpu_is_buf1(frame)) -++ { -++ GPU_MEM_PTR_T g = *gpu_buf1_gmem(frame); -++ g.numbytes = frame->data[1] - frame->data[0]; -++ return g; -++ } -++ else -++ return *gpu_buf3_gmem(frame, 0); -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_u(const AVFrame * const frame) { -++ if (gpu_is_buf1(frame)) -++ { -++ GPU_MEM_PTR_T g = *gpu_buf1_gmem(frame); -++ g.arm += frame->data[1] - frame->data[0]; -++ g.vc += frame->data[1] - frame->data[0]; -++ g.numbytes = frame->data[2] - frame->data[1]; // chroma size -++ return g; -++ } -++ else -++ return *gpu_buf3_gmem(frame, 1); -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_v(const AVFrame * const frame) { -++ if (gpu_is_buf1(frame)) -++ { -++ GPU_MEM_PTR_T g = *gpu_buf1_gmem(frame); -++ g.arm += frame->data[2] - frame->data[0]; -++ g.vc += frame->data[2] - frame->data[0]; -++ g.numbytes = frame->data[2] - frame->data[1]; // chroma size -++ return g; -++ } -++ else -++ return *gpu_buf3_gmem(frame, 2); -++} -++ -++#endif -++ -++ -+ // QPU specific functions -+ extern void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+ extern void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12); -+diff --git a/libavcodec/rpi_zc.c b/libavcodec/rpi_zc.c -+new file mode 100644 -+index 0000000..9580165 -+--- /dev/null -++++ b/libavcodec/rpi_zc.c -+@@ -0,0 +1,406 @@ -++#include "config.h" -++#ifdef RPI -++#include "rpi_qpu.h" -++#include "rpi_zc.h" -++ -++#include "libavutil/buffer_internal.h" -++ -++struct ZcPoolEnt; -++ -++typedef struct ZcPool -++{ -++ int numbytes; -++ struct ZcPoolEnt * head; -++ pthread_mutex_t lock; -++} ZcPool; -++ -++typedef struct ZcPoolEnt -++{ -++ // It is important that we start with gmem as other bits of code will expect to see that -++ GPU_MEM_PTR_T gmem; -++ struct ZcPoolEnt * next; -++ struct ZcPool * pool; -++} ZcPoolEnt; -++ -++static ZcPoolEnt * zc_pool_ent_alloc(ZcPool * const pool, const int size) -++{ -++ ZcPoolEnt * const zp = av_malloc(sizeof(ZcPoolEnt)); -++ -++ if (zp == NULL) { -++ av_log(NULL, AV_LOG_ERROR, "av_malloc(ZcPoolEnt) failed\n"); -++ goto fail0; -++ } -++ -++ if (gpu_malloc_cached(size, &zp->gmem) != 0) -++ { -++ av_log(NULL, AV_LOG_ERROR, "av_gpu_malloc_cached(%d) failed\n", size); -++ goto fail1; -++ } -++ -++ zp->next = NULL; -++ zp->pool = pool; -++ return zp; -++ -++fail1: -++ av_free(zp); -++fail0: -++ return NULL; -++} -++ -++static void zc_pool_ent_free(ZcPoolEnt * const zp) -++{ -++ gpu_free(&zp->gmem); -++ av_free(zp); -++} -++ -++static void zc_pool_flush(ZcPool * const pool) -++{ -++ ZcPoolEnt * p = pool->head; -++ pool->head = NULL; -++ while (p != NULL) -++ { -++ ZcPoolEnt * const zp = p; -++ p = p->next; -++ zc_pool_ent_free(zp); -++ } -++} -++ -++static ZcPoolEnt * zc_pool_alloc(ZcPool * const pool, const int numbytes) -++{ -++ ZcPoolEnt * zp; -++ pthread_mutex_lock(&pool->lock); -++ -++ if (numbytes != pool->numbytes) -++ { -++ zc_pool_flush(pool); -++ pool->numbytes = numbytes; -++ } -++ -++ if (pool->head != NULL) -++ { -++ zp = pool->head; -++ pool->head = zp->next; -++ } -++ else -++ { -++ zp = zc_pool_ent_alloc(pool, numbytes); -++ } -++ -++ pthread_mutex_unlock(&pool->lock); -++ return zp; -++} -++ -++static void zc_pool_free(ZcPoolEnt * const zp) -++{ -++ ZcPool * const pool = zp == NULL ? NULL : zp->pool; -++ if (zp != NULL) -++ { -++ pthread_mutex_lock(&pool->lock); -++ if (pool->numbytes == zp->gmem.numbytes) -++ { -++ zp->next = pool->head; -++ pool->head = zp; -++ pthread_mutex_unlock(&pool->lock); -++ } -++ else -++ { -++ pthread_mutex_unlock(&pool->lock); -++ zc_pool_ent_free(zp); -++ } -++ } -++} -++ -++static void -++zc_pool_init(ZcPool * const pool) -++{ -++ pool->numbytes = -1; -++ pool->head = NULL; -++ pthread_mutex_init(&pool->lock, NULL); -++} -++ -++static void -++zc_pool_destroy(ZcPool * const pool) -++{ -++ pool->numbytes = -1; -++ zc_pool_flush(pool); -++ pthread_mutex_destroy(&pool->lock); -++} -++ -++ -++typedef struct AVZcEnv -++{ -++ ZcPool pool; -++} ZcEnv; -++ -++// Callback when buffer unrefed to zero -++static void rpi_free_display_buffer(void *opaque, uint8_t *data) -++{ -++ ZcPoolEnt *const zp = opaque; -++// printf("%s: data=%p\n", __func__, data); -++ zc_pool_free(zp); -++} -++ -++static inline GPU_MEM_PTR_T * pic_gm_ptr(AVBufferRef * const buf) -++{ -++ // Kludge where we check the free fn to check this is really -++ // one of our buffers - can't think of a better way -++ return buf == NULL || buf->buffer->free != rpi_free_display_buffer ? NULL : -++ av_buffer_get_opaque(buf); -++} -++ -++AVRpiZcFrameGeometry av_rpi_zc_frame_geometry( -++ const unsigned int video_width, const unsigned int video_height) -++{ -++ AVRpiZcFrameGeometry geo; -++ geo.stride_y = (video_width + 32 + 31) & ~31; -++ geo.stride_c = geo.stride_y / 2; -++// geo.height_y = (video_height + 15) & ~15; -++ geo.height_y = (video_height + 32 + 31) & ~31; -++ geo.height_c = geo.height_y / 2; -++ return geo; -++} -++ -++static AVBufferRef * rpi_buf_pool_alloc(ZcPool * const pool, int size) -++{ -++ ZcPoolEnt *const zp = zc_pool_alloc(pool, size); -++ AVBufferRef * buf; -++ -++ if (zp == NULL) { -++ av_log(NULL, AV_LOG_ERROR, "zc_pool_alloc(%d) failed\n", size); -++ goto fail0; -++ } -++ -++ if ((buf = av_buffer_create(zp->gmem.arm, size, rpi_free_display_buffer, zp, AV_BUFFER_FLAG_READONLY)) == NULL) -++ { -++ av_log(NULL, AV_LOG_ERROR, "av_buffer_create() failed\n"); -++ goto fail2; -++ } -++ -++ return buf; -++ -++fail2: -++ zc_pool_free(zp); -++fail0: -++ return NULL; -++} -++ -++static int rpi_get_display_buffer(struct AVCodecContext * const s, AVFrame * const frame) -++{ -++ ZcEnv *const zc = s->get_buffer_context; -++ const AVRpiZcFrameGeometry geo = av_rpi_zc_frame_geometry(frame->width, frame->height); -++ const unsigned int size_y = geo.stride_y * geo.height_y; -++ const unsigned int size_c = geo.stride_c * geo.height_c; -++ const unsigned int size_pic = size_y + size_c * 2; -++ AVBufferRef * buf; -++ unsigned int i; -++ -++// printf("Do local alloc: format=%#x, %dx%d: %u\n", frame->format, frame->width, frame->height, size_pic); -++ -++ if ((buf = rpi_buf_pool_alloc(&zc->pool, size_pic)) == NULL) -++ { -++ av_log(s, AV_LOG_ERROR, "rpi_get_display_buffer: Failed to get buffer from pool\n"); -++ return AVERROR(ENOMEM); -++ } -++ -++ for (i = 0; i < AV_NUM_DATA_POINTERS; i++) { -++ frame->buf[i] = NULL; -++ frame->data[i] = NULL; -++ frame->linesize[i] = 0; -++ } -++ -++ frame->buf[0] = buf; -++ frame->linesize[0] = geo.stride_y; -++ frame->linesize[1] = geo.stride_c; -++ frame->linesize[2] = geo.stride_c; -++ frame->data[0] = buf->data; -++ frame->data[1] = frame->data[0] + size_y; -++ frame->data[2] = frame->data[1] + size_c; -++ frame->extended_data = frame->data; -++ // Leave extended buf alone -++ -++ return 0; -++} -++ -++ -++#define RPI_GET_BUFFER2 1 -++ -++int av_rpi_zc_get_buffer2(struct AVCodecContext *s, AVFrame *frame, int flags) -++{ -++#if !RPI_GET_BUFFER2 -++ return avcodec_default_get_buffer2(s, frame, flags); -++#else -++ int rv; -++ -++ if ((s->codec->capabilities & AV_CODEC_CAP_DR1) == 0 || -++ frame->format != AV_PIX_FMT_YUV420P) -++ { -++// printf("Do default alloc: format=%#x\n", frame->format); -++ rv = avcodec_default_get_buffer2(s, frame, flags); -++ } -++ else -++ { -++ rv = rpi_get_display_buffer(s, frame); -++ } -++ -++#if 0 -++ printf("%s: %dx%d lsize=%d/%d/%d data=%p/%p/%p bref=%p/%p/%p opaque[0]=%p\n", __func__, -++ frame->width, frame->height, -++ frame->linesize[0], frame->linesize[1], frame->linesize[2], -++ frame->data[0], frame->data[1], frame->data[2], -++ frame->buf[0], frame->buf[1], frame->buf[2], -++ av_buffer_get_opaque(frame->buf[0])); -++#endif -++ return rv; -++#endif -++} -++ -++ -++static AVBufferRef * zc_copy(struct AVCodecContext * const s, -++ const AVFrame * const src) -++{ -++ AVFrame dest_frame; -++ AVFrame * const dest = &dest_frame; -++ unsigned int i; -++ uint8_t * psrc, * pdest; -++ -++ dest->width = src->width; -++ dest->height = src->height; -++ -++ if (rpi_get_display_buffer(s, dest) != 0) -++ { -++ return NULL; -++ } -++ -++ for (i = 0, psrc = src->data[0], pdest = dest->data[0]; -++ i != dest->height; -++ ++i, psrc += src->linesize[0], pdest += dest->linesize[0]) -++ { -++ memcpy(pdest, psrc, dest->width); -++ } -++ for (i = 0, psrc = src->data[1], pdest = dest->data[1]; -++ i != dest->height / 2; -++ ++i, psrc += src->linesize[1], pdest += dest->linesize[1]) -++ { -++ memcpy(pdest, psrc, dest->width / 2); -++ } -++ for (i = 0, psrc = src->data[2], pdest = dest->data[2]; -++ i != dest->height / 2; -++ ++i, psrc += src->linesize[2], pdest += dest->linesize[2]) -++ { -++ memcpy(pdest, psrc, dest->width / 2); -++ } -++ -++ return dest->buf[0]; -++} -++ -++ -++AVRpiZcRefPtr av_rpi_zc_ref(struct AVCodecContext * const s, -++ const AVFrame * const frame, const int maycopy) -++{ -++ assert(s != NULL); -++ -++ if (frame->format != AV_PIX_FMT_YUV420P) -++ { -++ av_log(s, AV_LOG_WARNING, "%s: *** Format not YUV420P: %d\n", __func__, frame->format); -++ return NULL; -++ } -++ -++ if (frame->buf[1] != NULL) -++ { -++ if (maycopy) -++ { -++ av_log(s, AV_LOG_INFO, "%s: *** Not a single buf frame: copying\n", __func__); -++ return zc_copy(s, frame); -++ } -++ else -++ { -++ av_log(s, AV_LOG_WARNING, "%s: *** Not a single buf frame: NULL\n", __func__); -++ return NULL; -++ } -++ } -++ -++ if (pic_gm_ptr(frame->buf[0]) == NULL) -++ { -++ if (maycopy) -++ { -++ av_log(s, AV_LOG_INFO, "%s: *** Not one of our buffers: copying\n", __func__); -++ return zc_copy(s, frame); -++ } -++ else -++ { -++ av_log(s, AV_LOG_WARNING, "%s: *** Not one of our buffers: NULL\n", __func__); -++ return NULL; -++ } -++ } -++ -++ return av_buffer_ref(frame->buf[0]); -++} -++ -++int av_rpi_zc_vc_handle(const AVRpiZcRefPtr fr_ref) -++{ -++ const GPU_MEM_PTR_T * const p = pic_gm_ptr(fr_ref); -++ return p == NULL ? -1 : p->vc_handle; -++} -++ -++int av_rpi_zc_numbytes(const AVRpiZcRefPtr fr_ref) -++{ -++ const GPU_MEM_PTR_T * const p = pic_gm_ptr(fr_ref); -++ return p == NULL ? 0 : p->numbytes; -++} -++ -++void av_rpi_zc_unref(AVRpiZcRefPtr fr_ref) -++{ -++ if (fr_ref != NULL) -++ { -++ av_buffer_unref(&fr_ref); -++ } -++} -++ -++AVZcEnvPtr av_rpi_zc_env_alloc(void) -++{ -++ ZcEnv * const zc = av_mallocz(sizeof(ZcEnv)); -++ if (zc == NULL) -++ { -++ av_log(NULL, AV_LOG_ERROR, "av_rpi_zc_env_alloc: Context allocation failed\n"); -++ return NULL; -++ } -++ -++ zc_pool_init(&zc->pool); -++ return zc; -++} -++ -++void av_rpi_zc_env_free(AVZcEnvPtr zc) -++{ -++ if (zc != NULL) -++ { -++ zc_pool_destroy(&zc->pool); ; -++ av_free(zc); -++ } -++} -++ -++int av_rpi_zc_init(struct AVCodecContext * const s) -++{ -++ ZcEnv * const zc = av_rpi_zc_env_alloc(); -++ if (zc == NULL) -++ { -++ return AVERROR(ENOMEM); -++ } -++ -++ s->get_buffer_context = zc; -++ s->get_buffer2 = av_rpi_zc_get_buffer2; -++ return 0; -++} -++ -++void av_rpi_zc_uninit(struct AVCodecContext * const s) -++{ -++ if (s->get_buffer2 == av_rpi_zc_get_buffer2) -++ { -++ ZcEnv * const zc = s->get_buffer_context; -++ s->get_buffer2 = avcodec_default_get_buffer2; -++ s->get_buffer_context = NULL; -++ av_rpi_zc_env_free(zc); -++ } -++} -++ -++#endif // RPI -++ -+diff --git a/libavcodec/rpi_zc.h b/libavcodec/rpi_zc.h -+new file mode 100644 -+index 0000000..f0109f4 -+--- /dev/null -++++ b/libavcodec/rpi_zc.h -+@@ -0,0 +1,83 @@ -++#ifndef LIBAVCODEC_RPI_ZC_H -++#define LIBAVCODEC_RPI_ZC_H -++ -++// Zero-Copy frame code for RPi -++// RPi needs Y/U/V planes to be contiguous for display. By default -++// ffmpeg will allocate separated planes so a memcpy is needed before -++// display. This code prodes a method a making ffmpeg allocate a single -++// bit of memory for the frame when can then be refrence counted until -++// display ahs finsihed with it. -++ -++#include "libavutil/frame.h" -++#include "libavcodec/avcodec.h" -++ -++// "Opaque" pointer to whatever we are using as a buffer reference -++typedef AVBufferRef * AVRpiZcRefPtr; -++ -++struct AVZcEnv; -++typedef struct AVZcEnv * AVZcEnvPtr; -++ -++typedef struct AVRpiZcFrameGeometry -++{ -++ unsigned int stride_y; -++ unsigned int height_y; -++ unsigned int stride_c; -++ unsigned int height_c; -++} AVRpiZcFrameGeometry; -++ -++ -++AVRpiZcFrameGeometry av_rpi_zc_frame_geometry( -++ const unsigned int video_width, const unsigned int video_height); -++ -++// Replacement fn for avctx->get_buffer2 -++// Should be set before calling avcodec_decode_open2 -++// -++// N.B. in addition to to setting avctx->get_buffer2, avctx->refcounted_frames -++// must be set to 1 as otherwise the buffer info is killed before being returned -++// by avcodec_decode_video2. Note also that this means that the AVFrame that is -++// return must be manually derefed with av_frame_unref. This should be done -++// after av_rpi_zc_ref has been called. -++int av_rpi_zc_get_buffer2(struct AVCodecContext *s, AVFrame *frame, int flags); -++ -++// Generate a ZC reference to the buffer(s) in this frame -++// If the buffer doesn't appear to be one allocated by _get_buffer_2 -++// then the behaviour depends on maycopy: -++// If maycopy=0 then return NULL -++// If maycopy=1 && the src frame is in a form where we can easily copy -++// the data, then allocate a new buffer and copy the data into it -++// Otherwise return NULL -++AVRpiZcRefPtr av_rpi_zc_ref(struct AVCodecContext * const s, -++ const AVFrame * const frame, const int maycopy); -++ -++// Get the vc_handle from the frame ref -++// Returns -1 if ref doesn't look valid -++int av_rpi_zc_vc_handle(const AVRpiZcRefPtr fr_ref); -++// Get the number of bytes allocated from the frame ref -++// Returns 0 if ref doesn't look valid -++int av_rpi_zc_numbytes(const AVRpiZcRefPtr fr_ref); -++ -++// Unreference the buffer refed/allocated by _zc_ref -++// If fr_ref is NULL then this will NOP -++void av_rpi_zc_unref(AVRpiZcRefPtr fr_ref); -++ -++// Allocate an environment for the buffer pool used by the ZC code -++// This should be put in avctx->get_buffer_context so it can be found by -++// av_rpi_zc_get_buffer2 when it is called from ffmpeg -++AVZcEnvPtr av_rpi_zc_env_alloc(void); -++ -++// Allocate the environment used by the ZC code -++void av_rpi_zc_env_free(AVZcEnvPtr); -++ -++ -++// Init ZC into a context -++// There is nothing magic in this fn - it just packages setting -++// get_buffer2 & get_buffer_context -++int av_rpi_zc_init(struct AVCodecContext * const s); -++ -++// Free ZC from a context -++// There is nothing magic in this fn - it just packages unsetting -++// get_buffer2 & get_buffer_context -++void av_rpi_zc_uninit(struct AVCodecContext * const s); -++ -++#endif -++ -+-- -+2.7.4 -+ -+ -+From a6da64e1ca42f0394ccfa55dca782a456841da94 Mon Sep 17 00:00:00 2001 -+From: John Cox -+Date: Tue, 1 Mar 2016 14:21:25 +0000 -+Subject: [PATCH 2/2] Set VPU scheduling thread to high priority after creation -+ -+--- -+ libavcodec/rpi_qpu.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- -+ 1 file changed, 47 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index b0c9bc5..ee19231 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -182,9 +182,55 @@ static int gpu_init(volatile struct GPU **gpu) { -+ err = pthread_create(&vpu_thread, NULL, vpu_start, NULL); -+ //printf("Created thread\n"); -+ if (err) { -+- printf("Failed to create vpu thread\n"); -++ av_log(NULL, AV_LOG_FATAL, "Failed to create vpu thread\n"); -+ return -4; -+ } -++ -++ { -++ struct sched_param param = {0}; -++ int policy = 0; -++ -++ if (pthread_getschedparam(vpu_thread, &policy, ¶m) != 0) -++ { -++ av_log(NULL, AV_LOG_ERROR, "Unable to get VPU thread scheduling parameters\n"); -++ } -++ else -++ { -++ av_log(NULL, AV_LOG_INFO, "VPU thread: policy=%d (%s), pri=%d\n", -++ policy, -++ policy == SCHED_RR ? "RR" : policy == SCHED_FIFO ? "FIFO" : "???" , -++ param.sched_priority); -++ -++ policy = SCHED_FIFO; -++ param.sched_priority = sched_get_priority_max(SCHED_FIFO); -++ -++ av_log(NULL, AV_LOG_INFO, "Attempt to set: policy=%d (%s), pri=%d\n", -++ policy, -++ policy == SCHED_RR ? "RR" : policy == SCHED_FIFO ? "FIFO" : "???" , -++ param.sched_priority); -++ -++ if (pthread_setschedparam(vpu_thread, policy, ¶m) != 0) -++ { -++ av_log(NULL, AV_LOG_ERROR, "Unable to set VPU thread scheduling parameters\n"); -++ } -++ else -++ { -++ if (pthread_getschedparam(vpu_thread, &policy, ¶m) != 0) -++ { -++ av_log(NULL, AV_LOG_ERROR, "Unable to get VPU thread scheduling parameters\n"); -++ } -++ else -++ { -++ av_log(NULL, AV_LOG_INFO, "VPU thread (after): policy=%d (%s), pri=%d\n", -++ policy, -++ policy == SCHED_RR ? "RR" : policy == SCHED_FIFO ? "FIFO" : "???" , -++ param.sched_priority); -++ } -++ } -++ } -++ -++ } -++ -+ } -+ #endif -+ -+-- -+2.7.4 -+ - -From 978ac05eba662e8eb7b043d0e51d8ad90e8e04f5 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 12 Jan 2016 16:29:57 +0000 -Subject: [PATCH 28/61] ffmpeg: Add cabac opimisations for hevc - ---- - .../0001-Squashed-commit-of-the-following.patch | 2179 ++++++++++++++++++++ - tools/depends/target/ffmpeg/Makefile | 5 +- - tools/depends/target/ffmpeg/autobuild.sh | 2 + - 3 files changed, 2185 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/0001-Squashed-commit-of-the-following.patch - -diff --git a/tools/depends/target/ffmpeg/0001-Squashed-commit-of-the-following.patch b/tools/depends/target/ffmpeg/0001-Squashed-commit-of-the-following.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..38554af0af30a85b7d88d31b7d21775cf294b0e3 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/0001-Squashed-commit-of-the-following.patch -@@ -0,0 +1,2179 @@ -+From d08594462136274636c1f2f476a6410ff92a9e16 Mon Sep 17 00:00:00 2001 -+From: John Cox -+Date: Wed, 13 Jan 2016 16:13:33 +0000 -+Subject: [PATCH] H.265 residual decode rework (v2) -+ -+Rework the cabac decode functions -+Simplify the code flow and variable usage where possible -+ -+(Remove profiling and other spurious deltas that were in v1) -+--- -+ libavcodec/arm/cabac.h | 155 ++++- -+ libavcodec/arm/hevc_cabac.h | 491 +++++++++++++++ -+ libavcodec/arm/hevcdsp_deblock_neon.S | 13 +- -+ libavcodec/arm/hevcdsp_epel_neon.S | 9 +- -+ libavcodec/cabac.h | 9 +- -+ libavcodec/hevc_cabac.c | 1096 +++++++++++++++++++++++++-------- -+ 6 files changed, 1509 insertions(+), 264 deletions(-) -+ create mode 100644 libavcodec/arm/hevc_cabac.h -+ -+diff --git a/libavcodec/arm/cabac.h b/libavcodec/arm/cabac.h -+index fdbf86b..0a3980a 100644 -+--- a/libavcodec/arm/cabac.h -++++ b/libavcodec/arm/cabac.h -+@@ -26,13 +26,34 @@ -+ #include "libavutil/internal.h" -+ #include "libavcodec/cabac.h" -+ -++ -++#if UNCHECKED_BITSTREAM_READER -++#define LOAD_16BITS_BEHI\ -++ "ldrh %[tmp] , [%[ptr]] , #2 \n\t"\ -++ "rev %[tmp] , %[tmp] \n\t" -++#elif CONFIG_THUMB -++#define LOAD_16BITS_BEHI\ -++ "ldr %[tmp] , [%[c], %[end]] \n\t"\ -++ "cmp %[tmp] , %[ptr] \n\t"\ -++ "it cs \n\t"\ -++ "ldrhcs %[tmp] , [%[ptr]] , #2 \n\t"\ -++ "rev %[tmp] , %[tmp] \n\t" -++#else -++#define LOAD_16BITS_BEHI\ -++ "ldr %[tmp] , [%[c], %[end]] \n\t"\ -++ "cmp %[tmp] , %[ptr] \n\t"\ -++ "ldrcsh %[tmp] , [%[ptr]] , #2 \n\t"\ -++ "rev %[tmp] , %[tmp] \n\t" -++#endif -++ -++ -+ #define get_cabac_inline get_cabac_inline_arm -+ static av_always_inline int get_cabac_inline_arm(CABACContext *c, -+ uint8_t *const state) -+ { -+ int bit; -++#if 0 -+ void *reg_b, *reg_c, *tmp; -+- -+ __asm__ volatile( -+ "ldrb %[bit] , [%[state]] \n\t" -+ "add %[r_b] , %[tables] , %[lps_off] \n\t" -+@@ -100,9 +121,141 @@ static av_always_inline int get_cabac_inline_arm(CABACContext *c, -+ [mlps_off]"I"(H264_MLPS_STATE_OFFSET + 128) -+ : "memory", "cc" -+ ); -++#else -++ // *** Not thumb compatible yet -++ unsigned int reg_b, tmp; -++ __asm__ ( -++ "ldrb %[bit] , [%[state]] \n\t" -++ "sub %[r_b] , %[mlps_tables], %[lps_off] \n\t" -++ "and %[tmp] , %[range] , #0xC0 \n\t" -++ "add %[r_b] , %[r_b] , %[bit] \n\t" -++ "ldrb %[tmp] , [%[r_b] , %[tmp], lsl #1] \n\t" -++// %bit = *state -++// %range = range -++// %tmp = RangeLPS -++ "sub %[range] , %[range] , %[tmp] \n\t" -++ -++ "cmp %[low] , %[range] , lsl #17 \n\t" -++ "ittt ge \n\t" -++ "subge %[low] , %[low] , %[range], lsl #17 \n\t" -++ "mvnge %[bit] , %[bit] \n\t" -++ "movge %[range] , %[tmp] \n\t" -++ -++ "clz %[tmp] , %[range] \n\t" -++ "sub %[tmp] , #23 \n\t" -++ -++ "ldrb %[r_b] , [%[mlps_tables], %[bit]] \n\t" -++ "lsl %[low] , %[low] , %[tmp] \n\t" -++ "lsl %[range] , %[range] , %[tmp] \n\t" -++ -++ "strb %[r_b] , [%[state]] \n\t" -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ -++ "bne 2f \n\t" -++ LOAD_16BITS_BEHI -++ "lsr %[tmp] , %[tmp] , #15 \n\t" -++ "movw %[r_b] , #0xFFFF \n\t" -++ "sub %[tmp] , %[tmp] , %[r_b] \n\t" -++ -++ "rbit %[r_b] , %[low] \n\t" -++ "clz %[r_b] , %[r_b] \n\t" -++ "sub %[r_b] , %[r_b] , #16 \n\t" -++#if CONFIG_THUMB -++ "lsl %[tmp] , %[tmp] , %[r_b] \n\t" -++ "add %[low] , %[low] , %[tmp] \n\t" -++#else -++ "add %[low] , %[low] , %[tmp], lsl %[r_b] \n\t" -++#endif -++ "2: \n\t" -++ : [bit]"=&r"(bit), -++ [low]"+&r"(c->low), -++ [range]"+&r"(c->range), -++ [r_b]"=&r"(reg_b), -++ [ptr]"+&r"(c->bytestream), -++ [tmp]"=&r"(tmp) -++ : [state]"r"(state), -++ [mlps_tables]"r"(ff_h264_cabac_tables + H264_MLPS_STATE_OFFSET + 128), -++ [byte]"M"(offsetof(CABACContext, bytestream)), -++#if !UNCHECKED_BITSTREAM_READER -++ [c]"r"(c), -++ [end]"M"(offsetof(CABACContext, bytestream_end)), -++#endif -++ [lps_off]"I"((H264_MLPS_STATE_OFFSET + 128) - H264_LPS_RANGE_OFFSET) -++ : "memory", "cc" -++ ); -++#endif -+ -+ return bit & 1; -+ } -++ -++#define get_cabac_bypass get_cabac_bypass_arm -++static inline int get_cabac_bypass_arm(CABACContext * const c) -++{ -++ int rv = 0; -++ unsigned int tmp; -++ __asm ( -++ "lsl %[low] , #1 \n\t" -++ "cmp %[low] , %[range] , lsl #17 \n\t" -++ "adc %[rv] , %[rv] , #0 \n\t" -++ "it cs \n\t" -++ "subcs %[low] , %[low] , %[range], lsl #17 \n\t" -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ "bne 1f \n\t" -++ LOAD_16BITS_BEHI -++ "add %[low] , %[low] , %[tmp], lsr #15 \n\t" -++ "movw %[tmp] , #0xFFFF \n\t" -++ "sub %[low] , %[low] , %[tmp] \n\t" -++ "1: \n\t" -++ : // Outputs -++ [rv]"+&r"(rv), -++ [low]"+&r"(c->low), -++ [tmp]"=&r"(tmp), -++ [ptr]"+&r"(c->bytestream) -++ : // Inputs -++#if !UNCHECKED_BITSTREAM_READER -++ [c]"r"(c), -++ [end]"M"(offsetof(CABACContext, bytestream_end)), -++#endif -++ [range]"r"(c->range) -++ : "cc" -++ ); -++ return rv; -++} -++ -++ -++#define get_cabac_bypass_sign get_cabac_bypass_sign_arm -++static inline int get_cabac_bypass_sign_arm(CABACContext * const c, int rv) -++{ -++ unsigned int tmp; -++ __asm ( -++ "lsl %[low] , #1 \n\t" -++ "cmp %[low] , %[range] , lsl #17 \n\t" -++ "ite cc \n\t" -++ "rsbcc %[rv] , %[rv] , #0 \n\t" -++ "subcs %[low] , %[low] , %[range], lsl #17 \n\t" -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ "bne 1f \n\t" -++ LOAD_16BITS_BEHI -++ "add %[low] , %[low] , %[tmp], lsr #15 \n\t" -++ "movw %[tmp] , #0xFFFF \n\t" -++ "sub %[low] , %[low] , %[tmp] \n\t" -++ "1: \n\t" -++ : // Outputs -++ [rv]"+&r"(rv), -++ [low]"+&r"(c->low), -++ [tmp]"=&r"(tmp), -++ [ptr]"+&r"(c->bytestream) -++ : // Inputs -++#if !UNCHECKED_BITSTREAM_READER -++ [c]"r"(c), -++ [end]"M"(offsetof(CABACContext, bytestream_end)), -++#endif -++ [range]"r"(c->range) -++ : "cc" -++ ); -++ return rv; -++} -++ -+ #endif /* HAVE_ARMV6T2_INLINE */ -+ -+ #endif /* AVCODEC_ARM_CABAC_H */ -+diff --git a/libavcodec/arm/hevc_cabac.h b/libavcodec/arm/hevc_cabac.h -+new file mode 100644 -+index 0000000..31d3c59 -+--- /dev/null -++++ b/libavcodec/arm/hevc_cabac.h -+@@ -0,0 +1,491 @@ -++/* -++ * This file is part of FFmpeg. -++ * -++ * FFmpeg is free software; you can redistribute it and/or -++ * modify it under the terms of the GNU Lesser General Public -++ * License as published by the Free Software Foundation; either -++ * version 2.1 of the License, or (at your option) any later version. -++ * -++ * FFmpeg is distributed in the hope that it will be useful, -++ * but WITHOUT ANY WARRANTY; without even the implied warranty of -++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -++ * Lesser General Public License for more details. -++ * -++ * You should have received a copy of the GNU Lesser General Public -++ * License along with FFmpeg; if not, write to the Free Software -++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -++ */ -++ -++#ifndef AVCODEC_ARM_HEVC_CABAC_H -++#define AVCODEC_ARM_HEVC_CABAC_H -++ -++#include "config.h" -++#if HAVE_ARMV6T2_INLINE -++ -++#define hevc_mem_bits32 hevc_mem_bits32_arm -++static inline uint32_t hevc_mem_bits32_arm(const void * p, const unsigned int bits) -++{ -++ unsigned int n; -++ __asm__ ( -++ "rev %[n], %[x] \n\t" -++ : [n]"=r"(n) -++ : [x]"r"(*(const uint32_t *)((const uint8_t *)p + (bits >> 3))) -++ : -++ ); -++ return n << (bits & 7); -++} -++ -++ -++// --------------------------------------------------------------------------- -++// -++// Helper fns - little bits of code where ARM has an instraction that the -++// compiler doesn't know about / use -++ -++#define trans_scale_sat trans_scale_sat_arm -++static inline int trans_scale_sat_arm(const int level, const unsigned int scale, const unsigned int scale_m, const unsigned int shift) -++{ -++ int rv; -++ int t = ((level * (int)(scale * scale_m)) >> shift) + 1; -++ -++ __asm__ ( -++ "ssat %[rv], #16, %[t], ASR #1 \n\t" -++ : [rv]"=r"(rv) -++ : [t]"r"(t) -++ : -++ ); -++ return rv; -++} -++ -++#define update_rice update_rice_arm -++static inline void update_rice_arm(uint8_t * const stat_coeff, -++ const unsigned int last_coeff_abs_level_remaining, -++ const unsigned int c_rice_param) -++{ -++ int t; -++ __asm__ ( -++ "lsl %[t], %[coeff], #1 \n\t" -++ "lsrs %[t], %[t], %[shift] \n\t" -++ "it eq \n\t" -++ "subeq %[stat], %[stat], #1 \n\t" -++ "cmp %[t], #6 \n\t" -++ "adc %[stat], %[stat], #0 \n\t" -++ "usat %[stat], #8, %[stat] \n\t" -++ : [stat]"+&r"(*stat_coeff), -++ [t]"=&r"(t) -++ : [coeff]"r"(last_coeff_abs_level_remaining), -++ [shift]"r"(c_rice_param) -++ : "cc" -++ ); -++} -++ -++// --------------------------------------------------------------------------- -++// -++// CABAC get loops -++// -++// Where the loop is simple enough we can normally do 10-30% better than the -++// compiler -++ -++// Get the residual greater than 1 bits -++ -++#define get_cabac_greater1_bits get_cabac_greater1_bits_arm -++static inline unsigned int get_cabac_greater1_bits_arm(CABACContext * const c, const unsigned int n, -++ uint8_t * const state0) -++{ -++ unsigned int i, reg_b, st, tmp, bit, rv; -++ __asm__ ( -++ "mov %[i] , #0 \n\t" -++ "mov %[rv] , #0 \n\t" -++ "1: \n\t" -++ "add %[i] , %[i] , #1 \n\t" -++ "cmp %[rv] , #0 \n\t" -++ "ite eq \n\t" -++ "usateq %[st] , #2 , %[i] \n\t" -++ "movne %[st] , #0 \n\t" -++ -++ "ldrb %[bit] , [%[state0], %[st]] \n\t" -++ "sub %[r_b] , %[mlps_tables], %[lps_off] \n\t" -++ "and %[tmp] , %[range] , #0xC0 \n\t" -++ "add %[r_b] , %[r_b] , %[bit] \n\t" -++ "ldrb %[tmp] , [%[r_b], %[tmp], lsl #1] \n\t" -++ "sub %[range] , %[range] , %[tmp] \n\t" -++ -++ "cmp %[low] , %[range], lsl #17 \n\t" -++ "ittt ge \n\t" -++ "subge %[low] , %[low] , %[range], lsl #17 \n\t" -++ "mvnge %[bit] , %[bit] \n\t" -++ "movge %[range] , %[tmp] \n\t" -++ -++ "ldrb %[r_b] , [%[mlps_tables], %[bit]] \n\t" -++ "and %[bit] , %[bit] , #1 \n\t" -++ "orr %[rv] , %[bit] , %[rv], lsl #1 \n\t" -++ -++ "clz %[tmp] , %[range] \n\t" -++ "sub %[tmp] , #23 \n\t" -++ -++ "lsl %[low] , %[low] , %[tmp] \n\t" -++ "lsl %[range] , %[range] , %[tmp] \n\t" -++ -++ "strb %[r_b] , [%[state0], %[st]] \n\t" -++// There is a small speed gain from combining both conditions, using a single -++// branch and then working out what that meant later -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ "it ne \n\t" -++ "cmpne %[n] , %[i] \n\t" -++ "bne 1b \n\t" -++ -++// If reload is not required then we must have run out of flags to decode -++ "tst %[tmp] , %[tmp] \n\t" -++ "bne 2f \n\t" -++ -++// Do reload -++ "ldrh %[tmp] , [%[bptr]] , #2 \n\t" -++ "movw %[r_b] , #0xFFFF \n\t" -++ "rev %[tmp] , %[tmp] \n\t" -++ "rsb %[tmp] , %[r_b] , %[tmp], lsr #15 \n\t" -++ -++ "rbit %[r_b] , %[low] \n\t" -++ "clz %[r_b] , %[r_b] \n\t" -++ "sub %[r_b] , %[r_b] , #16 \n\t" -++ -++#if CONFIG_THUMB -++ "lsl %[tmp] , %[tmp] , %[r_b] \n\t" -++ "add %[low] , %[low] , %[tmp] \n\t" -++#else -++ "add %[low] , %[low] , %[tmp], lsl %[r_b] \n\t" -++#endif -++ -++ "cmp %[n] , %[i] \n\t" -++ "bne 1b \n\t" -++ "2: \n\t" -++ : [bit]"=&r"(bit), -++ [low]"+&r"(c->low), -++ [range]"+&r"(c->range), -++ [r_b]"=&r"(reg_b), -++ [bptr]"+&r"(c->bytestream), -++ [i]"=&r"(i), -++ [tmp]"=&r"(tmp), -++ [st]"=&r"(st), -++ [rv]"=&r"(rv) -++ : [state0]"r"(state0), -++ [n]"r"(n), -++ [mlps_tables]"r"(ff_h264_cabac_tables + H264_MLPS_STATE_OFFSET + 128), -++ [byte]"M"(offsetof(CABACContext, bytestream)), -++ [lps_off]"I"((H264_MLPS_STATE_OFFSET + 128) - H264_LPS_RANGE_OFFSET) -++ : "memory", "cc" -++ ); -++ return rv; -++} -++ -++ -++// n must be > 0 on entry -++#define get_cabac_sig_coeff_flag_idxs get_cabac_sig_coeff_flag_idxs_arm -++static inline uint8_t * get_cabac_sig_coeff_flag_idxs_arm(CABACContext * const c, uint8_t * const state0, -++ unsigned int n, -++ const uint8_t const * ctx_map, -++ uint8_t * p) -++{ -++ unsigned int reg_b, tmp, st, bit; -++ __asm__ ( -++ "1: \n\t" -++// Get bin from map -++ "ldrb %[st] , [%[ctx_map], %[n]] \n\t" -++ -++// Load state & ranges -++ "sub %[r_b] , %[mlps_tables], %[lps_off] \n\t" -++ "ldrb %[bit] , [%[state0], %[st]] \n\t" -++ "and %[tmp] , %[range] , #0xC0 \n\t" -++ "add %[r_b] , %[r_b] , %[tmp], lsl #1 \n\t" -++ "ldrb %[tmp] , [%[r_b], %[bit]] \n\t" -++ "sub %[range] , %[range] , %[tmp] \n\t" -++ -++ "cmp %[low] , %[range], lsl #17 \n\t" -++ "ittt ge \n\t" -++ "subge %[low] , %[low] , %[range], lsl #17 \n\t" -++ "mvnge %[bit] , %[bit] \n\t" -++ "movge %[range] , %[tmp] \n\t" -++ -++ "ldrb %[r_b] , [%[mlps_tables], %[bit]] \n\t" -++ "tst %[bit] , #1 \n\t" -++// GCC asm seems to need strbne written differently for thumb and arm -++#if CONFIG_THUMB -++ "it ne \n\t" -++ "strbne %[n] , [%[idx]] , #1 \n\t" -++#else -++ "strneb %[n] , [%[idx]] , #1 \n\t" -++#endif -++ -++// Renorm -++ "clz %[tmp] , %[range] \n\t" -++ "sub %[tmp] , #23 \n\t" -++ "lsl %[low] , %[low] , %[tmp] \n\t" -++ "lsl %[range] , %[range] , %[tmp] \n\t" -++ -++ "strb %[r_b] , [%[state0], %[st]] \n\t" -++// There is a small speed gain from combining both conditions, using a single -++// branch and then working out what that meant later -++ "subs %[n] , %[n] , #1 \n\t" -++#if CONFIG_THUMB -++ "itt ne \n\t" -++ "lslsne %[tmp] , %[low] , #16 \n\t" -++ "bne 1b \n\t" -++#else -++ "lslnes %[tmp] , %[low] , #16 \n\t" -++ "bne 1b \n\t" -++#endif -++ -++// If we have bits left then n must be 0 so give up now -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ "bne 2f \n\t" -++ -++// Do reload -++ "ldrh %[tmp] , [%[bptr]] , #2 \n\t" -++ "movw %[r_b] , #0xFFFF \n\t" -++ "rev %[tmp] , %[tmp] \n\t" -++ "rsb %[tmp] , %[r_b] , %[tmp], lsr #15 \n\t" -++ -++ "rbit %[r_b] , %[low] \n\t" -++ "clz %[r_b] , %[r_b] \n\t" -++ "sub %[r_b] , %[r_b] , #16 \n\t" -++ -++#if CONFIG_THUMB -++ "lsl %[tmp] , %[tmp] , %[r_b] \n\t" -++ "add %[low] , %[low] , %[tmp] \n\t" -++#else -++ "add %[low] , %[low] , %[tmp], lsl %[r_b] \n\t" -++#endif -++ -++// Check to see if we still have more to do -++ "cmp %[n] , #0 \n\t" -++ "bne 1b \n\t" -++ "2: \n\t" -++ : [bit]"=&r"(bit), -++ [low]"+&r"(c->low), -++ [range]"+&r"(c->range), -++ [r_b]"=&r"(reg_b), -++ [bptr]"+&r"(c->bytestream), -++ [idx]"+&r"(p), -++ [n]"+&r"(n), -++ [tmp]"=&r"(tmp), -++ [st]"=&r"(st) -++ : [state0]"r"(state0), -++ [ctx_map]"r"(ctx_map), -++ [mlps_tables]"r"(ff_h264_cabac_tables + H264_MLPS_STATE_OFFSET + 128), -++ [byte]"M"(offsetof(CABACContext, bytestream)), -++ [lps_off]"I"((H264_MLPS_STATE_OFFSET + 128) - H264_LPS_RANGE_OFFSET) -++ : "memory", "cc" -++ ); -++ -++ return p; -++} -++ -++// --------------------------------------------------------------------------- -++// -++// CABAC_BY22 functions -++// -++// By and large these are (at best) no faster than their C equivalents - the -++// only one worth having is _peek where we do a slightly better job than the -++// compiler -++// -++// The others have been stashed here for reference in case larger scale asm -++// is attempted in which case they might be a useful base -++ -++ -++#define get_cabac_by22_peek get_cabac_by22_peek_arm -++static inline uint32_t get_cabac_by22_peek_arm(const CABACContext *const c) -++{ -++ uint32_t rv, tmp; -++ __asm__ ( -++ "bic %[rv] , %[low], #1 \n\t" -++ "cmp %[inv] , #0 \n\t" -++ "it ne \n\t" -++ "umullne %[tmp] , %[rv] , %[inv], %[rv] \n\t" -++ : // Outputs -++ [rv]"=&r"(rv), -++ [tmp]"=r"(tmp) -++ : // Inputs -++ [low]"r"(c->low), -++ [inv]"r"(c->range) -++ : // Clobbers -++ "cc" -++ ); -++ return rv << 1; -++} -++ -++#if 0 -++ -++// ***** Slower than the C :-( -++#define get_cabac_by22_flush get_cabac_by22_flush_arm -++static inline void get_cabac_by22_flush_arm(CABACContext *const c, const unsigned int n, const uint32_t val) -++{ -++ uint32_t m, tmp; -++ __asm__ ( -++ "add %[bits], %[bits], %[n] \n\t" -++ "ldr %[m], [%[ptr], %[bits], lsr #3] \n\t" -++ -++ "rsb %[tmp], %[n], #32 \n\t" -++ "lsr %[tmp], %[val], %[tmp] \n\t" -++ "mul %[tmp], %[range], %[tmp] \n\t" -++ -++ "rev %[m], %[m] \n\t" -++ -++ "lsl %[tmp], %[tmp], #23 \n\t" -++ "rsb %[low], %[tmp], %[low], lsl %[n] \n\t" -++ -++ "and %[tmp], %[bits], #7 \n\t" -++ "lsl %[m], %[m], %[tmp] \n\t" -++ -++ "orr %[low], %[low], %[m], lsr #9 \n\t" -++ : // Outputs -++ [m]"=&r"(m), -++ [tmp]"=&r"(tmp), -++ [bits]"+&r"(c->by22.bits), -++ [low]"+&r"(c->low) -++ : // Inputs -++ [n]"r"(n), -++ [val]"r"(val), -++ [inv]"r"(c->range), -++ [range]"r"(c->by22.range), -++ [ptr]"r"(c->bytestream) -++ : // Clobbers -++ ); -++} -++ -++ -++// Works but slower than C -++#define coeff_abs_level_remaining_decode_by22(c,r) coeff_abs_level_remaining_decode_by22_arm(c, r) -++static int coeff_abs_level_remaining_decode_by22_arm(CABACContext * const c, const unsigned int c_rice_param) -++{ -++ uint32_t n, val, tmp, level; -++ -++// PROFILE_START(); -++ -++ __asm__ ( -++ // Peek -++ "bic %[val], %[low], #1 \n\t" -++ "cmp %[inv], #0 \n\t" -++ "umullne %[tmp], %[val], %[inv], %[val] \n\t" -++ "lsl %[val], %[val], #1 \n\t" -++ -++ // Count bits (n = prefix) -++ "mvn %[n], %[val] \n\t" -++ "clz %[n], %[n] \n\t" -++ -++ "lsl %[level], %[val], %[n] \n\t" -++ "subs %[tmp], %[n], #3 \n\t" -++ "blo 2f \n\t" -++ -++ // prefix >= 3 -++ // < tmp = prefix - 3 -++ // > tmp = prefix + rice - 3 -++ "add %[tmp], %[tmp], %[rice] \n\t" -++ // > n = prefix * 2 + rice - 3 -++ "add %[n], %[tmp], %[n] \n\t" -++ "cmp %[n], #21 \n\t" -++ "bhi 3f \n\t" -++ -++ "orr %[level], %[level], #0x80000000 \n\t" -++ "rsb %[tmp], %[tmp], #31 \n\t" -++ "lsr %[level], %[level], %[tmp] \n\t" -++ -++ "mov %[tmp], #2 \n\t" -++ "add %[level], %[level], %[tmp], lsl %[rice] \n\t" -++ "b 1f \n\t" -++ -++ // > 22 bits used in total - need reload -++ "3: \n\t" -++ -++ // Stash prefix + rice - 3 in level (only spare reg) -++ "mov %[level], %[tmp] \n\t" -++ // Restore n to flush value (prefix) -++ "sub %[n], %[n], %[tmp] \n\t" -++ -++ // Flush + reload -++ -++// "rsb %[tmp], %[n], #32 \n\t" -++// "lsr %[tmp], %[val], %[tmp] \n\t" -++// "mul %[tmp], %[range], %[tmp] \n\t" -++ -++ // As it happens we know that all the bits we are flushing are 1 -++ // so we can cheat slightly -++ "rsb %[tmp], %[range], %[range], lsl %[n] \n\t" -++ "lsl %[tmp], %[tmp], #23 \n\t" -++ "rsb %[low], %[tmp], %[low], lsl %[n] \n\t" -++ -++ "add %[bits], %[bits], %[n] \n\t" -++ "ldr %[n], [%[ptr], %[bits], lsr #3] \n\t" -++ "rev %[n], %[n] \n\t" -++ "and %[tmp], %[bits], #7 \n\t" -++ "lsl %[n], %[n], %[tmp] \n\t" -++ -++ "orr %[low], %[low], %[n], lsr #9 \n\t" -++ -++ // (reload) -++ -++ "bic %[val], %[low], #1 \n\t" -++ "cmp %[inv], #0 \n\t" -++ "umullne %[tmp], %[val], %[inv], %[val] \n\t" -++ "lsl %[val], %[val], #1 \n\t" -++ -++ // Build value -++ -++ "mov %[n], %[level] \n\t" -++ -++ "orr %[tmp], %[val], #0x80000000 \n\t" -++ "rsb %[level], %[level], #31 \n\t" -++ "lsr %[level], %[tmp], %[level] \n\t" -++ -++ "mov %[tmp], #2 \n\t" -++ "add %[level], %[level], %[tmp], lsl %[rice] \n\t" -++ "b 1f \n\t" -++ -++ // prefix < 3 -++ "2: \n\t" -++ "rsb %[tmp], %[rice], #31 \n\t" -++ "lsr %[level], %[level], %[tmp] \n\t" -++ "orr %[level], %[level], %[n], lsl %[rice] \n\t" -++ "add %[n], %[n], %[rice] \n\t" -++ -++ "1: \n\t" -++ // Flush -++ "add %[n], %[n], #1 \n\t" -++ -++ "rsb %[tmp], %[n], #32 \n\t" -++ "lsr %[tmp], %[val], %[tmp] \n\t" -++ -++ "add %[bits], %[bits], %[n] \n\t" -++ "ldr %[val], [%[ptr], %[bits], lsr #3] \n\t" -++ -++ "mul %[tmp], %[range], %[tmp] \n\t" -++ "lsl %[tmp], %[tmp], #23 \n\t" -++ "rsb %[low], %[tmp], %[low], lsl %[n] \n\t" -++ -++ "rev %[val], %[val] \n\t" -++ "and %[tmp], %[bits], #7 \n\t" -++ "lsl %[val], %[val], %[tmp] \n\t" -++ -++ "orr %[low], %[low], %[val], lsr #9 \n\t" -++ : // Outputs -++ [level]"=&r"(level), -++ [n]"=&r"(n), -++ [val]"=&r"(val), -++ [tmp]"=&r"(tmp), -++ [bits]"+&r"(c->by22.bits), -++ [low]"+&r"(c->low) -++ : // Inputs -++ [rice]"r"(c_rice_param), -++ [inv]"r"(c->range), -++ [range]"r"(c->by22.range), -++ [ptr]"r"(c->bytestream) -++ : // Clobbers -++ "cc" -++ ); -++ -++// PROFILE_ACC(residual_abs); -++ -++ return level; -++} -++#endif -++ -++#endif /* HAVE_ARMV6T2_INLINE */ -++ -++#endif /* AVCODEC_ARM_HEVC_CABAC_H */ -+diff --git a/libavcodec/arm/hevcdsp_deblock_neon.S b/libavcodec/arm/hevcdsp_deblock_neon.S -+index bad4589..a088cc3 100644 -+--- a/libavcodec/arm/hevcdsp_deblock_neon.S -++++ b/libavcodec/arm/hevcdsp_deblock_neon.S -+@@ -409,10 +409,12 @@ function ff_hevc_deblocking_boundary_strengths_neon, export=1 -+ beq 90f -+ -+ tst a3, #1 -++ itee ne -+ ldrne a3, [v5, #0] @ curr->mv[0] -+ ldreq a3, [v5, #4] @ curr->mv[1] -+ moveq v1, v2 -+ tst v8, #1 -++ itee ne -+ ldrne v8, [v6, #0] @ neigh->mv[0] -+ ldreq v8, [v6, #4] @ neigh->mv[1] -+ moveq v3, v4 -+@@ -424,9 +426,14 @@ function ff_hevc_deblocking_boundary_strengths_neon, export=1 -+ sel a3, a3, ip -+ ands a3, a3, lr -+ @ drop through -+-10: movne a3, #1 -++10: it ne -++ movne a3, #1 -+ 11: subs a2, a2, #1 -+-12: strbhs a3, [v7], a4 -++12: -++A strbhs a3, [v7], a4 -++T itt hs -++T strbhs a3, [v7] -++T addhs v7, v7, a4 -+ subs a2, a2, #1 -+ bhs 12b -+ -+@@ -442,6 +449,7 @@ function ff_hevc_deblocking_boundary_strengths_neon, export=1 -+ bne 10b -+ -+ teq v1, v3 -++ it eq -+ teqeq v2, v4 -+ bne 40f -+ teq v1, v2 -+@@ -487,6 +495,7 @@ function ff_hevc_deblocking_boundary_strengths_neon, export=1 -+ b 10b -+ -+ 40: teq v1, v4 -++ ite eq -+ teqeq v2, v3 -+ bne 10b -+ -+diff --git a/libavcodec/arm/hevcdsp_epel_neon.S b/libavcodec/arm/hevcdsp_epel_neon.S -+index 516ae5b..00eab9e 100644 -+--- a/libavcodec/arm/hevcdsp_epel_neon.S -++++ b/libavcodec/arm/hevcdsp_epel_neon.S -+@@ -110,7 +110,9 @@ function ff_hevc_put_epel_h_neon_8, export=1 -+ sub r7, #1 -+ lsl r7, #2 -+ vpush {d8-d15} -+- adrl r12, epel_coeffs -++@ adr reaches if we are in thumb mode but not in arm -++T adr r12, epel_coeffs -++A adrl r12, epel_coeffs -+ add r7, r12 -+ sub r1, #1 -+ lsl r4, #1 -+@@ -170,7 +172,8 @@ function ff_hevc_put_epel_v_neon_8, export=1 -+ sub r7, #1 -+ lsl r7, #2 -+ vpush {d8-d15} -+- adrl r12, epel_coeffs -++T adr r12, epel_coeffs -++A adrl r12, epel_coeffs -+ add r7, r12 -+ load_coeffs_16b r7 -+ sub r1, r2 -+@@ -246,7 +249,7 @@ function ff_hevc_put_epel_hv_neon_8, export=1 -+ sub r7, #1 -+ lsl r7, #2 -+ vpush {d8-d15} -+- adrl r12, epel_coeffs -++ adr r12, epel_coeffs -+ sub r6, #1 -+ lsl r6, #2 -+ add r6, r12 // mx epel coeff offset -+diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h -+index 1bf1c62..ccfa991 100644 -+--- a/libavcodec/cabac.h -++++ b/libavcodec/cabac.h -+@@ -43,7 +43,14 @@ extern const uint8_t ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63]; -+ typedef struct CABACContext{ -+ int low; -+ int range; -+- int outstanding_count; -++ union -++ { -++ int outstanding_count; -++ struct { -++ uint16_t bits; -++ uint16_t range; -++ } by22; -++ }; -+ const uint8_t *bytestream_start; -+ const uint8_t *bytestream; -+ const uint8_t *bytestream_end; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 8656917..4caf720 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -21,14 +21,72 @@ -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -++#define UNCHECKED_BITSTREAM_READER 1 -++ -+ #include "libavutil/attributes.h" -+ #include "libavutil/common.h" -+ -+-#include "cabac_functions.h" -+ #include "hevc.h" -++#include "cabac_functions.h" -++ -++// BY22 is probably faster than simple bypass if the processor has -++// either a fast 32-bit divide or a fast 32x32->64[63:32] instruction -++// x86 has fast int divide -++// Arm doesn't have divide or general fast 64 bit, but does have the multiply -++// * Beware: ARCH_xxx isn't set if configure --disable-asm is used -++#define USE_BY22 (HAVE_FAST_64BIT || ARCH_ARM || ARCH_X86) -++// Use native divide if we have a fast one - otherwise use mpy 1/x -++// x86 has a fast integer divide - arm doesn't - unsure about other -++// architectures -++#define USE_BY22_DIV ARCH_X86 -++ -++// Special case blocks with a single significant ceoff -++// Decreases the complexity of the code for a common case but increases the -++// code size. -++#define USE_N_END_1 1 -++ -++#if ARCH_ARM -++#include "arm/hevc_cabac.h" -++#endif -+ -+ #define CABAC_MAX_BIN 31 -+ -++ -++#if USE_BY22 && !USE_BY22_DIV -++#define I(x) (uint32_t)((0x10000000000ULL / (uint64_t)(x)) + 1ULL) -++ -++static const uint32_t cabac_by22_inv_range[256] = { -++ 0, I(257), I(258), I(259), -++ I(260), I(261), I(262), I(263), I(264), I(265), I(266), I(267), I(268), I(269), -++ I(270), I(271), I(272), I(273), I(274), I(275), I(276), I(277), I(278), I(279), -++ I(280), I(281), I(282), I(283), I(284), I(285), I(286), I(287), I(288), I(289), -++ I(290), I(291), I(292), I(293), I(294), I(295), I(296), I(297), I(298), I(299), -++ I(300), I(301), I(302), I(303), I(304), I(305), I(306), I(307), I(308), I(309), -++ I(310), I(311), I(312), I(313), I(314), I(315), I(316), I(317), I(318), I(319), -++ I(320), I(321), I(322), I(323), I(324), I(325), I(326), I(327), I(328), I(329), -++ I(330), I(331), I(332), I(333), I(334), I(335), I(336), I(337), I(338), I(339), -++ I(340), I(341), I(342), I(343), I(344), I(345), I(346), I(347), I(348), I(349), -++ I(350), I(351), I(352), I(353), I(354), I(355), I(356), I(357), I(358), I(359), -++ I(360), I(361), I(362), I(363), I(364), I(365), I(366), I(367), I(368), I(369), -++ I(370), I(371), I(372), I(373), I(374), I(375), I(376), I(377), I(378), I(379), -++ I(380), I(381), I(382), I(383), I(384), I(385), I(386), I(387), I(388), I(389), -++ I(390), I(391), I(392), I(393), I(394), I(395), I(396), I(397), I(398), I(399), -++ I(400), I(401), I(402), I(403), I(404), I(405), I(406), I(407), I(408), I(409), -++ I(410), I(411), I(412), I(413), I(414), I(415), I(416), I(417), I(418), I(419), -++ I(420), I(421), I(422), I(423), I(424), I(425), I(426), I(427), I(428), I(429), -++ I(430), I(431), I(432), I(433), I(434), I(435), I(436), I(437), I(438), I(439), -++ I(440), I(441), I(442), I(443), I(444), I(445), I(446), I(447), I(448), I(449), -++ I(450), I(451), I(452), I(453), I(454), I(455), I(456), I(457), I(458), I(459), -++ I(460), I(461), I(462), I(463), I(464), I(465), I(466), I(467), I(468), I(469), -++ I(470), I(471), I(472), I(473), I(474), I(475), I(476), I(477), I(478), I(479), -++ I(480), I(481), I(482), I(483), I(484), I(485), I(486), I(487), I(488), I(489), -++ I(490), I(491), I(492), I(493), I(494), I(495), I(496), I(497), I(498), I(499), -++ I(500), I(501), I(502), I(503), I(504), I(505), I(506), I(507), I(508), I(509), -++ I(510), I(511) -++}; -++#undef I -++#endif // USE_BY22 -++ -+ /** -+ * number of bin by SyntaxElement. -+ */ -+@@ -445,6 +503,211 @@ static const uint8_t diag_scan8x8_inv[8][8] = { -+ { 28, 36, 43, 49, 54, 58, 61, 63, }, -+ }; -+ -++ -++typedef struct -++{ -++ uint16_t coeff; -++ uint16_t scale; -++} xy_off_t; -++ -++#define XYT_C(x,y,t) ((x) + ((y) << (t))) -++#define SCALE_TRAFO(t) ((t) > 3 ? 3 : (t)) -++#define SCALE_SHR(t) ((t) - SCALE_TRAFO(t)) -++#define XYT_S(x,y,t) (((x) >> SCALE_SHR(t)) + (((y) >> SCALE_SHR(t)) << SCALE_TRAFO(t))) -++ -++#define XYT(x,y,t) {XYT_C(x,y,t), XYT_S(x,y,t)} -++ -++#define OFF_DIAG(t) {\ -++ XYT(0,0,t), XYT(0,1,t), XYT(1,0,t), XYT(0,2,t),\ -++ XYT(1,1,t), XYT(2,0,t), XYT(0,3,t), XYT(1,2,t),\ -++ XYT(2,1,t), XYT(3,0,t), XYT(1,3,t), XYT(2,2,t),\ -++ XYT(3,1,t), XYT(2,3,t), XYT(3,2,t), XYT(3,3,t)\ -++} -++ -++#define OFF_HORIZ(t) {\ -++ XYT(0,0,t), XYT(1,0,t), XYT(2,0,t), XYT(3,0,t),\ -++ XYT(0,1,t), XYT(1,1,t), XYT(2,1,t), XYT(3,1,t),\ -++ XYT(0,2,t), XYT(1,2,t), XYT(2,2,t), XYT(3,2,t),\ -++ XYT(0,3,t), XYT(1,3,t), XYT(2,3,t), XYT(3,3,t)\ -++} -++ -++#define OFF_VERT(t) {\ -++ XYT(0,0,t), XYT(0,1,t), XYT(0,2,t), XYT(0,3,t),\ -++ XYT(1,0,t), XYT(1,1,t), XYT(1,2,t), XYT(1,3,t),\ -++ XYT(2,0,t), XYT(2,1,t), XYT(2,2,t), XYT(2,3,t),\ -++ XYT(3,0,t), XYT(3,1,t), XYT(3,2,t), XYT(3,3,t)\ -++} -++ -++static const xy_off_t off_xys[3][4][16] = -++{ -++ {OFF_DIAG(2), OFF_DIAG(3), OFF_DIAG(4), OFF_DIAG(5)}, -++ {OFF_HORIZ(2), OFF_HORIZ(3), OFF_HORIZ(4), OFF_HORIZ(5)}, -++ {OFF_VERT(2), OFF_VERT(3), OFF_VERT(4), OFF_VERT(5)} -++}; -++ -++ -++// Helper fns -++#ifndef hevc_mem_bits32 -++static av_always_inline uint32_t hevc_mem_bits32(const void * buf, const unsigned int offset) -++{ -++ return AV_RB32((const uint8_t *)buf + (offset >> 3)) << (offset & 7); -++} -++#endif -++ -++#if AV_GCC_VERSION_AT_LEAST(3,4) && !defined(hevc_clz32) -++#define hevc_clz32 hevc_clz32_builtin -++static av_always_inline unsigned int hevc_clz32_builtin(const uint32_t x) -++{ -++ // __builtin_clz says it works on ints - so adjust if int is >32 bits long -++ return __builtin_clz(x) - (sizeof(int) * 8 - 32); -++} -++#endif -++ -++// It is unlikely that we will ever need this but include for completeness -++#ifndef hevc_clz32 -++static inline unsigned int hevc_clz32(unsigned int x) -++{ -++ unsigned int n = 1; -++ if ((x & 0xffff0000) == 0) { -++ n += 16; -++ x <<= 16; -++ } -++ if ((x & 0xff000000) == 0) { -++ n += 8; -++ x <<= 8; -++ } -++ if ((x & 0xf0000000) == 0) { -++ n += 4; -++ x <<= 4; -++ } -++ if ((x & 0xc0000000) == 0) { -++ n += 2; -++ x <<= 2; -++ } -++ return n - ((x >> 31) & 1); -++} -++#endif -++ -++ -++#if !USE_BY22 -++// If no by22 then _by22 functions will revert to normal and so _peek/_flush -++// will no longer be called but the setup calls will still exist and we want -++// to null them out -++#define bypass_start(s) -++#define bypass_finish(s) -++#else -++// Use BY22 for residual bypass block -++ -++#define bypass_start(s) get_cabac_by22_start(&s->HEVClc->cc) -++#define bypass_finish(s) get_cabac_by22_finish(&s->HEVClc->cc) -++ -++// BY22 notes that bypass is simply a divide into the bitstream and so we -++// can peek out large quantities of bits at one and treat the result as if -++// it was VLC. In many cases this will lead to O(1) processing rather than -++// O(n) though the setup and teardown is sufficiently expensive that it is -++// only worth using if we expect to be dealing with more than a few bits -++// The definition of "a few bits" will vary from platform to platform but -++// tests on ARM show that it probably isn't worth it for a single coded -++// residual, but is for >1 - this is probaly reinforced that if there are -++// more residuals then they are likely to be bigger and this will make the -++// O(1) nature of the code more worthwhile. -++ -++ -++#if !USE_BY22_DIV -++// * 1/x @ 32 bits gets us 22 bits of accuracy -++#define CABAC_BY22_PEEK_BITS 22 -++#else -++// A real 32-bit divide gets us another bit -++// If we have a 64 bit int & a unit time divider then we should get a lot -++// of bits (55) but that is untested and it is unclear if it would give -++// us a large advantage -++#define CABAC_BY22_PEEK_BITS 23 -++#endif -++ -++// Bypass block start -++// Must be called before _by22_peek is used as it sets the CABAC environment -++// into the correct state. _by22_finish must be called to return to 'normal' -++// (i.e. non-bypass) cabac decoding -++static inline void get_cabac_by22_start(CABACContext * const c) -++{ -++ const unsigned int bits = __builtin_ctz(c->low); -++ const uint32_t m = hevc_mem_bits32(c->bytestream, 0); -++ uint32_t x = (c->low << (22 - CABAC_BITS)) ^ ((m ^ 0x80000000U) >> (9 + CABAC_BITS - bits)); -++#if !USE_BY22_DIV -++ const uint32_t inv = cabac_by22_inv_range[c->range & 0xff]; -++#endif -++ -++ c->bytestream -= (CABAC_BITS / 8); -++ c->by22.bits = bits; -++#if !USE_BY22_DIV -++ c->by22.range = c->range; -++ c->range = inv; -++#endif -++ c->low = x; -++} -++ -++// Bypass block finish -++// Must be called at the end of the bypass block to return to normal operation -++static inline void get_cabac_by22_finish(CABACContext * const c) -++{ -++ unsigned int used = c->by22.bits; -++ unsigned int bytes_used = (used / CABAC_BITS) * (CABAC_BITS / 8); -++ unsigned int bits_used = used & (CABAC_BITS == 16 ? 15 : 7); -++ -++ c->bytestream += bytes_used + (CABAC_BITS / 8); -++ c->low = (((uint32_t)c->low >> (22 - CABAC_BITS + bits_used)) | 1) << bits_used; -++#if !USE_BY22_DIV -++ c->range = c->by22.range; -++#endif -++} -++ -++// Peek bypass bits -++// _by22_start must be called before _by22_peek is called and _by22_flush -++// must be called afterwards to flush any used bits -++// The actual number of valid bits returned is -++// min(, CABAC_BY22_PEEK_BITS). CABAC_BY22_PEEK_BITS -++// will be at least 22 which should be long enough for any prefix or suffix -++// though probably not long enough for the worst case combination -++#ifndef get_cabac_by22_peek -++static inline uint32_t get_cabac_by22_peek(const CABACContext * const c) -++{ -++#if USE_BY22_DIV -++ return ((unsigned int)c->low / (unsigned int)c->range) << 9; -++#else -++ uint32_t x = c->low & ~1U; -++ const uint32_t inv = c->range; -++ -++ if (inv != 0) -++ x = (uint32_t)(((uint64_t)x * (uint64_t)inv) >> 32); -++ -++ return x << 1; -++#endif -++} -++#endif -++ -++// Flush bypass bits peeked by _by22_peek -++// Flush n bypass bits. n must be >= 1 to guarantee correct operation -++// val is an unmodified copy of whatever _by22_peek returned -++#ifndef get_cabac_by22_flush -++static inline void get_cabac_by22_flush(CABACContext * c, const unsigned int n, const uint32_t val) -++{ -++ // Subtract the bits used & reshift up to the top of the word -++#if USE_BY22_DIV -++ const uint32_t low = (((unsigned int)c->low << n) - (((val >> (32 - n)) * (unsigned int)c->range) << 23)); -++#else -++ const uint32_t low = (((uint32_t)c->low << n) - (((val >> (32 - n)) * c->by22.range) << 23)); -++#endif -++ -++ // and refill lower bits -++ // We will probably OR over some existing bits but that doesn't matter -++ c->by22.bits += n; -++ c->low = low | (hevc_mem_bits32(c->bytestream, c->by22.bits) >> 9); -++} -++#endif -++ -++#endif // USE_BY22 -++ -++ -+ void ff_hevc_save_states(HEVCContext *s, int ctb_addr_ts) -+ { -+ if (s->ps.pps->entropy_coding_sync_enabled_flag && -+@@ -863,19 +1126,19 @@ int ff_hevc_cbf_luma_decode(HEVCContext *s, int trafo_depth) -+ return GET_CABAC(elem_offset[CBF_LUMA] + !trafo_depth); -+ } -+ -+-static int hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx) -++static int hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx_nz) -+ { -+- return GET_CABAC(elem_offset[TRANSFORM_SKIP_FLAG] + !!c_idx); -++ return GET_CABAC(elem_offset[TRANSFORM_SKIP_FLAG] + c_idx_nz); -+ } -+ -+-static int explicit_rdpcm_flag_decode(HEVCContext *s, int c_idx) -++static int explicit_rdpcm_flag_decode(HEVCContext *s, int c_idx_nz) -+ { -+- return GET_CABAC(elem_offset[EXPLICIT_RDPCM_FLAG] + !!c_idx); -++ return GET_CABAC(elem_offset[EXPLICIT_RDPCM_FLAG] + c_idx_nz); -+ } -+ -+-static int explicit_rdpcm_dir_flag_decode(HEVCContext *s, int c_idx) -++static int explicit_rdpcm_dir_flag_decode(HEVCContext *s, int c_idx_nz) -+ { -+- return GET_CABAC(elem_offset[EXPLICIT_RDPCM_DIR_FLAG] + !!c_idx); -++ return GET_CABAC(elem_offset[EXPLICIT_RDPCM_DIR_FLAG] + c_idx_nz); -+ } -+ -+ int ff_hevc_log2_res_scale_abs(HEVCContext *s, int idx) { -+@@ -891,14 +1154,14 @@ int ff_hevc_res_scale_sign_flag(HEVCContext *s, int idx) { -+ return GET_CABAC(elem_offset[RES_SCALE_SIGN_FLAG] + idx); -+ } -+ -+-static av_always_inline void last_significant_coeff_xy_prefix_decode(HEVCContext *s, int c_idx, -++static av_always_inline void last_significant_coeff_xy_prefix_decode(HEVCContext *s, int c_idx_nz, -+ int log2_size, int *last_scx_prefix, int *last_scy_prefix) -+ { -+ int i = 0; -+ int max = (log2_size << 1) - 1; -+ int ctx_offset, ctx_shift; -+ -+- if (!c_idx) { -++ if (!c_idx_nz) { -+ ctx_offset = 3 * (log2_size - 2) + ((log2_size - 1) >> 2); -+ ctx_shift = (log2_size + 1) >> 2; -+ } else { -+@@ -929,22 +1192,16 @@ static av_always_inline int last_significant_coeff_suffix_decode(HEVCContext *s, -+ return value; -+ } -+ -+-static av_always_inline int significant_coeff_group_flag_decode(HEVCContext *s, int c_idx, int ctx_cg) -++static av_always_inline int significant_coeff_group_flag_decode(HEVCContext *s, int c_idx_nz, int ctx_cg) -+ { -+ int inc; -+ -+- inc = FFMIN(ctx_cg, 1) + (c_idx>0 ? 2 : 0); -++ inc = (ctx_cg != 0) + (c_idx_nz << 1); -+ -+ return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_GROUP_FLAG] + inc); -+ } -+-static av_always_inline int significant_coeff_flag_decode(HEVCContext *s, int x_c, int y_c, -+- int offset, const uint8_t *ctx_idx_map) -+-{ -+- int inc = ctx_idx_map[(y_c << 2) + x_c] + offset; -+- return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_FLAG] + inc); -+-} -+ -+-static av_always_inline int significant_coeff_flag_decode_0(HEVCContext *s, int c_idx, int offset) -++static av_always_inline int significant_coeff_flag_decode_0(HEVCContext *s, int offset) -+ { -+ return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_FLAG] + offset); -+ } -+@@ -966,65 +1223,305 @@ static av_always_inline int coeff_abs_level_greater2_flag_decode(HEVCContext *s, -+ return GET_CABAC(elem_offset[COEFF_ABS_LEVEL_GREATER2_FLAG] + inc); -+ } -+ -+-static av_always_inline int coeff_abs_level_remaining_decode(HEVCContext *s, int rc_rice_param) -++ -++#if !USE_BY22 -++#define coeff_abs_level_remaining_decode_bypass(s,r) coeff_abs_level_remaining_decode(s, r) -++#endif -++ -++ -++#ifndef coeff_abs_level_remaining_decode_bypass -++static int coeff_abs_level_remaining_decode_bypass(HEVCContext * const s, const unsigned int rice_param) -++{ -++ CABACContext * const c = &s->HEVClc->cc; -++ uint32_t y; -++ unsigned int prefix; -++ unsigned int last_coeff_abs_level_remaining; -++ unsigned int n; -++ -++ y = get_cabac_by22_peek(c); -++ prefix = hevc_clz32(~y); -++ // y << prefix will always have top bit 0 -++ -++ if (prefix < 3) { -++ const unsigned int suffix = (y << prefix) >> (31 - rice_param); -++ last_coeff_abs_level_remaining = (prefix << rice_param) + suffix; -++ n = prefix + 1 + rice_param; -++ } -++ else if (prefix * 2 + rice_param <= CABAC_BY22_PEEK_BITS + 2) -++ { -++ const uint32_t suffix = ((y << prefix) | 0x80000000) >> (34 - (prefix + rice_param)); -++ -++ last_coeff_abs_level_remaining = (2 << rice_param) + suffix; -++ n = prefix * 2 + rice_param - 2; -++ } -++ else { -++ unsigned int suffix; -++ -++ get_cabac_by22_flush(c, prefix, y); -++ y = get_cabac_by22_peek(c); -++ -++ suffix = (y | 0x80000000) >> (34 - (prefix + rice_param)); -++ last_coeff_abs_level_remaining = (2 << rice_param) + suffix; -++ n = prefix + rice_param - 2; -++ } -++ -++ get_cabac_by22_flush(c, n, y); -++ -++ return last_coeff_abs_level_remaining; -++} -++#endif -++ -++static int coeff_abs_level_remaining_decode(HEVCContext * const s, int rc_rice_param) -+ { -++ CABACContext * const c = &s->HEVClc->cc; -+ int prefix = 0; -+ int suffix = 0; -+ int last_coeff_abs_level_remaining; -+ int i; -+ -+- while (prefix < CABAC_MAX_BIN && get_cabac_bypass(&s->HEVClc->cc)) -++ while (prefix < CABAC_MAX_BIN && get_cabac_bypass(c)) -+ prefix++; -+ if (prefix == CABAC_MAX_BIN) { -+ av_log(s->avctx, AV_LOG_ERROR, "CABAC_MAX_BIN : %d\n", prefix); -+ return 0; -+ } -++ -+ if (prefix < 3) { -+ for (i = 0; i < rc_rice_param; i++) -+- suffix = (suffix << 1) | get_cabac_bypass(&s->HEVClc->cc); -++ suffix = (suffix << 1) | get_cabac_bypass(c); -+ last_coeff_abs_level_remaining = (prefix << rc_rice_param) + suffix; -+ } else { -+ int prefix_minus3 = prefix - 3; -+ for (i = 0; i < prefix_minus3 + rc_rice_param; i++) -+- suffix = (suffix << 1) | get_cabac_bypass(&s->HEVClc->cc); -++ suffix = (suffix << 1) | get_cabac_bypass(c); -+ last_coeff_abs_level_remaining = (((1 << prefix_minus3) + 3 - 1) -+ << rc_rice_param) + suffix; -+ } -++ -+ return last_coeff_abs_level_remaining; -+ } -+ -+-static av_always_inline int coeff_sign_flag_decode(HEVCContext *s, uint8_t nb) -++#if !USE_BY22 -++#define coeff_sign_flag_decode_bypass coeff_sign_flag_decode -++static inline uint32_t coeff_sign_flag_decode(HEVCContext * const s, const unsigned int nb) -+ { -+- int i; -+- int ret = 0; -++ CABACContext * const c = &s->HEVClc->cc; -++ unsigned int i; -++ uint32_t ret = 0; -+ -+ for (i = 0; i < nb; i++) -+- ret = (ret << 1) | get_cabac_bypass(&s->HEVClc->cc); -+- return ret; -++ ret = (ret << 1) | get_cabac_bypass(c); -++ -++ return ret << (32 - nb); -+ } -++#endif -++ -++#ifndef coeff_sign_flag_decode_bypass -++static inline uint32_t coeff_sign_flag_decode_bypass(HEVCContext * const s, const unsigned int nb) -++{ -++ CABACContext * const c = &s->HEVClc->cc; -++ uint32_t y; -++ y = get_cabac_by22_peek(c); -++ get_cabac_by22_flush(c, nb, y); -++ return y & ~(0xffffffffU >> nb); -++} -++#endif -++ -++ -++#ifndef get_cabac_greater1_bits -++static inline unsigned int get_cabac_greater1_bits(CABACContext * const c, const unsigned int n, -++ uint8_t * const state0) -++{ -++ unsigned int i; -++ unsigned int rv = 0; -++ for (i = 0; i != n; ++i) { -++ const unsigned int idx = rv != 0 ? 0 : i < 3 ? i + 1 : 3; -++ const unsigned int b = get_cabac(c, state0 + idx); -++ rv = (rv << 1) | b; -++ } -++ return rv; -++} -++#endif -++ -++ -++// N.B. levels returned are the values assuming coeff_abs_level_remaining -++// is uncoded, so 1 must be added if it is coded. sum_abs also reflects -++// this version of events. -++static inline uint32_t get_greaterx_bits(HEVCContext * const s, const unsigned int n_end, int * const levels, -++ int * const pprev_subset_coded, int * const psum, -++ const unsigned int idx0_gt1, const unsigned int idx_gt2) -++{ -++ CABACContext * const c = &s->HEVClc->cc; -++ uint8_t * const state0 = s->HEVClc->cabac_state + idx0_gt1; -++ uint8_t * const state_gt2 = s->HEVClc->cabac_state + idx_gt2; -++ unsigned int rv; -++ unsigned int i; -++ const unsigned int n = FFMIN(n_end, 8); -++ -++ // Really this is i != n but the simple unconditional loop is cheaper -++ // and faster -++ for (i = 0; i != 8; ++i) -++ levels[i] = 1; -++ -++ rv = get_cabac_greater1_bits(c, n, state0); -++ -++ *pprev_subset_coded = 0; -++ *psum = n; -++ -++ rv <<= (32 - n); -++ if (rv != 0) -++ { -++ *pprev_subset_coded = 1; -++ *psum = n + 1; -++ i = hevc_clz32(rv); -++ levels[i] = 2; -++ if (get_cabac(c, state_gt2) == 0) -++ { -++ // Unset first coded bit -++ rv &= ~(0x80000000U >> i); -++ } -++ } -++ -++ if (n_end > 8) { -++ const unsigned int g8 = n_end - 8; -++ rv |= ((1 << g8) - 1) << (24 - g8); -++ for (i = 0; i != g8; ++i) { -++ levels[i + 8] = 0; -++ } -++ } -++ -++ return rv; -++} -++ -++// extended_precision_processing_flag must be false given we are -++// putting the result into a 16-bit array -++// So trans_coeff_level must fit in 16 bits too (7.4.9.1 definition of coeff_abs_level_remaining) -++// scale_m is uint8_t -++// -++// scale is [40 - 72] << [0..12] based on qp- worst case is (45 << 12) -++// or it can be 2 (if we have transquant_bypass) -++// shift is set to one less than we really want but would normally be -++// s->ps.sps->bit_depth (max 16, min 8) + log2_trafo_size (max 5, min 2?) - 5 = max 16 min 5? -++// however the scale shift is substracted from shift to a min 0 so scale_m worst = 45 << 6 -++// This can still theoretically lead to overflow but the coding would have to be very odd (& inefficient) -++// to achieve it -++ -++#ifndef trans_scale_sat -++static inline int trans_scale_sat(const int level, const unsigned int scale, const unsigned int scale_m, const unsigned int shift) -++{ -++ return av_clip_int16((((level * (int)(scale * scale_m)) >> shift) + 1) >> 1); -++} -++#endif -++ -++ -++#ifndef update_rice -++static inline void update_rice(uint8_t * const stat_coeff, -++ const unsigned int last_coeff_abs_level_remaining, -++ const unsigned int c_rice_param) -++{ -++ const unsigned int x = (last_coeff_abs_level_remaining << 1) >> c_rice_param; -++ if (x >= 6) -++ (*stat_coeff)++; -++ else if (x == 0 && *stat_coeff > 0) -++ (*stat_coeff)--; -++} -++#endif -++ -++ -++// n must be > 0 on entry -++#ifndef get_cabac_sig_coeff_flag_idxs -++static inline uint8_t * get_cabac_sig_coeff_flag_idxs(CABACContext * const c, uint8_t * const state0, -++ unsigned int n, -++ const uint8_t const * ctx_map, -++ uint8_t * p) -++{ -++ do { -++ if (get_cabac(c, state0 + ctx_map[n])) -++ *p++ = n; -++ } while (--n != 0); -++ return p; -++} -++#endif -++ -++ -++static int get_sig_coeff_flag_idxs(CABACContext * const c, uint8_t * const state0, -++ unsigned int n, -++ const uint8_t const * ctx_map, -++ uint8_t * const flag_idx) -++{ -++ int rv; -++ -++ rv = get_cabac_sig_coeff_flag_idxs(c, state0, n, ctx_map, flag_idx) - flag_idx; -++ -++ return rv; -++} -++ -++#define H4x4(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15) {\ -++ x0, x1, x2, x3,\ -++ x4, x5, x6, x7,\ -++ x8, x9, x10, x11,\ -++ x12, x13, x14, x15} -++ -++#define V4x4(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15) {\ -++ x0, x4, x8, x12,\ -++ x1, x5, x9, x13,\ -++ x2, x6, x10, x14,\ -++ x3, x7, x11, x15} -++ -++#define D4x4(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15) {\ -++ x0, x4, x1, x8,\ -++ x5, x2, x12, x9,\ -++ x6, x3, x13, x10,\ -++ x7, x14, x11, x15} -++ -++ -++static inline int next_subset(HEVCContext * const s, int i, const int c_idx_nz, -++ uint8_t * const significant_coeff_group_flag, -++ const uint8_t * const scan_x_cg, const uint8_t * const scan_y_cg, -++ int * const pPrev_sig) -++{ -++ while (--i >= 0) { -++ unsigned int x_cg = scan_x_cg[i]; -++ unsigned int y_cg = scan_y_cg[i]; -++ -++ // For the flag decode we only care about Z/NZ but -++ // we use the full Right + Down * 2 when calculating -++ // significant coeff flags so we obtain it here -++ //. -++ // The group flag array is one longer than it needs to -++ // be so we don't need to check for y_cg limits -++ unsigned int prev_sig = ((significant_coeff_group_flag[y_cg] >> (x_cg + 1)) & 1) | -++ (((significant_coeff_group_flag[y_cg + 1] >> x_cg) & 1) << 1); -++ -++ if (i == 0 || -++ significant_coeff_group_flag_decode(s, c_idx_nz, prev_sig)) -++ { -++ significant_coeff_group_flag[y_cg] |= (1 << x_cg); -++ *pPrev_sig = prev_sig; -++ break; -++ } -++ } -++ -++ return i; -++} -++ -+ -+ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int log2_trafo_size, enum ScanType scan_idx, -+ int c_idx) -+ { -+-#define GET_COORD(offset, n) \ -+- do { \ -+- x_c = (x_cg << 2) + scan_x_off[n]; \ -+- y_c = (y_cg << 2) + scan_y_off[n]; \ -+- } while (0) -+- HEVCLocalContext *lc = s->HEVClc; -+- int transform_skip_flag = 0; -++ HEVCLocalContext * const lc = s->HEVClc; -++ int trans_skip_or_bypass = lc->cu.cu_transquant_bypass_flag; -+ -+ int last_significant_coeff_x, last_significant_coeff_y; -+- int last_scan_pos; -+- int n_end; -+ int num_coeff = 0; -+- int greater1_ctx = 1; -++ int prev_subset_coded = 0; -+ -+ int num_last_subset; -+ int x_cg_last_sig, y_cg_last_sig; -+ -+- const uint8_t *scan_x_cg, *scan_y_cg, *scan_x_off, *scan_y_off; -++ const uint8_t *scan_x_cg, *scan_y_cg; -++ const xy_off_t * scan_xy_off; -+ -+ ptrdiff_t stride = s->frame->linesize[c_idx]; -+ int hshift = s->ps.sps->hshift[c_idx]; -+@@ -1032,21 +1529,28 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ uint8_t *dst = &s->frame->data[c_idx][(y0 >> vshift) * stride + -+ ((x0 >> hshift) << s->ps.sps->pixel_shift)]; -+ #ifdef RPI -+- int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag && !transform_skip_flag && !lc->tu.cross_pf && log2_trafo_size>=4; -++ //***** transform_skip_flag decoded later! -++ int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag /* && !transform_skip_flag*/ && !lc->tu.cross_pf && log2_trafo_size>=4; -+ #endif -+ int16_t *coeffs = (int16_t*)(c_idx ? lc->edge_emu_buffer2 : lc->edge_emu_buffer); -+- uint8_t significant_coeff_group_flag[8][8] = {{0}}; -++ uint8_t significant_coeff_group_flag[9] = {0}; // Allow 1 final byte that is always zero -+ int explicit_rdpcm_flag = 0; -+ int explicit_rdpcm_dir_flag; -+ -+ int trafo_size = 1 << log2_trafo_size; -+ int i; -+- int qp,shift,add,scale,scale_m; -++ int qp,shift,scale; -+ static const uint8_t level_scale[] = { 40, 45, 51, 57, 64, 72 }; -+ const uint8_t *scale_matrix = NULL; -+ uint8_t dc_scale; -+ int pred_mode_intra = (c_idx == 0) ? lc->tu.intra_pred_mode : -+ lc->tu.intra_pred_mode_c; -++ -++ int prev_sig = 0; -++ const int c_idx_nz = (c_idx != 0); -++ -++ int may_hide_sign; -++ -+ #ifdef RPI -+ if (s->enable_rpi) { -+ int n = trafo_size * trafo_size; -+@@ -1078,7 +1582,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ -+ // Derive QP for dequant -+ if (!lc->cu.cu_transquant_bypass_flag) { -+- static const int qp_c[] = { 29, 30, 31, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37 }; -++ static const uint8_t qp_c[] = { 29, 30, 31, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37 }; -+ static const uint8_t rem6[51 + 4 * 6 + 1] = { -+ 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, -+ 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, -+@@ -1094,9 +1598,19 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ }; -+ int qp_y = lc->qp_y; -+ -++ may_hide_sign = s->ps.pps->sign_data_hiding_flag; -++ -+ if (s->ps.pps->transform_skip_enabled_flag && -+ log2_trafo_size <= s->ps.pps->log2_max_transform_skip_block_size) { -+- transform_skip_flag = hevc_transform_skip_flag_decode(s, c_idx); -++ int transform_skip_flag = hevc_transform_skip_flag_decode(s, c_idx_nz); -++ if (transform_skip_flag) { -++ trans_skip_or_bypass = 1; -++ if (lc->cu.pred_mode == MODE_INTRA && -++ s->ps.sps->implicit_rdpcm_enabled_flag && -++ (pred_mode_intra == 10 || pred_mode_intra == 26)) { -++ may_hide_sign = 0; -++ } -++ } -+ } -+ -+ if (c_idx == 0) { -+@@ -1129,39 +1643,73 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ qp += s->ps.sps->qp_bd_offset; -+ } -+ -+- shift = s->ps.sps->bit_depth + log2_trafo_size - 5; -+- add = 1 << (shift-1); -+- scale = level_scale[rem6[qp]] << (div6[qp]); -+- scale_m = 16; // default when no custom scaling lists. -+- dc_scale = 16; -++ // Shift is set to one less than will actually occur as the scale -++ // and saturate step adds 1 and then shifts right again -++ shift = s->ps.sps->bit_depth + log2_trafo_size - 6; -++ scale = level_scale[rem6[qp]]; -++ if (div6[qp] >= shift) { -++ scale <<= (div6[qp] - shift); -++ shift = 0; -++ } else { -++ shift -= div6[qp]; -++ } -+ -+- if (s->ps.sps->scaling_list_enable_flag && !(transform_skip_flag && log2_trafo_size > 2)) { -++ if (s->ps.sps->scaling_list_enable_flag && !(trans_skip_or_bypass && log2_trafo_size > 2)) { -+ const ScalingList *sl = s->ps.pps->scaling_list_data_present_flag ? -+- &s->ps.pps->scaling_list : &s->ps.sps->scaling_list; -++ &s->ps.pps->scaling_list : &s->ps.sps->scaling_list; -+ int matrix_id = lc->cu.pred_mode != MODE_INTRA; -+ -+ matrix_id = 3 * matrix_id + c_idx; -+ -+ scale_matrix = sl->sl[log2_trafo_size - 2][matrix_id]; -++ dc_scale = scale_matrix[0]; -+ if (log2_trafo_size >= 4) -+ dc_scale = sl->sl_dc[log2_trafo_size - 4][matrix_id]; -+ } -++ else -++ { -++ static const uint8_t sixteen_scale[64] = { -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16 -++ }; -++ scale_matrix = sixteen_scale; -++ dc_scale = 16; -++ } -+ } else { -++ static const uint8_t unit_scale[64] = { -++ 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, -++ }; -++ scale_matrix = unit_scale; -+ shift = 0; -+- add = 0; -+- scale = 0; -+- dc_scale = 0; -++ scale = 2; // We will shift right to kill this -++ dc_scale = 1; -++ -++ may_hide_sign = 0; -+ } -+ -+ if (lc->cu.pred_mode == MODE_INTER && s->ps.sps->explicit_rdpcm_enabled_flag && -+- (transform_skip_flag || lc->cu.cu_transquant_bypass_flag)) { -+- explicit_rdpcm_flag = explicit_rdpcm_flag_decode(s, c_idx); -++ trans_skip_or_bypass) { -++ explicit_rdpcm_flag = explicit_rdpcm_flag_decode(s, c_idx_nz); -+ if (explicit_rdpcm_flag) { -+- explicit_rdpcm_dir_flag = explicit_rdpcm_dir_flag_decode(s, c_idx); -++ may_hide_sign = 0; -++ explicit_rdpcm_dir_flag = explicit_rdpcm_dir_flag_decode(s, c_idx_nz); -+ } -+ } -+ -+- last_significant_coeff_xy_prefix_decode(s, c_idx, log2_trafo_size, -++ last_significant_coeff_xy_prefix_decode(s, c_idx_nz, log2_trafo_size, -+ &last_significant_coeff_x, &last_significant_coeff_y); -+ -+ if (last_significant_coeff_x > 3) { -+@@ -1189,119 +1737,113 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int last_x_c = last_significant_coeff_x & 3; -+ int last_y_c = last_significant_coeff_y & 3; -+ -+- scan_x_off = ff_hevc_diag_scan4x4_x; -+- scan_y_off = ff_hevc_diag_scan4x4_y; -+ num_coeff = diag_scan4x4_inv[last_y_c][last_x_c]; -+- if (trafo_size == 4) { -++ -++ switch (log2_trafo_size) { -++ case 2: -+ scan_x_cg = scan_1x1; -+ scan_y_cg = scan_1x1; -+- } else if (trafo_size == 8) { -++ break; -++ case 3: -+ num_coeff += diag_scan2x2_inv[y_cg_last_sig][x_cg_last_sig] << 4; -+ scan_x_cg = diag_scan2x2_x; -+ scan_y_cg = diag_scan2x2_y; -+- } else if (trafo_size == 16) { -++ break; -++ case 4: -+ num_coeff += diag_scan4x4_inv[y_cg_last_sig][x_cg_last_sig] << 4; -+ scan_x_cg = ff_hevc_diag_scan4x4_x; -+ scan_y_cg = ff_hevc_diag_scan4x4_y; -+- } else { // trafo_size == 32 -++ break; -++ case 5: -++ default: -+ num_coeff += diag_scan8x8_inv[y_cg_last_sig][x_cg_last_sig] << 4; -+ scan_x_cg = ff_hevc_diag_scan8x8_x; -+ scan_y_cg = ff_hevc_diag_scan8x8_y; -++ break; -+ } -+ break; -+ } -+ case SCAN_HORIZ: -+ scan_x_cg = horiz_scan2x2_x; -+ scan_y_cg = horiz_scan2x2_y; -+- scan_x_off = horiz_scan4x4_x; -+- scan_y_off = horiz_scan4x4_y; -+ num_coeff = horiz_scan8x8_inv[last_significant_coeff_y][last_significant_coeff_x]; -+ break; -+ default: //SCAN_VERT -+ scan_x_cg = horiz_scan2x2_y; -+ scan_y_cg = horiz_scan2x2_x; -+- scan_x_off = horiz_scan4x4_y; -+- scan_y_off = horiz_scan4x4_x; -+ num_coeff = horiz_scan8x8_inv[last_significant_coeff_x][last_significant_coeff_y]; -+ break; -+ } -+ num_coeff++; -+ num_last_subset = (num_coeff - 1) >> 4; -+ -+- for (i = num_last_subset; i >= 0; i--) { -+- int n, m; -+- int x_cg, y_cg, x_c, y_c, pos; -+- int implicit_non_zero_coeff = 0; -+- int64_t trans_coeff_level; -+- int prev_sig = 0; -+- int offset = i << 4; -+- int rice_init = 0; -+- -+- uint8_t significant_coeff_flag_idx[16]; -+- uint8_t nb_significant_coeff_flag = 0; -++ significant_coeff_group_flag[y_cg_last_sig] = 1 << x_cg_last_sig; // 1st subset always significant -+ -+- x_cg = scan_x_cg[i]; -+- y_cg = scan_y_cg[i]; -++ scan_xy_off = off_xys[scan_idx][log2_trafo_size - 2]; -+ -+- if ((i < num_last_subset) && (i > 0)) { -+- int ctx_cg = 0; -+- if (x_cg < (1 << (log2_trafo_size - 2)) - 1) -+- ctx_cg += significant_coeff_group_flag[x_cg + 1][y_cg]; -+- if (y_cg < (1 << (log2_trafo_size - 2)) - 1) -+- ctx_cg += significant_coeff_group_flag[x_cg][y_cg + 1]; -+- -+- significant_coeff_group_flag[x_cg][y_cg] = -+- significant_coeff_group_flag_decode(s, c_idx, ctx_cg); -+- implicit_non_zero_coeff = 1; -+- } else { -+- significant_coeff_group_flag[x_cg][y_cg] = -+- ((x_cg == x_cg_last_sig && y_cg == y_cg_last_sig) || -+- (x_cg == 0 && y_cg == 0)); -+- } -++ i = num_last_subset; -++ do { -++ int implicit_non_zero_coeff = 0; -++ int n_end; -+ -+- last_scan_pos = num_coeff - offset - 1; -++ uint8_t significant_coeff_flag_idx[16]; -++ unsigned int nb_significant_coeff_flag = 0; -+ -+ if (i == num_last_subset) { -++ // First time through -++ int last_scan_pos = num_coeff - (i << 4) - 1; -+ n_end = last_scan_pos - 1; -+ significant_coeff_flag_idx[0] = last_scan_pos; -+ nb_significant_coeff_flag = 1; -+ } else { -+ n_end = 15; -++ implicit_non_zero_coeff = (i != 0); -+ } -+ -+- if (x_cg < ((1 << log2_trafo_size) - 1) >> 2) -+- prev_sig = !!significant_coeff_group_flag[x_cg + 1][y_cg]; -+- if (y_cg < ((1 << log2_trafo_size) - 1) >> 2) -+- prev_sig += (!!significant_coeff_group_flag[x_cg][y_cg + 1] << 1); -+- -+- if (significant_coeff_group_flag[x_cg][y_cg] && n_end >= 0) { -+- static const uint8_t ctx_idx_map[] = { -+- 0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8, // log2_trafo_size == 2 -+- 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, // prev_sig == 0 -+- 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, // prev_sig == 1 -+- 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, // prev_sig == 2 -+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 // default -++ if (n_end >= 0) { -++ static const uint8_t ctx_idx_maps_ts2[3][16] = { -++ D4x4(0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8), // log2_trafo_size == 2 -++ H4x4(0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8), // log2_trafo_size == 2 -++ V4x4(0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8) // log2_trafo_size == 2 -++ }; -++ static const uint8_t ctx_idx_maps[3][4][16] = { -++ { -++ D4x4(1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 0 -++ D4x4(2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 1 -++ D4x4(2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0), // prev_sig == 2 -++ D4x4(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) // prev_sig == 3, default -++ }, -++ { -++ H4x4(1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 0 -++ H4x4(2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 1 -++ H4x4(2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0), // prev_sig == 2 -++ H4x4(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) // prev_sig == 3, default -++ }, -++ { -++ V4x4(1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 0 -++ V4x4(2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 1 -++ V4x4(2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0), // prev_sig == 2 -++ V4x4(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) // prev_sig == 3, default -++ } -+ }; -+ const uint8_t *ctx_idx_map_p; -+ int scf_offset = 0; -+- if (s->ps.sps->transform_skip_context_enabled_flag && -+- (transform_skip_flag || lc->cu.cu_transquant_bypass_flag)) { -+- ctx_idx_map_p = (uint8_t*) &ctx_idx_map[4 * 16]; -+- if (c_idx == 0) { -+- scf_offset = 40; -+- } else { -+- scf_offset = 14 + 27; -+- } -++ -++ if (s->ps.sps->transform_skip_context_enabled_flag && trans_skip_or_bypass) { -++ ctx_idx_map_p = ctx_idx_maps[0][3]; -++ scf_offset = 40 + c_idx_nz; -+ } else { -+- if (c_idx != 0) -++ if (c_idx_nz != 0) -+ scf_offset = 27; -++ -+ if (log2_trafo_size == 2) { -+- ctx_idx_map_p = (uint8_t*) &ctx_idx_map[0]; -++ ctx_idx_map_p = ctx_idx_maps_ts2[scan_idx]; -+ } else { -+- ctx_idx_map_p = (uint8_t*) &ctx_idx_map[(prev_sig + 1) << 4]; -+- if (c_idx == 0) { -+- if ((x_cg > 0 || y_cg > 0)) -++ ctx_idx_map_p = ctx_idx_maps[scan_idx][prev_sig]; -++ if (!c_idx_nz) { -++ if (i != 0) -+ scf_offset += 3; -++ -+ if (log2_trafo_size == 3) { -+ scf_offset += (scan_idx == SCAN_DIAG) ? 9 : 15; -+ } else { -+@@ -1315,34 +1857,30 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ } -+ } -+- for (n = n_end; n > 0; n--) { -+- x_c = scan_x_off[n]; -+- y_c = scan_y_off[n]; -+- if (significant_coeff_flag_decode(s, x_c, y_c, scf_offset, ctx_idx_map_p)) { -+- significant_coeff_flag_idx[nb_significant_coeff_flag] = n; -+- nb_significant_coeff_flag++; -++ -++ if (n_end > 0) { -++ int cnt = get_sig_coeff_flag_idxs(&s->HEVClc->cc, -++ s->HEVClc->cabac_state + elem_offset[SIGNIFICANT_COEFF_FLAG] + scf_offset, -++ n_end, ctx_idx_map_p, -++ significant_coeff_flag_idx + nb_significant_coeff_flag); -++ -++ nb_significant_coeff_flag += cnt; -++ if (cnt != 0) { -+ implicit_non_zero_coeff = 0; -+ } -+ } -++ -+ if (implicit_non_zero_coeff == 0) { -+- if (s->ps.sps->transform_skip_context_enabled_flag && -+- (transform_skip_flag || lc->cu.cu_transquant_bypass_flag)) { -+- if (c_idx == 0) { -+- scf_offset = 42; -+- } else { -+- scf_offset = 16 + 27; -+- } -++ if (s->ps.sps->transform_skip_context_enabled_flag && trans_skip_or_bypass) { -++ scf_offset = 42 + c_idx_nz; -+ } else { -+ if (i == 0) { -+- if (c_idx == 0) -+- scf_offset = 0; -+- else -+- scf_offset = 27; -++ scf_offset = c_idx_nz ? 27 : 0; -+ } else { -+ scf_offset = 2 + scf_offset; -+ } -+ } -+- if (significant_coeff_flag_decode_0(s, c_idx, scf_offset) == 1) { -++ if (significant_coeff_flag_decode_0(s, scf_offset) == 1) { -+ significant_coeff_flag_idx[nb_significant_coeff_flag] = 0; -+ nb_significant_coeff_flag++; -+ } -+@@ -1352,141 +1890,185 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ } -+ -+- n_end = nb_significant_coeff_flag; -+- -++ if (nb_significant_coeff_flag != 0) { -++ const unsigned int gt1_idx_delta = (c_idx_nz << 2) | -++ ((i != 0 && !c_idx_nz) ? 2 : 0) | -++ prev_subset_coded; -++ const unsigned int idx0_gt1 = elem_offset[COEFF_ABS_LEVEL_GREATER1_FLAG] + -++ (gt1_idx_delta << 2); -++ const unsigned int idx_gt2 = elem_offset[COEFF_ABS_LEVEL_GREATER2_FLAG] + -++ gt1_idx_delta; -++ -++ const unsigned int x_cg = scan_x_cg[i]; -++ const unsigned int y_cg = scan_y_cg[i]; -++ int16_t * const blk_coeffs = coeffs + -++ ((x_cg + (y_cg << log2_trafo_size)) << 2); -++ // This calculation is 'wrong' for log2_traffo_size == 2 -++ // but that doesn't mattor as in this case x_cg & y_cg -++ // are always 0 so result is correct (0) anyway -++ const uint8_t * const blk_scale = scale_matrix + -++ (((x_cg + (y_cg << 3)) << (5 - log2_trafo_size))); -++ -++ // * THe following code block doesn't deal with these flags: -++ // (nor did the one it replaces) -++ // -++ // cabac_bypass_alignment_enabled_flag -++ // This should be easy but I can't find a test case -++ // extended_precision_processing_flag -++ // This can extend the required precision past 16bits -++ // so is probably tricky - also no example found yet -++ -++#if USE_N_END_1 -++ if (nb_significant_coeff_flag == 1) { -++ // There is a small gain to be had from special casing the single -++ // transform coefficient case. The reduction in complexity -++ // makes up for the code duplicatioon. -++ -++ int trans_coeff_level = 1; -++ int coeff_sign_flag; -++ int coded_val = 0; -++ -++ // initialize first elem of coeff_bas_level_greater1_flag -++ prev_subset_coded = 0; -++ -++ if (get_cabac(&s->HEVClc->cc, s->HEVClc->cabac_state + idx0_gt1 + 1)) { -++ trans_coeff_level = 2; -++ prev_subset_coded = 1; -++ coded_val = get_cabac(&s->HEVClc->cc, s->HEVClc->cabac_state + idx_gt2); -++ } -+ -+- if (n_end) { -+- int first_nz_pos_in_cg; -+- int last_nz_pos_in_cg; -+- int c_rice_param = 0; -+- int first_greater1_coeff_idx = -1; -+- uint8_t coeff_abs_level_greater1_flag[8]; -+- uint16_t coeff_sign_flag; -+- int sum_abs = 0; -+- int sign_hidden; -+- int sb_type; -++ // Probably not worth the overhead of starting by22 for just one value -++ coeff_sign_flag = get_cabac_bypass(&s->HEVClc->cc); -+ -++ if (coded_val) -++ { -++ if (!s->ps.sps->persistent_rice_adaptation_enabled_flag) { -++ trans_coeff_level = 3 + coeff_abs_level_remaining_decode(s, 0); -++ } else { -++ uint8_t * const stat_coeff = -++ lc->stat_coeff + trans_skip_or_bypass + 2 - ((c_idx_nz) << 1); -++ const unsigned int c_rice_param = *stat_coeff >> 2; -++ const int last_coeff_abs_level_remaining = coeff_abs_level_remaining_decode(s, c_rice_param); -+ -+- // initialize first elem of coeff_bas_level_greater1_flag -+- int ctx_set = (i > 0 && c_idx == 0) ? 2 : 0; -++ trans_coeff_level = 3 + last_coeff_abs_level_remaining; -++ update_rice(stat_coeff, last_coeff_abs_level_remaining, c_rice_param); -++ } -++ } -+ -+- if (s->ps.sps->persistent_rice_adaptation_enabled_flag) { -+- if (!transform_skip_flag && !lc->cu.cu_transquant_bypass_flag) -+- sb_type = 2 * (c_idx == 0 ? 1 : 0); -+- else -+- sb_type = 2 * (c_idx == 0 ? 1 : 0) + 1; -+- c_rice_param = lc->stat_coeff[sb_type] / 4; -+- } -++ { -++ const xy_off_t * const xy_off = scan_xy_off + significant_coeff_flag_idx[0]; -++ const int k = (int32_t)(coeff_sign_flag << 31) >> 31; -++ const unsigned int scale_m = blk_scale[xy_off->scale]; -+ -+- if (!(i == num_last_subset) && greater1_ctx == 0) -+- ctx_set++; -+- greater1_ctx = 1; -+- last_nz_pos_in_cg = significant_coeff_flag_idx[0]; -+- -+- for (m = 0; m < (n_end > 8 ? 8 : n_end); m++) { -+- int inc = (ctx_set << 2) + greater1_ctx; -+- coeff_abs_level_greater1_flag[m] = -+- coeff_abs_level_greater1_flag_decode(s, c_idx, inc); -+- if (coeff_abs_level_greater1_flag[m]) { -+- greater1_ctx = 0; -+- if (first_greater1_coeff_idx == -1) -+- first_greater1_coeff_idx = m; -+- } else if (greater1_ctx > 0 && greater1_ctx < 3) { -+- greater1_ctx++; -++ blk_coeffs[xy_off->coeff] = trans_scale_sat( -++ (trans_coeff_level ^ k) - k, // Apply sign -++ scale, -++ i == 0 && xy_off->coeff == 0 ? dc_scale : scale_m, -++ shift); -+ } -+ } -+- first_nz_pos_in_cg = significant_coeff_flag_idx[n_end - 1]; -+- -+- if (lc->cu.cu_transquant_bypass_flag || -+- (lc->cu.pred_mode == MODE_INTRA && -+- s->ps.sps->implicit_rdpcm_enabled_flag && transform_skip_flag && -+- (pred_mode_intra == 10 || pred_mode_intra == 26 )) || -+- explicit_rdpcm_flag) -+- sign_hidden = 0; -+ else -+- sign_hidden = (last_nz_pos_in_cg - first_nz_pos_in_cg >= 4); -++#endif -++ { -++ int sign_hidden = may_hide_sign; -++ int levels[16]; // Should be able to get away with int16_t but that fails some tests -++ uint32_t coeff_sign_flags; -++ uint32_t coded_vals = 0; -++ // Sum(abs(level[])) -++ // In fact we only need the bottom bit and in some future -++ // version that may be all we calculate -++ unsigned int sum_abs; -++ -++ coded_vals = get_greaterx_bits(s, nb_significant_coeff_flag, levels, -++ &prev_subset_coded, &sum_abs, idx0_gt1, idx_gt2); -++ -++ if (significant_coeff_flag_idx[0] - significant_coeff_flag_idx[nb_significant_coeff_flag - 1] <= 3) -++ sign_hidden = 0; -++ -++ // -- Start bypass block -++ -++ bypass_start(s); -++ -++ coeff_sign_flags = coeff_sign_flag_decode_bypass(s, nb_significant_coeff_flag - sign_hidden); -++ -++ if (coded_vals != 0) -++ { -++ const int rice_adaptation_enabled = s->ps.sps->persistent_rice_adaptation_enabled_flag; -++ uint8_t * stat_coeff = !rice_adaptation_enabled ? NULL : -++ lc->stat_coeff + trans_skip_or_bypass + 2 - ((c_idx_nz) << 1); -++ int c_rice_param = !rice_adaptation_enabled ? 0 : *stat_coeff >> 2; -++ int * level = levels - 1; -++ -++ do { -++ { -++ const unsigned int z = hevc_clz32(coded_vals) + 1; -++ level += z; -++ coded_vals <<= z; -++ } -+ -+- if (first_greater1_coeff_idx != -1) { -+- coeff_abs_level_greater1_flag[first_greater1_coeff_idx] += coeff_abs_level_greater2_flag_decode(s, c_idx, ctx_set); -+- } -+- if (!s->ps.pps->sign_data_hiding_flag || !sign_hidden ) { -+- coeff_sign_flag = coeff_sign_flag_decode(s, nb_significant_coeff_flag) << (16 - nb_significant_coeff_flag); -+- } else { -+- coeff_sign_flag = coeff_sign_flag_decode(s, nb_significant_coeff_flag - 1) << (16 - (nb_significant_coeff_flag - 1)); -+- } -++ { -++ const int last_coeff_abs_level_remaining = coeff_abs_level_remaining_decode_bypass(s, c_rice_param); -++ const int trans_coeff_level = *level + last_coeff_abs_level_remaining + 1; -++ -++ sum_abs += last_coeff_abs_level_remaining + 1; -++ *level = trans_coeff_level; -+ -+- for (m = 0; m < n_end; m++) { -+- n = significant_coeff_flag_idx[m]; -+- GET_COORD(offset, n); -+- if (m < 8) { -+- trans_coeff_level = 1 + coeff_abs_level_greater1_flag[m]; -+- if (trans_coeff_level == ((m == first_greater1_coeff_idx) ? 3 : 2)) { -+- int last_coeff_abs_level_remaining = coeff_abs_level_remaining_decode(s, c_rice_param); -+- -+- trans_coeff_level += last_coeff_abs_level_remaining; -+- if (trans_coeff_level > (3 << c_rice_param)) -+- c_rice_param = s->ps.sps->persistent_rice_adaptation_enabled_flag ? c_rice_param + 1 : FFMIN(c_rice_param + 1, 4); -+- if (s->ps.sps->persistent_rice_adaptation_enabled_flag && !rice_init) { -+- int c_rice_p_init = lc->stat_coeff[sb_type] / 4; -+- if (last_coeff_abs_level_remaining >= (3 << c_rice_p_init)) -+- lc->stat_coeff[sb_type]++; -+- else if (2 * last_coeff_abs_level_remaining < (1 << c_rice_p_init)) -+- if (lc->stat_coeff[sb_type] > 0) -+- lc->stat_coeff[sb_type]--; -+- rice_init = 1; -++ if (stat_coeff != NULL) -++ update_rice(stat_coeff, last_coeff_abs_level_remaining, c_rice_param); -++ stat_coeff = NULL; -++ -++ if (trans_coeff_level > (3 << c_rice_param) && -++ (c_rice_param < 4 || rice_adaptation_enabled)) -++ ++c_rice_param; -+ } -+- } -+- } else { -+- int last_coeff_abs_level_remaining = coeff_abs_level_remaining_decode(s, c_rice_param); -+- -+- trans_coeff_level = 1 + last_coeff_abs_level_remaining; -+- if (trans_coeff_level > (3 << c_rice_param)) -+- c_rice_param = s->ps.sps->persistent_rice_adaptation_enabled_flag ? c_rice_param + 1 : FFMIN(c_rice_param + 1, 4); -+- if (s->ps.sps->persistent_rice_adaptation_enabled_flag && !rice_init) { -+- int c_rice_p_init = lc->stat_coeff[sb_type] / 4; -+- if (last_coeff_abs_level_remaining >= (3 << c_rice_p_init)) -+- lc->stat_coeff[sb_type]++; -+- else if (2 * last_coeff_abs_level_remaining < (1 << c_rice_p_init)) -+- if (lc->stat_coeff[sb_type] > 0) -+- lc->stat_coeff[sb_type]--; -+- rice_init = 1; -+- } -++ } while (coded_vals != 0); -+ } -+- if (s->ps.pps->sign_data_hiding_flag && sign_hidden) { -+- sum_abs += trans_coeff_level; -+- if (n == first_nz_pos_in_cg && (sum_abs&1)) -+- trans_coeff_level = -trans_coeff_level; -++ -++ // sign_hidden = 0 or 1 so we can combine the tests -++ if ((sign_hidden & sum_abs) != 0) { -++ levels[nb_significant_coeff_flag - 1] = -levels[nb_significant_coeff_flag - 1]; -+ } -+- if (coeff_sign_flag >> 15) -+- trans_coeff_level = -trans_coeff_level; -+- coeff_sign_flag <<= 1; -+- if(!lc->cu.cu_transquant_bypass_flag) { -+- if (s->ps.sps->scaling_list_enable_flag && !(transform_skip_flag && log2_trafo_size > 2)) { -+- if(y_c || x_c || log2_trafo_size < 4) { -+- switch(log2_trafo_size) { -+- case 3: pos = (y_c << 3) + x_c; break; -+- case 4: pos = ((y_c >> 1) << 3) + (x_c >> 1); break; -+- case 5: pos = ((y_c >> 2) << 3) + (x_c >> 2); break; -+- default: pos = (y_c << 2) + x_c; break; -+- } -+- scale_m = scale_matrix[pos]; -+- } else { -+- scale_m = dc_scale; -+- } -++ -++ bypass_finish(s); -++ -++ // -- Finish bypass block -++ -++ // Scale loop -++ { -++ int m = nb_significant_coeff_flag - 1; -++ -++ // Deal with DC component (if any) first -++ if (i == 0 && significant_coeff_flag_idx[m] == 0) -++ { -++ const int k = (int32_t)(coeff_sign_flags << m) >> 31; -++ blk_coeffs[0] = trans_scale_sat( -++ (levels[m] ^ k) - k, scale, dc_scale, shift); -++ --m; -+ } -+- trans_coeff_level = (trans_coeff_level * (int64_t)scale * (int64_t)scale_m + add) >> shift; -+- if(trans_coeff_level < 0) { -+- if((~trans_coeff_level) & 0xFffffffffff8000) -+- trans_coeff_level = -32768; -+- } else { -+- if(trans_coeff_level & 0xffffffffffff8000) -+- trans_coeff_level = 32767; -++ -++#if !USE_N_END_1 -++ // If N_END_! set then m was at least 1 initially -++ if (m >= 0) -++#endif -++ { -++ do { -++ const xy_off_t * const xy_off = scan_xy_off + -++ significant_coeff_flag_idx[m]; -++ const int k = (int32_t)(coeff_sign_flags << m) >> 31; -++ -++ blk_coeffs[xy_off->coeff] = trans_scale_sat( -++ (levels[m] ^ k) - k, -++ scale, -++ blk_scale[xy_off->scale], -++ shift); -++ } while (--m >= 0); -+ } -+ } -+- coeffs[y_c * trafo_size + x_c] = trans_coeff_level; -++ -+ } -+ } -+- } -++ } while ((i = next_subset(s, i, c_idx_nz, -++ significant_coeff_group_flag, scan_x_cg, scan_y_cg, &prev_sig)) >= 0); -+ -+ if (lc->cu.cu_transquant_bypass_flag) { -+ if (explicit_rdpcm_flag || (s->ps.sps->implicit_rdpcm_enabled_flag && -+@@ -1496,7 +2078,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ s->hevcdsp.transform_rdpcm(coeffs, log2_trafo_size, mode); -+ } -+ } else { -+- if (transform_skip_flag) { -++ if (trans_skip_or_bypass) { // Must be trans_skip as we've already dealt with bypass -+ int rot = s->ps.sps->transform_skip_rotation_enabled_flag && -+ log2_trafo_size == 2 && -+ lc->cu.pred_mode == MODE_INTRA; -+-- -+2.7.4 -+ -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index 48f8d56988718dd53294e8291a53e532f0ff338d..337dbaab927919858e44d79f647207ef0513eea1 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -3,7 +3,8 @@ include FFMPEG-VERSION - DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ - 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \ - hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch \ -- pfcd_hevc_optimisations.patch -+ pfcd_hevc_optimisations.patch \ -+ 0001-Squashed-commit-of-the-following.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -71,6 +72,7 @@ ifeq ($(Configuration), Release) - ffmpg_config += --disable-debug - endif - -+ffmpg_config += --extra-cflags="-DRPI=1" - - CLEAN_FILES=$(ARCHIVE) $(PLATFORM) - -@@ -87,6 +89,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - cd $(PLATFORM); patch -p1 < ../pfcd_hevc_optimisations.patch -+ cd $(PLATFORM); patch -p1 < ../0001-Squashed-commit-of-the-following.patch - - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index d6856dbd4fb4957ace700cbc08332223c01938f6..a61357f14cb2139e8125ae04684bed1b29fefb12 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -136,6 +136,7 @@ patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - patch -p1 < ../pfcd_hevc_optimisations.patch -+patch -p1 < ../0001-Squashed-commit-of-the-following.patch - - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ -@@ -170,6 +171,7 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - --enable-zlib \ - --disable-mipsdsp \ - --disable-mipsdspr2 \ -+ --extra-cflags="-DRPI=1" \ - ${FLAGS} - - make -j ${BUILDTHREADS} - -From ebf9d46351a5f4b6d14b9936a2ff4048062cf219 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 16 Sep 2015 19:05:12 +0100 -Subject: [PATCH 29/61] [3d] Make MVC a valid 3D filename tag - ---- - xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++ - xbmc/settings/AdvancedSettings.cpp | 2 ++ - xbmc/settings/AdvancedSettings.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp -index 299d0ba62f4dbb6bc8d5632e19288f165333cc3c..618e6f4f0d6e792e0d0d60edfad2d59e3805ff7c 100644 ---- a/xbmc/guilib/StereoscopicsManager.cpp -+++ b/xbmc/guilib/StereoscopicsManager.cpp -@@ -198,6 +198,15 @@ std::string CStereoscopicsManager::DetectStereoModeByString(const std::string &n - if (re.RegFind(searchString) > -1) - stereoMode = "top_bottom"; - -+ if (!re.RegComp(g_advancedSettings.m_stereoscopicregex_mvc.c_str())) -+ { -+ CLog::Log(LOGERROR, "%s: Invalid RegExp for matching 3d MVC content:'%s'", __FUNCTION__, g_advancedSettings.m_stereoscopicregex_mvc.c_str()); -+ return stereoMode; -+ } -+ -+ if (re.RegFind(searchString) > -1) -+ stereoMode = "left_right"; -+ - return stereoMode; - } - -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 4ebc890a52995ca761effad6c30d41cb25b5bdb8..c728dd652d323fb5f0882b7dbd2887fd59dfe0e2 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -402,6 +402,7 @@ void CAdvancedSettings::Initialize() - m_stereoscopicregex_3d = "[-. _]3d[-. _]"; - m_stereoscopicregex_sbs = "[-. _]h?sbs[-. _]"; - m_stereoscopicregex_tab = "[-. _]h?tab[-. _]"; -+ m_stereoscopicregex_mvc = "[-. _]h?mvc[-. _]"; - - m_useDisplayControlHWStereo = false; - -@@ -551,6 +552,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) - XMLUtils::GetString(pElement, "stereoscopicregex3d", m_stereoscopicregex_3d); - XMLUtils::GetString(pElement, "stereoscopicregexsbs", m_stereoscopicregex_sbs); - XMLUtils::GetString(pElement, "stereoscopicregextab", m_stereoscopicregex_tab); -+ XMLUtils::GetString(pElement, "stereoscopicregexmvc", m_stereoscopicregex_mvc); - XMLUtils::GetFloat(pElement, "subsdelayrange", m_videoSubsDelayRange, 10, 600); - XMLUtils::GetFloat(pElement, "audiodelayrange", m_videoAudioDelayRange, 10, 600); - XMLUtils::GetString(pElement, "defaultplayer", m_videoDefaultPlayer); -diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 64d42f8bdce59d3c7752657e3fe483733e88eda6..faa91950e9546855d71beef4ee96aa33a1318f24 100644 ---- a/xbmc/settings/AdvancedSettings.h -+++ b/xbmc/settings/AdvancedSettings.h -@@ -373,6 +373,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler - std::string m_stereoscopicregex_3d; - std::string m_stereoscopicregex_sbs; - std::string m_stereoscopicregex_tab; -+ std::string m_stereoscopicregex_mvc; - - bool m_useDisplayControlHWStereo; - - -From 8593504fd9d874850f7423ff8426d125c033daab Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 5 Oct 2015 14:58:05 +0100 -Subject: [PATCH 30/61] [3d] Swap top/bottom sides of GUI - ---- - xbmc/guilib/GraphicContext.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp -index 6b65632fdfcf6278a44e90f61ddb018f2a98763c..80a7809beffa1a03ee41d6ab862ec075c68fed5d 100644 ---- a/xbmc/guilib/GraphicContext.cpp -+++ b/xbmc/guilib/GraphicContext.cpp -@@ -267,7 +267,7 @@ CPoint CGraphicContext::StereoCorrection(const CPoint &point) const - { - const RESOLUTION_INFO info = GetResInfo(); - -- if(m_stereoView == RENDER_STEREO_VIEW_RIGHT) -+ if(m_stereoView == RENDER_STEREO_VIEW_LEFT) - res.y += info.iHeight + info.iBlanking; - } - if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL) - -From 1ca2072e6f1670cb8001027003c2abafc04316cf Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sun, 11 Oct 2015 20:51:37 +0100 -Subject: [PATCH 31/61] Revert "Revert "Disable extra logging by default"" - -This reverts commit a880554325be187b877cd8f0e2b338e7267da636. ---- - system/settings/settings.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 38a772b4e5f59cdd30293850752a761dbe532177..068ca2d519cb7537e0d3ad05c83d47d341a34250 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -2967,12 +2967,12 @@ - - - 1 -- true -+ false - - - - 1 -- 32768 -+ - - loggingcomponents - , - -From 0b331588ffcd3947970db9c180d627d4a3846e50 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 21 Dec 2015 22:17:25 +0000 -Subject: [PATCH 32/61] [omximage] Fall back to arm jpeg encode/decode when gpu - is busy - ---- - xbmc/cores/omxplayer/OMXImage.cpp | 50 ++++++++++++++++++++++++++++++++------- - xbmc/cores/omxplayer/OMXImage.h | 7 ++++++ - 2 files changed, 48 insertions(+), 9 deletions(-) - -diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp -index c16f3d626ac749d17e2896474ee06be7acdded5f..bfc0440998b69f3f998378ea665246a63448fec8 100644 ---- a/xbmc/cores/omxplayer/OMXImage.cpp -+++ b/xbmc/cores/omxplayer/OMXImage.cpp -@@ -56,12 +56,17 @@ static XbmcThreads::ConditionVariable g_count_cond; - static CCriticalSection g_count_lock; - static int g_count_val; - --static void limit_calls_enter() -+static bool limit_calls_enter() - { - CSingleLock lock(g_count_lock); -+ // on Pi2 fall back to arm decode if the queue is getting big -+ if (g_RBP.RasberryPiVersion() > 1 && g_count_val >= 2) -+ return false; -+ - while (g_count_val >= 3) - g_count_cond.wait(lock); - g_count_val++; -+ return true; - } - - static void limit_calls_leave() -@@ -111,6 +116,9 @@ bool COMXImage::CreateThumbnailFromSurface(unsigned char* buffer, unsigned int w - unsigned int format, unsigned int pitch, const std::string& destFile) - { - COMXImageEnc omxImageEnc; -+ if (!omxImageEnc.Gpu()) -+ return false; -+ - bool ret = omxImageEnc.CreateThumbnailFromSurface(buffer, width, height, format, pitch, destFile); - if (!ret) - CLog::Log(LOGNOTICE, "%s: unable to create thumbnail %s %dx%d", __func__, destFile.c_str(), width, height); -@@ -204,6 +212,8 @@ bool COMXImage::CreateThumb(const std::string& srcFile, unsigned int maxHeight, - bool okay = false; - COMXImageFile file; - COMXImageReEnc reenc; -+ if (!reenc.Gpu()) -+ return false; - void *pDestBuffer; - unsigned int nDestSize; - int orientation = additional_info == "flipped" ? 1:0; -@@ -309,6 +319,9 @@ bool COMXImage::DecodeJpegToTexture(COMXImageFile *file, unsigned int width, uns - bool ret = false; - COMXTexture omx_image; - -+ if (!omx_image.Gpu()) -+ return false; -+ - struct textureinfo *tex = new struct textureinfo; - if (!tex) - return NULL; -@@ -923,7 +936,7 @@ bool COMXImageFile::ReadFile(const std::string& inputFile, int orientation) - - COMXImageDec::COMXImageDec() - { -- limit_calls_enter(); -+ m_gpu = limit_calls_enter(); - m_decoded_buffer = NULL; - OMX_INIT_STRUCTURE(m_decoded_format); - m_success = false; -@@ -935,7 +948,8 @@ COMXImageDec::~COMXImageDec() - - OMX_INIT_STRUCTURE(m_decoded_format); - m_decoded_buffer = NULL; -- limit_calls_leave(); -+ if (m_gpu) -+ limit_calls_leave(); - } - - void COMXImageDec::Close() -@@ -1085,6 +1099,9 @@ bool COMXImageDec::HandlePortSettingChange(unsigned int resize_width, unsigned i - - bool COMXImageDec::Decode(const uint8_t *demuxer_content, unsigned demuxer_bytes, unsigned width, unsigned height, unsigned stride, void *pixels) - { -+ if (!m_gpu) -+ return false; -+ - CSingleLock lock(m_OMXSection); - OMX_ERRORTYPE omx_err = OMX_ErrorNone; - OMX_BUFFERHEADERTYPE *omx_buffer = NULL; -@@ -1222,7 +1239,7 @@ bool COMXImageDec::Decode(const uint8_t *demuxer_content, unsigned demuxer_bytes - - COMXImageEnc::COMXImageEnc() - { -- limit_calls_enter(); -+ m_gpu = limit_calls_enter(); - CSingleLock lock(m_OMXSection); - OMX_INIT_STRUCTURE(m_encoded_format); - m_encoded_buffer = NULL; -@@ -1246,11 +1263,15 @@ COMXImageEnc::~COMXImageEnc() - m_omx_encoder.Deinitialize(); - } - } -- limit_calls_leave(); -+ if (m_gpu) -+ limit_calls_leave(); - } - - bool COMXImageEnc::Encode(unsigned char *buffer, int size, unsigned width, unsigned height, unsigned int pitch) - { -+ if (!m_gpu) -+ return false; -+ - CSingleLock lock(m_OMXSection); - - unsigned int demuxer_bytes = 0; -@@ -1431,6 +1452,9 @@ bool COMXImageEnc::Encode(unsigned char *buffer, int size, unsigned width, unsig - bool COMXImageEnc::CreateThumbnailFromSurface(unsigned char* buffer, unsigned int width, unsigned int height, - unsigned int format, unsigned int pitch, const std::string& destFile) - { -+ if (!m_gpu) -+ return false; -+ - if(format != XB_FMT_A8R8G8B8 || !buffer) - { - CLog::Log(LOGDEBUG, "%s::%s : %s failed format=0x%x\n", CLASSNAME, __func__, destFile.c_str(), format); -@@ -1464,7 +1488,7 @@ bool COMXImageEnc::CreateThumbnailFromSurface(unsigned char* buffer, unsigned in - - COMXImageReEnc::COMXImageReEnc() - { -- limit_calls_enter(); -+ m_gpu = limit_calls_enter(); - m_encoded_buffer = NULL; - m_pDestBuffer = NULL; - m_nDestAllocSize = 0; -@@ -1478,7 +1502,8 @@ COMXImageReEnc::~COMXImageReEnc() - free (m_pDestBuffer); - m_pDestBuffer = NULL; - m_nDestAllocSize = 0; -- limit_calls_leave(); -+ if (m_gpu) -+ limit_calls_leave(); - } - - void COMXImageReEnc::Close() -@@ -1770,6 +1795,9 @@ bool COMXImageReEnc::HandlePortSettingChange(unsigned int resize_width, unsigned - - bool COMXImageReEnc::ReEncode(COMXImageFile &srcFile, unsigned int maxWidth, unsigned int maxHeight, void * &pDestBuffer, unsigned int &nDestSize) - { -+ if (!m_gpu) -+ return false; -+ - CSingleLock lock(m_OMXSection); - OMX_ERRORTYPE omx_err = OMX_ErrorNone; - -@@ -1942,14 +1970,15 @@ bool COMXImageReEnc::ReEncode(COMXImageFile &srcFile, unsigned int maxWidth, uns - - COMXTexture::COMXTexture() - { -- limit_calls_enter(); -+ m_gpu = limit_calls_enter(); - m_success = false; - } - - COMXTexture::~COMXTexture() - { - Close(); -- limit_calls_leave(); -+ if (m_gpu) -+ limit_calls_leave(); - } - - void COMXTexture::Close() -@@ -2133,6 +2162,9 @@ bool COMXTexture::HandlePortSettingChange(unsigned int resize_width, unsigned in - - bool COMXTexture::Decode(const uint8_t *demuxer_content, unsigned demuxer_bytes, unsigned int width, unsigned int height, void *egl_image) - { -+ if (!m_gpu) -+ return false; -+ - CSingleLock lock(m_OMXSection); - OMX_ERRORTYPE omx_err = OMX_ErrorNone; - -diff --git a/xbmc/cores/omxplayer/OMXImage.h b/xbmc/cores/omxplayer/OMXImage.h -index e44fb6ef0ba5fd011fdfc6771c946ffcfb8d581c..f1febd69aaa3522d252802ca00b6746022be41c6 100644 ---- a/xbmc/cores/omxplayer/OMXImage.h -+++ b/xbmc/cores/omxplayer/OMXImage.h -@@ -133,6 +133,7 @@ protected: - OMX_PARAM_PORTDEFINITIONTYPE m_decoded_format; - CCriticalSection m_OMXSection; - bool m_success; -+ bool m_gpu; - }; - - class COMXImageEnc -@@ -144,6 +145,7 @@ public: - // Required overrides - bool CreateThumbnailFromSurface(unsigned char* buffer, unsigned int width, unsigned int height, - unsigned int format, unsigned int pitch, const std::string& destFile); -+ bool Gpu() { return m_gpu; } - protected: - bool Encode(unsigned char *buffer, int size, unsigned int width, unsigned int height, unsigned int pitch); - // Components -@@ -152,6 +154,7 @@ protected: - OMX_PARAM_PORTDEFINITIONTYPE m_encoded_format; - CCriticalSection m_OMXSection; - bool m_success; -+ bool m_gpu; - }; - - class COMXImageReEnc -@@ -163,6 +166,7 @@ public: - // Required overrides - void Close(); - bool ReEncode(COMXImageFile &srcFile, unsigned int width, unsigned int height, void * &pDestBuffer, unsigned int &nDestSize); -+ bool Gpu() { return m_gpu; } - protected: - bool HandlePortSettingChange(unsigned int resize_width, unsigned int resize_height, int orientation, bool port_settings_changed); - // Components -@@ -176,6 +180,7 @@ protected: - void *m_pDestBuffer; - unsigned int m_nDestAllocSize; - bool m_success; -+ bool m_gpu; - }; - - class COMXTexture -@@ -187,6 +192,7 @@ public: - // Required overrides - void Close(void); - bool Decode(const uint8_t *data, unsigned size, unsigned int width, unsigned int height, void *egl_image); -+ bool Gpu() { return m_gpu; } - protected: - bool HandlePortSettingChange(unsigned int resize_width, unsigned int resize_height, void *egl_image, bool port_settings_changed); - -@@ -201,6 +207,7 @@ protected: - OMX_BUFFERHEADERTYPE *m_egl_buffer; - CCriticalSection m_OMXSection; - bool m_success; -+ bool m_gpu; - }; - - extern COMXImage g_OMXImage; - -From fa43a0ae5e0b2eb9bdff7c757ffe5b6ab53d9a16 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 9 Dec 2015 13:31:14 +0000 -Subject: [PATCH 33/61] [mmalcodec] Fail to open when width is invalid. Can - happen with mpegts files - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 4f5de0341b344c77a12c936f4f573c2911c0bb7b..4f07113ade696aa4bbefb2dd2a2e17d5f12e9ab9 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -366,6 +366,9 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - if (g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s usemmal:%d software:%d %dx%d renderer:%p", CLASSNAME, __func__, CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL), hints.software, hints.width, hints.height, options.m_opaque_pointer); - -+ // This occurs at start of m2ts files before streams have been fully identified - just ignore -+ if (!hints.width) -+ return false; - // we always qualify even if DVDFactoryCodec does this too. - if (!CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) - return false; - -From bf31243afd0e75b49cf3ceceb9af28bd25bc4742 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 19 Sep 2014 11:54:49 +0100 -Subject: [PATCH 34/61] [videoplayer/rbp] Add pi specific option to maintain - vsync with pll adjustment - -New A/V sync option in settings/video/playback to do "Adjust PLL". -This uses video clock (so perfect video syncing) but avoids having to resample -or drop/dupe audio packets which is normally required. ---- - .../resource.language.en_gb/resources/strings.po | 32 ++++++++++++++++++++++ - system/settings/rbp.xml | 14 ++++++++++ - .../AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 25 +++++++++++------ - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h | 9 +++++- - .../Engines/ActiveAE/ActiveAEStream.cpp | 24 +++++++++++++--- - .../AudioEngine/Engines/ActiveAE/ActiveAEStream.h | 7 +++-- - xbmc/cores/AudioEngine/Interfaces/AEStream.h | 10 ++++++- - xbmc/cores/VideoPlayer/DVDAudio.cpp | 4 +-- - xbmc/cores/VideoPlayer/DVDAudio.h | 2 +- - xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 12 ++++++-- - xbmc/linux/RBP.cpp | 20 ++++++++++++++ - xbmc/linux/RBP.h | 5 ++++ - 12 files changed, 143 insertions(+), 21 deletions(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 2e3f179fcc7aa100e2aaec64d0513145903ccd32..ddc3d4a5127d759d160107e400c7d714a01f440b 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -20467,3 +20467,35 @@ msgstr "" - msgctxt "#38190" - msgid "Extract thumbnails from video files" - msgstr "" -+ -+#. Description of setting "System -> Audio Ouput -> A/V sync method" with label #38200 -+#: system/settings/settings.xml -+msgctxt "#38200" -+msgid "PLL adjustment to maintain audio/video sync" -+msgstr "" -+ -+#. Description of setting "Videos -> Playback -> A/V sync method" with label #38201 -+#: system/settings/settings.xml -+msgctxt "#38201" -+msgid "Allows sync adjustment without resampling. Lower the settings if you get audio/video dropouts." -+msgstr "" -+ -+msgctxt "#38202" -+msgid "Off" -+msgstr "" -+ -+msgctxt "#38203" -+msgid "Low" -+msgstr "" -+ -+msgctxt "#38204" -+msgid "Medium" -+msgstr "" -+ -+msgctxt "#38205" -+msgid "High" -+msgstr "" -+ -+msgctxt "#38206" -+msgid "Max" -+msgstr "" -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index 289dc55ec41aa44848519a05f8ee1ccc72740085..2572e25753712186f69390965ee1448bff3fadd5 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -101,6 +101,20 @@ - - 100 - -+ -+ 3 -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 61787f99f95dbf3d637b62185d1496909d7ee0a6..b77b6098c7138157817567de471ded718b204227 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -364,11 +364,12 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg) - m_sink.m_controlPort.SendOutMessage(CSinkControlProtocol::APPFOCUSED, msg->data, sizeof(bool)); - return; - case CActiveAEControlProtocol::STREAMRESAMPLEMODE: -- MsgStreamParameter *par; -- par = (MsgStreamParameter*)msg->data; -+ MsgStreamResample *par; -+ par = (MsgStreamResample*)msg->data; - if (par->stream) - { -- par->stream->m_resampleMode = par->parameter.int_par; -+ par->stream->m_resampleMode = par->mode; -+ par->stream->m_pllAdjust = par->plladjust; - par->stream->m_resampleIntegral = 0.0; - } - return; -@@ -2457,7 +2458,14 @@ CSampleBuffer* CActiveAE::SyncStream(CActiveAEStream *stream) - { - if (stream->m_processingBuffers) - { -- stream->m_processingBuffers->SetRR(stream->CalcResampleRatio(error), m_settings.atempoThreshold); -+ double pllAdjustRequest = 0.0, pllAdjustActual = 0.0, e = 0.0; -+ if (stream->m_pllAdjust > 0.0) -+ { -+ e = std::max(std::min(error / 50.0, 1.0), - 1.0); -+ pllAdjustRequest = 1.0 + e * stream->m_pllAdjust; -+ } -+ stream->m_processingBuffers->SetRR(stream->CalcResampleRatio(error), m_settings.atempoThreshold, pllAdjustRequest, stream->m_pllAdjust, pllAdjustActual); -+ CLog::Log(LOGDEBUG, "ActiveAE::%s pll:%.5f (act:%.5f lim:%.5f) rr:%.5f threshold:%.3f error:%.6f", __FUNCTION__, pllAdjustRequest, pllAdjustActual, stream->m_pllAdjust, stream->m_processingBuffers->GetRR(), m_settings.atempoThreshold, error ); - } - } - else if (stream->m_processingBuffers) -@@ -3323,13 +3331,14 @@ void CActiveAE::SetStreamResampleRatio(CActiveAEStream *stream, double ratio) - &msg, sizeof(MsgStreamParameter)); - } - --void CActiveAE::SetStreamResampleMode(CActiveAEStream *stream, int mode) -+void CActiveAE::SetStreamResampleMode(CActiveAEStream *stream, int mode, float plladjust) - { -- MsgStreamParameter msg; -+ MsgStreamResample msg; - msg.stream = stream; -- msg.parameter.int_par = mode; -+ msg.mode = mode; -+ msg.plladjust = plladjust; - m_controlPort.SendOutMessage(CActiveAEControlProtocol::STREAMRESAMPLEMODE, -- &msg, sizeof(MsgStreamParameter)); -+ &msg, sizeof(MsgStreamResample)); - } - - void CActiveAE::SetStreamFFmpegInfo(CActiveAEStream *stream, int profile, enum AVMatrixEncoding matrix_encoding, enum AVAudioServiceType audio_service_type) -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -index 77fc01a24e56298348148b501cd47e41d8d5cad5..c46ef0227b70cd6a2e1c8c327f5c0b2f76353260 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -@@ -177,6 +177,13 @@ struct MsgStreamFFmpegInfo - enum AVAudioServiceType audio_service_type; - }; - -+struct MsgStreamResample -+{ -+ CActiveAEStream *stream; -+ int mode; -+ float plladjust; -+}; -+ - class CEngineStats - { - public: -@@ -293,7 +300,7 @@ protected: - void SetStreamReplaygain(CActiveAEStream *stream, float rgain); - void SetStreamVolume(CActiveAEStream *stream, float volume); - void SetStreamResampleRatio(CActiveAEStream *stream, double ratio); -- void SetStreamResampleMode(CActiveAEStream *stream, int mode); -+ void SetStreamResampleMode(CActiveAEStream *stream, int mode, float plladjust); - void SetStreamFFmpegInfo(CActiveAEStream *stream, int profile, enum AVMatrixEncoding matrix_encoding, enum AVAudioServiceType audio_service_type); - void SetStreamFade(CActiveAEStream *stream, float from, float target, unsigned int millis); - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -index 246d7e6c05242f1d64bbc3983b7342e24423ba8c..6b009dcea60e7431d418286c7602e1c29e793cb5 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -@@ -29,6 +29,10 @@ - #include "ActiveAE.h" - #include "ActiveAEStream.h" - -+#if defined(TARGET_RASPBERRY_PI) -+#include "linux/RBP.h" -+#endif -+ - using namespace ActiveAE; - - /* typecast AE to CActiveAE */ -@@ -71,6 +75,7 @@ CActiveAEStream::CActiveAEStream(AEAudioFormat *format, unsigned int streamid) - m_lastPtsJump = 0; - m_errorInterval = 1000; - m_clockSpeed = 1.0; -+ m_pllAdjust = 0.0f; - } - - CActiveAEStream::~CActiveAEStream() -@@ -509,11 +514,12 @@ void CActiveAEStream::SetResampleRatio(double ratio) - m_streamResampleRatio = ratio; - } - --void CActiveAEStream::SetResampleMode(int mode) -+void CActiveAEStream::SetResampleMode(int mode, float plladjust) - { -- if (mode != m_streamResampleMode) -- AE.SetStreamResampleMode(this, mode); -+ if (mode != m_streamResampleMode || plladjust != m_streamPllAdjust) -+ AE.SetStreamResampleMode(this, mode, plladjust); - m_streamResampleMode = mode; -+ m_streamPllAdjust = plladjust; - } - - void CActiveAEStream::SetFFmpegInfo(int profile, enum AVMatrixEncoding matrix_encoding, enum AVAudioServiceType audio_service_type) -@@ -714,8 +720,18 @@ bool CActiveAEStreamBuffers::IsDrained() - return false; - } - --void CActiveAEStreamBuffers::SetRR(double rr, double atempoThreshold) -+void CActiveAEStreamBuffers::SetRR(double rr, double atempoThreshold, double pllAdjustRequest, double pllThreshold, double &pllAdjustActual) - { -+#if defined(TARGET_RASPBERRY_PI) -+ if (pllAdjustRequest > 0.0f) // pll adjust -+ { -+ pllAdjustActual = g_RBP.AdjustHDMIClock(pllAdjustRequest); -+ rr = 1.0; -+ } -+ else -+ pllAdjustActual = g_RBP.AdjustHDMIClock(1.0); -+#endif -+ - if (fabs(rr - 1.0) < atempoThreshold) - { - m_resampleBuffers->SetRR(rr); -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h -index 531dedc71f8b342d1556518e1fb7cb051f334e88..80ab096a417d53fcdf7703d11437f92df23f6f46 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h -@@ -103,7 +103,8 @@ public: - void Flush(); - void SetDrain(bool drain); - bool IsDrained(); -- void SetRR(double rr, double atempoThreshold); -+ void SetRR(double rr, double atempoThreshold, double pllAdjustRequest, double pllThreshold, double &pllAdjustActual); -+ void SetRR(double rr, double atempoThreshold) { double pllAdjustActual; SetRR(rr, atempoThreshold, 0.0, 0.0, pllAdjustActual); } - double GetRR(); - void FillBuffer(); - bool DoesNormalize(); -@@ -169,7 +170,7 @@ public: - - virtual double GetResampleRatio(); - virtual void SetResampleRatio(double ratio); -- virtual void SetResampleMode(int mode); -+ virtual void SetResampleMode(int mode, float plladjust); - virtual void RegisterAudioCallback(IAudioCallback* pCallback); - virtual void UnRegisterAudioCallback(); - virtual void FadeVolume(float from, float to, unsigned int time); -@@ -186,6 +187,7 @@ protected: - float m_streamAmplify; - double m_streamResampleRatio; - int m_streamResampleMode; -+ float m_streamPllAdjust; - unsigned int m_streamSpace; - bool m_streamDraining; - bool m_streamDrained; -@@ -226,6 +228,7 @@ protected: - int m_fadingTime; - int m_profile; - int m_resampleMode; -+ float m_pllAdjust; - double m_resampleIntegral; - double m_clockSpeed; - enum AVMatrixEncoding m_matrixEncoding; -diff --git a/xbmc/cores/AudioEngine/Interfaces/AEStream.h b/xbmc/cores/AudioEngine/Interfaces/AEStream.h -index dc50f8c82cb6831756e8344784f97e158692c780..02038f09fbcb7e4ac41e32c7c06a936cd16a2175 100644 ---- a/xbmc/cores/AudioEngine/Interfaces/AEStream.h -+++ b/xbmc/cores/AudioEngine/Interfaces/AEStream.h -@@ -41,6 +41,14 @@ public: - class CAESyncInfo - { - public: -+ CAESyncInfo() -+ { -+ delay = 0.0; -+ error = 0.0; -+ rr = 1.0; -+ errortime = 0; -+ state = SYNC_OFF; -+ } - double delay; - double error; - double rr; -@@ -231,7 +239,7 @@ public: - /** - * Sets the resamplling on/ff - */ -- virtual void SetResampleMode(int mode) = 0; -+ virtual void SetResampleMode(int mode, float plladjust) = 0; - - /** - * Registers the audio callback to call with each block of data, this is used by Audio Visualizations -diff --git a/xbmc/cores/VideoPlayer/DVDAudio.cpp b/xbmc/cores/VideoPlayer/DVDAudio.cpp -index de1ad64523c3c9799ca24a86fce0dfec459366db..c3312daaf15ceed0072d640d2d49dc0a47128a9b 100644 ---- a/xbmc/cores/VideoPlayer/DVDAudio.cpp -+++ b/xbmc/cores/VideoPlayer/DVDAudio.cpp -@@ -313,12 +313,12 @@ double CDVDAudio::GetResampleRatio() - return m_resampleRatio; - } - --void CDVDAudio::SetResampleMode(int mode) -+void CDVDAudio::SetResampleMode(int mode, float plladjust) - { - CSingleLock lock (m_critSection); - if(m_pAudioStream) - { -- m_pAudioStream->SetResampleMode(mode); -+ m_pAudioStream->SetResampleMode(mode, plladjust); - } - } - -diff --git a/xbmc/cores/VideoPlayer/DVDAudio.h b/xbmc/cores/VideoPlayer/DVDAudio.h -index 0bbd2968b4e219aee04a31333b17981cd61b7dbc..a400677a782143a085daac0df22756a6cb8bb148 100644 ---- a/xbmc/cores/VideoPlayer/DVDAudio.h -+++ b/xbmc/cores/VideoPlayer/DVDAudio.h -@@ -58,7 +58,7 @@ public: - double GetSyncError(); - void SetSyncErrorCorrection(double correction); - double GetResampleRatio(); -- void SetResampleMode(int mode); -+ void SetResampleMode(int mode, float plladjust); - void Flush(); - void Drain(); - void AbortAddPackets(); -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -index 1f184e78d28a7430bca7d4f39de1f49adf33b56c..3b2ac69ae174d76d83ed55cdc999afaa90f0ee39 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -@@ -97,6 +97,7 @@ bool CVideoPlayerAudio::OpenStream(CDVDStreamInfo &hints) - bool allowpassthrough = !CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK); - if (hints.realtime) - allowpassthrough = false; -+ allowpassthrough |= CServiceBroker::GetSettings().GetInt("audiooutput.plladjust") > 0; - CDVDAudioCodec* codec = CDVDFactoryCodec::CreateAudioCodec(hints, m_processInfo, allowpassthrough, m_processInfo.AllowDTSHDDecode()); - if(!codec) - { -@@ -218,8 +219,12 @@ void CVideoPlayerAudio::UpdatePlayerInfo() - - //print the inverse of the resample ratio, since that makes more sense - //if the resample ratio is 0.5, then we're playing twice as fast -+#ifdef TARGET_RASPBERRY_PI -+ s << ", rr:" << std::fixed << std::setprecision(5) << 1.0 / m_dvdAudio.GetResampleRatio() << ", pll:" << std::fixed << std::setprecision(5) << g_RBP.GetAdjustHDMIClock() << ", err:" << std::fixed << std::setprecision(1) << m_dvdAudio.GetSyncError() * 1e-3 << "ms"; -+#else - if (m_synctype == SYNC_RESAMPLE) - s << ", rr:" << std::fixed << std::setprecision(5) << 1.0 / m_dvdAudio.GetResampleRatio(); -+#endif - - s << ", att:" << std::fixed << std::setprecision(1) << log(GetCurrentAttenuation()) * 20.0f << " dB"; - -@@ -542,10 +547,12 @@ void CVideoPlayerAudio::SetSyncType(bool passthrough) - int synctype = (m_synctype >= 0 && m_synctype <= 1) ? m_synctype : 2; - CLog::Log(LOGDEBUG, "CVideoPlayerAudio:: synctype set to %i: %s", m_synctype, synctypes[synctype]); - m_prevsynctype = m_synctype; -+ const float plladjusts[] = { 0.0f, 0.00001f, 0.0001f, 0.001f, 0.01f }; -+ float plladjust = plladjusts[CServiceBroker::GetSettings().GetInt("audiooutput.plladjust")]; - if (m_synctype == SYNC_RESAMPLE) -- m_dvdAudio.SetResampleMode(1); -+ m_dvdAudio.SetResampleMode(1, plladjust); - else -- m_dvdAudio.SetResampleMode(0); -+ m_dvdAudio.SetResampleMode(0, plladjust); - } - } - -@@ -603,6 +610,7 @@ bool CVideoPlayerAudio::SwitchCodecIfNeeded() - bool allowpassthrough = !CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK); - if (m_streaminfo.realtime) - allowpassthrough = false; -+ allowpassthrough |= CServiceBroker::GetSettings().GetInt("audiooutput.plladjust") > 0; - CDVDAudioCodec *codec = CDVDFactoryCodec::CreateAudioCodec(m_streaminfo, m_processInfo, allowpassthrough, m_processInfo.AllowDTSHDDecode()); - if (!codec || codec->NeedPassthrough() == m_pAudioCodec->NeedPassthrough()) { - // passthrough state has not changed -diff --git a/xbmc/linux/RBP.cpp b/xbmc/linux/RBP.cpp -index c073dc28db9abc24025909e2d91b7ce49201f4ea..e4bff70c0b8bc934e55fb8e68c6d5e35ce92c66f 100644 ---- a/xbmc/linux/RBP.cpp -+++ b/xbmc/linux/RBP.cpp -@@ -47,6 +47,8 @@ CRBP::CRBP() - m_DllBcmHost = new DllBcmHost(); - m_OMX = new COMXCore(); - m_display = DISPMANX_NO_HANDLE; -+ m_requested_pll_adjust = -1.0; -+ m_actual_pll_adjust = -1.0; - m_mb = mbox_open(); - vcsm_init(); - m_vsync_count = 0; -@@ -154,6 +156,8 @@ void CRBP::CloseDisplay(DISPMANX_DISPLAY_HANDLE_T display) - assert(s == 0); - vc_dispmanx_display_close(m_display); - m_display = DISPMANX_NO_HANDLE; -+ m_requested_pll_adjust = -1.0; -+ m_actual_pll_adjust = -1.0; - } - - void CRBP::GetDisplaySize(int &width, int &height) -@@ -367,4 +371,20 @@ void CGPUMEM::Flush() - vcsm_clean_invalid( &iocache ); - } - -+double CRBP::AdjustHDMIClock(double adjust) -+{ -+ char response[80]; -+ -+ if (adjust == m_requested_pll_adjust) -+ return m_actual_pll_adjust; -+ -+ m_requested_pll_adjust = adjust; -+ vc_gencmd(response, sizeof response, "hdmi_adjust_clock %f", adjust); -+ char *p = strchr(response, '='); -+ if (p) -+ m_actual_pll_adjust = atof(p+1); -+ CLog::Log(LOGDEBUG, "CRBP::%s(%.5f) = %.5f", __func__, adjust, m_actual_pll_adjust); -+ return m_actual_pll_adjust; -+} -+ - #endif -diff --git a/xbmc/linux/RBP.h b/xbmc/linux/RBP.h -index 26a2a4bd74b54288282b534c5de7d59d6ccec7f5..79e676b1dee78f808a359dbee781fa80cf9be82e 100644 ---- a/xbmc/linux/RBP.h -+++ b/xbmc/linux/RBP.h -@@ -81,6 +81,8 @@ public: - uint32_t WaitVsync(uint32_t target = ~0U); - void VSyncCallback(); - int GetMBox() { return m_mb; } -+ double AdjustHDMIClock(double adjust); -+ double GetAdjustHDMIClock() { return m_actual_pll_adjust; } - - private: - DllBcmHost *m_DllBcmHost; -@@ -102,6 +104,9 @@ private: - CCriticalSection m_critSection; - - int m_mb; -+ double m_requested_pll_adjust; -+ double m_actual_pll_adjust; -+ public: - }; - - extern CRBP g_RBP; - -From 352d9255894aa09b87cc624ddc32f165c152a6ec Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 7 May 2015 15:35:43 +0100 -Subject: [PATCH 35/61] rbp: Support zero copy interface with hevc acceleration - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++++++ - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 5 +++-- - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 8b59b1825c4fdee83ec4afc13403126153f8071d..c4eda5a2c78db1f6acc9ed59938ea3f42262d8fe 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -366,6 +366,15 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options - if (tryhw && m_decoderState == STATE_NONE) - { - m_decoderState = STATE_HW_SINGLE; -+#ifdef TARGET_RASPBERRY_PI -+ int num_threads = g_cpuInfo.getCPUCount() * 3 / 2; -+ num_threads = std::max(1, std::min(num_threads, 16)); -+ if (pCodec->id == AV_CODEC_ID_HEVC) -+ num_threads = 8; -+ m_pCodecContext->thread_count = num_threads; -+ m_pCodecContext->thread_safe_callbacks = 0; -+ CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - open frame threaded with %d threads", num_threads); -+#endif - } - else - { -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index 3b6307725d938aae12f093b2691f3b9bf8373fe7..689ed0fddcc05175857e4cc57f23092ab9b81ddc 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -296,8 +296,9 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture - picture->MMALBuffer->mmal_buffer->alloc_size = picture->MMALBuffer->mmal_buffer->length = gmem->m_numbytes; - picture->MMALBuffer->m_stills = m_hints.stills; - -- // need to flush ARM cache so GPU can see it -- gmem->Flush(); -+ // need to flush ARM cache so GPU can see it (HEVC will have already done this) -+ if (avctx->codec_id != AV_CODEC_ID_HEVC) -+ gmem->Flush(); - - if (g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s - mmal:%p dts:%.3f pts:%.3f buf:%p gpu:%p", CLASSNAME, __FUNCTION__, picture->MMALBuffer->mmal_buffer, 1e-6*picture->dts, 1e-6*picture->pts, picture->MMALBuffer, gmem); - -From cfa59e3c4278c382c27b4f19f619cd3cb9e0bbdf Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 16 May 2015 18:26:04 +0100 -Subject: [PATCH 36/61] ffmpeg: use upstream mvc patches - ---- - ...vcodec-add-h264_mvc-codec-id-and-profiles.patch | 68 ++++++++++++ - ...er-add-support-for-parsing-h264-mvc-NALUs.patch | 116 +++++++++++++++++++++ - tools/depends/target/ffmpeg/Makefile | 7 +- - tools/depends/target/ffmpeg/autobuild.sh | 3 + - ...arsing_of_mvc_slices_in_some_corner_cases.patch | 55 ++++++++++ - 5 files changed, 248 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch - create mode 100644 tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch - create mode 100644 tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch - -diff --git a/tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch b/tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..2e7381fe6538089759ebc7288c0a5d908cd0973c ---- /dev/null -+++ b/tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch -@@ -0,0 +1,68 @@ -+From 4060f15e2d29e268110032d4366382e370e088d0 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sun, 26 Jun 2016 20:09:18 +0100 -+Subject: [PATCH] avcodec: add h264_mvc codec id and profiles -+ -+--- -+ libavcodec/avcodec.h | 5 +++++ -+ libavcodec/codec_desc.c | 7 +++++++ -+ libavformat/mpegts.c | 2 +- -+ 3 files changed, 13 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -+index a1ba217..abd2e91 100644 -+--- a/libavcodec/avcodec.h -++++ b/libavcodec/avcodec.h -+@@ -410,6 +410,8 @@ enum AVCodecID { -+ AV_CODEC_ID_SHEERVIDEO, -+ AV_CODEC_ID_YLC, -+ -++ AV_CODEC_ID_H264_MVC, -++ -+ /* various PCM "codecs" */ -+ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs -+ AV_CODEC_ID_PCM_S16LE = 0x10000, -+@@ -3195,6 +3197,9 @@ typedef struct AVCodecContext { -+ #define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244 -+ #define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA) -+ #define FF_PROFILE_H264_CAVLC_444 44 -++#define FF_PROFILE_H264_MULTIVIEW_HIGH 118 -++#define FF_PROFILE_H264_STEREO_HIGH 128 -++#define FF_PROFILE_H264_MULTIVIEW_HIGH_DEPTH 138 -+ -+ #define FF_PROFILE_VC1_SIMPLE 0 -+ #define FF_PROFILE_VC1_MAIN 1 -+diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c -+index 9d94b72..535ebf0 100644 -+--- a/libavcodec/codec_desc.c -++++ b/libavcodec/codec_desc.c -+@@ -1563,6 +1563,13 @@ static const AVCodecDescriptor codec_descriptors[] = { -+ .long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"), -+ .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, -+ }, -++ { -++ .id = AV_CODEC_ID_H264_MVC, -++ .type = AVMEDIA_TYPE_VIDEO, -++ .name = "h264_mvc", -++ .long_name = NULL_IF_CONFIG_SMALL("H264 MVC"), -++ .props = AV_CODEC_PROP_LOSSY, -++ }, -+ -+ /* various PCM "codecs" */ -+ { -+diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -+index b31d233..2767306 100644 -+--- a/libavformat/mpegts.c -++++ b/libavformat/mpegts.c -+@@ -701,7 +701,7 @@ static const StreamType ISO_types[] = { -+ #endif -+ { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, -+ { 0x1c, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC }, -+- { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, -++ { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264_MVC }, -+ { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 }, -+ { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, -+ { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, -+-- -+2.7.4 -+ -diff --git a/tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch b/tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..399e8a95984771e4388bfe4785423ff3f664f89b ---- /dev/null -+++ b/tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch -@@ -0,0 +1,116 @@ -+From 23dd20678a05e1764e5d8d30481cb354a51b6c8b Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sun, 26 Jun 2016 20:16:03 +0100 -+Subject: [PATCH] h264_parser: add support for parsing h264 mvc NALUs -+ -+--- -+ libavcodec/allcodecs.c | 1 + -+ libavcodec/h264.h | 2 ++ -+ libavcodec/h264_parser.c | 34 ++++++++++++++++++++++++++++++---- -+ 3 files changed, 33 insertions(+), 4 deletions(-) -+ -+diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c -+index 54efaad..02a89c3 100644 -+--- a/libavcodec/allcodecs.c -++++ b/libavcodec/allcodecs.c -+@@ -667,6 +667,7 @@ void avcodec_register_all(void) -+ REGISTER_PARSER(H261, h261); -+ REGISTER_PARSER(H263, h263); -+ REGISTER_PARSER(H264, h264); -++ REGISTER_PARSER(H264_MVC, h264_mvc); -+ REGISTER_PARSER(HEVC, hevc); -+ REGISTER_PARSER(MJPEG, mjpeg); -+ REGISTER_PARSER(MLP, mlp); -+diff --git a/libavcodec/h264.h b/libavcodec/h264.h -+index efe3555..16358aa 100644 -+--- a/libavcodec/h264.h -++++ b/libavcodec/h264.h -+@@ -126,7 +126,9 @@ enum { -+ NAL_END_STREAM = 11, -+ NAL_FILLER_DATA = 12, -+ NAL_SPS_EXT = 13, -++ NAL_SPS_SUBSET = 15, -+ NAL_AUXILIARY_SLICE = 19, -++ NAL_SLICE_EXT = 20, -+ NAL_FF_IGNORE = 0xff0f001, -+ }; -+ -+diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c -+index ce4bab2..082ac17 100644 -+--- a/libavcodec/h264_parser.c -++++ b/libavcodec/h264_parser.c -+@@ -58,6 +58,7 @@ typedef struct H264ParseContext { -+ uint8_t parse_history[6]; -+ int parse_history_count; -+ int parse_last_mb; -++ int is_mvc; -+ } H264ParseContext; -+ -+ -+@@ -105,14 +106,18 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, -+ } else if (state <= 5) { -+ int nalu_type = buf[i] & 0x1F; -+ if (nalu_type == NAL_SEI || nalu_type == NAL_SPS || -+- nalu_type == NAL_PPS || nalu_type == NAL_AUD) { -++ nalu_type == NAL_PPS || nalu_type == NAL_AUD || -++ nalu_type == NAL_SPS_SUBSET) { -+ if (pc->frame_start_found) { -+ i++; -+ goto found; -+ } -+ } else if (nalu_type == NAL_SLICE || nalu_type == NAL_DPA || -+- nalu_type == NAL_IDR_SLICE) { -++ nalu_type == NAL_IDR_SLICE || (p->is_mvc && nalu_type == NAL_SLICE_EXT)) { -+ state += 8; -++ -++ if (nalu_type == NAL_SLICE_EXT) -++ i += 3; // skip mvc extension -+ continue; -+ } -+ state = 7; -+@@ -585,7 +590,8 @@ static int h264_parse(AVCodecParserContext *s, -+ } -+ } -+ -+- parse_nal_units(s, avctx, buf, buf_size); -++ if (!p->is_mvc) -++ parse_nal_units(s, avctx, buf, buf_size); -+ -+ if (avctx->framerate.num) -+ avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); -+@@ -622,7 +628,7 @@ static int h264_split(AVCodecContext *avctx, -+ if ((state & 0xFFFFFF00) != 0x100) -+ break; -+ nalu_type = state & 0x1F; -+- if (nalu_type == NAL_SPS) { -++ if (nalu_type == NAL_SPS || nalu_type == NAL_SPS_SUBSET) { -+ has_sps = 1; -+ } else if (nalu_type == NAL_PPS) -+ has_pps = 1; -+@@ -672,3 +678,23 @@ AVCodecParser ff_h264_parser = { -+ .parser_close = h264_close, -+ .split = h264_split, -+ }; -++ -++static av_cold int init_mvc(AVCodecParserContext *s) -++{ -++ H264ParseContext *p = s->priv_data; -++ int ret = init(s); -++ if (ret < 0) -++ return ret; -++ -++ p->is_mvc = 1; -++ return 0; -++} -++ -++AVCodecParser ff_h264_mvc_parser = { -++ .codec_ids = { AV_CODEC_ID_H264_MVC }, -++ .priv_data_size = sizeof(H264ParseContext), -++ .parser_init = init_mvc, -++ .parser_parse = h264_parse, -++ .parser_close = h264_close, -++ .split = h264_split, -++}; -+-- -+2.7.4 -+ -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index 337dbaab927919858e44d79f647207ef0513eea1..7e97e4d91a443d46d933df528763422ff5e8f4fa 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -4,7 +4,9 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ - 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \ - hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch \ - pfcd_hevc_optimisations.patch \ -- 0001-Squashed-commit-of-the-following.patch -+ 0001-Squashed-commit-of-the-following.patch \ -+ 0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch 0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch \ -+ h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -90,6 +92,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - cd $(PLATFORM); patch -p1 < ../pfcd_hevc_optimisations.patch - cd $(PLATFORM); patch -p1 < ../0001-Squashed-commit-of-the-following.patch -+ cd $(PLATFORM); patch -p1 < ../0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch -+ cd $(PLATFORM); patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch -+ cd $(PLATFORM); patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch - - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index a61357f14cb2139e8125ae04684bed1b29fefb12..9f6c26c8acd08ed603aadeb4d9d81b07026e7506 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -137,6 +137,9 @@ patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - patch -p1 < ../pfcd_hevc_optimisations.patch - patch -p1 < ../0001-Squashed-commit-of-the-following.patch -+patch -p1 < ../0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch -+patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch -+patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch - - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ -diff --git a/tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch b/tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b98686bcc ---- /dev/null -+++ b/tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch -@@ -0,0 +1,55 @@ -+From 12d99a92469e5916de3bc787dce4c13abfdd5e09 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sun, 26 Jun 2016 20:20:04 +0100 -+Subject: [PATCH] h264_parser: fix parsing of mvc slices in some corner cases -+ -+--- -+ libavcodec/h264_parser.c | 10 +++++----- -+ 1 file changed, 5 insertions(+), 5 deletions(-) -+ -+diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c -+index 082ac17..b9b0c78 100644 -+--- a/libavcodec/h264_parser.c -++++ b/libavcodec/h264_parser.c -+@@ -59,6 +59,7 @@ typedef struct H264ParseContext { -+ int parse_history_count; -+ int parse_last_mb; -+ int is_mvc; -++ int slice_ext; -+ } H264ParseContext; -+ -+ -+@@ -116,18 +117,17 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, -+ nalu_type == NAL_IDR_SLICE || (p->is_mvc && nalu_type == NAL_SLICE_EXT)) { -+ state += 8; -+ -+- if (nalu_type == NAL_SLICE_EXT) -+- i += 3; // skip mvc extension -++ p->slice_ext = (nalu_type == NAL_SLICE_EXT); -+ continue; -+ } -+ state = 7; -+ } else { -+ p->parse_history[p->parse_history_count++] = buf[i]; -+- if (p->parse_history_count > 5) { -++ if (p->parse_history_count > 8) { -+ unsigned int mb, last_mb = p->parse_last_mb; -+ GetBitContext gb; -+ -+- init_get_bits(&gb, p->parse_history, 8*p->parse_history_count); -++ init_get_bits8(&gb, p->parse_history + 3*p->slice_ext, p->parse_history_count - 3*p->slice_ext); -+ p->parse_history_count = 0; -+ mb= get_ue_golomb_long(&gb); -+ p->parse_last_mb = mb; -+@@ -150,7 +150,7 @@ found: -+ pc->frame_start_found = 0; -+ if (p->is_avc) -+ return next_avc; -+- return i - (state & 5) - 5 * (state > 7); -++ return i - (state & 5) - 8 * (state > 7); -+ } -+ -+ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, -+-- -+2.7.4 -+ - -From 96ed6f043c6cc511daa085ba166329c1abdfca6c Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 29 Jan 2016 17:18:50 +0300 -Subject: [PATCH 37/61] [win32] Settings: Added setting to enable/disable MVC - decoder. - ---- - system/settings/win32.xml | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/system/settings/win32.xml b/system/settings/win32.xml -index a017d30c24232fb01220b87b29398403b8ed9662..2fcee72a64e8b701c8e895143410bbe9fd617356 100644 ---- a/system/settings/win32.xml -+++ b/system/settings/win32.xml -@@ -12,6 +12,17 @@ - false - - -+

-+ -+ -+ -+ 2 -+ true -+ -+ -+ -+ -+
-
- - - -From 032f97775cb10b8401549483110a52a36a147208 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Wed, 20 Jan 2016 17:02:16 +0300 -Subject: [PATCH 38/61] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc - streams. - ---- - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 23 +++++++++++++++++++++- - 1 file changed, 22 insertions(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index b485ad23e6309647db2bc489ed6bfda60cf506a1..50889977723cf3857216d68100fe0b3575253c92 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -25,6 +25,7 @@ - - #include "commons/Exception.h" - #include "cores/FFmpeg.h" -+#include "DVDCodecs/DVDCodecUtils.h" - #include "DVDClock.h" // for DVD_TIME_BASE - #include "DVDDemuxUtils.h" - #include "DVDInputStreams/DVDInputStream.h" -@@ -1356,6 +1357,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - } - case AVMEDIA_TYPE_VIDEO: - { -+ if (pStream->codec->codec_id == AV_CODEC_ID_H264_MVC) -+ { -+ // ignore MVC extension streams, they are handled specially -+ stream = new CDemuxStream(); -+ stream->type = STREAM_DATA; -+ stream->disabled = true; -+ pStream->need_parsing = AVSTREAM_PARSE_NONE; -+ break; -+ } - CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); - stream = st; - if(strcmp(m_pFormatContext->iformat->name, "flv") == 0) -@@ -1364,7 +1374,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - st->bVFR = false; - - // never trust pts in avi files with h264. -- if (m_bAVI && pStream->codec->codec_id == AV_CODEC_ID_H264) -+ if (m_bAVI && (pStream->codec->codec_id == AV_CODEC_ID_H264 || pStream->codec->codec_id == AV_CODEC_ID_H264_MVC)) - st->bPTSInvalid = true; - - #if defined(AVFORMAT_HAS_STREAM_GET_R_FRAME_RATE) -@@ -1436,6 +1446,17 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - if (av_dict_get(pStream->metadata, "title", NULL, 0)) - st->m_description = av_dict_get(pStream->metadata, "title", NULL, 0)->value; - -+ if (pStream->codec->codec_id == AV_CODEC_ID_H264) -+ { -+ if (CDVDCodecUtils::IsH264AnnexB(m_pFormatContext->iformat->name, pStream)) -+ { -+ // TODO -+ } -+ else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) -+ { -+ pStream->codec->codec_tag = MKTAG('M', 'V', 'C', '1'); -+ } -+ } - break; - } - case AVMEDIA_TYPE_DATA: - -From f67e4ff7460847e7e582cb4dfc21ef43be7d94ce Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Thu, 25 Feb 2016 11:21:25 +0300 -Subject: [PATCH 39/61] [Stereo3D] Added block_lr and block_rl to supported - modes. - ---- - xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp | 4 ++-- - xbmc/guilib/StereoscopicsManager.cpp | 8 +++++--- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp -index 24b1b10519467cbbfd96f7048efaf49aab7700cc..49f7f7ca7e144a259f6d06bd11cd97aa0b3242aa 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp -@@ -102,8 +102,8 @@ namespace RenderManager { - convert["right_left"] = CONF_FLAGS_STEREO_MODE_SBS | CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT; - convert["anaglyph_green_magenta"] = 0u; - convert["anaglyph_yellow_blue"] = 0u; -- convert["block_lr"] = 0u; -- convert["block_rl"] = 0u; -+ convert["block_lr"] = CONF_FLAGS_STEREO_CADANCE_LEFT_RIGHT; -+ convert["block_rl"] = CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT; - } - return convert[mode]; - } -diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp -index 618e6f4f0d6e792e0d0d60edfad2d59e3805ff7c..041324c51977ce880ab365a16f1ac366c79e369c 100644 ---- a/xbmc/guilib/StereoscopicsManager.cpp -+++ b/xbmc/guilib/StereoscopicsManager.cpp -@@ -71,8 +71,10 @@ static const struct StereoModeMap VideoModeToGuiModeMap[] = - { "anaglyph_cyan_red", RENDER_STEREO_MODE_ANAGLYPH_RED_CYAN }, - { "anaglyph_green_magenta", RENDER_STEREO_MODE_ANAGLYPH_GREEN_MAGENTA }, - { "anaglyph_yellow_blue", RENDER_STEREO_MODE_ANAGLYPH_YELLOW_BLUE }, -- { "block_lr", RENDER_STEREO_MODE_OFF }, // unsupported -- { "block_rl", RENDER_STEREO_MODE_OFF }, // unsupported -+ { "block_lr", RENDER_STEREO_MODE_HARDWAREBASED }, -+ { "block_rl", RENDER_STEREO_MODE_HARDWAREBASED }, -+ { "block_lr", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback -+ { "block_rl", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback - {} - }; - -@@ -311,7 +313,7 @@ int CStereoscopicsManager::ConvertVideoToGuiStereoMode(const std::string &mode) - size_t i = 0; - while (VideoModeToGuiModeMap[i].name) - { -- if (mode == VideoModeToGuiModeMap[i].name) -+ if (mode == VideoModeToGuiModeMap[i].name && g_Windowing.SupportsStereo(VideoModeToGuiModeMap[i].mode)) - return VideoModeToGuiModeMap[i].mode; - i++; - } - -From 376d61bb1d20f1e1e359e669ca53ac3a46aa2047 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Sat, 23 Jan 2016 10:21:32 +0300 -Subject: [PATCH 40/61] [VideoPlayer] Fix possible wrong aspect. - ---- - xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index d4920ac30216fb295a16b70ddff887e2077ee196..4f0e2cb561b5453217e961921049486dcd0636b3 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -@@ -182,7 +182,7 @@ void CVideoPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec) - } - - // use aspect in stream if available -- if(hint.forced_aspect) -+ if (hint.forced_aspect && !std::isnan(hint.aspect)) - m_fForcedAspectRatio = hint.aspect; - else - m_fForcedAspectRatio = 0.0; - -From 02211eeb217f672058f4936f981231f996c4658e Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 22 Jan 2016 18:18:33 +0300 -Subject: [PATCH 41/61] [VideoPlayer] DemuxFFmpeg: ssif remux - ---- - xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 + - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 47 ++++++- - .../cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h | 2 + - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp | 156 +++++++++++++++++++++ - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h | 49 +++++++ - xbmc/settings/AdvancedSettings.cpp | 2 +- - 6 files changed, 250 insertions(+), 8 deletions(-) - create mode 100644 xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp - create mode 100644 xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -index 63776b1333bb66483303e44d6ebe60f3cd7e14d7..156ec2021002d9d7a355db2f0dcf099aabb1db48 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -@@ -5,6 +5,7 @@ set(SOURCES DemuxMultiSource.cpp - DVDDemuxCDDA.cpp - DVDDemuxClient.cpp - DVDDemuxFFmpeg.cpp -+ DemuxStreamSSIF.cpp - DVDDemuxUtils.cpp - DVDDemuxVobsub.cpp - DVDFactoryDemuxer.cpp) -@@ -16,6 +17,7 @@ set(HEADERS DemuxMultiSource.h - DVDDemuxCDDA.h - DVDDemuxClient.h - DVDDemuxFFmpeg.h -+ DemuxStreamSSIF.h - DVDDemuxPacket.h - DVDDemuxUtils.h - DVDDemuxVobsub.h -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 50889977723cf3857216d68100fe0b3575253c92..bd3bd7490c35c487cca232e28a71ba207be74990 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -167,6 +167,7 @@ CDVDDemuxFFmpeg::CDVDDemuxFFmpeg() : CDVDDemux() - m_currentPts = DVD_NOPTS_VALUE; - m_bMatroska = false; - m_bAVI = false; -+ m_pSSIF = nullptr; - m_speed = DVD_PLAYSPEED_NORMAL; - m_program = UINT_MAX; - m_pkt.result = -1; -@@ -554,6 +555,8 @@ void CDVDDemuxFFmpeg::Dispose() - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); - -+ SAFE_DELETE(m_pSSIF); -+ - if (m_pFormatContext) - { - for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) -@@ -607,6 +610,9 @@ void CDVDDemuxFFmpeg::Flush() - - m_displayTime = 0; - m_dtsAtDisplayTime = DVD_NOPTS_VALUE; -+ -+ if (m_pSSIF) -+ m_pSSIF->Flush(); - } - - void CDVDDemuxFFmpeg::Abort() -@@ -879,7 +885,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - { - Flush(); - } -- else if (IsProgramChange()) -+ // libavformat is confused by the interleaved SSIF. -+ // Disable program management for those -+ else if (!m_pSSIF && IsProgramChange()) - { - // update streams - CreateStreams(m_program); -@@ -907,6 +915,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); -+ -+ if (m_pSSIF) -+ m_pSSIF->Flush(); - } - else - { -@@ -916,7 +927,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - - if (IsVideoReady()) - { -- if (m_program != UINT_MAX) -+ // libavformat is confused by the interleaved SSIF. -+ // Disable program management for those -+ if (!m_pSSIF && m_program != UINT_MAX ) - { - /* check so packet belongs to selected program */ - for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) -@@ -1065,6 +1078,15 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - stream = AddStream(pPacket->iStreamId); - } - } -+ if (stream && m_pSSIF) -+ { -+ if (stream->type == STREAM_VIDEO || -+ stream->type == STREAM_DATA) -+ pPacket = m_pSSIF->AddPacket(pPacket); -+ -+ if (stream->type == STREAM_DATA && stream->codec == AV_CODEC_ID_H264_MVC && pPacket->iSize) -+ stream = GetStream(pPacket->iStreamId); -+ } - if (!stream) - { - CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::AddStream - internal error, stream is null"); -@@ -1094,6 +1116,9 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); - -+ if (m_pSSIF) -+ m_pSSIF->Flush(); -+ - CDVDInputStream::IPosTime* ist = m_pInput->GetIPosTime(); - if (ist) - { -@@ -1174,6 +1199,9 @@ bool CDVDDemuxFFmpeg::SeekByte(int64_t pos) - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); - -+ if (m_pSSIF) -+ m_pSSIF->Flush(); -+ - return (ret >= 0); - } - -@@ -1359,11 +1387,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - { - if (pStream->codec->codec_id == AV_CODEC_ID_H264_MVC) - { -- // ignore MVC extension streams, they are handled specially -+ m_pSSIF = new CDemuxStreamSSIF(); -+ m_pSSIF->SetMVCStreamId(streamIdx); -+ - stream = new CDemuxStream(); - stream->type = STREAM_DATA; -- stream->disabled = true; -- pStream->need_parsing = AVSTREAM_PARSE_NONE; -+ pStream->codec->codec_type = AVMEDIA_TYPE_DATA; - break; - } - CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); -@@ -1450,7 +1479,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - { - if (CDVDCodecUtils::IsH264AnnexB(m_pFormatContext->iformat->name, pStream)) - { -- // TODO -+ if (m_pSSIF) -+ { -+ m_pSSIF->SetH264StreamId(streamIdx); -+ pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); -+ } - } - else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) - { -@@ -1562,7 +1595,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - if (langTag) - strncpy(stream->language, langTag->value, 3); - -- if( stream->type != STREAM_NONE && pStream->codec->extradata && pStream->codec->extradata_size > 0 ) -+ if (stream->type != STREAM_NONE && pStream->codec->extradata && pStream->codec->extradata_size > 0) - { - stream->ExtraSize = pStream->codec->extradata_size; - stream->ExtraData = new uint8_t[pStream->codec->extradata_size]; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h -index 73d536cc06710eab654f05fbc3e011d0c86c6a8b..364675293f73d40d4390b0d64e240df2432e082a 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h -@@ -21,6 +21,7 @@ - */ - - #include "DVDDemux.h" -+#include "DemuxStreamSSIF.h" - #include "threads/CriticalSection.h" - #include "threads/SystemClock.h" - #include -@@ -146,6 +147,7 @@ protected: - double m_currentPts; // used for stream length estimation - bool m_bMatroska; - bool m_bAVI; -+ CDemuxStreamSSIF* m_pSSIF; - int m_speed; - unsigned m_program; - XbmcThreads::EndTime m_timeout; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -new file mode 100644 -index 0000000000000000000000000000000000000000..f75532016a1395782b59dc124676835c7254de56 ---- /dev/null -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -@@ -0,0 +1,156 @@ -+/* -+* Copyright (C) 2005-2013 Team XBMC -+* http://xbmc.org -+* -+* This Program is free software; you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation; either version 2, or (at your option) -+* any later version. -+* -+* This Program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* -+* You should have received a copy of the GNU General Public License -+* along with XBMC; see the file COPYING. If not, see -+* . -+* -+*/ -+ -+#include "DemuxStreamSSIF.h" -+#include "DVDClock.h" -+#include "DVDDemuxUtils.h" -+#include "utils/log.h" -+ -+//#define DEBUG_VERBOSE -+ -+DemuxPacket* CDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) -+{ -+ if (srcPkt->iStreamId != m_h264StreamId && -+ srcPkt->iStreamId != m_mvcStreamId) -+ return srcPkt; -+ -+ if (srcPkt->iStreamId == m_h264StreamId) -+ { -+ m_H264queue.push(srcPkt); -+ } -+ else if (srcPkt->iStreamId == m_mvcStreamId) -+ { -+ m_MVCqueue.push(srcPkt); -+ } -+ -+ return GetMVCPacket(); -+} -+ -+void CDemuxStreamSSIF::Flush() -+{ -+ while (!m_H264queue.empty()) -+ { -+ CDVDDemuxUtils::FreeDemuxPacket(m_H264queue.front()); -+ m_H264queue.pop(); -+ } -+ while (!m_MVCqueue.empty()) -+ { -+ CDVDDemuxUtils::FreeDemuxPacket(m_MVCqueue.front()); -+ m_MVCqueue.pop(); -+ } -+} -+ -+DemuxPacket* CDemuxStreamSSIF::MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt) -+{ -+ DemuxPacket* newpkt = NULL; -+ newpkt = CDVDDemuxUtils::AllocateDemuxPacket(srcPkt->iSize + appendPkt->iSize); -+ newpkt->iSize = srcPkt->iSize + appendPkt->iSize; -+ -+ newpkt->pts = srcPkt->pts; -+ newpkt->dts = srcPkt->dts; -+ newpkt->duration = srcPkt->duration; -+ newpkt->iGroupId = srcPkt->iGroupId; -+ newpkt->iStreamId = srcPkt->iStreamId; -+ memcpy(newpkt->pData, srcPkt->pData, srcPkt->iSize); -+ memcpy(newpkt->pData + srcPkt->iSize, appendPkt->pData, appendPkt->iSize); -+ -+ CDVDDemuxUtils::FreeDemuxPacket(srcPkt); -+ srcPkt = NULL; -+ CDVDDemuxUtils::FreeDemuxPacket(appendPkt); -+ appendPkt = NULL; -+ -+ return newpkt; -+} -+ -+DemuxPacket* CDemuxStreamSSIF::GetMVCPacket() -+{ -+ // Here, we recreate a h264 MVC packet from the base one + buffered MVC NALU's -+ while (!m_H264queue.empty() && !m_MVCqueue.empty()) -+ { -+ DemuxPacket* h264pkt = m_H264queue.front(); -+ double tsH264 = (h264pkt->dts != DVD_NOPTS_VALUE ? h264pkt->dts : h264pkt->pts); -+ DemuxPacket* mvcpkt = m_MVCqueue.front(); -+ double tsMVC = (mvcpkt->dts != DVD_NOPTS_VALUE ? mvcpkt->dts : mvcpkt->pts); -+ -+ if (tsH264 == tsMVC) -+ { -+ m_H264queue.pop(); -+ m_MVCqueue.pop(); -+ -+ while (!m_H264queue.empty()) -+ { -+ DemuxPacket* pkt = m_H264queue.front(); -+ double ts = (pkt->dts != DVD_NOPTS_VALUE ? pkt->dts : pkt->pts); -+ if (ts == DVD_NOPTS_VALUE) -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC merge h264 fragment: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", h264pkt->iSize, pkt->iSize, h264pkt->pts*1e-6, pkt->pts*1e-6, h264pkt->dts*1e-6, pkt->dts*1e-6); -+#endif -+ h264pkt = MergePacket(h264pkt, pkt); -+ m_H264queue.pop(); -+ } -+ else -+ break; -+ } -+ while (!m_MVCqueue.empty()) -+ { -+ DemuxPacket* pkt = m_MVCqueue.front(); -+ double ts = (pkt->dts != DVD_NOPTS_VALUE ? pkt->dts : pkt->pts); -+ if (ts == DVD_NOPTS_VALUE) -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC merge mvc fragment: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", mvcpkt->iSize, pkt->iSize, mvcpkt->pts*1e-6, pkt->pts*1e-6, mvcpkt->dts*1e-6, pkt->dts*1e-6); -+#endif -+ mvcpkt = MergePacket(mvcpkt, pkt); -+ m_MVCqueue.pop(); -+ } -+ else -+ break; -+ } -+ -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC merge packet: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", h264pkt->iSize, mvcpkt->iSize, h264pkt->pts*1e-6, mvcpkt->pts*1e-6, h264pkt->dts*1e-6, mvcpkt->dts*1e-6); -+#endif -+ return MergePacket(h264pkt, mvcpkt); -+ } -+ else if (tsH264 > tsMVC) -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC discard mvc: %6d, pts(%.3f) dts(%.3f)", mvcpkt->iSize, mvcpkt->pts*1e-6, mvcpkt->dts*1e-6); -+#endif -+ CDVDDemuxUtils::FreeDemuxPacket(mvcpkt); -+ m_MVCqueue.pop(); -+ } -+ else -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC discard h264: %6d, pts(%.3f) dts(%.3f)", h264pkt->iSize, h264pkt->pts*1e-6, h264pkt->dts*1e-6); -+#endif -+ CDVDDemuxUtils::FreeDemuxPacket(h264pkt); -+ m_H264queue.pop(); -+ } -+ } -+ -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC waiting. MVC(%d) H264(%d)", m_MVCqueue.size(), m_H264queue.size()); -+#endif -+ -+ return CDVDDemuxUtils::AllocateDemuxPacket(0); -+} -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -new file mode 100644 -index 0000000000000000000000000000000000000000..1dafdc58db3f9cb5eac032c591942439117e13c4 ---- /dev/null -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -@@ -0,0 +1,49 @@ -+#pragma once -+ -+/* -+* Copyright (C) 2005-2013 Team XBMC -+* http://xbmc.org -+* -+* This Program is free software; you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation; either version 2, or (at your option) -+* any later version. -+* -+* This Program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* -+* You should have received a copy of the GNU General Public License -+* along with XBMC; see the file COPYING. If not, see -+* . -+* -+*/ -+ -+#include "DVDDemuxPacket.h" -+#include -+ -+extern "C" { -+#include "libavformat/avformat.h" -+} -+ -+class CDemuxStreamSSIF -+{ -+public: -+ CDemuxStreamSSIF() {}; -+ ~CDemuxStreamSSIF() { Flush(); } -+ -+ DemuxPacket* AddPacket(DemuxPacket* &scrPkt); -+ void Flush(); -+ void SetH264StreamId(int id) { m_h264StreamId = id; }; -+ void SetMVCStreamId(int id) { m_mvcStreamId = id; }; -+ -+private: -+ DemuxPacket* GetMVCPacket(); -+ DemuxPacket* MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt); -+ -+ std::queue m_H264queue; -+ std::queue m_MVCqueue; -+ int m_h264StreamId = 0; -+ int m_mvcStreamId = 0; -+}; -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index c728dd652d323fb5f0882b7dbd2887fd59dfe0e2..aff4a915c7a129772f4d2272fff386067c578bce 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -391,7 +391,7 @@ void CAdvancedSettings::Initialize() - - m_pictureExtensions = ".png|.jpg|.jpeg|.bmp|.gif|.ico|.tif|.tiff|.tga|.pcx|.cbz|.zip|.cbr|.rar|.rss|.webp|.jp2|.apng"; - m_musicExtensions = ".nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.gdm|.imf|.m15|.sfx|.uni|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.rar|.wv|.dsp|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.wtv|.mka|.tak|.opus|.dff|.dsf"; -- m_videoExtensions = ".m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.mpd|.m3u|.m3u8|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.mk3d|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv"; -+ m_videoExtensions = ".m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.mpd|.m3u|.m3u8|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.mk3d|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv|.ssif"; - m_subtitlesExtensions = ".utf|.utf8|.utf-8|.sub|.srt|.smi|.rt|.txt|.ssa|.text|.ssa|.aqt|.jss|.ass|.idx|.ifo|.rar|.zip"; - m_discStubExtensions = ".disc"; - // internal music extensions - -From d79fe987006170fa686a5e03c742dadd6ffd5875 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Tue, 23 Feb 2016 16:02:46 +0300 -Subject: [PATCH 42/61] [3DBD] Added support of 3D-BluRay playback. - ---- - lib/DllLibbluray.h | 8 + - xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 + - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 51 +++- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 266 +++++++++++++++++++++ - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h | 57 +++++ - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp | 40 +++- - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h | 12 +- - .../DVDInputStreams/DVDInputStreamBluray.cpp | 159 ++++++++++-- - .../DVDInputStreams/DVDInputStreamBluray.h | 20 ++ - 9 files changed, 580 insertions(+), 35 deletions(-) - create mode 100644 xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp - create mode 100644 xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h - -diff --git a/lib/DllLibbluray.h b/lib/DllLibbluray.h -index f5a337fe19beff472557c97ff7a203ad30a912b2..03f93391265e164837c2a17a8fe6d7da41c2f13e 100644 ---- a/lib/DllLibbluray.h -+++ b/lib/DllLibbluray.h -@@ -31,6 +31,8 @@ extern "C" - #include - #include - #include -+#include -+#include - } - - class DllLibblurayInterface -@@ -80,6 +82,8 @@ public: - #endif - virtual int bd_menu_call (BLURAY *bd, int64_t pts)=0; - virtual int bd_mouse_select (BLURAY *bd, int64_t pts, uint16_t x, uint16_t y)=0; -+ virtual MPLS_PL* bd_get_title_mpls (BLURAY *bd) = 0; -+ virtual int bd_get_clip_infos (BLURAY *bd, unsigned clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration) = 0; - }; - - class DllLibbluray : public DllDynamic, DllLibblurayInterface -@@ -128,6 +132,8 @@ class DllLibbluray : public DllDynamic, DllLibblurayInterface - #endif - DEFINE_METHOD2(int, bd_menu_call, (BLURAY *p1, int64_t p2)) - DEFINE_METHOD4(int, bd_mouse_select, (BLURAY *p1, int64_t p2, uint16_t p3, uint16_t p4)) -+ DEFINE_METHOD1(MPLS_PL*, bd_get_title_mpls, (BLURAY *p1)) -+ DEFINE_METHOD6(int, bd_get_clip_infos, (BLURAY *p1, unsigned p2, uint64_t *p3, uint64_t *p4, uint64_t *p5, uint64_t *p6)) - - BEGIN_METHOD_RESOLVE() - RESOLVE_METHOD(bd_get_titles) -@@ -172,6 +178,8 @@ class DllLibbluray : public DllDynamic, DllLibblurayInterface - #endif - RESOLVE_METHOD(bd_menu_call) - RESOLVE_METHOD(bd_mouse_select) -+ RESOLVE_METHOD(bd_get_title_mpls) -+ RESOLVE_METHOD(bd_get_clip_infos) - END_METHOD_RESOLVE() - - public: -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -index 156ec2021002d9d7a355db2f0dcf099aabb1db48..87d27b666f703743bb0170252cf1190da5bce261 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -@@ -6,6 +6,7 @@ set(SOURCES DemuxMultiSource.cpp - DVDDemuxClient.cpp - DVDDemuxFFmpeg.cpp - DemuxStreamSSIF.cpp -+ DemuxMVC.cpp - DVDDemuxUtils.cpp - DVDDemuxVobsub.cpp - DVDFactoryDemuxer.cpp) -@@ -18,6 +19,7 @@ set(HEADERS DemuxMultiSource.h - DVDDemuxClient.h - DVDDemuxFFmpeg.h - DemuxStreamSSIF.h -+ DemuxMVC.h - DVDDemuxPacket.h - DVDDemuxUtils.h - DVDDemuxVobsub.h -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index bd3bd7490c35c487cca232e28a71ba207be74990..b80f44994dfbc9f4cac37f9cad7926c0d32371e2 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -27,6 +27,7 @@ - #include "cores/FFmpeg.h" - #include "DVDCodecs/DVDCodecUtils.h" - #include "DVDClock.h" // for DVD_TIME_BASE -+#include "DemuxMVC.h" - #include "DVDDemuxUtils.h" - #include "DVDInputStreams/DVDInputStream.h" - #include "DVDInputStreams/DVDInputStreamFFmpeg.h" -@@ -504,6 +505,16 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein - - UpdateCurrentPTS(); - -+ if (!fileinfo && m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY)) -+ { -+ CDVDInputStreamBluray *bluRay = static_cast(m_pInput); -+ if (bluRay->HasMVC()) -+ { -+ SAFE_DELETE(m_pSSIF); -+ m_pSSIF = new CDemuxStreamSSIF(); -+ m_pSSIF->SetBluRay(bluRay); -+ } -+ } - // in case of mpegts and we have not seen pat/pmt, defer creation of streams - if (!skipCreateStreams || m_pFormatContext->nb_programs > 0) - { -@@ -885,9 +896,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - { - Flush(); - } -- // libavformat is confused by the interleaved SSIF. -- // Disable program management for those -- else if (!m_pSSIF && IsProgramChange()) -+ else if (IsProgramChange()) - { - // update streams - CreateStreams(m_program); -@@ -928,8 +937,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - if (IsVideoReady()) - { - // libavformat is confused by the interleaved SSIF. -- // Disable program management for those -- if (!m_pSSIF && m_program != UINT_MAX ) -+ if ((!m_pSSIF || m_pSSIF->IsBluRay()) && m_program != UINT_MAX) - { - /* check so packet belongs to selected program */ - for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) -@@ -1080,10 +1088,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - } - if (stream && m_pSSIF) - { -- if (stream->type == STREAM_VIDEO || -- stream->type == STREAM_DATA) -- pPacket = m_pSSIF->AddPacket(pPacket); -- -+ pPacket = m_pSSIF->AddPacket(pPacket); - if (stream->type == STREAM_DATA && stream->codec == AV_CODEC_ID_H264_MVC && pPacket->iSize) - stream = GetStream(pPacket->iStreamId); - } -@@ -1483,6 +1488,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - { - m_pSSIF->SetH264StreamId(streamIdx); - pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); -+ -+ AVStream* mvcStream = nullptr; -+ if (m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY)) -+ { -+ CDVDInputStreamBluray *bluRay = static_cast(m_pInput); -+ if (bluRay->HasMVC()) -+ { -+ st->stereo_mode = bluRay->AreEyesFlipped() ? "block_rl" : "block_lr"; -+ mvcStream = static_cast(bluRay->GetDemuxMVC())->GetAVStream(); -+ } -+ } -+ else -+ mvcStream = m_pFormatContext->streams[m_pSSIF->GetMVCStreamId()]; -+ -+ if (mvcStream && pStream->codec->extradata_size > 0 && mvcStream->codec->extradata_size > 0) -+ { -+ uint8_t* extr = pStream->codec->extradata; -+ pStream->codec->extradata = (uint8_t*)av_mallocz(pStream->codec->extradata_size + mvcStream->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ memcpy(pStream->codec->extradata, extr, pStream->codec->extradata_size); -+ memcpy(pStream->codec->extradata + pStream->codec->extradata_size, mvcStream->codec->extradata, mvcStream->codec->extradata_size); -+ pStream->codec->extradata_size += mvcStream->codec->extradata_size; -+ av_free(extr); -+ } - } - } - else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) -@@ -1806,6 +1834,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) - - bool CDVDDemuxFFmpeg::IsProgramChange() - { -+ // libavformat is confused by the interleaved SSIF. -+ // disable program management for those -+ if (m_pSSIF && !m_pSSIF->IsBluRay()) -+ return false; -+ - if (m_program == UINT_MAX) - return false; - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -new file mode 100644 -index 0000000000000000000000000000000000000000..ade6a4454fc3915b0c787b1a4f72aedbd74903db ---- /dev/null -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -@@ -0,0 +1,266 @@ -+/* -+* Copyright (C) 2005-2013 Team XBMC -+* http://xbmc.org -+* -+* This Program is free software; you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation; either version 2, or (at your option) -+* any later version. -+* -+* This Program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* -+* You should have received a copy of the GNU General Public License -+* along with XBMC; see the file COPYING. If not, see -+* . -+* -+*/ -+ -+#include "DemuxMVC.h" -+#include "DVDDemuxUtils.h" -+#include "DVDInputStreams/DVDInputStream.h" -+#include "DVDClock.h" -+#include "cores/FFmpeg.h" -+#include "utils/log.h" -+ -+extern "C" { -+#include "libavutil/opt.h" -+}; -+ -+#define MVC_SEEK_TIME_WINDOW 75000 // experimental value depends on seeking accurate -+ -+static int mvc_file_read(void *h, uint8_t* buf, int size) -+{ -+ CDVDInputStream* pInputStream = static_cast(h)->m_pInput; -+ return pInputStream->Read(buf, size); -+} -+ -+static int64_t mvc_file_seek(void *h, int64_t pos, int whence) -+{ -+ CDVDInputStream* pInputStream = static_cast(h)->m_pInput; -+ if (whence == AVSEEK_SIZE) -+ return pInputStream->GetLength(); -+ else -+ return pInputStream->Seek(pos, whence & ~AVSEEK_FORCE); -+} -+ -+CDemuxMVC::CDemuxMVC() -+{ -+ m_ioContext = nullptr; -+ m_pFormatContext = nullptr; -+ m_pInput = nullptr; -+ m_nStreamIndex = -1; -+} -+ -+CDemuxMVC::~CDemuxMVC() -+{ -+ Dispose(); -+} -+ -+bool CDemuxMVC::Open(CDVDInputStream* pInput) -+{ -+ int ret; -+ -+ if (!pInput) -+ return false; -+ m_pInput = pInput; -+ -+ unsigned char* buffer = (unsigned char*)av_malloc(FFMPEG_FILE_BUFFER_SIZE); -+ m_ioContext = avio_alloc_context(buffer, FFMPEG_FILE_BUFFER_SIZE, 0, this, mvc_file_read, NULL, mvc_file_seek); -+ m_ioContext->max_packet_size = m_pInput->GetBlockSize(); -+ if (m_ioContext->max_packet_size) -+ m_ioContext->max_packet_size *= FFMPEG_FILE_BUFFER_SIZE / m_ioContext->max_packet_size; -+ -+ m_pFormatContext = avformat_alloc_context(); -+ m_pFormatContext->pb = m_ioContext; -+ -+ AVInputFormat *format = av_find_input_format("mpegts"); -+ ret = avformat_open_input(&m_pFormatContext, m_pInput->GetFileName().c_str(), format, nullptr); -+ if (ret < 0) -+ { -+ CLog::Log(LOGDEBUG, "%s: Opening MVC demuxing context failed (%d)", __FUNCTION__, ret); -+ Dispose(); -+ return false; -+ } -+ -+ av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0); -+ av_opt_set_int(m_pFormatContext, "correct_ts_overflow", 0, 0); -+ m_pFormatContext->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; -+ -+ // Find the streams -+ ret = avformat_find_stream_info(m_pFormatContext, nullptr); -+ //it always returns -1 so just ignore it -+ //if (ret < 0) -+ //{ -+ // CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::OpenMVCDemuxer(): avformat_find_stream_info failed (%d)", ret); -+ // Dispose(); -+ // return false; -+ //} -+ -+ // print some extra information -+ av_dump_format(m_pFormatContext, 0, m_pInput->GetFileName().c_str(), 0); -+ -+ // Find and select our MVC stream -+ CLog::Log(LOGDEBUG, "%s: MVC m2ts has %d streams", __FUNCTION__, m_pFormatContext->nb_streams); -+ for (unsigned i = 0; i < m_pFormatContext->nb_streams; i++) -+ { -+ if (m_pFormatContext->streams[i]->codec->codec_id == AV_CODEC_ID_H264_MVC -+ && m_pFormatContext->streams[i]->codec->extradata_size > 0) -+ { -+ m_nStreamIndex = i; -+ break; -+ } -+ else -+ m_pFormatContext->streams[i]->discard = AVDISCARD_ALL; -+ } -+ -+ if (m_nStreamIndex < 0) -+ { -+ CLog::Log(LOGDEBUG, "%s: MVC Stream not found", __FUNCTION__); -+ Dispose(); -+ return false; -+ } -+ -+ return true; -+} -+ -+void CDemuxMVC::Reset() -+{ -+ CDVDInputStream* pInput = m_pInput; -+ Dispose(); -+ Open(pInput); -+} -+ -+void CDemuxMVC::Abort() -+{ -+} -+ -+void CDemuxMVC::Flush() -+{ -+ if (m_pFormatContext) -+ { -+ if (m_pFormatContext->pb) -+ avio_flush(m_pFormatContext->pb); -+ avformat_flush(m_pFormatContext); -+ } -+} -+ -+DemuxPacket* CDemuxMVC::Read() -+{ -+ int ret; -+ AVPacket mvcPacket = { 0 }; -+ av_init_packet(&mvcPacket); -+ -+ while (true) -+ { -+ ret = av_read_frame(m_pFormatContext, &mvcPacket); -+ -+ if (ret == AVERROR(EINTR) || ret == AVERROR(EAGAIN)) -+ continue; -+ else if (ret == AVERROR_EOF) -+ break; -+ else if (mvcPacket.size <= 0 || mvcPacket.stream_index != m_nStreamIndex) -+ { -+ av_packet_unref(&mvcPacket); -+ continue; -+ } -+ else -+ { -+ AVStream *stream = m_pFormatContext->streams[mvcPacket.stream_index]; -+ double dts = ConvertTimestamp(mvcPacket.dts, stream->time_base.den, stream->time_base.num); -+ double pts = ConvertTimestamp(mvcPacket.pts, stream->time_base.den, stream->time_base.num); -+ -+ DemuxPacket* newPkt = CDVDDemuxUtils::AllocateDemuxPacket(mvcPacket.size); -+ if (mvcPacket.data) -+ memcpy(newPkt->pData, mvcPacket.data, mvcPacket.size); -+ newPkt->iSize = mvcPacket.size; -+ newPkt->dts = dts; -+ newPkt->pts = pts; -+ newPkt->iStreamId = stream->id; -+ -+ av_packet_unref(&mvcPacket); -+ return newPkt; -+ } -+ } -+ -+ return nullptr; -+} -+ -+bool CDemuxMVC::SeekTime(int time, bool backwords, double* startpts) -+{ -+ if (!m_pInput) -+ return false; -+ -+ AVRational time_base = m_pFormatContext->streams[m_nStreamIndex]->time_base; -+ int64_t seek_pts = av_rescale(DVD_MSEC_TO_TIME(time), time_base.den, (int64_t)time_base.num * AV_TIME_BASE); -+ int64_t starttime = 0; -+ -+ if (m_pFormatContext->start_time != (int64_t)AV_NOPTS_VALUE) -+ starttime = av_rescale(m_pFormatContext->start_time, time_base.den, (int64_t)time_base.num * AV_TIME_BASE); -+ if (starttime != 0) -+ seek_pts += starttime; -+ if (seek_pts < MVC_SEEK_TIME_WINDOW) -+ seek_pts = 0; -+ else -+ seek_pts -= MVC_SEEK_TIME_WINDOW; -+ -+ av_seek_frame(m_pFormatContext, m_nStreamIndex, seek_pts, AVSEEK_FLAG_BACKWARD); -+ return true; -+} -+ -+std::string CDemuxMVC::GetFileName() -+{ -+ return m_pInput->GetFileName(); -+} -+ -+AVStream* CDemuxMVC::GetAVStream() -+{ -+ return m_pFormatContext ? m_pFormatContext->streams[m_nStreamIndex] : nullptr; -+} -+ -+void CDemuxMVC::Dispose() -+{ -+ if (m_pFormatContext) -+ avformat_close_input(&m_pFormatContext); -+ -+ if (m_ioContext) -+ { -+ av_free(m_ioContext->buffer); -+ av_free(m_ioContext); -+ } -+ -+ m_ioContext = nullptr; -+ m_pFormatContext = nullptr; -+ m_pInput = nullptr; -+ m_nStreamIndex = -1; -+} -+ -+double CDemuxMVC::ConvertTimestamp(int64_t pts, int den, int num) -+{ -+ if (pts == (int64_t)AV_NOPTS_VALUE) -+ return DVD_NOPTS_VALUE; -+ -+ // do calculations in floats as they can easily overflow otherwise -+ // we don't care for having a completly exact timestamp anyway -+ double timestamp = (double)pts * num / den; -+ double starttime = 0.0f; -+ -+ /*if (m_MVCFormatContext->start_time != (int64_t)AV_NOPTS_VALUE) -+ starttime = (double)m_MVCFormatContext->start_time / AV_TIME_BASE;*/ -+ -+ if (timestamp > starttime) -+ timestamp -= starttime; -+ // allow for largest possible difference in pts and dts for a single packet -+ else if (timestamp + 0.5f > starttime) -+ timestamp = 0; -+ -+ return timestamp * DVD_TIME_BASE; -+} -+ -+std::vector CDemuxMVC::GetStreams() const -+{ -+ std::vector streams; -+ return streams; -+} -\ No newline at end of file -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -new file mode 100644 -index 0000000000000000000000000000000000000000..bbb836a61344689a83af68c821c05c212a86b097 ---- /dev/null -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -@@ -0,0 +1,57 @@ -+#pragma once -+ -+/* -+* Copyright (C) 2005-2013 Team XBMC -+* http://xbmc.org -+* -+* This Program is free software; you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation; either version 2, or (at your option) -+* any later version. -+* -+* This Program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* -+* You should have received a copy of the GNU General Public License -+* along with XBMC; see the file COPYING. If not, see -+* . -+* -+*/ -+ -+#include "DVDDemux.h" -+ -+extern "C" { -+#include "libavformat/avformat.h" -+} -+ -+class CDemuxMVC : public CDVDDemux -+{ -+public: -+ CDemuxMVC(); -+ virtual ~CDemuxMVC(); -+ bool Open(CDVDInputStream* pInput); -+ virtual void Reset(); -+ virtual void Abort(); -+ virtual void Flush(); -+ virtual DemuxPacket* Read(); -+ virtual bool SeekTime(int time, bool backwords = false, double* startpts = nullptr); -+ virtual void SetSpeed(int iSpeed) { }; -+ virtual int GetStreamLength() { return 0; }; -+ virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; }; -+ virtual std::vector GetStreams() const override; -+ virtual int GetNrOfStreams() const override { return 1; }; -+ virtual std::string GetFileName(); -+ -+ AVStream* GetAVStream(); -+ CDVDInputStream* m_pInput; -+ -+private: -+ void Dispose(); -+ double ConvertTimestamp(int64_t pts, int den, int num); -+ -+ AVIOContext *m_ioContext = nullptr; -+ AVFormatContext *m_pFormatContext = nullptr; -+ int m_nStreamIndex = -1; -+}; -\ No newline at end of file -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -index f75532016a1395782b59dc124676835c7254de56..2c7e66f7ee5683a0fbcde5ad5c65ebfd6853f3d0 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -@@ -19,11 +19,13 @@ - */ - - #include "DemuxStreamSSIF.h" -+#include "DVDDemux.h" - #include "DVDClock.h" - #include "DVDDemuxUtils.h" - #include "utils/log.h" - - //#define DEBUG_VERBOSE -+#define MVC_QUEUE_SIZE 100 - - DemuxPacket* CDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) - { -@@ -37,7 +39,7 @@ DemuxPacket* CDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) - } - else if (srcPkt->iStreamId == m_mvcStreamId) - { -- m_MVCqueue.push(srcPkt); -+ AddMVCExtPacket(srcPkt); - } - - return GetMVCPacket(); -@@ -81,6 +83,10 @@ DemuxPacket* CDemuxStreamSSIF::MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &a - - DemuxPacket* CDemuxStreamSSIF::GetMVCPacket() - { -+ // if input is a bluray fill mvc queue before processing -+ if (m_bluRay && m_MVCqueue.empty() && !m_H264queue.empty()) -+ FillMVCQueue(m_H264queue.front()->dts); -+ - // Here, we recreate a h264 MVC packet from the base one + buffered MVC NALU's - while (!m_H264queue.empty() && !m_MVCqueue.empty()) - { -@@ -151,6 +157,36 @@ DemuxPacket* CDemuxStreamSSIF::GetMVCPacket() - #if defined(DEBUG_VERBOSE) - CLog::Log(LOGDEBUG, ">>> MVC waiting. MVC(%d) H264(%d)", m_MVCqueue.size(), m_H264queue.size()); - #endif -- - return CDVDDemuxUtils::AllocateDemuxPacket(0); - } -+ -+void CDemuxStreamSSIF::AddMVCExtPacket(DemuxPacket* &mvcExtPkt) -+{ -+ m_MVCqueue.push(mvcExtPkt); -+} -+ -+bool CDemuxStreamSSIF::FillMVCQueue(double dtsBase) -+{ -+ if (!m_bluRay) -+ return false; -+ -+ CDVDDemux* demux = m_bluRay->GetDemuxMVC(); -+ DemuxPacket* mvc; -+ while ((m_MVCqueue.size() < MVC_QUEUE_SIZE) && (mvc = demux->Read())) -+ { -+ if (dtsBase == DVD_NOPTS_VALUE || mvc->dts == DVD_NOPTS_VALUE) -+ { -+ // do nothing, can't compare timestamps when they are not set -+ } -+ else if (mvc->dts < dtsBase) -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC discard mvc: %6d, pts(%.3f) dts(%.3f)", mvc->iSize, mvc->pts*1e-6, mvc->dts*1e-6); -+#endif -+ CDVDDemuxUtils::FreeDemuxPacket(mvc); -+ continue; -+ } -+ AddMVCExtPacket(mvc); -+ }; -+ return m_MVCqueue.size() == MVC_QUEUE_SIZE; -+} -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -index 1dafdc58db3f9cb5eac032c591942439117e13c4..508e9debd3e6679a1433842a65649fa68ead76ec 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -@@ -21,6 +21,7 @@ - */ - - #include "DVDDemuxPacket.h" -+#include "DVDInputStreams/DVDInputStreamBluray.h" - #include - - extern "C" { -@@ -37,13 +38,20 @@ public: - void Flush(); - void SetH264StreamId(int id) { m_h264StreamId = id; }; - void SetMVCStreamId(int id) { m_mvcStreamId = id; }; -+ int GetH264StreamId() { return m_h264StreamId; }; -+ int GetMVCStreamId() { return m_mvcStreamId; }; -+ void AddMVCExtPacket(DemuxPacket* &scrPkt); -+ void SetBluRay(CDVDInputStreamBluray* &bluRay) { m_bluRay = bluRay; }; -+ bool IsBluRay() { return m_bluRay != nullptr; }; - - private: - DemuxPacket* GetMVCPacket(); - DemuxPacket* MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt); -+ bool FillMVCQueue(double dtsBase); - -+ CDVDInputStreamBluray* m_bluRay = nullptr; - std::queue m_H264queue; - std::queue m_MVCqueue; -- int m_h264StreamId = 0; -- int m_mvcStreamId = 0; -+ int m_h264StreamId = -1; -+ int m_mvcStreamId = -1; - }; -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -index 55bc91384500f64f6cc4242514aa3104393de2cb..a2c59b137ebdb7a44aea4fe1216eb9a2f43c048c 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -@@ -26,6 +26,8 @@ - #include "IVideoPlayer.h" - #include "DVDCodecs/Overlay/DVDOverlay.h" - #include "DVDCodecs/Overlay/DVDOverlayImage.h" -+#include "DVDInputStreamFile.h" -+#include "DVDDemuxers/DemuxMVC.h" - #include "settings/Settings.h" - #include "LangInfo.h" - #include "ServiceBroker.h" -@@ -232,10 +234,8 @@ bool CDVDInputStreamBluray::IsEOF() - - BLURAY_TITLE_INFO* CDVDInputStreamBluray::GetTitleLongest() - { -- int titles = m_dll->bd_get_titles(m_bd, TITLES_RELEVANT, 0); -- - BLURAY_TITLE_INFO *s = NULL; -- for(int i=0; i < titles; i++) -+ for(int i=0; i < m_nTitles; i++) - { - BLURAY_TITLE_INFO *t = m_dll->bd_get_title_info(m_bd, i, 0); - if(!t) -@@ -327,6 +327,7 @@ bool CDVDInputStreamBluray::Open() - return false; - } - -+ m_root = root; - const BLURAY_DISC_INFO *disc_info; - - disc_info = m_dll->bd_get_disc_info(m_bd); -@@ -350,6 +351,7 @@ bool CDVDInputStreamBluray::Open() - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Open - BD+ detected : %d", disc_info->bdplus_detected); - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Open - libbdplus detected : %d", disc_info->libbdplus_detected); - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Open - BD+ handled : %d", disc_info->bdplus_handled); -+ CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Open - 3D content exist : %d", disc_info->content_exist_3D); - } - else - CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - BluRay not detected"); -@@ -366,6 +368,7 @@ bool CDVDInputStreamBluray::Open() - return false; - } - -+ m_nTitles = m_dll->bd_get_titles(m_bd, TITLES_RELEVANT, 0); - int mode = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_DISC_PLAYBACK); - - if (URIUtils::HasExtension(filename, ".mpls")) -@@ -394,18 +397,17 @@ bool CDVDInputStreamBluray::Open() - m_title = GetTitleLongest(); - } - -- if(m_navmode) -+ SetupPlayerSettings(); -+ m_dll->bd_get_event(m_bd, NULL); -+ -+ if (m_navmode) - { -- SetupPlayerSettings(); - - m_dll->bd_register_overlay_proc (m_bd, this, bluray_overlay_cb); - #ifdef HAVE_LIBBLURAY_BDJ - m_dll->bd_register_argb_overlay_proc (m_bd, this, bluray_overlay_argb_cb, NULL); - #endif - -- m_dll->bd_get_event(m_bd, NULL); -- -- - if(m_dll->bd_play(m_bd) <= 0) - { - CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed play disk %s", strPath.c_str()); -@@ -420,21 +422,25 @@ bool CDVDInputStreamBluray::Open() - CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed to get title info"); - return false; - } -- -- if(m_dll->bd_select_playlist(m_bd, m_title->playlist) == 0 ) -+ if (m_dll->bd_select_playlist(m_bd, m_title->playlist) == 0) - { - CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed to select title %d", m_title->idx); - return false; - } -- m_clip = 0; - } - -+ // Process any events that occured during opening -+ while (m_dll->bd_get_event(m_bd, &m_event)) -+ ProcessEvent(); -+ - return true; - } - - // close file and reset everything - void CDVDInputStreamBluray::Close() - { -+ CloseMVCDemux(); -+ - if (!m_dll) - return; - if(m_title) -@@ -450,7 +456,7 @@ void CDVDInputStreamBluray::Close() - - void CDVDInputStreamBluray::ProcessEvent() { - -- int pid = -1; -+ int pid = -1, ret; - switch (m_event.event) { - - case BD_EVENT_ERROR: -@@ -515,15 +521,17 @@ void CDVDInputStreamBluray::ProcessEvent() { - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - BD_EVENT_PLAYLIST %d", - m_event.param); - m_playlist = m_event.param; -- if(m_title) -- m_dll->bd_free_title_info(m_title); -- m_title = m_dll->bd_get_playlist_info(m_bd, m_playlist, m_angle); -+ ProcessItem(m_playlist); - break; - - case BD_EVENT_PLAYITEM: - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - BD_EVENT_PLAYITEM %d", - m_event.param); - m_clip = m_event.param; -+ uint64_t clip_start, clip_in, bytepos; -+ ret = m_dll->bd_get_clip_infos(m_bd, m_clip, &clip_start, &clip_in, &bytepos, nullptr); -+ if (ret) -+ m_clipStartTime = clip_start / 90; - break; - - case BD_EVENT_CHAPTER: -@@ -602,14 +610,20 @@ void CDVDInputStreamBluray::ProcessEvent() { - - /* event has been consumed */ - m_event.event = BD_EVENT_NONE; -+ -+ if (m_bMVCPlayback && m_clip >= 0 && m_title && m_clip < m_title->clip_count && m_nMVCClip != m_clip) -+ { -+ CloseMVCDemux(); -+ OpenMVCDemux(m_clip); -+ } - } - - int CDVDInputStreamBluray::Read(uint8_t* buf, int buf_size) - { -+ int result = 0; - m_dispTimeBeforeRead = (int)(m_dll->bd_tell_time(m_bd) / 90); - if(m_navmode) - { -- int result = 0; - do { - - if(m_hold == HOLD_HELD) -@@ -659,10 +673,14 @@ int CDVDInputStreamBluray::Read(uint8_t* buf, int buf_size) - - } while(result == 0); - -- return result; - } - else -- return m_dll->bd_read(m_bd, buf, buf_size); -+ { -+ result = m_dll->bd_read(m_bd, buf, buf_size); -+ while (m_dll->bd_get_event(m_bd, &m_event)) -+ ProcessEvent(); -+ } -+ return result; - } - - static uint8_t clamp(double v) -@@ -910,8 +928,12 @@ bool CDVDInputStreamBluray::PosTime(int ms) - { - if(m_dll->bd_seek_time(m_bd, ms * 90) < 0) - return false; -- else -- return true; -+ -+ while (m_dll->bd_get_event(m_bd, &m_event)) -+ ProcessEvent(); -+ -+ SeekMVCDemux(ms - m_clipStartTime); -+ return true; - } - - int CDVDInputStreamBluray::GetChapterCount() -@@ -934,8 +956,12 @@ bool CDVDInputStreamBluray::SeekChapter(int ch) - { - if(m_title && m_dll->bd_seek_chapter(m_bd, ch-1) < 0) - return false; -- else -- return true; -+ -+ while (m_dll->bd_get_event(m_bd, &m_event)) -+ ProcessEvent(); -+ -+ SeekMVCDemux(GetChapterPos(ch) * 1000 - m_clipStartTime); -+ return true; - } - - int64_t CDVDInputStreamBluray::GetChapterPos(int ch) -@@ -1133,6 +1159,95 @@ bool CDVDInputStreamBluray::HasMenu() - return m_navmode; - } - -+bool CDVDInputStreamBluray::ProcessItem(int playitem) -+{ -+ if (m_title) -+ m_dll->bd_free_title_info(m_title); -+ -+ m_title = m_dll->bd_get_playlist_info(m_bd, playitem, m_angle); -+ -+ if (CSettings::GetInstance().GetBool("videoplayer.supportmvc")) -+ { -+ MPLS_PL * mpls = m_dll->bd_get_title_mpls(m_bd); -+ if (mpls) -+ { -+ for (int i = 0; i < mpls->ext_sub_count; i++) -+ { -+ if (mpls->ext_sub_path[i].type == 8 -+ && mpls->ext_sub_path[i].sub_playitem_count == mpls->list_count) -+ { -+ CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - Enabling BD3D MVC demuxing"); -+ CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - MVC_Base_view_R_flag: %d", m_title->mvc_base_view_r_flag); -+ m_bMVCPlayback = true; -+ m_nMVCSubPathIndex = i; -+ m_bFlipEyes = m_title->mvc_base_view_r_flag != 0; -+ break; -+ } -+ } -+ } -+ } -+ CloseMVCDemux(); -+ return true; -+} -+ -+bool CDVDInputStreamBluray::OpenMVCDemux(int playItem) -+{ -+ MPLS_PL *pl = m_dll->bd_get_title_mpls(m_bd); -+ if (!pl) -+ return false; -+ -+ std::string strFileName; -+ strFileName.append(m_root); -+ strFileName.append("/BDMV/STREAM/"); -+ strFileName.append(pl->ext_sub_path[m_nMVCSubPathIndex].sub_play_item[playItem].clip->clip_id); -+ strFileName.append(".m2ts"); -+ -+ CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::OpenMVCDemuxer(): Opening MVC extension stream at %s", strFileName.c_str()); -+ -+ CFileItem fileitem(CURL(strFileName), false); -+ m_pMVCInput = new CDVDInputStreamFile(fileitem); -+ -+ // Try to open the MVC stream -+ if (!m_pMVCInput->Open()) -+ { -+ CloseMVCDemux(); -+ m_bMVCPlayback = false; -+ return false; -+ } -+ -+ if (m_pMVCDemux) -+ SAFE_DELETE(m_pMVCDemux); -+ -+ CDemuxMVC* pMVCDemux = new CDemuxMVC; -+ m_pMVCDemux = pMVCDemux; -+ -+ if (!pMVCDemux->Open(m_pMVCInput)) -+ { -+ CloseMVCDemux(); -+ m_bMVCPlayback = false; -+ return false; -+ } -+ -+ m_nMVCClip = playItem; -+ return true; -+} -+ -+bool CDVDInputStreamBluray::CloseMVCDemux() -+{ -+ if (m_pMVCDemux) -+ SAFE_DELETE(m_pMVCDemux); -+ -+ SAFE_DELETE(m_pMVCInput); -+ m_nMVCClip = -1; -+ return true; -+} -+ -+void CDVDInputStreamBluray::SeekMVCDemux(int64_t time) -+{ -+ if (m_bMVCPlayback && m_pMVCDemux) -+ m_pMVCDemux->SeekTime(time); -+} -+ - void CDVDInputStreamBluray::SetupPlayerSettings() - { - int region = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_BLURAY_PLAYERREGION); -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d5bc5625f 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -@@ -38,6 +38,7 @@ extern "C" - class CDVDOverlayImage; - class DllLibbluray; - class IVideoPlayer; -+class CDVDDemux; - - class CDVDInputStreamBluray - : public CDVDInputStream -@@ -119,6 +120,9 @@ public: - BLURAY_TITLE_INFO* GetTitleFile(const std::string& name); - - void ProcessEvent(); -+ CDVDDemux* GetDemuxMVC() { return m_pMVCDemux; }; -+ bool HasMVC() { return m_bMVCPlayback; } -+ bool AreEyesFlipped() { return m_bFlipEyes; } - - protected: - struct SPlane; -@@ -127,6 +131,11 @@ protected: - void OverlayClose(); - static void OverlayClear(SPlane& plane, int x, int y, int w, int h); - static void OverlayInit (SPlane& plane, int w, int h); -+ bool ProcessItem(int playitem); -+ -+ bool OpenMVCDemux(int playItem); -+ bool CloseMVCDemux(); -+ void SeekMVCDemux(int64_t time); - - IVideoPlayer* m_player; - DllLibbluray* m_dll; -@@ -138,6 +147,17 @@ protected: - bool m_menu; - bool m_navmode; - int m_dispTimeBeforeRead; -+ int m_nTitles = -1; -+ std::string m_root; -+ -+ // MVC related members -+ CDVDDemux* m_pMVCDemux = nullptr; -+ CDVDInputStream *m_pMVCInput = nullptr; -+ bool m_bMVCPlayback = false; -+ int m_nMVCSubPathIndex = 0; -+ int m_nMVCClip = -1; -+ bool m_bFlipEyes = false; -+ uint64_t m_clipStartTime = 0; - - typedef std::shared_ptr SOverlay; - typedef std::list SOverlays; - -From ce707dd363dec9d577f7d2d508ca2345a2ce6060 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 11 Mar 2016 16:58:53 +0300 -Subject: [PATCH 43/61] [VideoPlayer] HasVideo returns true if video stream - exists. This don't allow start visualization if audio is opened before video. - ---- - xbmc/cores/VideoPlayer/VideoPlayer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index 5945d06dea8af5ea841e58a0268e09ecd8d7d494..6e7edd237c9184bd8e812a72b18f48213c1f797e 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -@@ -3119,7 +3119,7 @@ void CVideoPlayer::Pause() - - bool CVideoPlayer::HasVideo() const - { -- return m_HasVideo; -+ return m_HasVideo || GetVideoStream() >= 0; - } - - bool CVideoPlayer::HasAudio() const - -From 92293afe04eb8e21383fbacfa610615c2082e836 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 44/61] fixup! Revert supporting crappy tab/sbs subtitles. this - fixes regular subtitles. - ---- - .../cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -index 3a080d06c90b0762482816928642e6de7810b539..a8323f419e404037c4e5fb4d78fa1b45409337a7 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -@@ -243,20 +243,20 @@ CDVDOverlay* CDVDOverlayCodecFFmpeg::GetOverlay() - } - } - -- RENDER_STEREO_MODE render_stereo_mode = g_graphicsContext.GetStereoMode(); -+ /*RENDER_STEREO_MODE render_stereo_mode = g_graphicsContext.GetStereoMode(); - if (render_stereo_mode != RENDER_STEREO_MODE_OFF) - { -- if (rect.h > m_height / 2) -+ if ((rect.h - rect.y) > m_height / 2) - { - m_height /= 2; - rect.h /= 2; - } -- else if (rect.w > m_width / 2) -+ else if ((rect.w - rect.x) > m_width / 2) - { - m_width /= 2; - rect.w /= 2; - } -- } -+ }*/ - - CDVDOverlayImage* overlay = new CDVDOverlayImage(); - - -From b2debae5578a4ff05af7d598da137255ecd5b156 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Thu, 7 Apr 2016 17:28:50 +0300 -Subject: [PATCH 45/61] [VideoPlayer] Disable reading extension stream from - input stream if decoder doesn't support it. - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h | 5 +++++ - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 18 +++++++++--------- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp | 4 +++- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h | 6 +++--- - .../cores/VideoPlayer/DVDInputStreams/DVDInputStream.h | 11 +++++++++++ - .../DVDInputStreams/DVDInputStreamBluray.cpp | 9 ++++++++- - .../VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h | 9 ++++++--- - xbmc/cores/VideoPlayer/IVideoPlayer.h | 1 + - xbmc/cores/VideoPlayer/VideoPlayer.cpp | 4 ++++ - xbmc/cores/VideoPlayer/VideoPlayerVideo.h | 1 + - 10 files changed, 51 insertions(+), 17 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h -index a2da9de4375939f3711c594dc854b9a533c755b4..8101b6eeff0341a94736df7ee815dd4c18337a32 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h -@@ -311,6 +311,11 @@ public: - */ - virtual void Reopen() {}; - -+ /** -+ * Indicates that the decoder supports extention streams. -+ */ -+ virtual bool SupportsExtention() { return false; } -+ - protected: - CProcessInfo &m_processInfo; - }; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index b80f44994dfbc9f4cac37f9cad7926c0d32371e2..99ad8f34770b175b0ac9d92c75d7b409d51b5fec 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -505,14 +505,14 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein - - UpdateCurrentPTS(); - -- if (!fileinfo && m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY)) -+ if (!fileinfo) - { -- CDVDInputStreamBluray *bluRay = static_cast(m_pInput); -- if (bluRay->HasMVC()) -+ CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInput); -+ if (pExt && pExt->HasExtention()) - { - SAFE_DELETE(m_pSSIF); - m_pSSIF = new CDemuxStreamSSIF(); -- m_pSSIF->SetBluRay(bluRay); -+ m_pSSIF->SetBluRay(pExt); - } - } - // in case of mpegts and we have not seen pat/pmt, defer creation of streams -@@ -1490,13 +1490,13 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); - - AVStream* mvcStream = nullptr; -- if (m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY)) -+ CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInput); -+ if (pExt) - { -- CDVDInputStreamBluray *bluRay = static_cast(m_pInput); -- if (bluRay->HasMVC()) -+ if (pExt->HasExtention()) - { -- st->stereo_mode = bluRay->AreEyesFlipped() ? "block_rl" : "block_lr"; -- mvcStream = static_cast(bluRay->GetDemuxMVC())->GetAVStream(); -+ st->stereo_mode = pExt->AreEyesFlipped() ? "block_rl" : "block_lr"; -+ mvcStream = static_cast(pExt->GetExtentionDemux())->GetAVStream(); - } - } - else -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -index 2c7e66f7ee5683a0fbcde5ad5c65ebfd6853f3d0..7c8719ce40e725e27b7551250398022a1f1a4fc6 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -@@ -35,6 +35,8 @@ DemuxPacket* CDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) - - if (srcPkt->iStreamId == m_h264StreamId) - { -+ if (m_bluRay && !m_bluRay->HasExtention()) -+ return srcPkt; - m_H264queue.push(srcPkt); - } - else if (srcPkt->iStreamId == m_mvcStreamId) -@@ -170,7 +172,7 @@ bool CDemuxStreamSSIF::FillMVCQueue(double dtsBase) - if (!m_bluRay) - return false; - -- CDVDDemux* demux = m_bluRay->GetDemuxMVC(); -+ CDVDDemux* demux = m_bluRay->GetExtentionDemux(); - DemuxPacket* mvc; - while ((m_MVCqueue.size() < MVC_QUEUE_SIZE) && (mvc = demux->Read())) - { -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -index 508e9debd3e6679a1433842a65649fa68ead76ec..26cd97dddcae208afacfb241e96b4935ad0f81f3 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -@@ -21,7 +21,7 @@ - */ - - #include "DVDDemuxPacket.h" --#include "DVDInputStreams/DVDInputStreamBluray.h" -+#include "DVDInputStreams/DVDInputStream.h" - #include - - extern "C" { -@@ -41,7 +41,7 @@ public: - int GetH264StreamId() { return m_h264StreamId; }; - int GetMVCStreamId() { return m_mvcStreamId; }; - void AddMVCExtPacket(DemuxPacket* &scrPkt); -- void SetBluRay(CDVDInputStreamBluray* &bluRay) { m_bluRay = bluRay; }; -+ void SetBluRay(CDVDInputStream::IExtentionStream* &bluRay) { m_bluRay = bluRay; }; - bool IsBluRay() { return m_bluRay != nullptr; }; - - private: -@@ -49,7 +49,7 @@ private: - DemuxPacket* MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt); - bool FillMVCQueue(double dtsBase); - -- CDVDInputStreamBluray* m_bluRay = nullptr; -+ CDVDInputStream::IExtentionStream* m_bluRay = nullptr; - std::queue m_H264queue; - std::queue m_MVCqueue; - int m_h264StreamId = -1; -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -index 3377d3f282d4e8cdeb10339e1aded5e3eb1edf1a..8e94436051e7b04ec11560057ecd64c5d08a7bcd 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -@@ -57,6 +57,7 @@ namespace XFILE - - struct DemuxPacket; - class CDemuxStream; -+class CDVDDemux; - - class CDVDInputStream - { -@@ -131,6 +132,16 @@ public: - virtual void SetVideoResolution(int width, int height) {}; - }; - -+ class IExtentionStream -+ { -+ public: -+ virtual ~IExtentionStream() {} -+ virtual bool HasExtention() = 0; -+ virtual bool AreEyesFlipped() = 0; -+ virtual CDVDDemux* GetExtentionDemux() = 0; -+ virtual void DisableExtention() = 0; -+ }; -+ - enum ENextStream - { - NEXTSTREAM_NONE, -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -index a2c59b137ebdb7a44aea4fe1216eb9a2f43c048c..cdc9039729993c5cd7d3af0b8ee8e5fc28a4a158 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -@@ -618,6 +618,13 @@ void CDVDInputStreamBluray::ProcessEvent() { - } - } - -+void CDVDInputStreamBluray::DisableExtention() -+{ -+ CloseMVCDemux(); -+ m_bMVCDisabled = true; -+ m_bMVCPlayback = false; -+} -+ - int CDVDInputStreamBluray::Read(uint8_t* buf, int buf_size) - { - int result = 0; -@@ -1166,7 +1173,7 @@ bool CDVDInputStreamBluray::ProcessItem(int playitem) - - m_title = m_dll->bd_get_playlist_info(m_bd, playitem, m_angle); - -- if (CSettings::GetInstance().GetBool("videoplayer.supportmvc")) -+ if (CSettings::GetInstance().GetBool("videoplayer.supportmvc") && !m_bMVCDisabled) - { - MPLS_PL * mpls = m_dll->bd_get_title_mpls(m_bd); - if (mpls) -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -index 561fb5cd4f971bc9ee4f41218a60bb3d5bc5625f..f70657c9e31fb2460d12910c635dba5163282e74 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -@@ -46,6 +46,7 @@ class CDVDInputStreamBluray - , public CDVDInputStream::IChapter - , public CDVDInputStream::IPosTime - , public CDVDInputStream::IMenus -+ , public CDVDInputStream::IExtentionStream - { - public: - CDVDInputStreamBluray(IVideoPlayer* player, const CFileItem& fileitem); -@@ -120,9 +121,10 @@ public: - BLURAY_TITLE_INFO* GetTitleFile(const std::string& name); - - void ProcessEvent(); -- CDVDDemux* GetDemuxMVC() { return m_pMVCDemux; }; -- bool HasMVC() { return m_bMVCPlayback; } -- bool AreEyesFlipped() { return m_bFlipEyes; } -+ CDVDDemux* GetExtentionDemux() override { return m_pMVCDemux; }; -+ bool HasExtention() override { return m_bMVCPlayback; } -+ bool AreEyesFlipped() override { return m_bFlipEyes; } -+ void DisableExtention() override; - - protected: - struct SPlane; -@@ -157,6 +159,7 @@ protected: - int m_nMVCSubPathIndex = 0; - int m_nMVCClip = -1; - bool m_bFlipEyes = false; -+ bool m_bMVCDisabled = false; - uint64_t m_clipStartTime = 0; - - typedef std::shared_ptr SOverlay; -diff --git a/xbmc/cores/VideoPlayer/IVideoPlayer.h b/xbmc/cores/VideoPlayer/IVideoPlayer.h -index 689798245ca48676af7c34a3e3565ea70ebcf309..d076c118f0877be6e5adb79c75606dce7870487c 100644 ---- a/xbmc/cores/VideoPlayer/IVideoPlayer.h -+++ b/xbmc/cores/VideoPlayer/IVideoPlayer.h -@@ -111,6 +111,7 @@ public: - virtual int GetDecoderBufferSize() { return 0; } - virtual int GetDecoderFreeSpace() = 0; - virtual bool IsEOS() { return false; }; -+ virtual bool SupportsExtention() const = 0; - }; - - class CDVDAudioCodec; -diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index 6e7edd237c9184bd8e812a72b18f48213c1f797e..aca33a7e75c604eb292a669a44bfecbffda9b9b1 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -@@ -3895,6 +3895,10 @@ bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset) - if (!player->OpenStream(hint)) - return false; - -+ CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInputStream); -+ if (pExt && !static_cast(player)->SupportsExtention()) -+ pExt->DisableExtention(); -+ - s.stereo_mode = static_cast(player)->GetStereoMode(); - if (s.stereo_mode == "mono") - s.stereo_mode = ""; -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.h b/xbmc/cores/VideoPlayer/VideoPlayerVideo.h -index 0d4100e58e9db7e5035bcf9ae23b0147f80cec8f..69570153f0810a5840f3780c7a6681a102b85cec 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.h -+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.h -@@ -91,6 +91,7 @@ public: - int GetVideoBitrate(); - std::string GetStereoMode(); - void SetSpeed(int iSpeed); -+ bool SupportsExtention() const override { return m_pVideoCodec && m_pVideoCodec->SupportsExtention(); } - - // classes - CDVDOverlayContainer* m_pOverlayContainer; - -From 6c573a5eb0e2d87486d8a7f220c2b6e681e75ba9 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 16 Sep 2016 11:37:48 +0300 -Subject: [PATCH 46/61] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from - platform settings to common settings. - ---- - system/settings/rbp.xml | 7 ------- - system/settings/settings.xml | 6 ++++++ - system/settings/win32.xml | 11 ----------- - .../VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp | 2 +- - xbmc/settings/SettingConditions.cpp | 3 +++ - 5 files changed, 10 insertions(+), 19 deletions(-) - -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index 2572e25753712186f69390965ee1448bff3fadd5..7098edf32dff8c00e192229c3ffb060be6a42482 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -28,13 +28,6 @@ - - - -- -- -- 2 -- true -- -- -- - -
-
-diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 068ca2d519cb7537e0d3ad05c83d47d341a34250..23b96cbb2463d6b4072b0f9333e0def0aaa446e1 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -343,6 +343,12 @@ - true - - -+ -+ 2 -+ true -+ -+ HAS_MVC -+ - - - -diff --git a/system/settings/win32.xml b/system/settings/win32.xml -index 2fcee72a64e8b701c8e895143410bbe9fd617356..a017d30c24232fb01220b87b29398403b8ed9662 100644 ---- a/system/settings/win32.xml -+++ b/system/settings/win32.xml -@@ -12,17 +12,6 @@ - false - -
--
-- -- -- -- 2 -- true -- -- -- -- --
-
- - -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -index cdc9039729993c5cd7d3af0b8ee8e5fc28a4a158..e1f0240124bf7777b755f5a39cbb32e354dabd50 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -@@ -1173,7 +1173,7 @@ bool CDVDInputStreamBluray::ProcessItem(int playitem) - - m_title = m_dll->bd_get_playlist_info(m_bd, playitem, m_angle); - -- if (CSettings::GetInstance().GetBool("videoplayer.supportmvc") && !m_bMVCDisabled) -+ if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC) && !m_bMVCDisabled) - { - MPLS_PL * mpls = m_dll->bd_get_title_mpls(m_bd); - if (mpls) -diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp -index 6b1f2b6d757354d6065c2862b44dfb47184a1dcc..9163ec85bd0feb48a698a025d9870bf40042c675 100644 ---- a/xbmc/settings/SettingConditions.cpp -+++ b/xbmc/settings/SettingConditions.cpp -@@ -327,6 +327,9 @@ void CSettingConditions::Initialize() - m_simpleConditions.insert("has_dx"); - m_simpleConditions.insert("hasdxva2"); - #endif -+#if defined(HAVE_LIBMFX) || defined(TARGET_RASPBERRY_PI) -+ m_simpleConditions.insert("has_mvc"); -+#endif - #ifdef HAVE_LCMS2 - m_simpleConditions.insert("have_lcms2"); - #endif - -From c4f4531295ce1126d888414ee2116fac7f3ebf39 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 4 Nov 2016 22:56:56 +0300 -Subject: [PATCH 47/61] [VideoPlayer] SSIF: fix for corner case when mvc stream - is switched before the last packet is read from previous stream. - ---- - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 5 ++- - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp | 7 ++-- - .../VideoPlayer/DVDInputStreams/DVDInputStream.h | 1 + - .../DVDInputStreams/DVDInputStreamBluray.cpp | 39 +++++++++++++++++++--- - .../DVDInputStreams/DVDInputStreamBluray.h | 3 ++ - 5 files changed, 45 insertions(+), 10 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 99ad8f34770b175b0ac9d92c75d7b409d51b5fec..179a287d1cec04686b30fdee1ef8f1770b0f9f8d 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1121,9 +1121,6 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); - -- if (m_pSSIF) -- m_pSSIF->Flush(); -- - CDVDInputStream::IPosTime* ist = m_pInput->GetIPosTime(); - if (ist) - { -@@ -1137,6 +1134,8 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) - - return true; - } -+ else if (m_pSSIF) -+ m_pSSIF->Flush(); - - if (!m_pInput->Seek(0, SEEK_POSSIBLE) && - !m_pInput->IsStreamType(DVDSTREAM_TYPE_FFMPEG)) -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -index 7c8719ce40e725e27b7551250398022a1f1a4fc6..c675e31f731bc6afb8aabc37bbb5495aed45f4f6 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -@@ -183,12 +183,15 @@ bool CDemuxStreamSSIF::FillMVCQueue(double dtsBase) - else if (mvc->dts < dtsBase) - { - #if defined(DEBUG_VERBOSE) -- CLog::Log(LOGDEBUG, ">>> MVC discard mvc: %6d, pts(%.3f) dts(%.3f)", mvc->iSize, mvc->pts*1e-6, mvc->dts*1e-6); -+ CLog::Log(LOGDEBUG, ">>> MVC drop mvc: %6d, pts(%.3f) dts(%.3f)", mvc->iSize, mvc->pts*1e-6, mvc->dts*1e-6); - #endif - CDVDDemuxUtils::FreeDemuxPacket(mvc); - continue; - } - AddMVCExtPacket(mvc); - }; -- return m_MVCqueue.size() == MVC_QUEUE_SIZE; -+ if (m_MVCqueue.size() != MVC_QUEUE_SIZE) -+ m_bluRay->OpenNextStream(); -+ -+ return true; - } -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -index 8e94436051e7b04ec11560057ecd64c5d08a7bcd..1637be9496814b6129c349ffeccd7450a8a62aca 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -@@ -140,6 +140,7 @@ public: - virtual bool AreEyesFlipped() = 0; - virtual CDVDDemux* GetExtentionDemux() = 0; - virtual void DisableExtention() = 0; -+ virtual bool OpenNextStream() = 0; - }; - - enum ENextStream -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -index e1f0240124bf7777b755f5a39cbb32e354dabd50..aaba0e70c3ac2bf2f93046be5139b15ab3e613c0 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -@@ -49,6 +49,7 @@ - #endif - - #define LIBBLURAY_BYTESEEK 0 -+#define EMPTY_QUEUE(x) { while(!x.empty()) x.pop(); } - - using namespace XFILE; - -@@ -433,6 +434,8 @@ bool CDVDInputStreamBluray::Open() - while (m_dll->bd_get_event(m_bd, &m_event)) - ProcessEvent(); - -+ OpenNextStream(); -+ - return true; - } - -@@ -611,10 +614,14 @@ void CDVDInputStreamBluray::ProcessEvent() { - /* event has been consumed */ - m_event.event = BD_EVENT_NONE; - -- if (m_bMVCPlayback && m_clip >= 0 && m_title && m_clip < m_title->clip_count && m_nMVCClip != m_clip) -+ if ( m_bMVCPlayback && m_clip >= 0 -+ && m_title -+ && m_clip < m_title->clip_count -+ && m_nMVCClip != m_clip -+ && (m_clipQueue.empty() -+ || m_clip != m_clipQueue.front())) - { -- CloseMVCDemux(); -- OpenMVCDemux(m_clip); -+ m_clipQueue.push(m_clip); - } - } - -@@ -936,10 +943,15 @@ bool CDVDInputStreamBluray::PosTime(int ms) - if(m_dll->bd_seek_time(m_bd, ms * 90) < 0) - return false; - -+ EMPTY_QUEUE(m_clipQueue); - while (m_dll->bd_get_event(m_bd, &m_event)) - ProcessEvent(); - -- SeekMVCDemux(ms - m_clipStartTime); -+ if (m_bMVCPlayback) -+ { -+ OpenNextStream(); -+ SeekMVCDemux(ms - m_clipStartTime); -+ } - return true; - } - -@@ -964,10 +976,15 @@ bool CDVDInputStreamBluray::SeekChapter(int ch) - if(m_title && m_dll->bd_seek_chapter(m_bd, ch-1) < 0) - return false; - -+ EMPTY_QUEUE(m_clipQueue); - while (m_dll->bd_get_event(m_bd, &m_event)) - ProcessEvent(); - -- SeekMVCDemux(GetChapterPos(ch) * 1000 - m_clipStartTime); -+ if (m_bMVCPlayback) -+ { -+ OpenNextStream(); -+ SeekMVCDemux(GetChapterPos(ch) * 1000 - m_clipStartTime); -+ } - return true; - } - -@@ -1197,6 +1214,18 @@ bool CDVDInputStreamBluray::ProcessItem(int playitem) - return true; - } - -+bool CDVDInputStreamBluray::OpenNextStream() -+{ -+ if (m_clipQueue.empty()) -+ return false; -+ -+ int clip = m_clipQueue.front(); -+ m_clipQueue.pop(); -+ -+ CloseMVCDemux(); -+ return OpenMVCDemux(clip); -+} -+ - bool CDVDInputStreamBluray::OpenMVCDemux(int playItem) - { - MPLS_PL *pl = m_dll->bd_get_title_mpls(m_bd); -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -index f70657c9e31fb2460d12910c635dba5163282e74..a11ec77903d2a9b2c68106a8e2301af93823b0bd 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -@@ -23,6 +23,7 @@ - #include "DVDInputStream.h" - #include - #include -+#include - - extern "C" - { -@@ -125,6 +126,7 @@ public: - bool HasExtention() override { return m_bMVCPlayback; } - bool AreEyesFlipped() override { return m_bFlipEyes; } - void DisableExtention() override; -+ bool OpenNextStream() override; - - protected: - struct SPlane; -@@ -161,6 +163,7 @@ protected: - bool m_bFlipEyes = false; - bool m_bMVCDisabled = false; - uint64_t m_clipStartTime = 0; -+ std::queue m_clipQueue; - - typedef std::shared_ptr SOverlay; - typedef std::list SOverlays; - -From 21d1d00d630a9c9d02766a48ded2546d14e18d6b Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Tue, 23 Feb 2016 16:01:08 +0300 -Subject: [PATCH 48/61] [libbluray] bump libbluray to 0.9.2-mvc. - ---- - project/BuildDependencies/scripts/0_package.list | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list -index 3f7112408c343b9da967e340ba069c447e91809f..3be6ce2f8362e3f5eb834971936827911abdbebe 100644 ---- a/project/BuildDependencies/scripts/0_package.list -+++ b/project/BuildDependencies/scripts/0_package.list -@@ -17,7 +17,7 @@ freetype-2.6.3-win32-vc140.7z - giflib-5.1.4-win32-vc140.7z - jsonschemabuilder-1.0.0-win32-3.7z - libass-542975a-win32-vc140.7z --libbluray-0.9.3-win32-vc140.7z -+libbluray-0.9.2-mvc-win32-vc120.7z - libcdio-0.9.3-win32-vc140.7z - libcec-4.0.1-win32-vc140-2.7z - libfribidi-0.19.2-win32.7z - -From 8addc2c513e6aa1ea6f50a6865dd00a79a776afa Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 29 Feb 2016 17:00:50 +0000 -Subject: [PATCH 49/61] libbluray: Bump to Nevcairie's v0.9.2 - -This includes 3D support ---- - tools/depends/target/libbluray/Makefile | 1 + - .../libbluray/bump_to_Nevcairie_v0.9.2.patch | 1629 ++++++++++++++++++++ - 2 files changed, 1630 insertions(+) - create mode 100644 tools/depends/target/libbluray/bump_to_Nevcairie_v0.9.2.patch - -diff --git a/tools/depends/target/libbluray/Makefile b/tools/depends/target/libbluray/Makefile -index 09d2a8e04ef4ef694f3d7a6152ab9be0e294ce2f..741a820df47fd8014192f6c0c546abb72d33ab1f 100644 ---- a/tools/depends/target/libbluray/Makefile -+++ b/tools/depends/target/libbluray/Makefile -@@ -24,6 +24,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - # libbluray has borked Makefile.am with respect to CFLAGS, remove the offending line - sed -i -e "s|CFLAGS=|#CFLAGS=|" $(PLATFORM)/Makefile.am -+ cd $(PLATFORM); patch -p1 < ../bump_to_Nevcairie_v0.9.2.patch - cd $(PLATFORM); ./bootstrap - cd $(PLATFORM); $(CONFIGURE) - -diff --git a/tools/depends/target/libbluray/bump_to_Nevcairie_v0.9.2.patch b/tools/depends/target/libbluray/bump_to_Nevcairie_v0.9.2.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220640fb84e ---- /dev/null -+++ b/tools/depends/target/libbluray/bump_to_Nevcairie_v0.9.2.patch -@@ -0,0 +1,1629 @@ -+diff --git a/Makefile.am b/Makefile.am -+index 3a54bfc..035553b 100644 -+--- a/Makefile.am -++++ b/Makefile.am -+@@ -161,6 +161,15 @@ noinst_HEADERS = \ -+ jni/win32/jni_md.h \ -+ jni/darwin/jni_md.h -+ -++ -++bdnavdir=$(pkgincludedir)/bdnav -++bdnav_HEADERS = \ -++ src/libbluray/bdnav/clpi_data.h -++ -++utildir=$(pkgincludedir)/../util -++util_HEADERS = \ -++ src/util/attributes.h -++ -+ pkginclude_HEADERS = \ -+ src/file/filesystem.h \ -+ src/libbluray/bluray.h \ -+@@ -168,6 +177,9 @@ pkginclude_HEADERS = \ -+ src/libbluray/keys.h \ -+ src/libbluray/player_settings.h \ -+ src/libbluray/bdnav/clpi_data.h \ -++ src/libbluray/bdnav/clpi_parse.h \ -++ src/libbluray/bdnav/mpls_parse.h \ -++ src/libbluray/bdnav/uo_mask_table.h \ -+ src/libbluray/bdnav/meta_data.h \ -+ src/libbluray/decoders/overlay.h \ -+ src/util/log_control.h -+diff --git a/config.h b/config.h -+new file mode 100644 -+index 0000000..6764704 -+--- /dev/null -++++ b/config.h -+@@ -0,0 +1,157 @@ -++/* config.h. Generated from config.h.in by configure. */ -++/* config.h.in. Generated from configure.ac by autoheader. */ -++ -++/* Define to 1 if libudfread is to be used for disc image access */ -++/* #undef ENABLE_UDF */ -++ -++/* Define to 1 if using libbluray J2ME stack */ -++/* #undef HAVE_BDJ_J2ME */ -++ -++/* Define to 1 if you have the header file, and it defines `DIR'. -++ */ -++/* #undef HAVE_DIRENT_H */ -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_DLFCN_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_ERRNO_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_FCNTL_H */ -++ -++/* Define this if you have fontconfig library */ -++/* #undef HAVE_FONTCONFIG */ -++ -++/* Define this if you have FreeType2 library */ -++/* #undef HAVE_FT2 */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_INTTYPES_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_JNI_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_LIBGEN_H 1 -++ -++/* Define to 1 if libxml2 is to be used for metadata parsing */ -++/* #undef HAVE_LIBXML2 */ -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_LINUX_CDROM_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_MALLOC_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_MEMORY_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_MNTENT_H */ -++ -++/* Define to 1 if you have the header file, and it defines `DIR'. */ -++/* #undef HAVE_NDIR_H */ -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_PTHREAD_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_STDARG_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_STDINT_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_STDLIB_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_STRINGS_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_STRING_H 1 -++ -++/* Define to 1 if `d_type' is a member of `struct dirent'. */ -++/* #undef HAVE_STRUCT_DIRENT_D_TYPE */ -++ -++/* Define to 1 if you have the header file, and it defines `DIR'. -++ */ -++/* #undef HAVE_SYS_DIR_H */ -++ -++/* Define to 1 if you have the header file, and it defines `DIR'. -++ */ -++/* #undef HAVE_SYS_NDIR_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_SYS_STAT_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_SYS_TIME_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_SYS_TYPES_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_TIME_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_UNISTD_H */ -++ -++/* "Defines the architecture of the java vm." */ -++/* #undef JAVA_ARCH */ -++ -++/* "" */ -++/* #undef JDK_HOME */ -++ -++/* Define to the sub-directory where libtool stores uninstalled libraries. */ -++#define LT_OBJDIR ".libs/" -++ -++/* Name of package */ -++#define PACKAGE "libbluray" -++ -++/* Define to the address where bug reports for this package should be sent. */ -++#define PACKAGE_BUGREPORT "http://www.videolan.org/developers/libbluray.html" -++ -++/* Define to the full name of this package. */ -++#define PACKAGE_NAME "libbluray" -++ -++/* Define to the full name and version of this package. */ -++#define PACKAGE_STRING "libbluray 0.9.2" -++ -++/* Define to the one symbol short name of this package. */ -++#define PACKAGE_TARNAME "libbluray" -++ -++/* Define to the home page for this package. */ -++#define PACKAGE_URL "" -++ -++/* Define to the version of this package. */ -++#define PACKAGE_VERSION "0.9.2" -++ -++/* Define as the return type of signal handlers (`int' or `void'). */ -++#define RETSIGTYPE void -++ -++/* Define to 1 if you have the ANSI C header files. */ -++#define STDC_HEADERS 1 -++ -++/* "Define to 1 if using BD-Java" */ -++/* #undef USING_BDJAVA */ -++ -++/* Version number of package */ -++#define VERSION "0.9.2" -++ -++/* Enable large inode numbers on Mac OS X 10.5. */ -++#ifndef _DARWIN_USE_64_BIT_INODE -++# define _DARWIN_USE_64_BIT_INODE 1 -++#endif -++ -++/* Number of bits in a file offset, on hosts where this is settable. */ -++#define _FILE_OFFSET_BITS 64 -++ -++/* Define for large files, on AIX-style hosts. */ -++/* #undef _LARGE_FILES */ -++ -++/* Define to '0x0501' for IE 5.01. */ -++#define _WIN32_IE 0x0501 -++ -++/* Define to '0x0502' for Windows XP SP2 APIs. */ -++#define _WIN32_WINNT 0x0502 -+diff --git a/includes/inttypes.h b/includes/inttypes.h -+new file mode 100644 -+index 0000000..ead903f -+--- /dev/null -++++ b/includes/inttypes.h -+@@ -0,0 +1,305 @@ -++// ISO C9x compliant inttypes.h for Microsoft Visual Studio -++// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -++// -++// Copyright (c) 2006 Alexander Chemeris -++// -++// Redistribution and use in source and binary forms, with or without -++// modification, are permitted provided that the following conditions are met: -++// -++// 1. Redistributions of source code must retain the above copyright notice, -++// this list of conditions and the following disclaimer. -++// -++// 2. Redistributions in binary form must reproduce the above copyright -++// notice, this list of conditions and the following disclaimer in the -++// documentation and/or other materials provided with the distribution. -++// -++// 3. The name of the author may be used to endorse or promote products -++// derived from this software without specific prior written permission. -++// -++// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -++// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -++// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -++// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -++// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -++// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -++// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -++// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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 _MSC_VER // [ -++#error "Use this header only with Microsoft Visual C++ compilers!" -++#endif // _MSC_VER ] -++ -++#ifndef _MSC_INTTYPES_H_ // [ -++#define _MSC_INTTYPES_H_ -++ -++#if _MSC_VER > 1000 -++#pragma once -++#endif -++ -++#include "stdint.h" -++ -++// 7.8 Format conversion of integer types -++ -++typedef struct { -++ intmax_t quot; -++ intmax_t rem; -++} imaxdiv_t; -++ -++// 7.8.1 Macros for format specifiers -++ -++#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198 -++ -++// The fprintf macros for signed integers are: -++#define PRId8 "d" -++#define PRIi8 "i" -++#define PRIdLEAST8 "d" -++#define PRIiLEAST8 "i" -++#define PRIdFAST8 "d" -++#define PRIiFAST8 "i" -++ -++#define PRId16 "hd" -++#define PRIi16 "hi" -++#define PRIdLEAST16 "hd" -++#define PRIiLEAST16 "hi" -++#define PRIdFAST16 "hd" -++#define PRIiFAST16 "hi" -++ -++#define PRId32 "I32d" -++#define PRIi32 "I32i" -++#define PRIdLEAST32 "I32d" -++#define PRIiLEAST32 "I32i" -++#define PRIdFAST32 "I32d" -++#define PRIiFAST32 "I32i" -++ -++#define PRId64 "I64d" -++#define PRIi64 "I64i" -++#define PRIdLEAST64 "I64d" -++#define PRIiLEAST64 "I64i" -++#define PRIdFAST64 "I64d" -++#define PRIiFAST64 "I64i" -++ -++#define PRIdMAX "I64d" -++#define PRIiMAX "I64i" -++ -++#define PRIdPTR "Id" -++#define PRIiPTR "Ii" -++ -++// The fprintf macros for unsigned integers are: -++#define PRIo8 "o" -++#define PRIu8 "u" -++#define PRIx8 "x" -++#define PRIX8 "X" -++#define PRIoLEAST8 "o" -++#define PRIuLEAST8 "u" -++#define PRIxLEAST8 "x" -++#define PRIXLEAST8 "X" -++#define PRIoFAST8 "o" -++#define PRIuFAST8 "u" -++#define PRIxFAST8 "x" -++#define PRIXFAST8 "X" -++ -++#define PRIo16 "ho" -++#define PRIu16 "hu" -++#define PRIx16 "hx" -++#define PRIX16 "hX" -++#define PRIoLEAST16 "ho" -++#define PRIuLEAST16 "hu" -++#define PRIxLEAST16 "hx" -++#define PRIXLEAST16 "hX" -++#define PRIoFAST16 "ho" -++#define PRIuFAST16 "hu" -++#define PRIxFAST16 "hx" -++#define PRIXFAST16 "hX" -++ -++#define PRIo32 "I32o" -++#define PRIu32 "I32u" -++#define PRIx32 "I32x" -++#define PRIX32 "I32X" -++#define PRIoLEAST32 "I32o" -++#define PRIuLEAST32 "I32u" -++#define PRIxLEAST32 "I32x" -++#define PRIXLEAST32 "I32X" -++#define PRIoFAST32 "I32o" -++#define PRIuFAST32 "I32u" -++#define PRIxFAST32 "I32x" -++#define PRIXFAST32 "I32X" -++ -++#define PRIo64 "I64o" -++#define PRIu64 "I64u" -++#define PRIx64 "I64x" -++#define PRIX64 "I64X" -++#define PRIoLEAST64 "I64o" -++#define PRIuLEAST64 "I64u" -++#define PRIxLEAST64 "I64x" -++#define PRIXLEAST64 "I64X" -++#define PRIoFAST64 "I64o" -++#define PRIuFAST64 "I64u" -++#define PRIxFAST64 "I64x" -++#define PRIXFAST64 "I64X" -++ -++#define PRIoMAX "I64o" -++#define PRIuMAX "I64u" -++#define PRIxMAX "I64x" -++#define PRIXMAX "I64X" -++ -++#define PRIoPTR "Io" -++#define PRIuPTR "Iu" -++#define PRIxPTR "Ix" -++#define PRIXPTR "IX" -++ -++// The fscanf macros for signed integers are: -++#define SCNd8 "d" -++#define SCNi8 "i" -++#define SCNdLEAST8 "d" -++#define SCNiLEAST8 "i" -++#define SCNdFAST8 "d" -++#define SCNiFAST8 "i" -++ -++#define SCNd16 "hd" -++#define SCNi16 "hi" -++#define SCNdLEAST16 "hd" -++#define SCNiLEAST16 "hi" -++#define SCNdFAST16 "hd" -++#define SCNiFAST16 "hi" -++ -++#define SCNd32 "ld" -++#define SCNi32 "li" -++#define SCNdLEAST32 "ld" -++#define SCNiLEAST32 "li" -++#define SCNdFAST32 "ld" -++#define SCNiFAST32 "li" -++ -++#define SCNd64 "I64d" -++#define SCNi64 "I64i" -++#define SCNdLEAST64 "I64d" -++#define SCNiLEAST64 "I64i" -++#define SCNdFAST64 "I64d" -++#define SCNiFAST64 "I64i" -++ -++#define SCNdMAX "I64d" -++#define SCNiMAX "I64i" -++ -++#ifdef _WIN64 // [ -++# define SCNdPTR "I64d" -++# define SCNiPTR "I64i" -++#else // _WIN64 ][ -++# define SCNdPTR "ld" -++# define SCNiPTR "li" -++#endif // _WIN64 ] -++ -++// The fscanf macros for unsigned integers are: -++#define SCNo8 "o" -++#define SCNu8 "u" -++#define SCNx8 "x" -++#define SCNX8 "X" -++#define SCNoLEAST8 "o" -++#define SCNuLEAST8 "u" -++#define SCNxLEAST8 "x" -++#define SCNXLEAST8 "X" -++#define SCNoFAST8 "o" -++#define SCNuFAST8 "u" -++#define SCNxFAST8 "x" -++#define SCNXFAST8 "X" -++ -++#define SCNo16 "ho" -++#define SCNu16 "hu" -++#define SCNx16 "hx" -++#define SCNX16 "hX" -++#define SCNoLEAST16 "ho" -++#define SCNuLEAST16 "hu" -++#define SCNxLEAST16 "hx" -++#define SCNXLEAST16 "hX" -++#define SCNoFAST16 "ho" -++#define SCNuFAST16 "hu" -++#define SCNxFAST16 "hx" -++#define SCNXFAST16 "hX" -++ -++#define SCNo32 "lo" -++#define SCNu32 "lu" -++#define SCNx32 "lx" -++#define SCNX32 "lX" -++#define SCNoLEAST32 "lo" -++#define SCNuLEAST32 "lu" -++#define SCNxLEAST32 "lx" -++#define SCNXLEAST32 "lX" -++#define SCNoFAST32 "lo" -++#define SCNuFAST32 "lu" -++#define SCNxFAST32 "lx" -++#define SCNXFAST32 "lX" -++ -++#define SCNo64 "I64o" -++#define SCNu64 "I64u" -++#define SCNx64 "I64x" -++#define SCNX64 "I64X" -++#define SCNoLEAST64 "I64o" -++#define SCNuLEAST64 "I64u" -++#define SCNxLEAST64 "I64x" -++#define SCNXLEAST64 "I64X" -++#define SCNoFAST64 "I64o" -++#define SCNuFAST64 "I64u" -++#define SCNxFAST64 "I64x" -++#define SCNXFAST64 "I64X" -++ -++#define SCNoMAX "I64o" -++#define SCNuMAX "I64u" -++#define SCNxMAX "I64x" -++#define SCNXMAX "I64X" -++ -++#ifdef _WIN64 // [ -++# define SCNoPTR "I64o" -++# define SCNuPTR "I64u" -++# define SCNxPTR "I64x" -++# define SCNXPTR "I64X" -++#else // _WIN64 ][ -++# define SCNoPTR "lo" -++# define SCNuPTR "lu" -++# define SCNxPTR "lx" -++# define SCNXPTR "lX" -++#endif // _WIN64 ] -++ -++#endif // __STDC_FORMAT_MACROS ] -++ -++// 7.8.2 Functions for greatest-width integer types -++ -++// 7.8.2.1 The imaxabs function -++#define imaxabs _abs64 -++ -++// 7.8.2.2 The imaxdiv function -++ -++// This is modified version of div() function from Microsoft's div.c found -++// in %MSVC.NET%\crt\src\div.c -++#ifdef STATIC_IMAXDIV // [ -++static -++#else // STATIC_IMAXDIV ][ -++_inline -++#endif // STATIC_IMAXDIV ] -++imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) -++{ -++ imaxdiv_t result; -++ -++ result.quot = numer / denom; -++ result.rem = numer % denom; -++ -++ if (numer < 0 && result.rem > 0) { -++ // did division wrong; must fix up -++ ++result.quot; -++ result.rem -= denom; -++ } -++ -++ return result; -++} -++ -++// 7.8.2.3 The strtoimax and strtoumax functions -++#define strtoimax _strtoi64 -++#define strtoumax _strtoui64 -++ -++// 7.8.2.4 The wcstoimax and wcstoumax functions -++#define wcstoimax _wcstoi64 -++#define wcstoumax _wcstoui64 -++ -++ -++#endif // _MSC_INTTYPES_H_ ] -+diff --git a/libbluray.def b/libbluray.def -+new file mode 100644 -+index 0000000..d4c93cb -+--- /dev/null -++++ b/libbluray.def -+@@ -0,0 +1,63 @@ -++; libbluray.def ; declares the exports -++ -++LIBRARY "libbluray.dll" -++ -++EXPORTS -++ ; bluray.h -++ bd_get_version -++ bd_get_titles -++ bd_get_title_info -++ bd_get_playlist_info -++ bd_free_title_info -++ bd_open -++ bd_close -++ bd_seek -++ bd_seek_time -++ bd_find_seek_point -++ bd_read -++ bd_read_skip_still -++ bd_seek_chapter -++ bd_chapter_pos -++ bd_get_current_chapter -++ bd_seek_mark -++ bd_seek_playitem -++ bd_select_playlist -++ bd_select_title -++ bd_select_angle -++ bd_seamless_angle_change -++ bd_get_title_size -++ bd_get_current_title -++ bd_get_current_angle -++ bd_tell -++ bd_tell_time -++ bd_get_disc_info -++ bd_set_player_setting -++ bd_set_player_setting_str -++ bd_start_bdj -++ bd_stop_bdj -++ bd_get_event -++ bd_play -++ bd_read_ext -++ bd_play_title -++ bd_menu_call -++ bd_register_overlay_proc -++ bd_register_argb_overlay_proc -++ bd_set_scr -++ bd_user_input -++ bd_mouse_select -++ bd_get_sound_effect -++ bd_get_meta -++ bd_get_clpi -++ bd_read_clpi -++ bd_free_clpi -++ bd_read_mpls -++ bd_free_mpls -++ bd_read_mobj -++ bd_free_mobj -++ bd_get_clip_infos -++ bd_get_title_mpls -++ -++ ; additional functions -++ bd_set_debug_handler -++ bd_set_debug_mask -++ bd_get_debug_mask -+diff --git a/libbluray.vcxproj b/libbluray.vcxproj -+new file mode 100644 -+index 0000000..c778955 -+--- /dev/null -++++ b/libbluray.vcxproj -+@@ -0,0 +1,231 @@ -++ -++ -++ -++ -++ DebugRelease -++ Win32 -++ -++ -++ DebugRelease -++ x64 -++ -++ -++ Debug -++ Win32 -++ -++ -++ Debug -++ x64 -++ -++ -++ Release -++ Win32 -++ -++ -++ Release -++ x64 -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ {E1DA1B95-71F1-4C21-A271-121176925062} -++ Win32Proj -++ libbluray -++ -++ -++ -++ v110_xp -++ -++ -++ v120_xp -++ -++ -++ v140_xp -++ -++ -++ DynamicLibrary -++ true -++ Unicode -++ -++ -++ DynamicLibrary -++ false -++ true -++ Unicode -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ true -++ $(SolutionDir)bin_$(PlatformName)d\ -++ $(SolutionDir)bin_$(PlatformName)d\$(ProjectName)\ -++ -++ -++ false -++ $(SolutionDir)bin_$(PlatformName)\$(ProjectName)\ -++ $(SolutionDir)bin_$(PlatformName)\$(ProjectName)\ -++ -++ -++ -++ -++ -++ Level3 -++ Disabled -++ HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBBLURAY_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) -++ __STDC_FORMAT_MACROS;%(PreprocessorDefinitions) -++ $(ProjectDir);$(ProjectDir)includes;$(ProjectDir)src;$(ProjectDir)src\libbluray;%(AdditionalIncludeDirectories) -++ MultiThreadedDebugDLL -++ CompileAsCpp -++ -++ -++ Windows -++ true -++ libbluray.def -++ -++ -++ xcopy /I /Y "$(OutDir)$(TargetName).lib" "$(OutDir)lib\" -++ Copy .lib into library path -++ -++ -++ -++ -++ MultiThreadedDebug -++ -++ -++ -++ -++ Level3 -++ MaxSpeed -++ true -++ true -++ HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBBLURAY_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) -++ __STDC_FORMAT_MACROS;%(PreprocessorDefinitions) -++ $(ProjectDir);$(ProjectDir)includes;$(ProjectDir)src;$(ProjectDir)src\libbluray;%(AdditionalIncludeDirectories) -++ MultiThreaded -++ StreamingSIMDExtensions -++ CompileAsCpp -++ -++ -++ Windows -++ true -++ true -++ true -++ libbluray.def -++ true -++ -++ -++ xcopy /I /Y "$(TargetDir)$(TargetName)$(TargetExt)" "$(OutDir)..\" -++xcopy /I /Y "$(TargetDir)$(TargetName).lib" "$(OutDir)..\lib\" -++ Copy .dll/.lib into library path -++ -++ -++ -++ -++ -++ -+\ No newline at end of file -+diff --git a/libbluray.vcxproj.filters b/libbluray.vcxproj.filters -+new file mode 100644 -+index 0000000..57ff16c -+--- /dev/null -++++ b/libbluray.vcxproj.filters -+@@ -0,0 +1,353 @@ -++ -++ -++ -++ -++ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} -++ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx -++ -++ -++ {93995380-89BD-4b04-88EB-625FBE52EBFB} -++ h;hpp;hxx;hm;inl;inc;xsd -++ -++ -++ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} -++ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms -++ -++ -++ {1ab0e905-7c04-4090-b385-6363dd1c961c} -++ -++ -++ {b8fa3348-a089-461f-9ef5-3d9df997b8e5} -++ -++ -++ {125333e9-0b5e-45f9-a444-f0aaaf547d9b} -++ -++ -++ {a743058f-f07a-4d0f-bab6-02dc57defda9} -++ -++ -++ {7dacc7c4-ef59-452b-9e5b-392c9df07c98} -++ -++ -++ {c7895c81-c186-4d5e-a8ff-645c6d55a731} -++ -++ -++ {c8619466-211b-4c85-9d30-d1b1a822d32e} -++ -++ -++ {8afb6919-994f-4d1f-9638-ce4a06d0b473} -++ -++ -++ {0e9086a7-eebf-4b8e-a4fe-b1724d148877} -++ -++ -++ {fc5e776b-0f32-493a-b823-240288288502} -++ -++ -++ {96d2d786-cd45-4856-937d-9e6f85ced241} -++ -++ -++ {9f4ea4ae-217a-4d97-a5f3-e561ce1e49cd} -++ -++ -++ {09e1b1b8-3aa3-4918-b157-3dfc0554ccbb} -++ -++ -++ {1e02e503-752e-4765-9dfb-8cc67a7b79f8} -++ -++ -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\file -++ -++ -++ Header Files\file -++ -++ -++ Header Files\file -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\hdmv -++ -++ -++ Header Files\libbluray\hdmv -++ -++ -++ Header Files\libbluray\hdmv -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\file -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\util -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\file -++ -++ -++ -++ -++ Source Files\util -++ -++ -++ Source Files\util -++ -++ -++ Source Files\file -++ -++ -++ Source Files\libbluray -++ -++ -++ Source Files\libbluray -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\hdmv -++ -++ -++ Source Files\libbluray\hdmv -++ -++ -++ Source Files\libbluray\hdmv -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\util -++ -++ -++ Source Files\file -++ -++ -++ Source Files\file -++ -++ -++ Source Files\file -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\util -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\file -++ -++ -++ Source Files\file -++ -++ -++ Source Files\util -++ -++ -++ Source Files\util -++ -++ -++ Source Files\libbluray\disc -++ -++ -++ Source Files\libbluray\disc -++ -++ -++ Source Files\libbluray\disc -++ -++ -++ Source Files\libbluray\disc -++ -++ -++ Source Files\util -++ -++ -++ Source Files\file -++ -++ -++ -++ -++ Source Files -++ -++ -++ -+\ No newline at end of file -+diff --git a/src/file/dir_win32.c b/src/file/dir_win32.c -+index 2690658..f42114d 100644 -+--- a/src/file/dir_win32.c -++++ b/src/file/dir_win32.c -+@@ -86,8 +86,8 @@ static BD_DIR_H *_dir_open_win32(const char* dirname) -+ -+ dir->internal = priv; -+ -+- wchar_t wfilespec[MAX_PATH]; -+- if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, MAX_PATH)) -++ wchar_t wfilespec[4096 + 1] = {0}; -++ if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, 4096)) -+ priv->handle = _wfindfirst(wfilespec, &priv->info); -+ else -+ priv->handle = -1; -+diff --git a/src/file/dirs_win32.c b/src/file/dirs_win32.c -+index e165fea..3d07251 100644 -+--- a/src/file/dirs_win32.c -++++ b/src/file/dirs_win32.c -+@@ -36,7 +36,7 @@ -+ -+ char *win32_get_font_dir(const char *font_file) -+ { -+- wchar_t wdir[MAX_PATH]; -++ wchar_t wdir[MAX_PATH+1] = {0}; -+ if (S_OK != SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT, wdir)) { -+ int lenght = GetWindowsDirectoryW(wdir, MAX_PATH); -+ if (lenght == 0 || lenght > (MAX_PATH - 8)) { -+@@ -67,7 +67,7 @@ char *file_get_config_home(void) -+ -+ char *file_get_data_home(void) -+ { -+- wchar_t wdir[MAX_PATH]; -++ wchar_t wdir[MAX_PATH+1] = {0}; -+ -+ /* Get the "Application Data" folder for the user */ -+ if (S_OK == SHGetFolderPathW(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, -+@@ -92,7 +92,7 @@ char *file_get_cache_home(void) -+ const char *file_get_config_system(const char *dir) -+ { -+ static char *appdir = NULL; -+- wchar_t wdir[MAX_PATH]; -++ wchar_t wdir[MAX_PATH+1] = {0}; -+ -+ if (!dir) { -+ // first call -+diff --git a/src/file/dl_win32.c b/src/file/dl_win32.c -+index e4492e1..7f6ae73 100644 -+--- a/src/file/dl_win32.c -++++ b/src/file/dl_win32.c -+@@ -57,7 +57,7 @@ void *dl_dlopen(const char *path, const char *version) -+ { -+ (void)version; -+ -+- wchar_t wname[MAX_PATH]; -++ wchar_t wname[MAX_PATH+1] = {0}; -+ char *name; -+ void *result; -+ -+@@ -109,7 +109,7 @@ const char *dl_get_path(void) -+ if (!initialized) { -+ initialized = 1; -+ -+- static char path[MAX_PATH]; -++ static char path[MAX_PATH + 1]; -+ HMODULE hModule; -+ wchar_t wpath[MAX_PATH]; -+ -+diff --git a/src/file/file_win32.c b/src/file/file_win32.c -+index d9845fb..b4fb7ad 100644 -+--- a/src/file/file_win32.c -++++ b/src/file/file_win32.c -+@@ -107,9 +107,9 @@ static BD_FILE_H *_file_open(const char* filename, const char *mode) -+ { -+ BD_FILE_H *file; -+ FILE *fp; -+- wchar_t wfilename[MAX_PATH], wmode[8]; -++ wchar_t wfilename[4096 + 1] = {0}, wmode[8] = {0}; -+ -+- if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, wfilename, MAX_PATH) || -++ if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, wfilename, 4096) || -+ !MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mode, -1, wmode, 8)) { -+ -+ BD_DEBUG(DBG_FILE, "Error opening file %s\n", filename); -+@@ -122,6 +122,9 @@ static BD_FILE_H *_file_open(const char* filename, const char *mode) -+ return NULL; -+ } -+ -++ // Set file buffer -++ setvbuf(fp, NULL, _IOFBF, 6144 * 10); -++ -+ file = calloc(1, sizeof(BD_FILE_H)); -+ if (!file) { -+ BD_DEBUG(DBG_FILE | DBG_CRIT, "Error opening file %s (out of memory)\n", filename); -+diff --git a/src/libbluray/bdnav/clpi_parse.c b/src/libbluray/bdnav/clpi_parse.c -+index 394347e..39bbcef 100644 -+--- a/src/libbluray/bdnav/clpi_parse.c -++++ b/src/libbluray/bdnav/clpi_parse.c -+@@ -39,6 +39,7 @@ -+ #define CLPI_SIG1 ('H' << 24 | 'D' << 16 | 'M' << 8 | 'V') -+ #define CLPI_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0') -+ #define CLPI_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0') -++#define CLPI_SIG2C ('0' << 24 | '2' << 16 | '4' << 8 | '0') -+ -+ static void -+ _human_readable_sig(char *sig, uint32_t s1, uint32_t s2) -+@@ -129,7 +130,8 @@ _parse_header(BITSTREAM *bits, CLPI_CL *cl) -+ cl->type_indicator2 = bs_read(bits, 32); -+ if (cl->type_indicator != CLPI_SIG1 || -+ (cl->type_indicator2 != CLPI_SIG2A && -+- cl->type_indicator2 != CLPI_SIG2B)) { -++ cl->type_indicator2 != CLPI_SIG2B && -++ cl->type_indicator2 != CLPI_SIG2C)) { -+ -+ char sig[9]; -+ char expect[9]; -+diff --git a/src/libbluray/bdnav/mpls_parse.c b/src/libbluray/bdnav/mpls_parse.c -+index e196118..87b240a 100644 -+--- a/src/libbluray/bdnav/mpls_parse.c -++++ b/src/libbluray/bdnav/mpls_parse.c -+@@ -39,6 +39,7 @@ -+ #define MPLS_SIG1 ('M' << 24 | 'P' << 16 | 'L' << 8 | 'S') -+ #define MPLS_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0') -+ #define MPLS_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0') -++#define MPLS_SIG2C ('0' << 24 | '2' << 16 | '4' << 8 | '0') -+ -+ static void -+ _human_readable_sig(char *sig, uint32_t s1, uint32_t s2) -+@@ -137,8 +138,9 @@ _parse_appinfo(BITSTREAM *bits, MPLS_AI *ai) -+ ai->random_access_flag = bs_read(bits, 1); -+ ai->audio_mix_flag = bs_read(bits, 1); -+ ai->lossless_bypass_flag = bs_read(bits, 1); -++ ai->mvc_base_view_r_flag = bs_read(bits, 1); -+ // Reserved -+- bs_skip(bits, 13); -++ bs_skip(bits, 12); -+ bs_seek_byte(bits, pos + len); -+ return 1; -+ } -+@@ -155,7 +157,8 @@ _parse_header(BITSTREAM *bits, MPLS_PL *pl) -+ pl->type_indicator2 = bs_read(bits, 32); -+ if (pl->type_indicator != MPLS_SIG1 || -+ (pl->type_indicator2 != MPLS_SIG2A && -+- pl->type_indicator2 != MPLS_SIG2B)) { -++ pl->type_indicator2 != MPLS_SIG2B && -++ pl->type_indicator2 != MPLS_SIG2C)) { -+ -+ char sig[9]; -+ char expect[9]; -+@@ -259,6 +262,7 @@ _parse_stream(BITSTREAM *bits, MPLS_STREAM *s) -+ break; -+ }; -+ s->lang[3] = '\0'; -++ s->ss_offset_sequence_id = 0xFF; -+ -+ bs_seek_byte(bits, pos + len); -+ return 1; -+@@ -882,6 +886,99 @@ _parse_subpath_extension(BITSTREAM *bits, MPLS_PL *pl) -+ } -+ -+ static int -++_parse_stn_ss_extension(BITSTREAM *bits, MPLS_PL *pl) -++{ -++ int ii, s; -++ int64_t pos; -++ -++ for (ii = 0; ii < pl->list_count; ii++) { -++ uint32_t len = bs_read(bits, 16); -++ pos = bs_pos(bits) >> 3; -++ int Fixed_offset_during_PopUp_flag = bs_read(bits, 1); -++ bs_skip(bits, 15); // reserved -++ -++ for (s = 0; s < pl->play_item[ii].stn.num_video; s++) { -++ // stream_entry -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ // stream_attributes_ss -++ slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 10); // reserved -++ bs_skip(bits, 6); // number_of_offset_sequences -++ } -++ -++ for (s = 0; s < pl->play_item[ii].stn.num_pg; s++) { -++ pl->play_item[ii].stn.pg[s].ss_offset_sequence_id = bs_read(bits, 8); -++ -++ bs_skip(bits, 4); // reserved -++ bs_skip(bits, 1); // dialog_region_offset_valid_flag -++ int is_SS_PG = bs_read(bits, 1); -++ int is_top_AS_PG_textST = bs_read(bits, 1); -++ int is_bottom_AS_PG_textST = bs_read(bits, 1); -++ if (is_SS_PG) { -++ // stream_entry left eye -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ // stream_entry right eye -++ slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 8); // reserved -++ bs_skip(bits, 8); // PG offset -++ } -++ if (is_top_AS_PG_textST) { -++ // stream_entry -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 8); // reserved -++ bs_skip(bits, 8); // PG offset -++ } -++ if (is_bottom_AS_PG_textST) { -++ // stream_entry -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 8); // reserved -++ bs_skip(bits, 8); // PG offset -++ } -++ } -++ -++ for (s = 0; s < pl->play_item[ii].stn.num_ig; s++) { -++ if (Fixed_offset_during_PopUp_flag) -++ bs_skip(bits, 8); -++ else -++ pl->play_item[ii].stn.ig[s].ss_offset_sequence_id = bs_read(bits, 8); -++ -++ bs_skip(bits, 16); // IG_Plane_offset_during_BB_video -++ bs_skip(bits, 7); // reserved -++ int is_SS_IG = bs_read(bits, 1); -++ if (is_SS_IG) { -++ // stream_entry left eye -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ // stream_entry right eye -++ slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 8); // reserved -++ bs_skip(bits, 8); // PG offset -++ } -++ } -++ -++ // Skip to next play item -++ bs_seek_byte(bits, pos + len); -++ } -++ -++ return 0; -++} -++ -++static int -+ _parse_mpls_extension(BITSTREAM *bits, int id1, int id2, void *handle) -+ { -+ MPLS_PL *pl = (MPLS_PL*)handle; -+@@ -895,7 +992,7 @@ _parse_mpls_extension(BITSTREAM *bits, int id1, int id2, void *handle) -+ -+ if (id1 == 2) { -+ if (id2 == 1) { -+- return 0; -++ return _parse_stn_ss_extension(bits, pl); -+ } -+ if (id2 == 2) { -+ // SubPath entries extension -+diff --git a/src/libbluray/bdnav/mpls_parse.h b/src/libbluray/bdnav/mpls_parse.h -+index 94bfa67..c1b2c31 100644 -+--- a/src/libbluray/bdnav/mpls_parse.h -++++ b/src/libbluray/bdnav/mpls_parse.h -+@@ -49,6 +49,7 @@ typedef struct -+ uint8_t sv_num_pip_pg_ref; -+ uint8_t *sv_secondary_audio_ref; -+ uint8_t *sv_pip_pg_ref; -++ uint8_t ss_offset_sequence_id; -+ } MPLS_STREAM; -+ -+ typedef struct -+@@ -109,6 +110,7 @@ typedef struct -+ uint8_t random_access_flag; -+ uint8_t audio_mix_flag; -+ uint8_t lossless_bypass_flag; -++ uint8_t mvc_base_view_r_flag; -+ } MPLS_AI; -+ -+ typedef struct -+diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c -+index 0e60b68..f633d7a 100644 -+--- a/src/libbluray/bluray.c -++++ b/src/libbluray/bluray.c -+@@ -1626,6 +1626,25 @@ int64_t bd_seek_time(BLURAY *bd, uint64_t tick) -+ return bd->s_pos; -+ } -+ -++int64_t bd_find_seek_point(BLURAY *bd, uint64_t tick) -++{ -++ uint32_t clip_pkt, out_pkt; -++ NAV_CLIP *clip; -++ -++ tick /= 2; -++ -++ if (bd->title && -++ tick < bd->title->duration) { -++ -++ // Find the closest access unit to the requested position -++ clip = nav_time_search(bd->title, (uint32_t)tick, &clip_pkt, &out_pkt); -++ -++ return (int64_t)out_pkt * 192; -++ } -++ -++ return bd->s_pos; -++} -++ -+ uint64_t bd_tell_time(BLURAY *bd) -+ { -+ uint32_t clip_pkt = 0, out_pkt = 0, out_time = 0; -+@@ -2602,6 +2621,7 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx, -+ BLURAY_CLIP_INFO *ci = &title_info->clips[ii]; -+ NAV_CLIP *nc = &title->clip_list.clip[ii]; -+ -++ ci->idx = nc->clip_id; -+ ci->pkt_count = nc->end_pkt - nc->start_pkt; -+ ci->start_time = (uint64_t)nc->title_time * 2; -+ ci->in_time = (uint64_t)pi->in_time * 2; -+@@ -2628,6 +2648,8 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx, -+ _copy_streams(nc, ci->sec_audio_streams, pi->stn.secondary_audio, ci->sec_audio_stream_count); -+ } -+ -++ title_info->mvc_base_view_r_flag = title->pl->app_info.mvc_base_view_r_flag; -++ -+ return title_info; -+ } -+ -+@@ -3746,3 +3768,28 @@ void bd_free_bdjo(struct bdjo_data *obj) -+ (void)obj; -+ #endif -+ } -++ -++int bd_get_clip_infos(BLURAY *bd, unsigned clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration) -++{ -++ if (bd && bd->title && bd->title->clip_list.count > clip) { -++ if (clip_start_time) -++ *clip_start_time = (uint64_t)bd->title->clip_list.clip[clip].title_time << 1; -++ if (stream_start_time) -++ *stream_start_time = (uint64_t)bd->title->clip_list.clip[clip].in_time << 1; -++ if (pos) -++ *pos = (uint64_t)bd->title->clip_list.clip[clip].title_pkt * 192; -++ if (duration) -++ *duration = (uint64_t)bd->title->clip_list.clip[clip].duration << 1; -++ -++ return 1; -++ } -++ return 0; -++} -++ -++struct mpls_pl* bd_get_title_mpls(BLURAY * bd) -++{ -++ if (bd && bd->title) { -++ return bd->title->pl; -++ } -++ return NULL; -++} -+diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h -+index cbf16fc..97dc1a3 100644 -+--- a/src/libbluray/bluray.h -++++ b/src/libbluray/bluray.h -+@@ -32,6 +32,7 @@ extern "C" { -+ */ -+ -+ #include -++#include "bdnav/clpi_data.h" -+ -+ #define TITLES_ALL 0 /**< all titles. */ -+ #define TITLES_FILTER_DUP_TITLE 0x01 /**< remove duplicate titles. */ -+@@ -225,6 +226,7 @@ typedef struct bd_stream_info { -+ } BLURAY_STREAM_INFO; -+ -+ typedef struct bd_clip { -++ uint32_t idx; -+ uint32_t pkt_count; -+ uint8_t still_mode; -+ uint16_t still_time; /* seconds */ -+@@ -275,6 +277,8 @@ typedef struct bd_title_info { -+ -+ uint32_t mark_count; -+ BLURAY_TITLE_MARK *marks; -++ -++ uint8_t mvc_base_view_r_flag; -+ } BLURAY_TITLE_INFO; -+ -+ /* -+@@ -483,6 +487,16 @@ uint32_t bd_get_current_title(BLURAY *bd); -+ -+ /** -+ * -++ * Find the byte position to specific time in 90Khz ticks -++ * -++ * @param bd BLURAY ojbect -++ * @param tick tick count -++ * @return byte position -++ */ -++int64_t bd_find_seek_point(BLURAY *bd, uint64_t tick); -++ -++/** -++ * -+ * Read from currently selected title file, decrypt if possible -+ * -+ * @param bd BLURAY object -+@@ -1007,7 +1021,6 @@ int bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y); -+ -+ /* access to internal information */ -+ -+-struct clpi_cl; -+ /** -+ * -+ * Get copy of clip information for requested playitem. -+@@ -1060,6 +1073,28 @@ void bd_stop_bdj(BLURAY *bd); // shutdown BD-J and clean up resources -+ */ -+ int bd_read_file(BLURAY *, const char *path, void **data, int64_t *size); -+ -++/** -++ * -++ * Get information about the clip -++ * -++ * @param bd BLURAY object -++ * @param clip clip index -++ * @param clip_start_time start of the clip (in the total title) (in 90khz) -++ * @param stream_start_time first pts in the clip (in 90khz) -++ * @param byte position of the clip (absolute) -++ * @param duration duration of the clip (in 90khz) -++ */ -++int bd_get_clip_infos(BLURAY *bd, unsigned clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration); -++ -++/** -++ * Get the MPLS struct of the current title -++ * -++ * @param bd BLURAY object -++ * @return the MPLS struct -++ * -++ * Lifetime of the MPLS pointer is limited to the lifetime of the BD title -++ */ -++struct mpls_pl* bd_get_title_mpls(BLURAY * bd); -+ -+ #ifdef __cplusplus -+ } -+diff --git a/src/libbluray/disc/disc.c b/src/libbluray/disc/disc.c -+index defa084..375e6c3 100644 -+--- a/src/libbluray/disc/disc.c -++++ b/src/libbluray/disc/disc.c -+@@ -69,7 +69,7 @@ static BD_FILE_H *_bdrom_open_path(void *p, const char *rel_path) -+ return NULL; -+ } -+ -+- fp = file_open(abs_path, "rb"); -++ fp = file_open(abs_path, "rbS"); -+ X_FREE(abs_path); -+ -+ return fp; - -From f647a2efa4794fb9c42fc3f52e3c4dc28414e5fd Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sun, 6 Mar 2016 12:54:59 +0000 -Subject: [PATCH 50/61] mvc: Automatically enable stereo mode - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++++- - xbmc/cores/omxplayer/OMXVideo.cpp | 6 +++++- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 4f07113ade696aa4bbefb2dd2a2e17d5f12e9ab9..ce4a849a71468ab89c16cd6e5207a88ee22567c4 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -401,13 +401,17 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - switch (hints.codec) - { - case AV_CODEC_ID_H264: -+ case AV_CODEC_ID_H264_MVC: - // H.264 - m_codingType = MMAL_ENCODING_H264; - m_pFormatName = "mmal-h264"; -- if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) -+ if ((hints.codec_tag == MKTAG('M', 'V', 'C', '1') || hints.codec_tag == MKTAG('A', 'M', 'V', 'C')) && -+ CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) - { - m_codingType = MMAL_ENCODING_MVC; - m_pFormatName= "mmal-mvc"; -+ if (hints.stereo_mode == "mono") -+ hints.stereo_mode = "mvc_lr"; - } - break; - case AV_CODEC_ID_H263: -diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp -index 2e26a6eef7335a5d0baf39313434ac786c66631b..c6aceaadd0a73d170b4024ea5ab54442197bbc5a 100644 ---- a/xbmc/cores/omxplayer/OMXVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXVideo.cpp -@@ -397,6 +397,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool hdmi_clock_syn - switch (hints.codec) - { - case AV_CODEC_ID_H264: -+ case AV_CODEC_ID_H264_MVC: - { - switch(hints.profile) - { -@@ -433,10 +434,13 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool hdmi_clock_syn - break; - } - } -- if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) -+ if ((hints.codec_tag == MKTAG('M', 'V', 'C', '1') || hints.codec_tag == MKTAG('A', 'M', 'V', 'C')) && -+ CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) - { - m_codingType = OMX_VIDEO_CodingMVC; - m_video_codec_name = "omx-mvc"; -+ if (hints.stereo_mode == "mono") -+ hints.stereo_mode = "mvc_lr"; - } - break; - case AV_CODEC_ID_MPEG4: - -From 0801c32f76c1306d1ea3cc1dcb7fb872f912ed78 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 24 Mar 2016 13:02:58 +0000 -Subject: [PATCH 51/61] ffmpeg: mvc: fix for pixelation from packets with no - pts/dts - ---- - .../73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch | 24 ++++++++++++++++++++++ - tools/depends/target/ffmpeg/Makefile | 4 +++- - 2 files changed, 27 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch - -diff --git a/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch b/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..5240cf58ce40c28d12354db63b7e29143ba46978 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch -@@ -0,0 +1,24 @@ -+From 73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105 Mon Sep 17 00:00:00 2001 -+From: Hendrik Leppkes -+Date: Mon, 1 Sep 2014 11:39:09 +0200 -+Subject: [PATCH] h264_parser: force grabing a new timestamp until a frame -+ start was found -+ -+--- -+ libavcodec/h264_parser.c | 3 +++ -+ 1 file changed, 3 insertions(+) -+ -+diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c -+index 2fd3f2b..7165652 100644 -+--- a/libavcodec/h264_parser.c -++++ b/libavcodec/h264_parser.c -+@@ -525,6 +525,9 @@ static int h264_parse(AVCodecParserContext *s, -+ } else { -+ next = h264_find_frame_end(p, buf, buf_size); -+ -++ if (next == END_NOT_FOUND && pc->frame_start_found == 0) -++ s->fetch_timestamp = 1; -++ -+ if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { -+ *poutbuf = NULL; -+ *poutbuf_size = 0; -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index 7e97e4d91a443d46d933df528763422ff5e8f4fa..d4f279fd4f2ceb260698cd6fedb124bae61018d0 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -6,7 +6,8 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ - pfcd_hevc_optimisations.patch \ - 0001-Squashed-commit-of-the-following.patch \ - 0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch 0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch \ -- h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch -+ h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch \ -+ 73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -95,6 +96,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); patch -p1 < ../0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch - cd $(PLATFORM); patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch - cd $(PLATFORM); patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch -+ cd $(PLATFORM); patch -p1 < ../73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch - - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ - -From cb41bffdba7b2a1b32c7cc5a8318336795b63c8d Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 11 Nov 2016 15:53:53 +0000 -Subject: [PATCH 52/61] stereoscopicmanager: fixups for rbp - ---- - xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp | 61 ++++++++++++++++++++++ - xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h | 4 ++ - .../VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 9 +++- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h | 1 + - xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 5 ++ - xbmc/cores/omxplayer/OMXPlayerVideo.h | 1 + - xbmc/cores/omxplayer/OMXVideo.cpp | 2 +- - xbmc/guilib/StereoscopicsManager.cpp | 3 ++ - 8 files changed, 83 insertions(+), 3 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp -index 02fb028daace723fca008a19c1160113b958103f..10e05249cde619a9f5d229fe0ac45b6561236c72 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp -@@ -24,9 +24,11 @@ - #include "utils/log.h" - #include "cores/FFmpeg.h" - #include "Util.h" -+#include - - extern "C" { - #include "libswscale/swscale.h" -+#include "libavutil/intreadwrite.h" - } - - // allocate a new picture (AV_PIX_FMT_YUV420P) -@@ -392,6 +394,65 @@ double CDVDCodecUtils::NormalizeFrameduration(double frameduration, bool *match) - } - } - -+bool CDVDCodecUtils::IsH264AnnexB(std::string format, AVStream *avstream) -+{ -+ assert(avstream->codec->codec_id == AV_CODEC_ID_H264 || avstream->codec->codec_id == AV_CODEC_ID_H264_MVC); -+ if (avstream->codec->extradata_size < 4) -+ return true; -+ if (avstream->codec->extradata[0] == 1) -+ return false; -+ if (format == "avi") -+ { -+ BYTE *src = avstream->codec->extradata; -+ unsigned startcode = AV_RB32(src); -+ if (startcode == 0x00000001 || (startcode & 0xffffff00) == 0x00000100) -+ return true; -+ if (avstream->codec->codec_tag == MKTAG('A', 'V', 'C', '1') || avstream->codec->codec_tag == MKTAG('a', 'v', 'c', '1')) -+ return false; -+ } -+ return true; -+} -+ -+bool CDVDCodecUtils::ProcessH264MVCExtradata(uint8_t *data, int data_size, uint8_t **mvc_data, int *mvc_data_size) -+{ -+ uint8_t* extradata = data; -+ int extradata_size = data_size; -+ -+ if (extradata_size > 4 && *(char *)extradata == 1) -+ { -+ // Find "mvcC" atom -+ uint32_t state = -1; -+ int i = 0; -+ for (; i < extradata_size; i++) -+ { -+ state = (state << 8) | extradata[i]; -+ if (state == MKBETAG('m', 'v', 'c', 'C')) -+ break; -+ } -+ if (i >= 8 && i < extradata_size) -+ { -+ // Update pointers to the start of the mvcC atom -+ extradata = extradata + i - 7; -+ extradata_size = extradata_size - i + 7; -+ // verify size atom and actual size -+ if (extradata_size >= 14 && (AV_RB32(extradata) + 4) <= extradata_size) -+ { -+ extradata += 8; -+ extradata_size -= 8; -+ if (*(char *)extradata == 1) -+ { -+ if (mvc_data) -+ *mvc_data = extradata; -+ if (mvc_data_size) -+ *mvc_data_size = extradata_size; -+ return true; -+ } -+ } -+ } -+ } -+ return false; -+} -+ - struct EFormatMap { - AVPixelFormat pix_fmt; - ERenderFormat format; -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h -index 361c96623660305fc393273b1eaea4db096c417d..8ec50bbf79e9e163ccae25e30f3a40bfbb0d3450 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h -@@ -28,6 +28,7 @@ extern "C" { - } - - struct YV12Image; -+class AVStream; - - class CDVDCodecUtils - { -@@ -46,6 +47,9 @@ public: - - static double NormalizeFrameduration(double frameduration, bool *match = NULL); - -+ static bool IsH264AnnexB(std::string format, AVStream *avstream); -+ static bool ProcessH264MVCExtradata(uint8_t *extradata, int extradata_size, uint8_t **mvc_extradata = nullptr, int *mvc_extradata_size = nullptr); -+ - static ERenderFormat EFormatFromPixfmt(int fmt); - static AVPixelFormat PixfmtFromEFormat(ERenderFormat format); - }; -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index ce4a849a71468ab89c16cd6e5207a88ee22567c4..4ad4c169034c492f67c5efe68212ad1a772a8d7c 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -360,6 +360,11 @@ bool CMMALVideo::SendCodecConfigData() - return true; - } - -+bool CMMALVideo::SupportsExtention() -+{ -+ return CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC); -+} -+ - bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - { - CSingleLock lock(m_sharedSection); -@@ -406,12 +411,12 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - m_codingType = MMAL_ENCODING_H264; - m_pFormatName = "mmal-h264"; - if ((hints.codec_tag == MKTAG('M', 'V', 'C', '1') || hints.codec_tag == MKTAG('A', 'M', 'V', 'C')) && -- CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) -+ SupportsExtention()) - { - m_codingType = MMAL_ENCODING_MVC; - m_pFormatName= "mmal-mvc"; - if (hints.stereo_mode == "mono") -- hints.stereo_mode = "mvc_lr"; -+ hints.stereo_mode = "block_lr"; - } - break; - case AV_CODEC_ID_H263: -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h -index baff1f031149da5d669536711cc0057b2db078e3..1e49f09574c2a93b938d5eb405ebcb06543dec01 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h -@@ -104,6 +104,7 @@ public: - virtual bool GetCodecStats(double &pts, int &droppedPics); - virtual void SetCodecControl(int flags); - virtual void SetSpeed(int iSpeed); -+ virtual bool SupportsExtention(); - - // MMAL decoder callback routines. - void dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer); -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -index d308e44e26baae1a56127b55b987c28c384a9b63..57f0076714ec0c3a2b66d21870bd9644cbfe6ff6 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -@@ -110,6 +110,11 @@ OMXPlayerVideo::~OMXPlayerVideo() - CloseStream(false); - } - -+bool OMXPlayerVideo::SupportsExtention() const -+{ -+ return CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC); -+} -+ - bool OMXPlayerVideo::OpenStream(CDVDStreamInfo &hints) - { - m_hints = hints; -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h -index b5050081c360d29b1b478c27e6b88291e20ecdac..c880fa6bbb128b99f8a5393056586821143d99ff 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.h -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.h -@@ -96,6 +96,7 @@ public: - void WaitForBuffers() { m_messageQueue.WaitUntilEmpty(); } - int GetLevel() const { return m_messageQueue.GetLevel(); } - bool IsStalled() const { return m_stalled; } -+ bool SupportsExtention() const; - bool IsEOS(); - void CloseStream(bool bWaitForBuffers); - void Output(double pts, bool bDropPacket); -diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp -index c6aceaadd0a73d170b4024ea5ab54442197bbc5a..ea11757bfc7ab3ebfbd5b46176c4a91097b765c4 100644 ---- a/xbmc/cores/omxplayer/OMXVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXVideo.cpp -@@ -440,7 +440,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool hdmi_clock_syn - m_codingType = OMX_VIDEO_CodingMVC; - m_video_codec_name = "omx-mvc"; - if (hints.stereo_mode == "mono") -- hints.stereo_mode = "mvc_lr"; -+ hints.stereo_mode = "block_lr"; - } - break; - case AV_CODEC_ID_MPEG4: -diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp -index 041324c51977ce880ab365a16f1ac366c79e369c..7d5999245939c0d9e27a110008e0f2747ca3b696 100644 ---- a/xbmc/guilib/StereoscopicsManager.cpp -+++ b/xbmc/guilib/StereoscopicsManager.cpp -@@ -71,10 +71,13 @@ static const struct StereoModeMap VideoModeToGuiModeMap[] = - { "anaglyph_cyan_red", RENDER_STEREO_MODE_ANAGLYPH_RED_CYAN }, - { "anaglyph_green_magenta", RENDER_STEREO_MODE_ANAGLYPH_GREEN_MAGENTA }, - { "anaglyph_yellow_blue", RENDER_STEREO_MODE_ANAGLYPH_YELLOW_BLUE }, -+#ifndef TARGET_RASPBERRY_PI - { "block_lr", RENDER_STEREO_MODE_HARDWAREBASED }, - { "block_rl", RENDER_STEREO_MODE_HARDWAREBASED }, -+#else - { "block_lr", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback - { "block_rl", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback -+#endif - {} - }; - - -From e311d263f3fe5a2e03c986b3b4806a188db901d1 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 53/61] fixup! Revert supporting crappy tab/sbs subtitles. this - fixes regular subtitles. - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -index a8323f419e404037c4e5fb4d78fa1b45409337a7..7c0b70777556ac7694e7fc511cd4bb189fc42e08 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -@@ -290,6 +290,7 @@ CDVDOverlay* CDVDOverlayCodecFFmpeg::GetOverlay() - - m_SubtitleIndex++; - -+ CLog::Log(LOGDEBUG, "Overlay: x:%d y:%d w:%d h:%d", overlay->x, overlay->y, overlay->width, overlay->height); - return overlay; - } - - -From a2c2c116c6d60388321645998f96f8609c86408f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 26 Nov 2016 18:24:18 +0000 -Subject: [PATCH 54/61] DemuxMVC: fixup after SeekTime API change - ---- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 2 +- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -index ade6a4454fc3915b0c787b1a4f72aedbd74903db..baefe44ca932ee98e482f1bed70d8949be71cfac 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -@@ -188,7 +188,7 @@ DemuxPacket* CDemuxMVC::Read() - return nullptr; - } - --bool CDemuxMVC::SeekTime(int time, bool backwords, double* startpts) -+bool CDemuxMVC::SeekTime(double time, bool backwords, double* startpts) - { - if (!m_pInput) - return false; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -index bbb836a61344689a83af68c821c05c212a86b097..54f91a02391368fbfbb4d669c003f42568347f62 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -@@ -36,7 +36,7 @@ public: - virtual void Abort(); - virtual void Flush(); - virtual DemuxPacket* Read(); -- virtual bool SeekTime(int time, bool backwords = false, double* startpts = nullptr); -+ virtual bool SeekTime(double time, bool backwords = false, double* startpts = nullptr); - virtual void SetSpeed(int iSpeed) { }; - virtual int GetStreamLength() { return 0; }; - virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; }; - -From 0de7f9bdd25e091c98663f733bb4208b5b1274aa Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Tue, 22 Mar 2016 09:51:52 +0100 -Subject: [PATCH 55/61] python: use kodi provided cert if available - ---- - xbmc/interfaces/python/XBPython.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp -index cd6033a9f16233aeec3fcb2c4d3144c3b31f1ac5..e55e336fd9e434a3840fd99c99cc5a3381f818fd 100644 ---- a/xbmc/interfaces/python/XBPython.cpp -+++ b/xbmc/interfaces/python/XBPython.cpp -@@ -591,6 +591,12 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker *invoker) - CEnvironment::putenv(buf); - #endif - -+#if !defined(TARGET_WINDOWS) -+ // use Kodi provided cert if available -+ if (XFILE::CFile::Exists("special://xbmc/system/certs/cacert.pem")) -+ setenv("SSL_CERT_FILE", CSpecialProtocol::TranslatePath("special://xbmc/system/certs/cacert.pem").c_str(), 1); -+#endif -+ - if (PyEval_ThreadsInitialized()) - PyEval_AcquireLock(); - else - -From a53538fd73f6d58433d06aa73c66500376d0ef9e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 25 May 2016 18:31:17 +0100 -Subject: [PATCH 56/61] rbp: Hard code the number of buffers to improve audio - sync - ---- - system/settings/rbp.xml | 6 ++++++ - xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index 7098edf32dff8c00e192229c3ffb060be6a42482..0ce6735e11fabd1d07a4860b9d985a4e1fd5f35a 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -85,6 +85,12 @@ - - - -+ -+ -+ false -+ 2 -+ -+ - - - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index 5feee388bb3a433ea6a35b29e587ab6447c089a5..5d2071ee724fb2f7ba04f96832c89de52d9354f2 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -@@ -1070,7 +1070,11 @@ void CRenderManager::UpdateDisplayLatency() - refresh = 0; // No idea about refresh rate when windowed, just get the default latency - m_displayLatency = (double) g_advancedSettings.GetDisplayLatency(refresh); - -+#ifdef TARGET_RASPBERRY_PI -+ int buffers = CServiceBroker::GetSettings().GetBool("videoplayer.usedisplayasclock") ? 1:2; -+#else - int buffers = g_Windowing.NoOfBuffers(); -+#endif - m_displayLatency += (buffers - 1) / fps; - - } - -From b8180512a426878bc5cc38337f4214487efebe29 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 4 Jul 2016 18:30:03 +0100 -Subject: [PATCH 57/61] rbp: Update the GL libs to new naming scheme - -As the opensource mesa GL library is getting more usable, the name collision wih the firmware GL driver is causing issues. -As such we are renaming the firmware GL driver to avoid this. - -The new names are libbrcmEGL.so and libbrcmGLESv2.so. Both will be supported for some time, but the original name -will be dropped at some point ---- - cmake/modules/FindOpenGLES.cmake | 6 +++--- - tools/depends/configure.ac | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake -index ab06f968b3e314fca1ae001139f687dce9a5098b..87f1faa248b91a2e50758b23c0b9e5b09e4a69ff 100644 ---- a/cmake/modules/FindOpenGLES.cmake -+++ b/cmake/modules/FindOpenGLES.cmake -@@ -13,7 +13,7 @@ - find_package(EMBEDDED) - - if(PKG_CONFIG_FOUND AND NOT PLATFORM STREQUAL "raspberry-pi") -- pkg_check_modules(PC_OPENGLES glesv2 QUIET) -+ pkg_check_modules(PC_OPENGLES brcmglesv2 QUIET) - if(NOT OPENGLES_FOUND AND EMBEDDED_FOUND) - set(CMAKE_PREFIX_PATH ${EMBEDDED_FOUND} ${CMAKE_PREFIX_PATH}) - endif() -@@ -22,9 +22,9 @@ endif() - if(NOT CORE_SYSTEM_NAME STREQUAL ios) - find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h - PATHS ${PC_OPENGLES_INCLUDEDIR}) -- find_library(OPENGLES_gl_LIBRARY NAMES GLESv2 -+ find_library(OPENGLES_gl_LIBRARY NAMES brcmGLESv2 - PATHS ${PC_OPENGLES_LIBDIR}) -- find_library(OPENGLES_egl_LIBRARY NAMES EGL -+ find_library(OPENGLES_egl_LIBRARY NAMES brcmEGL - PATHS ${PC_OPENGLES_LIBDIR}) - else() - find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES -diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac -index ac2ac3cf689ec0eb68877d4149c9d3f856e9145c..1c8fd284c2d59170003f274d2c0cec04dd4c2118 100644 ---- a/tools/depends/configure.ac -+++ b/tools/depends/configure.ac -@@ -433,7 +433,7 @@ if test "$target_platform" = "raspberry-pi" ; then - -isystem${use_firmware}/opt/vc/include \ - -isystem${use_firmware}/opt/vc/include/interface/vcos/pthreads \ - -isystem${use_firmware}/opt/vc/include/interface/vmcs_host/linux" -- platform_ldflags+=" -L${use_firmware}/opt/vc/lib -lEGL -lGLESv2 -lbcm_host -lvcos \ -+ platform_ldflags+=" -L${use_firmware}/opt/vc/lib -lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvcos \ - -lvchiq_arm" - fi - - -From 894b620985c0b8fef4e6117cc594b7493e6816e1 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 28 Jun 2016 14:46:01 +0100 -Subject: [PATCH 58/61] ffmpeg: hacky fix for files with GMC - ---- - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 179a287d1cec04686b30fdee1ef8f1770b0f9f8d..1453fb7f281609598e57afdc5e162f5ebfbbecd3 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1460,8 +1460,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - stereoMode = GetStereoModeFromMetadata(m_pFormatContext->metadata); - if (!stereoMode.empty()) - st->stereo_mode = stereoMode; -- -- st->workaround_bugs = pStream->codec->workaround_bugs; -+ AVCodecContext *c = (AVCodecContext *)(((uint32_t *)pStream->internal)[4]); /* Eek! */ -+ st->workaround_bugs = c->workaround_bugs; - if ( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) ) - { - if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) - -From 541a9cdf189e47985dd4616f72ea888a29ccbe1e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 19 Jul 2016 20:39:18 +0100 -Subject: [PATCH 59/61] mmalrender: Add sharpness control - ---- - addons/resource.language.en_gb/resources/strings.po | 2 +- - .../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 13 ++++++++++++- - .../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h | 1 + - 3 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index ddc3d4a5127d759d160107e400c7d714a01f440b..dc48b283ebb511501dd3675ed6b24861c2203195 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -8739,7 +8739,7 @@ msgstr "" - - #: xbmc/video/dialogs/GUIDialogVideoSettings.cpp - msgctxt "#16313" --msgid "VDPAU - Sharpness" -+msgid "Sharpness" - msgstr "" - - #empty string with id 16314 -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -index 213c46345d5eebc4046619821526f6684db131dd..a234de11322599e042febd9a4945dd150dac3921 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -@@ -411,6 +411,7 @@ CMMALRenderer::CMMALRenderer() : CThread("MMALRenderer"), m_processThread(this, - m_frameInterval = 0.0; - m_frameIntervalDiff = 1e5; - m_vsync_count = ~0U; -+ m_sharpness = -2.0f; - m_vout_width = 0; - m_vout_height = 0; - m_vout_aligned_width = 0; -@@ -847,6 +848,15 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha) - goto exit; - } - -+ // if sharpness setting has changed, we should update it -+ if (m_sharpness != CMediaSettings::GetInstance().GetCurrentVideoSettings().m_Sharpness) -+ { -+ m_sharpness = CMediaSettings::GetInstance().GetCurrentVideoSettings().m_Sharpness; -+ char command[80], response[80]; -+ sprintf(command, "scaling_sharpness %d", ((int)(50.0f * (m_sharpness + 1.0f) + 0.5f))); -+ vc_gencmd(response, sizeof response, command); -+ } -+ - if (m_format != RENDER_FMT_MMAL) - { - if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -@@ -1023,7 +1033,8 @@ bool CMMALRenderer::Supports(ERENDERFEATURE feature) - feature == RENDERFEATURE_ZOOM || - feature == RENDERFEATURE_ROTATION || - feature == RENDERFEATURE_VERTICAL_SHIFT || -- feature == RENDERFEATURE_PIXEL_RATIO) -+ feature == RENDERFEATURE_PIXEL_RATIO || -+ feature == RENDERFEATURE_SHARPNESS) - return true; - - return false; -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h -index e0e6f7c0e0546013ca74265aef54704fd332f8e4..69eae6cbef0131d20dc979dcb35915cd73967592 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h -@@ -140,6 +140,7 @@ protected: - RENDER_STEREO_MODE m_video_stereo_mode; - RENDER_STEREO_MODE m_display_stereo_mode; - bool m_StereoInvert; -+ float m_sharpness; - - CCriticalSection m_sharedSection; - MMAL_COMPONENT_T *m_vout; - -From 3a409eb31f7317a9c3cc48a6dd28ffd513b8d2e4 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 14 Oct 2016 15:37:53 +0100 -Subject: [PATCH 60/61] MMALFFMpeg: Report as SW decode in codec overlay info - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index c4eda5a2c78db1f6acc9ed59938ea3f42262d8fe..a5e14e6ec5ff9a78e7342b30109e68ed8d81a54b 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -577,7 +577,7 @@ void CDVDVideoCodecFFmpeg::UpdateName() - if(m_pHardware) - m_name += "-" + m_pHardware->Name(); - -- m_processInfo.SetVideoDecoderName(m_name, m_pHardware ? true : false); -+ m_processInfo.SetVideoDecoderName(m_name, m_pHardware && m_pHardware->Name() != "mmal" ? true : false); - - CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - Updated codec: %s", m_name.c_str()); - } - -From 466da8e66acf9a60b424759f946b3c2bb2db6eed Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 1 Dec 2016 17:06:01 +0000 -Subject: [PATCH 61/61] MMALRender: Allow advanced deinterlace with software - decode - -Uses YUV420 directly which improves performance. -Requires updated firmware ---- - xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -index a234de11322599e042febd9a4945dd150dac3921..6d71b09c4badb5c3e2ef8f57b94014f43a285e32 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -@@ -1370,7 +1370,7 @@ bool CMMALRenderer::CheckConfigurationDeint(uint32_t width, uint32_t height, uin - m_deint_output->format->es->video.crop.height = height; - m_deint_output->format->es->video.width = ALIGN_UP(width, 32); - m_deint_output->format->es->video.height = ALIGN_UP(height, 16); -- m_deint_output->format->encoding = advanced_deinterlace ? MMAL_ENCODING_YUVUV128 : MMAL_ENCODING_I420; -+ m_deint_output->format->encoding = advanced_deinterlace && encoding == MMAL_ENCODING_OPAQUE ? MMAL_ENCODING_YUVUV128 : MMAL_ENCODING_I420; - - status = mmal_port_format_commit(m_deint_output); - if (status != MMAL_SUCCESS) From b71874e5ceab2b9bbbabcb9d98c8d893d4ced88b Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 10 Feb 2017 15:06:25 -0800 Subject: [PATCH 3/7] kodi: drop RPi2 patches --- .../RPi2/patches/kodi/kodi-001-backport.patch | 52006 ---------------- 1 file changed, 52006 deletions(-) delete mode 100644 projects/RPi2/patches/kodi/kodi-001-backport.patch diff --git a/projects/RPi2/patches/kodi/kodi-001-backport.patch b/projects/RPi2/patches/kodi/kodi-001-backport.patch deleted file mode 100644 index 3316323ffa..0000000000 --- a/projects/RPi2/patches/kodi/kodi-001-backport.patch +++ /dev/null @@ -1,52006 +0,0 @@ -From 8386e404766c270aa72043215184400d2ec96c25 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 19 Dec 2016 13:28:26 +0000 -Subject: [PATCH 01/61] [cec] Drop CEC_DOUBLE_TAP_TIMEOUT_MS_OLD code - -Kodi won't even build with libcec 3, so supporting a libcec 2.2 setting is of no value ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 54dc37e751ba4ec50cfa922cfe4c0b1fd354e3cd..73872e3c6126bf4a4e8b998491f87a35dcbdaceb 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1391,13 +1391,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == LOCALISED_ID_SUSPEND ? 1 : 0; - m_bShutdownOnStandby = iStandbyAction == LOCALISED_ID_POWEROFF; - --#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) -- // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -- m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; --#else -- // backwards compatibility. will be removed once the next major release of libCEC is out -+ // double tap prevention timeout in ms - m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); --#endif - - if (GetSettingBool("pause_playback_on_deactivate")) - { - -From 606fde4f5f9e8cd26600d949619db516fd8d4ec1 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 28 Oct 2014 00:19:40 +0000 -Subject: [PATCH 02/61] [cec] Add settings for configuring button repeats - ---- - addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ - system/peripherals.xml | 4 +++- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 11 +++++++++++ - 3 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 0cdc64916aec1c12bfa2bb617eec530d5f1efe80..b356dbe55165567a232c2a6afd00387122aee96f 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -20424,3 +20424,18 @@ msgstr "" - msgctxt "#39014" - msgid "Would you also like to remove all related data (e.g. settings) of this add-on?" - msgstr "" -+ -+#: system/peripherals.xml -+msgctxt "#38050" -+msgid "Remote button press delay before repeating (ms)" -+msgstr "" -+ -+#: system/peripherals.xml -+msgctxt "#38051" -+msgid "Remote button press repeat rate (ms)" -+msgstr "" -+ -+#: system/peripherals.xml -+msgctxt "#38052" -+msgid "Remote button press release time (ms)" -+msgstr "" -diff --git a/system/peripherals.xml b/system/peripherals.xml -index d5704b249c3065b2980dc92c7c81dc7b384187bc..02b1a9ed6fce1986bd864bba09a9df0621f9e041 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -31,7 +31,9 @@ - - - -- -+ -+ -+ - - - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 73872e3c6126bf4a4e8b998491f87a35dcbdaceb..92c901e044aeb7b9bece17636ffe89c05648814f 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1296,6 +1296,15 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu - m_configuration.bActivateSource = config.bActivateSource; - bChanged |= SetSetting("activate_source", m_configuration.bActivateSource == 1); - -+ m_configuration.iDoubleTapTimeoutMs = config.iDoubleTapTimeoutMs; -+ bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeoutMs); -+ -+ m_configuration.iButtonRepeatRateMs = config.iButtonRepeatRateMs; -+ bChanged |= SetSetting("button_repeat_rate_ms", (int)m_configuration.iButtonRepeatRateMs); -+ -+ m_configuration.iButtonReleaseDelayMs = config.iButtonReleaseDelayMs; -+ bChanged |= SetSetting("button_release_delay_ms", (int)m_configuration.iButtonReleaseDelayMs); -+ - m_configuration.bPowerOffOnStandby = config.bPowerOffOnStandby; - - m_configuration.iFirmwareVersion = config.iFirmwareVersion; -@@ -1393,6 +1402,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - - // double tap prevention timeout in ms - m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ m_configuration.iButtonRepeatRateMs = GetSettingInt("button_repeat_rate_ms"); -+ m_configuration.iButtonReleaseDelayMs = GetSettingInt("button_release_delay_ms"); - - if (GetSettingBool("pause_playback_on_deactivate")) - { - -From cf1c64764598b85d9da9032feddd87c8f0fc58b6 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 3 Nov 2014 23:17:46 +0000 -Subject: [PATCH 03/61] [cec] Don't discard buttons when repeat mode is enabled - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 92c901e044aeb7b9bece17636ffe89c05648814f..da99db975e994c0e1d9d9b420f3ad92c6ed91eb6 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -803,7 +803,10 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration); - - CSingleLock lock(m_critSection); -- if (key.iDuration > 0) -+ // avoid the queue getting too long -+ if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5) -+ return; -+ if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0) - { - if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) - { - -From 4855222624ec6f184e5763bf9387f904545ab873 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 4 Nov 2014 18:50:00 +0000 -Subject: [PATCH 04/61] [cec] Temp - more logging - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index da99db975e994c0e1d9d9b420f3ad92c6ed91eb6..9114cec72ccaf16afa1e50d13b238c9ca0dee30d 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -800,12 +800,15 @@ void CPeripheralCecAdapter::GetNextKey(void) - - void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - { -- CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration); -+ CLog::Log(LOGDEBUG, "%s - received key %2x duration %d (rep:%d size:%d)", __FUNCTION__, key.iButton, key.iDuration, m_configuration.iButtonRepeatRateMs, m_buttonQueue.size()); - - CSingleLock lock(m_critSection); - // avoid the queue getting too long - if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5) -+ { -+ CLog::Log(LOGDEBUG, "%s - discarded key %2x", __FUNCTION__, key.iButton); - return; -+ } - if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0) - { - if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) -@@ -814,6 +817,7 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - if (m_bHasButton) - m_currentButton.iDuration = key.iDuration; - // ignore this one, since it's already been handled by xbmc -+ CLog::Log(LOGDEBUG, "%s - ignored key %2x", __FUNCTION__, key.iButton); - return; - } - // if we received a keypress with a duration set, try to find the same one without a duration set, and replace it -@@ -824,6 +828,7 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - if ((*it).iDuration == 0) - { - // replace this entry -+ CLog::Log(LOGDEBUG, "%s - replaced key %2x", __FUNCTION__, key.iButton); - (*it).iDuration = key.iDuration; - return; - } -@@ -833,6 +838,7 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) - } - } - -+ CLog::Log(LOGDEBUG, "%s - added key %2x", __FUNCTION__, key.iButton); - m_buttonQueue.push_back(key); - } - - -From 741c1ec64bca9da543d9be6a4a82049ca0d70593 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 26 Apr 2014 17:27:52 +0100 -Subject: [PATCH 05/61] [cec] Don't suspend pi on tv switch off - it can't wake - up - ---- - system/peripherals.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index 02b1a9ed6fce1986bd864bba09a9df0621f9e041..54f9b70cfd5c8c82ceb99932e1b3e3251211cd20 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -16,7 +16,7 @@ - - - -- -+ - - - - -From 161d42929f5bbf481c946601d78376e873e706a4 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 7 Apr 2014 18:19:32 +0100 -Subject: [PATCH 06/61] [rbp/omxplayer] When opening a stream don't try to - update gui so often - ---- - xbmc/dialogs/GUIDialogBusy.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xbmc/dialogs/GUIDialogBusy.cpp b/xbmc/dialogs/GUIDialogBusy.cpp -index c8fe0706d128b3c67a4000894129ae0fa08bb223..8a5916299575661743131b921a27a76f0bb88409 100644 ---- a/xbmc/dialogs/GUIDialogBusy.cpp -+++ b/xbmc/dialogs/GUIDialogBusy.cpp -@@ -69,7 +69,11 @@ bool CGUIDialogBusy::WaitOnEvent(CEvent &event, unsigned int displaytime /* = 10 - { - dialog->Open(); - -+#ifdef TARGET_RASPBERRY_PI -+ while(!event.WaitMSec(100)) -+#else - while(!event.WaitMSec(1)) -+#endif - { - dialog->ProcessRenderLoop(false); - if (allowCancel && dialog->IsCanceled()) - -From c2d9db11fa5b5d56b0d5c19fe5712ed4e9088f3c Mon Sep 17 00:00:00 2001 -From: Ben Avison -Date: Thu, 1 May 2014 16:28:39 +0100 -Subject: [PATCH 07/61] Improved file buffering in CArchive - -Even though memcpy is typically inlined by the compiler into byte/word loads -and stores (at least for release builds), the frequency with which 1, 2 and 4 -byte loads/stores are encountered in cases where the size is *not* -determinable at compile time is still high enough that it's worth handling -these specially. On the ARM1176JZF-S in the Raspberry Pi, this improves the -total time to open a library (in the case where it's fetched from a CArchive) -by around 4%. - -It should be noted that this code uses 16-bit and 32-bit word loads and -stores that are not necessarily aligned to their respective widths. It is -possible that there are some architectures out there which do not support -this, although all ARMs since ARMv6 have supported it (and ARMs earlier than -that are probably not powerful enough to be good targets for XBMC). ---- - xbmc/utils/Archive.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/xbmc/utils/Archive.h b/xbmc/utils/Archive.h -index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7acce53b3a 100644 ---- a/xbmc/utils/Archive.h -+++ b/xbmc/utils/Archive.h -@@ -155,9 +155,17 @@ protected: - * than waiting until we attempt to put more data into an already full buffer */ - if (m_BufferRemain > size) - { -+ switch (size) -+ { -+ case 1: *m_BufferPos++ = *ptr; m_BufferRemain--; break; -+ case 2: *(uint16_t *) m_BufferPos = *(const uint16_t *) ptr; m_BufferPos += 2; m_BufferRemain -= 2; break; -+ case 4: *(uint32_t *) m_BufferPos = *(const uint32_t *) ptr; m_BufferPos += 4; m_BufferRemain -= 4; break; -+ default: - memcpy(m_BufferPos, ptr, size); - m_BufferPos += size; - m_BufferRemain -= size; -+ break; -+ } - return *this; - } - -@@ -170,9 +178,17 @@ protected: - /* Note, refilling the buffer is deferred until we know we need to read more from it */ - if (m_BufferRemain >= size) - { -+ switch (size) -+ { -+ case 1: *ptr = *m_BufferPos++; m_BufferRemain--; break; -+ case 2: *(uint16_t *) ptr = *(const uint16_t *) m_BufferPos; m_BufferPos += 2; m_BufferRemain -= 2; break; -+ case 4: *(uint32_t *) ptr = *(const uint32_t *) m_BufferPos; m_BufferPos += 4; m_BufferRemain -= 4; break; -+ default: - memcpy(ptr, m_BufferPos, size); - m_BufferPos += size; - m_BufferRemain -= size; -+ break; -+ } - return *this; - } - - -From 7835b498bae03e702db8dec9eebbe38ba0c9181c Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sun, 10 Aug 2014 16:45:16 +0100 -Subject: [PATCH 08/61] filesystem: Make support of browsing into archives - optional - -The ability to browse, scan and play content in archives can cause problems on low powered/low memory devices. -It's quite common to see reports of a large rar file that causes xbmc to crash with an out-of-memory error when browsing or scanning. -It also can be slow as any archive in the directory is opened and extracted. - -This causes issues for people who scan library with archives disabled, then subsequently enable it. -The library has the .rar files in which don't play without removing and re-adding. - -We'll let people who don't use archives disable it manually ---- - addons/resource.language.en_gb/resources/strings.po | 9 +++++++++ - system/settings/rbp.xml | 11 +++++++++++ - xbmc/Util.cpp | 4 ++-- - xbmc/filesystem/FileDirectoryFactory.cpp | 4 ++++ - 4 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index b356dbe55165567a232c2a6afd00387122aee96f..d4b4911282fbc32c89ef3f66f26179e1d798fb1f 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -20045,6 +20045,15 @@ msgstr "" - #: system/settings/rbp.xml - msgctxt "#38010" - msgid "GPU accelerated" -+ -+#: system/settings/settings.xml -+msgctxt "#38040" -+msgid "Support browsing into archives" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#38041" -+msgid "Allow viewing and playing files in archives (e.g. zip, rar)" - msgstr "" - - #. Setting #38011 "Show All Items entry" -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index 62e9c8ed2199f8c57a640b06b0216ee4c8f0ca1e..e8b0d3d472b02fd161a4b51e957b9129e3cb9792 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -102,4 +102,15 @@ - - -
-+
-+ -+ -+ -+ 1 -+ true -+ -+ -+ -+ -+
- -diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp -index f2d69da28ce36209ace7391ed607bc85983520ac..c3fd0e2b3277a0a29de9b7c6861b796a9f198aee 100644 ---- a/xbmc/Util.cpp -+++ b/xbmc/Util.cpp -@@ -1900,7 +1900,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, - URIUtils::RemoveExtension(strCandidate); - if (StringUtils::StartsWithNoCase(strCandidate, videoName)) - { -- if (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath())) -+ if (CServiceBroker::GetSettings().GetBool("filelists.browsearchives") && (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath()))) - CUtil::ScanArchiveForAssociatedItems(pItem->GetPath(), "", item_exts, associatedFiles); - else - { -@@ -1910,7 +1910,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, - } - else - { -- if (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath())) -+ if (CServiceBroker::GetSettings().GetBool("filelists.browsearchives") && (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath()))) - CUtil::ScanArchiveForAssociatedItems(pItem->GetPath(), videoName, item_exts, associatedFiles); - } - } -diff --git a/xbmc/filesystem/FileDirectoryFactory.cpp b/xbmc/filesystem/FileDirectoryFactory.cpp -index 36fd7bb6358497abf80494620341def8ff991996..9c1b6bf975afee8b6a3d8784ed19af0367455f46 100644 ---- a/xbmc/filesystem/FileDirectoryFactory.cpp -+++ b/xbmc/filesystem/FileDirectoryFactory.cpp -@@ -40,6 +40,7 @@ - #include "playlists/PlayListFactory.h" - #include "Directory.h" - #include "File.h" -+#include "settings/Settings.h" - #include "FileItem.h" - #include "utils/StringUtils.h" - #include "URL.h" -@@ -148,6 +149,8 @@ IFileDirectory* CFileDirectoryFactory::Create(const CURL& url, CFileItem* pItem, - return NULL; - } - #endif -+ if (CServiceBroker::GetSettings().GetBool("filelists.browsearchives")) -+ { - if (url.IsFileType("zip")) - { - CURL zipURL = URIUtils::CreateArchivePath("zip", url); -@@ -221,6 +224,7 @@ IFileDirectory* CFileDirectoryFactory::Create(const CURL& url, CFileItem* pItem, - } - return NULL; - } -+ } - if (url.IsFileType("xbt")) - { - CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url); - -From b06c63eb292cd2a12c61435420ea7472bbf04e42 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 27 Oct 2014 13:06:57 +0000 -Subject: [PATCH 09/61] [rbp] Make cachemembuffersize default depend on memory - size - ---- - xbmc/linux/RBP.cpp | 10 ++++++++++ - xbmc/linux/RBP.h | 1 + - xbmc/settings/AdvancedSettings.cpp | 12 +++++++++++- - 3 files changed, 22 insertions(+), 1 deletion(-) - -diff --git a/xbmc/linux/RBP.cpp b/xbmc/linux/RBP.cpp -index 356d64b0b16e4b543abbdbb11f4beacd0b715334..c073dc28db9abc24025909e2d91b7ce49201f4ea 100644 ---- a/xbmc/linux/RBP.cpp -+++ b/xbmc/linux/RBP.cpp -@@ -24,6 +24,7 @@ - #include - #include "ServiceBroker.h" - #include "settings/Settings.h" -+#include "settings/AdvancedSettings.h" - #include "utils/log.h" - - #include "cores/omxplayer/OMXImage.h" -@@ -59,6 +60,12 @@ CRBP::~CRBP() - delete m_DllBcmHost; - } - -+void CRBP::InitializeSettings() -+{ -+ if (m_initialized && g_advancedSettings.m_cacheMemSize == ~0U) -+ g_advancedSettings.m_cacheMemSize = m_arm_mem < 256 ? 1024 * 1024 * 2 : 1024 * 1024 * 20; -+} -+ - bool CRBP::Initialize() - { - CSingleLock lock(m_critSection); -@@ -98,6 +105,8 @@ bool CRBP::Initialize() - if (!m_gui_resolution_limit) - m_gui_resolution_limit = m_gpu_mem < 128 ? 720:1080; - -+ InitializeSettings(); -+ - g_OMXImage.Initialize(); - m_omx_image_init = true; - return true; -@@ -110,6 +119,7 @@ void CRBP::LogFirmwareVerison() - response[sizeof(response) - 1] = '\0'; - CLog::Log(LOGNOTICE, "Raspberry PI firmware version: %s", response); - CLog::Log(LOGNOTICE, "ARM mem: %dMB GPU mem: %dMB MPG2:%d WVC1:%d", m_arm_mem, m_gpu_mem, m_codec_mpg2_enabled, m_codec_wvc1_enabled); -+ CLog::Log(LOGNOTICE, "cache.memorysize: %dMB", g_advancedSettings.m_cacheMemSize >> 20); - m_DllBcmHost->vc_gencmd(response, sizeof response, "get_config int"); - response[sizeof(response) - 1] = '\0'; - CLog::Log(LOGNOTICE, "Config:\n%s", response); -diff --git a/xbmc/linux/RBP.h b/xbmc/linux/RBP.h -index eff631d24cd7b072fd601f8f6a35ff0ae67bad4c..26a2a4bd74b54288282b534c5de7d59d6ccec7f5 100644 ---- a/xbmc/linux/RBP.h -+++ b/xbmc/linux/RBP.h -@@ -61,6 +61,7 @@ public: - ~CRBP(); - - bool Initialize(); -+ void InitializeSettings(); - void LogFirmwareVerison(); - void Deinitialize(); - int GetArmMem() { return m_arm_mem; } -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 5634ed111a6b7b19fb81acb9a81b58109ef40395..4ebc890a52995ca761effad6c30d41cb25b5bdb8 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -50,6 +50,9 @@ - #if defined(TARGET_DARWIN_IOS) - #include "platform/darwin/DarwinUtils.h" - #endif -+#if defined(TARGET_RASPBERRY_PI) -+#include "linux/RBP.h" -+#endif - - using namespace ADDON; - using namespace XFILE; -@@ -355,7 +358,12 @@ void CAdvancedSettings::Initialize() - m_bPVRAutoScanIconsUserSet = false; - m_iPVRNumericChannelSwitchTimeout = 2000; - -+#ifdef TARGET_RASPBERRY_PI -+ // want default to be memory dependent, but interface to gpu not available yet, so set in RBP.cpp -+ m_cacheMemSize = ~0; -+#else - m_cacheMemSize = 1024 * 1024 * 20; -+#endif - m_cacheBufferMode = CACHE_BUFFER_MODE_INTERNET; // Default (buffer all internet streams/filesystems) - // the following setting determines the readRate of a player data - // as multiply of the default data read rate -@@ -404,7 +412,9 @@ void CAdvancedSettings::Initialize() - m_extraLogLevels = 0; - - m_userAgent = g_sysinfo.GetUserAgent(); -- -+#ifdef TARGET_RASPBERRY_PI -+ g_RBP.InitializeSettings(); -+#endif - m_initialized = true; - } - - -From e3e9ab17bc67e558df61e4a88cf5ee7d42e29e31 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 30 May 2014 14:58:43 +0100 -Subject: [PATCH 10/61] [settings] Experiment: Report DESKTOP resolution in - video settings - ---- - xbmc/settings/DisplaySettings.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp -index 0f0f3549bb4e68fcbdf73976c43e300791fabc6b..b6a9adacc7872487b25331dff16cc5a302cb3e15 100644 ---- a/xbmc/settings/DisplaySettings.cpp -+++ b/xbmc/settings/DisplaySettings.cpp -@@ -705,6 +705,9 @@ void CDisplaySettings::SettingOptionsResolutionsFiller(const CSetting *setting, - std::vector resolutions = g_Windowing.ScreenResolutions(info.iScreen, info.fRefreshRate); - for (std::vector::const_iterator resolution = resolutions.begin(); resolution != resolutions.end(); ++resolution) - { -+if (resolution->ResInfo_Index == RES_DESKTOP) -+ list.push_back(std::make_pair(StringUtils::Format("DESKTOP"), resolution->ResInfo_Index)); -+else - list.push_back(std::make_pair( - StringUtils::Format("%dx%d%s", resolution->width, resolution->height, - ModeFlagsToString(resolution->flags, false).c_str()), - -From b688c614ab62dfcee9d7b44eb1d972fd7775a444 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 24 Sep 2014 23:13:52 +0100 -Subject: [PATCH 11/61] [audio] Add settings option to boost centre channel - when downmixing - -This allows a dB volume increase to be added to centre channel. -This can help improve dialgue in the presence of background music/effects. -It can go up to 30dB for testing purposes, but value of 6 is probably more reasonable. -It is recommended to ensure "Normalise levels on downmix" is enabled when boosting by large values to avoid clipping. - -Should work with Pi Sink (dvdplayer/paplayer) and omxplayer ---- - addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ - system/settings/settings.xml | 12 ++++++++++++ - .../Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp | 8 ++++++++ - .../AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp | 7 +++++++ - xbmc/cores/omxplayer/OMXAudio.cpp | 6 ++++++ - 5 files changed, 48 insertions(+) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index d4b4911282fbc32c89ef3f66f26179e1d798fb1f..532be48326aebeb2c05bb52176ea4544fae81c49 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -20265,6 +20265,21 @@ msgstr "" - - #empty strings from id 38062 to 38099 - -+#: system/settings/settings.xml -+msgctxt "#38007" -+msgid "Boost centre channel when downmixing" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#38008" -+msgid "Increase this value to make the dialogue louder compared to background sounds when downmixing multichannel audio" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#38009" -+msgid "%i dB" -+msgstr "" -+ - #. Description of section #14200 "Player"" - #: system/settings/settings.xml - msgctxt "#38100" -diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 9060fbc5eafe3726ab33649273aad9e05980f64a..b0d103cba5bcdd1d7bece68bc983ab37b0133dbb 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -2491,6 +2491,18 @@ - - - -+ -+ 2 -+ 0 -+ -+ 0 -+ 1 -+ 30 -+ -+ -+ 38009 -+ -+ - - HAS_AE_QUALITY_LEVELS - 2 -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -index af5bf93116543bd282953b01d0c5bcef93bb3a84..80aecbd496ac021b1a02c10ef9432a4c22e54bfa 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -@@ -20,6 +20,8 @@ - - #include "cores/AudioEngine/Utils/AEUtil.h" - #include "ActiveAEResampleFFMPEG.h" -+#include "ServiceBroker.h" -+#include "settings/Settings.h" - #include "utils/log.h" - - extern "C" { -@@ -104,6 +106,12 @@ bool CActiveAEResampleFFMPEG::Init(uint64_t dst_chan_layout, int dst_channels, i - { - av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); - } -+ int boost_center = CServiceBroker::GetSettings().GetInt("audiooutput.boostcenter"); -+ if (boost_center) -+ { -+ float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f); -+ av_opt_set_double(m_pContext, "center_mix_level", gain, 0); -+ } - - if (remapLayout) - { -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp -index 78071493fca4756c6741d7085e35cbe2f27038e6..9b9d1a736c974eab37bdd85e6553dfe69b438847 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp -@@ -25,6 +25,7 @@ - - #include "cores/AudioEngine/Utils/AEUtil.h" - #include "ActiveAEResamplePi.h" -+#include "ServiceBroker.h" - #include "settings/Settings.h" - #include "utils/log.h" - #include "linux/RBP.h" -@@ -164,6 +165,12 @@ bool CActiveAEResamplePi::Init(uint64_t dst_chan_layout, int dst_channels, int d - { - av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); - } -+ int boost_center = CServiceBroker::GetSettings().GetInt("audiooutput.boostcenter"); -+ if (boost_center) -+ { -+ float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f); -+ av_opt_set_double(m_pContext, "center_mix_level", gain, 0); -+ } - - if (remapLayout) - { -diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp -index fcec25db0c48b4d4ec7b329b19538a73d0b53efd..ae048e0d144e174020a6f567112f9829e3ac0c8b 100644 ---- a/xbmc/cores/omxplayer/OMXAudio.cpp -+++ b/xbmc/cores/omxplayer/OMXAudio.cpp -@@ -632,6 +632,12 @@ bool COMXAudio::Initialize(AEAudioFormat format, OMXClock *clock, CDVDStreamInfo - { - av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); - } -+ int boost_center = CServiceBroker::GetSettings().GetInt("audiooutput.boostcenter"); -+ if (boost_center) -+ { -+ float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f); -+ av_opt_set_double(m_pContext, "center_mix_level", gain, 0); -+ } - - // stereo upmix - if (upmix && m_src_channels == 2 && m_dst_channels > 2) - -From 564d8219c632fec87bc13cca69e92913441dada3 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 27 Oct 2014 15:23:51 +0000 -Subject: [PATCH 12/61] [rbp] Default extract thumbnails to false - -It can take 80 seconds for a single file on a Pi. It can cause crashes with out-of-memory errors. -It genereates a lot of support issues. Best to default to disabled and let users enable it if they must ---- - system/settings/rbp.xml | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc72740085 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -43,6 +43,12 @@ - - false - -+ -+ false -+ -+ -+ false -+ - - - - -From c3ffa7554489075837a561020d47a66e06bb6b7f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 27 Nov 2014 16:31:56 +0000 -Subject: [PATCH 13/61] [languageinvoker] Reduce priority of python threads - ---- - xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/xbmc/interfaces/generic/LanguageInvokerThread.cpp b/xbmc/interfaces/generic/LanguageInvokerThread.cpp -index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd12b5a81fd 100644 ---- a/xbmc/interfaces/generic/LanguageInvokerThread.cpp -+++ b/xbmc/interfaces/generic/LanguageInvokerThread.cpp -@@ -50,6 +50,11 @@ bool CLanguageInvokerThread::execute(const std::string &script, const std::vecto - m_args = arguments; - - Create(); -+ #ifdef TARGET_RASPBERRY_PI -+ /* low prio */ -+ SetPriority(GetPriority()-1); -+ #endif -+ - return true; - } - - -From 898ca2aa44542ed99f4e435e39a2a199c9ffd893 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 29 Nov 2014 15:25:16 +0000 -Subject: [PATCH 14/61] [rbp] hack: wait for splash to complete before changing - hdmi mode - ---- - xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp | 52 +++++++++++++++++++++++++ - 1 file changed, 52 insertions(+) - -diff --git a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp -index 6ec0f110ca748c1ca305b255e2f1a0413b40c1ad..d1a7de58dea31dba3864828bd268292d53945b3d 100644 ---- a/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp -+++ b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp -@@ -33,6 +33,9 @@ - #include "guilib/StereoscopicsManager.h" - #include "rendering/RenderSystem.h" - #include -+#ifdef TARGET_POSIX -+#include "linux/XTimeUtils.h" -+#endif - - #ifndef __VIDEOCORE4__ - #define __VIDEOCORE4__ -@@ -222,12 +225,61 @@ int CEGLNativeTypeRaspberryPI::AddUniqueResolution(RESOLUTION_INFO &res, std::ve - } - #endif - -+#include -+ -+pid_t proc_find(const char* name) -+{ -+ DIR* dir; -+ struct dirent* ent; -+ char buf[512]; -+ -+ long pid; -+ char pname[100] = {0,}; -+ char state; -+ FILE *fp=NULL; -+ -+ if (!(dir = opendir("/proc"))) { -+ perror("can't open /proc"); -+ return -1; -+ } -+ -+ while((ent = readdir(dir)) != NULL) { -+ long lpid = atol(ent->d_name); -+ if(lpid < 0) -+ continue; -+ snprintf(buf, sizeof(buf), "/proc/%ld/stat", lpid); -+ fp = fopen(buf, "r"); -+ -+ if (fp) { -+ if ( (fscanf(fp, "%ld (%[^)]) %c", &pid, pname, &state)) != 3 ){ -+ printf("fscanf failed \n"); -+ fclose(fp); -+ closedir(dir); -+ return -1; -+ } -+ if (!strcmp(pname, name)) { -+ fclose(fp); -+ closedir(dir); -+ return (pid_t)lpid; -+ } -+ fclose(fp); -+ } -+ } -+ -+ closedir(dir); -+ return -1; -+} -+ -+ - bool CEGLNativeTypeRaspberryPI::SetNativeResolution(const RESOLUTION_INFO &res) - { - #if defined(TARGET_RASPBERRY_PI) - if(!m_DllBcmHost || !m_nativeWindow) - return false; - -+ while (proc_find("hello_video.bin") >= 0) -+ Sleep(100); -+ - DestroyDispmanxWindow(); - - RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); - -From 68a166868644bbd8bcd34267dd84af4fc1b42fe1 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 11 Dec 2014 17:00:57 +0000 -Subject: [PATCH 15/61] Fix for UI not showing both extractflags and - extractthumb - ---- - addons/resource.language.en_gb/resources/strings.po | 10 +++++++--- - system/settings/settings.xml | 4 ++-- - 2 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 532be48326aebeb2c05bb52176ea4544fae81c49..2e3f179fcc7aa100e2aaec64d0513145903ccd32 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -12880,7 +12880,7 @@ msgstr "" - - #: system/settings/settings.xml - msgctxt "#20433" --msgid "Extract thumbnails and video information" -+msgid "Extract video information from files" - msgstr "" - - #: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp -@@ -17688,7 +17688,7 @@ msgstr "" - #. Description of setting with label #20433 "Extract thumbnails and video information" - #: system/settings/settings.xml - msgctxt "#36178" --msgid "Extract thumbnails and metadata information such as codec and aspect ratio from videos." -+msgid "Extract metadata information such as codec and aspect ratio from videos." - msgstr "" - - #. Description of setting with label #20419 "Replace file names with library titles" -@@ -17700,7 +17700,7 @@ msgstr "" - #. Description of setting with label #20433 "Extract thumbnails and video information" - #: system/settings/settings.xml - msgctxt "#36180" --msgid "Extract thumbnails and information, such as codecs and aspect ratio, to display in library mode." -+msgid "Extract thumbnails, to display in library Mode." - msgstr "" - - #: system/settings/settings.xml -@@ -20463,3 +20463,7 @@ msgstr "" - msgctxt "#38052" - msgid "Remote button press release time (ms)" - msgstr "" -+ -+msgctxt "#38190" -+msgid "Extract thumbnails from video files" -+msgstr "" -diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index b0d103cba5bcdd1d7bece68bc983ab37b0133dbb..38a772b4e5f59cdd30293850752a761dbe532177 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -969,8 +969,8 @@ - true - - -- -- 4 -+ -+ 1 - true - - - -From 3ad4ce7c292f534de8db3305c8be7bf229b507dd Mon Sep 17 00:00:00 2001 -From: anaconda -Date: Thu, 11 Sep 2014 21:30:43 +0200 -Subject: [PATCH 16/61] Disable autoscrolling while on screensaver and while - opening streams. - ---- - xbmc/Application.cpp | 10 ++++++++++ - xbmc/Application.h | 2 ++ - xbmc/guilib/GUIFadeLabelControl.cpp | 4 +++- - xbmc/guilib/GUIFont.cpp | 4 ++++ - xbmc/guilib/GUILabel.cpp | 4 +++- - xbmc/guilib/GUITextBox.cpp | 3 ++- - 6 files changed, 24 insertions(+), 3 deletions(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 11f8005d16abd40a696156581384afeb68db66f6..2d668dc7b6239fafa6a7440093c34bb486d994a6 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -5260,3 +5260,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const - - return false; - } -+ -+bool CApplication::ScreenSaverDisablesAutoScrolling() -+{ -+ bool onBlackDimScreenSaver = IsInScreenSaver() && m_screenSaver && -+ (m_screenSaver->ID() == "screensaver.xbmc.builtin.black" || -+ m_screenSaver->ID() == "screensaver.xbmc.builtin.dim"); -+ bool openingStreams = m_pPlayer->IsPlaying() && g_windowManager.IsWindowActive(WINDOW_DIALOG_BUSY); -+ -+ return onBlackDimScreenSaver || openingStreams; -+} -diff --git a/xbmc/Application.h b/xbmc/Application.h -index 59a1ec96b24014b4bc3cc6a7e0d4aa345958eaf8..c50a56f4254c88a9f69a156aec2967bdc6315330 100644 ---- a/xbmc/Application.h -+++ b/xbmc/Application.h -@@ -382,6 +382,8 @@ public: - */ - void UnregisterActionListener(IActionListener *listener); - -+ bool ScreenSaverDisablesAutoScrolling(); -+ - std::unique_ptr m_ServiceManager; - - /*! -diff --git a/xbmc/guilib/GUIFadeLabelControl.cpp b/xbmc/guilib/GUIFadeLabelControl.cpp -index 01826a5f7ca2ccb104f897ca0670571a9b04b83d..553a6458a71009dd592c8a843eeb3bc336864d61 100644 ---- a/xbmc/guilib/GUIFadeLabelControl.cpp -+++ b/xbmc/guilib/GUIFadeLabelControl.cpp -@@ -21,6 +21,8 @@ - #include "GUIFadeLabelControl.h" - #include "utils/Random.h" - -+#include "Application.h" -+ - CGUIFadeLabelControl::CGUIFadeLabelControl(int parentID, int controlID, float posX, float posY, float width, float height, const CLabelInfo& labelInfo, bool scrollOut, unsigned int timeToDelayAtEnd, bool resetOnLabelChange, bool randomized) - : CGUIControl(parentID, controlID, posX, posY, width, height), m_label(labelInfo), m_scrollInfo(50, labelInfo.offsetX, labelInfo.scrollSpeed) - , m_textLayout(labelInfo.font, false) -@@ -106,7 +108,7 @@ void CGUIFadeLabelControl::Process(unsigned int currentTime, CDirtyRegionList &d - m_lastLabel = m_currentLabel; - } - -- if (m_infoLabels.size() > 1 || !m_shortText) -+ if ((m_infoLabels.size() > 1 || !m_shortText) && !g_application.ScreenSaverDisablesAutoScrolling()) - { // have scrolling text - bool moveToNextLabel = false; - if (!m_scrollOut) -diff --git a/xbmc/guilib/GUIFont.cpp b/xbmc/guilib/GUIFont.cpp -index 7f1108939a63162024c7a055403a58e395f090b6..1192b74675b79d1a862de2949a60163abb916035 100644 ---- a/xbmc/guilib/GUIFont.cpp -+++ b/xbmc/guilib/GUIFont.cpp -@@ -22,6 +22,7 @@ - #include "GUIFontTTF.h" - #include "GraphicContext.h" - -+#include "Application.h" - #include "threads/SingleLock.h" - #include "utils/TimeUtils.h" - #include "utils/MathUtils.h" -@@ -128,6 +129,9 @@ bool CGUIFont::UpdateScrollInfo(const vecText &text, CScrollInfo &scrollInfo) - // If the string is smaller than the viewport, then it may be plotted even - // more times than that. - // -+ if (g_application.ScreenSaverDisablesAutoScrolling()) -+ return false; -+ - if (scrollInfo.waitTime) - { - scrollInfo.waitTime--; -diff --git a/xbmc/guilib/GUILabel.cpp b/xbmc/guilib/GUILabel.cpp -index f15e847ec43d07b44660caec9f8faca780b0a061..ba88a7c5e45da13404d59dfbf1bbc8b93d3528c1 100644 ---- a/xbmc/guilib/GUILabel.cpp -+++ b/xbmc/guilib/GUILabel.cpp -@@ -21,6 +21,8 @@ - #include "GUILabel.h" - #include - -+#include "Application.h" -+ - CGUILabel::CGUILabel(float posX, float posY, float width, float height, const CLabelInfo& labelInfo, CGUILabel::OVER_FLOW overflow) - : m_label(labelInfo) - , m_textLayout(labelInfo.font, overflow == OVER_FLOW_WRAP, height) -@@ -103,7 +105,7 @@ void CGUILabel::Render() - color_t color = GetColor(); - bool renderSolid = (m_color == COLOR_DISABLED); - bool overFlows = (m_renderRect.Width() + 0.5f < m_textLayout.GetTextWidth()); // 0.5f to deal with floating point rounding issues -- if (overFlows && m_scrolling && !renderSolid) -+ if (overFlows && m_scrolling && !renderSolid && !g_application.ScreenSaverDisablesAutoScrolling()) - m_textLayout.RenderScrolling(m_renderRect.x1, m_renderRect.y1, m_label.angle, color, m_label.shadowColor, 0, m_renderRect.Width(), m_scrollInfo); - else - { -diff --git a/xbmc/guilib/GUITextBox.cpp b/xbmc/guilib/GUITextBox.cpp -index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144b303f15f 100644 ---- a/xbmc/guilib/GUITextBox.cpp -+++ b/xbmc/guilib/GUITextBox.cpp -@@ -24,6 +24,7 @@ - #include "utils/MathUtils.h" - #include "utils/StringUtils.h" - #include "guiinfo/GUIInfoLabels.h" -+#include "Application.h" - - #include - -@@ -133,7 +134,7 @@ void CGUITextBox::Process(unsigned int currentTime, CDirtyRegionList &dirtyregio - // update our auto-scrolling as necessary - if (m_autoScrollTime && m_lines.size() > m_itemsPerPage) - { -- if (!m_autoScrollCondition || m_autoScrollCondition->Get()) -+ if ((!m_autoScrollCondition || m_autoScrollCondition->Get()) && !g_application.ScreenSaverDisablesAutoScrolling()) - { - if (m_lastRenderTime) - m_autoScrollDelayTime += currentTime - m_lastRenderTime; - -From c5388bfa1dcd43ab0a2ba6a8426a19d511fb7207 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 13 Dec 2014 18:35:20 +0000 -Subject: [PATCH 17/61] [demuxer] Avoid memcpy on every demuxer packet - -Avoids an unnecessary memcpy on every demuxer packet which for -high bitrate videos can be significant. ---- - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 17 ++++++++++++----- - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h | 3 +++ - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp | 7 ++++++- - 3 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index a00a362239df1f7d99e3bf13a41a58e5d0567e02..e9a1645acbdb2dd2fbf3c1eaee9ef1401fe9bfd7 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -922,7 +922,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - { - if(m_pkt.pkt.stream_index == (int)m_pFormatContext->programs[m_program]->stream_index[i]) - { -- pPacket = CDVDDemuxUtils::AllocateDemuxPacket(m_pkt.pkt.size); -+ pPacket = CDVDDemuxUtils::AllocateDemuxPacket(0); - break; - } - } -@@ -931,7 +931,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - bReturnEmpty = true; - } - else -- pPacket = CDVDDemuxUtils::AllocateDemuxPacket(m_pkt.pkt.size); -+ pPacket = CDVDDemuxUtils::AllocateDemuxPacket(0); - } - else - bReturnEmpty = true; -@@ -961,9 +961,13 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - // copy contents into our own packet - pPacket->iSize = m_pkt.pkt.size; - -- // maybe we can avoid a memcpy here by detecting where pkt.destruct is pointing too? - if (m_pkt.pkt.data) -- memcpy(pPacket->pData, m_pkt.pkt.data, pPacket->iSize); -+ { -+ pPacket->pData = m_pkt.pkt.data; -+ // so we can free AVPacket when DemuxPacket is freed -+ pPacket->pkt = new AVPacket(m_pkt.pkt); -+ } -+ - - pPacket->pts = ConvertTimestamp(m_pkt.pkt.pts, stream->time_base.den, stream->time_base.num); - pPacket->dts = ConvertTimestamp(m_pkt.pkt.dts, stream->time_base.den, stream->time_base.num); -@@ -1017,7 +1021,10 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - pPacket->iStreamId = m_pkt.pkt.stream_index; - } - m_pkt.result = -1; -- av_packet_unref(&m_pkt.pkt); -+ if (pPacket && pPacket->pkt) -+ memset(&m_pkt.pkt, 0, sizeof(AVPacket)); -+ else -+ av_packet_unref(&m_pkt.pkt); - } - } - } // end of lock scope -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -index 4f471188c133deb91516311f0082e8741d9dee79..22805781c4d5a957d10fdf74ffa34387f67a25e9 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -@@ -25,6 +25,8 @@ - #define DMX_SPECIALID_STREAMINFO -10 - #define DMX_SPECIALID_STREAMCHANGE -11 - -+struct AVPacket; -+ - typedef struct DemuxPacket - { - unsigned char* pData; // data -@@ -36,6 +38,7 @@ typedef struct DemuxPacket - double pts; // pts in DVD_TIME_BASE - double dts; // dts in DVD_TIME_BASE - double duration; // duration in DVD_TIME_BASE if available -+ AVPacket *pkt; // to allow packet to be freed - - int dispTime; - } DemuxPacket; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp -index 403d75fe905f02dcc46a9bd1798ca6c8fc0ccc4e..66774e4d299790059db8ed99fb060e2b3e91cef4 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp -@@ -36,7 +36,12 @@ void CDVDDemuxUtils::FreeDemuxPacket(DemuxPacket* pPacket) - if (pPacket) - { - try { -- if (pPacket->pData) _aligned_free(pPacket->pData); -+ if (pPacket->pkt) -+ { -+ av_free_packet(pPacket->pkt); -+ delete pPacket->pkt; -+ } -+ else if (pPacket->pData) _aligned_free(pPacket->pData); - delete pPacket; - } - catch(...) { - -From 5fe6dc3d7ae961e85918126ba7ec834a0acf6f7f Mon Sep 17 00:00:00 2001 -From: anaconda -Date: Wed, 25 Feb 2015 18:22:21 +0100 -Subject: [PATCH 18/61] Load OSD dialogs on startup. - -Fixes skipped frames the first time they're loaded in memory on less powered -devices, like a Raspberry Pi, when using DVDPlayer. -See http://forum.kodi.tv/showthread.php?tid=211501&pid=1938811#pid1938811 ---- - xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp | 1 + - xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp | 1 + - xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp | 4 +++- - xbmc/video/dialogs/GUIDialogSubtitles.cpp | 2 +- - xbmc/video/dialogs/GUIDialogVideoOSD.cpp | 2 +- - xbmc/video/dialogs/GUIDialogVideoSettings.cpp | 4 +++- - 6 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp -index 4450583494e483afdeec610b489a9fe75944e054..28ed83f59ba1db07fc64d3c1fbcdc2acc7c1ad82 100644 ---- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp -+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp -@@ -45,6 +45,7 @@ CGUIDialogPVRChannelsOSD::CGUIDialogPVRChannelsOSD() : - CGUIDialog(WINDOW_DIALOG_PVR_OSD_CHANNELS, "DialogPVRChannelsOSD.xml"), - CPVRChannelNumberInputHandler(1000) - { -+ m_loadType = LOAD_ON_GUI_INIT; - m_vecItems = new CFileItemList; - } - -diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp -index 99a75175638c66968b7fe61a9dc973de64edd9fe..81355ff55f92f47378a986ac7ff2c0cd52296f9e 100644 ---- a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp -+++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp -@@ -36,6 +36,7 @@ using namespace PVR; - CGUIDialogPVRGuideOSD::CGUIDialogPVRGuideOSD() - : CGUIDialog(WINDOW_DIALOG_PVR_OSD_GUIDE, "DialogPVRGuideOSD.xml") - { -+ m_loadType = LOAD_ON_GUI_INIT; - m_vecItems = new CFileItemList; - } - -diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp -index ac501f769d648b669c4363a824fa4a751744555f..0a0cf76f254b85212bd5777b26e8872651bffece 100644 ---- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp -+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp -@@ -69,7 +69,9 @@ CGUIDialogAudioSubtitleSettings::CGUIDialogAudioSubtitleSettings() - : CGUIDialogSettingsManualBase(WINDOW_DIALOG_AUDIO_OSD_SETTINGS, "DialogSettings.xml"), - m_passthrough(false), - m_dspEnabled(false) --{ } -+{ -+ m_loadType = LOAD_ON_GUI_INIT; -+} - - CGUIDialogAudioSubtitleSettings::~CGUIDialogAudioSubtitleSettings() - { } -diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp -index 09ac499df555ea9231d6d486df11eb3a6a5265af..72da62e76337663f44ef8d5fc5c890bea1213ab3 100644 ---- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp -+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp -@@ -104,7 +104,7 @@ CGUIDialogSubtitles::CGUIDialogSubtitles(void) - , m_pausedOnRun(false) - , m_updateSubsList(false) - { -- m_loadType = KEEP_IN_MEMORY; -+ m_loadType = LOAD_ON_GUI_INIT; - } - - CGUIDialogSubtitles::~CGUIDialogSubtitles(void) -diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp -index e498e1fd476d9ab5300bb00bc39946a22cfd93cb..a6648d016b07e2eb3e52f8d927697cc53a42fd7b 100644 ---- a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp -+++ b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp -@@ -30,7 +30,7 @@ using namespace PVR; - CGUIDialogVideoOSD::CGUIDialogVideoOSD(void) - : CGUIDialog(WINDOW_DIALOG_VIDEO_OSD, "VideoOSD.xml") - { -- m_loadType = KEEP_IN_MEMORY; -+ m_loadType = LOAD_ON_GUI_INIT; - } - - CGUIDialogVideoOSD::~CGUIDialogVideoOSD(void) -diff --git a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp -index 7f10c52223c7a02471dcd3bc6d13da59b076a198..072c7be73f352ad00219594bb5ce0c3939f9c540 100644 ---- a/xbmc/video/dialogs/GUIDialogVideoSettings.cpp -+++ b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp -@@ -67,7 +67,9 @@ - CGUIDialogVideoSettings::CGUIDialogVideoSettings() - : CGUIDialogSettingsManualBase(WINDOW_DIALOG_VIDEO_OSD_SETTINGS, "DialogSettings.xml"), - m_viewModeChanged(false) --{ } -+{ -+ m_loadType = LOAD_ON_GUI_INIT; -+} - - CGUIDialogVideoSettings::~CGUIDialogVideoSettings() - { } - -From 28634a946f135a94dd6167d54ee9c41dc27c6633 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 14 Apr 2015 20:51:14 +0100 -Subject: [PATCH 19/61] [gui] Also limit GUI updates when in non full-screen - video mode - ---- - xbmc/Application.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 2d668dc7b6239fafa6a7440093c34bb486d994a6..159d169cb4511afd192ac56fe8712f396af12b07 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -2761,7 +2761,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) - #if defined(TARGET_RASPBERRY_PI) || defined(HAS_IMXVPU) - // This code reduces rendering fps of the GUI layer when playing videos in fullscreen mode - // it makes only sense on architectures with multiple layers -- if (g_graphicsContext.IsFullScreenVideo() && !m_pPlayer->IsPausedPlayback() && m_pPlayer->IsRenderingVideoLayer()) -+ if (m_pPlayer->IsPlayingVideo() && !m_pPlayer->IsPausedPlayback() && m_pPlayer->IsRenderingVideoLayer()) - fps = m_ServiceManager->GetSettings().GetInt(CSettings::SETTING_VIDEOPLAYER_LIMITGUIUPDATE); - #endif - -@@ -2774,6 +2774,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) - { - if (!m_skipGuiRender) - g_windowManager.Process(CTimeUtils::GetFrameTime()); -+ else if (!g_graphicsContext.IsFullScreenVideo()) -+ g_windowManager.FrameMove(); - } - g_windowManager.FrameMove(); - } - -From d50f671f5d2a8607443d156f8cf4b6e5d48c9506 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 5 May 2015 23:58:06 +0100 -Subject: [PATCH 20/61] [screensaver] Leave GUI contents available for - screensaver - ---- - xbmc/guilib/GUIWindowManager.cpp | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp -index 77ab06e490beded56258826c91da5ee69cd55ed8..f0af5bc1e4d0e7b4e736a39fef06fbf7a37a6e93 100644 ---- a/xbmc/guilib/GUIWindowManager.cpp -+++ b/xbmc/guilib/GUIWindowManager.cpp -@@ -818,7 +818,16 @@ void CGUIWindowManager::ActivateWindow_Internal(int iWindowID, const std::vector - int currentWindow = GetActiveWindow(); - CGUIWindow *pWindow = GetWindow(currentWindow); - if (pWindow) -- CloseWindowSync(pWindow, iWindowID); -+ { -+ if (iWindowID == WINDOW_SCREENSAVER) -+ { -+ pWindow->Close(true, iWindowID); -+ } -+ else -+ { -+ CloseWindowSync(pWindow, iWindowID); -+ } -+ } - g_infoManager.SetNextWindow(WINDOW_INVALID); - - // Add window to the history list (we must do this before we activate it, - -From 96fc13c18ff166151226aa531fc0d49950f42d95 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 6 Jun 2015 18:43:57 +0100 -Subject: [PATCH 21/61] ffmpeg: Automatic switch to software decode for GMC - with more than one warp point - ---- - ...Signal-unsupported-GMC-with-more-than-one.patch | 48 ++++++++++++++++++++++ - tools/depends/target/ffmpeg/Makefile | 4 +- - tools/depends/target/ffmpeg/autobuild.sh | 2 + - .../VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++ - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h | 2 + - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 2 +- - xbmc/cores/VideoPlayer/DVDStreamInfo.cpp | 3 ++ - xbmc/cores/VideoPlayer/DVDStreamInfo.h | 1 + - xbmc/cores/omxplayer/OMXHelper.cpp | 8 +++- - 9 files changed, 73 insertions(+), 3 deletions(-) - create mode 100644 tools/depends/target/ffmpeg/0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - -diff --git a/tools/depends/target/ffmpeg/0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch b/tools/depends/target/ffmpeg/0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..4cb8dd8fc466220e5d2539120de79ab123e65713 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -@@ -0,0 +1,48 @@ -+From 84e9a1784bbd3182b68cefa5e5feae8da8b9e184 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Fri, 5 Jun 2015 22:48:33 +0100 -+Subject: [PATCH] mpeg4video: Signal unsupported GMC with more than one warp -+ point -+ -+--- -+ libavcodec/avcodec.h | 1 + -+ libavcodec/mpeg4videodec.c | 4 ++++ -+ 2 files changed, 5 insertions(+) -+ -+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -+index 8c7c420..e63dc2d 100644 -+--- a/libavcodec/avcodec.h -++++ b/libavcodec/avcodec.h -+@@ -2527,6 +2527,7 @@ typedef struct AVCodecContext { -+ #define FF_BUG_DC_CLIP 4096 -+ #define FF_BUG_MS 8192 ///< Work around various bugs in Microsoft's broken decoders. -+ #define FF_BUG_TRUNCATED 16384 -++#define FF_BUG_GMC_UNSUPPORTED 32768 -+ -+ /** -+ * strictly follow the standard (MPEG4, ...). -+diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c -+index 9bf33dd..0b5d3b9 100644 -+--- a/libavcodec/mpeg4videodec.c -++++ b/libavcodec/mpeg4videodec.c -+@@ -2179,6 +2179,9 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) -+ -+ if (ctx->divx_version >= 0) -+ s->workaround_bugs |= FF_BUG_HPEL_CHROMA; -++ -++ if (ctx->num_sprite_warping_points > 1) -++ s->workaround_bugs |= FF_BUG_GMC_UNSUPPORTED; -+ } -+ -+ if (s->workaround_bugs & FF_BUG_STD_QPEL) { -+@@ -2203,6 +2206,7 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) -+ s->workaround_bugs, ctx->lavc_build, ctx->xvid_build, -+ ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : ""); -+ -++ avctx->workaround_bugs = s->workaround_bugs; -+ if (CONFIG_MPEG4_DECODER && ctx->xvid_build >= 0 && -+ s->codec_id == AV_CODEC_ID_MPEG4 && -+ avctx->idct_algo == FF_IDCT_AUTO) { -+-- -+1.9.1 -+ -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index eaf9fc49319d5f0ee450ddd802bba569e291f0b5..8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -1,6 +1,7 @@ - include ../../Makefile.include - include FFMPEG-VERSION --DEPS= ../../Makefile.include FFMPEG-VERSION Makefile -+DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ -+ 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -76,6 +77,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - rm -rf $(PLATFORM); mkdir -p $(PLATFORM) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \&\& pkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure -+ cd $(PLATFORM); patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure $(ffmpg_config) -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index 5c2976278eb5ec5b8b4a4f9f9c7174b164ab5201..dde29adf425e54f54e4104b3370352db0be6ef40 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -132,6 +132,8 @@ mkdir -p "ffmpeg-${VERSION}" - cd "ffmpeg-${VERSION}" || exit 2 - tar --strip-components=1 -xf $MYDIR/${ARCHIVE} - -+patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -+ - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ - --extra-version="kodi-${VERSION}" \ -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 0976d9fb361324ca25224535c6a7c23c3b50bba1..4f5de0341b344c77a12c936f4f573c2911c0bb7b 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -45,6 +45,10 @@ - - #include "linux/RBP.h" - -+#ifndef FF_BUG_GMC_UNSUPPORTED -+#define FF_BUG_GMC_UNSUPPORTED 0 -+#endif -+ - using namespace KODI::MESSAGING; - - #define CLASSNAME "CMMALVideoBuffer" -@@ -365,6 +369,8 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - // we always qualify even if DVDFactoryCodec does this too. - if (!CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) - return false; -+ if (hints.workaround_bugs & FF_BUG_GMC_UNSUPPORTED) -+ return false; - - std::list deintMethods; - deintMethods.push_back(EINTERLACEMETHOD::VS_INTERLACEMETHOD_AUTO); -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h -index f2a5349d329ba4ce9886db41b7dc6c5aca0f00b1..a201efed7f3a591ebbe65106eb75e95264cd4a3f 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h -@@ -154,6 +154,7 @@ public: - iOrientation = 0; - iBitsPerPixel = 0; - iBitRate = 0; -+ workaround_bugs = 0; - } - - virtual ~CDemuxStreamVideo() {} -@@ -169,6 +170,7 @@ public: - int iBitsPerPixel; - int iBitRate; - std::string stereo_mode; // expected stereo mode -+ int workaround_bugs; // info for decoder - }; - - class CDemuxStreamAudio : public CDemuxStream -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index e9a1645acbdb2dd2fbf3c1eaee9ef1401fe9bfd7..b485ad23e6309647db2bc489ed6bfda60cf506a1 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1418,7 +1418,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - if (!stereoMode.empty()) - st->stereo_mode = stereoMode; - -- -+ st->workaround_bugs = pStream->codec->workaround_bugs; - if ( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) ) - { - if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) -diff --git a/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp b/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp -index e59c84c32ff6f108b52955523321f37bd3885986..28dbdd344473338762927f5f2d01425243187a7c 100644 ---- a/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp -+++ b/xbmc/cores/VideoPlayer/DVDStreamInfo.cpp -@@ -74,6 +74,7 @@ void CDVDStreamInfo::Clear() - channellayout = 0; - - orientation = 0; -+ workaround_bugs = 0; - } - - bool CDVDStreamInfo::Equal(const CDVDStreamInfo& right, bool withextradata) -@@ -175,6 +176,7 @@ void CDVDStreamInfo::Assign(const CDVDStreamInfo& right, bool withextradata) - vfr = right.vfr; - software = right.software; - stereo_mode = right.stereo_mode; -+ workaround_bugs = right.workaround_bugs; - - // AUDIO - channels = right.channels; -@@ -233,6 +235,7 @@ void CDVDStreamInfo::Assign(const CDemuxStream& right, bool withextradata) - orientation = stream->iOrientation; - bitsperpixel = stream->iBitsPerPixel; - stereo_mode = stream->stereo_mode; -+ workaround_bugs = stream->workaround_bugs; - } - else if( right.type == STREAM_SUBTITLE ) - { -diff --git a/xbmc/cores/VideoPlayer/DVDStreamInfo.h b/xbmc/cores/VideoPlayer/DVDStreamInfo.h -index b087a110ad2cd4df00702133607ab117c87f552e..12c251e0feaf59bd9498d9cc63e3e3b9d8bb0dd8 100644 ---- a/xbmc/cores/VideoPlayer/DVDStreamInfo.h -+++ b/xbmc/cores/VideoPlayer/DVDStreamInfo.h -@@ -69,6 +69,7 @@ public: - int orientation; // orientation of the video in degrees counter clockwise - int bitsperpixel; - std::string stereo_mode; // stereoscopic 3d mode -+ int workaround_bugs; // info for decoder - - // AUDIO - int channels; -diff --git a/xbmc/cores/omxplayer/OMXHelper.cpp b/xbmc/cores/omxplayer/OMXHelper.cpp -index d7210ac180edf28024fc205385a75275f0c87330..4f5dedd05745ec918e8e683a329a526f981a9be6 100644 ---- a/xbmc/cores/omxplayer/OMXHelper.cpp -+++ b/xbmc/cores/omxplayer/OMXHelper.cpp -@@ -31,6 +31,10 @@ - #include "cores/omxplayer/OMXPlayerVideo.h" - #include "threads/SystemClock.h" - -+#ifndef FF_BUG_GMC_UNSUPPORTED -+#define FF_BUG_GMC_UNSUPPORTED 0 -+#endif -+ - #define PREDICATE_RETURN(lh, rh) \ - do { \ - if((lh) != (rh)) \ -@@ -82,7 +86,9 @@ bool OMXPlayerUnsuitable(bool m_HasVideo, bool m_HasAudio, CDVDDemux* m_pDemuxer - CDVDStreamInfo hint(*stream, true); - - bool supported = false; -- if ((hint.codec == AV_CODEC_ID_MPEG1VIDEO || hint.codec == AV_CODEC_ID_MPEG2VIDEO) && g_RBP.GetCodecMpg2()) -+ if (hint.workaround_bugs & FF_BUG_GMC_UNSUPPORTED) -+ ; -+ else if ((hint.codec == AV_CODEC_ID_MPEG1VIDEO || hint.codec == AV_CODEC_ID_MPEG2VIDEO) && g_RBP.GetCodecMpg2()) - supported = true; - else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1()) - supported = true; - -From 66c54f029dd878b416c669850f8210a0e6270c67 Mon Sep 17 00:00:00 2001 -From: Claudio-Sjo -Date: Mon, 16 Feb 2015 14:51:26 +0100 -Subject: [PATCH 22/61] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer - - fixes #15794 - ---- - xbmc/filesystem/CDDAFile.cpp | 120 ++++++++++++++++++++++++++++++++----------- - xbmc/filesystem/CDDAFile.h | 3 ++ - 2 files changed, 92 insertions(+), 31 deletions(-) - -diff --git a/xbmc/filesystem/CDDAFile.cpp b/xbmc/filesystem/CDDAFile.cpp -index 722e62602084923bd040803f0e5a5c336a42fa3b..b0f53e5d44e108d88d7af0e46913a7f29328cd31 100644 ---- a/xbmc/filesystem/CDDAFile.cpp -+++ b/xbmc/filesystem/CDDAFile.cpp -@@ -42,10 +42,14 @@ CFileCDDA::CFileCDDA(void) - m_lsnEnd = CDIO_INVALID_LSN; - m_cdio = CLibcdio::GetInstance(); - m_iSectorCount = 52; -+ m_TrackBuf = (uint8_t *) malloc(CDIO_CD_FRAMESIZE_RAW); -+ p_TrackBuf = 0; -+ f_TrackBuf = 0; - } - - CFileCDDA::~CFileCDDA(void) - { -+ free(m_TrackBuf); - Close(); - } - -@@ -53,6 +57,9 @@ bool CFileCDDA::Open(const CURL& url) - { - std::string strURL = url.GetWithoutFilename(); - -+ // Flag TrackBuffer = FALSE, TrackBuffer is empty -+ f_TrackBuf = 0; -+ - if (!g_mediaManager.IsDiscInDrive(strURL) || !IsValidFile(url)) - return false; - -@@ -117,50 +124,98 @@ int CFileCDDA::Stat(const CURL& url, struct __stat64* buffer) - - ssize_t CFileCDDA::Read(void* lpBuf, size_t uiBufSize) - { -- if (!m_pCdIo || !g_mediaManager.IsDiscInDrive()) -- return -1; - -- if (uiBufSize > SSIZE_MAX) -- uiBufSize = SSIZE_MAX; -+ ssize_t returnValue; -+ int iSectorCount; -+ void *destBuf; - -- // limit number of sectors that fits in buffer by m_iSectorCount -- int iSectorCount = std::min((int)uiBufSize / CDIO_CD_FRAMESIZE_RAW, m_iSectorCount); - -- if (iSectorCount <= 0) -+ if (!m_pCdIo || !g_mediaManager.IsDiscInDrive()) -+ { -+ CLog::Log(LOGERROR, "file cdda: Aborted because no disc in drive or no m_pCdIo"); - return -1; -+ } - -- // Are there enough sectors left to read -- if (m_lsnCurrent + iSectorCount > m_lsnEnd) -- iSectorCount = m_lsnEnd - m_lsnCurrent; -+ uiBufSize = std::min( uiBufSize, (size_t)SSIZE_MAX ); - -- // The loop tries to solve read error problem by lowering number of sectors to read (iSectorCount). -- // When problem is solved the proper number of sectors is stored in m_iSectorCount -- int big_iSectorCount = iSectorCount; -- while (iSectorCount > 0) -+ // If we have data in the TrackBuffer, they must be used first -+ if (f_TrackBuf) - { -- int iret = m_cdio->cdio_read_audio_sectors(m_pCdIo, lpBuf, m_lsnCurrent, iSectorCount); -+ // Get at most the remaining data in m_TrackBuf -+ uiBufSize = std::min(uiBufSize, CDIO_CD_FRAMESIZE_RAW - p_TrackBuf); -+ memcpy(lpBuf, m_TrackBuf + p_TrackBuf, uiBufSize); -+ // Update the data offset -+ p_TrackBuf += uiBufSize; -+ // Is m_TrackBuf empty? -+ f_TrackBuf = (CDIO_CD_FRAMESIZE_RAW == p_TrackBuf); -+ // All done, return read bytes -+ return uiBufSize; -+ } -+ -+ // No data left in buffer -+ -+ // Is this a short read? -+ if (uiBufSize < CDIO_CD_FRAMESIZE_RAW) -+ { -+ // short request, buffer one full sector -+ iSectorCount = 1; -+ destBuf = m_TrackBuf; -+ } -+ else // normal request -+ { -+ // limit number of sectors that fits in buffer by m_iSectorCount -+ iSectorCount = std::min((int)uiBufSize / CDIO_CD_FRAMESIZE_RAW, m_iSectorCount); -+ destBuf = lpBuf; -+ } - -+ // Are there enough sectors left to read? -+ iSectorCount = std::min(iSectorCount, m_lsnEnd - m_lsnCurrent); -+ -+ // Have we reached EOF? -+ if (iSectorCount == 0) -+ { -+ CLog::Log(LOGNOTICE, "file cdda: Read EoF"); -+ return 0; // Success, but nothing read -+ } // Reached EoF -+ -+ // At leat one sector to read -+ int retries; -+ int iret; -+ // Try reading a decresing number of sectors, then 3 times with 1 sector -+ for (retries = 3; retries > 0; iSectorCount>1 ? iSectorCount-- : retries--) -+ { -+ iret = m_cdio->cdio_read_audio_sectors(m_pCdIo, destBuf, m_lsnCurrent, iSectorCount); - if (iret == DRIVER_OP_SUCCESS) -+ break; // Get out from the loop -+ else - { -- // If lower iSectorCount solved the problem limit it's value -- if (iSectorCount < big_iSectorCount) -- { -- m_iSectorCount = iSectorCount; -- } -- break; -- } -- -- // iSectorCount is low so it cannot solve read problem -- if (iSectorCount <= 10) -- { -- CLog::Log(LOGERROR, "file cdda: Reading %d sectors of audio data starting at lsn %d failed with error code %i", iSectorCount, m_lsnCurrent, iret); -- return -1; -- } -- -- iSectorCount = 10; -+ CLog::Log(LOGERROR, "file cdda: Read cdio error when reading track "); -+ } // Errors when reading file - } -+ // retries == 0 only if failed reading at least one sector -+ if (retries == 0) -+ { -+ CLog::Log(LOGERROR, "file cdda: Reading %d sectors of audio data starting at lsn %d failed with error code %i", iSectorCount, m_lsnCurrent, iret); -+ return -1; -+ } -+ -+ // Update position in file - m_lsnCurrent += iSectorCount; - -+ // Was it a short request? -+ if (uiBufSize < CDIO_CD_FRAMESIZE_RAW) -+ { -+ // We copy the amount if requested data into the destination buffer -+ memcpy(lpBuf, m_TrackBuf, uiBufSize); -+ // and keep track of the first available data -+ p_TrackBuf = uiBufSize; -+ // Finally, we set the buffer flag as TRUE -+ f_TrackBuf = true; -+ // We will return uiBufSize -+ return uiBufSize; -+ } -+ -+ // Otherwise, just return the size of read data - return iSectorCount*CDIO_CD_FRAMESIZE_RAW; - } - -@@ -194,6 +249,9 @@ int64_t CFileCDDA::Seek(int64_t iFilePosition, int iWhence /*=SEEK_SET*/) - - void CFileCDDA::Close() - { -+ // Flag TrackBuffer = FALSE, TrackBuffer is empty -+ f_TrackBuf = 0; -+ - if (m_pCdIo) - { - m_cdio->cdio_destroy(m_pCdIo); -diff --git a/xbmc/filesystem/CDDAFile.h b/xbmc/filesystem/CDDAFile.h -index 0427af4534bfe59a343f0518c7f4242d93299836..e99236294fa8b9b613e465a8ecaf3ad3ba8b5a6f 100644 ---- a/xbmc/filesystem/CDDAFile.h -+++ b/xbmc/filesystem/CDDAFile.h -@@ -50,6 +50,9 @@ protected: - - protected: - CdIo_t* m_pCdIo; -+ uint8_t *m_TrackBuf; -+ size_t p_TrackBuf; -+ int f_TrackBuf; - lsn_t m_lsnStart; // Start of m_iTrack in logical sector number - lsn_t m_lsnCurrent; // Position inside the track in logical sector number - lsn_t m_lsnEnd; // End of m_iTrack in logical sector number - -From d97bb927df4346be71a45c3e1659b0592c080e96 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 24 Jun 2016 19:38:13 +0100 -Subject: [PATCH 23/61] codecoverlay: Include codec name in overlay - ---- - xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 4 ++++ - xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 5 ++++- - xbmc/cores/omxplayer/OMXPlayerAudio.cpp | 4 ++++ - xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 8 +++++--- - xbmc/cores/omxplayer/OMXPlayerVideo.h | 1 - - 5 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -index a40c6191e5e0e403790bbd05d6b5cded773f54c8..1f184e78d28a7430bca7d4f39de1f49adf33b56c 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -@@ -211,6 +211,10 @@ void CVideoPlayerAudio::UpdatePlayerInfo() - std::ostringstream s; - s << "aq:" << std::setw(2) << std::min(99,m_messageQueue.GetLevel()) << "%"; - s << ", Kb/s:" << std::fixed << std::setprecision(2) << (double)m_audioStats.GetBitrate() / 1024.0; -+ s << ", ac:" << m_processInfo.GetAudioDecoderName().c_str(); -+ if (!m_info.passthrough) -+ s << ", chan:" << m_processInfo.GetAudioChannels().c_str(); -+ s << ", " << m_streaminfo.samplerate/1000 << " kHz"; - - //print the inverse of the resample ratio, since that makes more sense - //if the resample ratio is 0.5, then we're playing twice as fast -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index 5298963d58bb976a2bbd608a8dbc8e079a5bef62..d4920ac30216fb295a16b70ddff887e2077ee196 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -@@ -896,10 +896,13 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) - - std::string CVideoPlayerVideo::GetPlayerInfo() - { -+ int width, height; -+ m_processInfo.GetVideoDimensions(width, height); - std::ostringstream s; - s << "vq:" << std::setw(2) << std::min(99,GetLevel()) << "%"; - s << ", Mb/s:" << std::fixed << std::setprecision(2) << (double)GetVideoBitrate() / (1024.0*1024.0); -- s << ", fr:" << std::fixed << std::setprecision(3) << m_fFrameRate; -+ s << ", dc:" << m_processInfo.GetVideoDecoderName().c_str(); -+ s << ", " << width << "x" << height << "[" << std::setprecision(2) << m_processInfo.GetVideoDAR() << "]@" << std::fixed << std::setprecision(3) << m_processInfo.GetVideoFps() << ", deint:" << m_processInfo.GetVideoDeintMethod(); - s << ", drop:" << m_iDroppedFrames; - s << ", skip:" << m_renderManager.GetSkippedFrames(); - -diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -index 968724e81d473a4bf8d4a0456be69f05e1a54812..c593c2fed0ce967f3d0b9fb5cf37b1026504b3a5 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -@@ -657,6 +657,10 @@ std::string OMXPlayerAudio::GetPlayerInfo() - std::ostringstream s; - s << "aq:" << std::setw(2) << std::min(99,m_messageQueue.GetLevel() + MathUtils::round_int(100.0/8.0*GetCacheTime())) << "%"; - s << ", Kb/s:" << std::fixed << std::setprecision(2) << (double)GetAudioBitrate() / 1024.0; -+ s << ", ac:" << m_processInfo.GetAudioDecoderName().c_str(); -+ if (!m_passthrough) -+ s << ", chan:" << m_processInfo.GetAudioChannels().c_str(); -+ s << ", " << m_processInfo.GetAudioSampleRate()/1000 << " kHz"; - - return s.str(); - } -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -index b2c435bb2bc3f458d63be7249069531a954c6b9e..d308e44e26baae1a56127b55b987c28c384a9b63 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -@@ -592,12 +592,14 @@ void OMXPlayerVideo::SetSpeed(int speed) - - std::string OMXPlayerVideo::GetPlayerInfo() - { -+ int width, height; -+ m_processInfo.GetVideoDimensions(width, height); - double match = 0.0f, phase = 0.0f, pll = 0.0f; - std::ostringstream s; -- s << "fr:" << std::fixed << std::setprecision(3) << m_fFrameRate; -- s << ", vq:" << std::setw(2) << std::min(99,GetLevel()) << "%"; -- s << ", dc:" << m_codecname; -+ s << "vq:" << std::setw(2) << std::min(99,GetLevel()) << "%"; - s << ", Mb/s:" << std::fixed << std::setprecision(2) << (double)GetVideoBitrate() / (1024.0*1024.0); -+ s << ", dc:" << m_processInfo.GetVideoDecoderName().c_str(); -+ s << ", " << width << "x" << height << "[" << std::setprecision(2) << m_processInfo.GetVideoDAR() << "]@" << std::fixed << std::setprecision(3) << m_processInfo.GetVideoFps() << ", deint:" << m_processInfo.GetVideoDeintMethod(); - if (m_omxVideo.GetPlayerInfo(match, phase, pll)) - { - s << ", match:" << std::fixed << std::setprecision(2) << match; -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h -index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291e20ecdac 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.h -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.h -@@ -55,7 +55,6 @@ protected: - bool m_stalled; - IDVDStreamPlayer::ESyncState m_syncState; - bool m_flush; -- std::string m_codecname; - std::atomic_bool m_bAbortOutput; - double m_iSubtitleDelay; - bool m_bRenderSubs; - -From b369306f68d346c906ec91a5ea4a3c78364d56e9 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Tue, 8 Mar 2016 21:20:58 +0300 -Subject: [PATCH 24/61] [DebugInfo] Add cpu usage info. - ---- - .../VideoPlayer/VideoRenderers/DebugRenderer.cpp | 56 ++++++++-------------- - .../VideoPlayer/VideoRenderers/DebugRenderer.h | 9 ++-- - .../VideoPlayer/VideoRenderers/RenderManager.cpp | 7 ++- - 3 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp -index 539a560f9554478ad25a5631121dc74e667d9b40..08721e153e5f3232585eb776d1d1b44396f63de4 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp -@@ -28,7 +28,7 @@ using namespace OVERLAY; - - CDebugRenderer::CDebugRenderer() - { -- for (int i=0; i<4; i++) -+ for (int i = 0; iRelease(); - } - } - --void CDebugRenderer::SetInfo(std::string &info1, std::string &info2, std::string &info3, std::string &info4) -+void CDebugRenderer::SetInfo(std::vector &infos) - { - m_overlayRenderer.Release(0); - -- if (info1 != m_strDebug[0]) -+ for (size_t i = 0; i < std::min(infos.size(), (size_t)DEBUG_OVERLAY_COUNT_MAX); i++) - { -- m_strDebug[0] = info1; -- if (m_overlay[0]) -- m_overlay[0]->Release(); -- m_overlay[0] = new CDVDOverlayText(); -- m_overlay[0]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[0])); -- } -- if (info2 != m_strDebug[1]) -- { -- m_strDebug[1] = info2; -- if (m_overlay[1]) -- m_overlay[1]->Release(); -- m_overlay[1] = new CDVDOverlayText(); -- m_overlay[1]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[1])); -- } -- if (info3 != m_strDebug[2]) -- { -- m_strDebug[2] = info3; -- if (m_overlay[2]) -- m_overlay[2]->Release(); -- m_overlay[2] = new CDVDOverlayText(); -- m_overlay[2]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[2])); -+ if (infos[i] != m_strDebug[i]) -+ { -+ if (infos[i].empty()) -+ continue; -+ m_strDebug[i] = infos[i]; -+ if (m_overlay[i]) -+ m_overlay[i]->Release(); -+ m_overlay[i] = new CDVDOverlayText(); -+ m_overlay[i]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[i])); -+ } -+ - } -- if (info4 != m_strDebug[3]) -+ for (size_t i = 0; i < DEBUG_OVERLAY_COUNT_MAX; i++) - { -- m_strDebug[3] = info4; -- if (m_overlay[3]) -- m_overlay[3]->Release(); -- m_overlay[3] = new CDVDOverlayText(); -- m_overlay[3]->AddElement(new CDVDOverlayText::CElementText(m_strDebug[3])); -+ if (m_overlay[i]) -+ m_overlayRenderer.AddOverlay(m_overlay[i], 0, 0); - } -- -- m_overlayRenderer.AddOverlay(m_overlay[0], 0, 0); -- m_overlayRenderer.AddOverlay(m_overlay[1], 0, 0); -- m_overlayRenderer.AddOverlay(m_overlay[2], 0, 0); -- m_overlayRenderer.AddOverlay(m_overlay[3], 0, 0); - } - - void CDebugRenderer::Render(CRect &src, CRect &dst, CRect &view) -@@ -121,7 +103,7 @@ void CDebugRenderer::CRenderer::Render(int idx) - - COverlayText *text = dynamic_cast(o); - if (text) -- text->PrepareRender("arial.ttf", 1, 16, 0, m_font, m_fontBorder); -+ text->PrepareRender("arial.ttf", 1, 12, 0, m_font, m_fontBorder); - - RESOLUTION_INFO res = g_graphicsContext.GetResInfo(g_graphicsContext.GetVideoResolution()); - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h -index 85aefaace73994730f7d2bdff9de85c79e99b2a2..8005a13bc220be0c5c596d276197c11ed938ffb0 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h -@@ -22,6 +22,9 @@ - - #include "OverlayRenderer.h" - #include -+#include -+ -+#define DEBUG_OVERLAY_COUNT_MAX 6 - - class CDVDOverlayText; - -@@ -30,7 +33,7 @@ class CDebugRenderer - public: - CDebugRenderer(); - virtual ~CDebugRenderer(); -- void SetInfo(std::string &info1, std::string &info2, std::string &info3, std::string &info4); -+ void SetInfo(std::vector &infos); - void Render(CRect &src, CRect &dst, CRect &view); - void Flush(); - -@@ -43,7 +46,7 @@ protected: - void Render(int idx) override; - }; - -- std::string m_strDebug[4]; -- CDVDOverlayText *m_overlay[4]; -+ std::string m_strDebug[DEBUG_OVERLAY_COUNT_MAX]; -+ CDVDOverlayText *m_overlay[DEBUG_OVERLAY_COUNT_MAX]; - CRenderer m_overlayRenderer; - }; -\ No newline at end of file -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index 5230c6d2c9b20bfa6390b0da1b06ae9045580972..5feee388bb3a433ea6a35b29e587ab6447c089a5 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -@@ -24,6 +24,7 @@ - #include "guilib/GraphicContext.h" - #include "utils/MathUtils.h" - #include "threads/SingleLock.h" -+#include "utils/CPUInfo.h" - #include "utils/log.h" - #include "utils/StringUtils.h" - #include "windowing/WindowingFactory.h" -@@ -929,7 +930,7 @@ void CRenderManager::Render(bool clear, DWORD flags, DWORD alpha, bool gui) - - if (m_renderDebug) - { -- std::string audio, video, player, vsync; -+ std::string audio, video, player, vsync, cpu; - - m_playerPort->GetDebugInfo(audio, video, player); - -@@ -943,8 +944,10 @@ void CRenderManager::Render(bool clear, DWORD flags, DWORD alpha, bool gui) - missedvblanks, - clockspeed * 100); - } -+ cpu = g_cpuInfo.GetCoresUsageString(); - -- m_debugRenderer.SetInfo(audio, video, player, vsync); -+ std::vector infos = { audio, video, player, vsync, cpu }; -+ m_debugRenderer.SetInfo(infos); - m_debugRenderer.Render(src, dst, view); - - m_debugTimer.Set(1000); - -From a7af3b0cf07e3154c4c81672cdf977d639b53a21 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 22 May 2015 13:56:29 +0100 -Subject: [PATCH 25/61] ffmpeg: Allow neon to be enabled in unified builds - ---- - tools/depends/target/ffmpeg/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index 8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93..b5f38a458dfb341c43089e07afded153e234b9cd 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -23,7 +23,11 @@ ffmpg_config += --enable-gnutls - ffmpg_config += --enable-encoder=png --enable-encoder=mjpeg - - ifeq ($(CROSS_COMPILING), yes) -+ ifeq ($(CPU), cortex-a7) -+ ffmpg_config += --arch=arm --enable-cross-compile -+ else - ffmpg_config += --arch=$(CPU) --enable-cross-compile -+ endif - endif - ifeq ($(OS), linux) - ffmpg_config += --target-os=$(OS) --cpu=$(CPU) - -From 030cff10e75130e22daf8e1b2bbcd809170e654f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 27 Feb 2015 14:37:27 +0000 -Subject: [PATCH 26/61] ffmpeg: Add some upstream HEVC optimisations - ---- - tools/depends/target/ffmpeg/Makefile | 6 +- - .../added_ARM_NEON_optimized_SAO_patches.patch | 3328 ++++++++++++++++++++ - tools/depends/target/ffmpeg/autobuild.sh | 2 + - ...hevcdsp_ARM_NEON_optimized_epel_functions.patch | 409 +++ - 4 files changed, 3744 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/added_ARM_NEON_optimized_SAO_patches.patch - create mode 100644 tools/depends/target/ffmpeg/hevcdsp_ARM_NEON_optimized_epel_functions.patch - -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index b5f38a458dfb341c43089e07afded153e234b9cd..c46b533e47497cb7b1e7200eff2cee1a6f2a1a2f 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -1,7 +1,8 @@ - include ../../Makefile.include - include FFMPEG-VERSION - DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ -- 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -+ 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \ -+ hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -82,6 +83,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \&\& pkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure - cd $(PLATFORM); patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -+ cd $(PLATFORM); patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch -+ cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch -+ - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure $(ffmpg_config) -diff --git a/tools/depends/target/ffmpeg/added_ARM_NEON_optimized_SAO_patches.patch b/tools/depends/target/ffmpeg/added_ARM_NEON_optimized_SAO_patches.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..792b5fea581613a6fe9108443357f97518f4b4db ---- /dev/null -+++ b/tools/depends/target/ffmpeg/added_ARM_NEON_optimized_SAO_patches.patch -@@ -0,0 +1,3328 @@ -+From b0cb307c253d2c9f4b94a54dfc74ddb83af984cc Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Mon, 8 Dec 2014 13:24:40 +0200 -+Subject: [PATCH 1/9] added ARM NEON optimized SAO band offset -+ -+--- -+ libavcodec/arm/Makefile | 3 +- -+ libavcodec/arm/hevcdsp_init_neon.c | 47 +++++++++ -+ libavcodec/arm/hevcdsp_sao_neon.S | 204 +++++++++++++++++++++++++++++++++++++ -+ 3 files changed, 253 insertions(+), 1 deletion(-) -+ create mode 100644 libavcodec/arm/hevcdsp_sao_neon.S -+ -+diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile -+index 6051ec8..093a2e8 100644 -+--- a/libavcodec/arm/Makefile -++++ b/libavcodec/arm/Makefile -+@@ -133,7 +133,8 @@ NEON-OBJS-$(CONFIG_HEVC_DECODER) += arm/hevcdsp_init_neon.o \ -+ arm/hevcdsp_deblock_neon.o \ -+ arm/hevcdsp_epel_neon.o \ -+ arm/hevcdsp_idct_neon.o \ -+- arm/hevcdsp_qpel_neon.o -++ arm/hevcdsp_qpel_neon.o \ -++ arm/hevcdsp_sao_neon.o -+ NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_neon.o -+ NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_neon.o \ -+ arm/rv40dsp_neon.o -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 733ff08..69e2b2c 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -22,6 +22,7 @@ -+ #include "libavutil/arm/cpu.h" -+ #include "libavcodec/hevcdsp.h" -+ #include "hevcdsp_arm.h" -++#include "../bit_depth_template.c" -+ -+ void ff_hevc_v_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+ void ff_hevc_h_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+@@ -43,6 +44,11 @@ void ff_hevc_transform_add_16x16_neon_8(uint8_t *_dst, int16_t *coeffs, -+ void ff_hevc_transform_add_32x32_neon_8(uint8_t *_dst, int16_t *coeffs, -+ ptrdiff_t stride); -+ -++void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++ -+ #define PUT_PIXELS(name) \ -+ void name(int16_t *dst, uint8_t *src, \ -+ ptrdiff_t srcstride, int height, \ -+@@ -151,6 +157,44 @@ void ff_hevc_put_qpel_bi_neon_wrapper(uint8_t *dst, ptrdiff_t dststride, uint8_t -+ put_hevc_qpel_uw_neon[my][mx](dst, dststride, src, srcstride, width, height, src2, MAX_PB_SIZE); -+ } -+ -++static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, -++ int16_t *sao_offset_val, int sao_left_class, int width, int height) -++{ -++ pixel *dst = (pixel *)_dst; -++ pixel *src = (pixel *)_src; -++ int8_t offset_table[32] = { 0 }; -++ int k, y, x; -++ int shift = 3; // BIT_DEPTH - 5 -++ -++ stride_src /= sizeof(pixel); -++ stride_dst /= sizeof(pixel); -++ -++ for (k = 0; k < 4; k++) -++ offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1]; -++ -++ switch(width){ -++ case 8: -++ ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ break; -++ case 16: -++ ff_hevc_sao_band_w16_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ break; -++ case 32: -++ ff_hevc_sao_band_w32_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ break; -++ case 64: -++ ff_hevc_sao_band_w64_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ break; -++ default: -++ for (y = 0; y < height; y++) { -++ for (x = 0; x < width; x++) -++ dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]); -++ dst += stride_dst; -++ src += stride_src; -++ } -++ } -++} -++ -+ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ { -+ if (bit_depth == 8) { -+@@ -170,6 +214,9 @@ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ c->transform_add[2] = ff_hevc_transform_add_16x16_neon_8; -+ c->transform_add[3] = ff_hevc_transform_add_32x32_neon_8; -+ c->idct_4x4_luma = ff_hevc_transform_luma_4x4_neon_8; -++ for (x = 0; x < sizeof c->sao_band_filter / sizeof *c->sao_band_filter; x++) { -++ c->sao_band_filter[x] = ff_hevc_sao_band_neon_wrapper; -++ } -+ put_hevc_qpel_neon[1][0] = ff_hevc_put_qpel_v1_neon_8; -+ put_hevc_qpel_neon[2][0] = ff_hevc_put_qpel_v2_neon_8; -+ put_hevc_qpel_neon[3][0] = ff_hevc_put_qpel_v3_neon_8; -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+new file mode 100644 -+index 0000000..1f0ad64 -+--- /dev/null -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -0,0 +1,204 @@ -++/* -++ * Copyright (c) 2014 Seppo Tomperi -++ * -++ * This file is part of FFmpeg. -++ * -++ * FFmpeg is free software; you can redistribute it and/or -++ * modify it under the terms of the GNU Lesser General Public -++ * License as published by the Free Software Foundation; either -++ * version 2.1 of the License, or (at your option) any later version. -++ * -++ * FFmpeg is distributed in the hope that it will be useful, -++ * but WITHOUT ANY WARRANTY; without even the implied warranty of -++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -++ * Lesser General Public License for more details. -++ * -++ * You should have received a copy of the GNU Lesser General Public -++ * License along with FFmpeg; if not, write to the Free Software -++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -++ */ -++ -++#include "libavutil/arm/asm.S" -++#include "neon.S" -++ -++function ff_hevc_sao_band_w8_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // offset_table -++ vpush {d8-d15} -++ vld1.8 {q0, q1}, [r5] // offset table -++ -++1: subs r4, #1 -++ vld1.8 {d24}, [r1], r3 -++ vshr.u8 d16, d24, #3 -++ vtbl.8 d16, {q0, q1}, d16 -++ vmovl.s8 q2, d16 -++ vmovl.u8 q6, d24 -++ vadd.s16 q2, q6 -++ vqmovun.s16 d4, q2 -++ vst1.8 {d4}, [r0], r2 -++ bne 1b -++ -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w16_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // offset_table -++ vpush {d8-d15} -++ vld1.8 {q0, q1}, [r5] // offset table -++ -++1: subs r4, #1 -++ vld1.8 {q12}, [r1], r3 -++ -++ vshr.u8 q8, q12, #3 -++ -++ vtbl.8 d16, {q0, q1}, d16 -++ vtbl.8 d17, {q0, q1}, d17 -++ -++ vmovl.s8 q2, d16 -++ vmovl.s8 q3, d17 -++ -++ vmovl.u8 q6, d24 -++ vmovl.u8 q7, d25 -++ -++ vadd.s16 q2, q6 -++ vadd.s16 q3, q7 -++ -++ vqmovun.s16 d4, q2 -++ vqmovun.s16 d5, q3 -++ -++ vstm.8 r0, {q2} -++ add r0, r2 -++ bne 1b -++ -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // offset_table -++ vpush {d8-d15} -++ vld1.8 {q0, q1}, [r5] // offset table -++ -++1: subs r4, #1 -++ vld1.8 {q12-q13}, [r1], r3 -++ -++ vshr.u8 q8, q12, #3 -++ vshr.u8 q9, q13, #3 -++ -++ vtbl.8 d16, {q0, q1}, d16 -++ vtbl.8 d17, {q0, q1}, d17 -++ vtbl.8 d18, {q0, q1}, d18 -++ vtbl.8 d19, {q0, q1}, d19 -++ -++ vmovl.s8 q2, d16 -++ vmovl.s8 q3, d17 // q8 free -++ vmovl.s8 q4, d18 -++ vmovl.s8 q5, d19 // q9 free -++ -++ vmovl.u8 q6, d24 -++ vmovl.u8 q7, d25 // q12 free -++ vmovl.u8 q8, d26 -++ vmovl.u8 q9, d27 // q13 free -++ -++ vadd.s16 q2, q6 -++ vadd.s16 q3, q7 -++ vadd.s16 q4, q8 -++ vadd.s16 q5, q9 -++ -++ vqmovun.s16 d4, q2 -++ vqmovun.s16 d5, q3 -++ vqmovun.s16 d6, q4 // q4 free -++ vqmovun.s16 d7, q5 // q5 free -++ -++ vst1.8 {q2-q3}, [r0], r2 -++ bne 1b -++ -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // offset_table -++ vpush {d8-d15} -++ vld1.8 {q0, q1}, [r5] // offset table -++ -++1: subs r4, #1 -++ vld1.8 {q12-q13}, [r1]! -++ vld1.8 {q14-q15}, [r1], r3 -++ sub r1, #32 -++ -++ vshr.u8 q8, q12, #3 -++ vshr.u8 q9, q13, #3 -++ vshr.u8 q10, q14, #3 -++ vshr.u8 q11, q15, #3 -++ -++ vtbl.8 d16, {q0, q1}, d16 -++ vtbl.8 d17, {q0, q1}, d17 -++ vtbl.8 d18, {q0, q1}, d18 -++ vtbl.8 d19, {q0, q1}, d19 -++ vtbl.8 d20, {q0, q1}, d20 -++ vtbl.8 d21, {q0, q1}, d21 -++ vtbl.8 d22, {q0, q1}, d22 -++ vtbl.8 d23, {q0, q1}, d23 -++ -++ vmovl.s8 q2, d16 -++ vmovl.s8 q3, d17 // q8 free -++ vmovl.s8 q4, d18 -++ vmovl.s8 q5, d19 // q9 free -++ -++ vmovl.u8 q6, d24 -++ vmovl.u8 q7, d25 // q12 free -++ vmovl.u8 q8, d26 -++ vmovl.u8 q9, d27 // q13 free -++ -++ vadd.s16 q2, q6 -++ vadd.s16 q3, q7 -++ vadd.s16 q4, q8 -++ vadd.s16 q5, q9 -++ -++ vqmovun.s16 d4, q2 -++ vqmovun.s16 d5, q3 -++ vqmovun.s16 d6, q4 // q4 free -++ vqmovun.s16 d7, q5 // q5 free -++ -++ // free q4 -q9, q12 - q13 -++ vmovl.s8 q4, d20 -++ vmovl.s8 q5, d21 // q10 free -++ vmovl.s8 q6, d22 -++ vmovl.s8 q7, d23 // q11 free -++ -++ vmovl.u8 q8, d28 -++ vmovl.u8 q9, d29 // q14 free -++ vmovl.u8 q10, d30 -++ vmovl.u8 q11, d31 // q15 free -++ -++ vadd.s16 q4, q8 -++ vadd.s16 q5, q9 -++ vadd.s16 q6, q10 -++ vadd.s16 q7, q11 -++ -++ vqmovun.s16 d8, q4 -++ vqmovun.s16 d9, q5 -++ vqmovun.s16 d10, q6 -++ vqmovun.s16 d11, q7 -++ -++ vstm.8 r0, {q2-q5} -++ add r0, r2 -++ bne 1b -++ -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -+-- -+2.5.0 -+ -+ -+From 8429b1de64bb871d57651ecfe3b084e2dfe0af51 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Wed, 27 May 2015 18:10:20 +0100 -+Subject: [PATCH 2/9] added NEON optimized sao edge for eo1 width 64 -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 47 ++++++++++++ -+ libavcodec/arm/hevcdsp_sao_neon.S | 147 +++++++++++++++++++++++++++++++++++++ -+ 2 files changed, 194 insertions(+) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 69e2b2c..c7b5404 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -22,6 +22,7 @@ -+ #include "libavutil/arm/cpu.h" -+ #include "libavcodec/hevcdsp.h" -+ #include "hevcdsp_arm.h" -++#include "libavcodec/avcodec.h" -+ #include "../bit_depth_template.c" -+ -+ void ff_hevc_v_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+@@ -48,6 +49,7 @@ void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_d -+ void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+ void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+ void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_edge_eo1_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ -+ #define PUT_PIXELS(name) \ -+ void name(int16_t *dst, uint8_t *src, \ -+@@ -195,6 +197,50 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ } -+ } -+ -++#define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1)) -++static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t *_src /* align 32 */, ptrdiff_t stride_dst, -++ int16_t *_sao_offset_val, int eo, int width, int height) -++{ -++ static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 }; -++ static const int8_t pos[4][2][2] = { -++ { { -1, 0 }, { 1, 0 } }, // horizontal -++ { { 0, -1 }, { 0, 1 } }, // vertical -++ { { -1, -1 }, { 1, 1 } }, // 45 degree -++ { { 1, -1 }, { -1, 1 } }, // 135 degree -++ }; -++ int8_t sao_offset_val[8]; // padding of 3 for vld -++ ptrdiff_t stride_src = (2*MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); -++ pixel *dst = (pixel *)_dst; -++ pixel *src = (pixel *)_src; -++ int a_stride, b_stride; -++ int x, y; -++ -++ for (x = 0; x < 5; x++) { -++ sao_offset_val[x] = _sao_offset_val[x]; -++ } -++ -++ stride_src /= sizeof(pixel); -++ stride_dst /= sizeof(pixel); -++ -++ if (eo == 1 && width == 64) { -++ ff_hevc_sao_edge_eo1_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ } else { -++ a_stride = pos[eo][0][0] + pos[eo][0][1] * stride_src; -++ b_stride = pos[eo][1][0] + pos[eo][1][1] * stride_src; -++ for (y = 0; y < height; y++) { -++ for (x = 0; x < width; x++) { -++ int diff0 = CMP(src[x], src[x + a_stride]); -++ int diff1 = CMP(src[x], src[x + b_stride]); -++ int offset_val = edge_idx[2 + diff0 + diff1]; -++ dst[x] = av_clip_pixel(src[x] + sao_offset_val[offset_val]); -++ } -++ src += stride_src; -++ dst += stride_dst; -++ } -++ } -++} -++#undef CMP -++ -+ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ { -+ if (bit_depth == 8) { -+@@ -216,6 +262,7 @@ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ c->idct_4x4_luma = ff_hevc_transform_luma_4x4_neon_8; -+ for (x = 0; x < sizeof c->sao_band_filter / sizeof *c->sao_band_filter; x++) { -+ c->sao_band_filter[x] = ff_hevc_sao_band_neon_wrapper; -++ c->sao_edge_filter[x] = ff_hevc_sao_edge_neon_wrapper; -+ } -+ put_hevc_qpel_neon[1][0] = ff_hevc_put_qpel_v1_neon_8; -+ put_hevc_qpel_neon[2][0] = ff_hevc_put_qpel_v2_neon_8; -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 1f0ad64..5ec2de9 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -202,3 +202,150 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ bx lr -+ endfunc -+ -++function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x02 -++ vpush {d8-d15} -++1: subs r4, #1 -++ // load a -++ sub r1, r3 -++ vld1.8 {q0-q1}, [r1]! -++ vld1.8 {q2-q3}, [r1], r3 -++ sub r1, #32 -++ // load c -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ // load b -++ vld1.8 {q8-q9}, [r1]! -++ vld1.8 {q10-q11}, [r1], r3 -++ sub r1, #32 -++ -++ vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -++ vcgt.u8 q13, q5, q1 -++ vcgt.u8 q1, q1, q5 -++ vcgt.u8 q14, q6, q2 -++ vcgt.u8 q2, q2, q6 -++ vcgt.u8 q15, q7, q3 -++ vcgt.u8 q3, q3, q7 -++ -++ vsub.s8 q12, q0, q12 // diff0 -++ vsub.s8 q13, q1, q13 -++ vsub.s8 q14, q2, q14 -++ vsub.s8 q15, q3, q15 -++ -++ vcgt.u8 q0, q4, q8 // c > b -++ vcgt.u8 q8, q8, q4 // b > c -++ vcgt.u8 q1, q5, q9 -++ vcgt.u8 q9, q9, q5 -++ vcgt.u8 q2, q6, q10 -++ vcgt.u8 q10, q10, q6 -++ vcgt.u8 q3, q7, q11 -++ vcgt.u8 q11, q11, q7 -++ -++ vsub.s8 q0, q8, q0 // diff1 -++ vsub.s8 q1, q9, q1 -++ vsub.s8 q2, q10, q2 -++ vsub.s8 q3, q11, q3 -++ -++ veor.u8 q8, q8 // zero register -++ vdup.s8 q9, r6 // 2 to all elements -++ add r6, #1 -++ vdup.s8 q10, r6 // 3 to all elements -++ sub r6, #1 -++ -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ vadd.s8 q2, q14 -++ vadd.s8 q3, q15 -++ -++ vcgt.s8 q4, q0, q8 // diff0 + diff1 > 0 -++ vcgt.s8 q5, q1, q8 -++ vcgt.s8 q6, q2, q8 -++ vcgt.s8 q7, q3, q8 -++ -++ vclt.s8 q11, q0, q8 // diff0 + diff1 < 0 -++ vclt.s8 q12, q1, q8 -++ vclt.s8 q13, q2, q8 -++ vclt.s8 q14, q3, q8 -++ -++ vadd.s8 q8, q0, q9 // diff0 + diff1 + 2 -++ vand.8 q15, q8, q4 -++ vadd.s8 q8, q0, q10 // diff0 + diff1 + 3 -++ vand.8 q8, q8, q11 -++ vadd.s8 q0, q15, q8 // offset_idx -++ -++ vadd.s8 q8, q1, q9 // diff0 + diff1 + 2 -++ vand.8 q15, q8, q5 -++ vadd.s8 q8, q1, q10 // diff0 + diff1 + 3 -++ vand.8 q8, q8, q12 -++ vadd.s8 q1, q15, q8 // offset_idx -++ -++ vadd.s8 q8, q2, q9 // diff0 + diff1 + 2 + 2 -++ vand.8 q15, q8, q6 -++ vadd.s8 q8, q2, q10 // diff0 + diff1 + 2 + 3 -++ vand.8 q8, q8, q13 -++ vadd.s8 q2, q15, q8 // offset_idx -++ -++ vadd.s8 q8, q3, q9 // diff0 + diff1 + 2 + 2 -++ vand.8 q15, q8, q7 -++ vadd.s8 q8, q3, q10 // diff0 + diff1 + 2 + 3 -++ vand.8 q8, q8, q14 -++ vadd.s8 q3, q15, q8 // offset_idx -++ // TODO: load only once -++ vld1.8 d16, [r5] -++ -++ vtbl.8 d0, {d16}, d0 -++ vtbl.8 d1, {d16}, d1 -++ vtbl.8 d2, {d16}, d2 -++ vtbl.8 d3, {d16}, d3 -++ vtbl.8 d4, {d16}, d4 -++ vtbl.8 d5, {d16}, d5 -++ vtbl.8 d6, {d16}, d6 -++ vtbl.8 d7, {d16}, d7 -++ -++ // TODO: load only once -++ // load c again -++ sub r1, r3 -++ sub r1, r3 -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ -++ vmovl.u8 q8, d8 -++ vmovl.u8 q9, d9 -++ vmovl.u8 q10, d10 -++ vmovl.u8 q11, d11 -++ vmovl.u8 q12, d12 -++ vmovl.u8 q13, d13 -++ vmovl.u8 q14, d14 -++ vmovl.u8 q15, d15 -++ -++ vaddw.s8 q8, d0 -++ vaddw.s8 q9, d1 -++ vaddw.s8 q10, d2 -++ vaddw.s8 q11, d3 -++ vaddw.s8 q12, d4 -++ vaddw.s8 q13, d5 -++ vaddw.s8 q14, d6 -++ vaddw.s8 q15, d7 -++ -++ vqmovun.s16 d0, q8 -++ vqmovun.s16 d1, q9 -++ vqmovun.s16 d2, q10 -++ vqmovun.s16 d3, q11 -++ vqmovun.s16 d4, q12 -++ vqmovun.s16 d5, q13 -++ vqmovun.s16 d6, q14 -++ vqmovun.s16 d7, q15 -++ -++ vstm r0, {q0-q3} -++ add r0, r2 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -+-- -+2.5.0 -+ -+ -+From 402e2bd1c5ad659c757bf9734abe6331904fb9e2 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Tue, 16 Dec 2014 16:28:25 +0200 -+Subject: [PATCH 3/9] Added SAO edge offset for ARM NEON w32 and w64 -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 46 +++- -+ libavcodec/arm/hevcdsp_sao_neon.S | 510 +++++++++++++++++++++++++++++++------ -+ 2 files changed, 474 insertions(+), 82 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index c7b5404..c32940e 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -49,7 +49,16 @@ void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_d -+ void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+ void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+ void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++ -++void ff_hevc_sao_edge_eo0_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo1_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo2_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo3_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++ -++void ff_hevc_sao_edge_eo0_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ void ff_hevc_sao_edge_eo1_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo2_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -++void ff_hevc_sao_edge_eo3_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ -+ #define PUT_PIXELS(name) \ -+ void name(int16_t *dst, uint8_t *src, \ -+@@ -222,9 +231,40 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ stride_src /= sizeof(pixel); -+ stride_dst /= sizeof(pixel); -+ -+- if (eo == 1 && width == 64) { -+- ff_hevc_sao_edge_eo1_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -+- } else { -++ switch (width) { -++ case 32: -++ switch(eo) { -++ case 0: -++ ff_hevc_sao_edge_eo0_w32_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 1: -++ ff_hevc_sao_edge_eo1_w32_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 2: -++ ff_hevc_sao_edge_eo2_w32_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 3: -++ ff_hevc_sao_edge_eo3_w32_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ } -++ break; -++ case 64: -++ switch(eo) { -++ case 0: -++ ff_hevc_sao_edge_eo0_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 1: -++ ff_hevc_sao_edge_eo1_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 2: -++ ff_hevc_sao_edge_eo2_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ case 3: -++ ff_hevc_sao_edge_eo3_w64_neon_8(dst, src, stride_dst, stride_src, height, sao_offset_val); -++ break; -++ } -++ break; -++ default: -+ a_stride = pos[eo][0][0] + pos[eo][0][1] * stride_src; -+ b_stride = pos[eo][1][0] + pos[eo][1][1] * stride_src; -+ for (y = 0; y < height; y++) { -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 5ec2de9..4687012 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -202,27 +202,7 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ bx lr -+ endfunc -+ -+-function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x02 -+- vpush {d8-d15} -+-1: subs r4, #1 -+- // load a -+- sub r1, r3 -+- vld1.8 {q0-q1}, [r1]! -+- vld1.8 {q2-q3}, [r1], r3 -+- sub r1, #32 -+- // load c -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -+- sub r1, #32 -+- // load b -+- vld1.8 {q8-q9}, [r1]! -+- vld1.8 {q10-q11}, [r1], r3 -+- sub r1, #32 -+- -++.macro edge_w64_body -+ vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -+ vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -+ vcgt.u8 q13, q5, q1 -+@@ -251,69 +231,61 @@ function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+ vsub.s8 q2, q10, q2 -+ vsub.s8 q3, q11, q3 -+ -+- veor.u8 q8, q8 // zero register -+- vdup.s8 q9, r6 // 2 to all elements -+- add r6, #1 -+- vdup.s8 q10, r6 // 3 to all elements -+- sub r6, #1 -+- -+ vadd.s8 q0, q12 //diff0 + diff1 -+ vadd.s8 q1, q13 -+ vadd.s8 q2, q14 -+ vadd.s8 q3, q15 -+ -+- vcgt.s8 q4, q0, q8 // diff0 + diff1 > 0 -+- vcgt.s8 q5, q1, q8 -+- vcgt.s8 q6, q2, q8 -+- vcgt.s8 q7, q3, q8 -+- -+- vclt.s8 q11, q0, q8 // diff0 + diff1 < 0 -+- vclt.s8 q12, q1, q8 -+- vclt.s8 q13, q2, q8 -+- vclt.s8 q14, q3, q8 -+- -+- vadd.s8 q8, q0, q9 // diff0 + diff1 + 2 -+- vand.8 q15, q8, q4 -+- vadd.s8 q8, q0, q10 // diff0 + diff1 + 3 -+- vand.8 q8, q8, q11 -+- vadd.s8 q0, q15, q8 // offset_idx -+- -+- vadd.s8 q8, q1, q9 // diff0 + diff1 + 2 -+- vand.8 q15, q8, q5 -+- vadd.s8 q8, q1, q10 // diff0 + diff1 + 3 -+- vand.8 q8, q8, q12 -+- vadd.s8 q1, q15, q8 // offset_idx -+- -+- vadd.s8 q8, q2, q9 // diff0 + diff1 + 2 + 2 -+- vand.8 q15, q8, q6 -+- vadd.s8 q8, q2, q10 // diff0 + diff1 + 2 + 3 -+- vand.8 q8, q8, q13 -+- vadd.s8 q2, q15, q8 // offset_idx -+- -+- vadd.s8 q8, q3, q9 // diff0 + diff1 + 2 + 2 -+- vand.8 q15, q8, q7 -+- vadd.s8 q8, q3, q10 // diff0 + diff1 + 2 + 3 -+- vand.8 q8, q8, q14 -+- vadd.s8 q3, q15, q8 // offset_idx -+- // TODO: load only once -+- vld1.8 d16, [r5] -+- -+- vtbl.8 d0, {d16}, d0 -+- vtbl.8 d1, {d16}, d1 -+- vtbl.8 d2, {d16}, d2 -+- vtbl.8 d3, {d16}, d3 -+- vtbl.8 d4, {d16}, d4 -+- vtbl.8 d5, {d16}, d5 -+- vtbl.8 d6, {d16}, d6 -+- vtbl.8 d7, {d16}, d7 -+- -+- // TODO: load only once -+- // load c again -+- sub r1, r3 -+- sub r1, r3 -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -+- sub r1, #32 -++ vdup.s8 q9, r6 // 3 to all elements -++ sub r6, #1 -++ -++ vclt.s8 q12, q0, #0 // diff0 + diff1 < 0 -++ vclt.s8 q13, q1, #0 -++ vclt.s8 q14, q2, #0 -++ vclt.s8 q15, q3, #0 -++ -++ vadd.s8 q8, q0, q9 // diff0 + diff1 + 3 -++ vadd.s8 q10, q1, q9 -++ vand.8 q12, q8, q12 // if (diff0 + diff1 < 0) then (diff0 + diff1 + 3) else 0 -++ vand.8 q13, q10, q13 -++ vadd.s8 q8, q2, q9 -++ vadd.s8 q10, q3, q9 -++ vand.8 q14, q8, q14 -++ vand.8 q15, q10, q15 -++ -++ vdup.s8 q9, r6 // 2 to all elements -++ add r6, #1 -++ -++ vcgt.s8 q10, q0, #0 // diff0 + diff1 > 0 -++ vadd.s8 q8, q0, q9 // diff0 + diff1 + 2 -++ vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vcgt.s8 q10, q1, #0 -++ vadd.s8 q0, q11, q12 // offset_idx -++ -++ vadd.s8 q8, q1, q9 // diff0 + diff1 + 2 -++ vcgt.s8 q12, q2, #0 -++ vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vadd.s8 q8, q2, q9 // diff0 + diff1 + 2 -++ vadd.s8 q1, q11, q13 -++ -++ vand.8 q11, q8, q12 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vcgt.s8 q10, q3, #0 -++ vadd.s8 q2, q11, q14 -++ -++ vadd.s8 q8, q3, q9 // diff0 + diff1 + 2 -++ vmov.32 d18[0], r7 // load offset table from general registers -++ vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vmov.32 d18[1], r5 // load rest of offset table -++ vadd.s8 q3, q11, q15 -++ -++ vtbl.8 d0, {d18}, d0 -++ vtbl.8 d1, {d18}, d1 -++ vtbl.8 d2, {d18}, d2 -++ vtbl.8 d3, {d18}, d3 -++ vtbl.8 d4, {d18}, d4 -++ vtbl.8 d5, {d18}, d5 -++ vtbl.8 d6, {d18}, d6 -++ vtbl.8 d7, {d18}, d7 -+ -+ vmovl.u8 q8, d8 -+ vmovl.u8 q9, d9 -+@@ -344,8 +316,388 @@ function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+ -+ vstm r0, {q0-q3} -+ add r0, r2 -++.endm -++ -++.macro edge_w32_body -++ vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -++ vcgt.u8 q13, q5, q1 -++ vcgt.u8 q1, q1, q5 -++ -++ vsub.s8 q12, q0, q12 // diff0 -++ vcgt.u8 q0, q4, q8 // c > b -++ vsub.s8 q13, q1, q13 // diff0 part 2 -++ -++ vcgt.u8 q6, q8, q4 // b > c -++ vcgt.u8 q1, q5, q9 -++ vcgt.u8 q7, q9, q5 -++ -++ vsub.s8 q0, q6, q0 // diff1 -++ vsub.s8 q1, q7, q1 // diff1 part 2 -++ vadd.s8 q0, q12 //diff0 + diff1 -++ -++ vdup.s8 q7, r6 // 3 to all elements -++ sub r6, #1 -++ vadd.s8 q1, q13 -++ -++ vclt.s8 q12, q0, #0 // diff0 + diff1 < 0 -++ vclt.s8 q13, q1, #0 -++ -++ vadd.s8 q6, q0, q7 // diff0 + diff1 + 3 -++ vadd.s8 q10, q1, q7 -++ vdup.s8 q7, r6 // 2 to all elements -++ add r6, #1 -++ vand.8 q12, q6, q12 // if (diff0 + diff1 < 0) then (diff0 + diff1 + 3) else 0 -++ vand.8 q13, q10, q13 -++ -++ -++ vcgt.s8 q10, q0, #0 // diff0 + diff1 > 0 -++ vadd.s8 q6, q0, q7 // diff0 + diff1 + 2 -++ vand.8 q11, q6, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vcgt.s8 q10, q1, #0 -++ vadd.s8 q0, q11, q12 // offset_idx -++ -++ vadd.s8 q6, q1, q7 // diff0 + diff1 + 2 -++ vmov.32 d14[0], r7 // load offset table from general registers -++ vand.8 q11, q6, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -++ vmov.32 d14[1], r5 // load rest of offset table -++ vadd.s8 q1, q11, q13 -++ -++ vtbl.8 d0, {d14}, d0 -++ vtbl.8 d1, {d14}, d1 -++ vtbl.8 d2, {d14}, d2 -++ vtbl.8 d3, {d14}, d3 -++ -++ vmovl.u8 q6, d8 -++ vmovl.u8 q7, d9 -++ vmovl.u8 q10, d10 -++ vmovl.u8 q11, d11 -++ -++ vaddw.s8 q6, d0 -++ vaddw.s8 q7, d1 -++ vaddw.s8 q10, d2 -++ vaddw.s8 q11, d3 -++ -++ vqmovun.s16 d0, q6 -++ vqmovun.s16 d1, q7 -++ vqmovun.s16 d2, q10 -++ vqmovun.s16 d3, q11 -++ -++ vstm r0, {q0-q1} -++ add r0, r2 -++.endm -++ -++function ff_hevc_sao_edge_eo0_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ sub r1, #8 -++1: subs r4, #1 -++ vld1.64 {q10-q11}, [r1]! -++ vld1.64 {q12-q13}, [r1]! -++ vld1.64 {q14}, [r1], r3 -++ sub r1, #64 -++ // load a -++ vext.8 q0, q10, q11, #7 -++ vext.8 q1, q11, q12, #7 -++ vext.8 q2, q12, q13, #7 -++ vext.8 q3, q13, q14, #7 -++ // load c -++ vext.8 q4, q10, q11, #8 -++ vext.8 q5, q11, q12, #8 -++ vext.8 q6, q12, q13, #8 -++ vext.8 q7, q13, q14, #8 -++ // load b -++ vext.8 q8, q10, q11, #9 -++ vext.8 q9, q11, q12, #9 -++ vext.8 q10, q12, q13, #9 -++ vext.8 q11, q13, q14, #9 -++ edge_w64_body -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ sub r1, r3 -++ // load a -++ vld1.8 {q0-q1}, [r1]! -++ vld1.8 {q2-q3}, [r1], r3 -++ sub r1, #32 -++1: subs r4, #1 -++ // load c -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ // load b -++ vld1.8 {q8-q9}, [r1]! -++ vld1.8 {q10-q11}, [r1] -++ sub r1, #32 -++ edge_w64_body -++ // copy c to a -++ vmov.64 q0, q4 -++ vmov.64 q1, q5 -++ vmov.64 q2, q6 -++ vmov.64 q3, q7 -+ bne 1b -+ vpop {d8-d15} -+ pop {r4-r8} -+ bx lr -+ endfunc -++ -++function ff_hevc_sao_edge_eo2_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++1: sub r1, r3 -++ // load a -++ // TODO: fix unaligned load -++ // don't reload a like in eo1 -++ sub r1, #1 -++ vld1.8 {q0-q1}, [r1]! -++ vld1.8 {q2-q3}, [r1], r3 -++ sub r1, #31 -++ subs r4, #1 -++ // load c -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ // load b -++ add r1, #1 -++ vld1.8 {q8-q9}, [r1]! -++ vld1.8 {q10-q11}, [r1] -++ sub r1, #33 -++ edge_w64_body -++ // copy c to a -++ vmov.64 q0, q4 -++ vmov.64 q1, q5 -++ vmov.64 q2, q6 -++ vmov.64 q3, q7 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++1: sub r1, r3 -++ // load a -++ // TODO: fix unaligned load -++ // don't reload a like in eo1 -++ add r1, #1 -++ vld1.8 {q0-q1}, [r1]! -++ vld1.8 {q2-q3}, [r1], r3 -++ sub r1, #33 -++ subs r4, #1 -++ // load c -++ vld1.8 {q4-q5}, [r1]! -++ vld1.8 {q6-q7}, [r1], r3 -++ sub r1, #32 -++ // load b -++ sub r1, #1 -++ vld1.8 {q8-q9}, [r1]! -++ vld1.8 {q10-q11}, [r1] -++ sub r1, #31 -++ edge_w64_body -++ // copy c to a -++ vmov.64 q0, q4 -++ vmov.64 q1, q5 -++ vmov.64 q2, q6 -++ vmov.64 q3, q7 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo0_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ sub r1, #8 // load 8 extra bytes -++1: subs r4, #1 -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 // only first 9 bytes are used -++ sub r1, #32 -++ // a -++ vext.8 q0, q10, q11, #7 -++ vext.8 q1, q11, q12, #7 -++ // c -++ vext.8 q4, q10, q11, #8 -++ vext.8 q5, q11, q12, #8 -++ // b -++ vext.8 q8, q10, q11, #9 -++ vext.8 q9, q11, q12, #9 -++ edge_w32_body -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo1_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ // load a -++ sub r1, r3 -++ vld1.8 {q0-q1}, [r1], r3 -++ // load c -++ vld1.8 {q4-q5}, [r1], r3 -++1: subs r4, #1 -++ // load b -++ vld1.8 {q8-q9}, [r1], r3 -++ edge_w32_body -++ // inputs for next loop iteration -++ // a -++ vmov.64 q0, q4 -++ vmov.64 q1, q5 -++ // c -++ vmov.64 q4, q8 -++ vmov.64 q5, q9 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo2_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ ldr r5, [r5] -++ vpush {d8-d15} -++ // load a -++ sub r1, r3 -++ sub r1, #8 -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q0, q10, q11, #7 -++ vext.8 q1, q11, q12, #7 -++ // load c -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q4, q10, q11, #8 -++ vext.8 q5, q11, q12, #8 -++ vext.8 q2, q10, q11, #7 -++1: subs r4, #1 -++ // load b -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q8, q10, q11, #9 -++ vext.8 q9, q11, q12, #9 -++ vext.8 q14, q10, q11, #8 -++ vext.8 q15, q11, q12, #8 -++ vext.8 q3, q10, q11, #7 -++ edge_w32_body -++ // inputs for next loop iteration -++ // a -++ vmov.8 q0, q2 -++ vext.8 q1, q4, q5, #15 -++ // c -++ vmov.8 q4, q14 -++ vmov.8 q5, q15 -++ vmov.8 q2, q3 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -++function ff_hevc_sao_edge_eo3_w32_neon_8, export=1 -++ push {r4-r8} -++ ldr r4, [sp, #20] // height -++ ldr r5, [sp, #24] // sao_offset_val_table -++ ldr r6, =0x03 -++ ldr r7, [r5] -++ add r5, #4 -++ sub r1, r3 -++ ldr r5, [r5] -++ sub r1, #8 -++ vpush {d8-d15} -++ // load a -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q0, q10, q11, #9 -++ vext.8 q1, q11, q12, #9 -++ // load c -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q4, q10, q11, #8 -++ vext.8 q5, q11, q12, #8 -++ vext.8 q2, q12, q11, #8 -++1: subs r4, #1 -++ // load b -++ vld1.8 {q10-q11}, [r1] -++ add r1, #32 -++ vld1.8 {q12}, [r1], r3 -++ sub r1, #32 -++ vext.8 q8, q10, q11, #7 -++ vext.8 q9, q11, q12, #7 -++ vext.8 q3, q12, q10, #7 -++ edge_w32_body -++ // inputs for next loop iteration -++ // a -++ vext.8 q0, q4, q5, #1 -++ vext.8 q1, q5, q2, #1 -++ // c -++ vext.8 q4, q8, q9, #1 -++ vext.8 q5, q9, q3, #1 -++ vext.8 q2, q3, q1, #1 -++ bne 1b -++ vpop {d8-d15} -++ pop {r4-r8} -++ bx lr -++endfunc -++ -+-- -+2.5.0 -+ -+ -+From 1898d052a73370166d57e17cc7c52b7275887df3 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Fri, 19 Dec 2014 09:44:10 +0200 -+Subject: [PATCH 4/9] Improved SAO band NEON opimizations made SAO buffer 16 -+ byte aligned added alignment hints to loads and stores optimized register -+ usage in SAO band neon assembly -+ -+--- -+ libavcodec/arm/hevcdsp_sao_neon.S | 212 +++++++++++++++----------------------- -+ 1 file changed, 82 insertions(+), 130 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 4687012..ac21013 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -22,120 +22,84 @@ -+ #include "neon.S" -+ -+ function ff_hevc_sao_band_w8_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // offset_table -+- vpush {d8-d15} -+- vld1.8 {q0, q1}, [r5] // offset table -++ ldr r12, [sp, #4] // offset_table address -++ vld1.8 {q0, q1}, [r12] // offset table -++ ldr r12, [sp, #0] // height -+ -+-1: subs r4, #1 -+- vld1.8 {d24}, [r1], r3 -++1: subs r12, #1 -++ vld1.8 {d24}, [r1,:64], r3 -+ vshr.u8 d16, d24, #3 -+ vtbl.8 d16, {q0, q1}, d16 -+- vmovl.s8 q2, d16 -+ vmovl.u8 q6, d24 -+- vadd.s16 q2, q6 -++ vaddw.s8 q6, d16 -+ vqmovun.s16 d4, q2 -+- vst1.8 {d4}, [r0], r2 -++ vst1.8 {d4}, [r0,:64], r2 -+ bne 1b -+ -+- vpop {d8-d15} -+- pop {r4-r8} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_band_w16_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // offset_table -+- vpush {d8-d15} -+- vld1.8 {q0, q1}, [r5] // offset table -+- -+-1: subs r4, #1 -+- vld1.8 {q12}, [r1], r3 -++ ldr r12, [sp, #4] // offset_table address -++ vld1.8 {q0, q1}, [r12] // offset table -++ ldr r12, [sp, #0] // height -+ -++1: subs r12, #1 -++ vld1.8 {q12}, [r1,:128], r3 -+ vshr.u8 q8, q12, #3 -+- -+ vtbl.8 d16, {q0, q1}, d16 -+ vtbl.8 d17, {q0, q1}, d17 -+- -+- vmovl.s8 q2, d16 -+- vmovl.s8 q3, d17 -+- -+- vmovl.u8 q6, d24 -+- vmovl.u8 q7, d25 -+- -+- vadd.s16 q2, q6 -+- vadd.s16 q3, q7 -+- -+- vqmovun.s16 d4, q2 -+- vqmovun.s16 d5, q3 -+- -+- vstm.8 r0, {q2} -+- add r0, r2 -++ vmovl.u8 q10, d24 -++ vmovl.u8 q11, d25 -++ vaddw.s8 q10, d16 -++ vaddw.s8 q11, d17 -++ vqmovun.s16 d4, q10 -++ vqmovun.s16 d5, q11 -++ vst1.8 {q2}, [r0,:128], r2 -+ bne 1b -+ -+- vpop {d8-d15} -+- pop {r4-r8} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_band_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // offset_table -+- vpush {d8-d15} -+- vld1.8 {q0, q1}, [r5] // offset table -+- -+-1: subs r4, #1 -+- vld1.8 {q12-q13}, [r1], r3 -+- -+- vshr.u8 q8, q12, #3 -+- vshr.u8 q9, q13, #3 -+- -+- vtbl.8 d16, {q0, q1}, d16 -+- vtbl.8 d17, {q0, q1}, d17 -+- vtbl.8 d18, {q0, q1}, d18 -+- vtbl.8 d19, {q0, q1}, d19 -+- -+- vmovl.s8 q2, d16 -+- vmovl.s8 q3, d17 // q8 free -+- vmovl.s8 q4, d18 -+- vmovl.s8 q5, d19 // q9 free -+- -+- vmovl.u8 q6, d24 -+- vmovl.u8 q7, d25 // q12 free -+- vmovl.u8 q8, d26 -+- vmovl.u8 q9, d27 // q13 free -+- -+- vadd.s16 q2, q6 -+- vadd.s16 q3, q7 -+- vadd.s16 q4, q8 -+- vadd.s16 q5, q9 -+- -+- vqmovun.s16 d4, q2 -+- vqmovun.s16 d5, q3 -+- vqmovun.s16 d6, q4 // q4 free -+- vqmovun.s16 d7, q5 // q5 free -+- -+- vst1.8 {q2-q3}, [r0], r2 -+- bne 1b -+- -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ ldr r12, [sp, #4] // offset_table address -++ vld1.8 {q0, q1}, [r12] // offset table -++ ldr r12, [sp, #0] // height -++ -++1: subs r12, #1 -++ vld1.8 {q2-q3}, [r1,:128], r3 -++ vshr.u8 q8, q2, #3 -++ vshr.u8 q9, q3, #3 -++ vtbl.8 d16, {q0, q1}, d16 -++ vtbl.8 d17, {q0, q1}, d17 -++ vtbl.8 d18, {q0, q1}, d18 -++ vtbl.8 d19, {q0, q1}, d19 -++ vmovl.u8 q12, d4 -++ vmovl.u8 q13, d5 -++ vmovl.u8 q14, d6 -++ vmovl.u8 q15, d7 -++ vaddw.s8 q12, d16 -++ vaddw.s8 q13, d17 -++ vaddw.s8 q14, d18 -++ vaddw.s8 q15, d19 -++ vqmovun.s16 d4, q12 -++ vqmovun.s16 d5, q13 -++ vqmovun.s16 d6, q14 -++ vqmovun.s16 d7, q15 -++ vst1.8 {q2-q3}, [r0,:128], r2 -++ bne 1b -++ -++ bx lr -+ endfunc -+ -+ function ff_hevc_sao_band_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // offset_table -+- vpush {d8-d15} -+- vld1.8 {q0, q1}, [r5] // offset table -++ ldr r12, [sp, #4] // offset_table address -++ vld1.8 {q0, q1}, [r12] // offset table -++ ldr r12, [sp, #0] // height -+ -+-1: subs r4, #1 -+- vld1.8 {q12-q13}, [r1]! -+- vld1.8 {q14-q15}, [r1], r3 -++1: subs r12, #1 -++ vld1.8 {q12-q13}, [r1,:128]! -++ vld1.8 {q14-q15}, [r1,:128], r3 -+ sub r1, #32 -+ -+ vshr.u8 q8, q12, #3 -+@@ -152,53 +116,41 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ vtbl.8 d22, {q0, q1}, d22 -+ vtbl.8 d23, {q0, q1}, d23 -+ -+- vmovl.s8 q2, d16 -+- vmovl.s8 q3, d17 // q8 free -+- vmovl.s8 q4, d18 -+- vmovl.s8 q5, d19 // q9 free -++ vmovl.u8 q2, d24 -++ vmovl.u8 q3, d25 -++ vmovl.u8 q12, d26 -++ vmovl.u8 q13, d27 -+ -+- vmovl.u8 q6, d24 -+- vmovl.u8 q7, d25 // q12 free -+- vmovl.u8 q8, d26 -+- vmovl.u8 q9, d27 // q13 free -+- -+- vadd.s16 q2, q6 -+- vadd.s16 q3, q7 -+- vadd.s16 q4, q8 -+- vadd.s16 q5, q9 -++ vaddw.s8 q2, d16 -++ vaddw.s8 q3, d17 -++ vaddw.s8 q12, d18 -++ vaddw.s8 q13, d19 -+ -+ vqmovun.s16 d4, q2 -+ vqmovun.s16 d5, q3 -+- vqmovun.s16 d6, q4 // q4 free -+- vqmovun.s16 d7, q5 // q5 free -+- -+- // free q4 -q9, q12 - q13 -+- vmovl.s8 q4, d20 -+- vmovl.s8 q5, d21 // q10 free -+- vmovl.s8 q6, d22 -+- vmovl.s8 q7, d23 // q11 free -+- -+- vmovl.u8 q8, d28 -+- vmovl.u8 q9, d29 // q14 free -+- vmovl.u8 q10, d30 -+- vmovl.u8 q11, d31 // q15 free -+- -+- vadd.s16 q4, q8 -+- vadd.s16 q5, q9 -+- vadd.s16 q6, q10 -+- vadd.s16 q7, q11 -+- -+- vqmovun.s16 d8, q4 -+- vqmovun.s16 d9, q5 -+- vqmovun.s16 d10, q6 -+- vqmovun.s16 d11, q7 -+- -+- vstm.8 r0, {q2-q5} -+- add r0, r2 -++ vqmovun.s16 d6, q12 -++ vqmovun.s16 d7, q13 -++ -++ vmovl.u8 q12, d28 -++ vmovl.u8 q13, d29 -++ vmovl.u8 q14, d30 -++ vmovl.u8 q15, d31 -++ -++ vaddw.s8 q12, d20 -++ vaddw.s8 q13, d21 -++ vaddw.s8 q14, d22 -++ vaddw.s8 q15, d23 -++ -++ vqmovun.s16 d8, q12 -++ vqmovun.s16 d9, q13 -++ vqmovun.s16 d10, q14 -++ vqmovun.s16 d11, q15 -++ -++ vst1.8 {q2-q3}, [r0,:128]! -++ vst1.8 {q4-q5}, [r0,:128], r2 -++ sub r0, #32 -+ bne 1b -+ -+- vpop {d8-d15} -+- pop {r4-r8} -+ bx lr -+ endfunc -+ -+-- -+2.5.0 -+ -+ -+From 26bd536800db2f50ff6a021e1fda0d0394d1ea01 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Mon, 29 Dec 2014 15:00:49 +0200 -+Subject: [PATCH 5/9] better code reuse in NEON SAO band -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 16 ++-- -+ libavcodec/arm/hevcdsp_sao_neon.S | 155 +++++++++++++------------------------ -+ 2 files changed, 61 insertions(+), 110 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index c32940e..6379810 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -45,10 +45,10 @@ void ff_hevc_transform_add_16x16_neon_8(uint8_t *_dst, int16_t *coeffs, -+ void ff_hevc_transform_add_32x32_neon_8(uint8_t *_dst, int16_t *coeffs, -+ ptrdiff_t stride); -+ -+-void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+-void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+-void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -+-void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t * offset_table); -++void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -++void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -++void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -++void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -+ -+ void ff_hevc_sao_edge_eo0_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ void ff_hevc_sao_edge_eo1_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+@@ -185,16 +185,16 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ -+ switch(width){ -+ case 8: -+- ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+ case 16: -+- ff_hevc_sao_band_w16_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ ff_hevc_sao_band_w16_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+ case 32: -+- ff_hevc_sao_band_w32_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ ff_hevc_sao_band_w32_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+ case 64: -+- ff_hevc_sao_band_w64_neon_8(_dst, _src, stride_dst, stride_src, height, offset_table); -++ ff_hevc_sao_band_w64_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+ default: -+ for (y = 0; y < height; y++) { -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index ac21013..8852550 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -21,53 +21,13 @@ -+ #include "libavutil/arm/asm.S" -+ #include "neon.S" -+ -+-function ff_hevc_sao_band_w8_neon_8, export=1 -+- ldr r12, [sp, #4] // offset_table address -++.macro init_sao_band -++ ldr r12, [sp, #0] // offset_table address -+ vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #0] // height -+- -+-1: subs r12, #1 -+- vld1.8 {d24}, [r1,:64], r3 -+- vshr.u8 d16, d24, #3 -+- vtbl.8 d16, {q0, q1}, d16 -+- vmovl.u8 q6, d24 -+- vaddw.s8 q6, d16 -+- vqmovun.s16 d4, q2 -+- vst1.8 {d4}, [r0,:64], r2 -+- bne 1b -+- -+- bx lr -+-endfunc -+- -+-function ff_hevc_sao_band_w16_neon_8, export=1 -+- ldr r12, [sp, #4] // offset_table address -+- vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #0] // height -+- -+-1: subs r12, #1 -+- vld1.8 {q12}, [r1,:128], r3 -+- vshr.u8 q8, q12, #3 -+- vtbl.8 d16, {q0, q1}, d16 -+- vtbl.8 d17, {q0, q1}, d17 -+- vmovl.u8 q10, d24 -+- vmovl.u8 q11, d25 -+- vaddw.s8 q10, d16 -+- vaddw.s8 q11, d17 -+- vqmovun.s16 d4, q10 -+- vqmovun.s16 d5, q11 -+- vst1.8 {q2}, [r0,:128], r2 -+- bne 1b -+- -+- bx lr -+-endfunc -+- -+-function ff_hevc_sao_band_w32_neon_8, export=1 -+- ldr r12, [sp, #4] // offset_table address -+- vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #0] // height -++ ldr r12, [sp, #4] // height -++.endm -+ -+-1: subs r12, #1 -+- vld1.8 {q2-q3}, [r1,:128], r3 -++.macro sao_band_32 -+ vshr.u8 q8, q2, #3 -+ vshr.u8 q9, q3, #3 -+ vtbl.8 d16, {q0, q1}, d16 -+@@ -86,6 +46,43 @@ function ff_hevc_sao_band_w32_neon_8, export=1 -+ vqmovun.s16 d5, q13 -+ vqmovun.s16 d6, q14 -+ vqmovun.s16 d7, q15 -++.endm -++ -++function ff_hevc_sao_band_w8_neon_8, export=1 -++ init_sao_band -++1: subs r12, #4 -++ vld1.8 {d4}, [r1,:64], r3 -++ vld1.8 {d5}, [r1,:64], r3 -++ vld1.8 {d6}, [r1,:64], r3 -++ vld1.8 {d7}, [r1,:64], r3 -++ sao_band_32 -++ vst1.8 {d4}, [r0,:64], r2 -++ vst1.8 {d5}, [r0,:64], r2 -++ vst1.8 {d6}, [r0,:64], r2 -++ vst1.8 {d7}, [r0,:64], r2 -++ bne 1b -++ -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w16_neon_8, export=1 -++ init_sao_band -++1: subs r12, #2 -++ vld1.8 {q2}, [r1,:128], r3 -++ vld1.8 {q3}, [r1,:128], r3 -++ sao_band_32 -++ vst1.8 {q2}, [r0,:128], r2 -++ vst1.8 {q3}, [r0,:128], r2 -++ bne 1b -++ -++ bx lr -++endfunc -++ -++function ff_hevc_sao_band_w32_neon_8, export=1 -++ init_sao_band -++1: subs r12, #1 -++ vld1.8 {q2-q3}, [r1,:128], r3 -++ sao_band_32 -+ vst1.8 {q2-q3}, [r0,:128], r2 -+ bne 1b -+ -+@@ -93,63 +90,17 @@ function ff_hevc_sao_band_w32_neon_8, export=1 -+ endfunc -+ -+ function ff_hevc_sao_band_w64_neon_8, export=1 -+- ldr r12, [sp, #4] // offset_table address -+- vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #0] // height -+- -+-1: subs r12, #1 -+- vld1.8 {q12-q13}, [r1,:128]! -+- vld1.8 {q14-q15}, [r1,:128], r3 -+- sub r1, #32 -+- -+- vshr.u8 q8, q12, #3 -+- vshr.u8 q9, q13, #3 -+- vshr.u8 q10, q14, #3 -+- vshr.u8 q11, q15, #3 -+- -+- vtbl.8 d16, {q0, q1}, d16 -+- vtbl.8 d17, {q0, q1}, d17 -+- vtbl.8 d18, {q0, q1}, d18 -+- vtbl.8 d19, {q0, q1}, d19 -+- vtbl.8 d20, {q0, q1}, d20 -+- vtbl.8 d21, {q0, q1}, d21 -+- vtbl.8 d22, {q0, q1}, d22 -+- vtbl.8 d23, {q0, q1}, d23 -+- -+- vmovl.u8 q2, d24 -+- vmovl.u8 q3, d25 -+- vmovl.u8 q12, d26 -+- vmovl.u8 q13, d27 -+- -+- vaddw.s8 q2, d16 -+- vaddw.s8 q3, d17 -+- vaddw.s8 q12, d18 -+- vaddw.s8 q13, d19 -+- -+- vqmovun.s16 d4, q2 -+- vqmovun.s16 d5, q3 -+- vqmovun.s16 d6, q12 -+- vqmovun.s16 d7, q13 -+- -+- vmovl.u8 q12, d28 -+- vmovl.u8 q13, d29 -+- vmovl.u8 q14, d30 -+- vmovl.u8 q15, d31 -+- -+- vaddw.s8 q12, d20 -+- vaddw.s8 q13, d21 -+- vaddw.s8 q14, d22 -+- vaddw.s8 q15, d23 -+- -+- vqmovun.s16 d8, q12 -+- vqmovun.s16 d9, q13 -+- vqmovun.s16 d10, q14 -+- vqmovun.s16 d11, q15 -+- -+- vst1.8 {q2-q3}, [r0,:128]! -+- vst1.8 {q4-q5}, [r0,:128], r2 -+- sub r0, #32 -+- bne 1b -++ init_sao_band -++1: subs r12, #1 -++ vld1.8 {q2-q3}, [r1,:128]! -++ sao_band_32 -++ vst1.8 {q2-q3}, [r0,:128]! -++ vld1.8 {q2-q3}, [r1,:128], r3 -++ sub r1, #32 -++ sao_band_32 -++ vst1.8 {q2-q3}, [r0,:128], r2 -++ sub r0, #32 -++ bne 1b -+ -+ bx lr -+ endfunc -+-- -+2.5.0 -+ -+ -+From f93646a97bc885b81759e774d04be3781916a3e7 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Wed, 7 Jan 2015 15:27:38 +0200 -+Subject: [PATCH 6/9] More SAO NEON optimizations Now uses only 8 bit integers -+ for SAO calculations -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 7 +- -+ libavcodec/arm/hevcdsp_sao_neon.S | 664 +++++++++++++++---------------------- -+ 2 files changed, 272 insertions(+), 399 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 6379810..8d6e863 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -225,7 +225,7 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ int x, y; -+ -+ for (x = 0; x < 5; x++) { -+- sao_offset_val[x] = _sao_offset_val[x]; -++ sao_offset_val[x] = _sao_offset_val[edge_idx[x]]; -+ } -+ -+ stride_src /= sizeof(pixel); -+@@ -271,8 +271,9 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ for (x = 0; x < width; x++) { -+ int diff0 = CMP(src[x], src[x + a_stride]); -+ int diff1 = CMP(src[x], src[x + b_stride]); -+- int offset_val = edge_idx[2 + diff0 + diff1]; -+- dst[x] = av_clip_pixel(src[x] + sao_offset_val[offset_val]); -++ int idx = diff0 + diff1; -++ if (idx) -++ dst[x] = av_clip_pixel(src[x] + sao_offset_val[idx+2]); -+ } -+ src += stride_src; -+ dst += stride_dst; -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 8852550..5fc482b 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -1,5 +1,5 @@ -+ /* -+- * Copyright (c) 2014 Seppo Tomperi -++ * Copyright (c) 2014 - 2015 Seppo Tomperi -+ * -+ * This file is part of FFmpeg. -+ * -+@@ -23,6 +23,7 @@ -+ -+ .macro init_sao_band -+ ldr r12, [sp, #0] // offset_table address -++ pld [r1] -+ vld1.8 {q0, q1}, [r12] // offset table -+ ldr r12, [sp, #4] // height -+ .endm -+@@ -30,36 +31,31 @@ -+ .macro sao_band_32 -+ vshr.u8 q8, q2, #3 -+ vshr.u8 q9, q3, #3 -++ vmov.u8 q14, #128 -+ vtbl.8 d16, {q0, q1}, d16 -+ vtbl.8 d17, {q0, q1}, d17 -+ vtbl.8 d18, {q0, q1}, d18 -+ vtbl.8 d19, {q0, q1}, d19 -+- vmovl.u8 q12, d4 -+- vmovl.u8 q13, d5 -+- vmovl.u8 q14, d6 -+- vmovl.u8 q15, d7 -+- vaddw.s8 q12, d16 -+- vaddw.s8 q13, d17 -+- vaddw.s8 q14, d18 -+- vaddw.s8 q15, d19 -+- vqmovun.s16 d4, q12 -+- vqmovun.s16 d5, q13 -+- vqmovun.s16 d6, q14 -+- vqmovun.s16 d7, q15 -++ vadd.s8 q2, q14 -++ vadd.s8 q3, q14 -++ vqadd.s8 q2, q8 -++ vqadd.s8 q3, q9 -++ vsub.s8 q2, q14 -++ vsub.s8 q3, q14 -+ .endm -+ -+ function ff_hevc_sao_band_w8_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #4 -+- vld1.8 {d4}, [r1,:64], r3 -+- vld1.8 {d5}, [r1,:64], r3 -+- vld1.8 {d6}, [r1,:64], r3 -+- vld1.8 {d7}, [r1,:64], r3 -++ vld1.8 {d4}, [r1, :64], r3 -++ vld1.8 {d5}, [r1, :64], r3 -++ vld1.8 {d6}, [r1, :64], r3 -++ vld1.8 {d7}, [r1, :64], r3 -+ sao_band_32 -+- vst1.8 {d4}, [r0,:64], r2 -+- vst1.8 {d5}, [r0,:64], r2 -+- vst1.8 {d6}, [r0,:64], r2 -+- vst1.8 {d7}, [r0,:64], r2 -++ vst1.8 {d4}, [r0, :64], r2 -++ vst1.8 {d5}, [r0, :64], r2 -++ vst1.8 {d6}, [r0, :64], r2 -++ vst1.8 {d7}, [r0, :64], r2 -+ bne 1b -+ -+ bx lr -+@@ -68,11 +64,11 @@ endfunc -+ function ff_hevc_sao_band_w16_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #2 -+- vld1.8 {q2}, [r1,:128], r3 -+- vld1.8 {q3}, [r1,:128], r3 -++ vld1.8 {q2}, [r1, :128], r3 -++ vld1.8 {q3}, [r1, :128], r3 -+ sao_band_32 -+- vst1.8 {q2}, [r0,:128], r2 -+- vst1.8 {q3}, [r0,:128], r2 -++ vst1.8 {q2}, [r0, :128], r2 -++ vst1.8 {q3}, [r0, :128], r2 -+ bne 1b -+ -+ bx lr -+@@ -81,9 +77,9 @@ endfunc -+ function ff_hevc_sao_band_w32_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #1 -+- vld1.8 {q2-q3}, [r1,:128], r3 -++ vld1.8 {q2-q3}, [r1, :128], r3 -+ sao_band_32 -+- vst1.8 {q2-q3}, [r0,:128], r2 -++ vst1.8 {q2-q3}, [r0, :128], r2 -+ bne 1b -+ -+ bx lr -+@@ -92,263 +88,153 @@ endfunc -+ function ff_hevc_sao_band_w64_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #1 -+- vld1.8 {q2-q3}, [r1,:128]! -++ pld [r1, r3] -++ vld1.8 {q2-q3}, [r1, :128]! -+ sao_band_32 -+- vst1.8 {q2-q3}, [r0,:128]! -+- vld1.8 {q2-q3}, [r1,:128], r3 -++ vst1.8 {q2-q3}, [r0, :128]! -++ vld1.8 {q2-q3}, [r1, :128], r3 -+ sub r1, #32 -+ sao_band_32 -+- vst1.8 {q2-q3}, [r0,:128], r2 -++ vst1.8 {q2-q3}, [r0, :128], r2 -+ sub r0, #32 -+ bne 1b -+ -+ bx lr -+ endfunc -+- -++// input -++// a in q0 - q3 -++// c in q4 - q7 -++// b in q8 - q11 -++// offset table in r7 and r5 -++// output in q0 - q3 -++// clobbers q12 - q15 -+ .macro edge_w64_body -+- vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -+- vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -+- vcgt.u8 q13, q5, q1 -+- vcgt.u8 q1, q1, q5 -+- vcgt.u8 q14, q6, q2 -+- vcgt.u8 q2, q2, q6 -+- vcgt.u8 q15, q7, q3 -+- vcgt.u8 q3, q3, q7 -+- -+- vsub.s8 q12, q0, q12 // diff0 -+- vsub.s8 q13, q1, q13 -+- vsub.s8 q14, q2, q14 -+- vsub.s8 q15, q3, q15 -+- -++ vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -++ vcgt.u8 q13, q5, q1 -++ vcgt.u8 q1, q1, q5 -++ vsub.s8 q12, q0, q12 // diff0 -+ vcgt.u8 q0, q4, q8 // c > b -+- vcgt.u8 q8, q8, q4 // b > c -++ vsub.s8 q13, q1, q13 -++ -++ vcgt.u8 q14, q8, q4 // b > c -+ vcgt.u8 q1, q5, q9 -+- vcgt.u8 q9, q9, q5 -+- vcgt.u8 q2, q6, q10 -+- vcgt.u8 q10, q10, q6 -+- vcgt.u8 q3, q7, q11 -+- vcgt.u8 q11, q11, q7 -++ vcgt.u8 q15, q9, q5 -++ vsub.s8 q0, q14, q0 // diff1 -+ -+- vsub.s8 q0, q8, q0 // diff1 -+- vsub.s8 q1, q9, q1 -+- vsub.s8 q2, q10, q2 -+- vsub.s8 q3, q11, q3 -++ vsub.s8 q1, q15, q1 -+ -+- vadd.s8 q0, q12 //diff0 + diff1 -+- vadd.s8 q1, q13 -+- vadd.s8 q2, q14 -+- vadd.s8 q3, q15 -+- -+- vdup.s8 q9, r6 // 3 to all elements -+- sub r6, #1 -+- -+- vclt.s8 q12, q0, #0 // diff0 + diff1 < 0 -+- vclt.s8 q13, q1, #0 -+- vclt.s8 q14, q2, #0 -+- vclt.s8 q15, q3, #0 -+- -+- vadd.s8 q8, q0, q9 // diff0 + diff1 + 3 -+- vadd.s8 q10, q1, q9 -+- vand.8 q12, q8, q12 // if (diff0 + diff1 < 0) then (diff0 + diff1 + 3) else 0 -+- vand.8 q13, q10, q13 -+- vadd.s8 q8, q2, q9 -+- vadd.s8 q10, q3, q9 -+- vand.8 q14, q8, q14 -+- vand.8 q15, q10, q15 -+- -+- vdup.s8 q9, r6 // 2 to all elements -+- add r6, #1 -+- -+- vcgt.s8 q10, q0, #0 // diff0 + diff1 > 0 -+- vadd.s8 q8, q0, q9 // diff0 + diff1 + 2 -+- vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vcgt.s8 q10, q1, #0 -+- vadd.s8 q0, q11, q12 // offset_idx -+- -+- vadd.s8 q8, q1, q9 // diff0 + diff1 + 2 -+- vcgt.s8 q12, q2, #0 -+- vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vadd.s8 q8, q2, q9 // diff0 + diff1 + 2 -+- vadd.s8 q1, q11, q13 -+- -+- vand.8 q11, q8, q12 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vcgt.s8 q10, q3, #0 -+- vadd.s8 q2, q11, q14 -+- -+- vadd.s8 q8, q3, q9 // diff0 + diff1 + 2 -+- vmov.32 d18[0], r7 // load offset table from general registers -+- vand.8 q11, q8, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vmov.32 d18[1], r5 // load rest of offset table -+- vadd.s8 q3, q11, q15 -+- -+- vtbl.8 d0, {d18}, d0 -+- vtbl.8 d1, {d18}, d1 -+- vtbl.8 d2, {d18}, d2 -+- vtbl.8 d3, {d18}, d3 -+- vtbl.8 d4, {d18}, d4 -+- vtbl.8 d5, {d18}, d5 -+- vtbl.8 d6, {d18}, d6 -+- vtbl.8 d7, {d18}, d7 -+- -+- vmovl.u8 q8, d8 -+- vmovl.u8 q9, d9 -+- vmovl.u8 q10, d10 -+- vmovl.u8 q11, d11 -+- vmovl.u8 q12, d12 -+- vmovl.u8 q13, d13 -+- vmovl.u8 q14, d14 -+- vmovl.u8 q15, d15 -+- -+- vaddw.s8 q8, d0 -+- vaddw.s8 q9, d1 -+- vaddw.s8 q10, d2 -+- vaddw.s8 q11, d3 -+- vaddw.s8 q12, d4 -+- vaddw.s8 q13, d5 -+- vaddw.s8 q14, d6 -+- vaddw.s8 q15, d7 -+- -+- vqmovun.s16 d0, q8 -+- vqmovun.s16 d1, q9 -+- vqmovun.s16 d2, q10 -+- vqmovun.s16 d3, q11 -+- vqmovun.s16 d4, q12 -+- vqmovun.s16 d5, q13 -+- vqmovun.s16 d6, q14 -+- vqmovun.s16 d7, q15 -+- -+- vstm r0, {q0-q3} -+- add r0, r2 -+-.endm -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -+ -+-.macro edge_w32_body -+- vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -+- vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -+- vcgt.u8 q13, q5, q1 -+- vcgt.u8 q1, q1, q5 -++ vcgt.u8 q14, q6, q2 -++ vcgt.u8 q2, q2, q6 -++ vcgt.u8 q15, q7, q3 -++ vcgt.u8 q3, q3, q7 -+ -+- vsub.s8 q12, q0, q12 // diff0 -+- vcgt.u8 q0, q4, q8 // c > b -+- vsub.s8 q13, q1, q13 // diff0 part 2 -++ vsub.s8 q14, q2, q14 -++ vcgt.u8 q2, q6, q10 -++ vsub.s8 q15, q3, q15 -+ -+- vcgt.u8 q6, q8, q4 // b > c -+- vcgt.u8 q1, q5, q9 -+- vcgt.u8 q7, q9, q5 -++ vcgt.u8 q12, q10, q6 -++ vcgt.u8 q3, q7, q11 -++ vcgt.u8 q13, q11, q7 -++ vsub.s8 q2, q12, q2 -++ vsub.s8 q3, q13, q3 -+ -+- vsub.s8 q0, q6, q0 // diff1 -+- vsub.s8 q1, q7, q1 // diff1 part 2 -+- vadd.s8 q0, q12 //diff0 + diff1 -++ vmov.s8 q13, #2 // 2 to all elements -+ -+- vdup.s8 q7, r6 // 3 to all elements -+- sub r6, #1 -+- vadd.s8 q1, q13 -++ vadd.s8 q2, q14 -++ vadd.s8 q3, q15 -++ -++ vmov.32 d24[0], r4 // load offset table from general registers -++ vmov.32 d24[1], r5 // load rest of offset table -+ -+- vclt.s8 q12, q0, #0 // diff0 + diff1 < 0 -+- vclt.s8 q13, q1, #0 -+- -+- vadd.s8 q6, q0, q7 // diff0 + diff1 + 3 -+- vadd.s8 q10, q1, q7 -+- vdup.s8 q7, r6 // 2 to all elements -+- add r6, #1 -+- vand.8 q12, q6, q12 // if (diff0 + diff1 < 0) then (diff0 + diff1 + 3) else 0 -+- vand.8 q13, q10, q13 -+- -+- -+- vcgt.s8 q10, q0, #0 // diff0 + diff1 > 0 -+- vadd.s8 q6, q0, q7 // diff0 + diff1 + 2 -+- vand.8 q11, q6, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vcgt.s8 q10, q1, #0 -+- vadd.s8 q0, q11, q12 // offset_idx -+- -+- vadd.s8 q6, q1, q7 // diff0 + diff1 + 2 -+- vmov.32 d14[0], r7 // load offset table from general registers -+- vand.8 q11, q6, q10 // if (diff0 + diff1 > 0) then (diff0 + diff1 + 2) else 0 -+- vmov.32 d14[1], r5 // load rest of offset table -+- vadd.s8 q1, q11, q13 -+- -+- vtbl.8 d0, {d14}, d0 -+- vtbl.8 d1, {d14}, d1 -+- vtbl.8 d2, {d14}, d2 -+- vtbl.8 d3, {d14}, d3 -+- -+- vmovl.u8 q6, d8 -+- vmovl.u8 q7, d9 -+- vmovl.u8 q10, d10 -+- vmovl.u8 q11, d11 -+- -+- vaddw.s8 q6, d0 -+- vaddw.s8 q7, d1 -+- vaddw.s8 q10, d2 -+- vaddw.s8 q11, d3 -+- -+- vqmovun.s16 d0, q6 -+- vqmovun.s16 d1, q7 -+- vqmovun.s16 d2, q10 -+- vqmovun.s16 d3, q11 -+- -+- vstm r0, {q0-q1} -+- add r0, r2 -++ vadd.s8 q0, q13 -++ vadd.s8 q1, q13 -++ vadd.s8 q2, q13 -++ vadd.s8 q3, q13 -++ -++ vmov.u8 q15, #128 // s8 #-128 -++ vtbl.8 d0, {d24}, d0 -++ vtbl.8 d1, {d24}, d1 -++ vtbl.8 d2, {d24}, d2 -++ vtbl.8 d3, {d24}, d3 -++ vtbl.8 d4, {d24}, d4 -++ vtbl.8 d5, {d24}, d5 -++ vtbl.8 d6, {d24}, d6 -++ vtbl.8 d7, {d24}, d7 -++ -++ vadd.s8 q12, q4, q15 -++ vadd.s8 q13, q5, q15 -++ vadd.s8 q14, q6, q15 -++ vadd.s8 q15, q7, q15 -++ vqadd.s8 q12, q0 -++ vqadd.s8 q15, q3 -++ vmov.u8 q3, #128 // s8 #-128 -++ vqadd.s8 q13, q1 -++ vqadd.s8 q14, q2 -++ vsub.s8 q0, q12, q3 -++ vsub.s8 q1, q13, q3 -++ vsub.s8 q2, q14, q3 -++ vsub.s8 q3, q15, q3 -++ vst1.8 {q0-q1}, [r0, :128]! -++ vst1.8 {q2-q3}, [r0, :128], r2 -++ sub r0, #32 -+ .endm -+ -+-function ff_hevc_sao_edge_eo0_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -++.macro init_edge_64 -++ push {r4-r5} -++ ldr r12, [sp, #8] // height -++ ldr r5, [sp, #12] // sao_offset_val_table -++ ldr r4, [r5] -+ add r5, #4 -+ ldr r5, [r5] -++.endm -++ -++function ff_hevc_sao_edge_eo0_w64_neon_8, export=1 -++ init_edge_64 -+ vpush {d8-d15} -+ sub r1, #8 -+-1: subs r4, #1 -+- vld1.64 {q10-q11}, [r1]! -+- vld1.64 {q12-q13}, [r1]! -+- vld1.64 {q14}, [r1], r3 -+- sub r1, #64 -++1: subs r12, #1 -++ vld1.64 {d7}, [r1, :64]! -++ vld1.64 {q4-q5}, [r1, :128]! // load c -++ vld1.64 {q6-q7}, [r1, :128]! -++ vld1.64 {d24}, [r1, :64], r3 -++ sub r1, #72 -+ // load a -+- vext.8 q0, q10, q11, #7 -+- vext.8 q1, q11, q12, #7 -+- vext.8 q2, q12, q13, #7 -+- vext.8 q3, q13, q14, #7 -+- // load c -+- vext.8 q4, q10, q11, #8 -+- vext.8 q5, q11, q12, #8 -+- vext.8 q6, q12, q13, #8 -+- vext.8 q7, q13, q14, #8 -++ vext.8 q0, q3, q4, #15 -++ vext.8 q1, q4, q5, #15 -++ vext.8 q2, q5, q6, #15 -++ vext.8 q3, q6, q7, #15 -+ // load b -+- vext.8 q8, q10, q11, #9 -+- vext.8 q9, q11, q12, #9 -+- vext.8 q10, q12, q13, #9 -+- vext.8 q11, q13, q14, #9 -++ vext.8 q8, q4, q5, #1 -++ vext.8 q9, q5, q6, #1 -++ vext.8 q10, q6, q7, #1 -++ vext.8 q11, q7, q12, #1 -+ edge_w64_body -+ bne 1b -+ vpop {d8-d15} -+- pop {r4-r8} -++ pop {r4-r5} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -++ init_edge_64 -+ vpush {d8-d15} -+ sub r1, r3 -+ // load a -+- vld1.8 {q0-q1}, [r1]! -+- vld1.8 {q2-q3}, [r1], r3 -++ vld1.8 {q0-q1}, [r1, :128]! -++ vld1.8 {q2-q3}, [r1, :128], r3 -+ sub r1, #32 -+-1: subs r4, #1 -+ // load c -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -++ vld1.8 {q4-q5}, [r1, :128]! -++ vld1.8 {q6-q7}, [r1, :128], r3 -+ sub r1, #32 -++1: subs r12, #1 -+ // load b -+- vld1.8 {q8-q9}, [r1]! -+- vld1.8 {q10-q11}, [r1] -++ vld1.8 {q8-q9}, [r1, :128]! -++ vld1.8 {q10-q11}, [r1, :128], r3 -+ sub r1, #32 -+ edge_w64_body -+ // copy c to a -+@@ -356,20 +242,19 @@ function ff_hevc_sao_edge_eo1_w64_neon_8, export=1 -+ vmov.64 q1, q5 -+ vmov.64 q2, q6 -+ vmov.64 q3, q7 -++ // copy b to c -++ vmov.64 q4, q8 -++ vmov.64 q5, q9 -++ vmov.64 q6, q10 -++ vmov.64 q7, q11 -+ bne 1b -+ vpop {d8-d15} -+- pop {r4-r8} -++ pop {r4-r5} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo2_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -++ init_edge_64 -+ vpush {d8-d15} -+ 1: sub r1, r3 -+ // load a -+@@ -379,10 +264,10 @@ function ff_hevc_sao_edge_eo2_w64_neon_8, export=1 -+ vld1.8 {q0-q1}, [r1]! -+ vld1.8 {q2-q3}, [r1], r3 -+ sub r1, #31 -+- subs r4, #1 -++ subs r12, #1 -+ // load c -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -++ vld1.8 {q4-q5}, [r1, :128]! -++ vld1.8 {q6-q7}, [r1, :128], r3 -+ sub r1, #32 -+ // load b -+ add r1, #1 -+@@ -390,25 +275,14 @@ function ff_hevc_sao_edge_eo2_w64_neon_8, export=1 -+ vld1.8 {q10-q11}, [r1] -+ sub r1, #33 -+ edge_w64_body -+- // copy c to a -+- vmov.64 q0, q4 -+- vmov.64 q1, q5 -+- vmov.64 q2, q6 -+- vmov.64 q3, q7 -+ bne 1b -+ vpop {d8-d15} -+- pop {r4-r8} -++ pop {r4-r5} -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -++ init_edge_64 -+ vpush {d8-d15} -+ 1: sub r1, r3 -+ // load a -+@@ -418,10 +292,10 @@ function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -+ vld1.8 {q0-q1}, [r1]! -+ vld1.8 {q2-q3}, [r1], r3 -+ sub r1, #33 -+- subs r4, #1 -++ subs r12, #1 -+ // load c -+- vld1.8 {q4-q5}, [r1]! -+- vld1.8 {q6-q7}, [r1], r3 -++ vld1.8 {q4-q5}, [r1, :128]! -++ vld1.8 {q6-q7}, [r1, :128], r3 -+ sub r1, #32 -+ // load b -+ sub r1, #1 -+@@ -429,178 +303,176 @@ function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -+ vld1.8 {q10-q11}, [r1] -+ sub r1, #31 -+ edge_w64_body -+- // copy c to a -+- vmov.64 q0, q4 -+- vmov.64 q1, q5 -+- vmov.64 q2, q6 -+- vmov.64 q3, q7 -+ bne 1b -+ vpop {d8-d15} -+- pop {r4-r8} -++ pop {r4-r5} -+ bx lr -+ endfunc -+ -++// inputs: -++// a in q0, q1 -++// c in q2, q3 -++// b in q8, q9 -++// offset table in d31 -++// clobbered registers q0, q1, q10, q11, q12, q13 -++// output q0, q1 -++.macro edge_w32_body -++ vcgt.u8 q12, q2, q0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 q0, q0, q2 // a > c -> -1 , otherwise 0 -++ vcgt.u8 q13, q3, q1 -++ vcgt.u8 q1, q1, q3 -++ -++ vsub.s8 q12, q0, q12 // diff0 -++ vcgt.u8 q0, q2, q8 // c > b -++ vsub.s8 q13, q1, q13 // diff0 part 2 -++ -++ vcgt.u8 q10, q8, q2 // b > c -++ vcgt.u8 q1, q3, q9 -++ vcgt.u8 q11, q9, q3 -++ -++ vsub.s8 q0, q10, q0 // diff1 -++ -++ vmov.s8 q10, #2 // 2 to all elements -++ vsub.s8 q1, q11, q1 // diff1 part 2 -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ -++ vadd.s8 q0, q10 -++ vadd.s8 q1, q10 -++ -++ vmov.u8 q10, #128 -++ vtbl.8 d0, {d31}, d0 -++ vtbl.8 d1, {d31}, d1 -++ vtbl.8 d2, {d31}, d2 -++ vtbl.8 d3, {d31}, d3 -++ -++ vadd.s8 q11, q2, q10 -++ vadd.s8 q12, q3, q10 -++ vqadd.s8 q11, q0 -++ vqadd.s8 q12, q1 -++ vsub.s8 q0, q11, q10 -++ vsub.s8 q1, q12, q10 -++ vst1.8 {q0-q1}, [r0, :128], r2 -++.endm -++ -++.macro init_edge_32 -++ ldr r12, [sp, #4] // sao_offset_val_table -++ vld1.32 {d31}, [r12] -++ ldr r12, [sp] // height -++.endm -++ -+ function ff_hevc_sao_edge_eo0_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -+- vpush {d8-d15} -+- sub r1, #8 // load 8 extra bytes -+-1: subs r4, #1 -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 // only first 9 bytes are used -+- sub r1, #32 -++ init_edge_32 -++ sub r1, #4 // load 4 extra bytes -++1: subs r12, #1 -++ vld1.32 d3[1], [r1]! -++ vld1.8 {q2-q3}, [r1, :128]! // c -++ vld1.32 d20[0], [r1], r3 -++ sub r1, #36 -+ // a -+- vext.8 q0, q10, q11, #7 -+- vext.8 q1, q11, q12, #7 -+- // c -+- vext.8 q4, q10, q11, #8 -+- vext.8 q5, q11, q12, #8 -++ vext.8 q0, q1, q2, #15 -++ vext.8 q1, q2, q3, #15 -+ // b -+- vext.8 q8, q10, q11, #9 -+- vext.8 q9, q11, q12, #9 -++ vext.8 q8, q2, q3, #1 -++ vext.8 q9, q3, q10, #1 -+ edge_w32_body -+- bne 1b -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ bne 1b -++ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo1_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -+- vpush {d8-d15} -++ init_edge_32 -+ // load a -+ sub r1, r3 -+- vld1.8 {q0-q1}, [r1], r3 -++ vld1.8 {q0-q1}, [r1, :128], r3 -+ // load c -+- vld1.8 {q4-q5}, [r1], r3 -+-1: subs r4, #1 -++ vld1.8 {q2-q3}, [r1, :128], r3 -++1: subs r12, #1 -+ // load b -+- vld1.8 {q8-q9}, [r1], r3 -++ vld1.8 {q8-q9}, [r1, :128], r3 -+ edge_w32_body -+ // inputs for next loop iteration -+ // a -+- vmov.64 q0, q4 -+- vmov.64 q1, q5 -++ vmov.64 q0, q2 -++ vmov.64 q1, q3 -+ // c -+- vmov.64 q4, q8 -+- vmov.64 q5, q9 -+- bne 1b -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ vmov.64 q2, q8 -++ vmov.64 q3, q9 -++ bne 1b -++ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo2_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- ldr r5, [r5] -+- vpush {d8-d15} -++ init_edge_32 -++ vpush {d8-d15} -+ // load a -+ sub r1, r3 -+- sub r1, #8 -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -++ sub r1, #8 -++ vld1.8 {q10-q11}, [r1, :64]! -++ vld1.8 {d24}, [r1, :64], r3 -++ sub r1, #32 -+ vext.8 q0, q10, q11, #7 -+ vext.8 q1, q11, q12, #7 -+ // load c -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -+- vext.8 q4, q10, q11, #8 -+- vext.8 q5, q11, q12, #8 -+- vext.8 q2, q10, q11, #7 -+-1: subs r4, #1 -++ vld1.8 {d9}, [r1, :64]! -++ vld1.8 {q2-q3}, [r1, :64], r3 -++ sub r1, #8 -++ vext.8 q4, q4, q2, #15 -++1: subs r12, #1 -+ // load b -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -++ vld1.8 {q10-q11}, [r1, :64]! -++ vld1.8 {q12}, [r1, :64], r3 -++ sub r1, #32 -+ vext.8 q8, q10, q11, #9 -+ vext.8 q9, q11, q12, #9 -+- vext.8 q14, q10, q11, #8 -+- vext.8 q15, q11, q12, #8 -+- vext.8 q3, q10, q11, #7 -++ vext.8 q6, q10, q11, #8 -++ vext.8 q7, q11, q12, #8 -++ vext.8 q5, q10, q11, #7 -+ edge_w32_body -+ // inputs for next loop iteration -+ // a -+- vmov.8 q0, q2 -+- vext.8 q1, q4, q5, #15 -++ vmov.8 q0, q4 -++ vext.8 q1, q2, q3, #15 -+ // c -+- vmov.8 q4, q14 -+- vmov.8 q5, q15 -+- vmov.8 q2, q3 -+- bne 1b -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ vmov.8 q2, q6 -++ vmov.8 q3, q7 -++ vmov.8 q4, q5 -++ bne 1b -++ vpop {d8-d15} -++ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo3_w32_neon_8, export=1 -+- push {r4-r8} -+- ldr r4, [sp, #20] // height -+- ldr r5, [sp, #24] // sao_offset_val_table -+- ldr r6, =0x03 -+- ldr r7, [r5] -+- add r5, #4 -+- sub r1, r3 -+- ldr r5, [r5] -+- sub r1, #8 -+- vpush {d8-d15} -++ init_edge_32 -++ sub r1, r3 -+ // load a -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -+- vext.8 q0, q10, q11, #9 -+- vext.8 q1, q11, q12, #9 -++ vld1.8 {q10-q11}, [r1, :64]! -++ vld1.8 {d24}, [r1, :64], r3 -++ sub r1, #32 -++ vext.8 q0, q10, q11, #1 -++ vext.8 q1, q11, q12, #1 -+ // load c -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -+- vext.8 q4, q10, q11, #8 -+- vext.8 q5, q11, q12, #8 -+- vext.8 q2, q12, q11, #8 -+-1: subs r4, #1 -++ vld1.8 {q2-q3}, [r1, :64]! -++ vld1.8 {d30}, [r1, :64], r3 -++ sub r1, #40 -++1: subs r12, #1 -+ // load b -+- vld1.8 {q10-q11}, [r1] -+- add r1, #32 -+- vld1.8 {q12}, [r1], r3 -+- sub r1, #32 -++ vld1.8 {q10-q11}, [r1, :64]! -++ vld1.8 {q12}, [r1, :64], r3 -++ sub r1, #32 -+ vext.8 q8, q10, q11, #7 -+ vext.8 q9, q11, q12, #7 -+- vext.8 q3, q12, q10, #7 -++ vext.8 q14, q12, q10, #7 -+ edge_w32_body -+ // inputs for next loop iteration -+ // a -+- vext.8 q0, q4, q5, #1 -+- vext.8 q1, q5, q2, #1 -++ vext.8 q0, q2, q3, #1 -++ vext.8 q1, q3, q15, #1 -+ // c -+- vext.8 q4, q8, q9, #1 -+- vext.8 q5, q9, q3, #1 -+- vext.8 q2, q3, q1, #1 -+- bne 1b -+- vpop {d8-d15} -+- pop {r4-r8} -+- bx lr -++ vext.8 q2, q8, q9, #1 -++ vext.8 q3, q9, q14, #1 -++ vext.8 d30, d28, d2, #1 -++ bne 1b -++ bx lr -+ endfunc -+ -+-- -+2.5.0 -+ -+ -+From 016c39d46b86830204a4519590332d2a38f7ee51 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Thu, 8 Jan 2015 09:58:55 +0200 -+Subject: [PATCH 7/9] small optimization to SAO BAND. correct path for -+ bit_depth_template.c -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 2 +- -+ libavcodec/arm/hevcdsp_sao_neon.S | 2 +- -+ 2 files changed, 2 insertions(+), 2 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 8d6e863..385c35d 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -23,7 +23,7 @@ -+ #include "libavcodec/hevcdsp.h" -+ #include "hevcdsp_arm.h" -+ #include "libavcodec/avcodec.h" -+-#include "../bit_depth_template.c" -++#include "libavcodec/bit_depth_template.c" -+ -+ void ff_hevc_v_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+ void ff_hevc_h_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 5fc482b..710b32b 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -26,12 +26,12 @@ -+ pld [r1] -+ vld1.8 {q0, q1}, [r12] // offset table -+ ldr r12, [sp, #4] // height -++ vmov.u8 q14, #128 -+ .endm -+ -+ .macro sao_band_32 -+ vshr.u8 q8, q2, #3 -+ vshr.u8 q9, q3, #3 -+- vmov.u8 q14, #128 -+ vtbl.8 d16, {q0, q1}, d16 -+ vtbl.8 d17, {q0, q1}, d17 -+ vtbl.8 d18, {q0, q1}, d18 -+-- -+2.5.0 -+ -+ -+From 579f1584d688e1ac24fb7d22697e2a7b64f62e8e Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Fri, 9 Jan 2015 10:28:52 +0200 -+Subject: [PATCH 8/9] Added height check for SAO NEON optimizations. Faster SAO -+ band NEON Some reordering to use NEON pipelines more efficiently -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 12 +++- -+ libavcodec/arm/hevcdsp_sao_neon.S | 142 ++++++++++++++++++++++--------------- -+ 2 files changed, 93 insertions(+), 61 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 385c35d..6d0689c 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -176,6 +176,7 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ int8_t offset_table[32] = { 0 }; -+ int k, y, x; -+ int shift = 3; // BIT_DEPTH - 5 -++ int cwidth = 0; -+ -+ stride_src /= sizeof(pixel); -+ stride_dst /= sizeof(pixel); -+@@ -183,7 +184,10 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ for (k = 0; k < 4; k++) -+ offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1]; -+ -+- switch(width){ -++ if (height % 8 == 0) -++ cwidth = width; -++ -++ switch(cwidth){ -+ case 8: -+ ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -+ break; -+@@ -223,15 +227,19 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ pixel *src = (pixel *)_src; -+ int a_stride, b_stride; -+ int x, y; -++ int cwidth = 0; -+ -+ for (x = 0; x < 5; x++) { -+ sao_offset_val[x] = _sao_offset_val[edge_idx[x]]; -+ } -+ -++ if (height % 8 == 0) -++ cwidth = width; -++ -+ stride_src /= sizeof(pixel); -+ stride_dst /= sizeof(pixel); -+ -+- switch (width) { -++ switch (cwidth) { -+ case 32: -+ switch(eo) { -+ case 0: -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 710b32b..08f50b8 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -26,36 +26,59 @@ -+ pld [r1] -+ vld1.8 {q0, q1}, [r12] // offset table -+ ldr r12, [sp, #4] // height -+- vmov.u8 q14, #128 -++ vmov.u8 q3, #128 -+ .endm -+ -+-.macro sao_band_32 -+- vshr.u8 q8, q2, #3 -+- vshr.u8 q9, q3, #3 -+- vtbl.8 d16, {q0, q1}, d16 -+- vtbl.8 d17, {q0, q1}, d17 -+- vtbl.8 d18, {q0, q1}, d18 -+- vtbl.8 d19, {q0, q1}, d19 -+- vadd.s8 q2, q14 -+- vadd.s8 q3, q14 -+- vqadd.s8 q2, q8 -+- vqadd.s8 q3, q9 -+- vsub.s8 q2, q14 -+- vsub.s8 q3, q14 -++// 128 in q3 -++// input q8 - q11 -++// 32 cycles -++.macro sao_band_64 -++ vshr.u8 q12, q8, #3 -++ vshr.u8 q13, q9, #3 -++ vshr.u8 q14, q10, #3 -++ vshr.u8 q15, q11, #3 -++ vtbl.8 d24, {d0, d1, d2, d3}, d24 -++ vadd.s8 q8, q3 -++ vtbl.8 d25, {d0, d1, d2, d3}, d25 -++ vadd.s8 q9, q3 -++ vtbl.8 d26, {d0, d1, d2, d3}, d26 -++ vadd.s8 q10, q3 -++ vtbl.8 d27, {d0, d1, d2, d3}, d27 -++ vadd.s8 q11, q3 -++ vtbl.8 d28, {d0, d1, d2, d3}, d28 -++ vqadd.s8 q8, q12 -++ vtbl.8 d29, {d0, d1, d2, d3}, d29 -++ vqadd.s8 q9, q13 -++ vtbl.8 d30, {d0, d1, d2, d3}, d30 -++ vqadd.s8 q10, q14 -++ vtbl.8 d31, {d0, d1, d2, d3}, d31 -++ vqadd.s8 q11, q15 -++ vsub.s8 q8, q3 -++ vsub.s8 q9, q3 -++ vsub.s8 q10, q3 -++ vsub.s8 q11, q3 -+ .endm -+ -+ function ff_hevc_sao_band_w8_neon_8, export=1 -+ init_sao_band -+-1: subs r12, #4 -+- vld1.8 {d4}, [r1, :64], r3 -+- vld1.8 {d5}, [r1, :64], r3 -+- vld1.8 {d6}, [r1, :64], r3 -+- vld1.8 {d7}, [r1, :64], r3 -+- sao_band_32 -+- vst1.8 {d4}, [r0, :64], r2 -+- vst1.8 {d5}, [r0, :64], r2 -+- vst1.8 {d6}, [r0, :64], r2 -+- vst1.8 {d7}, [r0, :64], r2 -++1: subs r12, #8 -++ vld1.8 {d16}, [r1, :64], r3 -++ vld1.8 {d17}, [r1, :64], r3 -++ vld1.8 {d18}, [r1, :64], r3 -++ vld1.8 {d19}, [r1, :64], r3 -++ vld1.8 {d20}, [r1, :64], r3 -++ vld1.8 {d21}, [r1, :64], r3 -++ vld1.8 {d22}, [r1, :64], r3 -++ vld1.8 {d23}, [r1, :64], r3 -++ sao_band_64 -++ vst1.8 {d16}, [r0, :64], r2 -++ vst1.8 {d17}, [r0, :64], r2 -++ vst1.8 {d18}, [r0, :64], r2 -++ vst1.8 {d19}, [r0, :64], r2 -++ vst1.8 {d20}, [r0, :64], r2 -++ vst1.8 {d21}, [r0, :64], r2 -++ vst1.8 {d22}, [r0, :64], r2 -++ vst1.8 {d23}, [r0, :64], r2 -+ bne 1b -+ -+ bx lr -+@@ -63,12 +86,16 @@ endfunc -+ -+ function ff_hevc_sao_band_w16_neon_8, export=1 -+ init_sao_band -+-1: subs r12, #2 -+- vld1.8 {q2}, [r1, :128], r3 -+- vld1.8 {q3}, [r1, :128], r3 -+- sao_band_32 -+- vst1.8 {q2}, [r0, :128], r2 -+- vst1.8 {q3}, [r0, :128], r2 -++1: subs r12, #4 -++ vld1.8 {q8}, [r1, :128], r3 -++ vld1.8 {q9}, [r1, :128], r3 -++ vld1.8 {q10}, [r1, :128], r3 -++ vld1.8 {q11}, [r1, :128], r3 -++ sao_band_64 -++ vst1.8 {q8}, [r0, :128], r2 -++ vst1.8 {q9}, [r0, :128], r2 -++ vst1.8 {q10}, [r0, :128], r2 -++ vst1.8 {q11}, [r0, :128], r2 -+ bne 1b -+ -+ bx lr -+@@ -76,10 +103,12 @@ endfunc -+ -+ function ff_hevc_sao_band_w32_neon_8, export=1 -+ init_sao_band -+-1: subs r12, #1 -+- vld1.8 {q2-q3}, [r1, :128], r3 -+- sao_band_32 -+- vst1.8 {q2-q3}, [r0, :128], r2 -++1: subs r12, #2 -++ vld1.8 {q8-q9}, [r1, :128], r3 -++ vld1.8 {q10-q11}, [r1, :128], r3 -++ sao_band_64 -++ vst1.8 {q8-q9}, [r0, :128], r2 -++ vst1.8 {q10-q11}, [r0, :128], r2 -+ bne 1b -+ -+ bx lr -+@@ -89,13 +118,12 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #1 -+ pld [r1, r3] -+- vld1.8 {q2-q3}, [r1, :128]! -+- sao_band_32 -+- vst1.8 {q2-q3}, [r0, :128]! -+- vld1.8 {q2-q3}, [r1, :128], r3 -++ vld1.8 {q8-q9}, [r1, :128]! -++ vld1.8 {q10-q11}, [r1, :128], r3 -+ sub r1, #32 -+- sao_band_32 -+- vst1.8 {q2-q3}, [r0, :128], r2 -++ sao_band_64 -++ vst1.8 {q8-q9}, [r0, :128]! -++ vst1.8 {q10-q11}, [r0, :128], r2 -+ sub r0, #32 -+ bne 1b -+ -+@@ -121,7 +149,6 @@ endfunc -+ vcgt.u8 q1, q5, q9 -+ vcgt.u8 q15, q9, q5 -+ vsub.s8 q0, q14, q0 // diff1 -+- -+ vsub.s8 q1, q15, q1 -+ -+ vadd.s8 q0, q12 //diff0 + diff1 -+@@ -157,27 +184,25 @@ endfunc -+ -+ vmov.u8 q15, #128 // s8 #-128 -+ vtbl.8 d0, {d24}, d0 -++ vadd.s8 q13, q4, q15 -+ vtbl.8 d1, {d24}, d1 -++ vadd.s8 q14, q5, q15 -+ vtbl.8 d2, {d24}, d2 -++ vqadd.s8 q0, q13 -+ vtbl.8 d3, {d24}, d3 -++ vqadd.s8 q1, q14 -+ vtbl.8 d4, {d24}, d4 -++ vadd.s8 q13, q6, q15 -+ vtbl.8 d5, {d24}, d5 -++ vadd.s8 q14, q7, q15 -+ vtbl.8 d6, {d24}, d6 -++ vqadd.s8 q2, q13 -+ vtbl.8 d7, {d24}, d7 -+- -+- vadd.s8 q12, q4, q15 -+- vadd.s8 q13, q5, q15 -+- vadd.s8 q14, q6, q15 -+- vadd.s8 q15, q7, q15 -+- vqadd.s8 q12, q0 -+- vqadd.s8 q15, q3 -+- vmov.u8 q3, #128 // s8 #-128 -+- vqadd.s8 q13, q1 -+- vqadd.s8 q14, q2 -+- vsub.s8 q0, q12, q3 -+- vsub.s8 q1, q13, q3 -+- vsub.s8 q2, q14, q3 -+- vsub.s8 q3, q15, q3 -++ vqadd.s8 q3, q14 -++ vsub.s8 q0, q15 -++ vsub.s8 q1, q15 -++ vsub.s8 q2, q15 -++ vsub.s8 q3, q15 -+ vst1.8 {q0-q1}, [r0, :128]! -+ vst1.8 {q2-q3}, [r0, :128], r2 -+ sub r0, #32 -+@@ -342,13 +367,12 @@ endfunc -+ -+ vmov.u8 q10, #128 -+ vtbl.8 d0, {d31}, d0 -++ vadd.s8 q11, q2, q10 -+ vtbl.8 d1, {d31}, d1 -++ vadd.s8 q12, q3, q10 -+ vtbl.8 d2, {d31}, d2 -++ vqadd.s8 q11, q0 -+ vtbl.8 d3, {d31}, d3 -+- -+- vadd.s8 q11, q2, q10 -+- vadd.s8 q12, q3, q10 -+- vqadd.s8 q11, q0 -+ vqadd.s8 q12, q1 -+ vsub.s8 q0, q11, q10 -+ vsub.s8 q1, q12, q10 -+-- -+2.5.0 -+ -+ -+From 026bac1824e4936e948e6b1efec82868c520ea66 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Mon, 2 Feb 2015 16:08:27 +0200 -+Subject: [PATCH 9/9] Further SAO NEON optimisations -+ -+--- -+ libavcodec/arm/hevcdsp_init_neon.c | 16 +-- -+ libavcodec/arm/hevcdsp_sao_neon.S | 224 +++++++++++++++++++------------------ -+ 2 files changed, 124 insertions(+), 116 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 6d0689c..e5da7e9 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -45,10 +45,10 @@ void ff_hevc_transform_add_16x16_neon_8(uint8_t *_dst, int16_t *coeffs, -+ void ff_hevc_transform_add_32x32_neon_8(uint8_t *_dst, int16_t *coeffs, -+ ptrdiff_t stride); -+ -+-void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -+-void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -+-void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -+-void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int8_t * offset_table, int height); -++void ff_hevc_sao_band_w8_neon_8(uint8_t *_dst, uint8_t *_src, int8_t * offset_table, ptrdiff_t stride_src, ptrdiff_t stride_dst, int height); -++void ff_hevc_sao_band_w16_neon_8(uint8_t *_dst, uint8_t *_src, int8_t * offset_table, ptrdiff_t stride_src, ptrdiff_t stride_dst, int height); -++void ff_hevc_sao_band_w32_neon_8(uint8_t *_dst, uint8_t *_src, int8_t * offset_table, ptrdiff_t stride_src, ptrdiff_t stride_dst, int height); -++void ff_hevc_sao_band_w64_neon_8(uint8_t *_dst, uint8_t *_src, int8_t * offset_table, ptrdiff_t stride_src, ptrdiff_t stride_dst, int height); -+ -+ void ff_hevc_sao_edge_eo0_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+ void ff_hevc_sao_edge_eo1_w32_neon_8(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int height, int8_t *sao_offset_table); -+@@ -189,16 +189,16 @@ static void ff_hevc_sao_band_neon_wrapper(uint8_t *_dst, uint8_t *_src, ptrdiff_ -+ -+ switch(cwidth){ -+ case 8: -+- ff_hevc_sao_band_w8_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -++ ff_hevc_sao_band_w8_neon_8(_dst, _src, offset_table, stride_src, stride_dst, height); -+ break; -+ case 16: -+- ff_hevc_sao_band_w16_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -++ ff_hevc_sao_band_w16_neon_8(_dst, _src, offset_table, stride_src, stride_dst, height); -+ break; -+ case 32: -+- ff_hevc_sao_band_w32_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -++ ff_hevc_sao_band_w32_neon_8(_dst, _src, offset_table, stride_src, stride_dst, height); -+ break; -+ case 64: -+- ff_hevc_sao_band_w64_neon_8(_dst, _src, stride_dst, stride_src, offset_table, height); -++ ff_hevc_sao_band_w64_neon_8(_dst, _src, offset_table, stride_src, stride_dst, height); -+ break; -+ default: -+ for (y = 0; y < height; y++) { -+diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S -+index 08f50b8..9c7808d 100644 -+--- a/libavcodec/arm/hevcdsp_sao_neon.S -++++ b/libavcodec/arm/hevcdsp_sao_neon.S -+@@ -22,21 +22,16 @@ -+ #include "neon.S" -+ -+ .macro init_sao_band -+- ldr r12, [sp, #0] // offset_table address -+ pld [r1] -+- vld1.8 {q0, q1}, [r12] // offset table -+- ldr r12, [sp, #4] // height -++ vld1.8 {q0, q1}, [r2] // offset table -++ ldr r2, [sp, #0] // stride_dst -++ ldr r12, [sp, #4] // height -+ vmov.u8 q3, #128 -+ .endm -+ -+ // 128 in q3 -+ // input q8 - q11 -+-// 32 cycles -+ .macro sao_band_64 -+- vshr.u8 q12, q8, #3 -+- vshr.u8 q13, q9, #3 -+- vshr.u8 q14, q10, #3 -+- vshr.u8 q15, q11, #3 -+ vtbl.8 d24, {d0, d1, d2, d3}, d24 -+ vadd.s8 q8, q3 -+ vtbl.8 d25, {d0, d1, d2, d3}, d25 -+@@ -52,8 +47,8 @@ -+ vtbl.8 d30, {d0, d1, d2, d3}, d30 -+ vqadd.s8 q10, q14 -+ vtbl.8 d31, {d0, d1, d2, d3}, d31 -+- vqadd.s8 q11, q15 -+ vsub.s8 q8, q3 -++ vqadd.s8 q11, q15 -+ vsub.s8 q9, q3 -+ vsub.s8 q10, q3 -+ vsub.s8 q11, q3 -+@@ -64,12 +59,16 @@ function ff_hevc_sao_band_w8_neon_8, export=1 -+ 1: subs r12, #8 -+ vld1.8 {d16}, [r1, :64], r3 -+ vld1.8 {d17}, [r1, :64], r3 -++ vshr.u8 q12, q8, #3 -+ vld1.8 {d18}, [r1, :64], r3 -+ vld1.8 {d19}, [r1, :64], r3 -++ vshr.u8 q13, q9, #3 -+ vld1.8 {d20}, [r1, :64], r3 -+ vld1.8 {d21}, [r1, :64], r3 -++ vshr.u8 q14, q10, #3 -+ vld1.8 {d22}, [r1, :64], r3 -+ vld1.8 {d23}, [r1, :64], r3 -++ vshr.u8 q15, q11, #3 -+ sao_band_64 -+ vst1.8 {d16}, [r0, :64], r2 -+ vst1.8 {d17}, [r0, :64], r2 -+@@ -88,9 +87,13 @@ function ff_hevc_sao_band_w16_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #4 -+ vld1.8 {q8}, [r1, :128], r3 -++ vshr.u8 q12, q8, #3 -+ vld1.8 {q9}, [r1, :128], r3 -++ vshr.u8 q13, q9, #3 -+ vld1.8 {q10}, [r1, :128], r3 -++ vshr.u8 q14, q10, #3 -+ vld1.8 {q11}, [r1, :128], r3 -++ vshr.u8 q15, q11, #3 -+ sao_band_64 -+ vst1.8 {q8}, [r0, :128], r2 -+ vst1.8 {q9}, [r0, :128], r2 -+@@ -105,7 +108,11 @@ function ff_hevc_sao_band_w32_neon_8, export=1 -+ init_sao_band -+ 1: subs r12, #2 -+ vld1.8 {q8-q9}, [r1, :128], r3 -++ vshr.u8 q12, q8, #3 -++ vshr.u8 q13, q9, #3 -+ vld1.8 {q10-q11}, [r1, :128], r3 -++ vshr.u8 q14, q10, #3 -++ vshr.u8 q15, q11, #3 -+ sao_band_64 -+ vst1.8 {q8-q9}, [r0, :128], r2 -+ vst1.8 {q10-q11}, [r0, :128], r2 -+@@ -119,7 +126,11 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ 1: subs r12, #1 -+ pld [r1, r3] -+ vld1.8 {q8-q9}, [r1, :128]! -++ vshr.u8 q12, q8, #3 -++ vshr.u8 q13, q9, #3 -+ vld1.8 {q10-q11}, [r1, :128], r3 -++ vshr.u8 q14, q10, #3 -++ vshr.u8 q15, q11, #3 -+ sub r1, #32 -+ sao_band_64 -+ vst1.8 {q8-q9}, [r0, :128]! -+@@ -129,51 +140,18 @@ function ff_hevc_sao_band_w64_neon_8, export=1 -+ -+ bx lr -+ endfunc -+-// input -+-// a in q0 - q3 -+-// c in q4 - q7 -+-// b in q8 - q11 -+-// offset table in r7 and r5 -+-// output in q0 - q3 -+-// clobbers q12 - q15 -+-.macro edge_w64_body -+- vcgt.u8 q12, q4, q0 // c > a -> -1 , otherwise 0 -+- vcgt.u8 q0, q0, q4 // a > c -> -1 , otherwise 0 -+- vcgt.u8 q13, q5, q1 -+- vcgt.u8 q1, q1, q5 -+- vsub.s8 q12, q0, q12 // diff0 -+- vcgt.u8 q0, q4, q8 // c > b -+- vsub.s8 q13, q1, q13 -+- -+- vcgt.u8 q14, q8, q4 // b > c -+- vcgt.u8 q1, q5, q9 -+- vcgt.u8 q15, q9, q5 -+- vsub.s8 q0, q14, q0 // diff1 -+- vsub.s8 q1, q15, q1 -+ -+- vadd.s8 q0, q12 //diff0 + diff1 -+- vadd.s8 q1, q13 -+- -+- vcgt.u8 q14, q6, q2 -+- vcgt.u8 q2, q2, q6 -+- vcgt.u8 q15, q7, q3 -+- vcgt.u8 q3, q3, q7 -+- -+- vsub.s8 q14, q2, q14 -+- vcgt.u8 q2, q6, q10 -+- vsub.s8 q15, q3, q15 -+- -+- vcgt.u8 q12, q10, q6 -+- vcgt.u8 q3, q7, q11 -+- vcgt.u8 q13, q11, q7 -+- vsub.s8 q2, q12, q2 -+- vsub.s8 q3, q13, q3 -++.macro diff32 out0, out1, tmp0, tmp1, in0, in1, in2, in3 -++ vcgt.u8 \out0, \in2, \in0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 \tmp0, \in0, \in2 // a > c -> -1 , otherwise 0 -++ vcgt.u8 \out1, \in3, \in1 // c > a -> -1 , otherwise 0 part 2 -++ vcgt.u8 \tmp1, \in1, \in3 // a > c -> -1 , otherwise 0 part 2 -++ vsub.s8 \out0, \tmp0, \out0 // diff0 -++ vsub.s8 \out1, \tmp1, \out1 // diff0 part 2 -++.endm -+ -++.macro table64 -+ vmov.s8 q13, #2 // 2 to all elements -+- -+- vadd.s8 q2, q14 -+- vadd.s8 q3, q15 -+- -+ vmov.32 d24[0], r4 // load offset table from general registers -+ vmov.32 d24[1], r5 // load rest of offset table -+ -+@@ -208,6 +186,28 @@ endfunc -+ sub r0, #32 -+ .endm -+ -++// input -++// a in q0 - q3 -++// c in q4 - q7 -++// b in q8 - q11 -++// offset table in r7 and r5 -++// output in q0 - q3 -++// clobbers q12 - q15 -++.macro edge_w64_body -++ diff32 q12, q13, q0, q1, q0, q1, q4, q5 -++ diff32 q0, q1, q14, q15, q8, q9, q4, q5 -++ -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ -++ diff32 q14, q15, q2, q3, q2, q3, q6, q7 -++ diff32 q2, q3, q12, q13, q10, q11, q6, q7 -++ -++ vadd.s8 q2, q14 -++ vadd.s8 q3, q15 -++ table64 -++.endm -++ -+ .macro init_edge_64 -+ push {r4-r5} -+ ldr r12, [sp, #8] // height -+@@ -334,38 +334,23 @@ function ff_hevc_sao_edge_eo3_w64_neon_8, export=1 -+ bx lr -+ endfunc -+ -+-// inputs: -+-// a in q0, q1 -+-// c in q2, q3 -+-// b in q8, q9 -+-// offset table in d31 -+-// clobbered registers q0, q1, q10, q11, q12, q13 -+-// output q0, q1 -+-.macro edge_w32_body -+- vcgt.u8 q12, q2, q0 // c > a -> -1 , otherwise 0 -+- vcgt.u8 q0, q0, q2 // a > c -> -1 , otherwise 0 -+- vcgt.u8 q13, q3, q1 -+- vcgt.u8 q1, q1, q3 -+- -+- vsub.s8 q12, q0, q12 // diff0 -+- vcgt.u8 q0, q2, q8 // c > b -+- vsub.s8 q13, q1, q13 // diff0 part 2 -+- -+- vcgt.u8 q10, q8, q2 // b > c -+- vcgt.u8 q1, q3, q9 -+- vcgt.u8 q11, q9, q3 -+- -+- vsub.s8 q0, q10, q0 // diff1 -+- -+- vmov.s8 q10, #2 // 2 to all elements -+- vsub.s8 q1, q11, q1 // diff1 part 2 -+- vadd.s8 q0, q12 //diff0 + diff1 -+- vadd.s8 q1, q13 -++.macro init_edge_32 -++ ldr r12, [sp, #4] // sao_offset_val_table -++ vld1.32 {d31}, [r12] -++ ldr r12, [sp] // height -++.endm -+ -+- vadd.s8 q0, q10 -+- vadd.s8 q1, q10 -++.macro diff out0, tmp0, in0, in1 -++ vcgt.u8 \out0, \in1, \in0 // c > a -> -1 , otherwise 0 -++ vcgt.u8 \tmp0, \in0, \in1 // a > c -> -1 , otherwise 0 -++ vsub.s8 \out0, \tmp0, \out0 // diff0 -++.endm -+ -+- vmov.u8 q10, #128 -++.macro table32 -++ vmov.s8 q10, #2 -++ vadd.s8 q0, q10 -++ vadd.s8 q1, q10 -++ vmov.s8 q10, #128 -+ vtbl.8 d0, {d31}, d0 -+ vadd.s8 q11, q2, q10 -+ vtbl.8 d1, {d31}, d1 -+@@ -373,56 +358,68 @@ endfunc -+ vtbl.8 d2, {d31}, d2 -+ vqadd.s8 q11, q0 -+ vtbl.8 d3, {d31}, d3 -+- vqadd.s8 q12, q1 -+- vsub.s8 q0, q11, q10 -+- vsub.s8 q1, q12, q10 -++ vqadd.s8 q12, q1 -++ vsub.s8 q0, q11, q10 -++ vsub.s8 q1, q12, q10 -+ vst1.8 {q0-q1}, [r0, :128], r2 -+ .endm -+ -+-.macro init_edge_32 -+- ldr r12, [sp, #4] // sao_offset_val_table -+- vld1.32 {d31}, [r12] -+- ldr r12, [sp] // height -+-.endm -+- -+ function ff_hevc_sao_edge_eo0_w32_neon_8, export=1 -+ init_edge_32 -+- sub r1, #4 // load 4 extra bytes -++ vpush {q4-q7} -++ sub r1, #4 -+ 1: subs r12, #1 -+- vld1.32 d3[1], [r1]! -+- vld1.8 {q2-q3}, [r1, :128]! // c -+- vld1.32 d20[0], [r1], r3 -+- sub r1, #36 -++ vld1.8 {q13-q14}, [r1]! -++ vld1.32 d30, [r1], r3 -++ sub r1, #32 -+ // a -+- vext.8 q0, q1, q2, #15 -+- vext.8 q1, q2, q3, #15 -+- // b -+- vext.8 q8, q2, q3, #1 -+- vext.8 q9, q3, q10, #1 -+- edge_w32_body -++ vext.8 q0, q13, q14, #3 -++ vext.8 q1, q14, q15, #3 -++ vshr.u64 d24, d30, #24 -++ // c -++ vext.8 q2, q13, q14, #4 -++ vext.8 q3, q14, q15, #4 -++ vshr.u64 d16, d30, #32 -++ // diff0 -++ diff32 q13, q14, q4, q5, q0, q1, q2, q3 -++ diff d18, d25, d24, d16 -++ // -diff1 -++ vext.s8 q0, q13, q14, #1 -++ vext.s8 q1, q14, q9, #1 -++ -++ vsub.s8 q0, q13, q0 //diff0 + diff1 -++ vsub.s8 q1, q14, q1 -++ table32 -+ bne 1b -++ vpop {q4-q7} -++ -+ bx lr -+ endfunc -+ -+ function ff_hevc_sao_edge_eo1_w32_neon_8, export=1 -+ init_edge_32 -++ vpush {q4-q7} -+ // load a -+ sub r1, r3 -+ vld1.8 {q0-q1}, [r1, :128], r3 -+ // load c -+ vld1.8 {q2-q3}, [r1, :128], r3 -++ diff32 q12, q13, q0, q1, q0, q1, q2, q3 // CMP ( c, a ) -+ 1: subs r12, #1 -+ // load b -+ vld1.8 {q8-q9}, [r1, :128], r3 -+- edge_w32_body -+- // inputs for next loop iteration -+- // a -+- vmov.64 q0, q2 -+- vmov.64 q1, q3 -++ diff32 q4, q5, q10, q11, q8, q9, q2, q3 // CMP ( c, b ) -++ vadd.s8 q0, q4, q12 //diff0 + diff1 -++ vadd.s8 q1, q5, q13 -++ table32 -++ // CMP ( c, a ) -++ vneg.s8 q12, q4 -++ vneg.s8 q13, q5 -+ // c -+ vmov.64 q2, q8 -+ vmov.64 q3, q9 -+ bne 1b -++ vpop {q4-q7} -+ bx lr -+ endfunc -+ -+@@ -452,7 +449,11 @@ function ff_hevc_sao_edge_eo2_w32_neon_8, export=1 -+ vext.8 q6, q10, q11, #8 -+ vext.8 q7, q11, q12, #8 -+ vext.8 q5, q10, q11, #7 -+- edge_w32_body -++ diff32 q12, q13, q0, q1, q0, q1, q2, q3 -++ diff32 q0, q1, q10, q11, q8, q9, q2, q3 -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ table32 -+ // inputs for next loop iteration -+ // a -+ vmov.8 q0, q4 -+@@ -487,7 +488,14 @@ function ff_hevc_sao_edge_eo3_w32_neon_8, export=1 -+ vext.8 q8, q10, q11, #7 -+ vext.8 q9, q11, q12, #7 -+ vext.8 q14, q12, q10, #7 -+- edge_w32_body -++ -++ diff32 q12, q13, q0, q1, q0, q1, q2, q3 -++ diff32 q0, q1, q10, q11, q8, q9, q2, q3 -++ -++ vadd.s8 q0, q12 //diff0 + diff1 -++ vadd.s8 q1, q13 -++ table32 -++ -+ // inputs for next loop iteration -+ // a -+ vext.8 q0, q2, q3, #1 -+-- -+2.5.0 -+ -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index dde29adf425e54f54e4104b3370352db0be6ef40..83369203fef720456080f4119822e7fe3631ca1a 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -133,6 +133,8 @@ cd "ffmpeg-${VERSION}" || exit 2 - tar --strip-components=1 -xf $MYDIR/${ARCHIVE} - - patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch -+patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch -+patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ -diff --git a/tools/depends/target/ffmpeg/hevcdsp_ARM_NEON_optimized_epel_functions.patch b/tools/depends/target/ffmpeg/hevcdsp_ARM_NEON_optimized_epel_functions.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e818716ac62 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/hevcdsp_ARM_NEON_optimized_epel_functions.patch -@@ -0,0 +1,409 @@ -+From 29c3327a0d72a7e872ff170363cfe5ed13bca5d0 Mon Sep 17 00:00:00 2001 -+From: Seppo Tomperi -+Date: Tue, 22 Dec 2015 18:10:24 +0000 -+Subject: [PATCH] hevcdsp: ARM NEON optimized epel functions -+ -+--- -+ libavcodec/arm/Makefile | 1 + -+ libavcodec/arm/hevcdsp_epel_neon.S | 334 +++++++++++++++++++++++++++++++++++++ -+ libavcodec/arm/hevcdsp_init_neon.c | 23 +++ -+ 3 files changed, 358 insertions(+) -+ create mode 100644 libavcodec/arm/hevcdsp_epel_neon.S -+ -+diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile -+index cdd35b0..6051ec8 100644 -+--- a/libavcodec/arm/Makefile -++++ b/libavcodec/arm/Makefile -+@@ -131,6 +131,7 @@ NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \ -+ arm/synth_filter_neon.o -+ NEON-OBJS-$(CONFIG_HEVC_DECODER) += arm/hevcdsp_init_neon.o \ -+ arm/hevcdsp_deblock_neon.o \ -++ arm/hevcdsp_epel_neon.o \ -+ arm/hevcdsp_idct_neon.o \ -+ arm/hevcdsp_qpel_neon.o -+ NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_neon.o -+diff --git a/libavcodec/arm/hevcdsp_epel_neon.S b/libavcodec/arm/hevcdsp_epel_neon.S -+new file mode 100644 -+index 0000000..516ae5b -+--- /dev/null -++++ b/libavcodec/arm/hevcdsp_epel_neon.S -+@@ -0,0 +1,334 @@ -++/* -++ * Copyright (c) 2014 - 2015 Seppo Tomperi -++ * -++ * This file is part of FFmpeg. -++ * -++ * FFmpeg is free software; you can redistribute it and/or -++ * modify it under the terms of the GNU Lesser General Public -++ * License as published by the Free Software Foundation; either -++ * version 2.1 of the License, or (at your option) any later version. -++ * -++ * FFmpeg is distributed in the hope that it will be useful, -++ * but WITHOUT ANY WARRANTY; without even the implied warranty of -++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -++ * Lesser General Public License for more details. -++ * -++ * You should have received a copy of the GNU Lesser General Public -++ * License along with FFmpeg; if not, write to the Free Software -++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -++ */ -++ -++#include "libavutil/arm/asm.S" -++#include "neon.S" -++ -++#define MAX_PB_SIZE #64 -++ -++.macro vextin_d4 -++ vld1.8 {q10}, [r1], r2 -++ vmov d16, d20 -++ vext.8 d17, d20, d21, #1 -++ vext.8 d18, d20, d21, #2 -++ vext.8 d19, d20, d21, #3 -++.endm -++ -++.macro vextin_d4_8 -++ vld1.8 d16, [r1], r2 -++ vext.8 d17, d16, d16, #1 -++ vext.8 d18, d16, d16, #2 -++ vext.8 d19, d16, d16, #3 -++.endm -++ -++.macro load_coeffs_16b coeffs -++ ldr \coeffs, [\coeffs] -++ vdup.i8 d0, \coeffs -++ lsr \coeffs, #8 -++ vdup.i8 d1, \coeffs -++ lsr \coeffs, #8 -++ vdup.i8 d2, \coeffs -++ lsr \coeffs, #8 -++ vdup.i8 d3, \coeffs -++.endm -++ -++.macro epel_filter_16b out=q12 -++ vmull.u8 q3, d16, d0 -++ vmull.u8 q11, d19, d3 -++ vmull.u8 \out, d17, d1 -++ vmull.u8 q10, d18, d2 -++ vadd.s16 q3, q11 -++ vadd.s16 \out, q10 -++ vsub.s16 \out, q3 -++.endm -++ -++.macro load_coeffs_32b coeffs -++ ldr \coeffs, [\coeffs] -++ vmov.i64 d4, #0 -++ vmov.8 d4[0], \coeffs -++ lsr \coeffs, #8 -++ vmov.8 d4[2], \coeffs -++ lsr \coeffs, #8 -++ vmov.8 d4[4], \coeffs -++ lsr \coeffs, #8 -++ vmov.8 d4[6], \coeffs -++.endm -++ -++.macro epel_filter_32b -++ vmull.s16 q3, d24, d4[0] //q12 -++ vmull.s16 q4, d25, d4[0] -++ vmull.s16 q5, d30, d4[3] //q15 -++ vmull.s16 q6, d31, d4[3] -++ -++ vmull.s16 q7, d26, d4[1] // q13 -++ vmull.s16 q8, d27, d4[1] -++ vmull.s16 q9, d28, d4[2] // q14 -++ vmull.s16 q10, d29, d4[2] -++ vadd.s32 q3, q5 -++ vadd.s32 q4, q6 -++ vadd.s32 q7, q9 -++ vadd.s32 q8, q10 -++ vsub.s32 q7, q3 -++ vsub.s32 q8, q4 -++ vqshrn.s32 d6, q7, #6 -++ vqshrn.s32 d7, q8, #6 -++.endm -++ -++.macro epel_filter_32b_4 -++ vmull.s16 q3, d24, d4[0] //q12 -++ vmull.s16 q5, d30, d4[3] //q15 -++ vmull.s16 q7, d26, d4[1] // q13 -++ vmull.s16 q9, d28, d4[2] // q14 -++ vadd.s32 q3, q5 -++ vadd.s32 q7, q9 -++ vsub.s32 q7, q3 -++ vqshrn.s32 d6, q7, #6 -++.endm -++ -++function ff_hevc_put_epel_h_neon_8, export=1 -++ push {r4-r7} -++ mov r4, MAX_PB_SIZE -++ ldr r7, [sp, #16] // mx -++ ldr r5, [sp, #24] // width -++ sub r7, #1 -++ lsl r7, #2 -++ vpush {d8-d15} -++ adrl r12, epel_coeffs -++ add r7, r12 -++ sub r1, #1 -++ lsl r4, #1 -++ load_coeffs_16b r7 -++ mov r12, r3 -++ mov r6, r0 -++ mov r7, r1 -++ cmp r5, #6 -++ bgt 8f -++ cmp r5, #4 -++ blt 2f -++ b 4f -++8: subs r3, #1 -++ pld [r1] -++ vextin_d4 -++ epel_filter_16b -++ vst1.16 {q12}, [r0], r4 -++ bne 8b -++ subs r5, #8 -++ beq 99f -++ mov r3, r12 -++ add r6, #16 -++ mov r0, r6 -++ add r7, #8 -++ mov r1, r7 -++ cmp r5, #4 -++ bgt 8b -++4: subs r3, #1 -++ pld [r1] -++ vextin_d4_8 -++ epel_filter_16b -++ vst1.16 d24, [r0], r4 -++ bne 4b -++ subs r5, #4 -++ beq 99f -++ mov r3, r12 -++ add r6, #8 -++ mov r0, r6 -++ add r7, #4 -++ mov r1, r7 -++2: subs r3, #1 -++ pld [r1] -++ vextin_d4_8 -++ epel_filter_16b -++ vst1.32 d24[0], [r0], r4 -++ bne 2b -++99: vpop {d8-d15} -++ pop {r4-r7} -++ bx lr -++endfunc -++ -++function ff_hevc_put_epel_v_neon_8, export=1 -++ push {r4-r7} -++ mov r4, MAX_PB_SIZE -++ ldr r7, [sp, #20] // my -++ ldr r5, [sp, #24] // width -++ sub r7, #1 -++ lsl r7, #2 -++ vpush {d8-d15} -++ adrl r12, epel_coeffs -++ add r7, r12 -++ load_coeffs_16b r7 -++ sub r1, r2 -++ lsl r4, #1 -++ mov r12, r3 -++ mov r6, r0 -++ mov r7, r1 -++0: pld [r1] -++ vld1.8 {d16}, [r1], r2 -++ pld [r1] -++ vld1.8 {d17}, [r1], r2 -++ pld [r1] -++ vld1.8 {d18}, [r1], r2 -++ cmp r5, #6 -++ bgt 8f -++ cmp r5, #4 -++ blt 2f -++ b 4f -++8: pld [r1] -++ vld1.8 {d19}, [r1], r2 -++ subs r3, #1 -++ epel_filter_16b -++ vst1.16 {q12}, [r0], r4 -++ vmov d16, d17 -++ vmov d17, d18 -++ vmov d18, d19 -++ bne 8b -++ subs r5, #8 -++ beq 99f -++ mov r3, r12 -++ add r6, #16 -++ mov r0, r6 -++ add r7, #8 -++ mov r1, r7 -++ b 0b -++4: pld [r1] -++ vld1.8 {d19}, [r1], r2 -++ subs r3, #1 -++ epel_filter_16b -++ vst1.16 d24, [r0], r4 -++ vmov d16, d17 -++ vmov d17, d18 -++ vmov d18, d19 -++ bne 4b -++ subs r5, #4 -++ beq 99f -++ mov r3, r12 -++ add r6, #8 -++ mov r0, r6 -++ add r7, #4 -++ mov r1, r7 -++ b 0b -++2: pld [r1] -++ vld1.8 {d19}, [r1], r2 -++ subs r3, #1 -++ epel_filter_16b -++ vst1.32 d24[0], [r0], r4 -++ vmov d16, d17 -++ vmov d17, d18 -++ vmov d18, d19 -++ bne 2b -++99: vpop {d8-d15} -++ pop {r4-r7} -++ bx lr -++endfunc -++ -++function ff_hevc_put_epel_hv_neon_8, export=1 -++ push {r4-r7} -++ mov r4, MAX_PB_SIZE -++ ldr r6, [sp, #16] // mx -++ ldr r7, [sp, #20] // my -++ ldr r5, [sp, #24] // width -++ sub r7, #1 -++ lsl r7, #2 -++ vpush {d8-d15} -++ adrl r12, epel_coeffs -++ sub r6, #1 -++ lsl r6, #2 -++ add r6, r12 // mx epel coeff offset -++ add r7, r12 -++ sub r1, #1 -++ sub r1, r2 -++ lsl r4, #1 -++ load_coeffs_16b r6 -++ load_coeffs_32b r7 -++ mov r12, r3 -++ mov r6, r0 -++ mov r7, r1 -++0: pld [r1] -++ vextin_d4 -++ epel_filter_16b q12 -++ pld [r1] -++ vextin_d4 -++ epel_filter_16b q13 -++ pld [r1] -++ vextin_d4 -++ epel_filter_16b q14 -++ cmp r5, #6 -++ bgt 8f -++ cmp r5, #4 -++ blt 2f -++ b 4f -++8: pld [r1] -++ vextin_d4 -++ epel_filter_16b q15 -++ subs r3, #1 -++ epel_filter_32b -++ vst1.16 {q3}, [r0], r4 -++ vmov q12, q13 -++ vmov q13, q14 -++ vmov q14, q15 -++ bne 8b -++ subs r5, #8 -++ beq 99f -++ mov r3, r12 -++ add r6, #16 -++ mov r0, r6 -++ add r7, #8 -++ mov r1, r7 -++ b 0b -++4: pld [r1] -++ vextin_d4_8 -++ epel_filter_16b q15 -++ subs r3, #1 -++ epel_filter_32b_4 -++ vst1.16 d6, [r0], r4 -++ vmov q12, q13 -++ vmov q13, q14 -++ vmov q14, q15 -++ bne 4b -++ subs r5, #4 -++ beq 99f -++ mov r3, r12 -++ add r6, #8 -++ mov r0, r6 -++ add r7, #4 -++ mov r1, r7 -++ b 0b -++2: pld [r1] -++ vextin_d4_8 -++ epel_filter_16b q15 -++ subs r3, #1 -++ epel_filter_32b_4 -++ vst1.32 d6[0], [r0], r4 -++ vmov q12, q13 -++ vmov q13, q14 -++ vmov q14, q15 -++ bne 2b -++99: vpop {d8-d15} -++ pop {r4-r7} -++ bx lr -++endfunc -++ -++epel_coeffs: -++ .byte 2, 58, 10, 2 -++ .byte 4, 54, 16, 2 -++ .byte 6, 46, 28, 4 -++ .byte 4, 36, 36, 4 -++ .byte 4, 28, 46, 6 -++ .byte 2, 16, 54, 4 -++ .byte 2, 10, 58, 2 -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index 5591807..733ff08 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -58,6 +58,15 @@ PUT_PIXELS(ff_hevc_put_pixels_w32_neon_8); -+ PUT_PIXELS(ff_hevc_put_pixels_w48_neon_8); -+ PUT_PIXELS(ff_hevc_put_pixels_w64_neon_8); -+ #undef PUT_PIXELS -++void ff_hevc_put_epel_h_neon_8(int16_t *dst, uint8_t *src, -++ ptrdiff_t srcstride, int height, -++ intptr_t mx, intptr_t my, int width); -++void ff_hevc_put_epel_v_neon_8(int16_t *dst, uint8_t *src, -++ ptrdiff_t srcstride, int height, -++ intptr_t mx, intptr_t my, int width); -++void ff_hevc_put_epel_hv_neon_8(int16_t *dst, uint8_t *src, -++ ptrdiff_t srcstride, int height, -++ intptr_t mx, intptr_t my, int width); -+ -+ static void (*put_hevc_qpel_neon[4][4])(int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, -+ int height, int width); -+@@ -201,7 +210,21 @@ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ c->put_hevc_qpel_bi[x][1][0] = ff_hevc_put_qpel_bi_neon_wrapper; -+ c->put_hevc_qpel_bi[x][0][1] = ff_hevc_put_qpel_bi_neon_wrapper; -+ c->put_hevc_qpel_bi[x][1][1] = ff_hevc_put_qpel_bi_neon_wrapper; -++ c->put_hevc_epel[x][1][0] = ff_hevc_put_epel_v_neon_8; -++ c->put_hevc_epel[x][0][1] = ff_hevc_put_epel_h_neon_8; -++ c->put_hevc_epel[x][1][1] = ff_hevc_put_epel_hv_neon_8; -+ } -++ c->put_hevc_epel[0][0][0] = ff_hevc_put_pixels_w2_neon_8; -++ c->put_hevc_epel[1][0][0] = ff_hevc_put_pixels_w4_neon_8; -++ c->put_hevc_epel[2][0][0] = ff_hevc_put_pixels_w6_neon_8; -++ c->put_hevc_epel[3][0][0] = ff_hevc_put_pixels_w8_neon_8; -++ c->put_hevc_epel[4][0][0] = ff_hevc_put_pixels_w12_neon_8; -++ c->put_hevc_epel[5][0][0] = ff_hevc_put_pixels_w16_neon_8; -++ c->put_hevc_epel[6][0][0] = ff_hevc_put_pixels_w24_neon_8; -++ c->put_hevc_epel[7][0][0] = ff_hevc_put_pixels_w32_neon_8; -++ c->put_hevc_epel[8][0][0] = ff_hevc_put_pixels_w48_neon_8; -++ c->put_hevc_epel[9][0][0] = ff_hevc_put_pixels_w64_neon_8; -++ -+ c->put_hevc_qpel[0][0][0] = ff_hevc_put_pixels_w2_neon_8; -+ c->put_hevc_qpel[1][0][0] = ff_hevc_put_pixels_w4_neon_8; -+ c->put_hevc_qpel[2][0][0] = ff_hevc_put_pixels_w6_neon_8; -+-- -+2.5.0 -+ - -From daf0139e58775768c384747ccdcd7953f7a44f81 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 7 May 2015 14:04:18 +0100 -Subject: [PATCH 27/61] [ffmpeg] Add GPU acceleration to hevc - ---- - tools/depends/target/ffmpeg/Makefile | 4 +- - tools/depends/target/ffmpeg/autobuild.sh | 1 + - .../target/ffmpeg/pfcd_hevc_optimisations.patch | 38136 +++++++++++++++++++ - 3 files changed, 38140 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch - -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index c46b533e47497cb7b1e7200eff2cee1a6f2a1a2f..48f8d56988718dd53294e8291a53e532f0ff338d 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -2,7 +2,8 @@ include ../../Makefile.include - include FFMPEG-VERSION - DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ - 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \ -- hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch -+ hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch \ -+ pfcd_hevc_optimisations.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -85,6 +86,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - cd $(PLATFORM); patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch -+ cd $(PLATFORM); patch -p1 < ../pfcd_hevc_optimisations.patch - - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index 83369203fef720456080f4119822e7fe3631ca1a..d6856dbd4fb4957ace700cbc08332223c01938f6 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -135,6 +135,7 @@ tar --strip-components=1 -xf $MYDIR/${ARCHIVE} - patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch -+patch -p1 < ../pfcd_hevc_optimisations.patch - - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ -diff --git a/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch b/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71bc708c93 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch -@@ -0,0 +1,38136 @@ -+From b9b5434c61afd492a54dad5158b4d56ecbf7f01d Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 28 Apr 2015 16:18:40 +0100 -+Subject: [PATCH 01/68] Added display output -+ -+--- -+ ffmpeg.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -+ 1 file changed, 159 insertions(+) -+ -+diff --git a/ffmpeg.c b/ffmpeg.c -+index 9ffd833..50c6e86 100644 -+--- a/ffmpeg.c -++++ b/ffmpeg.c -+@@ -23,6 +23,11 @@ -+ * multimedia converter based on the FFmpeg libraries -+ */ -+ -++#ifdef RPI -++#define RPI_DISPLAY -++//#define RPI_ZERO_COPY -++#endif -++ -+ #include "config.h" -+ #include -+ #include -+@@ -66,6 +71,20 @@ -+ # include "libavfilter/buffersrc.h" -+ # include "libavfilter/buffersink.h" -+ -++#ifdef RPI_DISPLAY -++#include -++#include -++#include -++#include -++#include -++#include -++#include -++#include -++#ifdef RPI_ZERO_COPY -++#include "libavcodec/rpi_qpu.h" -++#endif -++#endif -++ -+ #if HAVE_SYS_RESOURCE_H -+ #include -+ #include -+@@ -158,6 +177,134 @@ static int restore_tty; -+ static void free_input_threads(void); -+ #endif -+ -++#ifdef RPI_DISPLAY -++ -++#define NUM_BUFFERS 4 -++ -++static MMAL_COMPONENT_T* rpi_display = NULL; -++static MMAL_POOL_T *rpi_pool = NULL; -++ -++#ifdef RPI_ZERO_COPY -++static uint8_t *get_vc_handle(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ return (uint8_t *)p->vc_handle; -++} -++#endif -++ -++static MMAL_POOL_T* display_alloc_pool(MMAL_PORT_T* port, size_t w, size_t h) -++{ -++ MMAL_POOL_T* pool; -++ size_t i; -++ size_t size = (w*h*3)/2; -++#ifdef RPI_ZERO_COPY -++ mmal_port_parameter_set_boolean(port, MMAL_PARAMETER_ZERO_COPY, MMAL_TRUE); // Does this mark that the buffer contains a vc_handle? Would have expected a vc_image? -++ pool = mmal_port_pool_create(port, NUM_BUFFERS, 0); -++ assert(pool); -++#else -++ pool = mmal_port_pool_create(port, NUM_BUFFERS, size); -++ -++ for (i = 0; i < NUM_BUFFERS; ++i) -++ { -++ MMAL_BUFFER_HEADER_T* buffer = pool->header[i]; -++ void* bufPtr = buffer->data; -++ memset(bufPtr, i*30, w*h); -++ memset(bufPtr+w*h, 128, (w*h)/2); -++ } -++#endif -++ -++ return pool; -++} -++ -++static void display_cb_input(MMAL_PORT_T *port,MMAL_BUFFER_HEADER_T *buffer) { -++ mmal_buffer_header_release(buffer); -++} -++ -++static MMAL_COMPONENT_T* display_init(size_t x, size_t y, size_t w, size_t h) -++{ -++ MMAL_COMPONENT_T* display; -++ int w2 = (w+31)&~31; -++ int h2 = (h+15)&~15; -++ MMAL_DISPLAYREGION_T region = -++ { -++ {MMAL_PARAMETER_DISPLAYREGION, sizeof(region)}, -++ .set = MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_FULLSCREEN | MMAL_DISPLAY_SET_DEST_RECT, -++ .layer = 2, -++ .fullscreen = 0, -++ .dest_rect = {x, y, w, h} -++ }; -++ bcm_host_init(); // TODO is this needed? -++ mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_RENDERER, &display); -++ assert(display); -++ -++ mmal_port_parameter_set(display->input[0], ®ion.hdr); -++ -++ MMAL_ES_FORMAT_T* format = display->input[0]->format; -++ format->encoding = MMAL_ENCODING_I420; -++ format->es->video.width = w2; -++ format->es->video.height = h2; -++ format->es->video.crop.x = 0; -++ format->es->video.crop.y = 0; -++ format->es->video.crop.width = w; -++ format->es->video.crop.height = h; -++ mmal_port_format_commit(display->input[0]); -++ -++ mmal_component_enable(display); -++ -++ rpi_pool = display_alloc_pool(display->input[0], w2, h2); -++ -++ mmal_port_enable(display->input[0],display_cb_input); -++ mmal_port_enable(display->control,display_cb_input); -++ -++ printf("Allocated display %d %d\n",w,h); -++ -++ return display; -++} -++ -++static void display_frame(MMAL_COMPONENT_T* display,AVFrame* fr) -++{ -++ int w = fr->width; -++ int h = fr->height; -++ int w2 = (w+31)&~31; -++ int h2 = (h+15)&~15; -++ if (!display || !rpi_pool) -++ return; -++ MMAL_BUFFER_HEADER_T* buf = mmal_queue_get(rpi_pool->queue); -++ if (!buf) { -++ // Running too fast so drop the frame -++ return; -++ } -++ assert(buf); -++ buf->cmd = 0; -++ buf->length = (w2 * h2 * 3)/2; -++ buf->offset = 0; // Offset to valid data -++ buf->flags = 0; -++#ifdef RPI_ZERO_COPY -++ buf->data = get_vc_handle(fr->buf[0]); -++ buf->alloc_size = (w2*h2*3)/2; -++#else -++ //mmal_buffer_header_mem_lock(buf); -++ memcpy(buf->data, fr->data[0], w2 * h); -++ memcpy(buf->data+w2*h2, fr->data[1], w2 * h / 4); -++ memcpy(buf->data+w2*h2*5/4, fr->data[2], w2 * h / 4); -++ //mmal_buffer_header_mem_unlock(buf); -++#endif -++ -++ mmal_port_send_buffer(display->input[0], buf); // I assume this will automatically get released -++} -++ -++static void display_exit(MMAL_COMPONENT_T* display) -++{ -++ if (display) { -++ mmal_component_destroy(display); -++ } -++ if (rpi_pool) { -++ mmal_port_pool_destroy(display->input[0], rpi_pool); -++ } -++} -++ -++#endif -++ -++ -+ /* sub2video hack: -+ Convert subtitles to video with alpha to insert them in filter graphs. -+ This is a temporary solution until libavfilter gets real subtitles support. -+@@ -581,6 +728,10 @@ static void ffmpeg_cleanup(int ret) -+ } -+ term_exit(); -+ ffmpeg_exited = 1; -++ -++#ifdef RPI_DISPLAY -++ display_exit(rpi_display); -++#endif -+ } -+ -+ void remove_avoptions(AVDictionary **a, AVDictionary *b) -+@@ -940,6 +1091,14 @@ static void do_video_out(AVFormatContext *s, -+ int frame_size = 0; -+ InputStream *ist = NULL; -+ AVFilterContext *filter = ost->filter->filter; -++#ifdef RPI_DISPLAY -++ if (next_picture) -++ { -++ if (!rpi_display) -++ rpi_display = display_init(0,0,next_picture->width,next_picture->height); -++ display_frame(rpi_display,next_picture); -++ } -++#endif -+ -+ if (ost->source_index >= 0) -+ ist = input_streams[ost->source_index]; -+-- -+2.7.4 -+ -+ -+From b90a5aff7bf9112ebd2a07949c8d79a49fcafe48 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 29 Apr 2015 16:49:43 +0100 -+Subject: [PATCH 02/68] Split transform and intra prediction into commands -+ -+--- -+ libavcodec/hevc.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++- -+ libavcodec/hevc.h | 58 +++++++++++++++++++++++ -+ libavcodec/hevc_cabac.c | 15 ++++++ -+ 3 files changed, 191 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index b478065..aa45dd6 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -931,6 +931,25 @@ static int hls_cross_component_pred(HEVCContext *s, int idx) { -+ return 0; -+ } -+ -++#ifdef RPI -++static void rpi_intra_pred(HEVCContext *s, int log2_trafo_size, int x0, int y0, int c_idx) -++{ -++ if (s->enable_rpi) { -++ HEVCLocalContext *lc = s->HEVClc; -++ HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -++ cmd->type = RPI_PRED_INTRA; -++ cmd->size = log2_trafo_size; -++ cmd->c_idx = c_idx; -++ cmd->x = x0; -++ cmd->y = y0; -++ cmd->na = (lc->na.cand_bottom_left<<4) + (lc->na.cand_left<<3) + (lc->na.cand_up_left<<2) + (lc->na.cand_up<<1) + lc->na.cand_up_right; -++ cmd->mode = c_idx ? lc->tu.intra_pred_mode_c : lc->tu.intra_pred_mode; -++ } else { -++ s->hpc.intra_pred[log2_trafo_size - 2](s, x0, y0, c_idx); -++ } -++} -++#endif -++ -+ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ int xBase, int yBase, int cb_xBase, int cb_yBase, -+ int log2_cb_size, int log2_trafo_size, -+@@ -943,8 +962,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ int trafo_size = 1 << log2_trafo_size; -+ ff_hevc_set_neighbour_available(s, x0, y0, trafo_size, trafo_size); -+- -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, x0, y0, 0); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, x0, y0, 0); -++#endif -+ } -+ -+ if (cbf_luma || cbf_cb[0] || cbf_cr[0] || -+@@ -1030,7 +1052,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (s->ps.sps->chroma_format_idc == 2 ? 2 : 1); i++) { -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ ff_hevc_set_neighbour_available(s, x0, y0 + (i << log2_trafo_size_c), trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0 + (i << log2_trafo_size_c), 1); -++#else -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0 + (i << log2_trafo_size_c), 1); -++#endif -+ } -+ if (cbf_cb[i]) -+ ff_hevc_hls_residual_coding(s, x0, y0 + (i << log2_trafo_size_c), -+@@ -1059,7 +1085,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (s->ps.sps->chroma_format_idc == 2 ? 2 : 1); i++) { -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ ff_hevc_set_neighbour_available(s, x0, y0 + (i << log2_trafo_size_c), trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0 + (i << log2_trafo_size_c), 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0 + (i << log2_trafo_size_c), 2); -++#endif -+ } -+ if (cbf_cr[i]) -+ ff_hevc_hls_residual_coding(s, x0, y0 + (i << log2_trafo_size_c), -+@@ -1088,7 +1118,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ ff_hevc_set_neighbour_available(s, xBase, yBase + (i << log2_trafo_size), -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase + (i << log2_trafo_size), 1); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase + (i << log2_trafo_size), 1); -++#endif -+ } -+ if (cbf_cb[i]) -+ ff_hevc_hls_residual_coding(s, xBase, yBase + (i << log2_trafo_size), -+@@ -1098,7 +1132,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ if (lc->cu.pred_mode == MODE_INTRA) { -+ ff_hevc_set_neighbour_available(s, xBase, yBase + (i << log2_trafo_size), -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase + (i << log2_trafo_size), 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase + (i << log2_trafo_size), 2); -++#endif -+ } -+ if (cbf_cr[i]) -+ ff_hevc_hls_residual_coding(s, xBase, yBase + (i << log2_trafo_size), -+@@ -1110,26 +1148,46 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ int trafo_size_h = 1 << (log2_trafo_size_c + s->ps.sps->hshift[1]); -+ int trafo_size_v = 1 << (log2_trafo_size_c + s->ps.sps->vshift[1]); -+ ff_hevc_set_neighbour_available(s, x0, y0, trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0, 1); -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0, 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0, 1); -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0, 2); -++#endif -+ if (s->ps.sps->chroma_format_idc == 2) { -+ ff_hevc_set_neighbour_available(s, x0, y0 + (1 << log2_trafo_size_c), -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0 + (1 << log2_trafo_size_c), 1); -++ rpi_intra_pred(s, log2_trafo_size_c, x0, y0 + (1 << log2_trafo_size_c), 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0 + (1 << log2_trafo_size_c), 1); -+ s->hpc.intra_pred[log2_trafo_size_c - 2](s, x0, y0 + (1 << log2_trafo_size_c), 2); -++#endif -+ } -+ } else if (blk_idx == 3) { -+ int trafo_size_h = 1 << (log2_trafo_size + 1); -+ int trafo_size_v = 1 << (log2_trafo_size + s->ps.sps->vshift[1]); -+ ff_hevc_set_neighbour_available(s, xBase, yBase, -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase, 1); -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase, 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase, 1); -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase, 2); -++#endif -+ if (s->ps.sps->chroma_format_idc == 2) { -+ ff_hevc_set_neighbour_available(s, xBase, yBase + (1 << (log2_trafo_size)), -+ trafo_size_h, trafo_size_v); -++#ifdef RPI -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase + (1 << (log2_trafo_size)), 1); -++ rpi_intra_pred(s, log2_trafo_size, xBase, yBase + (1 << (log2_trafo_size)), 2); -++#else -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase + (1 << (log2_trafo_size)), 1); -+ s->hpc.intra_pred[log2_trafo_size - 2](s, xBase, yBase + (1 << (log2_trafo_size)), 2); -++#endif -+ } -+ } -+ } -+@@ -2304,6 +2362,31 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ lc->ctb_up_left_flag = ((x_ctb > 0) && (y_ctb > 0) && (ctb_addr_in_slice-1 >= s->ps.sps->ctb_width) && (s->ps.pps->tile_id[ctb_addr_ts] == s->ps.pps->tile_id[s->ps.pps->ctb_addr_rs_to_ts[ctb_addr_rs-1 - s->ps.sps->ctb_width]])); -+ } -+ -++#ifdef RPI -++static void rpi_execute_pred_cmds(HEVCContext *s) -++{ -++ int i; -++ HEVCPredCmd *cmd = s->univ_pred_cmds; -++ HEVCLocalContext *lc = s->HEVClc; -++ -++ for(i = s->num_pred_cmds; i > 0; i--, cmd++) { -++ if (cmd->type == RPI_PRED_INTRA) { -++ lc->tu.intra_pred_mode_c = lc->tu.intra_pred_mode = cmd->mode; -++ lc->na.cand_bottom_left = (cmd->na >> 4) & 1; -++ lc->na.cand_left = (cmd->na >> 3) & 1; -++ lc->na.cand_up_left = (cmd->na >> 2) & 1; -++ lc->na.cand_up = (cmd->na >> 1) & 1; -++ lc->na.cand_up_right = (cmd->na >> 0) & 1; -++ s->hpc.intra_pred[cmd->size - 2](s, cmd->x, cmd->y, cmd->c_idx); -++ } else { -++ s->hevcdsp.transform_add[cmd->size-2](cmd->dst, cmd->buf, cmd->stride); -++ } -++ } -++ s->num_pred_cmds = 0; -++ s->num_coeffs = 0; -++} -++#endif -++ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ { -+ HEVCContext *s = avctxt->priv_data; -+@@ -2313,6 +2396,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int y_ctb = 0; -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -++#ifdef RPI -++ s->enable_rpi = 1; // TODO this should depend on cross component and frame width etc. -++#endif -++ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+ av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); -+ return AVERROR_INVALIDDATA; -+@@ -2342,6 +2429,9 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -++#ifdef RPI -++ rpi_execute_pred_cmds(s); -++#endif -+ if (more_data < 0) { -+ s->tab_slice_address[ctb_addr_rs] = -1; -+ return more_data; -+@@ -2387,6 +2477,10 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int -+ s = s1->sList[self_id]; -+ lc = s->HEVClc; -+ -++#ifdef RPI -++ s->enable_rpi = 0; -++#endif -++ -+ if(ctb_row) { -+ ret = init_get_bits8(&lc->gb, s->data + s->sh.offset[ctb_row - 1], s->sh.size[ctb_row - 1]); -+ -+@@ -3075,6 +3169,13 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ -+ av_freep(&s->cabac_state); -+ -++#ifdef RPI -++ av_freep(&s->unif_mv_cmds); -++ av_freep(&s->unif_xfm_cmds); -++ av_freep(&s->univ_pred_cmds); -++ av_freep(&s->coeffs_buf); -++#endif -++ -+ for (i = 0; i < 3; i++) { -+ av_freep(&s->sao_pixel_buffer_h[i]); -+ av_freep(&s->sao_pixel_buffer_v[i]); -+@@ -3129,6 +3230,22 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->HEVClcList[0] = s->HEVClc; -+ s->sList[0] = s; -+ -++#ifdef RPI -++ s->unif_mv_cmds = av_mallocz(sizeof(HEVCMvCmd)*RPI_MAX_MV_CMDS); -++ if (!s->unif_mv_cmds) -++ goto fail; -++ s->unif_xfm_cmds = av_mallocz(sizeof(HEVCXfmCmd)*RPI_MAX_XFM_CMDS); -++ if (!s->unif_xfm_cmds) -++ goto fail; -++ s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -++ if (!s->univ_pred_cmds) -++ goto fail; -++ s->coeffs_buf = av_mallocz(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16); -++ if (!s->coeffs_buf) -++ goto fail; -++ s->enable_rpi = 0; -++#endif -++ -+ s->cabac_state = av_malloc(HEVC_CONTEXTS); -+ if (!s->cabac_state) -+ goto fail; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index be91010..7a1c35f 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -23,6 +23,9 @@ -+ #ifndef AVCODEC_HEVC_H -+ #define AVCODEC_HEVC_H -+ -++// define RPI to split the CABAC/prediction/transform into separate stages -++#include "config.h" -++ -+ #include "libavutil/buffer.h" -+ #include "libavutil/md5.h" -+ -+@@ -790,6 +793,49 @@ typedef struct HEVCLocalContext { -+ int boundary_flags; -+ } HEVCLocalContext; -+ -++#ifdef RPI -++ -++// RPI_MAX_WIDTH is maximum width in pixels supported by the accelerated code -++#define RPI_MAX_WIDTH 2048 -++ -++// Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane -++#define RPI_MAX_MV_CMDS (16*3*(RPI_MAX_WIDTH/4)) -++#define RPI_MAX_XFM_CMDS (16*3*(RPI_MAX_WIDTH/4)) -++// Each block can have an intra prediction and a transform_add command -++#define RPI_MAX_PRED_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -++ -++// Command for inter prediction -++typedef struct HEVCMvCmd { -++} HEVCMvCmd; -++ -++// Command for transform to process a block of coefficients -++typedef struct HEVCXfmCmd { -++} HEVCXfmCmd; -++ -++// Command for intra prediction and transform_add of predictions to coefficients -++#define RPI_PRED_TRANSFORM_ADD 0 -++#define RPI_PRED_INTRA 1 -++typedef struct HEVCPredCmd { -++ uint8_t size; -++ uint8_t type; -++ uint8_t na; -++ uint8_t c_idx; -++ union { -++ uint8_t *dst; // RPI_PRED_TRANSFORM_ADD -++ uint32_t x; // RPI_PRED_INTRA -++ }; -++ union { -++ int16_t *buf; // RPI_PRED_TRANSFORM_ADD -++ uint32_t y; // RPI_PRED_INTRA -++ }; -++ union { -++ enum IntraPredMode mode; // RPI_PRED_TRANSFORM_ADD -++ uint32_t stride; // RPI_PRED_INTRA -++ }; -++} HEVCPredCmd; -++ -++#endif -++ -+ typedef struct HEVCContext { -+ const AVClass *c; // needed by private avoptions -+ AVCodecContext *avctx; -+@@ -805,6 +851,18 @@ typedef struct HEVCContext { -+ int width; -+ int height; -+ -++#ifdef RPI -++ int enable_rpi; -++ HEVCMvCmd *unif_mv_cmds; -++ HEVCXfmCmd *unif_xfm_cmds; -++ HEVCPredCmd *univ_pred_cmds; -++ int16_t *coeffs_buf; -++ int num_mv_cmds; -++ int num_xfm_cmds; -++ int num_pred_cmds; -++ int num_coeffs; -++#endif -++ -+ uint8_t *cabac_state; -+ -+ /** 1 if the independent slice segment header was successfully parsed */ -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 05b2821..4e97f06 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1510,6 +1510,21 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ coeffs[i] = coeffs[i] + ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -+ } -++#ifdef RPI -++ if (s->enable_rpi) { -++ int16_t *c = s->coeffs_buf + s->num_coeffs; -++ int n = trafo_size * trafo_size; -++ HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -++ memcpy(c, coeffs, n * sizeof(int16_t)); // TODO change pointer earlier and we can avoid this copy -++ s->num_coeffs += n; -++ cmd->type = RPI_PRED_TRANSFORM_ADD; -++ cmd->size = log2_trafo_size; -++ cmd->buf = c; -++ cmd->dst = dst; -++ cmd->stride = stride; -++ return; -++ } -++#endif -+ s->hevcdsp.transform_add[log2_trafo_size-2](dst, coeffs, stride); -+ } -+ -+-- -+2.7.4 -+ -+ -+From f8293de11dc040d9fa2a558762a357c0c353d2c9 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 30 Apr 2015 15:23:22 +0100 -+Subject: [PATCH 03/68] Added simple VPU test code -+ -+--- -+ libavcodec/Makefile | 7 + -+ libavcodec/hevc.c | 33 +- -+ libavcodec/rpi_hevc_transform.h | 212 ++++++ -+ libavcodec/rpi_hevc_transform.s | 147 ++++ -+ libavcodec/rpi_mailbox.c | 293 ++++++++ -+ libavcodec/rpi_mailbox.h | 20 + -+ libavcodec/rpi_qpu.c | 652 ++++++++++++++++++ -+ libavcodec/rpi_qpu.h | 45 ++ -+ libavcodec/rpi_shader.c | 818 ++++++++++++++++++++++ -+ libavcodec/rpi_shader.h | 20 + -+ libavcodec/rpi_shader.qasm | 1413 +++++++++++++++++++++++++++++++++++++++ -+ libavcodec/rpi_user_vcsm.h | 425 ++++++++++++ -+ 12 files changed, 4084 insertions(+), 1 deletion(-) -+ create mode 100644 libavcodec/rpi_hevc_transform.h -+ create mode 100644 libavcodec/rpi_hevc_transform.s -+ create mode 100644 libavcodec/rpi_mailbox.c -+ create mode 100644 libavcodec/rpi_mailbox.h -+ create mode 100644 libavcodec/rpi_qpu.c -+ create mode 100644 libavcodec/rpi_qpu.h -+ create mode 100644 libavcodec/rpi_shader.c -+ create mode 100644 libavcodec/rpi_shader.h -+ create mode 100644 libavcodec/rpi_shader.qasm -+ create mode 100644 libavcodec/rpi_user_vcsm.h -+ -+diff --git a/libavcodec/Makefile b/libavcodec/Makefile -+index fd0d1f0..03065cd 100644 -+--- a/libavcodec/Makefile -++++ b/libavcodec/Makefile -+@@ -5,6 +5,10 @@ NAME = avcodec -+ HEADERS = avcodec.h \ -+ avdct.h \ -+ avfft.h \ -++ rpi_qpu.h \ -++ rpi_shader.h \ -++ rpi_mailbox.h \ -++ rpi_hevc_transform.h \ -+ d3d11va.h \ -+ dirac.h \ -+ dv_profile.h \ -+@@ -43,6 +47,9 @@ OBJS = allcodecs.o \ -+ resample.o \ -+ resample2.o \ -+ utils.o \ -++ rpi_qpu.o \ -++ rpi_shader.o \ -++ rpi_mailbox.o \ -+ vorbis_parser.o \ -+ xiph.o \ -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index aa45dd6..ab55df1 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -41,6 +41,10 @@ -+ #include "hevc.h" -+ #include "profiles.h" -+ -++#ifdef RPI -++#include "rpi_qpu.h" -++#endif -++ -+ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; -+ -+ /** -+@@ -2430,7 +2434,9 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ #ifdef RPI -+- rpi_execute_pred_cmds(s); -++ if (x_ctb + ctb_size >= s->ps.sps->width) { -++ rpi_execute_pred_cmds(s); -++ } -+ #endif -+ if (more_data < 0) { -+ s->tab_slice_address[ctb_addr_rs] = -1; -+@@ -3244,6 +3250,31 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ if (!s->coeffs_buf) -+ goto fail; -+ s->enable_rpi = 0; -++ -++ // A little test program -++ { -++ GPU_MEM_PTR_T p; -++ int err = gpu_malloc_cached(16, &p); -++ short *q = (short *)p.arm; -++ int i; -++ int r; -++ printf("Allocated memory %d ARM 0x%x, VC 0x%x, Code 0x%x\n",err,(int)p.arm,p.vc,(int)vpu_get_fn()); -++ printf("Allocated memory %d ARM 0x%x, VC 0x%x\n",err,(int)p.arm,p.vc); -++ printf("Preparing data %p\n",q); -++ for(i=0;i<16;i++) -++ q[i] = i; -++ printf("Flush cache\n"); -++ gpu_cache_flush(&p); -++ printf("Executing code\n"); -++ r = vpu_execute_code( vpu_get_fn(), p.vc, 0, 0, 0, 0, 0); -++ printf("Return value %d (",r); -++ for(i=0;i<16;i++) -++ printf("%d ",q[i]); -++ printf(")\n"); -++ gpu_free(&p); -++ goto fail; // Early out -++ } -++ -+ #endif -+ -+ s->cabac_state = av_malloc(HEVC_CONTEXTS); -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+new file mode 100644 -+index 0000000..85a9102 -+--- /dev/null -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -0,0 +1,212 @@ -++unsigned char rpi_hevc_transform [] = { -++169, -++3, -++3, -++232, -++128, -++0, -++0, -++0, -++20, -++248, -++0, -++136, -++0, -++0, -++192, -++248, -++0, -++0, -++0, -++96, -++3, -++232, -++32, -++0, -++0, -++0, -++7, -++232, -++0, -++2, -++0, -++0, -++8, -++232, -++0, -++4, -++0, -++0, -++12, -++248, -++0, -++128, -++0, -++0, -++192, -++8, -++4, -++0, -++4, -++232, -++64, -++0, -++0, -++0, -++5, -++232, -++0, -++0, -++8, -++0, -++128, -++69, -++113, -++66, -++12, -++248, -++0, -++128, -++0, -++0, -++192, -++8, -++4, -++0, -++128, -++69, -++113, -++70, -++128, -++144, -++39, -++0, -++4, -++255, -++48, -++192, -++128, -++3, -++32, -++8, -++16, -++0, -++76, -++254, -++48, -++192, -++9, -++4, -++32, -++8, -++0, -++0, -++4, -++254, -++0, -++144, -++128, -++2, -++0, -++248, -++62, -++0, -++128, -++144, -++22, -++0, -++4, -++255, -++48, -++192, -++128, -++3, -++32, -++8, -++16, -++0, -++76, -++254, -++48, -++192, -++9, -++4, -++32, -++8, -++0, -++0, -++140, -++248, -++44, -++0, -++0, -++0, -++32, -++48, -++4, -++0, -++128, -++69, -++113, -++66, -++242, -++140, -++211, -++192, -++41, -++3, -++68, -++192, -++80, -++7, -++164, -++255, -++36, -++220, -++96, -++2, -++0, -++248, -++62, -++0, -++3, -++255, -++55, -++208, -++120, -++3, -++224, -++3, -++190, -++11, -++16, -++139, -++246, -++83, -++0, -++103, -++90, -++0, -++8, -++240, -++0, -++128, -++128, -++3, -++0, -++247, -++32, -++128, -++10, -++4, -++136, -++240, -++32, -++0, -++128, -++3, -++112, -++96, -++90, -++0, -++}; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+new file mode 100644 -+index 0000000..5e2728d -+--- /dev/null -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -0,0 +1,147 @@ -++# ****************************************************************************** -++# Argon Design Ltd. -++# (c) Copyright 2015 Argon Design Ltd. All rights reserved. -++# -++# Module : HEVC -++# Author : Peter de Rivaz -++# ****************************************************************************** -++ -++# HEVC VPU Transform -++# -++# Transform matrix can be thought of as -++# output row vector = input row vector * transMatrix2 -++# -++# The even rows of the matrix are symmetric -++# The odd rows of the matrix are antisymmetric -++# -++# So only need to compute the first half of the results, then can compute the remainder with a butterfly -++# -++# EXAMPLE -++# (a b c d) (1 2 2 1) -++# (3 4 -4 -3) -++# (5 6 6 5) -++# (7 8 -8 -7) -++# -++# x=(a c)(1 2) = 1a+5c 2a+6c -++# (5 6) -++# -++# y=(b d)(3 4) = 3b+7d 4b+8d -++# (7 8) -++# -++# u=x+y = 1a+5c+3b+7d 2a+4b+6c+8d -++# v=x-y = 1a+5c-3b-7d 2a+6c-4b-8d -++# -++# Final results are (u , v[::-1]) -++# -++# -++# For 32x1 input, load even rows into HX(0++,0), odd rows into HX(16++,0) -++# Apply the even matrix first and stop before rounding -++# Then apply the odd matrix in a full manner: -++# -++# First step is to compute partial products with the first input (16 cycles) -++# 1a 3b 5c 7d 16x1 input coefficients produce 16x16 output -++# 2a 4b 6c 8d -++# 2a -4b 6c -8d -++# 1a -3b 5c -7d -++# -++# Second step is to sum partial products into final position (8 cycles) -++# 1a+3b+5c+7d -++# 2a+4b+6c+8d -++# 2a-4b+6c-8d -++# 1a-3b+5c-7d -++# -++# Then can apply butterfly to combine even results and odd results + rounding to produce 16 rows of output at a time (need to save in transposed format) -++# -++# For 16x16 no butterfly is required and can store final results in original location (Could do 2 16x16s in parallel to make use of the trick - saves on the adds) -++# -++# For 8x8 we could compute two in parallel. -++# -++# -++ -++test_add: -++ vldh HX(0,0),(r0) -++ vadd HX(0,0),HX(0,0),10 -++ vsth HX(0,0),(r0) -++ mov r0,7 # return value -++ b lr -++ -++# Columns are transformed first -++# -++# Store top left half of transMatrix2 in -++# Store bottom left half of transMatrix2 in HX(32,32) -++# -++# For 16x16 -++# HX(0:15,0) contains input data before transform -++# HY(0:15,0) contains 32bit output data after transform -++# HX(32,0) contains even rows of left half of transMatrix2 -++# HX(32,32) contains odd rows of left half of transMatrix2 -++# HY(48,0) contains partial products ready for summing -++# -++ -++ -++# hevc_trans_16x16(short *transMatrix2, short *coeffs, int num) -++# transMatrix2: address of the constant matrix (must be at 32 byte aligned address in Videocore memory) -++# coeffs: address of the transform coefficients (must be at 32 byte aligned address in Videocore memory) -++# num: number of 16x16 transforms to be done -++# -++hevc_trans_16x16: -++ push r6-r15, lr # TODO cut down number of used registers -++ -++ mov r3, 2*32*2 # Twice Stride of transMatrix2 in bytes -++ vld HX(32++,0),(r0 += r3) REP 16 # This is the 16x16 matrix, a transform is equivalent to multiplying input row vector * matrix -++ # Now use r0 to describe which matrix we are working on. -++ # Allows us to prefetch the next block of coefficients for efficiency. -++ mov r0,0 # This describes the location where we read our coefficients from -++ mov r3,16*2 # Stride of coefficients in bytes -++ mov r7,16*16*2 # Total block size -++ mov r8,64*16 # Value used to swap from current to next VRF location -++ vldh HX(0++,0)+r0,(r1 += r3) REP 16 -++ mov r4,64 # Constant used for rounding first pass -++ mov r5,1<<19 # Constant used for rounding second pass -++ -++ # At start of block r0,r1 point to the current block (that has already been loaded) -++block_loop: -++ eor r0,r8 -++ add r1,r7 -++ # Prefetch the next block -++ vldh HX(0++,0)+r0,(r1 += r3) REP 16 -++ eor r0,r8 -++ sub r1,r7 -++ -++ # Transform the current block -++ bl col_trans_16 -++ vadd HY(0++,0)+r0,HY(0++,0)+r0,r4 REP 16 # Now add on rounding, shift down by 7, and saturate -++ #vsasls HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # 9+7=16 so this ends up with the output saturated and in the top half of the word. -++ vasl HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # This should be saturating, but the instruction above does not assemble? -++ vmov VX(0,0++), HX(0++,32) REP 16 # For simplicity transpose this back to the original position -++ -++ bl col_trans_16 -++ vadd HY(0++,0)+r0,HY(0++,0)+r0,r4 REP 16 # Now add on rounding, shift down by 7, and saturate -++ #vsasls HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # 9+7=16 so this ends up with the output saturated and in the top half of the word. -++ vasl HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # This should be saturating, but the instruction above does not assemble? -++ -++ # Save results - note there has been a transposition during the processing so we save columns -++ vsth VX(0,32++)+r0, (r1 += r3) REP 16 -++ -++ # Move onto next block -++ eor r0,r8 -++ add r1,r7 -++ -++ addcmpbgt r2,-1,0,block_loop -++ pop r6-r15, pc -++ -++# r1,r2,r3 r7,r8 should be preserved -++# HX(0++,0)+r0 is the block to be transformed -++# HX(32++,0) is the 16x16 matrix of transform coefficients -++# Use HY(48,0) for intermediate results -++# r0 can be used, but should be returned to its original value at the end -++col_trans_16: -++ add r4,r0,16 # Final value for this loop -++col_trans_16_loop: -++ # First compute partial products for a single column -++ vmul32s VY(48,0++), VX(0,0)+r0, VX(32,0++) REP 16 -++ # Then sum up the results and place back -++ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -++ addcmpblt r0,1,r4,col_trans_16_loop -++ sub r0,16 # but r0 back to its original value -++ b lr -+diff --git a/libavcodec/rpi_mailbox.c b/libavcodec/rpi_mailbox.c -+new file mode 100644 -+index 0000000..536896f -+--- /dev/null -++++ b/libavcodec/rpi_mailbox.c -+@@ -0,0 +1,293 @@ -++/* -++Copyright (c) 2012, Broadcom Europe 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. -++ * Neither the name of the copyright holder nor the -++ names of its contributors may be used to endorse or promote products -++ derived from this software without specific prior written permission. -++ -++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -++DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -++ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -++(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 -++#include -++#include -++#include -++#include -++#include -++#include -++#include -++#include -++ -++#include -++ -++#define MAJOR_NUM 100 -++#define IOCTL_MBOX_PROPERTY _IOWR(MAJOR_NUM, 0, char *) -++#define DEVICE_FILE_NAME "/dev/char_dev" -++ -++#include "rpi_mailbox.h" -++ -++#define PAGE_SIZE (4*1024) -++ -++// Shared memory will not be cached in ARM cache -++void *mapmem_shared(unsigned base, unsigned size) -++{ -++ int mem_fd; -++ unsigned offset = base % PAGE_SIZE; -++ base = base - offset; -++ /* open /dev/mem */ -++ if ((mem_fd = open("/dev/mem", O_RDWR|O_SYNC) ) < 0) { -++ printf("can't open /dev/mem\nThis program should be run as root. Try prefixing command with: sudo\n"); -++ return NULL; -++ } -++ void *mem = mmap( -++ 0, -++ size, -++ PROT_READ|PROT_WRITE, -++ MAP_SHARED/*|MAP_FIXED*/, -++ mem_fd, -++ base); -++#ifdef DEBUG -++ printf("base=0x%x, mem=%p\n", base, mem); -++#endif -++ if (mem == MAP_FAILED) { -++ printf("mmap error %d\n", (int)mem); -++ return NULL; -++ } -++ close(mem_fd); -++ return (char *)mem + offset; -++} -++ -++// Unshared memory will be faster as lives in ARM cache, but requires cache flushing -++void *mapmem_private(unsigned base, unsigned size) -++{ -++ int mem_fd; -++ unsigned offset = base % PAGE_SIZE; -++ base = base - offset; -++ /* open /dev/mem */ -++ if ((mem_fd = open("/dev/mem", O_RDWR|O_SYNC) ) < 0) { -++ printf("can't open /dev/mem\nThis program should be run as root. Try prefixing command with: sudo\n"); -++ return NULL; -++ } -++ void *mem = mmap( -++ 0, -++ size, -++ PROT_READ|PROT_WRITE, -++ MAP_PRIVATE/*|MAP_FIXED*/, -++ mem_fd, -++ base); -++#ifdef DEBUG -++ printf("base=0x%x, mem=%p\n", base, mem); -++#endif -++ if (mem == MAP_FAILED) { -++ printf("mmap error %d\n", (int)mem); -++ return NULL; -++ } -++ close(mem_fd); -++ return (char *)mem + offset; -++} -++ -++void unmapmem(void *addr, unsigned size) -++{ -++ int s = munmap(addr, size); -++ if (s != 0) { -++ printf("munmap error %d\n", s); -++ exit (-1); -++ } -++} -++ -++/* -++ * use ioctl to send mbox property message -++ */ -++ -++static int mbox_property(int file_desc, void *buf) -++{ -++ int ret_val = ioctl(file_desc, IOCTL_MBOX_PROPERTY, buf); -++ -++ if (ret_val < 0) { -++ printf("ioctl_set_msg failed:%d\n", ret_val); -++ } -++ -++#ifdef DEBUG -++ unsigned *p = buf; int i; unsigned size = *(unsigned *)buf; -++ for (i=0; i -++#include -++#include -++#include -++#include -++ -++#include "config.h" -++ -++#include -++#include -++ -++#include "rpi_mailbox.h" -++#include "rpi_qpu.h" -++#include "rpi_shader.h" -++#include "rpi_hevc_transform.h" -++ -++#ifdef RPI_USE_VCSM -++#include "rpi_user_vcsm.h" -++#endif -++ -++// On Pi2 there is no way to access the VPU L2 cache -++// GPU_MEM_FLG should be 4 for uncached memory. -++// However, if using VCSM allocated buffers, need to use C at the moment because VCSM does not allocate uncached memory correctly -++// The QPU crashes if we mix L2 cached and L2 uncached accesses due to a HW bug. -++#define GPU_MEM_FLG 0xC -++#define GPU_MEM_MAP 0x0 -++ -++#define vcos_verify(x) ((x)>=0) -++ -++typedef unsigned char uint8_t; -++typedef signed char int8_t; -++typedef unsigned short uint16_t; -++typedef unsigned int uint32_t; -++typedef int int32_t; -++ -++/*static const unsigned code[] = -++{ -++ #include "rpi_shader.hex" -++};*/ -++ -++// Size in 32bit words -++#define QPU_CODE_SIZE 2048 -++#define VPU_CODE_SIZE 2048 -++ -++struct GPU -++{ -++ unsigned int qpu_code[QPU_CODE_SIZE]; -++ unsigned int vpu_code[VPU_CODE_SIZE]; -++ int open_count; // Number of allocated video buffers -++ unsigned int vc_handle; // Handle of this memory -++ int mb; // Mailbox handle -++ int vc; // Address in GPU memory -++ int mail[12]; // These are used to pass pairs of code/unifs to the QPUs -++}; -++ -++// Stop more than one thread trying to allocate memory or use the processing resources at once -++static pthread_mutex_t gpu_mutex = PTHREAD_MUTEX_INITIALIZER; -++static volatile struct GPU* gpu = NULL; -++ -++#ifdef RPI_TIME_TOTAL_QPU -++static unsigned int Microseconds(void) { -++ struct timespec ts; -++ unsigned int x; -++ static unsigned int base = 0; -++ clock_gettime(CLOCK_REALTIME, &ts); -++ x = ts.tv_sec*1000000 + ts.tv_nsec/1000; -++ if (base==0) base=x; -++ return x-base; -++} -++#endif -++ -++// Connect to QPU, returns 0 on success. -++static int gpu_init(volatile struct GPU **gpu) { -++ int mb = mbox_open(); -++ int vc; -++ int handle; -++ volatile struct GPU* ptr; -++ if (mb < 0) -++ return -1; -++ -++ if (qpu_enable(mb, 1)) return -2; -++ -++#ifdef RPI_USE_VCSM -++ vcsm_init(); -++#endif -++ -++ handle = mem_alloc(mb, sizeof(struct GPU), 4096, GPU_MEM_FLG); -++ if (!handle) -++ { -++ qpu_enable(mb, 0); -++ return -3; -++ } -++ vc = mem_lock(mb, handle); -++ ptr = mapmem_shared((vc+GPU_MEM_MAP)&~0xc0000000, sizeof(struct GPU)); -++ if (ptr == NULL) -++ { mem_free(mb, handle); -++ mem_unlock(mb, handle); -++ qpu_enable(mb, 0); -++ return -4; -++ } -++ -++ ptr->mb = mb; -++ ptr->vc_handle = handle; -++ ptr->vc = vc; -++ -++ *gpu = ptr; -++ -++ // Now copy over the QPU code into GPU memory -++ { -++ int num_bytes = qpu_get_fn(QPU_MC_END) - qpu_get_fn(QPU_MC_SETUP); -++ assert(num_bytes<=QPU_CODE_SIZE*sizeof(unsigned int)); -++ memcpy((void*)ptr->qpu_code, rpi_shader, num_bytes); -++ } -++ // And the VPU code -++ { -++ int num_bytes = sizeof(rpi_hevc_transform); -++ assert(num_bytes<=VPU_CODE_SIZE*sizeof(unsigned int)); -++ memcpy((void*)ptr->vpu_code, rpi_hevc_transform, num_bytes); -++ } -++ -++ return 0; -++} -++ -++// Make sure we have exclusive access to the mailbox, and enable qpu if necessary. -++static void gpu_lock(void) { -++ pthread_mutex_lock(&gpu_mutex); -++ if (gpu==NULL) { -++ gpu_init(&gpu); -++ } -++} -++ -++static void gpu_unlock(void) { -++ pthread_mutex_unlock(&gpu_mutex); -++} -++ -++// Allocate memory on GPU -++// Fills in structure

containing ARM pointer, videocore handle, videocore memory address, numbytes -++// Returns 0 on success. -++// This allocates memory that will not be cached in ARM's data cache. -++// Therefore safe to use without data cache flushing. -++int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) { -++ gpu_lock(); -++ p->vc_handle = mem_alloc(gpu->mb, numbytes, 4096, GPU_MEM_FLG); -++ p->vcsm_handle = 0; -++ if (!p->vc_handle) -++ { -++ qpu_enable(gpu->mb, 0); -++ return -3; -++ } -++ p->vc = mem_lock(gpu->mb, p->vc_handle); -++ p->arm = mapmem_shared((p->vc+GPU_MEM_MAP)&~0xc0000000,numbytes); -++ p->numbytes = numbytes; -++ if (p->arm == NULL) -++ { -++ mem_free(gpu->mb, p->vc_handle); -++ mem_unlock(gpu->mb, p->vc_handle); -++ gpu_unlock(); -++ qpu_enable(gpu->mb, 0); -++ return -4; -++ } -++ gpu->open_count++; -++ gpu_unlock(); -++ return 0; -++} -++ -++void gpu_cache_flush(GPU_MEM_PTR_T *p) -++{ -++ // This only works when using RPI_USE_VCSM -++ void *tmp = vcsm_lock(p->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++} -++ -++// This allocates data that will be -++// Cached in ARM L2 -++// Uncached in VPU L2 -++int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p) { -++ gpu_lock(); -++#ifdef RPI_USE_VCSM -++ { -++ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); // f....... locks up for VP9 - retest this? -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); // 3b...... works -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); //fb...... locks up -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST_AND_VC, (char *)"Video Frame" ); // 3b works (but corrupted due to caching) -++ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -++ p->arm = vcsm_lock(p->vcsm_handle); -++ p->vc = mem_lock(gpu->mb, p->vc_handle); -++ } -++#else -++ p->vc_handle = mem_alloc(gpu->mb, numbytes, 4096, GPU_MEM_FLG); -++ p->vcsm_handle = 0; -++ if (!p->handle) -++ { -++ qpu_enable(gpu->mb, 0); -++ return -3; -++ } -++ p->vc = mem_lock(gpu->mb, p->vc_handle); -++ printf("This mapmem_private does not seem to work\n"); -++ exit(-1); -++ p->arm = mapmem_private((p->vc+GPU_MEM_MAP)&~0xc0000000,numbytes); -++ p->numbytes = numbytes; -++ if (p->arm == NULL) -++ { -++ mem_free(gpu->mb, p->handle); -++ mem_unlock(gpu->mb, p->handle); -++ gpu_unlock(); -++ qpu_enable(gpu->mb, 0); -++ return -4; -++ } -++#endif -++ gpu->open_count++; -++ gpu_unlock(); -++ return 0; -++} -++ -++static void gpu_term(void) -++{ -++ int mb = gpu->mb; -++ unsigned handle = gpu->vc_handle; -++ if (gpu==NULL) -++ return; -++ unmapmem((void*)gpu, sizeof(struct GPU)); -++ mem_unlock(mb, handle); -++ mem_free(mb, handle); -++ qpu_enable(mb, 0); -++#ifdef RPI_USE_VCSM -++ vcsm_exit(); -++#endif -++ mbox_close(mb); -++ gpu = NULL; -++} -++ -++void gpu_free(GPU_MEM_PTR_T *p) { -++ int mb = gpu->mb; -++ unsigned handle = p->vc_handle; -++ gpu_lock(); -++#ifdef RPI_USE_VCSM -++ if (p->vcsm_handle) { -++ mem_unlock(mb,p->vc_handle); -++ vcsm_unlock_ptr(p->arm); -++ vcsm_free(p->vcsm_handle); -++ } else { -++ unmapmem((void*)p->arm, sizeof(struct GPU)); -++ mem_unlock(mb, handle); -++ mem_free(mb, handle); -++ } -++#else -++ unmapmem((void*)p->arm, sizeof(struct GPU)); -++ mem_unlock(mb, handle); -++ mem_free(mb, handle); -++#endif -++ -++ gpu->open_count--; -++ if (gpu->open_count==0) { -++ printf("Closing GPU\n"); -++ gpu_term(); -++ gpu = NULL; -++ } -++ gpu_unlock(); -++} -++ -++unsigned int vpu_get_fn(void) { -++ // Make sure that the gpu is initialized -++ if (gpu==NULL) { -++ printf("Preparing gpu\n"); -++ gpu_lock(); -++ gpu_unlock(); -++ } -++ return gpu->vc + offsetof(struct GPU,vpu_code); -++} -++ -++unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5) -++{ -++ unsigned r; -++ gpu_lock(); -++ r = execute_code(gpu->mb, code, r0, r1, r2, r3, r4, r5); -++ gpu_unlock(); -++ return r; -++} -++ -++// Run a program on a QPU with the given code and uniform stream (given in GPU addresses) -++// The first num QPUs will start at code, the next num2 QPUs will start at code2 -++void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12) -++{ -++ int i; -++#ifdef RPI_TIME_TOTAL_QPU -++ static int last_time=0; -++ static long long on_time=0; -++ static long long off_time=0; -++ int start_time; -++ int end_time; -++ static int count=0; -++#endif -++ -++ gpu_lock(); -++#ifdef RPI_TIME_TOTAL_QPU -++ start_time = Microseconds(); -++ if (last_time==0) -++ last_time = start_time; -++ off_time += start_time-last_time; -++#endif -++ for(i=0;imail[i*2 + 1] = code; -++ } -++ for(;imail[i*2 + 1] = code2; -++ } -++ gpu->mail[0 ] = unifs1; -++ gpu->mail[2 ] = unifs2; -++ gpu->mail[4 ] = unifs3; -++ gpu->mail[6 ] = unifs4; -++ gpu->mail[8 ] = unifs5; -++ gpu->mail[10] = unifs6; -++ gpu->mail[12] = unifs7; -++ gpu->mail[14] = unifs8; -++ gpu->mail[16] = unifs9; -++ gpu->mail[18] = unifs10; -++ gpu->mail[20] = unifs11; -++ gpu->mail[22] = unifs12; -++ execute_qpu( -++ gpu->mb, -++ 12 /* Number of QPUs */, -++ gpu->vc + offsetof(struct GPU, mail), -++ 1 /* no flush */, // Don't flush VPU L1 cache -++ 5000 /* timeout ms */); -++#ifdef RPI_TIME_TOTAL_QPU -++ end_time = Microseconds(); -++ last_time = end_time; -++ on_time += end_time - start_time; -++ count++; -++ if ((count&0x7f)==0) -++ printf("On=%dms, Off=%dms\n",(int)(on_time/1000),(int)(off_time/1000)); -++#endif -++ gpu_unlock(); -++} -++ -++unsigned int qpu_get_fn(int num) { -++ // Make sure that the gpu is initialized -++ unsigned int *fn; -++ if (gpu==NULL) { -++ printf("Preparing gpu\n"); -++ gpu_lock(); -++ gpu_unlock(); -++ } -++ switch(num) { -++ case QPU_MC_SETUP: -++ fn = mc_setup; -++ break; -++ case QPU_MC_FILTER: -++ fn = mc_filter; -++ break; -++ case QPU_MC_EXIT: -++ fn = mc_exit; -++ break; -++ case QPU_MC_INTERRUPT_EXIT: -++ fn = mc_interrupt_exit; -++ break; -++ case QPU_MC_FILTER_B: -++ fn = mc_filter_b; -++ break; -++ case QPU_MC_FILTER_HONLY: -++ fn = mc_filter_honly; -++ break; -++ case QPU_MC_SETUP_UV: -++ fn = mc_setup_uv; -++ break; -++ case QPU_MC_FILTER_UV: -++ fn = mc_filter_uv; -++ break; -++ case QPU_MC_FILTER_UV_B: -++ fn = mc_filter_uv_b; -++ break; -++ case QPU_MC_END: -++ fn = mc_end; -++ break; -++ default: -++ printf("Unknown function\n"); -++ exit(-1); -++ } -++ return gpu->vc + 4*(int)(fn-rpi_shader); -++ //return code[num] + gpu->vc; -++} -++ -++#if 0 -++ -++int32_t hcoeffs[] = {-4, 10, -21, 70, 90, -24, 11, -4}; -++//int32_t hcoeffs[] = {1, 1, 1, 1, 1, 1, 1, 1}; -++int32_t vcoeffs[] = {-2, 6, -13, 37, 115, -20, 9, -4}; -++//int32_t vcoeffs[] = {1, 1, 1, 1, 1, 1, 1, 1}; -++ -++#define ENCODE_COEFFS(c0, c1, c2, c3) (((c0-1) & 0xff) | ((c1-1) & 0xff) << 8 | ((c2-1) & 0xff) << 16 | ((c3-1) & 0xff) << 24); -++ -++static uint8_t av_clip_uint8(int32_t a) -++{ -++ if (a&(~255)) return (-a)>>31; -++ else return a; -++} -++ -++static int32_t filter8(const uint8_t *data, int pitch) -++{ -++ int32_t vsum = 0; -++ int x, y; -++ -++ for (y = 0; y < 8; y++) { -++ int32_t hsum = 0; -++ -++ for (x = 0; x < 8; x++) -++ hsum += hcoeffs[x]*data[x + y * pitch]; -++ -++ vsum += vcoeffs[y]*av_clip_uint8( (hsum + 64) >> 7); // Added brackets to stop compiler warning -++ } -++ -++ return av_clip_uint8( (vsum + 64) >> 7); -++} -++ -++// Note regression changes coefficients so is not thread safe -++//#define REGRESSION -++#ifdef REGRESSION -++#define CMAX 100 -++#else -++#define CMAX 2 -++#endif -++#define YMAX 16 -++ -++int rpi_test_shader(void) -++{ -++ int i, c; -++ -++ uint32_t *unifs; -++ -++ uint8_t *in_buffer; -++ uint8_t *out_buffer[2]; -++ -++ GPU_MEM_PTR_T unifs_ptr; -++ GPU_MEM_PTR_T in_buffer_ptr; -++ GPU_MEM_PTR_T out_buffer_ptr[2]; -++ -++ // Addresses in GPU memory of filter programs -++ uint32_t mc_setup = 0; -++ uint32_t mc_filter = 0; -++ uint32_t mc_exit = 0; -++ -++ int pitch = 0x500; -++ -++ if (gpu==NULL) { -++ gpu_lock(); -++ gpu_unlock(); -++ } -++ -++ printf("This needs to change to reflect new assembler\n"); -++ // Use table to compute locations of program start points -++ mc_setup = code[0] + gpu->vc; -++ mc_filter = code[1] + gpu->vc; -++ mc_exit = code[2] + gpu->vc; -++ -++ if (!vcos_verify(gpu_malloc_uncached(4*64,&unifs_ptr))) { -++ return -2; -++ } -++ unifs = (uint32_t*)unifs_ptr.arm; -++ -++ if (!vcos_verify(gpu_malloc_uncached(64*23,&in_buffer_ptr))) { -++ return -3; -++ } -++ in_buffer = (uint8_t*)in_buffer_ptr.arm; -++ -++ if (!vcos_verify(gpu_malloc_uncached(16*pitch,&out_buffer_ptr[0])) || !vcos_verify(gpu_malloc_uncached(16*pitch,&out_buffer_ptr[1]))) { -++ return -4; -++ } -++ out_buffer[0] = (uint8_t*)out_buffer_ptr[0].arm; -++ out_buffer[1] = (uint8_t*)out_buffer_ptr[1].arm; -++ -++ for (c = 0; c < CMAX; c++) { -++ int xo[] = {rand()&31, rand()&31}; -++ -++#ifdef REGRESSION -++ for (i = 0; i < 8; i++) { -++ hcoeffs[i] = (int8_t)rand(); -++ vcoeffs[i] = (int8_t)rand(); -++ if (hcoeffs[i]==-128) -++ hcoeffs[i]++; -++ if (vcoeffs[i]==-128) -++ vcoeffs[i]++; -++ } -++#endif -++ -++ for (i = 0; i < 64*23; i++) { -++ //printf("%d %d %p\n",i,gpu->mb,&in_buffer[i]); -++ in_buffer[i] = rand(); -++ } -++ -++ // Clear output array -++ { -++ int b; -++ for(b=0;b<2;b++) { -++ for(i=0;i<16*16;i++) { -++ out_buffer[b][i] = 3; -++ } -++ } -++ } -++ -++ unifs[0] = mc_filter; -++ unifs[1] = in_buffer_ptr.vc+xo[0]+16; -++ unifs[2] = 64; // src pitch -++ unifs[3] = pitch; // dst pitch -++ unifs[4] = 0; // Padding -++ unifs[5] = 0; -++ unifs[6] = 0; -++ unifs[7 ] = mc_filter; -++ unifs[8 ] = in_buffer_ptr.vc+xo[1]+16; -++ unifs[9 ] = ENCODE_COEFFS(hcoeffs[0], hcoeffs[1], hcoeffs[2], hcoeffs[3]); -++ unifs[10] = ENCODE_COEFFS(hcoeffs[4], hcoeffs[5], hcoeffs[6], hcoeffs[7]); -++ unifs[11] = ENCODE_COEFFS(vcoeffs[0], vcoeffs[1], vcoeffs[2], vcoeffs[3]); -++ unifs[12] = ENCODE_COEFFS(vcoeffs[4], vcoeffs[5], vcoeffs[6], vcoeffs[7]); -++ unifs[13] = out_buffer_ptr[0].vc; -++ unifs[14] = mc_exit; -++ unifs[15] = in_buffer_ptr.vc+xo[1]+16; // dummy -++ unifs[16] = ENCODE_COEFFS(hcoeffs[0], hcoeffs[1], hcoeffs[2], hcoeffs[3]); -++ unifs[17] = ENCODE_COEFFS(hcoeffs[4], hcoeffs[5], hcoeffs[6], hcoeffs[7]); -++ unifs[18] = ENCODE_COEFFS(vcoeffs[0], vcoeffs[1], vcoeffs[2], vcoeffs[3]); -++ unifs[19] = ENCODE_COEFFS(vcoeffs[4], vcoeffs[5], vcoeffs[6], vcoeffs[7]); -++ unifs[20] = out_buffer_ptr[1].vc; -++ -++ printf("Gpu->vc=%x Code=%x dst=%x\n",gpu->vc, mc_filter,out_buffer_ptr[1].vc); -++ -++ // flush_dcache(); TODO is this needed on ARM side? - tried to use the direct alias to avoid this problem -++ -++ //qpu_run_shader(mc_setup, unifs_ptr.vc); -++ //qpu_run_shader(gpu, gpu->vc, unifs_ptr.vc); -++ rpi_do_block(in_buffer_ptr.vc+xo[0]+16, 64, out_buffer_ptr[0].vc, pitch,out_buffer[0]); -++ rpi_do_block(in_buffer_ptr.vc+xo[1]+16, 64, out_buffer_ptr[1].vc, pitch,out_buffer[1]); -++ -++ if (1) -++ { -++ int x, y, b; -++ int bad = 0; -++ -++ for (b=0; b<2; ++b) -++ for (y=0; yvc; -++ mc_filter = code[1] + gpu->vc; -++ mc_exit = code[2] + gpu->vc; -++ -++ if (!vcos_verify(gpu_malloc_uncached(4*64,&unifs_ptr))) { -++ return; -++ } -++ //gpu_malloc_uncached(16*dst_pitch,&out_buffer_ptr); -++ //out_buffer = (uint8_t*)out_buffer_ptr.arm; -++ -++ /*for (y=0; y<16; ++y) { -++ for (x=0; x<16; ++x) { -++ out_buffer[x+y*dst_pitch] = 7; -++ } -++ }*/ -++ -++ unifs = (uint32_t*)unifs_ptr.arm; -++ -++ unifs[0] = mc_filter; -++ unifs[1] = (int)in_buffer_vc; -++ unifs[2] = src_pitch; // src pitch -++ unifs[3] = dst_pitch; // dst pitch -++ unifs[4] = 0; // Padding -++ unifs[5] = 0; -++ unifs[6] = 0; -++ unifs[7 ] = mc_exit; -++ unifs[8 ] = (int)in_buffer_vc; -++ unifs[9 ] = ENCODE_COEFFS(hcoeffs[0], hcoeffs[1], hcoeffs[2], hcoeffs[3]); -++ unifs[10] = ENCODE_COEFFS(hcoeffs[4], hcoeffs[5], hcoeffs[6], hcoeffs[7]); -++ unifs[11] = ENCODE_COEFFS(vcoeffs[0], vcoeffs[1], vcoeffs[2], vcoeffs[3]); -++ unifs[12] = ENCODE_COEFFS(vcoeffs[4], vcoeffs[5], vcoeffs[6], vcoeffs[7]); -++ unifs[13] = (int)dst_vc; -++ //unifs[13] = (int)out_buffer_ptr.vc; -++ -++ //printf("Gpu->vc=%x Code=%x dst=%x\n",gpu->vc, mc_filter,out_buffer_ptr[1].vc); -++ -++ qpu_run_shader(mc_setup, unifs_ptr.vc); -++ -++ /*for (y=0; y<16; ++y) { -++ for (x=0; x<16; ++x) { -++ dst[x+y*dst_pitch] = out_buffer[x+y*dst_pitch]; -++ } -++ }*/ -++ -++ gpu_free(&unifs_ptr); -++ //gpu_free(&out_buffer_ptr); -++} -++ -++ -++#endif -++ -++#endif // RPI -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+new file mode 100644 -+index 0000000..4e3c35c -+--- /dev/null -++++ b/libavcodec/rpi_qpu.h -+@@ -0,0 +1,45 @@ -++#ifndef RPI_QPU_H -++#define RPI_QPU_H -++ -++typedef struct gpu_mem_ptr_s { -++ unsigned char *arm; // Pointer to memory mapped on ARM side -++ int vc_handle; // Videocore handle of relocatable memory -++ int vcsm_handle; // Handle for use by VCSM -++ int vc; // Address for use in GPU code -++ int numbytes; // Size of memory block -++} GPU_MEM_PTR_T; -++ -++// General GPU functions -++extern int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p); -++extern int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p); -++extern void gpu_free(GPU_MEM_PTR_T *p); -++extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -++ -++// QPU specific functions -++extern void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12); -++ -++enum { -++ QPU_MC_SETUP, -++ QPU_MC_FILTER, -++ QPU_MC_EXIT, -++ QPU_MC_INTERRUPT_EXIT, -++ QPU_MC_FILTER_B, -++ QPU_MC_FILTER_HONLY, -++ QPU_MC_SETUP_UV, -++ QPU_MC_FILTER_UV, -++ QPU_MC_FILTER_UV_B, -++ QPU_MC_END -++ }; -++extern unsigned int qpu_get_fn(int num); -++ -++// VPU specific functions -++extern unsigned int vpu_get_fn(void); -++extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -++ -++// Simple test of shader code -++extern int rpi_test_shader(void); -++ -++extern void rpi_do_block(const unsigned char *in_buffer_vc, int src_pitch, unsigned char *dst_vc, int dst_pitch, unsigned char *dst); -++extern void rpi_do_block_arm(const unsigned char *in_buffer, int src_pitch, unsigned char *dst, int dst_pitch); -++ -++#endif -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+new file mode 100644 -+index 0000000..41cc2e1 -+--- /dev/null -++++ b/libavcodec/rpi_shader.c -+@@ -0,0 +1,818 @@ -++#include "rpi_shader.h" -++ -++#ifdef _MSC_VER -++ #include -++ /* cast through uintptr_t to avoid warnings */ -++ #define POINTER_TO_UINT(X) ((unsigned int)(uintptr_t)(X)) -++#else -++ #define POINTER_TO_UINT(X) ((unsigned int)(X)) -++#endif -++ -++#ifdef __cplusplus -++extern "C" { /* the types are probably wrong... */ -++#endif -++#ifdef __cplusplus -++} -++#endif -++ -++#ifdef _MSC_VER -++__declspec(align(8)) -++#elif defined(__GNUC__) -++__attribute__((aligned(8))) -++#endif -++unsigned int rpi_shader[] = { -++// ::mc_setup -++/* [0x00000000] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000008] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -++/* [0x00000010] */ 0x15827d80, 0x10020767, // mov ra_y, unif -++/* [0x00000018] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -++/* [0x00000020] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00000028] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00000030] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00000038] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000040] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000048] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000050] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000058] */ 0x00000040, 0xe0020567, // mov ra21, 64 -++/* [0x00000060] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000068] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -++/* [0x00000070] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000078] */ 0x00000040, 0xe0021567, // mov rb21, 64 -++/* [0x00000080] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000088] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000090] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000098] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000a0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000a8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000b0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000d0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000d8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000000e0] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000000e8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x000000f0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x000000f8] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000100] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000108] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000110] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000118] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000120] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000128] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000130] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000138] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000140] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000148] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000150] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000158] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000160] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000168] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000170] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000178] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x00000180] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000188] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x00000190] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x00000198] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000001a0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x000001a8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001b0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x000001b8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x000001c0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000001c8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001d0] */ 0x4c9d00cf, 0x10024821, // add r0, r0, r3; mul24 r1, r1, rb_pitch -++/* [0x000001d8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x000001e0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001e8] */ 0x949dc5c0, 0xd0025890, // and r2, r2, ~3; mov ra_x_base, r0 -++/* [0x000001f0] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x000001f8] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x00000200] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000208] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000210] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000218] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000220] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000228] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000230] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000238] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000240] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++// ::mc_filter_uv -++/* [0x00000248] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000250] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000258] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000260] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000268] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000270] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000278] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000280] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000288] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000290] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000298] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002a0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002b0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002d0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000002d8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002e8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002f0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000002f8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000300] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000330] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000340] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000350] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000360] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000368] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000370] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000378] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000380] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000388] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000390] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000398] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003a0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :uvloop -++/* [0x000003a8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003b0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003b8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003c0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003c8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003d0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003d8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003e0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000400] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000408] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++/* [0x00000410] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000420] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000430] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000440] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000448] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000450] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000458] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000460] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000468] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000470] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000478] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000480] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000488] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000490] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000498] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000004a0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000004a8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000004b0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000004b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000004c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000004c8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x000004d8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x000004e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x000004e8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x000004f0] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x000004f8] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000500] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000508] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000510] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000518] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000520] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000528] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000530] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000538] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000540] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000560] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000568] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000570] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000578] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000580] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000588] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000590] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000598] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter -++/* [0x000005a0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005a8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005b0] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x000005b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005c0] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x000005c8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005d0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x000005d8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005e0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x000005e8] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x000005f0] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x000005f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000600] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000608] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000610] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000618] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000620] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000628] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000630] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000638] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000640] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000648] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000650] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000658] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000660] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000668] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000670] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000678] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000680] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000688] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000690] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000698] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000006b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000006d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000006f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000700] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000708] */ 0x000001d0, 0xf07809e7, // brr.anynn -, r:fast_path -++/* [0x00000710] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000718] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000720] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000728] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :loop -++/* [0x00000730] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000738] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000740] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000748] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000750] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000758] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000760] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000768] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000770] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000778] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000780] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000788] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000790] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000798] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000007a0] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000007a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000007b0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000007c0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000007d0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000007e0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000007f0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000007f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000800] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000808] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000810] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000818] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000820] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000828] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000830] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000838] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000840] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000848] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:loop -++/* [0x00000850] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000858] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000860] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000868] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000870] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000878] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000880] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000888] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000890] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000898] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x000008a0] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008a8] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000008b0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000008b8] */ 0xfffffe58, 0xf06809e7, // brr.anyn -, r:loop -++/* [0x000008c0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000008c8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008d0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000008d8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000008e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000008f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// :fast_path -++/* [0x000008f8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :fast_loop -++/* [0x00000900] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000908] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000910] */ 0x95727d9b, 0x1004475f, // mov.ifz ra_y, ra_y_next ; mov rb31, r3 -++/* [0x00000918] */ 0x95690dbf, 0x10044623, // mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -++/* [0x00000920] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000928] */ 0x929de5e4, 0x100248a1, // min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 -++/* [0x00000930] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000938] */ 0xec414c87, 0x10024e20, // add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00000940] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000948] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000950] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000958] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000960] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000968] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000970] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000978] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000980] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000988] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -++/* [0x00000990] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000998] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000009a0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000009a8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000009b0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000009b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000009c8] */ 0xffffff18, 0xf06809e7, // brr.anyn -, r:fast_loop -++/* [0x000009d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x000009d8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x000009e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x000009e8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x000009f0] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x000009f8] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000a00] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000a08] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000a10] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000a18] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000a20] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000a28] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000a30] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000a38] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:fast_loop -++/* [0x00000a40] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00000a48] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a50] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a60] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_b -++/* [0x00000a78] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000a80] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000a88] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x00000a90] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000a98] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000aa0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000aa8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x00000ab0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000ab8] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000ac0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000ac8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000ad0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000ad8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000ae0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000ae8] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000af0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000af8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000b00] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000b08] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b10] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000b18] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000b20] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000b28] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000b30] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000b38] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000b40] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000b48] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000b50] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000b58] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000b60] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000b68] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000b70] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00000b78] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b80] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000b88] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000b90] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000b98] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000ba0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ba8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bb0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bb8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000bc0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bc8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bd0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bd8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000be0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000be8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bf0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bf8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000c00] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000c08] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000c10] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :bloop -++/* [0x00000c18] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000c20] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000c28] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000c30] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000c38] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000c40] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000c48] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000c50] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000c58] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000c60] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000c68] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000c70] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000c78] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000c80] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000c88] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000c90] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000c98] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000ca0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000ca8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000cb0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000cb8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000cc0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000cc8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000cd0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000cd8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000ce0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000ce8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000cf0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000cf8] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000d00] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000d08] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000d10] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000d18] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000d20] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000d28] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000d30] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:bloop -++/* [0x00000d38] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000d40] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000d48] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000d50] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000d58] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000d60] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000d68] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000d70] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000d78] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000d80] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000d88] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000d90] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000d98] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000da0] */ 0x8fc8f3f6, 0xd0020867, // asr r1, r1, 15 ; mov -, vr_wait -++/* [0x00000da8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000db0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x00000db8] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:bloop -++/* [0x00000dc0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000dc8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00000dd0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x00000dd8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000de0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000de8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000df0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_honly -++/* [0x00000df8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000e00] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000e08] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x00000e10] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000e18] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000e20] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000e28] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x00000e30] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000e38] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000e40] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000e48] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000e50] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000e58] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000e60] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000e68] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000e70] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000e78] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e80] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000e88] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e90] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000e98] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000ea0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000ea8] */ 0x0c9de1c0, 0xd0021467, // add rb17, r0, -2 -++/* [0x00000eb0] */ 0x919c71c0, 0xd0024812, // shl r0, r0, 7 ; mov rb18,r0 -++/* [0x00000eb8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000ec0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000ec8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000ed0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000ed8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000ef8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f00] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f08] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f10] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000f18] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000f20] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000f28] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000f30] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :loop_honly -++/* [0x00000f38] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000f40] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000f48] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000f50] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000f58] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000f60] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000f68] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000f70] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000f78] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000f80] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000f88] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000f90] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000f98] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000fa0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000fa8] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000fb0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000fb8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000fc0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000fc8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000fd0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000fd8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000fe0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000fe8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000ff0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000ff8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001000] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001008] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -++/* [0x00001010] */ 0x8d5927f6, 0x100269e1, // sub.setf -, r3, rb18 ; mov r1, ra22 -++/* [0x00001018] */ 0x559f2fc1, 0x100049e0, // mov -, vw_wait ; mul24 r0, r0, r1 -++/* [0x00001020] */ 0xfffffef8, 0xf06809e7, // brr.anyn -, r:loop_honly -++/* [0x00001028] */ 0x0f9cf1c0, 0xd0020827, // asr r0, r0, 15 -++/* [0x00001030] */ 0x129d61c0, 0x10020827, // min r0, r0, rb22 -++/* [0x00001038] */ 0x139c01c0, 0xd0020c27, // max vpm, r0, 0 -++/* [0x00001040] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001048] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001050] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001058] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_exit -++/* [0x00001060] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001068] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00001070] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001078] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001080] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001088] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001090] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001098] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000010a0] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_exit1 -++/* [0x000010a8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000010b0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010b8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010c0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010c8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000010d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000010e0] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit -++/* [0x000010e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000010f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001100] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001108] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001110] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001118] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001120] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001128] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001130] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001138] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001140] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001148] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001150] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001158] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001160] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001168] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001170] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001178] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit4 -++/* [0x00001180] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001188] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001190] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001198] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011c0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000011c8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000011d0] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit8 -++/* [0x000011d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000011e0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011e8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001200] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001208] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001210] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001218] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001220] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001228] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001230] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001238] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001240] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001248] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_setup_uv -++/* [0x00001250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001258] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -++/* [0x00001260] */ 0x15827d80, 0x10020767, // mov ra_y, unif -++/* [0x00001268] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -++/* [0x00001270] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00001278] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -++/* [0x00001280] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00001288] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00001290] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00001298] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000012a0] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x000012a8] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x000012b0] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x000012b8] */ 0x00000040, 0xe0020567, // mov ra21, 64 -++/* [0x000012c0] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x000012c8] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -++/* [0x000012d0] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x000012d8] */ 0x00000040, 0xe0021567, // mov rb21, 64 -++/* [0x000012e0] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x000012e8] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x000012f0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x000012f8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00001300] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00001308] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00001310] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00001318] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00001320] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00001328] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00001330] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00001338] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00001340] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00001348] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00001350] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00001358] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00001360] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00001368] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001370] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00001378] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00001380] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00001388] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00001390] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00001398] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000013a0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x000013a8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x000013b0] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x000013b8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x000013c0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000013c8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x000013d0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x000013d8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x000013e0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000013e8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x000013f0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000013f8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00001400] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00001408] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00001410] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -++/* [0x00001418] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00001420] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x00001428] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x00001430] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x00001438] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001440] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001448] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001450] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00001458] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00001460] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00001468] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001470] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00001478] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00001480] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++// ::mc_filter_uv_b -++/* [0x00001488] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001490] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00001498] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000014a0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000014a8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000014b0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000014b8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000014c0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000014c8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000014d0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000014d8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000014e0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000014e8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000014f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000014f8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00001500] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00001508] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00001510] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00001518] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00001520] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00001528] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00001530] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00001538] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00001540] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001548] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001550] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00001558] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00001560] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00001568] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001570] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001578] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001580] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001588] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00001590] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001598] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015a0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015a8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000015b0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015b8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015c0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015c8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000015d0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015d8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015e0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015e8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x000015f0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000015f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001600] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :uvloop_b -++/* [0x00001608] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001610] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00001618] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00001620] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001628] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00001630] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001638] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001640] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00001648] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00001650] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00001658] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001660] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00001668] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++/* [0x00001670] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00001678] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00001680] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00001688] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001690] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001698] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000016a0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000016a8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000016b0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000016b8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000016c0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000016c8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000016d0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000016d8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x000016e0] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x000016e8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000016f0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x000016f8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001700] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001708] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001710] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001718] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001720] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00001728] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00001730] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00001738] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00001740] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00001748] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00001750] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00001758] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00001760] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00001768] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00001770] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00001778] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00001780] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00001788] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00001790] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00001798] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000017a0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000017a8] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x000017b0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000017b8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000017c0] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x000017c8] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x000017d0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000017d8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000017e0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000017e8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000017f0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000017f8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001800] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00001808] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001810] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_end -++}; -++#ifdef __HIGHC__ -++#pragma Align_to(8, rpi_shader) -++#endif -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+new file mode 100644 -+index 0000000..db971f4 -+--- /dev/null -++++ b/libavcodec/rpi_shader.h -+@@ -0,0 +1,20 @@ -++#ifndef rpi_shader_H -++#define rpi_shader_H -++ -++extern unsigned int rpi_shader[]; -++ -++#define mc_setup (rpi_shader + 0) -++#define mc_filter_uv (rpi_shader + 146) -++#define mc_filter (rpi_shader + 360) -++#define mc_filter_b (rpi_shader + 670) -++#define mc_filter_honly (rpi_shader + 894) -++#define mc_exit (rpi_shader + 1048) -++#define mc_exit1 (rpi_shader + 1066) -++#define mc_interrupt_exit (rpi_shader + 1082) -++#define mc_interrupt_exit4 (rpi_shader + 1120) -++#define mc_interrupt_exit8 (rpi_shader + 1142) -++#define mc_setup_uv (rpi_shader + 1172) -++#define mc_filter_uv_b (rpi_shader + 1314) -++#define mc_end (rpi_shader + 1542) -++ -++#endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+new file mode 100644 -+index 0000000..6851e83 -+--- /dev/null -++++ b/libavcodec/rpi_shader.qasm -+@@ -0,0 +1,1413 @@ -++# register allocation -++# -++# ra0...ra7 eight horizontal filter coefficients -++# -++# rb1...rb7 seven shifted copies of the current unfiltered row -++# -++# ra8...ra15 eight filtered rows of context (rb15 == most recent) -++# -++# (ra15 isn't clamped to zero - this happens during the -++# copy to ra14, and during its use in the vertical filter) -++# -++# rb8...rb15 eight vertical filter coefficients -++# -++# ra16 clipped(row start address+elem_num)&~3 -++# ra17 per-channel shifts -++# ra19 next ra17 -++# -++# rb16 pitch -++# rb17 height + 5 -++# rb18 height + 7 -++# rb19 next ra16 -++# -++# ra20 1 -++# ra21 64 -++# ra22 256 -++# ra23 8 -++# -++# rb20 0xffffff00 -++# rb21 64 -++# rb22 255 -++# rb23 24 -++# -++# rb24 vdw_setup_1(dst_pitch) -++# rb25 frame width-1 -++# rb26 height<<23 + width<<16 + vdw_setup_0 -++# rb27 vdw_setup_0 (depends on QPU number) -++# rb28 vpm_setup (depends on QPU number) -++# rb29 vdw_setup_1(dst_pitch-width) -++# rb30 frame height-1 -++# rb31 used as temp to count loop iterations -++# -++# ra24...ra30 15, 14, 13, 12, 11, 10, 9 -++# ra24 clipped(row start address+8+elem_num)&~3 -++# ra25 per-channel shifts 2 -++# ra26 next ra24 -++# ra27 next ra25 -++# ra28 next y -++# ra29 y for next texture access -++# -++# ra31 next kernel address -++ -++.set rb_frame_width_minus_1, rb25 -++.set rb_frame_height_minus_1, rb30 -++.set rb_pitch, rb16 -++.set ra_x_base, ra16 -++.set rb_x_base_next, rb19 -++.set ra_x2_base, ra24 -++.set ra_x2_base_next, ra26 -++.set ra_xshift, ra17 -++ -++.set ra_x2shift, ra25 -++.set ra_u2v_ref_offset, ra25 -++ -++.set ra_xshift_next, ra19 -++ -++.set ra_x2shift_next, ra27 -++.set ra_u2v_dst_offset, ra27 -++ -++.set ra_y_next, ra28 -++.set ra_y, ra29 -++ -++.set rb_const_64, rb21 -++ -++# mc_setup(next_kernel, x, y, ref_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1) -++::mc_setup -++ -++# Read starting kernel -++mov ra31, unif -++ -++# Load first request location -++add ra_x_base, unif, elem_num # Store x -++mov ra_y, unif # Store y -++mov ra_x2_base, unif # Store frame base -++ -++# Read image dimensions -++sub rb25,unif,1 -++sub rb30,unif,1 -++ -++# get source pitch -++mov rb16, unif -++ -++# get destination pitch -++mov r0, unif -++mov r1, vdw_setup_1(0) -++add rb24, r1, r0 -++ -++# load constants -++ -++mov ra20, 1 -++mov ra21, 64 -++mov ra22, 256 -++mov ra23, 8 -++ -++mov rb20, 0xffffff00 -++mov rb21, 64 -++mov rb22, 255 -++mov rb23, 24 -++ -++# touch vertical context to keep simulator happy -++ -++mov ra8, 0 -++mov ra9, 0 -++mov ra10, 0 -++mov ra11, 0 -++mov ra12, 0 -++mov ra13, 0 -++mov ra14, 0 -++mov ra15, 0 -++ -++# Compute part of VPM to use for DMA output -++mov r2, qpu_num -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++shl r0, r0, 5 -++add rb27, r0, r1 -++ -++# Compute part of VPM to save data into -++mov r2, qpu_num -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vpm_setup(0, 4, h8p(0, 0)) -++add rb28, r0, r1 -++ -++# Compute base address for first and second access -++#add r0, unif, elem_num # x -++mov r0, ra_x_base # Load x -++add r2, r0, 8 # x+8 -++max r0, r0, 0; mov r1, ra_y # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -++shl ra_xshift_next, r0, 3 -++max r2, r2, 0 -++add ra_y, r1, 1 -++min r2, r2, rb_frame_width_minus_1 -++shl ra_x2shift_next, r2, 3 -++max r1, r1, 0 # y -++min r1, r1, rb_frame_height_minus_1 -++add r0, r0, r3; mul24 r1, r1, rb_pitch -++add r2, r2, r3 -++and r0, r0, ~3 -++and r2, r2, ~3; mov ra_x_base, r0 -++# submit texture requests for first line -++add t0s, r0, r1 ; mov ra_x2_base, r2 -++add t0s, r2, r1 -++ -++# Dump padding words -++mov r0, unif -++mov r0, unif -++ -++# submit texture requests for second line -++max r1, ra_y, 0 -++min r1, r1, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 -++bra -, ra31 -++nop ; mul24 r1, r1, rb_pitch -++add t0s, r1, ra_x_base -++add t0s, r1, ra_x2_base -++ -++################################################################################ -++ -++# mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter_uv -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -++shl ra_xshift_next, r0, 3 -++sub r2, unif, r3 # compute offset from frame base u to frame base v -++add r0, r0, r3 -++and rb_x_base_next, r0, ~3 -++mov ra_y_next, r1 -++add ra_x2_base_next, rb_x_base_next, r2 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++asr rb12, r0, rb23 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:uvloop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:uvloop -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++brr.anyn -, r:uvloop -++asr r1, r1, 15 -++min r1, r1, rb22 -++max vpm, r1, 0 -++ -++# DMA out for U -++ -++mov vw_setup, rb26 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++# DMA out for V -++# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -++# Could potentially push this write into the start of the next pipeline stage. -++mov r0, 16 -++mov -, vw_wait -++ -++bra -, ra31 -++add vw_setup, rb26, r0 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++################################################################################ -++ -++ -++# mc_filter(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov ra_x2shift, ra_x2shift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++add r2, r0, 8 # x+8 -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -++shl ra_xshift_next, r0, 3 -++max r2, r2, 0 -++min r2, r2, rb_frame_width_minus_1 -++shl ra_x2shift_next, r2, 3 -++add r0, r0, r3 -++add r2, r2, r3 -++and rb_x_base_next, r0, ~3 -++and ra_x2_base_next, r2, ~3 -++mov ra_y_next, r1 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++brr.anynn -, r:fast_path -++asr rb12, r0, rb23 # delay slot 1 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 # delay slot 2 -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] # delay slot 3 -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++## nop ; ldtmu0 # loop counter increment -++## shr r0, r4, ra17 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 ; mul24 r3, r0, ra0 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++## sub r2, r2, r3 ; ldtmu0 -++## -++## mov r0, ra22 -++## shr r0, r4, ra17 ; mul24 r2, r2, r0 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # apply horizontal filter -++## -++## asr r2, r2, 15 ; mul24 r3, r0, ra0 -++## min r2, r2, rb22 -++## max ra13, r2, 0 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++## sub r0, r2, r3 -++## -++## # apply horizontal filter -++## -++## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -++## asr r0, r0, 15 -++## min r0, r0, rb22 -++## max ra14, r0, 0 -++## -++## -++## -++## -++## nop ; ldtmu0 # loop counter increment -++## shr r0, r4, ra17 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 ; mul24 r3, r0, ra0 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++## sub r0, r2, r3 -++## -++## # apply horizontal filter -++## -++## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -++## asr r0, r0, 15 -++## min r0, r0, rb22 -++## max ra15, r0, 0 -++ -++ -++ -++ -++mov r3, 0 -++ -++:loop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:loop -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++brr.anyn -, r:loop -++asr r1, r1, 15 -++min r1, r1, rb22 -++max vpm, r1, 0 -++ -++# DMA out -++ -++bra -, ra31 -++mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -++mov vw_setup, rb29 -++mov vw_addr, unif # start the VDW -++ -++#################################################### -++ -++:fast_path -++## nop ; ldtmu0 # loop counter increment -++## shr r0, r4, ra17 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 ; mul24 r3, r0, ra0 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## sub r2, r2, r3 ; ldtmu0 -++## -++## mov r0, ra22 -++## shr r0, r4, ra17 ; mul24 r2, r2, r0 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # apply horizontal filter -++## -++## asr r2, r2, 15 ; mul24 r3, r0, ra0 -++## min r2, r2, rb22 -++## max ra13, r2, 0 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## sub r0, r2, r3 -++## -++## # apply horizontal filter -++## -++## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -++## asr r0, r0, 15 -++## min r0, r0, rb22 -++## max ra14, r0, 0 -++## -++## -++## -++## -++## nop ; ldtmu0 # loop counter increment -++## shr r0, r4, ra17 ; ldtmu0 -++## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -++## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -++## add ra16, ra16, rb16 ; mov t0s, ra16 -++## -++## # generate seven shifted versions -++## # interleave with scroll of vertical context -++## -++## mov r2, rb21 ; mul24 r3, r0, ra0 -++## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++## sub r0, r2, r3 -++## -++## # apply horizontal filter -++## -++## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -++## asr r0, r0, 15 -++## min r0, r0, rb22 -++## max ra15, r0, 0 -++ -++ -++mov r3, 0 # This signifies the amount of unrolling -++ -++:fast_loop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++# Due to pipelining we can only skip second pipeline instructions related to the fetched pixels -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_y, ra_y_next ; mov rb31, r3 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -++ -++max r2, ra_y, 0 -++min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 # discard texture read -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++sub r0, r2, r3 ; mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++ -++brr.anyn -, r:fast_loop -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++brr.anyn -, r:fast_loop -++asr r1, r1, 15 -++min r1, r1, rb22 -++max vpm, r1, 0 -++ -++# DMA out -++ -++bra -, ra31 -++mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -++mov vw_setup, rb29 -++mov vw_addr, unif # start the VDW -++ -++################################################################################ -++ -++# mc_filter_b(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter_b -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov ra_x2shift, ra_x2shift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++add r2, r0, 8 # x+8 -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -++shl ra_xshift_next, r0, 3 -++max r2, r2, 0 -++min r2, r2, rb_frame_width_minus_1 -++shl ra_x2shift_next, r2, 3 -++add r0, r0, r3 -++add r2, r2, r3 -++and rb_x_base_next, r0, ~3 -++and ra_x2_base_next, r2, ~3 -++mov ra_y_next, r1 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++# r0 is currently height<<7 -++# For vr_setup we want height<<20 (so 20-7=13 additional bits) -++shl r3, r0, 13 -++shl r3, r3, 8 # Mask off top 8 bits -++shr r3, r3, 8 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++# In a B frame, so also set up VPM read -++add vr_setup, r3, rb28 -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++asr rb12, r0, rb23 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++mov r3, 0 -++ -++:bloop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:bloop -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 15 ; mov -, vr_wait -++min r1, r1, rb22 -++add r0, vpm, 1 # Blend in previous VPM contents at this location -++brr.anyn -, r:bloop -++max r1, r1, 0 -++add r1, r1, r0 -++shr vpm, r1, 1 -++ -++# DMA out -++ -++bra -, ra31 -++mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -++mov vw_setup, rb29 -++mov vw_addr, unif # start the VDW -++ -++################################################################################ -++ -++# mc_filter_honly(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -++# This filter only does horizontal filtering. -++# It is assumed that the region to fetch does not include extra rows above. -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter_honly -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov ra_x2shift, ra_x2shift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++add r2, r0, 8 # x+8 -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -++shl ra_xshift_next, r0, 3 -++max r2, r2, 0 -++min r2, r2, rb_frame_width_minus_1 -++shl ra_x2shift_next, r2, 3 -++add r0, r0, r3 -++add r2, r2, r3 -++and rb_x_base_next, r0, ~3 -++and ra_x2_base_next, r2, ~3 -++mov ra_y_next, r1 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, -2 # Pipelining means we move data across 2 iterations early -++shl r0, r0, 7 ; mov rb18,r0 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++mov r0, unif -++ -++# r2 is elem_num -++# r3 is loop counter -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] # delay slot 3 -++mov r3, 0 -++ -++:loop_honly -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 ; mov r3, rb31 -++ -++sub.setf -, r3, rb18 ; mov r1, ra22 -++ -++mov -, vw_wait ; mul24 r0, r0, r1 -++brr.anyn -, r:loop_honly -++asr r0, r0, 15 # delay 1 -++min r0, r0, rb22 # delay 2 -++max vpm, r0, 0 # delay 3 -++ -++# DMA out -++bra -, ra31 -++mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -++mov vw_setup, rb29 -++mov vw_addr, unif # start the VDW -++ -++ -++################################################################################ -++ -++# mc_exit() -++ -++::mc_exit -++mov -, vw_wait # wait on the VDW -++ -++mov -,srel(0) -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++nop ; nop ; thrend -++nop ; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++::mc_exit1 -++mov -, vw_wait # wait on the VDW -++ -++#mov -,srel(1) -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++# mc_interrupt_exit() -++::mc_interrupt_exit -++mov -, vw_wait # wait on the VDW -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++mov -,sacq(0) # 1 -++mov -,sacq(0) # 2 -++mov -,sacq(0) # 3 -++mov -,sacq(0) # 4 -++mov -,sacq(0) # 5 -++mov -,sacq(0) # 6 -++mov -,sacq(0) # 7 -++mov -,sacq(0) # 8 -++mov -,sacq(0) # 9 -++mov -,sacq(0) # 10 -++mov -,sacq(0) # 11 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++# mc_interrupt_exit4() -++::mc_interrupt_exit4 -++mov -, vw_wait # wait on the VDW -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++mov -,sacq(0) # 1 -++mov -,sacq(0) # 2 -++mov -,sacq(0) # 3 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++# mc_interrupt_exit8() -++::mc_interrupt_exit8 -++mov -, vw_wait # wait on the VDW -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++mov -,sacq(0) # 1 -++mov -,sacq(0) # 2 -++mov -,sacq(0) # 3 -++mov -,sacq(0) # 4 -++mov -,sacq(0) # 5 -++mov -,sacq(0) # 6 -++mov -,sacq(0) # 7 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++################################################################################ -++# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -++::mc_setup_uv -++ -++# Read starting kernel -++mov ra31, unif -++ -++# Load first request location -++add ra_x_base, unif, elem_num # Store x -++mov ra_y, unif # Store y -++mov ra_x2_base, unif # Store frame u base -++nop -++sub ra_u2v_ref_offset, unif, ra_x2_base # Store offset to add to move from u to v in reference frame -++ -++# Read image dimensions -++sub rb25,unif,1 -++sub rb30,unif,1 -++ -++# get source pitch -++mov rb16, unif -++ -++# get destination pitch -++mov r0, unif -++mov r1, vdw_setup_1(0) -++add rb24, r1, r0 -++ -++# load constants -++ -++mov ra20, 1 -++mov ra21, 64 -++mov ra22, 256 -++mov ra23, 8 -++ -++mov rb20, 0xffffff00 -++mov rb21, 64 -++mov rb22, 255 -++mov rb23, 24 -++ -++# touch vertical context to keep simulator happy -++ -++mov ra8, 0 -++mov ra9, 0 -++mov ra10, 0 -++mov ra11, 0 -++mov ra12, 0 -++mov ra13, 0 -++mov ra14, 0 -++mov ra15, 0 -++ -++# Compute part of VPM to use for DMA output -++mov r2, qpu_num -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++shl r0, r0, 5 -++add rb27, r0, r1 -++ -++# Compute part of VPM to save data into -++mov r2, qpu_num -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vpm_setup(0, 4, h8p(0, 0)) -++add rb28, r0, r1 -++ -++# Compute base address for first and second access -++mov r0, ra_x_base # Load x -++max r0, r0, 0; mov r1, ra_y # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -++shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++add ra_y, r1, 1 -++add r0, r0, r3 -++and r0, r0, ~3 -++max r1, r1, 0 ; mov ra_x_base, r0 # y -++min r1, r1, rb_frame_height_minus_1 -++# submit texture requests for first line -++add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++add t0s, r0, r1 ; mov ra_x2_base, r2 -++add t0s, r2, r1 -++ -++# Dump padding words -++mov r0, unif -++mov r0, unif -++mov r0, unif -++ -++# submit texture requests for second line -++max r1, ra_y, 0 -++min r1, r1, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 -++bra -, ra31 -++nop ; mul24 r1, r1, rb_pitch -++add t0s, r1, ra_x_base -++add t0s, r1, ra_x2_base -++ -++ -++ -++################################################################################ -++ -++::mc_filter_uv_b -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -++shl ra_xshift_next, r0, 3 -++sub r2, unif, r3 # compute offset from frame base u to frame base v -++add r0, r0, r3 -++and rb_x_base_next, r0, ~3 -++mov ra_y_next, r1 -++add ra_x2_base_next, rb_x_base_next, r2 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++ -++# r0 is currently height<<7 -++# For vr_setup we want height<<20 (so 20-7=13 additional bits) -++shl r3, r0, 13 -++shl r3, r3, 8 # Mask off top 8 bits -++shr r3, r3, 8 -++ -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++# In a B frame, so also set up VPM read -++add vr_setup, r3, rb28 -++ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++asr rb12, r0, rb23 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:uvloop_b -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r2, rb21 ; mul24 r3, r0, ra0 -++nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++sub r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:uvloop_b -++max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr r0, r0, 15 ; mov r1, ra21 -++min.setf ra15, r0, rb22 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r0, ra14, rb14 -++sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++sub.ifnn r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 15 -++min r1, r1, rb22 -++add r0, vpm, 1 # Blend in previous VPM contents at this location -++brr.anyn -, r:uvloop_b -++max r1, r1, 0 -++add r1, r1, r0 -++shr vpm, r1, 1 -++ -++ -++# DMA out for U -++ -++mov vw_setup, rb26 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++# DMA out for V -++# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -++# Could potentially push this write into the start of the next pipeline stage. -++mov r0, 16 -++mov -, vw_wait -++ -++bra -, ra31 -++add vw_setup, rb26, r0 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++::mc_end -+diff --git a/libavcodec/rpi_user_vcsm.h b/libavcodec/rpi_user_vcsm.h -+new file mode 100644 -+index 0000000..fbebbbe -+--- /dev/null -++++ b/libavcodec/rpi_user_vcsm.h -+@@ -0,0 +1,425 @@ -++/* -++Copyright (c) 2012, Broadcom Europe 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. -++ * Neither the name of the copyright holder nor the -++ names of its contributors may be used to endorse or promote products -++ derived from this software without specific prior written permission. -++ -++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -++DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -++ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -++(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 __USER_VCSM__H__INCLUDED__ -++#define __USER_VCSM__H__INCLUDED__ -++ -++/* VideoCore Shared Memory - user interface library. -++** -++** This library provides all the necessary abstraction for any application to -++** make use of the shared memory service which is distributed accross a kernel -++** driver and a videocore service. -++** -++** It is an application design decision to choose or not to use this service. -++** -++** The logical flow of operations that a user application needs to follow when -++** using this service is: -++** -++** 1) Initialize the service. -++** 2) Allocate shared memory blocks. -++** 3) Start using the allocated blocks. -++** - In order to gain ownership on a block, lock the allocated block, -++** locking a block returns a valid address that the user application -++** can access. -++** - When finished with using the block for the current execution cycle -++** or function, and so when giving up the ownership, unlock the block. -++** 4) A block can be locked/unlocked as many times required - within or outside -++** of - a specific execution context. -++** 5) To completely release an allocated block, free it. -++** 6) If the service is no longer required, terminate it. -++** -++** -++** Some generic considerations: -++ -++** Allocating memory blocks. -++** -++** Memory blocks can be allocated in different manners depending on the cache -++** behavior desired. A given block can either be: -++ -++** - Allocated in a non cached fashion all the way through host and videocore. -++** - Allocated in a cached fashion on host OR videocore. -++** - Allocated in a cached fashion on host AND videocore. -++** -++** It is an application decision to determine how to allocate a block. Evidently -++** if the application will be doing substantial read/write accesses to a given block, -++** it is recommended to allocate the block at least in a 'host cached' fashion for -++** better results. -++** -++** -++** Locking memory blocks. -++** -++** When the memory block has been allocated in a host cached fashion, locking the -++** memory block (and so taking ownership of it) will trigger a cache invalidation. -++** -++** For the above reason and when using host cached allocation, it is important that -++** an application properly implements the lock/unlock mechanism to ensure cache will -++** stay coherent, otherwise there is no guarantee it will at all be. -++** -++** It is possible to dynamically change the host cache behavior (ie cached or non -++** cached) of a given allocation without needing to free and re-allocate the block. -++** This feature can be useful for such application which requires access to the block -++** only at certain times and not otherwise. By changing the cache behavior dynamically -++** the application can optimize performances for a given duration of use. -++** Such dynamic cache behavior remapping only applies to host cache and not videocore -++** cache. If one requires to change the videocore cache behavior, then a new block -++** must be created to replace the old one. -++** -++** On successful locking, a valid pointer is returned that the application can use -++** to access to data inside the block. There is no guarantee that the pointer will -++** stay valid following the unlock action corresponding to this lock. -++** -++** -++** Unocking memory blocks. -++** -++** When the memory block has been allocated in a host cached fashion, unlocking the -++** memory block (and so forgiving its ownership) will trigger a cache flush unless -++** explicitely asked not to flush the cache for performances reasons. -++** -++** For the above reason and when using host cached allocation, it is important that -++** an application properly implements the lock/unlock mechanism to ensure cache will -++** stay coherent, otherwise there is no guarantee it will at all be. -++** -++** -++** A complete API is defined below. -++*/ -++ -++#ifdef __cplusplus -++extern "C" -++{ -++#endif -++ -++/* Different status that can be dumped. -++*/ -++typedef enum -++{ -++ VCSM_STATUS_VC_WALK_ALLOC = 0, // Walks *all* the allocation on videocore. -++ // Result of the walk is seen in the videocore -++ // log. -++ VCSM_STATUS_HOST_WALK_MAP, // Walks the *full* mapping allocation on host -++ // driver (ie for all processes). Result of -++ // the walk is seen in the kernel log. -++ VCSM_STATUS_HOST_WALK_PID_MAP, // Walks the per process mapping allocation on host -++ // driver (for current process). Result of -++ // the walk is seen in the kernel log. -++ VCSM_STATUS_HOST_WALK_PID_ALLOC, // Walks the per process host allocation on host -++ // driver (for current process). Result of -++ // the walk is seen in the kernel log. -++ VCSM_STATUS_VC_MAP_ALL, // Equivalent to both VCSM_STATUS_VC_WALK_ALLOC and -++ // VCSM_STATUS_HOST_WALK_MAP. -++ // -++ VCSM_STATUS_NONE, // Must be last - invalid. -++ -++} VCSM_STATUS_T; -++ -++/* Different kind of cache behavior. -++*/ -++typedef enum -++{ -++ VCSM_CACHE_TYPE_NONE = 0, // No caching applies. -++ VCSM_CACHE_TYPE_HOST, // Allocation is cached on host (user space). -++ VCSM_CACHE_TYPE_VC, // Allocation is cached on videocore. -++ VCSM_CACHE_TYPE_HOST_AND_VC, // Allocation is cached on both host and videocore. -++ -++} VCSM_CACHE_TYPE_T; -++ -++/* Initialize the vcsm processing. -++** -++** Must be called once before attempting to do anything else. -++** -++** Returns 0 on success, -1 on error. -++*/ -++int vcsm_init( void ); -++ -++ -++/* Terminates the vcsm processing. -++** -++** Must be called vcsm services are no longer needed, it will -++** take care of removing any allocation under the current process -++** control if deemed necessary. -++*/ -++void vcsm_exit( void ); -++ -++ -++/* Queries the status of the the vcsm. -++** -++** Triggers dump of various kind of information, see the -++** different variants specified in VCSM_STATUS_T. -++** -++** Pid is optional. -++*/ -++void vcsm_status( VCSM_STATUS_T status, int pid ); -++ -++ -++/* Allocates a non-cached block of memory of size 'size' via the vcsm memory -++** allocator. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** On success, the user must invoke vcsm_lock with the returned opaque -++** handle to gain access to the memory associated with the opaque handle. -++** When finished using the memory, the user calls vcsm_unlock_xx (see those -++** function definition for more details on the one that can be used). -++** -++** A well behaved application should make every attempt to lock/unlock -++** only for the duration it needs to access the memory data associated with -++** the opaque handle. -++*/ -++unsigned int vcsm_malloc( unsigned int size, char *name ); -++ -++ -++/* Allocates a cached block of memory of size 'size' via the vcsm memory -++** allocator, the type of caching requested is passed as argument of the -++** function call. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** On success, the user must invoke vcsm_lock with the returned opaque -++** handle to gain access to the memory associated with the opaque handle. -++** When finished using the memory, the user calls vcsm_unlock_xx (see those -++** function definition for more details on the one that can be used). -++** -++** A well behaved application should make every attempt to lock/unlock -++** only for the duration it needs to access the memory data associated with -++** the opaque handle. -++*/ -++unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char *name ); -++ -++ -++/* Shares an allocated block of memory via the vcsm memory allocator. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** On success, the user must invoke vcsm_lock with the returned opaque -++** handle to gain access to the memory associated with the opaque handle. -++** When finished using the memory, the user calls vcsm_unlock_xx (see those -++** function definition for more details on the one that can be used). -++** -++** A well behaved application should make every attempt to lock/unlock -++** only for the duration it needs to access the memory data associated with -++** the opaque handle. -++*/ -++unsigned int vcsm_malloc_share( unsigned int handle ); -++ -++ -++/* Resizes a block of memory allocated previously by vcsm_alloc. -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** The handle must be unlocked by user prior to attempting any -++** resize action. -++** -++** On error, the original size allocated against the handle -++** remains available the same way it would be following a -++** successful vcsm_malloc. -++*/ -++int vcsm_resize( unsigned int handle, unsigned int new_size ); -++ -++ -++/* Frees a block of memory that was successfully allocated by -++** a prior call the vcms_alloc. -++** -++** The handle should be considered invalid upon return from this -++** call. -++** -++** Whether any memory is actually freed up or not as the result of -++** this call will depends on many factors, if all goes well it will -++** be freed. If something goes wrong, the memory will likely end up -++** being freed up as part of the vcsm_exit process. In the end the -++** memory is guaranteed to be freed one way or another. -++*/ -++void vcsm_free( unsigned int handle ); -++ -++ -++/* Retrieves a videocore opaque handle from a mapped user address -++** pointer. The videocore handle will correspond to the actual -++** memory mapped in videocore. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** Note: the videocore opaque handle is distinct from the user -++** opaque handle (allocated via vcsm_malloc) and it is only -++** significant for such application which knows what to do -++** with it, for the others it is just a number with little -++** use since nothing can be done with it (in particular -++** for safety reason it cannot be used to map anything). -++*/ -++unsigned int vcsm_vc_hdl_from_ptr( void *usr_ptr ); -++ -++ -++/* Retrieves a videocore opaque handle from a opaque handle -++** pointer. The videocore handle will correspond to the actual -++** memory mapped in videocore. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++** -++** Note: the videocore opaque handle is distinct from the user -++** opaque handle (allocated via vcsm_malloc) and it is only -++** significant for such application which knows what to do -++** with it, for the others it is just a number with little -++** use since nothing can be done with it (in particular -++** for safety reason it cannot be used to map anything). -++*/ -++unsigned int vcsm_vc_hdl_from_hdl( unsigned int handle ); -++ -++ -++/* Retrieves a user opaque handle from a mapped user address -++** pointer. -++** -++** Returns: 0 on error -++** a non-zero opaque handle on success. -++*/ -++unsigned int vcsm_usr_handle( void *usr_ptr ); -++ -++ -++/* Retrieves a mapped user address from an opaque user -++** handle. -++** -++** Returns: 0 on error -++** a non-zero address on success. -++** -++** On success, the address corresponds to the pointer -++** which can access the data allocated via the vcsm_malloc -++** call. -++*/ -++void *vcsm_usr_address( unsigned int handle ); -++ -++ -++/* Locks the memory associated with this opaque handle. -++** -++** Returns: NULL on error -++** a valid pointer on success. -++** -++** A user MUST lock the handle received from vcsm_malloc -++** in order to be able to use the memory associated with it. -++** -++** On success, the pointer returned is only valid within -++** the lock content (ie until a corresponding vcsm_unlock_xx -++** is invoked). -++*/ -++void *vcsm_lock( unsigned int handle ); -++ -++ -++/* Locks the memory associated with this opaque handle. The lock -++** also gives a chance to update the *host* cache behavior of the -++** allocated buffer if so desired. The *videocore* cache behavior -++** of the allocated buffer cannot be changed by this call and such -++** attempt will be ignored. -++** -++** The system will attempt to honour the cache_update mode request, -++** the cache_result mode will provide the final answer on which cache -++** mode is really in use. Failing to change the cache mode will not -++** result in a failure to lock the buffer as it is an application -++** decision to choose what to do if (cache_result != cache_update) -++** -++** The value returned in cache_result can only be considered valid if -++** the returned pointer is non NULL. The cache_result pointer may be -++** NULL if the application does not care about the actual outcome of -++** its action with regards to the cache behavior change. -++** -++** Returns: NULL on error -++** a valid pointer on success. -++** -++** A user MUST lock the handle received from vcsm_malloc -++** in order to be able to use the memory associated with it. -++** -++** On success, the pointer returned is only valid within -++** the lock content (ie until a corresponding vcsm_unlock_xx -++** is invoked). -++*/ -++void *vcsm_lock_cache( unsigned int handle, -++ VCSM_CACHE_TYPE_T cache_update, -++ VCSM_CACHE_TYPE_T *cache_result ); -++ -++ -++/* Unlocks the memory associated with this user mapped address. -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** After unlocking a mapped address, the user should no longer -++** attempt to reference it. -++*/ -++int vcsm_unlock_ptr( void *usr_ptr ); -++ -++ -++/* Unlocks the memory associated with this user mapped address. -++** Apply special processing that would override the otherwise -++** default behavior. -++** -++** If 'cache_no_flush' is specified: -++** Do not flush cache as the result of the unlock (if cache -++** flush was otherwise applicable in this case). -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** After unlocking a mapped address, the user should no longer -++** attempt to reference it. -++*/ -++int vcsm_unlock_ptr_sp( void *usr_ptr, int cache_no_flush ); -++ -++ -++/* Unlocks the memory associated with this user opaque handle. -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** After unlocking an opaque handle, the user should no longer -++** attempt to reference the mapped addressed once associated -++** with it. -++*/ -++int vcsm_unlock_hdl( unsigned int handle ); -++ -++ -++/* Unlocks the memory associated with this user opaque handle. -++** Apply special processing that would override the otherwise -++** default behavior. -++** -++** If 'cache_no_flush' is specified: -++** Do not flush cache as the result of the unlock (if cache -++** flush was otherwise applicable in this case). -++** -++** Returns: 0 on success -++** -errno on error. -++** -++** After unlocking an opaque handle, the user should no longer -++** attempt to reference the mapped addressed once associated -++** with it. -++*/ -++int vcsm_unlock_hdl_sp( unsigned int handle, int cache_no_flush ); -++ -++#ifdef __cplusplus -++} -++#endif -++ -++#endif /* __USER_VCSM__H__INCLUDED__ */ -+-- -+2.7.4 -+ -+ -+From 6cfa5910be47865aaaf58c185587189c332765a6 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Sat, 2 May 2015 21:15:37 +0100 -+Subject: [PATCH 04/68] First working version with uncached memory -+ -+--- -+ libavcodec/hevc.c | 61 +++++- -+ libavcodec/hevc.h | 12 +- -+ libavcodec/hevc_cabac.c | 39 +++- -+ libavcodec/hevc_filter.c | 16 ++ -+ libavcodec/hevcpred_template.c | 6 + -+ libavcodec/rpi_hevc_transform.h | 422 +++++++++++++++++++++++++++++++++++++++- -+ libavcodec/rpi_hevc_transform.s | 153 +++++++++++++-- -+ libavcodec/rpi_qpu.c | 72 +++++++ -+ libavcodec/rpi_qpu.h | 1 + -+ 9 files changed, 736 insertions(+), 46 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index ab55df1..94ff709 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -45,6 +45,8 @@ -+ #include "rpi_qpu.h" -+ #endif -+ -++// #define DISABLE_MC -++ -+ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; -+ -+ /** -+@@ -1079,11 +1081,15 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (size * size); i++) { -+ coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -++ printf("Cross component not supported\n"); // TODO -++ exit(-1); -+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride); -+ } -+ } -+ -+ if (lc->tu.cross_pf) { -++ printf("Cross component not supported\n"); // TODO -++ exit(-1); -+ hls_cross_component_pred(s, 1); -+ } -+ for (i = 0; i < (s->ps.sps->chroma_format_idc == 2 ? 2 : 1); i++) { -+@@ -1112,6 +1118,8 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (size * size); i++) { -+ coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -++ printf("Cross component not supported\n"); // TODO -++ exit(-1); -+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride); -+ } -+ } -+@@ -1409,6 +1417,10 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ int idx = ff_hevc_pel_weight[block_w]; -+ -++#ifdef DISABLE_MC -++ return; -++#endif -++ -+ x_off += mv->x >> 2; -+ y_off += mv->y >> 2; -+ src += y_off * srcstride + (x_off * (1 << s->ps.sps->pixel_shift)); -+@@ -1479,6 +1491,10 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ uint8_t *src0 = ref0->data[0] + y_off0 * src0stride + (int)((unsigned)x_off0 << s->ps.sps->pixel_shift); -+ uint8_t *src1 = ref1->data[0] + y_off1 * src1stride + (int)((unsigned)x_off1 << s->ps.sps->pixel_shift); -+ -++#ifdef DISABLE_MC -++ return; -++#endif -++ -+ if (x_off0 < QPEL_EXTRA_BEFORE || y_off0 < QPEL_EXTRA_AFTER || -+ x_off0 >= pic_width - block_w - QPEL_EXTRA_AFTER || -+ y_off0 >= pic_height - block_h - QPEL_EXTRA_AFTER) { -+@@ -1564,6 +1580,10 @@ static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ intptr_t _mx = mx << (1 - hshift); -+ intptr_t _my = my << (1 - vshift); -+ -++#ifdef DISABLE_MC -++ return; -++#endif -++ -+ x_off += mv->x >> (2 + hshift); -+ y_off += mv->y >> (2 + vshift); -+ src0 += y_off * srcstride + (x_off * (1 << s->ps.sps->pixel_shift)); -+@@ -1628,6 +1648,10 @@ static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVF -+ int hshift = s->ps.sps->hshift[1]; -+ int vshift = s->ps.sps->vshift[1]; -+ -++#ifdef DISABLE_MC -++ return; -++#endif -++ -+ intptr_t mx0 = av_mod_uintp2(mv0->x, 2 + hshift); -+ intptr_t my0 = av_mod_uintp2(mv0->y, 2 + vshift); -+ intptr_t mx1 = av_mod_uintp2(mv1->x, 2 + hshift); -+@@ -2367,6 +2391,22 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ } -+ -+ #ifdef RPI -++static void rpi_execute_transform(HEVCContext *s) -++{ -++ int i=2; -++ //int j; -++ //int16_t *coeffs = s->coeffs_buf_arm[i]; -++ //for(j=s->num_coeffs[i]; j > 0; j-= 16*16, coeffs+=16*16) { -++ // s->hevcdsp.idct[4-2](coeffs, 16); -++ //} -++ -++ //gpu_cache_flush(&s->coeffs_buf[i]); -++ vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[i].vc, s->num_coeffs[i] >> 8, 0, 0, 0); -++ -++ for(i=0;i<4;i++) -++ s->num_coeffs[i] = 0; -++} -++ -+ static void rpi_execute_pred_cmds(HEVCContext *s) -+ { -+ int i; -+@@ -2387,7 +2427,6 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ } -+ } -+ s->num_pred_cmds = 0; -+- s->num_coeffs = 0; -+ } -+ #endif -+ -+@@ -2434,7 +2473,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ #ifdef RPI -+- if (x_ctb + ctb_size >= s->ps.sps->width) { -++ if (1 || x_ctb + ctb_size >= s->ps.sps->width) { // TODO watch out for deblocking! -++ rpi_execute_transform(s); -+ rpi_execute_pred_cmds(s); -+ } -+ #endif -+@@ -3179,7 +3219,9 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->unif_mv_cmds); -+ av_freep(&s->unif_xfm_cmds); -+ av_freep(&s->univ_pred_cmds); -+- av_freep(&s->coeffs_buf); -++ for(i = 0; i < 4; i++) { -++ gpu_free(&s->coeffs_buf[i]); -++ } -+ #endif -+ -+ for (i = 0; i < 3; i++) { -+@@ -3246,13 +3288,16 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -+ if (!s->univ_pred_cmds) -+ goto fail; -+- s->coeffs_buf = av_mallocz(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16); -+- if (!s->coeffs_buf) -+- goto fail; -++ for(i = 0; i < 4; i++) { -++ gpu_malloc_uncached(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16, &s->coeffs_buf[i]); // TODO slim this down and share across sizes -++ s->coeffs_buf_arm[i] = (int16_t*) s->coeffs_buf[i].arm; -++ if (!s->coeffs_buf_arm[i]) -++ goto fail; -++ } -+ s->enable_rpi = 0; -+ -+ // A little test program -+- { -++ /*{ -+ GPU_MEM_PTR_T p; -+ int err = gpu_malloc_cached(16, &p); -+ short *q = (short *)p.arm; -+@@ -3273,7 +3318,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ printf(")\n"); -+ gpu_free(&p); -+ goto fail; // Early out -+- } -++ }*/ -+ -+ #endif -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 7a1c35f..4167985 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -40,6 +40,11 @@ -+ #include "thread.h" -+ #include "videodsp.h" -+ -++// define RPI to split the CABAC/prediction/transform into separate stages -++#ifdef RPI -++#include "rpi_qpu.h" -++#endif -++ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+ #define MAX_REFS 16 -+ -+@@ -856,11 +861,12 @@ typedef struct HEVCContext { -+ HEVCMvCmd *unif_mv_cmds; -+ HEVCXfmCmd *unif_xfm_cmds; -+ HEVCPredCmd *univ_pred_cmds; -+- int16_t *coeffs_buf; -+- int num_mv_cmds; -++ GPU_MEM_PTR_T coeffs_buf[4]; -++ int16_t *coeffs_buf_arm[4]; -++ int num_coeffs[4]; -+ int num_xfm_cmds; -++ int num_mv_cmds; -+ int num_pred_cmds; -+- int num_coeffs; -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 4e97f06..d1cba86 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1031,6 +1031,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int vshift = s->ps.sps->vshift[c_idx]; -+ uint8_t *dst = &s->frame->data[c_idx][(y0 >> vshift) * stride + -+ ((x0 >> hshift) << s->ps.sps->pixel_shift)]; -++ int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag && !transform_skip_flag && !lc->tu.cross_pf && log2_trafo_size==4; -+ int16_t *coeffs = (int16_t*)(c_idx ? lc->edge_emu_buffer2 : lc->edge_emu_buffer); -+ uint8_t significant_coeff_group_flag[8][8] = {{0}}; -+ int explicit_rdpcm_flag = 0; -+@@ -1044,6 +1045,18 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ uint8_t dc_scale; -+ int pred_mode_intra = (c_idx == 0) ? lc->tu.intra_pred_mode : -+ lc->tu.intra_pred_mode_c; -++#ifdef RPI -++ if (s->enable_rpi) { -++ int n = trafo_size * trafo_size; -++ if (use_vpu) { -++ coeffs = s->coeffs_buf_arm[log2_trafo_size - 2] + s->num_coeffs[log2_trafo_size - 2]; -++ s->num_coeffs[log2_trafo_size - 2] += n; -++ } else { -++ coeffs = s->coeffs_buf_arm[0] + s->num_coeffs[0]; -++ s->num_coeffs[0] += n; -++ } -++ } -++#endif -+ -+ memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -+ -+@@ -1488,6 +1501,24 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } else if (lc->cu.pred_mode == MODE_INTRA && c_idx == 0 && log2_trafo_size == 2) { -+ s->hevcdsp.idct_4x4_luma(coeffs); -+ } else { -++#ifdef RPI -++ if (!use_vpu) { -++ int max_xy = FFMAX(last_significant_coeff_x, last_significant_coeff_y); -++ if (max_xy == 0) -++ s->hevcdsp.idct_dc[log2_trafo_size-2](coeffs); -++ else { -++ int col_limit = last_significant_coeff_x + last_significant_coeff_y + 4; -++ if (max_xy < 4) -++ col_limit = FFMIN(4, col_limit); -++ else if (max_xy < 8) -++ col_limit = FFMIN(8, col_limit); -++ else if (max_xy < 12) -++ col_limit = FFMIN(24, col_limit); -++ -++ s->hevcdsp.idct[log2_trafo_size-2](coeffs, col_limit); -++ } -++ } -++#else -+ int max_xy = FFMAX(last_significant_coeff_x, last_significant_coeff_y); -+ if (max_xy == 0) -+ s->hevcdsp.idct_dc[log2_trafo_size-2](coeffs); -+@@ -1501,6 +1532,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ col_limit = FFMIN(24, col_limit); -+ s->hevcdsp.idct[log2_trafo_size-2](coeffs, col_limit); -+ } -++#endif -+ } -+ } -+ if (lc->tu.cross_pf) { -+@@ -1512,14 +1544,11 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ #ifdef RPI -+ if (s->enable_rpi) { -+- int16_t *c = s->coeffs_buf + s->num_coeffs; -+- int n = trafo_size * trafo_size; -+ HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -+- memcpy(c, coeffs, n * sizeof(int16_t)); // TODO change pointer earlier and we can avoid this copy -+- s->num_coeffs += n; -++ //memcpy(coeffs2, coeffs, sizeof(int16_t) * trafo_size * trafo_size); // TODO -+ cmd->type = RPI_PRED_TRANSFORM_ADD; -+ cmd->size = log2_trafo_size; -+- cmd->buf = c; -++ cmd->buf = coeffs; -+ cmd->dst = dst; -+ cmd->stride = stride; -+ return; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 1f33b0c..e4c3da7 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -22,6 +22,10 @@ -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -++//#define DISABLE_SAO -++//#define DISABLE_DEBLOCK -++//#define DISABLE_STRENGTHS -++ -+ #include "libavutil/common.h" -+ #include "libavutil/internal.h" -+ -+@@ -273,6 +277,10 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y) -+ edges[2] = x_ctb == s->ps.sps->ctb_width - 1; -+ edges[3] = y_ctb == s->ps.sps->ctb_height - 1; -+ -++#ifdef DISABLE_SAO -++ return; -++#endif -++ -+ if (restore) { -+ if (!edges[0]) { -+ left_tile_edge = no_tile_filter && s->ps.pps->tile_id[ctb_addr_ts] != s->ps.pps->tile_id[s->ps.pps->ctb_addr_rs_to_ts[ctb_addr_rs-1]]; -+@@ -496,6 +504,10 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->ps.sps->pcm.loop_filter_disable_flag) || -+ s->ps.pps->transquant_bypass_enable_flag; -+ -++#ifdef DISABLE_DEBLOCK -++ return; -++#endif -++ -+ if (x0) { -+ left_tc_offset = s->deblock[ctb - 1].tc_offset; -+ left_beta_offset = s->deblock[ctb - 1].beta_offset; -+@@ -726,6 +738,10 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ int boundary_upper, boundary_left; -+ int i, j, bs; -+ -++#ifdef DISABLE_STRENGTHS -++ return; -++#endif -++ -+ boundary_upper = y0 > 0 && !(y0 & 7); -+ if (boundary_upper && -+ ((!s->sh.slice_loop_filter_across_slices_enabled_flag && -+diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c -+index 6ae87cc..71c6d52 100644 -+--- a/libavcodec/hevcpred_template.c -++++ b/libavcodec/hevcpred_template.c -+@@ -20,6 +20,8 @@ -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -++//#define DISABLE_INTRA -++ -+ #include "libavutil/pixdesc.h" -+ -+ #include "bit_depth_template.c" -+@@ -114,6 +116,10 @@ do { \ -+ int top_right_size = (FFMIN(x0 + 2 * size_in_luma_h, s->ps.sps->width) - -+ (x0 + size_in_luma_h)) >> hshift; -+ -++#ifdef DISABLE_INTRA -++ return; -++#endif -++ -+ if (s->ps.pps->constrained_intra_pred_flag == 1) { -+ int size_in_luma_pu_v = PU(size_in_luma_v); -+ int size_in_luma_pu_h = PU(size_in_luma_h); -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index 85a9102..c0c279f 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -3,11 +3,11 @@ unsigned char rpi_hevc_transform [] = { -+ 3, -+ 3, -+ 232, -+-128, -++32, -+ 0, -+ 0, -+ 0, -+-20, -++12, -+ 248, -+ 0, -+ 136, -+@@ -56,9 +56,9 @@ unsigned char rpi_hevc_transform [] = { -+ 5, -+ 232, -+ 0, -+-0, -+ 8, -+ 0, -++0, -+ 128, -+ 69, -+ 113, -+@@ -108,8 +108,8 @@ unsigned char rpi_hevc_transform [] = { -+ 128, -+ 2, -+ 0, -+-248, -+-62, -++8, -++2, -+ 0, -+ 128, -+ 144, -+@@ -123,13 +123,13 @@ unsigned char rpi_hevc_transform [] = { -+ 3, -+ 32, -+ 8, -+-16, -++20, -+ 0, -+ 76, -+ 254, -+ 48, -+ 192, -+-9, -++4, -+ 4, -+ 32, -+ 8, -+@@ -155,14 +155,46 @@ unsigned char rpi_hevc_transform [] = { -+ 192, -+ 41, -+ 3, -+-68, -++70, -++192, -++80, -++7, -++164, -++255, -++36, -++204, -++96, -++2, -++0, -++248, -++62, -++0, -++3, -++255, -++55, -++208, -++120, -++3, -++224, -++3, -++190, -++11, -++16, -++139, -++246, -++91, -++0, -++103, -++90, -++0, -++70, -+ 192, -+ 80, -+ 7, -+ 164, -+ 255, -+ 36, -+-220, -++204, -+ 96, -+ 2, -+ 0, -+@@ -182,7 +214,7 @@ unsigned char rpi_hevc_transform [] = { -+ 16, -+ 139, -+ 246, -+-83, -++91, -+ 0, -+ 103, -+ 90, -+@@ -209,4 +241,374 @@ unsigned char rpi_hevc_transform [] = { -+ 96, -+ 90, -+ 0, -++169, -++3, -++3, -++232, -++32, -++0, -++0, -++0, -++12, -++248, -++0, -++136, -++0, -++0, -++192, -++248, -++0, -++0, -++64, -++232, -++0, -++2, -++0, -++0, -++12, -++248, -++0, -++168, -++0, -++0, -++192, -++248, -++0, -++0, -++3, -++232, -++128, -++0, -++0, -++0, -++7, -++232, -++0, -++2, -++0, -++0, -++4, -++232, -++64, -++0, -++0, -++0, -++5, -++232, -++0, -++8, -++0, -++0, -++57, -++239, -++224, -++247, -++255, -++255, -++72, -++192, -++95, -++207, -++88, -++122, -++88, -++124, -++137, -++64, -++26, -++64, -++161, -++64, -++152, -++64, -++128, -++144, -++31, -++0, -++72, -++232, -++32, -++0, -++0, -++0, -++65, -++232, -++32, -++0, -++0, -++0, -++128, -++144, -++23, -++0, -++145, -++64, -++168, -++64, -++128, -++144, -++19, -++0, -++72, -++232, -++32, -++0, -++0, -++0, -++65, -++232, -++32, -++0, -++0, -++0, -++128, -++144, -++11, -++0, -++74, -++232, -++0, -++8, -++0, -++0, -++242, -++140, -++229, -++192, -++57, -++239, -++32, -++8, -++0, -++0, -++41, -++3, -++12, -++248, -++0, -++128, -++0, -++0, -++192, -++8, -++4, -++0, -++12, -++248, -++0, -++132, -++64, -++0, -++192, -++8, -++4, -++0, -++0, -++96, -++255, -++159, -++131, -++255, -++0, -++232, -++0, -++4, -++0, -++0, -++255, -++159, -++142, -++255, -++4, -++255, -++48, -++204, -++16, -++3, -++224, -++251, -++62, -++0, -++5, -++255, -++51, -++204, -++128, -++3, -++224, -++251, -++16, -++0, -++77, -++254, -++51, -++204, -++9, -++4, -++224, -++251, -++0, -++0, -++128, -++64, -++6, -++232, -++64, -++0, -++0, -++0, -++140, -++248, -++47, -++0, -++0, -++0, -++224, -++99, -++0, -++0, -++4, -++254, -++0, -++144, -++128, -++2, -++0, -++8, -++2, -++0, -++32, -++247, -++240, -++207, -++16, -++3, -++32, -++247, -++176, -++207, -++17, -++3, -++32, -++247, -++112, -++207, -++18, -++3, -++32, -++247, -++48, -++207, -++19, -++3, -++32, -++247, -++240, -++206, -++20, -++3, -++32, -++247, -++176, -++206, -++21, -++3, -++32, -++247, -++112, -++206, -++22, -++3, -++32, -++247, -++48, -++206, -++23, -++3, -++32, -++247, -++240, -++205, -++24, -++3, -++32, -++247, -++176, -++205, -++25, -++3, -++32, -++247, -++112, -++205, -++26, -++3, -++32, -++247, -++48, -++205, -++27, -++3, -++32, -++247, -++240, -++204, -++28, -++3, -++32, -++247, -++176, -++204, -++29, -++3, -++32, -++247, -++112, -++204, -++30, -++3, -++32, -++247, -++48, -++204, -++31, -++3, -++5, -++255, -++51, -++204, -++128, -++3, -++224, -++251, -++16, -++0, -++77, -++254, -++51, -++204, -++9, -++4, -++224, -++251, -++0, -++0, -++0, -++237, -++0, -++4, -++0, -++0, -++140, -++248, -++47, -++0, -++0, -++0, -++224, -++99, -++0, -++0, -++90, -++0, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index 5e2728d..1e389c7 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -58,13 +58,6 @@ -+ # -+ # -+ -+-test_add: -+- vldh HX(0,0),(r0) -+- vadd HX(0,0),HX(0,0),10 -+- vsth HX(0,0),(r0) -+- mov r0,7 # return value -+- b lr -+- -+ # Columns are transformed first -+ # -+ # Store top left half of transMatrix2 in -+@@ -79,7 +72,7 @@ test_add: -+ # -+ -+ -+-# hevc_trans_16x16(short *transMatrix2, short *coeffs, int num) -++# hevc_trans_16x16(short *transMatrix2, short *coeffs, int num) # TODO add size so we can branch to correct implementation (or perhaps have coeffs32 and num32 as secondary inputs!) -+ # transMatrix2: address of the constant matrix (must be at 32 byte aligned address in Videocore memory) -+ # coeffs: address of the transform coefficients (must be at 32 byte aligned address in Videocore memory) -+ # num: number of 16x16 transforms to be done -+@@ -87,17 +80,17 @@ test_add: -+ hevc_trans_16x16: -+ push r6-r15, lr # TODO cut down number of used registers -+ -+- mov r3, 2*32*2 # Twice Stride of transMatrix2 in bytes -+- vld HX(32++,0),(r0 += r3) REP 16 # This is the 16x16 matrix, a transform is equivalent to multiplying input row vector * matrix -++ mov r3, 16*2 # Stride of transMatrix2 in bytes -++ vldh HX(32++,0),(r0 += r3) REP 16 # This is the 16x16 matrix, a transform is equivalent to multiplying input row vector * matrix -+ # Now use r0 to describe which matrix we are working on. -+ # Allows us to prefetch the next block of coefficients for efficiency. -+ mov r0,0 # This describes the location where we read our coefficients from -+- mov r3,16*2 # Stride of coefficients in bytes -++ mov r3,16*2 # Stride of coefficients in bytes (TODO remove) -+ mov r7,16*16*2 # Total block size -+ mov r8,64*16 # Value used to swap from current to next VRF location -+ vldh HX(0++,0)+r0,(r1 += r3) REP 16 -+ mov r4,64 # Constant used for rounding first pass -+- mov r5,1<<19 # Constant used for rounding second pass -++ mov r5,1<<11 # Constant used for rounding second pass -+ -+ # At start of block r0,r1 point to the current block (that has already been loaded) -+ block_loop: -+@@ -113,12 +106,12 @@ block_loop: -+ vadd HY(0++,0)+r0,HY(0++,0)+r0,r4 REP 16 # Now add on rounding, shift down by 7, and saturate -+ #vsasls HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # 9+7=16 so this ends up with the output saturated and in the top half of the word. -+ vasl HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # This should be saturating, but the instruction above does not assemble? -+- vmov VX(0,0++), HX(0++,32) REP 16 # For simplicity transpose this back to the original position -++ vmov VX(0,0++)+r0, HX(0++,32)+r0 REP 16 # For simplicity transpose this back to the original position -+ -+ bl col_trans_16 -+- vadd HY(0++,0)+r0,HY(0++,0)+r0,r4 REP 16 # Now add on rounding, shift down by 7, and saturate -+- #vsasls HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # 9+7=16 so this ends up with the output saturated and in the top half of the word. -+- vasl HY(0++,0)+r0,HY(0++,0)+r0,9 REP 16 # This should be saturating, but the instruction above does not assemble? -++ vadd HY(0++,0)+r0,HY(0++,0)+r0,r5 REP 16 # Now add on rounding, shift down by 7, and saturate -++ #vsasls HY(0++,0)+r0,HY(0++,0)+r0,4 REP 16 # 4+12=16 so this ends up with the output saturated and in the top half of the word. -++ vasl HY(0++,0)+r0,HY(0++,0)+r0,4 REP 16 # This should be saturating, but the instruction above does not assemble? (Probably because it ends with ls which is interpreted as a condition flag) -+ -+ # Save results - note there has been a transposition during the processing so we save columns -+ vsth VX(0,32++)+r0, (r1 += r3) REP 16 -+@@ -132,16 +125,136 @@ block_loop: -+ -+ # r1,r2,r3 r7,r8 should be preserved -+ # HX(0++,0)+r0 is the block to be transformed -+-# HX(32++,0) is the 16x16 matrix of transform coefficients -++# HX(32++,0)+r6 is the 16x16 matrix of transform coefficients -+ # Use HY(48,0) for intermediate results -+ # r0 can be used, but should be returned to its original value at the end -+ col_trans_16: -+- add r4,r0,16 # Final value for this loop -++ add r6,r0,16 # Final value for this loop -+ col_trans_16_loop: -+ # First compute partial products for a single column -+- vmul32s VY(48,0++), VX(0,0)+r0, VX(32,0++) REP 16 -++ vmul32s HY(48++,0), VX(0,0)+r0, VX(32,0++) REP 16 -+ # Then sum up the results and place back -+ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -+- addcmpblt r0,1,r4,col_trans_16_loop -++ addcmpblt r0,1,r6,col_trans_16_loop -+ sub r0,16 # but r0 back to its original value -+ b lr -++ -++col_trans_odd_16: -++ add r6,r0,16 # Final value for this loop -++col_trans_odd_16_loop: -++ # First compute partial products for a single column -++ vmul32s HY(48++,0), VX(0,0)+r0, VX(32,0++) REP 16 -++ # Then sum up the results and place back -++ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -++ addcmpblt r0,1,r6,col_trans_odd_16_loop -++ sub r0,16 # but r0 back to its original value -++ b lr -++ -++ -++test_add: -++ vldh HX(0,0),(r0) -++ vadd HX(0,0),HX(0,0),10 -++ vsth HX(0,0),(r0) -++ mov r0,7 # return value -++ b lr -++ -++# hevc_trans_32x32(short *transMatrix2, short *coeffs, int num) -++# transMatrix2: address of the constant matrix (must be at 32 byte aligned address in Videocore memory) Even followed by odd -++# coeffs: address of the transform coefficients (must be at 32 byte aligned address in Videocore memory) -++# num: number of 16x16 transforms to be done -++# -++hevc_trans_32x32: -++ push r6-r15, lr # TODO cut down number of used registers -++ -++ # Fetch transform matrices -++ mov r3, 16*2 # Stride of transMatrix2 in bytes (and of coefficients) -++ vldh HX(32++,0),(r0 += r3) REP 16 # This is the even 16x16 matrix -++ add r0, 16*16*2 -++ vldh HX(32++,32),(r0 += r3) REP 16 # This is the odd 16x16 matrix -++ -++ mov r3, 32*2*2 # Stride used to fetch alternate rows of our input coefficient buffer -++ mov r7, 16*16*2 # Total block size -++ mov r4, 64 # Constant used for rounding first pass -++ mov r5, 1<<11 # Constant used for rounding second pass -++ sub sp,sp,32*32*2+32 # Allocate some space on the stack for us to store 32*32 shorts as temporary results (needs to be aligned) -++ # set r8 to 32byte aligned stack pointer -++ add r8,sp,31 -++ lsr r8,5 -++ lsl r8,5 -++ mov r9,r8 # Backup of the temporary storage -++ mov r10,r1 # Backup of the coefficient buffer -++block_loop32: -++ -++ # COLUMN TRANSFORM -++ # Transform the first 16 columns -++ mov r1,r10 # Input Coefficient buffer -++ mov r8,r9 # Output temporary storage -++ bl trans32 -++ # Transform the second 16 columns -++ add r8,32 -++ add r1,32 -++ bl trans32 -++ -++ # ROW TRANSFORM -++ mov r1,r9 # Input temporary storage -++ mov r8,r10 # Output Coefficient buffer -++ bl trans32 -++ # Transform the second 16 columns -++ add r8,32 -++ add r1,32 -++ bl trans32 -++ -++ add r10, 32*32*2 # move onto next block of coefficients -++ addcmpbgt r2,-1,0,block_loop32 -++ -++ add sp,sp,32*32*2+32 # Restore stack -++ -++ pop r6-r15, pc -++ -++trans32: -++ # We can no longer afford the VRF space to do prefetching when doing 32x32 -++ # Fetch the even rows -++ vldh HX(0++,0)+r0,(r1 += r3) REP 16 -++ # Fetch the odd rows -++ vldh HX(16++,0)+r0,64(r1 += r3) REP 16 # First odd row is 32 shorts ahead of r1 -++ -++ # Transform the even rows using even matrix -++ mov r0, 0 # Even rows -++ bl col_trans_16 -++ -++ # Now transform the odd rows using odd matrix -++ mov r0, 64*16 # Odd rows -++ bl col_trans_odd_16 -++ -++ # Now apply butterfly to compute the first 16 results -++ vadd HY(48++,0),HY(0++,0),HY(16++,0) REP 16 -++ vadd HY(48++,0),HY(48++,0),r4 REP 32 # add on rounding, -++ vasl HY(48++,0),HY(48++,0),9 REP 32 # shift down by 7, and saturate -++ # 16bit results now in HX(48,32) -++ mov r0,r8 -++ mov r6,32*2 -++ vsth VX(48,32++),(r0+=r6) REP 16 -++ vmov VX(0,0++)+r0, HX(0++,32)+r0 REP 16 # Store transposed -++ -++ # Now apply butterfly to compute the second 16 results (in reverse order) -++ vsub HY(63,0),HY(0,0),HY(16,0) -++ vsub HY(62,0),HY(0,0),HY(17,0) -++ vsub HY(61,0),HY(0,0),HY(18,0) -++ vsub HY(60,0),HY(0,0),HY(19,0) -++ vsub HY(59,0),HY(0,0),HY(20,0) -++ vsub HY(58,0),HY(0,0),HY(21,0) -++ vsub HY(57,0),HY(0,0),HY(22,0) -++ vsub HY(56,0),HY(0,0),HY(23,0) -++ vsub HY(55,0),HY(0,0),HY(24,0) -++ vsub HY(54,0),HY(0,0),HY(25,0) -++ vsub HY(53,0),HY(0,0),HY(26,0) -++ vsub HY(52,0),HY(0,0),HY(27,0) -++ vsub HY(51,0),HY(0,0),HY(28,0) -++ vsub HY(50,0),HY(0,0),HY(29,0) -++ vsub HY(49,0),HY(0,0),HY(30,0) -++ vsub HY(48,0),HY(0,0),HY(31,0) -++ vadd HY(48++,0),HY(48++,0),r4 REP 32 # add on rounding, -++ vasl HY(48++,0),HY(48++,0),9 REP 32 # shift down by 7, and saturate -++ add r0,r8,16*32*2 # Move to 16th row -++ vsth VX(48,32++),(r0+=r6) REP 16 -++ b lr -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index b1f50ee..d720546 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -3,6 +3,7 @@ -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+ #define RPI_USE_VCSM -+ #define RPI_TIME_TOTAL_QPU -++#define RPI_TIME_TOTAL_VPU -+ -+ #include -+ #include -+@@ -48,10 +49,47 @@ typedef int int32_t; -+ #define QPU_CODE_SIZE 2048 -+ #define VPU_CODE_SIZE 2048 -+ -++const short rpi_transMatrix2even[32][16] = { // Even rows first -++{64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64}, -++{90, 87, 80, 70, 57, 43, 25, 9, -9, -25, -43, -57, -70, -80, -87, -90}, -++{89, 75, 50, 18, -18, -50, -75, -89, -89, -75, -50, -18, 18, 50, 75, 89}, -++{87, 57, 9, -43, -80, -90, -70, -25, 25, 70, 90, 80, 43, -9, -57, -87}, -++{83, 36, -36, -83, -83, -36, 36, 83, 83, 36, -36, -83, -83, -36, 36, 83}, -++{80, 9, -70, -87, -25, 57, 90, 43, -43, -90, -57, 25, 87, 70, -9, -80}, -++{75, -18, -89, -50, 50, 89, 18, -75, -75, 18, 89, 50, -50, -89, -18, 75}, -++{70, -43, -87, 9, 90, 25, -80, -57, 57, 80, -25, -90, -9, 87, 43, -70}, -++{64, -64, -64, 64, 64, -64, -64, 64, 64, -64, -64, 64, 64, -64, -64, 64}, -++{57, -80, -25, 90, -9, -87, 43, 70, -70, -43, 87, 9, -90, 25, 80, -57}, -++{50, -89, 18, 75, -75, -18, 89, -50, -50, 89, -18, -75, 75, 18, -89, 50}, -++{43, -90, 57, 25, -87, 70, 9, -80, 80, -9, -70, 87, -25, -57, 90, -43}, -++{36, -83, 83, -36, -36, 83, -83, 36, 36, -83, 83, -36, -36, 83, -83, 36}, -++{25, -70, 90, -80, 43, 9, -57, 87, -87, 57, -9, -43, 80, -90, 70, -25}, -++{18, -50, 75, -89, 89, -75, 50, -18, -18, 50, -75, 89, -89, 75, -50, 18}, -++{ 9, -25, 43, -57, 70, -80, 87, -90, 90, -87, 80, -70, 57, -43, 25, -9}, -++// Odd rows -++{90, 90, 88, 85, 82, 78, 73, 67, 61, 54, 46, 38, 31, 22, 13, 4}, -++{90, 82, 67, 46, 22, -4, -31, -54, -73, -85, -90, -88, -78, -61, -38, -13}, -++{88, 67, 31, -13, -54, -82, -90, -78, -46, -4, 38, 73, 90, 85, 61, 22}, -++{85, 46, -13, -67, -90, -73, -22, 38, 82, 88, 54, -4, -61, -90, -78, -31}, -++{82, 22, -54, -90, -61, 13, 78, 85, 31, -46, -90, -67, 4, 73, 88, 38}, -++{78, -4, -82, -73, 13, 85, 67, -22, -88, -61, 31, 90, 54, -38, -90, -46}, -++{73, -31, -90, -22, 78, 67, -38, -90, -13, 82, 61, -46, -88, -4, 85, 54}, -++{67, -54, -78, 38, 85, -22, -90, 4, 90, 13, -88, -31, 82, 46, -73, -61}, -++{61, -73, -46, 82, 31, -88, -13, 90, -4, -90, 22, 85, -38, -78, 54, 67}, -++{54, -85, -4, 88, -46, -61, 82, 13, -90, 38, 67, -78, -22, 90, -31, -73}, -++{46, -90, 38, 54, -90, 31, 61, -88, 22, 67, -85, 13, 73, -82, 4, 78}, -++{38, -88, 73, -4, -67, 90, -46, -31, 85, -78, 13, 61, -90, 54, 22, -82}, -++{31, -78, 90, -61, 4, 54, -88, 82, -38, -22, 73, -90, 67, -13, -46, 85}, -++{22, -61, 85, -90, 73, -38, -4, 46, -78, 90, -82, 54, -13, -31, 67, -88}, -++{13, -38, 61, -78, 88, -90, 85, -73, 54, -31, 4, 22, -46, 67, -82, 90}, -++{ 4, -13, 22, -31, 38, -46, 54, -61, 67, -73, 78, -82, 85, -88, 90, -90} -++}; -++ -+ struct GPU -+ { -+ unsigned int qpu_code[QPU_CODE_SIZE]; -+ unsigned int vpu_code[VPU_CODE_SIZE]; -++ short transMatrix2even[16*16]; -+ int open_count; // Number of allocated video buffers -+ unsigned int vc_handle; // Handle of this memory -+ int mb; // Mailbox handle -+@@ -123,6 +161,8 @@ static int gpu_init(volatile struct GPU **gpu) { -+ assert(num_bytes<=VPU_CODE_SIZE*sizeof(unsigned int)); -+ memcpy((void*)ptr->vpu_code, rpi_hevc_transform, num_bytes); -+ } -++ // And the transform coefficients -++ memcpy((void*)ptr->transMatrix2even, rpi_transMatrix2even, 16*16*sizeof(short)); -+ -+ return 0; -+ } -+@@ -274,11 +314,43 @@ unsigned int vpu_get_fn(void) { -+ return gpu->vc + offsetof(struct GPU,vpu_code); -+ } -+ -++unsigned int vpu_get_constants(void) { -++ if (gpu==NULL) { -++ gpu_lock(); -++ gpu_unlock(); -++ } -++ return gpu->vc + offsetof(struct GPU,transMatrix2even); -++} -++ -+ unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5) -+ { -+ unsigned r; -++#ifdef RPI_TIME_TOTAL_VPU -++ static int last_time=0; -++ static long long on_time=0; -++ static long long off_time=0; -++ int start_time; -++ int end_time; -++ static int count=0; -++ static long long countr2=0; -++#endif -+ gpu_lock(); -++#ifdef RPI_TIME_TOTAL_VPU -++ start_time = Microseconds(); -++ if (last_time==0) -++ last_time = start_time; -++ off_time += start_time-last_time; -++#endif -+ r = execute_code(gpu->mb, code, r0, r1, r2, r3, r4, r5); -++#ifdef RPI_TIME_TOTAL_VPU -++ end_time = Microseconds(); -++ last_time = end_time; -++ on_time += end_time - start_time; -++ count++; -++ countr2 += r2; -++ if ((count&0x7f)==0) -++ printf("VPU %d %lld On=%dms, Off=%dms\n",count,countr2,(int)(on_time/1000),(int)(off_time/1000)); -++#endif -+ gpu_unlock(); -+ return r; -+ } -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 4e3c35c..814fc3c 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -34,6 +34,7 @@ extern unsigned int qpu_get_fn(int num); -+ -+ // VPU specific functions -+ extern unsigned int vpu_get_fn(void); -++extern unsigned int vpu_get_constants(void); -+ extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -+ -+ // Simple test of shader code -+-- -+2.7.4 -+ -+ -+From 4bb0a7ba6723650e74d63cec2123f76da4c3eb0e Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 5 May 2015 09:41:23 +0100 -+Subject: [PATCH 05/68] Fixed deblocking -+ -+--- -+ libavcodec/hevc.c | 20 +++++++++++++++++--- -+ 1 file changed, 17 insertions(+), 3 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 94ff709..391c57a 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2400,8 +2400,9 @@ static void rpi_execute_transform(HEVCContext *s) -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- //gpu_cache_flush(&s->coeffs_buf[i]); -++ gpu_cache_flush(&s->coeffs_buf[i]); -+ vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[i].vc, s->num_coeffs[i] >> 8, 0, 0, 0); -++ gpu_cache_flush(&s->coeffs_buf[i]); -+ -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+@@ -2440,6 +2441,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -+ #ifdef RPI -++ int start_ctb_x = (s->sh.slice_ctb_addr_rs % ((s->ps.sps->width + ctb_size - 1) >> s->ps.sps->log2_ctb_size)) << s->ps.sps->log2_ctb_size; -+ s->enable_rpi = 1; // TODO this should depend on cross component and frame width etc. -+ #endif -+ -+@@ -2473,9 +2475,17 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ #ifdef RPI -+- if (1 || x_ctb + ctb_size >= s->ps.sps->width) { // TODO watch out for deblocking! -++ if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -++ int x; -++ // Transform all blocks -+ rpi_execute_transform(s); -++ // Perform intra prediction and residual reconstruction -+ rpi_execute_pred_cmds(s); -++ // Perform deblocking for CTBs in this row -++ for(x = start_ctb_x; x <= x_ctb; x += ctb_size) { // TODO this will fail for tiles -++ ff_hevc_hls_filters(s, x, y_ctb, ctb_size); -++ } -++ start_ctb_x = 0; -+ } -+ #endif -+ if (more_data < 0) { -+@@ -2486,6 +2496,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ ctb_addr_ts++; -+ ff_hevc_save_states(s, ctb_addr_ts); -++#ifdef RPI -++ if (s->enable_rpi) -++ continue; -++#endif -+ ff_hevc_hls_filters(s, x_ctb, y_ctb, ctb_size); -+ } -+ -+@@ -3289,7 +3303,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ if (!s->univ_pred_cmds) -+ goto fail; -+ for(i = 0; i < 4; i++) { -+- gpu_malloc_uncached(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16, &s->coeffs_buf[i]); // TODO slim this down and share across sizes -++ gpu_malloc_cached(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16, &s->coeffs_buf[i]); // TODO slim this down and share across sizes -+ s->coeffs_buf_arm[i] = (int16_t*) s->coeffs_buf[i].arm; -+ if (!s->coeffs_buf_arm[i]) -+ goto fail; -+-- -+2.7.4 -+ -+ -+From 9079ef888e3d81a69f3c802ddc3c5134679e74a6 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 5 May 2015 11:32:30 +0100 -+Subject: [PATCH 06/68] Added 32x32 transform -+ -+--- -+ libavcodec/hevc.c | 8 +- -+ libavcodec/hevc_cabac.c | 4 +- -+ libavcodec/rpi_hevc_transform.h | 200 +++++++++++++++++----------------------- -+ libavcodec/rpi_hevc_transform.s | 102 ++++++++++---------- -+ libavcodec/rpi_qpu.c | 4 +- -+ 5 files changed, 148 insertions(+), 170 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 391c57a..0dde6f2 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2400,9 +2400,11 @@ static void rpi_execute_transform(HEVCContext *s) -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- gpu_cache_flush(&s->coeffs_buf[i]); -+- vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[i].vc, s->num_coeffs[i] >> 8, 0, 0, 0); -+- gpu_cache_flush(&s->coeffs_buf[i]); -++ gpu_cache_flush(&s->coeffs_buf[2]); -++ gpu_cache_flush(&s->coeffs_buf[3]); -++ vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[2].vc, s->num_coeffs[2] >> 8, s->coeffs_buf[3].vc, s->num_coeffs[3] >> 10, 0); -++ gpu_cache_flush(&s->coeffs_buf[2]); -++ gpu_cache_flush(&s->coeffs_buf[3]); -+ -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index d1cba86..88aa959 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1031,7 +1031,9 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int vshift = s->ps.sps->vshift[c_idx]; -+ uint8_t *dst = &s->frame->data[c_idx][(y0 >> vshift) * stride + -+ ((x0 >> hshift) << s->ps.sps->pixel_shift)]; -+- int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag && !transform_skip_flag && !lc->tu.cross_pf && log2_trafo_size==4; -++#ifdef RPI -++ int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag && !transform_skip_flag && !lc->tu.cross_pf && log2_trafo_size>=4; -++#endif -+ int16_t *coeffs = (int16_t*)(c_idx ? lc->edge_emu_buffer2 : lc->edge_emu_buffer); -+ uint8_t significant_coeff_group_flag[8][8] = {{0}}; -+ int explicit_rdpcm_flag = 0; -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index c0c279f..6d772d7 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -1,6 +1,10 @@ -+ unsigned char rpi_hevc_transform [] = { -+ 169, -+ 3, -++62, -++64, -++79, -++64, -+ 3, -+ 232, -+ 32, -+@@ -17,6 +21,22 @@ unsigned char rpi_hevc_transform [] = { -+ 248, -+ 0, -+ 0, -++64, -++232, -++0, -++2, -++0, -++0, -++12, -++248, -++0, -++168, -++0, -++0, -++192, -++248, -++0, -++0, -+ 0, -+ 96, -+ 3, -+@@ -79,7 +99,7 @@ unsigned char rpi_hevc_transform [] = { -+ 70, -+ 128, -+ 144, -+-39, -++40, -+ 0, -+ 4, -+ 255, -+@@ -113,7 +133,7 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 128, -+ 144, -+-22, -++23, -+ 0, -+ 4, -+ 255, -+@@ -153,6 +173,8 @@ unsigned char rpi_hevc_transform [] = { -+ 140, -+ 211, -+ 192, -++34, -++31, -+ 41, -+ 3, -+ 70, -+@@ -195,7 +217,7 @@ unsigned char rpi_hevc_transform [] = { -+ 255, -+ 36, -+ 204, -+-96, -++224, -+ 2, -+ 0, -+ 248, -+@@ -219,62 +241,10 @@ unsigned char rpi_hevc_transform [] = { -+ 103, -+ 90, -+ 0, -+-8, -+-240, -+-0, -+-128, -+-128, -+-3, -+-0, -+-247, -+-32, -+-128, -+-10, -+-4, -+-136, -+-240, -+-32, -+-0, -+-128, -+-3, -+-112, -+-96, -+-90, -+-0, -+-169, -+-3, -+-3, -+-232, -+-32, -+-0, -+-0, -+-0, -+-12, -+-248, -+-0, -+-136, -+-0, -+-0, -+-192, -+-248, -+-0, -+-0, -++225, -++64, -++242, -+ 64, -+-232, -+-0, -+-2, -+-0, -+-0, -+-12, -+-248, -+-0, -+-168, -+-0, -+-0, -+-192, -+-248, -+-0, -+-0, -+ 3, -+ 232, -+ 128, -+@@ -287,18 +257,6 @@ unsigned char rpi_hevc_transform [] = { -+ 2, -+ 0, -+ 0, -+-4, -+-232, -+-64, -+-0, -+-0, -+-0, -+-5, -+-232, -+-0, -+-8, -+-0, -+-0, -+ 57, -+ 239, -+ 224, -+@@ -317,18 +275,26 @@ unsigned char rpi_hevc_transform [] = { -+ 64, -+ 26, -+ 64, -++4, -++232, -++64, -++0, -++0, -++0, -++149, -++96, -+ 161, -+ 64, -+ 152, -+ 64, -+ 128, -+ 144, -+-31, -++35, -+ 0, -+ 72, -+ 232, -+-32, -+ 0, -++4, -+ 0, -+ 0, -+ 65, -+@@ -339,8 +305,16 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 128, -+ 144, -+-23, -++27, -++0, -++4, -++232, -++0, -++8, -+ 0, -++0, -++69, -++96, -+ 145, -+ 64, -+ 168, -+@@ -351,8 +325,8 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 72, -+ 232, -+-32, -+ 0, -++4, -+ 0, -+ 0, -+ 65, -+@@ -373,7 +347,7 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 242, -+ 140, -+-229, -++221, -+ 192, -+ 57, -+ 239, -+@@ -383,6 +357,8 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 41, -+ 3, -++239, -++3, -+ 12, -+ 248, -+ 0, -+@@ -390,7 +366,7 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 0, -+ 192, -+-8, -++248, -+ 4, -+ 0, -+ 12, -+@@ -400,14 +376,14 @@ unsigned char rpi_hevc_transform [] = { -+ 64, -+ 0, -+ 192, -+-8, -++248, -+ 4, -+ 0, -+ 0, -+ 96, -+ 255, -+ 159, -+-131, -++154, -+ 255, -+ 0, -+ 232, -+@@ -417,7 +393,7 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 255, -+ 159, -+-142, -++165, -+ 255, -+ 4, -+ 255, -+@@ -429,7 +405,7 @@ unsigned char rpi_hevc_transform [] = { -+ 251, -+ 62, -+ 0, -+-5, -++4, -+ 255, -+ 51, -+ 204, -+@@ -439,15 +415,15 @@ unsigned char rpi_hevc_transform [] = { -+ 251, -+ 16, -+ 0, -+-77, -++76, -+ 254, -+ 51, -+ 204, -+-9, -+-4, -++128, -++3, -+ 224, -+ 251, -+-0, -++20, -+ 0, -+ 128, -+ 64, -+@@ -467,16 +443,6 @@ unsigned char rpi_hevc_transform [] = { -+ 99, -+ 0, -+ 0, -+-4, -+-254, -+-0, -+-144, -+-128, -+-2, -+-0, -+-8, -+-2, -+-0, -+ 32, -+ 247, -+ 240, -+@@ -488,92 +454,92 @@ unsigned char rpi_hevc_transform [] = { -+ 176, -+ 207, -+ 17, -+-3, -++19, -+ 32, -+ 247, -+ 112, -+ 207, -+ 18, -+-3, -++35, -+ 32, -+ 247, -+ 48, -+ 207, -+ 19, -+-3, -++51, -+ 32, -+ 247, -+ 240, -+ 206, -+ 20, -+-3, -++67, -+ 32, -+ 247, -+ 176, -+ 206, -+ 21, -+-3, -++83, -+ 32, -+ 247, -+ 112, -+ 206, -+ 22, -+-3, -++99, -+ 32, -+ 247, -+ 48, -+ 206, -+ 23, -+-3, -++115, -+ 32, -+ 247, -+ 240, -+ 205, -+ 24, -+-3, -++131, -+ 32, -+ 247, -+ 176, -+ 205, -+ 25, -+-3, -++147, -+ 32, -+ 247, -+ 112, -+ 205, -+ 26, -+-3, -++163, -+ 32, -+ 247, -+ 48, -+ 205, -+ 27, -+-3, -++179, -+ 32, -+ 247, -+ 240, -+ 204, -+ 28, -+-3, -++195, -+ 32, -+ 247, -+ 176, -+ 204, -+ 29, -+-3, -++211, -+ 32, -+ 247, -+ 112, -+ 204, -+ 30, -+-3, -++227, -+ 32, -+ 247, -+ 48, -+ 204, -+ 31, -+-3, -+-5, -++243, -++4, -+ 255, -+ 51, -+ 204, -+@@ -583,20 +549,20 @@ unsigned char rpi_hevc_transform [] = { -+ 251, -+ 16, -+ 0, -+-77, -++76, -+ 254, -+ 51, -+ 204, -+-9, -+-4, -++128, -++3, -+ 224, -+ 251, -+-0, -++20, -+ 0, -+ 0, -+ 237, -++32, -+ 0, -+-4, -+ 0, -+ 0, -+ 140, -+@@ -609,6 +575,6 @@ unsigned char rpi_hevc_transform [] = { -+ 99, -+ 0, -+ 0, -+-90, -+-0, -++111, -++3, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index 1e389c7..afdb32a 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -76,12 +76,19 @@ -+ # transMatrix2: address of the constant matrix (must be at 32 byte aligned address in Videocore memory) -+ # coeffs: address of the transform coefficients (must be at 32 byte aligned address in Videocore memory) -+ # num: number of 16x16 transforms to be done -++# coeffs32 -++# num32: number of 32x32 transforms -+ # -+ hevc_trans_16x16: -+ push r6-r15, lr # TODO cut down number of used registers -+- -++ mov r14,r3 # coeffs32 -++ mov r15,r4 # num32 -+ mov r3, 16*2 # Stride of transMatrix2 in bytes -+ vldh HX(32++,0),(r0 += r3) REP 16 # This is the 16x16 matrix, a transform is equivalent to multiplying input row vector * matrix -++ -++ add r0, 16*16*2 # For 32x32 transforms we also need this matrix -++ vldh HX(32++,32),(r0 += r3) REP 16 # This is the odd 16x16 matrix -++ -+ # Now use r0 to describe which matrix we are working on. -+ # Allows us to prefetch the next block of coefficients for efficiency. -+ mov r0,0 # This describes the location where we read our coefficients from -+@@ -121,6 +128,10 @@ block_loop: -+ add r1,r7 -+ -+ addcmpbgt r2,-1,0,block_loop -++ -++ # Now go and do any 32x32 transforms -++ b hevc_trans_32x32 -++ -+ pop r6-r15, pc -+ -+ # r1,r2,r3 r7,r8 should be preserved -+@@ -136,26 +147,18 @@ col_trans_16_loop: -+ # Then sum up the results and place back -+ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -+ addcmpblt r0,1,r6,col_trans_16_loop -+- sub r0,16 # but r0 back to its original value -++ sub r0,16 # put r0 back to its original value -+ b lr -+ -+ col_trans_odd_16: -+ add r6,r0,16 # Final value for this loop -+ col_trans_odd_16_loop: -+ # First compute partial products for a single column -+- vmul32s HY(48++,0), VX(0,0)+r0, VX(32,0++) REP 16 -++ vmul32s HY(48++,0), VX(0,0)+r0, VX(32,32++) REP 16 -+ # Then sum up the results and place back -+ vadd VY(0,0)+r0, VY(48,0++), VY(48,8++) REP 8 CLRA SACC -+ addcmpblt r0,1,r6,col_trans_odd_16_loop -+- sub r0,16 # but r0 back to its original value -+- b lr -+- -+- -+-test_add: -+- vldh HX(0,0),(r0) -+- vadd HX(0,0),HX(0,0),10 -+- vsth HX(0,0),(r0) -+- mov r0,7 # return value -++ sub r0,16 # put r0 back to its original value -+ b lr -+ -+ # hevc_trans_32x32(short *transMatrix2, short *coeffs, int num) -+@@ -164,18 +167,17 @@ test_add: -+ # num: number of 16x16 transforms to be done -+ # -+ hevc_trans_32x32: -+- push r6-r15, lr # TODO cut down number of used registers -++ mov r1,r14 # coeffs -++ mov r2,r15 # num -+ -+- # Fetch transform matrices -+- mov r3, 16*2 # Stride of transMatrix2 in bytes (and of coefficients) -+- vldh HX(32++,0),(r0 += r3) REP 16 # This is the even 16x16 matrix -+- add r0, 16*16*2 -+- vldh HX(32++,32),(r0 += r3) REP 16 # This is the odd 16x16 matrix -++ # Fetch odd transform matrix -++ #mov r3, 16*2 # Stride of transMatrix2 in bytes (and of coefficients) -++ #vldh HX(32++,0),(r0 += r3) REP 16 # This is the even 16x16 matrix -++ #add r0, 16*16*2 -++ #vldh HX(32++,32),(r0 += r3) REP 16 # This is the odd 16x16 matrix -+ -+ mov r3, 32*2*2 # Stride used to fetch alternate rows of our input coefficient buffer -+ mov r7, 16*16*2 # Total block size -+- mov r4, 64 # Constant used for rounding first pass -+- mov r5, 1<<11 # Constant used for rounding second pass -+ sub sp,sp,32*32*2+32 # Allocate some space on the stack for us to store 32*32 shorts as temporary results (needs to be aligned) -+ # set r8 to 32byte aligned stack pointer -+ add r8,sp,31 -+@@ -186,21 +188,27 @@ hevc_trans_32x32: -+ block_loop32: -+ -+ # COLUMN TRANSFORM -++ mov r4, 64 # Constant used for rounding first pass -++ mov r5, 9 # left shift used for rounding first pass -++ -+ # Transform the first 16 columns -+ mov r1,r10 # Input Coefficient buffer -+ mov r8,r9 # Output temporary storage -+ bl trans32 -+ # Transform the second 16 columns -+- add r8,32 -++ add r8,32*16*2 -+ add r1,32 -+ bl trans32 -+ -+ # ROW TRANSFORM -++ mov r4, 1<<11 # Constant used for rounding second pass -++ mov r5, 4 # left shift used for rounding second pass -++ -+ mov r1,r9 # Input temporary storage -+ mov r8,r10 # Output Coefficient buffer -+ bl trans32 -+ # Transform the second 16 columns -+- add r8,32 -++ add r8,32*16*2 -+ add r1,32 -+ bl trans32 -+ -+@@ -212,11 +220,12 @@ block_loop32: -+ pop r6-r15, pc -+ -+ trans32: -++ push lr -+ # We can no longer afford the VRF space to do prefetching when doing 32x32 -+ # Fetch the even rows -+- vldh HX(0++,0)+r0,(r1 += r3) REP 16 -++ vldh HX(0++,0),(r1 += r3) REP 16 -+ # Fetch the odd rows -+- vldh HX(16++,0)+r0,64(r1 += r3) REP 16 # First odd row is 32 shorts ahead of r1 -++ vldh HX(16++,0),64(r1 += r3) REP 16 # First odd row is 32 shorts ahead of r1 -+ -+ # Transform the even rows using even matrix -+ mov r0, 0 # Even rows -+@@ -228,33 +237,32 @@ trans32: -+ -+ # Now apply butterfly to compute the first 16 results -+ vadd HY(48++,0),HY(0++,0),HY(16++,0) REP 16 -+- vadd HY(48++,0),HY(48++,0),r4 REP 32 # add on rounding, -+- vasl HY(48++,0),HY(48++,0),9 REP 32 # shift down by 7, and saturate -++ vadd HY(48++,0),HY(48++,0),r4 REP 16 # add on rounding, -++ vasl HY(48++,0),HY(48++,0),r5 REP 16 # shift down by 7, and saturate -+ # 16bit results now in HX(48,32) -+ mov r0,r8 -+ mov r6,32*2 -+ vsth VX(48,32++),(r0+=r6) REP 16 -+- vmov VX(0,0++)+r0, HX(0++,32)+r0 REP 16 # Store transposed -+ -+ # Now apply butterfly to compute the second 16 results (in reverse order) -+- vsub HY(63,0),HY(0,0),HY(16,0) -+- vsub HY(62,0),HY(0,0),HY(17,0) -+- vsub HY(61,0),HY(0,0),HY(18,0) -+- vsub HY(60,0),HY(0,0),HY(19,0) -+- vsub HY(59,0),HY(0,0),HY(20,0) -+- vsub HY(58,0),HY(0,0),HY(21,0) -+- vsub HY(57,0),HY(0,0),HY(22,0) -+- vsub HY(56,0),HY(0,0),HY(23,0) -+- vsub HY(55,0),HY(0,0),HY(24,0) -+- vsub HY(54,0),HY(0,0),HY(25,0) -+- vsub HY(53,0),HY(0,0),HY(26,0) -+- vsub HY(52,0),HY(0,0),HY(27,0) -+- vsub HY(51,0),HY(0,0),HY(28,0) -+- vsub HY(50,0),HY(0,0),HY(29,0) -+- vsub HY(49,0),HY(0,0),HY(30,0) -+- vsub HY(48,0),HY(0,0),HY(31,0) -+- vadd HY(48++,0),HY(48++,0),r4 REP 32 # add on rounding, -+- vasl HY(48++,0),HY(48++,0),9 REP 32 # shift down by 7, and saturate -+- add r0,r8,16*32*2 # Move to 16th row -++ vsub HY(63,0),HY(0 ,0),HY(16,0) -++ vsub HY(62,0),HY(1 ,0),HY(17,0) -++ vsub HY(61,0),HY(2 ,0),HY(18,0) -++ vsub HY(60,0),HY(3 ,0),HY(19,0) -++ vsub HY(59,0),HY(4 ,0),HY(20,0) -++ vsub HY(58,0),HY(5 ,0),HY(21,0) -++ vsub HY(57,0),HY(6 ,0),HY(22,0) -++ vsub HY(56,0),HY(7 ,0),HY(23,0) -++ vsub HY(55,0),HY(8 ,0),HY(24,0) -++ vsub HY(54,0),HY(9 ,0),HY(25,0) -++ vsub HY(53,0),HY(10,0),HY(26,0) -++ vsub HY(52,0),HY(11,0),HY(27,0) -++ vsub HY(51,0),HY(12,0),HY(28,0) -++ vsub HY(50,0),HY(13,0),HY(29,0) -++ vsub HY(49,0),HY(14,0),HY(30,0) -++ vsub HY(48,0),HY(15,0),HY(31,0) -++ vadd HY(48++,0),HY(48++,0),r4 REP 16 # add on rounding, -++ vasl HY(48++,0),HY(48++,0),r5 REP 16 # shift down by 7, and saturate -++ add r0,r8,32 -+ vsth VX(48,32++),(r0+=r6) REP 16 -+- b lr -++ pop pc -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index d720546..12ad5fb 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -89,7 +89,7 @@ struct GPU -+ { -+ unsigned int qpu_code[QPU_CODE_SIZE]; -+ unsigned int vpu_code[VPU_CODE_SIZE]; -+- short transMatrix2even[16*16]; -++ short transMatrix2even[16*16*2]; -+ int open_count; // Number of allocated video buffers -+ unsigned int vc_handle; // Handle of this memory -+ int mb; // Mailbox handle -+@@ -162,7 +162,7 @@ static int gpu_init(volatile struct GPU **gpu) { -+ memcpy((void*)ptr->vpu_code, rpi_hevc_transform, num_bytes); -+ } -+ // And the transform coefficients -+- memcpy((void*)ptr->transMatrix2even, rpi_transMatrix2even, 16*16*sizeof(short)); -++ memcpy((void*)ptr->transMatrix2even, rpi_transMatrix2even, sizeof(rpi_transMatrix2even)); -+ -+ return 0; -+ } -+-- -+2.7.4 -+ -+ -+From 6c2ed6109c4dd5c8ab16bf16e0ae3be6ae166e50 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 5 May 2015 16:57:03 +0100 -+Subject: [PATCH 07/68] Clear coefficients in advance -+ -+--- -+ libavcodec/hevc.c | 129 ++++++++++++++++++++++++++++------------ -+ libavcodec/hevc.h | 6 +- -+ libavcodec/hevc_cabac.c | 7 ++- -+ libavcodec/rpi_hevc_transform.h | 50 ++++++++++++++++ -+ libavcodec/rpi_hevc_transform.s | 16 +++++ -+ 5 files changed, 168 insertions(+), 40 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 0dde6f2..1424007 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -43,6 +43,8 @@ -+ -+ #ifdef RPI -+ #include "rpi_qpu.h" -++// For some unknown reason, the code seems to crash if I do a late malloc -++#define EARLY_MALLOC -+ #endif -+ -+ // #define DISABLE_MC -+@@ -61,6 +63,20 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ /* free everything allocated by pic_arrays_init() */ -+ static void pic_arrays_free(HEVCContext *s) -+ { -++#ifdef RPI -++#ifdef EARLY_MALLOC -++#else -++ printf("pic_arrays_free\n"); -++ if (s->coeffs_buf_arm[0]) { -++ gpu_free(&s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = 0; -++ } -++ if (s->coeffs_buf_arm[2]) { -++ gpu_free(&s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = 0; -++ } -++#endif -++#endif -+ av_freep(&s->sao); -+ av_freep(&s->deblock); -+ -+@@ -97,6 +113,28 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ int ctb_count = sps->ctb_width * sps->ctb_height; -+ int min_pu_size = sps->min_pu_width * sps->min_pu_height; -+ -++#ifdef RPI -++#ifdef EARLY_MALLOC -++#else -++ int coeffs_in_ctb = (1 << s->ps.sps->log2_ctb_size) * (1 << s->ps.sps->log2_ctb_size); -++ int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -++ printf("pic_arrays_init\n"); -++ printf("Allocated %d\n",coefs_per_row); -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -++ if (!s->coeffs_buf_arm[0]) -++ goto fail; -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -++ s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -++ if (!s->coeffs_buf_arm[2]) -++ goto fail; -++ s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -++ s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -++ printf("Done\n"); -++#endif -++#endif -++ -+ s->bs_width = (width >> 2) + 1; -+ s->bs_height = (height >> 2) + 1; -+ -+@@ -2400,11 +2438,10 @@ static void rpi_execute_transform(HEVCContext *s) -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- gpu_cache_flush(&s->coeffs_buf[2]); -+- gpu_cache_flush(&s->coeffs_buf[3]); -+- vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf[2].vc, s->num_coeffs[2] >> 8, s->coeffs_buf[3].vc, s->num_coeffs[3] >> 10, 0); -+- gpu_cache_flush(&s->coeffs_buf[2]); -+- gpu_cache_flush(&s->coeffs_buf[3]); -++ -++ gpu_cache_flush(&s->coeffs_buf_accelerated); -++ vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -++ //gpu_cache_flush(&s->coeffs_buf_accelerated); -+ -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+@@ -2426,7 +2463,9 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ lc->na.cand_up_right = (cmd->na >> 0) & 1; -+ s->hpc.intra_pred[cmd->size - 2](s, cmd->x, cmd->y, cmd->c_idx); -+ } else { -++ int trafo_size = 1 << cmd->size; -+ s->hevcdsp.transform_add[cmd->size-2](cmd->dst, cmd->buf, cmd->stride); -++ memset(cmd->buf, 0, trafo_size * trafo_size * sizeof(int16_t)); // Clear coefficients here while they are in the cache -+ } -+ } -+ s->num_pred_cmds = 0; -+@@ -3235,10 +3274,18 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->unif_mv_cmds); -+ av_freep(&s->unif_xfm_cmds); -+ av_freep(&s->univ_pred_cmds); -+- for(i = 0; i < 4; i++) { -+- gpu_free(&s->coeffs_buf[i]); -++ -++#ifdef EARLY_MALLOC -++ if (s->coeffs_buf_arm[0]) { -++ gpu_free(&s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = 0; -++ } -++ if (s->coeffs_buf_arm[2]) { -++ gpu_free(&s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = 0; -+ } -+ #endif -++#endif -+ -+ for (i = 0; i < 3; i++) { -+ av_freep(&s->sao_pixel_buffer_h[i]); -+@@ -3281,6 +3328,16 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ return 0; -+ } -+ -++#ifdef RPI -++static av_cold void memclear16(int16_t *p, int n) -++{ -++ vpu_execute_code( vpu_get_fn(), p, n, 0, 0, 0, 1); -++ //int i; -++ //for(i=0;ipriv_data; -+@@ -3304,37 +3361,35 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -+ if (!s->univ_pred_cmds) -+ goto fail; -+- for(i = 0; i < 4; i++) { -+- gpu_malloc_cached(sizeof(int16_t)*RPI_MAX_XFM_CMDS*16, &s->coeffs_buf[i]); // TODO slim this down and share across sizes -+- s->coeffs_buf_arm[i] = (int16_t*) s->coeffs_buf[i].arm; -+- if (!s->coeffs_buf_arm[i]) -+- goto fail; -+- } -+- s->enable_rpi = 0; -+ -+- // A little test program -+- /*{ -+- GPU_MEM_PTR_T p; -+- int err = gpu_malloc_cached(16, &p); -+- short *q = (short *)p.arm; -+- int i; -+- int r; -+- printf("Allocated memory %d ARM 0x%x, VC 0x%x, Code 0x%x\n",err,(int)p.arm,p.vc,(int)vpu_get_fn()); -+- printf("Allocated memory %d ARM 0x%x, VC 0x%x\n",err,(int)p.arm,p.vc); -+- printf("Preparing data %p\n",q); -+- for(i=0;i<16;i++) -+- q[i] = i; -+- printf("Flush cache\n"); -+- gpu_cache_flush(&p); -+- printf("Executing code\n"); -+- r = vpu_execute_code( vpu_get_fn(), p.vc, 0, 0, 0, 0, 0); -+- printf("Return value %d (",r); -+- for(i=0;i<16;i++) -+- printf("%d ",q[i]); -+- printf(")\n"); -+- gpu_free(&p); -+- goto fail; // Early out -+- }*/ -++ s->coeffs_buf_arm[0] = 0; -++ s->coeffs_buf_arm[2] = 0; -++ -++#ifdef EARLY_MALLOC -++ int coeffs_in_ctb = 64*64; -++ int coefs_per_row = (2048/64) * coeffs_in_ctb * 3; // Allow space for chroma -++ printf("Allocated %d\n",coefs_per_row); -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -++ if (!s->coeffs_buf_arm[0]) -++ goto fail; -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -++ s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -++ if (!s->coeffs_buf_arm[2]) -++ goto fail; -++ s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -++ s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -++ printf("Done\n"); -++ //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[0], coefs_per_row); -++ //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[2], coefs_per_row); -++ //memset(s->coeffs_buf_arm[3],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[3], coefs_per_row); -++#endif -++ -++ s->enable_rpi = 0; -+ -+ #endif -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 4167985..9a228f6 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -861,8 +861,12 @@ typedef struct HEVCContext { -+ HEVCMvCmd *unif_mv_cmds; -+ HEVCXfmCmd *unif_xfm_cmds; -+ HEVCPredCmd *univ_pred_cmds; -+- GPU_MEM_PTR_T coeffs_buf[4]; -++ int buf_width; -++ GPU_MEM_PTR_T coeffs_buf_default; -++ GPU_MEM_PTR_T coeffs_buf_accelerated; -+ int16_t *coeffs_buf_arm[4]; -++ unsigned int coeffs_buf_vc[4]; -++ -+ int num_coeffs[4]; -+ int num_xfm_cmds; -+ int num_mv_cmds; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 88aa959..dbfee85 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1058,9 +1058,13 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ s->num_coeffs[0] += n; -+ } -+ } -++ // We now do the memset after transform_add while we know the data is cached. -++ //memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -++#else -++ memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -+ #endif -+ -+- memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -++ -+ -+ // Derive QP for dequant -+ if (!lc->cu.cu_transquant_bypass_flag) { -+@@ -1547,7 +1551,6 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ #ifdef RPI -+ if (s->enable_rpi) { -+ HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -+- //memcpy(coeffs2, coeffs, sizeof(int16_t) * trafo_size * trafo_size); // TODO -+ cmd->type = RPI_PRED_TRANSFORM_ADD; -+ cmd->size = log2_trafo_size; -+ cmd->buf = coeffs; -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index 6d772d7..4f13622 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -1,4 +1,10 @@ -+ unsigned char rpi_hevc_transform [] = { -++21, -++106, -++0, -++144, -++35, -++1, -+ 169, -+ 3, -+ 62, -+@@ -577,4 +583,48 @@ unsigned char rpi_hevc_transform [] = { -+ 0, -+ 111, -+ 3, -++4, -++254, -++0, -++128, -++0, -++4, -++0, -++248, -++0, -++0, -++2, -++232, -++32, -++0, -++0, -++0, -++140, -++248, -++32, -++0, -++0, -++0, -++224, -++35, -++0, -++0, -++64, -++232, -++0, -++2, -++0, -++0, -++193, -++232, -++0, -++1, -++0, -++0, -++1, -++106, -++116, -++30, -++90, -++0, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index afdb32a..fd159bc 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -78,8 +78,11 @@ -+ # num: number of 16x16 transforms to be done -+ # coeffs32 -+ # num32: number of 32x32 transforms -++# command 0 for transform, 1 for memclear16(int16_t *dst,num16) -+ # -+ hevc_trans_16x16: -++ cmp r5,1 -++ beq memclear16 -+ push r6-r15, lr # TODO cut down number of used registers -+ mov r14,r3 # coeffs32 -+ mov r15,r4 # num32 -+@@ -266,3 +269,16 @@ trans32: -+ add r0,r8,32 -+ vsth VX(48,32++),(r0+=r6) REP 16 -+ pop pc -++ -++memclear16: -++ # r0 is address -++ # r1 is number of 16bits values to set to 0 (may overrun past end and clear more than specified) -++ vmov HX(0++,0),0 REP 16 -++ mov r2,32 -++loop: -++ vsth HX(0++,0),(r0+=r2) REP 16 -++ add r0,16*16*2 -++ sub r1,16*16 -++ cmp r1,0 -++ bgt loop -++ b lr -+-- -+2.7.4 -+ -+ -+From 48282c2fb55c0d9a72222f384c03c432f78a3016 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 6 May 2015 09:56:43 +0100 -+Subject: [PATCH 08/68] Prepared inter offload -+ -+--- -+ libavcodec/hevc.c | 116 +++++++++++++++++++++++++++++++++++++++++++----- -+ libavcodec/hevc.h | 29 +++++++++++- -+ libavcodec/hevc_cabac.c | 5 ++- -+ 3 files changed, 137 insertions(+), 13 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 1424007..8215201 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -45,6 +45,8 @@ -+ #include "rpi_qpu.h" -+ // For some unknown reason, the code seems to crash if I do a late malloc -+ #define EARLY_MALLOC -++// Move Inter prediction into separate pass -++//#define RPI_INTER -+ #endif -+ -+ // #define DISABLE_MC -+@@ -1440,6 +1442,95 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size) -+ * @param luma_offset additive offset applied to the luma prediction value -+ */ -+ -++#ifdef RPI_INTER -++#define RPI_REDIRECT(fn) rpi_ ## fn -++static void rpi_luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -++ AVFrame *ref, const Mv *mv, int x_off, int y_off, -++ int block_w, int block_h, int luma_weight, int luma_offset) -++{ -++ HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ cmd->cmd = RPI_CMD_LUMA_UNI; -++ cmd->dst = dst; -++ cmd->dststride = dststride; -++ cmd->src = ref->data[0]; -++ cmd->srcstride = ref->linesize[0]; -++ cmd->mv = *mv; -++ cmd->x_off = x_off; -++ cmd->y_off = y_off; -++ cmd->block_w = block_w; -++ cmd->block_h = block_h; -++ cmd->weight = luma_weight; -++ cmd->offset = luma_offset; -++} -++ -++static void rpi_luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -++ AVFrame *ref0, const Mv *mv0, int x_off, int y_off, -++ int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) -++{ -++ HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ cmd->cmd = RPI_CMD_LUMA_BI; -++ cmd->dst = dst; -++ cmd->dststride = dststride; -++ cmd->src = ref->data[0]; -++ cmd->srcstride = ref->linesize[0]; -++ cmd->mv = *mv; -++ cmd->x_off = x_off; -++ cmd->y_off = y_off; -++ cmd->block_w = block_w; -++ cmd->block_h = block_h; -++ cmd->weight = luma_weight; -++ cmd->offset = luma_offset; -++ cmd->src1 = ref1->data[]; -++ cmd->srcstride1 = ref1->linesize[0]; -++ cmd->mv1 = *mv1; -++ cmd->ref_idx[0] = current_mv->ref_idx[0]; -++ cmd->ref_idx[1] = current_mv->ref_idx[1]; -++} -++ -++static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -++ ptrdiff_t dststride, uint8_t *src0, ptrdiff_t srcstride, int reflist, -++ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int chroma_weight, int chroma_offset) -++{ -++ HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ cmd->cmd = RPI_CMD_CHROMA_UNI; -++ cmd->dst = dst0; -++ cmd->dststride = dststride; -++ cmd->src = src0; -++ cmd->srcstride = srcstride; -++ cmd->mv = current_mv->mv[reflist]; -++ cmd->x_off = x_off; -++ cmd->y_off = y_off; -++ cmd->block_w = block_w; -++ cmd->block_h = block_h; -++ cmd->weight = chroma_weight; -++ cmd->offset = chroma_offset; -++} -++ -++static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, -++ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int cidx) -++{ -++ HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ cmd->cmd = RPI_CMD_CHROMA_BI+cidx; -++ cmd->dst = dst0; -++ cmd->dststride = dststride; -++ cmd->src = ref0->data[cidx+1]; -++ cmd->srcstride = ref0->linesize[cidx+1]; -++ cmd->mv = current_mv->mv[reflist]; -++ cmd->x_off = x_off; -++ cmd->y_off = y_off; -++ cmd->block_w = block_w; -++ cmd->block_h = block_h; -++ cmd->weight = chroma_weight; -++ cmd->offset = chroma_offset; -++ cmd->src = ref1->data[cidx+1]; -++ cmd->srcstride1 = ref1->linesize[cidx+1]; -++ cmd->ref_idx[0] = current_mv->ref_idx[0]; -++ cmd->ref_idx[1] = current_mv->ref_idx[1]; -++} -++#else -++#define RPI_REDIRECT(fn) fn -++#endif -++ -+ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref, const Mv *mv, int x_off, int y_off, -+ int block_w, int block_h, int luma_weight, int luma_offset) -+@@ -1505,7 +1596,7 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ * @param mv1 motion vector1 (relative to block position) to get pixel data from -+ * @param current_mv current motion vector structure -+ */ -+- static void luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -++static void luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref0, const Mv *mv0, int x_off, int y_off, -+ int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) -+ { -+@@ -1887,16 +1978,16 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- luma_mc_uni(s, dst0, s->frame->linesize[0], ref0->frame, -++ RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref0->frame, -+ ¤t_mv.mv[0], x0, y0, nPbW, nPbH, -+ s->sh.luma_weight_l0[current_mv.ref_idx[0]], -+ s->sh.luma_offset_l0[current_mv.ref_idx[0]]); -+ -+ if (s->ps.sps->chroma_format_idc) { -+- chroma_mc_uni(s, dst1, s->frame->linesize[1], ref0->frame->data[1], ref0->frame->linesize[1], -++ RPI_REDIRECT(chroma_mc_uni)(s, dst1, s->frame->linesize[1], ref0->frame->data[1], ref0->frame->linesize[1], -+ 0, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0]); -+- chroma_mc_uni(s, dst2, s->frame->linesize[2], ref0->frame->data[2], ref0->frame->linesize[2], -++ RPI_REDIRECT(chroma_mc_uni)(s, dst2, s->frame->linesize[2], ref0->frame->data[2], ref0->frame->linesize[2], -+ 0, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][1], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][1]); -+ } -+@@ -1906,17 +1997,17 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- luma_mc_uni(s, dst0, s->frame->linesize[0], ref1->frame, -++ RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref1->frame, -+ ¤t_mv.mv[1], x0, y0, nPbW, nPbH, -+ s->sh.luma_weight_l1[current_mv.ref_idx[1]], -+ s->sh.luma_offset_l1[current_mv.ref_idx[1]]); -+ -+ if (s->ps.sps->chroma_format_idc) { -+- chroma_mc_uni(s, dst1, s->frame->linesize[1], ref1->frame->data[1], ref1->frame->linesize[1], -++ RPI_REDIRECT(chroma_mc_uni)(s, dst1, s->frame->linesize[1], ref1->frame->data[1], ref1->frame->linesize[1], -+ 1, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][0], s->sh.chroma_offset_l1[current_mv.ref_idx[1]][0]); -+ -+- chroma_mc_uni(s, dst2, s->frame->linesize[2], ref1->frame->data[2], ref1->frame->linesize[2], -++ RPI_REDIRECT(chroma_mc_uni)(s, dst2, s->frame->linesize[2], ref1->frame->data[2], ref1->frame->linesize[2], -+ 1, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][1], s->sh.chroma_offset_l1[current_mv.ref_idx[1]][1]); -+ } -+@@ -1926,15 +2017,15 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- luma_mc_bi(s, dst0, s->frame->linesize[0], ref0->frame, -++ RPI_REDIRECT(luma_mc_bi)(s, dst0, s->frame->linesize[0], ref0->frame, -+ ¤t_mv.mv[0], x0, y0, nPbW, nPbH, -+ ref1->frame, ¤t_mv.mv[1], ¤t_mv); -+ -+ if (s->ps.sps->chroma_format_idc) { -+- chroma_mc_bi(s, dst1, s->frame->linesize[1], ref0->frame, ref1->frame, -++ RPI_REDIRECT(chroma_mc_bi)(s, dst1, s->frame->linesize[1], ref0->frame, ref1->frame, -+ x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, 0); -+ -+- chroma_mc_bi(s, dst2, s->frame->linesize[2], ref0->frame, ref1->frame, -++ RPI_REDIRECT(chroma_mc_bi)(s, dst2, s->frame->linesize[2], ref0->frame, ref1->frame, -+ x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, 1); -+ } -+ } -+@@ -2465,7 +2556,9 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ } else { -+ int trafo_size = 1 << cmd->size; -+ s->hevcdsp.transform_add[cmd->size-2](cmd->dst, cmd->buf, cmd->stride); -++#ifdef RPI_PRECLEAR -+ memset(cmd->buf, 0, trafo_size * trafo_size * sizeof(int16_t)); // Clear coefficients here while they are in the cache -++#endif -+ } -+ } -+ s->num_pred_cmds = 0; -+@@ -3381,6 +3474,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -+ s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -+ printf("Done\n"); -++#ifdef RPI_PRECLEAR -+ //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -+ memclear16(s->coeffs_buf_arm[0], coefs_per_row); -+ //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -+@@ -3389,6 +3483,8 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ memclear16(s->coeffs_buf_arm[3], coefs_per_row); -+ #endif -+ -++#endif -++ -+ s->enable_rpi = 0; -+ -+ #endif -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 9a228f6..1ac119a 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -803,14 +803,39 @@ typedef struct HEVCLocalContext { -+ // RPI_MAX_WIDTH is maximum width in pixels supported by the accelerated code -+ #define RPI_MAX_WIDTH 2048 -+ -+-// Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane -+-#define RPI_MAX_MV_CMDS (16*3*(RPI_MAX_WIDTH/4)) -++// Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane, * 2 for bi -++#define RPI_MAX_MV_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+ #define RPI_MAX_XFM_CMDS (16*3*(RPI_MAX_WIDTH/4)) -+ // Each block can have an intra prediction and a transform_add command -+ #define RPI_MAX_PRED_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+ -++#define RPI_CMD_LUMA_UNI 0 -++#define RPI_CMD_CHROMA_UNI 1 -++#define RPI_CMD_LUMA_BI 2 -++#define RPI_CMD_U_BI 3 -++#define RPI_CMD_V_BI 4 -++ -++// RPI_PRECLEAR is not working yet - perhaps clearing on VPUs is flawed? -++// #define RPI_PRECLEAR -++ -+ // Command for inter prediction -+ typedef struct HEVCMvCmd { -++ int cmd; -++ uint8_t *dst; -++ ptrdiff_t dststride; -++ uint8_t *src; -++ ptrdiff_t srcstride; -++ Mv mv; -++ int x_off; -++ int y_off; -++ int block_w; -++ int block_h; -++ int weight; -++ int offset; -++ uint8_t *src1; -++ ptrdiff_t srcstride1; -++ Mv mv1; -++ int8_t ref_idx[2]; -+ } HEVCMvCmd; -+ -+ // Command for transform to process a block of coefficients -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index dbfee85..4f072be 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1059,7 +1059,10 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ } -+ // We now do the memset after transform_add while we know the data is cached. -+- //memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -++ #ifdef RPI_PRECLEAR -++ #else -++ memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -++ #endif -+ #else -+ memset(coeffs, 0, trafo_size * trafo_size * sizeof(int16_t)); -+ #endif -+-- -+2.7.4 -+ -+ -+From 25d3b4e876febe08302a01abd85d5009160ead3e Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 6 May 2015 11:08:50 +0100 -+Subject: [PATCH 09/68] Inter prediction in separate pass -+ -+--- -+ libavcodec/hevc.c | 93 +++++++++++++++++++++++++++++++++++++++++++++---------- -+ libavcodec/hevc.h | 2 +- -+ 2 files changed, 77 insertions(+), 18 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 8215201..b7bc6ad 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -46,7 +46,7 @@ -+ // For some unknown reason, the code seems to crash if I do a late malloc -+ #define EARLY_MALLOC -+ // Move Inter prediction into separate pass -+-//#define RPI_INTER -++#define RPI_INTER -+ #endif -+ -+ // #define DISABLE_MC -+@@ -1448,7 +1448,7 @@ static void rpi_luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref, const Mv *mv, int x_off, int y_off, -+ int block_w, int block_h, int luma_weight, int luma_offset) -+ { -+- HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -+ cmd->cmd = RPI_CMD_LUMA_UNI; -+ cmd->dst = dst; -+ cmd->dststride = dststride; -+@@ -1467,31 +1467,29 @@ static void rpi_luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref0, const Mv *mv0, int x_off, int y_off, -+ int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) -+ { -+- HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -+ cmd->cmd = RPI_CMD_LUMA_BI; -+ cmd->dst = dst; -+ cmd->dststride = dststride; -+- cmd->src = ref->data[0]; -+- cmd->srcstride = ref->linesize[0]; -+- cmd->mv = *mv; -++ cmd->src = ref0->data[0]; -++ cmd->srcstride = ref0->linesize[0]; -++ cmd->mv = *mv0; -+ cmd->x_off = x_off; -+ cmd->y_off = y_off; -+ cmd->block_w = block_w; -+ cmd->block_h = block_h; -+- cmd->weight = luma_weight; -+- cmd->offset = luma_offset; -+- cmd->src1 = ref1->data[]; -++ cmd->src1 = ref1->data[0]; -+ cmd->srcstride1 = ref1->linesize[0]; -+ cmd->mv1 = *mv1; -+ cmd->ref_idx[0] = current_mv->ref_idx[0]; -+ cmd->ref_idx[1] = current_mv->ref_idx[1]; -+ } -+ -+-static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -++static void rpi_chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ ptrdiff_t dststride, uint8_t *src0, ptrdiff_t srcstride, int reflist, -+ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int chroma_weight, int chroma_offset) -+ { -+- HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -+ cmd->cmd = RPI_CMD_CHROMA_UNI; -+ cmd->dst = dst0; -+ cmd->dststride = dststride; -+@@ -1506,27 +1504,27 @@ static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ cmd->offset = chroma_offset; -+ } -+ -+-static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, -++static void rpi_chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, -+ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int cidx) -+ { -+- HEVCMvCmd *cmd = unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -+ cmd->cmd = RPI_CMD_CHROMA_BI+cidx; -+ cmd->dst = dst0; -+ cmd->dststride = dststride; -+ cmd->src = ref0->data[cidx+1]; -+ cmd->srcstride = ref0->linesize[cidx+1]; -+- cmd->mv = current_mv->mv[reflist]; -++ cmd->mv = current_mv->mv[0]; -++ cmd->mv1 = current_mv->mv[1]; -+ cmd->x_off = x_off; -+ cmd->y_off = y_off; -+ cmd->block_w = block_w; -+ cmd->block_h = block_h; -+- cmd->weight = chroma_weight; -+- cmd->offset = chroma_offset; -+- cmd->src = ref1->data[cidx+1]; -++ cmd->src1 = ref1->data[cidx+1]; -+ cmd->srcstride1 = ref1->linesize[cidx+1]; -+ cmd->ref_idx[0] = current_mv->ref_idx[0]; -+ cmd->ref_idx[1] = current_mv->ref_idx[1]; -+ } -++ -+ #else -+ #define RPI_REDIRECT(fn) fn -+ #endif -+@@ -2554,7 +2552,9 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ lc->na.cand_up_right = (cmd->na >> 0) & 1; -+ s->hpc.intra_pred[cmd->size - 2](s, cmd->x, cmd->y, cmd->c_idx); -+ } else { -++#ifdef RPI_PRECLEAR -+ int trafo_size = 1 << cmd->size; -++#endif -+ s->hevcdsp.transform_add[cmd->size-2](cmd->dst, cmd->buf, cmd->stride); -+ #ifdef RPI_PRECLEAR -+ memset(cmd->buf, 0, trafo_size * trafo_size * sizeof(int16_t)); // Clear coefficients here while they are in the cache -+@@ -2563,6 +2563,61 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ } -+ s->num_pred_cmds = 0; -+ } -++ -++static void rpi_execute_inter_cmds(HEVCContext *s) -++{ -++ HEVCMvCmd *cmd = s->unif_mv_cmds; -++ int n,cidx; -++ AVFrame myref; -++ AVFrame myref1; -++ struct MvField mymv; -++ if (s->num_mv_cmds > RPI_MAX_MV_CMDS) { -++ printf("Overflow inter_cmds\n"); -++ exit(-1); -++ } -++ for(n = s->num_mv_cmds; n>0 ; n--, cmd++) { -++ switch(cmd->cmd) { -++ case RPI_CMD_LUMA_UNI: -++ myref.data[0] = cmd->src; -++ myref.linesize[0] = cmd->srcstride; -++ luma_mc_uni(s, cmd->dst, cmd->dststride, &myref, &cmd->mv, cmd->x_off, cmd->y_off, cmd->block_w, cmd->block_h, cmd->weight, cmd->offset); -++ break; -++ case RPI_CMD_LUMA_BI: -++ myref.data[0] = cmd->src; -++ myref.linesize[0] = cmd->srcstride; -++ myref1.data[0] = cmd->src1; -++ myref1.linesize[0] = cmd->srcstride1; -++ mymv.ref_idx[0] = cmd->ref_idx[0]; -++ mymv.ref_idx[1] = cmd->ref_idx[1]; -++ luma_mc_bi(s, cmd->dst, cmd->dststride, -++ &myref, &cmd->mv, cmd->x_off, cmd->y_off, cmd->block_w, cmd->block_h, -++ &myref1, &cmd->mv1, &mymv); -++ break; -++ case RPI_CMD_CHROMA_UNI: -++ mymv.mv[0] = cmd->mv; -++ chroma_mc_uni(s, cmd->dst, -++ cmd->dststride, cmd->src, cmd->srcstride, 0, -++ cmd->x_off, cmd->y_off, cmd->block_w, cmd->block_h, &mymv, cmd->weight, cmd->offset); -++ break; -++ case RPI_CMD_CHROMA_BI: -++ case RPI_CMD_CHROMA_BI+1: -++ cidx = cmd->cmd - RPI_CMD_CHROMA_BI; -++ myref.data[cidx+1] = cmd->src; -++ myref.linesize[cidx+1] = cmd->srcstride; -++ myref1.data[cidx+1] = cmd->src1; -++ myref1.linesize[cidx+1] = cmd->srcstride1; -++ mymv.ref_idx[0] = cmd->ref_idx[0]; -++ mymv.ref_idx[1] = cmd->ref_idx[1]; -++ mymv.mv[0] = cmd->mv; -++ mymv.mv[1] = cmd->mv1; -++ chroma_mc_bi(s, cmd->dst, cmd->dststride, &myref, &myref1, -++ cmd->x_off, cmd->y_off, cmd->block_w, cmd->block_h, &mymv, cidx); -++ break; -++ } -++ } -++ s->num_mv_cmds = 0; -++} -++ -+ #endif -+ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+@@ -2611,6 +2666,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI -+ if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -+ int x; -++ // Perform inter prediction -++ rpi_execute_inter_cmds(s); -+ // Transform all blocks -+ rpi_execute_transform(s); -+ // Perform intra prediction and residual reconstruction -+@@ -3422,6 +3479,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ } -+ -+ #ifdef RPI -++#ifdef RPI_PRECLEAR -+ static av_cold void memclear16(int16_t *p, int n) -+ { -+ vpu_execute_code( vpu_get_fn(), p, n, 0, 0, 0, 1); -+@@ -3430,6 +3488,7 @@ static av_cold void memclear16(int16_t *p, int n) -+ // p[i] = 0; -+ } -+ #endif -++#endif -+ -+ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ { -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 1ac119a..a0eb71b 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -812,7 +812,7 @@ typedef struct HEVCLocalContext { -+ #define RPI_CMD_LUMA_UNI 0 -+ #define RPI_CMD_CHROMA_UNI 1 -+ #define RPI_CMD_LUMA_BI 2 -+-#define RPI_CMD_U_BI 3 -++#define RPI_CMD_CHROMA_BI 3 -+ #define RPI_CMD_V_BI 4 -+ -+ // RPI_PRECLEAR is not working yet - perhaps clearing on VPUs is flawed? -+-- -+2.7.4 -+ -+ -+From 8af0a0a036e4bb3883f144d0567bc527772dd65b Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 6 May 2015 13:03:50 +0100 -+Subject: [PATCH 10/68] Added VPU thread -+ -+--- -+ libavcodec/hevc.c | 11 +++-- -+ libavcodec/hevc.h | 1 + -+ libavcodec/rpi_qpu.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++-- -+ libavcodec/rpi_qpu.h | 2 + -+ 4 files changed, 133 insertions(+), 6 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index b7bc6ad..98dbd69 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2529,8 +2529,10 @@ static void rpi_execute_transform(HEVCContext *s) -+ -+ -+ gpu_cache_flush(&s->coeffs_buf_accelerated); -+- vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -++ s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, &s->coeffs_buf_accelerated); -++ //vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -+ //gpu_cache_flush(&s->coeffs_buf_accelerated); -++ //vpu_wait(s->vpu_id); -+ -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+@@ -2666,10 +2668,12 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI -+ if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -+ int x; -+- // Perform inter prediction -+- rpi_execute_inter_cmds(s); -+ // Transform all blocks -+ rpi_execute_transform(s); -++ // Perform inter prediction -++ rpi_execute_inter_cmds(s); -++ // Wait for transform completion -++ vpu_wait(s->vpu_id); -+ // Perform intra prediction and residual reconstruction -+ rpi_execute_pred_cmds(s); -+ // Perform deblocking for CTBs in this row -+@@ -3426,6 +3430,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->univ_pred_cmds); -+ -+ #ifdef EARLY_MALLOC -++ printf("hevc_decode_free\n"); -+ if (s->coeffs_buf_arm[0]) { -+ gpu_free(&s->coeffs_buf_default); -+ s->coeffs_buf_arm[0] = 0; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index a0eb71b..0d8dfe9 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -896,6 +896,7 @@ typedef struct HEVCContext { -+ int num_xfm_cmds; -+ int num_mv_cmds; -+ int num_pred_cmds; -++ int vpu_id; -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 12ad5fb..378dd74 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -1,9 +1,13 @@ -+ #ifdef RPI -+-// Use the vcsm device for shared memory -++// define RPI_USE_VCSM to use the vcsm device for shared memory -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+ #define RPI_USE_VCSM -+-#define RPI_TIME_TOTAL_QPU -+-#define RPI_TIME_TOTAL_VPU -++// define RPI_TIME_TOTAL_QPU to print out how much time is spent in the QPU code -++//#define RPI_TIME_TOTAL_QPU -++// define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -++//#define RPI_TIME_TOTAL_VPU -++// define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -++#define RPI_ASYNC -+ -+ #include -+ #include -+@@ -113,6 +117,19 @@ static unsigned int Microseconds(void) { -+ } -+ #endif -+ -++#ifdef RPI_ASYNC -++pthread_t vpu_thread; -++static void *vpu_start(void *arg); -++ -++#define MAXCMDS 128 -++static pthread_cond_t post_cond = PTHREAD_COND_INITIALIZER; -++static pthread_mutex_t post_mutex = PTHREAD_MUTEX_INITIALIZER; -++ -++static int vpu_cmds[MAXCMDS][8]; -++static volatile int vpu_async_tail=0; // Contains the number of posted jobs -++static volatile int vpu_async_head=0; -++#endif -++ -+ // Connect to QPU, returns 0 on success. -+ static int gpu_init(volatile struct GPU **gpu) { -+ int mb = mbox_open(); -+@@ -164,12 +181,27 @@ static int gpu_init(volatile struct GPU **gpu) { -+ // And the transform coefficients -+ memcpy((void*)ptr->transMatrix2even, rpi_transMatrix2even, sizeof(rpi_transMatrix2even)); -+ -++#ifdef RPI_ASYNC -++ { -++ int err; -++ vpu_async_tail = 0; -++ vpu_async_head = 0; -++ err = pthread_create(&vpu_thread, NULL, vpu_start, NULL); -++ //printf("Created thread\n"); -++ if (err) { -++ printf("Failed to create vpu thread\n"); -++ return -4; -++ } -++ } -++#endif -++ -+ return 0; -+ } -+ -+ // Make sure we have exclusive access to the mailbox, and enable qpu if necessary. -+ static void gpu_lock(void) { -+ pthread_mutex_lock(&gpu_mutex); -++ -+ if (gpu==NULL) { -+ gpu_init(&gpu); -+ } -+@@ -264,6 +296,16 @@ static void gpu_term(void) -+ unsigned handle = gpu->vc_handle; -+ if (gpu==NULL) -+ return; -++ -++#ifdef RPI_ASYNC -++ { -++ void *res; -++ vpu_post_code(0, 0, 0, 0, 0, 0, -1, NULL); -++ pthread_join(vpu_thread, &res); -++ } -++#endif -++ -++ -+ unmapmem((void*)gpu, sizeof(struct GPU)); -+ mem_unlock(mb, handle); -+ mem_free(mb, handle); -+@@ -322,6 +364,79 @@ unsigned int vpu_get_constants(void) { -+ return gpu->vc + offsetof(struct GPU,transMatrix2even); -+ } -+ -++#ifdef RPI_ASYNC -++ -++static void *vpu_start(void *arg) { -++ while(1) { -++ pthread_mutex_lock(&post_mutex); -++ while( vpu_async_tail - vpu_async_head <= 0) -++ { -++ //printf("Checking number %d %d\n",vpu_async_head,vpu_async_tail); -++ pthread_cond_wait(&post_cond, &post_mutex); -++ } -++ int *p = vpu_cmds[vpu_async_head%MAXCMDS]; -++ pthread_mutex_unlock(&post_mutex); -++ -++ if (p[6] == -1) { -++ break; // Last job -++ } -++ if (p[7]) { -++ GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -++ //gpu_cache_flush(buf); -++ } -++ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -++ -++ pthread_mutex_lock(&post_mutex); -++ vpu_async_head++; -++ pthread_cond_broadcast(&post_cond); -++ pthread_mutex_unlock(&post_mutex); -++ } -++ -++ return NULL; -++} -++ -++// Post a command to the queue -++// Returns an id which we can use to wait for completion -++int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf) -++{ -++ pthread_mutex_lock(&post_mutex); -++ { -++ int id = vpu_async_tail++; -++ int *p = vpu_cmds[id%MAXCMDS]; -++ int num = vpu_async_tail - vpu_async_head; -++ if (num>MAXCMDS) { -++ printf("Too many commands submitted\n"); -++ exit(-1); -++ } -++ p[0] = code; -++ p[1] = r0; -++ p[2] = r1; -++ p[3] = r2; -++ p[4] = r3; -++ p[5] = r4; -++ p[6] = r5; -++ p[7] = (int) buf; -++ if (num<=1) -++ pthread_cond_broadcast(&post_cond); // Otherwise the vpu thread must already be awake -++ pthread_mutex_unlock(&post_mutex); -++ return id; -++ } -++} -++ -++// Wait for completion of the given command -++void vpu_wait(int id) -++{ -++ pthread_mutex_lock(&post_mutex); -++ while( id + 1 - vpu_async_head > 0) -++ { -++ pthread_cond_wait(&post_cond, &post_mutex); -++ } -++ pthread_mutex_unlock(&post_mutex); -++} -++ -++#endif -++ -++ -+ unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5) -+ { -+ unsigned r; -+@@ -334,7 +449,9 @@ unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, -+ static int count=0; -+ static long long countr2=0; -+ #endif -++#ifndef RPI_ASYNC -+ gpu_lock(); -++#endif -+ #ifdef RPI_TIME_TOTAL_VPU -+ start_time = Microseconds(); -+ if (last_time==0) -+@@ -351,7 +468,9 @@ unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, -+ if ((count&0x7f)==0) -+ printf("VPU %d %lld On=%dms, Off=%dms\n",count,countr2,(int)(on_time/1000),(int)(off_time/1000)); -+ #endif -++#ifndef RPI_ASYNC -+ gpu_unlock(); -++#endif -+ return r; -+ } -+ -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 814fc3c..3526fce 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -36,6 +36,8 @@ extern unsigned int qpu_get_fn(int num); -+ extern unsigned int vpu_get_fn(void); -+ extern unsigned int vpu_get_constants(void); -+ extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -++extern int vpu_post_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf); -++extern void vpu_wait( int id); -+ -+ // Simple test of shader code -+ extern int rpi_test_shader(void); -+-- -+2.7.4 -+ -+ -+From 016d3db644e60fbe272bfcf1d7c3670c82422317 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 6 May 2015 15:03:37 +0100 -+Subject: [PATCH 11/68] Added different signal when tail moves -+ -+--- -+ libavcodec/rpi_qpu.c | 11 ++++++----- -+ 1 file changed, 6 insertions(+), 5 deletions(-) -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 378dd74..d1c3e20 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -122,7 +122,8 @@ pthread_t vpu_thread; -+ static void *vpu_start(void *arg); -+ -+ #define MAXCMDS 128 -+-static pthread_cond_t post_cond = PTHREAD_COND_INITIALIZER; -++static pthread_cond_t post_cond_head = PTHREAD_COND_INITIALIZER; -++static pthread_cond_t post_cond_tail = PTHREAD_COND_INITIALIZER; -+ static pthread_mutex_t post_mutex = PTHREAD_MUTEX_INITIALIZER; -+ -+ static int vpu_cmds[MAXCMDS][8]; -+@@ -372,7 +373,7 @@ static void *vpu_start(void *arg) { -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+ //printf("Checking number %d %d\n",vpu_async_head,vpu_async_tail); -+- pthread_cond_wait(&post_cond, &post_mutex); -++ pthread_cond_wait(&post_cond_tail, &post_mutex); -+ } -+ int *p = vpu_cmds[vpu_async_head%MAXCMDS]; -+ pthread_mutex_unlock(&post_mutex); -+@@ -388,7 +389,7 @@ static void *vpu_start(void *arg) { -+ -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+- pthread_cond_broadcast(&post_cond); -++ pthread_cond_broadcast(&post_cond_head); -+ pthread_mutex_unlock(&post_mutex); -+ } -+ -+@@ -417,7 +418,7 @@ int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned -+ p[6] = r5; -+ p[7] = (int) buf; -+ if (num<=1) -+- pthread_cond_broadcast(&post_cond); // Otherwise the vpu thread must already be awake -++ pthread_cond_broadcast(&post_cond_tail); // Otherwise the vpu thread must already be awake -+ pthread_mutex_unlock(&post_mutex); -+ return id; -+ } -+@@ -429,7 +430,7 @@ void vpu_wait(int id) -+ pthread_mutex_lock(&post_mutex); -+ while( id + 1 - vpu_async_head > 0) -+ { -+- pthread_cond_wait(&post_cond, &post_mutex); -++ pthread_cond_wait(&post_cond_head, &post_mutex); -+ } -+ pthread_mutex_unlock(&post_mutex); -+ } -+-- -+2.7.4 -+ -+ -+From b04a72641253dc89fd1ec688035c3e2a946aa370 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 7 May 2015 08:57:11 +0100 -+Subject: [PATCH 12/68] Add option to test for gpu_idle -+ -+--- -+ libavcodec/hevc.c | 3 ++- -+ libavcodec/rpi_qpu.c | 18 ++++++++++++++++++ -+ 2 files changed, 20 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 98dbd69..2e269b6 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2527,7 +2527,6 @@ static void rpi_execute_transform(HEVCContext *s) -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- -+ gpu_cache_flush(&s->coeffs_buf_accelerated); -+ s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, &s->coeffs_buf_accelerated); -+ //vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -+@@ -2669,6 +2668,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -+ int x; -+ // Transform all blocks -++ //printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -++ -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index d1c3e20..85f49db 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -199,6 +199,17 @@ static int gpu_init(volatile struct GPU **gpu) { -+ return 0; -+ } -+ -++// Returns 1 if the gpu is currently idle -++static int gpu_idle(void) -++{ -++ int ret = pthread_mutex_trylock(&gpu_mutex); -++ if (ret==0) { -++ pthread_mutex_unlock(&gpu_mutex); -++ return 1; -++ } -++ return 0; -++} -++ -+ // Make sure we have exclusive access to the mailbox, and enable qpu if necessary. -+ static void gpu_lock(void) { -+ pthread_mutex_lock(&gpu_mutex); -+@@ -400,6 +411,13 @@ static void *vpu_start(void *arg) { -+ // Returns an id which we can use to wait for completion -+ int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf) -+ { -++ // If the gpu is idle then just run the command immediately -++ // This works, but doesn't seem to give any benefit -++ // if (gpu_idle()) { -++ // vpu_execute_code( code, r0, r1, r2, r3, r4, r5); -++ // return -1; // TODO perhaps a wraparound bug here? -++ // } -++ -+ pthread_mutex_lock(&post_mutex); -+ { -+ int id = vpu_async_tail++; -+-- -+2.7.4 -+ -+ -+From e7b457e683d4ca92bf2677b69708fbfc3849847b Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 7 May 2015 11:01:35 +0100 -+Subject: [PATCH 13/68] Added deblocking pass -+ -+--- -+ libavcodec/hevc.c | 33 +++++++++++++++++++++++++++------ -+ libavcodec/hevc.h | 7 ++++++- -+ libavcodec/hevc_filter.c | 6 +++++- -+ libavcodec/rpi_qpu.c | 2 +- -+ 4 files changed, 39 insertions(+), 9 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 2e269b6..29f8415 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2518,6 +2518,17 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ } -+ -+ #ifdef RPI -++static void rpi_execute_dblk_cmds(HEVCContext *s) -++{ -++ int n; -++ int ctb_size = 1 << s->ps.sps->log2_ctb_size; -++ int (*p)[2] = s->dblk_cmds; -++ for(n = s->num_dblk_cmds; n>0 ;n--,p++) { -++ ff_hevc_hls_filters(s, (*p)[0], (*p)[1], ctb_size); -++ } -++ s->num_dblk_cmds = 0; -++} -++ -+ static void rpi_execute_transform(HEVCContext *s) -+ { -+ int i=2; -+@@ -2631,7 +2642,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -+ #ifdef RPI -+- int start_ctb_x = (s->sh.slice_ctb_addr_rs % ((s->ps.sps->width + ctb_size - 1) >> s->ps.sps->log2_ctb_size)) << s->ps.sps->log2_ctb_size; -+ s->enable_rpi = 1; // TODO this should depend on cross component and frame width etc. -+ #endif -+ -+@@ -2665,7 +2675,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ #ifdef RPI -+- if (s->enable_rpi && x_ctb + ctb_size >= s->ps.sps->width) { -++ if (s->enable_rpi) { -++ s->dblk_cmds[s->num_dblk_cmds][0] = x_ctb; -++ s->dblk_cmds[s->num_dblk_cmds++][1] = y_ctb; -++ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+ int x; -+ // Transform all blocks -+ //printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+@@ -2678,10 +2691,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ // Perform intra prediction and residual reconstruction -+ rpi_execute_pred_cmds(s); -+ // Perform deblocking for CTBs in this row -+- for(x = start_ctb_x; x <= x_ctb; x += ctb_size) { // TODO this will fail for tiles -+- ff_hevc_hls_filters(s, x, y_ctb, ctb_size); -+- } -+- start_ctb_x = 0; -++ rpi_execute_dblk_cmds(s); -++ } -+ } -+ #endif -+ if (more_data < 0) { -+@@ -2699,6 +2710,16 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ ff_hevc_hls_filters(s, x_ctb, y_ctb, ctb_size); -+ } -+ -++#ifdef RPI -++ if (s->enable_rpi && s->num_dblk_cmds) { -++ rpi_execute_transform(s); -++ rpi_execute_inter_cmds(s); -++ vpu_wait(s->vpu_id); -++ rpi_execute_pred_cmds(s); -++ rpi_execute_dblk_cmds(s); -++ } -++#endif -++ -+ if (x_ctb + ctb_size >= s->ps.sps->width && -+ y_ctb + ctb_size >= s->ps.sps->height) -+ ff_hevc_hls_filter(s, x_ctb, y_ctb, ctb_size); -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 0d8dfe9..990bd8c 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -808,6 +808,8 @@ typedef struct HEVCLocalContext { -+ #define RPI_MAX_XFM_CMDS (16*3*(RPI_MAX_WIDTH/4)) -+ // Each block can have an intra prediction and a transform_add command -+ #define RPI_MAX_PRED_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -++// Worst case is 16x16 CTUs -++#define RPI_MAX_DEBLOCK_CMDS (RPI_MAX_WIDTH*4/16) -+ -+ #define RPI_CMD_LUMA_UNI 0 -+ #define RPI_CMD_CHROMA_UNI 1 -+@@ -867,6 +869,9 @@ typedef struct HEVCPredCmd { -+ #endif -+ -+ typedef struct HEVCContext { -++#ifdef RPI -++ int dblk_cmds[RPI_MAX_DEBLOCK_CMDS][2]; -++#endif -+ const AVClass *c; // needed by private avoptions -+ AVCodecContext *avctx; -+ -+@@ -891,11 +896,11 @@ typedef struct HEVCContext { -+ GPU_MEM_PTR_T coeffs_buf_accelerated; -+ int16_t *coeffs_buf_arm[4]; -+ unsigned int coeffs_buf_vc[4]; -+- -+ int num_coeffs[4]; -+ int num_xfm_cmds; -+ int num_mv_cmds; -+ int num_pred_cmds; -++ int num_dblk_cmds; -+ int vpu_id; -+ #endif -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index e4c3da7..ea0af91 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -877,8 +877,12 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ if (s->threads_type & FF_THREAD_FRAME ) -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -+ } -+- } else if (s->threads_type & FF_THREAD_FRAME && x_end) -++ } else if (s->threads_type & FF_THREAD_FRAME && x_end) { -++ int newh = y + ctb_size - 4; -++ //int currh = s->ref->tf.progress->data[0]; -++ //if (((y + ctb_size)&63)==0) -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -++ } -+ } -+ -+ void ff_hevc_hls_filters(HEVCContext *s, int x_ctb, int y_ctb, int ctb_size) -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 85f49db..3b6dae7 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -105,7 +105,7 @@ struct GPU -+ static pthread_mutex_t gpu_mutex = PTHREAD_MUTEX_INITIALIZER; -+ static volatile struct GPU* gpu = NULL; -+ -+-#ifdef RPI_TIME_TOTAL_QPU -++#if defined(RPI_TIME_TOTAL_QPU) || defined(RPI_TIME_TOTAL_VPU) -+ static unsigned int Microseconds(void) { -+ struct timespec ts; -+ unsigned int x; -+-- -+2.7.4 -+ -+ -+From 7a443df9115f21b4428de378bd146dcdba3dd42a Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 7 May 2015 16:47:47 +0100 -+Subject: [PATCH 14/68] Added option to disable deblocking for non-ref frames -+ -+--- -+ libavcodec/hevc_filter.c | 10 ++++++++++ -+ 1 file changed, 10 insertions(+) -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index ea0af91..2cdd621 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -25,6 +25,8 @@ -+ //#define DISABLE_SAO -+ //#define DISABLE_DEBLOCK -+ //#define DISABLE_STRENGTHS -++// define DISABLE_DEBLOCK_NONREF for a 6% speed boost (by skipping deblocking on unimportant frames) -++//#define DISABLE_DEBLOCK_NONREF -+ -+ #include "libavutil/common.h" -+ #include "libavutil/internal.h" -+@@ -504,6 +506,14 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->ps.sps->pcm.loop_filter_disable_flag) || -+ s->ps.pps->transquant_bypass_enable_flag; -+ -++#ifdef DISABLE_DEBLOCK_NONREF -++ if ( s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N ) -++ return; // Don't deblock non-reference frames -++#endif -+ #ifdef DISABLE_DEBLOCK -+ return; -+ #endif -+-- -+2.7.4 -+ -+ -+From 9606e160a582db64ccf981d971cdc258d8cc02f7 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 11 May 2015 10:00:27 +0100 -+Subject: [PATCH 15/68] Moved buffers to VPU memory -+ -+--- -+ libavcodec/hevc_filter.c | 17 +++++++++++++- -+ libavcodec/utils.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ -+ libavutil/buffer.c | 6 +++++ -+ libavutil/buffer.h | 3 +++ -+ 4 files changed, 84 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 2cdd621..e1b32d4 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -866,6 +866,13 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ #undef CB -+ #undef CR -+ -++#ifdef RPI_INTER_QPU -++static void flush_buffer(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ gpu_cache_flush(p); -++} -++#endif -++ -+ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ { -+ int x_end = x >= s->ps.sps->width - ctb_size; -+@@ -888,9 +895,17 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -+ } -+ } else if (s->threads_type & FF_THREAD_FRAME && x_end) { -+- int newh = y + ctb_size - 4; -++ //int newh = y + ctb_size - 4; -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -++ if (!( s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N )) { -++ flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[2]); -++ } -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+ } -+diff --git a/libavcodec/utils.c b/libavcodec/utils.c -+index f7adb52..708526e 100644 -+--- a/libavcodec/utils.c -++++ b/libavcodec/utils.c -+@@ -26,6 +26,12 @@ -+ */ -+ -+ #include "config.h" -++ -++#ifdef RPI -++// Move video buffers to GPU memory -++#define RPI_GPU_BUFFERS -++#endif -++ -+ #include "libavutil/atomic.h" -+ #include "libavutil/attributes.h" -+ #include "libavutil/avassert.h" -+@@ -64,6 +70,10 @@ -+ #include "libavutil/ffversion.h" -+ const char av_codec_ffversion[] = "FFmpeg version " FFMPEG_VERSION; -+ -++#ifdef RPI_GPU_BUFFERS -++#include "rpi_qpu.h" -++#endif -++ -+ #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS -+ static int default_lockmgr_cb(void **arg, enum AVLockOp op) -+ { -+@@ -503,6 +513,47 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, -+ return ret; -+ } -+ -++#ifdef RPI_GPU_BUFFERS -++static void rpi_buffer_default_free(void *opaque, uint8_t *data) -++{ -++ GPU_MEM_PTR_T *p = opaque; -++ gpu_free(p); -++ av_free(p); -++} -++ -++static AVBufferRef *rpi_buffer_alloc(int size) -++{ -++ AVBufferRef *ret = NULL; -++ uint8_t *data = NULL; -++ GPU_MEM_PTR_T *p; -++ -++ static int total=0; -++ total+=size; -++ -++ p = av_malloc(sizeof *p); -++ if (!p) -++ return NULL; -++ -++ if (gpu_malloc_cached(size,p)<0) // Change this line to choose cached or uncached memory. The caching here refers to the ARM data cache. -++ return NULL; -++ -++ data = p->arm; -++ printf("Rpi alloc %d/%d ARM=%p VC=%x->%x\n",size,total,p->arm,p->vc,p->vc+size); -++ //memset(data, 64, size); -++ -++ if (!data) -++ return NULL; -++ -++ ret = av_buffer_create(data, size, rpi_buffer_default_free, p, 0); -++ if (!ret) { -++ gpu_free(p); -++ av_freep(&p); -++ } -++ -++ return ret; -++} -++#endif -++ -+ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) -+ { -+ FramePool *pool = avctx->internal->pool; -+@@ -550,6 +601,14 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) -+ av_buffer_pool_uninit(&pool->pools[i]); -+ pool->linesize[i] = linesize[i]; -+ if (size[i]) { -++#ifdef RPI_GPU_BUFFERS -++ if (avctx->codec_id == AV_CODEC_ID_HEVC) -++ pool->pools[i] = av_buffer_pool_init(size[i] + 16 + STRIDE_ALIGN - 1, -++ CONFIG_MEMORY_POISONING ? -++ NULL : -++ rpi_buffer_alloc); -++ else -++#endif -+ pool->pools[i] = av_buffer_pool_init(size[i] + 16 + STRIDE_ALIGN - 1, -+ CONFIG_MEMORY_POISONING ? -+ NULL : -+diff --git a/libavutil/buffer.c b/libavutil/buffer.c -+index 694e116..203ca7b 100644 -+--- a/libavutil/buffer.c -++++ b/libavutil/buffer.c -+@@ -425,3 +425,9 @@ AVBufferRef *av_buffer_pool_get(AVBufferPool *pool) -+ -+ return ret; -+ } -++ -++// Return the opaque for the underlying frame (gives us a GPU_MEM_PTR_T) -++void *av_buffer_pool_opaque(AVBufferRef *ref) { -++ BufferPoolEntry *buf = av_buffer_get_opaque(ref); -++ return buf->opaque; -++} -+diff --git a/libavutil/buffer.h b/libavutil/buffer.h -+index 0c0ce12..82e0bc3 100644 -+--- a/libavutil/buffer.h -++++ b/libavutil/buffer.h -+@@ -283,6 +283,9 @@ void av_buffer_pool_uninit(AVBufferPool **pool); -+ */ -+ AVBufferRef *av_buffer_pool_get(AVBufferPool *pool); -+ -++// Return the opaque for the underlying frame -++void *av_buffer_pool_opaque(AVBufferRef *ref); -++ -+ /** -+ * @} -+ */ -+-- -+2.7.4 -+ -+ -+From f56515b9a720c829ba3ddf6da4232a91b13e0f03 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 11 May 2015 14:04:37 +0100 -+Subject: [PATCH 16/68] Prepared QPU execute code -+ -+--- -+ libavcodec/hevc.c | 227 ++++++++++++++++++++++++++++++++++++++++------- -+ libavcodec/hevc.h | 22 ++++- -+ libavcodec/hevc_filter.c | 7 +- -+ libavcodec/rpi_qpu.c | 55 +++++++++++- -+ libavcodec/rpi_qpu.h | 2 + -+ 5 files changed, 276 insertions(+), 37 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 29f8415..66ed37a 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -42,17 +42,45 @@ -+ #include "profiles.h" -+ -+ #ifdef RPI -+-#include "rpi_qpu.h" -+-// For some unknown reason, the code seems to crash if I do a late malloc -+-#define EARLY_MALLOC -+-// Move Inter prediction into separate pass -+-#define RPI_INTER -++ #include "rpi_qpu.h" -++ // For some unknown reason, the code seems to crash if I do a late malloc -++ #define EARLY_MALLOC -++ // Move Inter prediction into separate pass -++ #define RPI_INTER -+ #endif -+ -+ // #define DISABLE_MC -+ -+ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; -+ -++ -++#ifdef RPI_INTER_QPU -++ -++#define RPI_CHROMA_COMMAND_WORDS 12 -++// The QPU code for UV blocks only works up to a block width of 8 -++#define RPI_CHROMA_BLOCK_WIDTH 8 -++ -++#define ENCODE_COEFFS(c0, c1, c2, c3) (((-c0) & 0xff) | ((-c1) & 0xff) << 8 | ((-c2) & 0xff) << 16 | ((-c3) & 0xff) << 24) -++ -++// TODO Chroma only needs 4 taps -++static uint32_t rpi_filter_coefs[8][2] = { -++ { ENCODE_COEFFS( 0, 0, 0, 128), ENCODE_COEFFS( 0, 0, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -2, 58), ENCODE_COEFFS( 10, -2, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -4, 54), ENCODE_COEFFS( 16, -2, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -6, 46), ENCODE_COEFFS( 28, -4, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -4, 36), ENCODE_COEFFS( 36, -4, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -4, 28), ENCODE_COEFFS( 46, -6, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -2, 16), ENCODE_COEFFS( 54, -4, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, -2, 10), ENCODE_COEFFS( 58, -2, 0, 0 ) } -++}; -++ -++static uint32_t get_vc_address(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ return p->vc; -++} -++ -++#endif -++ -+ /** -+ * NOTE: Each function hls_foo correspond to the function foo in the -+ * specification (HLS stands for High Level Syntax). -+@@ -66,6 +94,7 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ static void pic_arrays_free(HEVCContext *s) -+ { -+ #ifdef RPI -++ -+ #ifdef EARLY_MALLOC -+ #else -+ printf("pic_arrays_free\n"); -+@@ -1982,6 +2011,43 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ s->sh.luma_offset_l0[current_mv.ref_idx[0]]); -+ -+ if (s->ps.sps->chroma_format_idc) { -++#ifdef RPI_INTER_QPU -++ if (s->enable_rpi) { -++ int reflist = 0; -++ int hshift = s->ps.sps->hshift[1]; -++ int vshift = s->ps.sps->vshift[1]; -++ const Mv *mv = ¤t_mv.mv[reflist]; -++ intptr_t mx = av_mod_uintp2(mv->x, 2 + hshift); -++ intptr_t my = av_mod_uintp2(mv->y, 2 + vshift); -++ intptr_t _mx = mx << (1 - hshift); -++ intptr_t _my = my << (1 - vshift); // Fractional part of motion vector -++ -++ int x1_c = x0_c + (mv->x >> (2 + hshift)); -++ int y1_c = y0_c + (mv->y >> (2 + hshift)); -++ int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ -++ uint32_t *u = s->u_mvs[chan & 7]; -++ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -++ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -++ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -++ *u++ = rpi_filter_coefs[_mx][0]; -++ *u++ = rpi_filter_coefs[_mx][1]; -++ *u++ = rpi_filter_coefs[_my][0]; -++ *u++ = rpi_filter_coefs[_my][1]; -++ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ } -++ } -++ s->u_mvs[chan & 7] = u; -++ return; -++ } -++#endif -+ RPI_REDIRECT(chroma_mc_uni)(s, dst1, s->frame->linesize[1], ref0->frame->data[1], ref0->frame->linesize[1], -+ 0, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0]); -+@@ -2632,6 +2698,54 @@ static void rpi_execute_inter_cmds(HEVCContext *s) -+ -+ #endif -+ -++#ifdef RPI_INTER_QPU -++static void rpi_inter_clear(HEVCContext *s) -++{ -++ int i; -++ int pic_width = s->ps.sps->width >> s->ps.sps->hshift[1]; -++ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[1]; -++ for(i=0;i<8;i++) { -++ s->u_mvs[i] = s->mvs_base[i]; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = pic_width; -++ *s->u_mvs[i]++ = pic_height; -++ *s->u_mvs[i]++ = s->frame->linesize[1]; -++ *s->u_mvs[i]++ = s->frame->linesize[2]; -++ s->u_mvs[i] += 3; // Padding words -++ } -++} -++ -++static void rpi_execute_inter_qpu(HEVCContext *s) -++{ -++ int k; -++ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -++ -++ if (s->sh.slice_type == I_SLICE) -++ return; -++ for(k=0;k<8;k++) { -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ } -++ -++ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++ -++ qpu_run_shader8(qpu_get_fn(QPU_MC_SETUP_UV), -++ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ ); -++} -++#endif -++ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ { -+ HEVCContext *s = avctxt->priv_data; -+@@ -2658,6 +2772,10 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ } -+ -++#ifdef RPI_INTER_QPU -++ rpi_inter_clear(s); -++#endif -++ -+ while (more_data && ctb_addr_ts < s->ps.sps->ctb_size) { -+ int ctb_addr_rs = s->ps.pps->ctb_addr_ts_to_rs[ctb_addr_ts]; -+ -+@@ -2679,19 +2797,30 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->dblk_cmds[s->num_dblk_cmds][0] = x_ctb; -+ s->dblk_cmds[s->num_dblk_cmds++][1] = y_ctb; -+ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+- int x; -++#ifdef RPI_INTER_QPU -++ // Kick off inter prediction on QPUs -++ rpi_execute_inter_qpu(s); -++#endif -+ // Transform all blocks -+ //printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+- -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -++ -++ // Copy back reconstructed data -++ //memcpy(s->frame->data[0],s->dummy.arm,2048*64); -++ //memcpy(s->frame->data[1],s->dummy.arm,1024*32); -++ //memcpy(s->frame->data[2],s->dummy.arm,1024*32); -++ -+ // Perform intra prediction and residual reconstruction -+ rpi_execute_pred_cmds(s); -+ // Perform deblocking for CTBs in this row -+ rpi_execute_dblk_cmds(s); -++#ifdef RPI_INTER_QPU -++ rpi_inter_clear(s); -++#endif -+ } -+ } -+ #endif -+@@ -2712,6 +2841,9 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ -+ #ifdef RPI -+ if (s->enable_rpi && s->num_dblk_cmds) { -++#ifdef RPI_INTER_QPU -++ rpi_execute_inter_qpu(s); -++#endif -+ rpi_execute_transform(s); -+ rpi_execute_inter_cmds(s); -+ vpu_wait(s->vpu_id); -+@@ -3451,6 +3583,14 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->unif_xfm_cmds); -+ av_freep(&s->univ_pred_cmds); -+ -++#ifdef RPI_INTER_QPU -++ if (s->unif_mvs) { -++ gpu_free( &s->unif_mvs_ptr ); -++ s->unif_mvs = 0; -++ } -++#endif -++ //gpu_free(&s->dummy); -++ -+ #ifdef EARLY_MALLOC -+ printf("hevc_decode_free\n"); -+ if (s->coeffs_buf_arm[0]) { -+@@ -3541,34 +3681,59 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ if (!s->univ_pred_cmds) -+ goto fail; -+ -+- s->coeffs_buf_arm[0] = 0; -+- s->coeffs_buf_arm[2] = 0; -++#ifdef RPI_INTER_QPU -++ // We divide the image into blocks 256 wide and 64 high -++ // We support up to 2048 widths -++ // We compute the number of chroma motion vector commands for 4:4:4 format and 4x4 chroma blocks - assuming all blocks are B predicted -++ // Also add space for the startup command for each stream. -++ -++ { -++ int uv_commands_per_qpu = (1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS; -++ uint32_t *p; -++ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++ s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -++ -++ // Set up initial locations for uniform streams -++ p = s->unif_mvs; -++ for(i = 0; i < 8; i++) { -++ s->mvs_base[i] = p; -++ p += uv_commands_per_qpu; -++ } -++ s->mc_filter_uv = qpu_get_fn(QPU_MC_FILTER_UV); -++ s->mc_filter_uv_b = qpu_get_fn(QPU_MC_FILTER_UV_B); -++ -++ } -++#endif -++ //gpu_malloc_uncached(2048*64,&s->dummy); -+ -+ #ifdef EARLY_MALLOC -+- int coeffs_in_ctb = 64*64; -+- int coefs_per_row = (2048/64) * coeffs_in_ctb * 3; // Allow space for chroma -+- printf("Allocated %d\n",coefs_per_row); -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -+- if (!s->coeffs_buf_arm[0]) -+- goto fail; -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -+- s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -+- if (!s->coeffs_buf_arm[2]) -+- goto fail; -+- s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -+- s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -+- printf("Done\n"); -++ { -++ int coeffs_in_ctb = 64*64; -++ int coefs_per_row = (2048/64) * coeffs_in_ctb * 3; // Allow space for chroma -++ s->coeffs_buf_arm[0] = 0; -++ s->coeffs_buf_arm[2] = 0; -++ printf("Allocated %d\n",coefs_per_row); -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -++ s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -++ if (!s->coeffs_buf_arm[0]) -++ goto fail; -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -++ s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -++ s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -++ if (!s->coeffs_buf_arm[2]) -++ goto fail; -++ s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -++ s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -++ printf("Done\n"); -+ #ifdef RPI_PRECLEAR -+- //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[0], coefs_per_row); -+- //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[2], coefs_per_row); -+- //memset(s->coeffs_buf_arm[3],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[3], coefs_per_row); -++ //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[0], coefs_per_row); -++ //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[2], coefs_per_row); -++ //memset(s->coeffs_buf_arm[3],0, sizeof(int16_t) * coefs_per_row); -++ memclear16(s->coeffs_buf_arm[3], coefs_per_row); -+ #endif -+- -++ } -+ #endif -+ -+ s->enable_rpi = 0; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 990bd8c..da345f6 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -42,7 +42,11 @@ -+ -+ // define RPI to split the CABAC/prediction/transform into separate stages -+ #ifdef RPI -+-#include "rpi_qpu.h" -++ -++ #include "rpi_qpu.h" -++ // Use QPU for inter prediction -++ //#define RPI_INTER_QPU -++ -+ #endif -+ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+@@ -888,7 +892,7 @@ typedef struct HEVCContext { -+ -+ #ifdef RPI -+ int enable_rpi; -+- HEVCMvCmd *unif_mv_cmds; -++ HEVCMvCmd *unif_mv_cmds; // TODO rename -+ HEVCXfmCmd *unif_xfm_cmds; -+ HEVCPredCmd *univ_pred_cmds; -+ int buf_width; -+@@ -902,6 +906,20 @@ typedef struct HEVCContext { -+ int num_pred_cmds; -+ int num_dblk_cmds; -+ int vpu_id; -++ //GPU_MEM_PTR_T dummy; -++#ifdef RPI_INTER_QPU -++ GPU_MEM_PTR_T unif_mvs_ptr; -++ uint32_t *unif_mvs; // Base of memory for motion vector commands -++ -++ // _base pointers are to the start of the row -++ uint32_t *mvs_base[8]; -++ // these pointers are to the next free space -++ uint32_t *u_mvs[8]; -++ // Function pointers -++ uint32_t mc_filter_uv; -++ uint32_t mc_filter_uv_b; -++#endif -++ -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index e1b32d4..5b3d759 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -903,8 +903,11 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ s->nal_unit_type == NAL_STSA_N || -+ s->nal_unit_type == NAL_RADL_N || -+ s->nal_unit_type == NAL_RASL_N )) { -+- flush_buffer(s->frame->buf[1]); -+- flush_buffer(s->frame->buf[2]); -++ //flush_buffer(s->frame->buf[1]); -++ //flush_buffer(s->frame->buf[2]); -++ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -++ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -++ //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -+ } -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 3b6dae7..e4dd58a 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -3,7 +3,7 @@ -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+ #define RPI_USE_VCSM -+ // define RPI_TIME_TOTAL_QPU to print out how much time is spent in the QPU code -+-//#define RPI_TIME_TOTAL_QPU -++#define RPI_TIME_TOTAL_QPU -+ // define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -+ //#define RPI_TIME_TOTAL_VPU -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+@@ -30,7 +30,7 @@ -+ #endif -+ -+ // On Pi2 there is no way to access the VPU L2 cache -+-// GPU_MEM_FLG should be 4 for uncached memory. -++// GPU_MEM_FLG should be 4 for uncached memory. (Or C for alias to allocate in the VPU L2 cache) -+ // However, if using VCSM allocated buffers, need to use C at the moment because VCSM does not allocate uncached memory correctly -+ // The QPU crashes if we mix L2 cached and L2 uncached accesses due to a HW bug. -+ #define GPU_MEM_FLG 0xC -+@@ -549,6 +549,54 @@ void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int un -+ gpu_unlock(); -+ } -+ -++// Run a program on 8 QPUs with the given code and uniform stream (given in GPU addresses) -++void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8) -++{ -++ int i; -++#ifdef RPI_TIME_TOTAL_QPU -++ static int last_time=0; -++ static long long on_time=0; -++ static long long off_time=0; -++ int start_time; -++ int end_time; -++ static int count=0; -++#endif -++ -++ gpu_lock(); -++#ifdef RPI_TIME_TOTAL_QPU -++ start_time = Microseconds(); -++ if (last_time==0) -++ last_time = start_time; -++ off_time += start_time-last_time; -++#endif -++ for(i=0;i<8;i++) { -++ gpu->mail[i*2 + 1] = code; -++ } -++ gpu->mail[0 ] = unifs1; -++ gpu->mail[2 ] = unifs2; -++ gpu->mail[4 ] = unifs3; -++ gpu->mail[6 ] = unifs4; -++ gpu->mail[8 ] = unifs5; -++ gpu->mail[10] = unifs6; -++ gpu->mail[12] = unifs7; -++ gpu->mail[14] = unifs8; -++ execute_qpu( -++ gpu->mb, -++ 8 /* Number of QPUs */, -++ gpu->vc + offsetof(struct GPU, mail), -++ 1 /* no flush */, // Don't flush VPU L1 cache -++ 5000 /* timeout ms */); -++#ifdef RPI_TIME_TOTAL_QPU -++ end_time = Microseconds(); -++ last_time = end_time; -++ on_time += end_time - start_time; -++ count++; -++ if ((count&0x7f)==0) -++ printf("On=%dms, Off=%dms\n",(int)(on_time/1000),(int)(off_time/1000)); -++#endif -++ gpu_unlock(); -++} -++ -+ unsigned int qpu_get_fn(int num) { -+ // Make sure that the gpu is initialized -+ unsigned int *fn; -+@@ -585,6 +633,9 @@ unsigned int qpu_get_fn(int num) { -+ case QPU_MC_FILTER_UV_B: -+ fn = mc_filter_uv_b; -+ break; -++ case QPU_MC_INTERRUPT_EXIT8: -++ fn = mc_interrupt_exit8; -++ break; -+ case QPU_MC_END: -+ fn = mc_end; -+ break; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 3526fce..2b22d98 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -16,6 +16,7 @@ extern void gpu_free(GPU_MEM_PTR_T *p); -+ extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -+ -+ // QPU specific functions -++extern void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+ extern void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12); -+ -+ enum { -+@@ -28,6 +29,7 @@ enum { -+ QPU_MC_SETUP_UV, -+ QPU_MC_FILTER_UV, -+ QPU_MC_FILTER_UV_B, -++ QPU_MC_INTERRUPT_EXIT8, -+ QPU_MC_END -+ }; -+ extern unsigned int qpu_get_fn(int num); -+-- -+2.7.4 -+ -+ -+From bd651e1569ebe0cdc41a6be169e139758cce069d Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 11:47:23 +0100 -+Subject: [PATCH 17/68] Drafted chroma interpolation on QPUs -+ -+--- -+ libavcodec/hevc.c | 5 ++- -+ libavcodec/hevc.h | 2 +- -+ libavcodec/hevc_filter.c | 6 ++- -+ libavcodec/rpi_qpu.c | 101 +++++++++++++++++++++++++++++++++++++++++++-- -+ libavcodec/rpi_qpu.h | 1 + -+ libavcodec/rpi_shader.c | 42 +++++++++---------- -+ libavcodec/rpi_shader.qasm | 42 +++++++++---------- -+ 7 files changed, 149 insertions(+), 50 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 66ed37a..d5ea45e 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -60,11 +60,11 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+ -+-#define ENCODE_COEFFS(c0, c1, c2, c3) (((-c0) & 0xff) | ((-c1) & 0xff) << 8 | ((-c2) & 0xff) << 16 | ((-c3) & 0xff) << 24) -++#define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+ // TODO Chroma only needs 4 taps -+ static uint32_t rpi_filter_coefs[8][2] = { -+- { ENCODE_COEFFS( 0, 0, 0, 128), ENCODE_COEFFS( 0, 0, 0, 0 ) }, -++ { ENCODE_COEFFS( 0, 0, 0, 64), ENCODE_COEFFS( 0, 0, 0, 0 ) }, -+ { ENCODE_COEFFS( 0, 0, -2, 58), ENCODE_COEFFS( 10, -2, 0, 0 ) }, -+ { ENCODE_COEFFS( 0, 0, -4, 54), ENCODE_COEFFS( 16, -2, 0, 0 ) }, -+ { ENCODE_COEFFS( 0, 0, -6, 46), ENCODE_COEFFS( 28, -4, 0, 0 ) }, -+@@ -2729,6 +2729,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ for(k=0;k<8;k++) { -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP); // Also need a dummy for V -+ } -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index da345f6..2497c47 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -45,7 +45,7 @@ -+ -+ #include "rpi_qpu.h" -+ // Use QPU for inter prediction -+- //#define RPI_INTER_QPU -++ // #define RPI_INTER_QPU -+ -+ #endif -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 5b3d759..9b6e26d 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -903,8 +903,10 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ s->nal_unit_type == NAL_STSA_N || -+ s->nal_unit_type == NAL_RADL_N || -+ s->nal_unit_type == NAL_RASL_N )) { -+- //flush_buffer(s->frame->buf[1]); -+- //flush_buffer(s->frame->buf[2]); -++#ifdef RPI_INTER_QPU -++ flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[2]); -++#endif -+ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -+ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -+ //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index e4dd58a..4d9eda8 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -33,7 +33,8 @@ -+ // GPU_MEM_FLG should be 4 for uncached memory. (Or C for alias to allocate in the VPU L2 cache) -+ // However, if using VCSM allocated buffers, need to use C at the moment because VCSM does not allocate uncached memory correctly -+ // The QPU crashes if we mix L2 cached and L2 uncached accesses due to a HW bug. -+-#define GPU_MEM_FLG 0xC -++#define GPU_MEM_FLG 0x4 -++// GPU_MEM_MAP is meaningless on the Pi2 and should be left at 0 (On Pi1 it allows ARM to access VPU L2 cache) -+ #define GPU_MEM_MAP 0x0 -+ -+ #define vcos_verify(x) ((x)>=0) -+@@ -165,6 +166,8 @@ static int gpu_init(volatile struct GPU **gpu) { -+ ptr->vc_handle = handle; -+ ptr->vc = vc; -+ -++ printf("GPU allocated at 0x%x\n",vc); -++ -+ *gpu = ptr; -+ -+ // Now copy over the QPU code into GPU memory -+@@ -304,10 +307,13 @@ int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p) { -+ -+ static void gpu_term(void) -+ { -+- int mb = gpu->mb; -+- unsigned handle = gpu->vc_handle; -++ int mb; -++ unsigned handle; -++ -+ if (gpu==NULL) -+ return; -++ mb = gpu->mb; -++ handle = gpu->vc_handle; -+ -+ #ifdef RPI_ASYNC -+ { -+@@ -648,6 +654,95 @@ unsigned int qpu_get_fn(int num) { -+ } -+ -+ #if 0 -++typedef unsigned int uint32_t; -++ -++typedef struct mvs_s { -++ GPU_MEM_PTR_T unif_mvs_ptr; -++ uint32_t *unif_mvs; // Base of memory for motion vector commands -++ -++ // _base pointers are to the start of the row -++ uint32_t *mvs_base[8]; -++ // these pointers are to the next free space -++ uint32_t *u_mvs[8]; -++ -++} HEVCContext; -++ -++#define RPI_CHROMA_COMMAND_WORDS 12 -++ -++static void rpi_inter_clear(HEVCContext *s) -++{ -++ int i; -++ for(i=0;i<8;i++) { -++ s->u_mvs[i] = s->mvs_base[i]; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 0; -++ *s->u_mvs[i]++ = 128; // w -++ *s->u_mvs[i]++ = 128; // h -++ *s->u_mvs[i]++ = 128; // stride u -++ *s->u_mvs[i]++ = 128; // stride v -++ s->u_mvs[i] += 3; // Padding words -++ } -++} -++ -++static void rpi_execute_inter_qpu(HEVCContext *s) -++{ -++ int k; -++ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -++ -++ for(k=0;k<8;k++) { -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP); // dummy location for V -++ } -++ -++ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++ -++ qpu_run_shader8(qpu_get_fn(QPU_MC_SETUP_UV), -++ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ ); -++} -++ -++void rpi_test_qpu(void) -++{ -++ HEVCContext mvs; -++ HEVCContext *s = &mvs; -++ int i; -++ int uv_commands_per_qpu = (1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS; -++ uint32_t *p; -++ printf("Allocate memory\n"); -++ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++ s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; -++ -++ // Set up initial locations for uniform streams -++ p = s->unif_mvs; -++ for(i = 0; i < 8; i++) { -++ s->mvs_base[i] = p; -++ p += uv_commands_per_qpu; -++ } -++ // Now run a simple program that should just quit immediately after a single texture fetch -++ rpi_inter_clear(s); -++ for(i=0;i<4;i++) { -++ printf("Launch QPUs\n"); -++ rpi_execute_inter_qpu(s); -++ printf("Done\n"); -++ } -++ printf("Free memory\n"); -++ gpu_free(&s->unif_mvs_ptr); -++ return; -++} -++#endif -++ -++#if 0 -+ -+ int32_t hcoeffs[] = {-4, 10, -21, 70, 90, -24, 11, -4}; -+ //int32_t hcoeffs[] = {1, 1, 1, 1, 1, 1, 1, 1}; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 2b22d98..f9ad333 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -18,6 +18,7 @@ extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -+ // QPU specific functions -+ extern void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+ extern void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12); -++extern void rpi_test_qpu(void); -+ -+ enum { -+ QPU_MC_SETUP, -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 41cc2e1..d7ed297 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -152,23 +152,23 @@ unsigned int rpi_shader[] = { -+ /* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+ /* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+ /* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000400] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000408] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-/* [0x00000410] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000400] */ 0x55015fc6, 0x100248a2, // mov r2, rb21 ; mul24 r2, r0, ra0 -++/* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+ /* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000420] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000420] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ /* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000430] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000430] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ /* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000440] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000440] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+ /* [0x00000448] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000450] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000450] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+ /* [0x00000458] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000460] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000460] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+ /* [0x00000468] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000470] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000470] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+ /* [0x00000478] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000480] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000480] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+ /* [0x00000488] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+ /* [0x00000490] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+ /* [0x00000498] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+@@ -179,20 +179,20 @@ unsigned int rpi_shader[] = { -+ /* [0x000004c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+ /* [0x000004c8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+ /* [0x000004d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x000004d8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x000004d8] */ 0x8f54e1f6, 0xd0024821, // asr r0, r0, 14 ; mov r1, ra21 -+ /* [0x000004e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x000004e8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x000004f0] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x000004f8] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000500] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000508] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000510] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000518] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000520] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000528] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000004e8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x000004f0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x000004f8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000500] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000508] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000510] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000518] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000520] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000528] */ 0x8c9f223f, 0x100a0867, // add.ifnn r1, r1, r0 ; mov -, vw_wait -+ /* [0x00000530] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ /* [0x00000538] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000540] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00000540] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+ /* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+ /* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+ /* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 6851e83..02fdcb2 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -270,23 +270,23 @@ add t0s, ra_x2_base, r2 -+ -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++mov r2, rb21 ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -+ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+ nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+ nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+ nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+ nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 -++add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+@@ -302,23 +302,23 @@ sub.setf -, r3, 8 ; mov r1, ra22 -+ # apply horizontal filter -+ brr.anyn -, r:uvloop -+ max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -++asr r0, r0, 14 ; mov r1, ra21 -+ min.setf ra15, r0, rb22 -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -++nop ; mul24 r1, ra14, rb14 -++nop ; mul24 r0, ra13, rb13 -++add r1, r1, r0 ; mul24 r0, ra12, rb12 -++add r1, r1, r0 ; mul24 r0, ra11, rb11 -++add r1, r1, r0 ; mul24 r0, ra10, rb10 -++add r1, r1, r0 ; mul24 r0, ra9, rb9 -++add r1, r1, r0 ; mul24 r0, ra8, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb15 -++add.ifnn r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ brr.anyn -, r:uvloop -+-asr r1, r1, 15 -++asr r1, r1, 14 -+ min r1, r1, rb22 -+ max vpm, r1, 0 -+ -+-- -+2.7.4 -+ -+ -+From 61628063461ee5d891af6dbedfd495efcf464012 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 13:54:11 +0100 -+Subject: [PATCH 18/68] Fixed chroma inter prediction -+ -+--- -+ libavcodec/hevc.c | 8 +- -+ libavcodec/hevc.h | 2 +- -+ libavcodec/rpi_shader.c | 1170 ++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 22 +- -+ libavcodec/rpi_shader.qasm | 24 +- -+ 5 files changed, 617 insertions(+), 609 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index d5ea45e..d6d78ee 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -57,9 +57,11 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ #ifdef RPI_INTER_QPU -+ -+ #define RPI_CHROMA_COMMAND_WORDS 12 -++#define UV_COMMANDS_PER_QPU ((1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS) -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+ -++ -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+ // TODO Chroma only needs 4 taps -+@@ -2024,7 +2026,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ -+ int x1_c = x0_c + (mv->x >> (2 + hshift)); -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+- int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ int chan = x0>>8; -+ -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+@@ -2730,6 +2733,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP); // Also need a dummy for V -++ assert(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -+ } -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+@@ -3689,7 +3693,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ // Also add space for the startup command for each stream. -+ -+ { -+- int uv_commands_per_qpu = (1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS; -++ int uv_commands_per_qpu = UV_COMMANDS_PER_QPU; -+ uint32_t *p; -+ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -+ s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 2497c47..d513579 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -45,7 +45,7 @@ -+ -+ #include "rpi_qpu.h" -+ // Use QPU for inter prediction -+- // #define RPI_INTER_QPU -++ #define RPI_INTER_QPU -+ -+ #endif -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index d7ed297..831633b 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -33,7 +33,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000040] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+ /* [0x00000048] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+ /* [0x00000050] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000058] */ 0x00000040, 0xe0020567, // mov ra21, 64 -++/* [0x00000058] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+ /* [0x00000060] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+ /* [0x00000068] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+ /* [0x00000070] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+@@ -152,7 +152,7 @@ unsigned int rpi_shader[] = { -+ /* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+ /* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+ /* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000400] */ 0x55015fc6, 0x100248a2, // mov r2, rb21 ; mul24 r2, r0, ra0 -++/* [0x00000400] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+ /* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+ /* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+ /* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+@@ -178,9 +178,9 @@ unsigned int rpi_shader[] = { -+ /* [0x000004b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+ /* [0x000004c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+ /* [0x000004c8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x000004d8] */ 0x8f54e1f6, 0xd0024821, // asr r0, r0, 14 ; mov r1, ra21 -+-/* [0x000004e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x000004d0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000004d8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000004e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ /* [0x000004e8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+ /* [0x000004f0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+ /* [0x000004f8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+@@ -189,400 +189,400 @@ unsigned int rpi_shader[] = { -+ /* [0x00000510] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+ /* [0x00000518] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+ /* [0x00000520] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000528] */ 0x8c9f223f, 0x100a0867, // add.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000528] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+ /* [0x00000530] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000538] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000540] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000560] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000568] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000570] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000578] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000580] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000588] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000590] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000598] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000538] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000540] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000548] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000550] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000558] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000560] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000568] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000570] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000578] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000580] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000588] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000590] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000598] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000005a0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000005a8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter -+-/* [0x000005a0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005a8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005b0] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x000005b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005c0] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x000005c8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005d0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x000005d8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005e0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x000005e8] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x000005f0] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x000005f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000600] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000608] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000610] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000618] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000620] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000628] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000630] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000638] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000640] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000648] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000650] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000658] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000660] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000668] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000670] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000678] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000680] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000688] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000690] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000698] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000006b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000006d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000006f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000700] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000708] */ 0x000001d0, 0xf07809e7, // brr.anynn -, r:fast_path -+-/* [0x00000710] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000718] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000720] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000728] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000005b0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005b8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005c0] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x000005c8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005d0] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x000005d8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005e0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x000005e8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005f0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x000005f8] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000600] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000608] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000610] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000618] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000620] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000628] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000630] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000638] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000640] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000648] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000650] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000658] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000660] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000668] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000670] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000678] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000680] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000688] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000690] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000698] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000006a0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000006c0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000006e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000700] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000708] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000710] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000718] */ 0x000001d0, 0xf07809e7, // brr.anynn -, r:fast_path -++/* [0x00000720] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000728] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000730] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000738] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :loop -+-/* [0x00000730] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000738] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000740] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000748] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000750] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000758] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000760] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000768] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000770] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000778] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000780] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000788] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000790] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000798] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000007a0] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000007a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007b0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000007b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007c0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000007c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007d0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000007d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007e0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000007e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000007f0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000007f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000800] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x00000808] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000810] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000818] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000820] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000828] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000830] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000838] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000840] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000848] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:loop -+-/* [0x00000850] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000858] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000860] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000868] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000870] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000878] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000880] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000888] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000890] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000898] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x000008a0] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008a8] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x000008b0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008b8] */ 0xfffffe58, 0xf06809e7, // brr.anyn -, r:loop -+-/* [0x000008c0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000008c8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008d0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000008d8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000008e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000008f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000740] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000748] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000750] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000758] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000760] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000768] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000770] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000778] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000780] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000788] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000790] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000798] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x000007a0] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000007a8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000007b0] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000007b8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000007c0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007c8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000007d0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007d8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000007e0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007e8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000007f0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007f8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000800] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000808] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000810] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000818] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000820] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000828] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000830] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000838] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000840] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000848] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000850] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000858] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:loop -++/* [0x00000860] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000868] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000870] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000878] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000880] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000888] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000890] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000898] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x000008a0] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x000008a8] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x000008b0] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008b8] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000008c0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000008c8] */ 0xfffffe58, 0xf06809e7, // brr.anyn -, r:loop -++/* [0x000008d0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000008d8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008e0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000008e8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000008f0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008f8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000900] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // :fast_path -+-/* [0x000008f8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000908] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :fast_loop -+-/* [0x00000900] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000908] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000910] */ 0x95727d9b, 0x1004475f, // mov.ifz ra_y, ra_y_next ; mov rb31, r3 -+-/* [0x00000918] */ 0x95690dbf, 0x10044623, // mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -+-/* [0x00000920] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000928] */ 0x929de5e4, 0x100248a1, // min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 -+-/* [0x00000930] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000938] */ 0xec414c87, 0x10024e20, // add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000940] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000948] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000950] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000958] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000960] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000968] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000970] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000978] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000980] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000988] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000990] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000998] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000009a0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000009a8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000009b0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000009b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000009c8] */ 0xffffff18, 0xf06809e7, // brr.anyn -, r:fast_loop -+-/* [0x000009d0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x000009d8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x000009e0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x000009e8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x000009f0] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x000009f8] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000a00] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000a08] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000a10] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000a18] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000a20] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000a28] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000a30] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000a38] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:fast_loop -+-/* [0x00000a40] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x00000a48] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a50] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a60] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000910] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000918] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000920] */ 0x95727d9b, 0x1004475f, // mov.ifz ra_y, ra_y_next ; mov rb31, r3 -++/* [0x00000928] */ 0x95690dbf, 0x10044623, // mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -++/* [0x00000930] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000938] */ 0x929de5e4, 0x100248a1, // min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 -++/* [0x00000940] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000948] */ 0xec414c87, 0x10024e20, // add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00000950] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000958] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000960] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000968] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000970] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000978] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000980] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000988] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000990] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000998] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -++/* [0x000009a0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x000009a8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000009b0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000009b8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000009c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000009c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009d0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000009d8] */ 0xffffff18, 0xf06809e7, // brr.anyn -, r:fast_loop -++/* [0x000009e0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x000009e8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x000009f0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x000009f8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000a00] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000a08] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000a10] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000a18] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000a20] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000a28] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000a30] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000a38] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000a40] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000a48] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:fast_loop -++/* [0x00000a50] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00000a58] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a60] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a68] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a70] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a78] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a80] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_b -+-/* [0x00000a78] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000a80] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000a88] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x00000a90] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000a98] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000aa0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000aa8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x00000ab0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000ab8] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x00000ac0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000ac8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000ad0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000ad8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000ae0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000ae8] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000af0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000af8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000b00] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000b08] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000b10] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000b18] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000b20] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000b28] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000b30] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000b38] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000b40] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000b48] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000b50] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000b58] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000b60] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000b68] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000b70] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -+-/* [0x00000b78] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000b80] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000b88] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000b90] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000b98] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000ba0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ba8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bb0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bb8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000bc0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bc8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bd0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bd8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000be0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000be8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bf0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bf8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000c00] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000c08] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000c10] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000a88] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000a90] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000a98] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x00000aa0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000aa8] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000ab0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000ab8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x00000ac0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000ac8] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000ad0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000ad8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000ae0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000ae8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000af0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000af8] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000b00] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000b08] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000b10] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000b18] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b20] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000b28] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000b30] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000b38] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000b40] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000b48] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000b50] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000b58] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000b60] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000b68] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000b70] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000b78] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000b80] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00000b88] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b90] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000b98] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ba0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ba8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000bb0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bb8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bc0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bc8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000bd0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bd8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000be0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000be8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000bf0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000bf8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000c00] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000c08] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000c10] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000c18] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000c20] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :bloop -+-/* [0x00000c18] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000c20] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000c28] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000c30] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000c38] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000c40] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000c48] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000c50] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000c58] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000c60] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000c68] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000c70] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000c78] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000c80] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000c88] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000c90] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000c98] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000ca0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000ca8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000cb0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000cb8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000cc0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000cc8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000cd0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000cd8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000ce0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000ce8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x00000cf0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000cf8] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000d00] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000d08] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000d10] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000d18] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000d20] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000d28] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000d30] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:bloop -+-/* [0x00000d38] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000d40] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000d48] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000d50] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000d58] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000d60] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000d68] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000d70] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000d78] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000d80] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000d88] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000d90] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000d98] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000da0] */ 0x8fc8f3f6, 0xd0020867, // asr r1, r1, 15 ; mov -, vr_wait -+-/* [0x00000da8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000db0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x00000db8] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:bloop -+-/* [0x00000dc0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000dc8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00000dd0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x00000dd8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000de0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000de8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000df0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000c28] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000c30] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000c38] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000c40] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000c48] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000c50] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000c58] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000c60] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000c68] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000c70] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000c78] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000c80] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000c88] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000c90] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000c98] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000ca0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000ca8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000cb0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000cb8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000cc0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000cc8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000cd0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000cd8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000ce0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000ce8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000cf0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000cf8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000d00] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000d08] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000d10] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000d18] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000d20] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000d28] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000d30] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000d38] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000d40] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:bloop -++/* [0x00000d48] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000d50] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000d58] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000d60] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000d68] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000d70] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000d78] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000d80] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000d88] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000d90] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000d98] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000da0] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000da8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000db0] */ 0x8fc8f3f6, 0xd0020867, // asr r1, r1, 15 ; mov -, vr_wait -++/* [0x00000db8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000dc0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x00000dc8] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:bloop -++/* [0x00000dd0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000dd8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00000de0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x00000de8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000df0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000df8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000e00] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_honly -+-/* [0x00000df8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000e00] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000e08] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x00000e10] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000e18] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000e20] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000e28] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x00000e30] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000e38] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x00000e40] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000e48] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000e50] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000e58] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000e60] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000e68] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000e70] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000e78] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000e80] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000e88] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e90] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000e98] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000ea0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000ea8] */ 0x0c9de1c0, 0xd0021467, // add rb17, r0, -2 -+-/* [0x00000eb0] */ 0x919c71c0, 0xd0024812, // shl r0, r0, 7 ; mov rb18,r0 -+-/* [0x00000eb8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000ec0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000ec8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000ed0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000ed8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000ef8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f00] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f08] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f10] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000f18] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000f20] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000f28] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000f30] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000e08] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000e10] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000e18] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -++/* [0x00000e20] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000e28] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -++/* [0x00000e30] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000e38] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -++/* [0x00000e40] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000e48] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000e50] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -++/* [0x00000e58] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -++/* [0x00000e60] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000e68] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -++/* [0x00000e70] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000e78] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -++/* [0x00000e80] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000e88] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e90] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000e98] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000ea0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000ea8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000eb0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000eb8] */ 0x0c9de1c0, 0xd0021467, // add rb17, r0, -2 -++/* [0x00000ec0] */ 0x919c71c0, 0xd0024812, // shl r0, r0, 7 ; mov rb18,r0 -++/* [0x00000ec8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000ed0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000ed8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000ee0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000ee8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f00] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000f08] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f10] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f18] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f20] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000f28] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000f30] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000f38] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000f40] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :loop_honly -+-/* [0x00000f38] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000f40] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000f48] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000f50] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000f58] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000f60] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000f68] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000f70] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000f78] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000f80] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000f88] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000f90] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000f98] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000fa0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000fa8] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000fb0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000fb8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000fc0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000fc8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000fd0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000fd8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000fe0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000fe8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000ff0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000ff8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001000] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001008] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001010] */ 0x8d5927f6, 0x100269e1, // sub.setf -, r3, rb18 ; mov r1, ra22 -+-/* [0x00001018] */ 0x559f2fc1, 0x100049e0, // mov -, vw_wait ; mul24 r0, r0, r1 -+-/* [0x00001020] */ 0xfffffef8, 0xf06809e7, // brr.anyn -, r:loop_honly -+-/* [0x00001028] */ 0x0f9cf1c0, 0xd0020827, // asr r0, r0, 15 -+-/* [0x00001030] */ 0x129d61c0, 0x10020827, // min r0, r0, rb22 -+-/* [0x00001038] */ 0x139c01c0, 0xd0020c27, // max vpm, r0, 0 -+-/* [0x00001040] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001048] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001050] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001058] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000f48] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000f50] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000f58] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000f60] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000f68] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -++/* [0x00000f70] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000f78] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000f80] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000f88] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000f90] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000f98] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000fa0] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000fa8] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000fb0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000fb8] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000fc0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000fc8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000fd0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000fd8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000fe0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000fe8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000ff0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000ff8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001000] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001008] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001010] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001018] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -++/* [0x00001020] */ 0x8d5927f6, 0x100269e1, // sub.setf -, r3, rb18 ; mov r1, ra22 -++/* [0x00001028] */ 0x559f2fc1, 0x100049e0, // mov -, vw_wait ; mul24 r0, r0, r1 -++/* [0x00001030] */ 0xfffffef8, 0xf06809e7, // brr.anyn -, r:loop_honly -++/* [0x00001038] */ 0x0f9cf1c0, 0xd0020827, // asr r0, r0, 15 -++/* [0x00001040] */ 0x129d61c0, 0x10020827, // min r0, r0, rb22 -++/* [0x00001048] */ 0x139c01c0, 0xd0020c27, // max vpm, r0, 0 -++/* [0x00001050] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001058] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001060] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001068] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00001060] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001068] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00001070] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001078] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001070] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001078] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+ /* [0x00001080] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001088] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001090] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001098] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000010a0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00001090] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001098] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010a0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000010a8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000010b0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_exit1 -+-/* [0x000010a8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000010b0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010b8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010b8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x000010c0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000010c8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000010d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000010e0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000010d0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010d8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010e0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000010e8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000010f0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit -+-/* [0x000010e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000010f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000010f8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x00001100] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001108] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001110] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001118] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001110] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001118] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001120] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001128] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001130] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+@@ -592,225 +592,227 @@ unsigned int rpi_shader[] = { -+ /* [0x00001150] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001158] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001160] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001168] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001170] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00001178] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00001168] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001170] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001178] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001180] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001188] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit4 -+-/* [0x00001180] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001188] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001190] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001190] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x00001198] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000011a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011a8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011b0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000011b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011c0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000011c8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000011d0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000011c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000011d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000011d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000011e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x000011d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000011e0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011e8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000011e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x000011f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000011f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001200] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001208] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001200] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001208] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001210] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001218] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001220] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001228] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001230] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001238] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001240] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00001248] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00001238] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001240] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001248] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001250] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001258] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_setup_uv -+-/* [0x00001250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001258] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -+-/* [0x00001260] */ 0x15827d80, 0x10020767, // mov ra_y, unif -+-/* [0x00001268] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -+-/* [0x00001270] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00001278] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -+-/* [0x00001280] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00001288] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x00001290] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x00001298] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000012a0] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x000012a8] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x000012b0] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x000012b8] */ 0x00000040, 0xe0020567, // mov ra21, 64 -+-/* [0x000012c0] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x000012c8] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x000012d0] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x000012d8] */ 0x00000040, 0xe0021567, // mov rb21, 64 -+-/* [0x000012e0] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x000012e8] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x000012f0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x000012f8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x00001300] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x00001308] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x00001310] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x00001318] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x00001320] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x00001328] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x00001330] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00001338] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00001340] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00001348] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00001350] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00001358] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00001360] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00001368] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001370] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00001378] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00001380] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00001388] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00001390] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00001398] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000013a0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x000013a8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x000013b0] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x000013b8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x000013c0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000013c8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x000013d0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x000013d8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x000013e0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000013e8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x000013f0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000013f8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x00001400] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00001408] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00001410] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x00001418] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00001420] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x00001428] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x00001430] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00001438] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001440] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001268] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -++/* [0x00001270] */ 0x15827d80, 0x10020767, // mov ra_y, unif -++/* [0x00001278] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -++/* [0x00001280] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00001288] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -++/* [0x00001290] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00001298] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x000012a0] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x000012a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000012b0] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x000012b8] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x000012c0] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x000012c8] */ 0x00000020, 0xe0020567, // mov ra21, 32 -++/* [0x000012d0] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x000012d8] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -++/* [0x000012e0] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x000012e8] */ 0x00000040, 0xe0021567, // mov rb21, 64 -++/* [0x000012f0] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x000012f8] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00001300] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00001308] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00001310] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00001318] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00001320] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00001328] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00001330] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00001338] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00001340] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00001348] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00001350] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00001358] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00001360] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00001368] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00001370] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00001378] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001380] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00001388] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00001390] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00001398] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000013a0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000013a8] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000013b0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x000013b8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x000013c0] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x000013c8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x000013d0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000013d8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x000013e0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x000013e8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x000013f0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000013f8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x00001400] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x00001408] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00001410] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00001418] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00001420] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -++/* [0x00001428] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00001430] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x00001438] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x00001440] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+ /* [0x00001448] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001450] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00001458] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00001460] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00001468] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001470] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00001478] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00001480] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00001450] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001458] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001460] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00001468] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00001470] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00001478] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001480] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00001488] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00001490] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv_b -+-/* [0x00001488] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001490] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00001498] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000014a0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000014a8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000014b0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000014b8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000014c0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000014c8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000014d0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000014d8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000014e0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000014e8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000014f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000014f8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00001500] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00001508] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00001510] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00001518] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00001520] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00001528] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00001530] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00001538] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00001540] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001548] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001550] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00001558] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -+-/* [0x00001560] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00001568] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001570] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001578] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001580] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001588] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00001590] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001598] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015a0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015a8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000015b0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015b8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015c0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015c8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000015d0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015d8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015e0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015e8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x000015f0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000015f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001600] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00001498] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000014a0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000014a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000014b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000014b8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000014c0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000014c8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000014d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000014d8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000014e0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000014e8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000014f0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000014f8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00001500] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001508] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00001510] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00001518] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00001520] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00001528] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00001530] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00001538] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00001540] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00001548] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00001550] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001558] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001560] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00001568] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00001570] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00001578] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001580] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001588] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001590] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001598] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000015a0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015a8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015b0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015b8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000015c0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015c8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015d0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015d8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000015e0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015e8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015f0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000015f8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00001600] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00001608] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001610] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00001608] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00001610] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00001618] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00001620] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00001628] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00001630] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00001638] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00001640] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00001648] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00001650] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00001658] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001660] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00001668] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-/* [0x00001670] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00001678] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00001680] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00001688] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00001690] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00001698] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000016a0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000016a8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000016b0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000016b8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000016c0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000016c8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000016d0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000016d8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x000016e0] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x000016e8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000016f0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x000016f8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001700] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001708] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001710] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001718] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001720] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00001728] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00001730] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00001738] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00001740] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00001748] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00001750] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00001758] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00001760] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00001768] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00001770] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00001778] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00001780] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00001788] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00001790] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00001798] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000017a0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000017a8] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x000017b0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000017b8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x000017c0] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x000017c8] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x000017d0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000017d8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000017e0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000017e8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000017f0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000017f8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001800] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00001808] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001810] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00001618] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001620] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00001628] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00001630] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001638] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00001640] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001648] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001650] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00001658] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00001660] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00001668] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001670] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00001678] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++/* [0x00001680] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00001688] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00001690] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00001698] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000016a0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000016a8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000016b0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000016b8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000016c0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000016c8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000016d0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000016d8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000016e0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000016e8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x000016f0] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x000016f8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00001700] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00001708] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001710] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001718] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001720] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001728] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001730] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00001738] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00001740] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00001748] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00001750] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00001758] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00001760] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00001768] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00001770] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00001778] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00001780] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00001788] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00001790] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00001798] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000017a0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000017a8] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000017b0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000017b8] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x000017c0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000017c8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000017d0] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x000017d8] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x000017e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000017e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000017f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000017f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00001800] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001808] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001810] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00001818] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001820] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index db971f4..3464cdb 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -5,16 +5,16 @@ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 146) -+-#define mc_filter (rpi_shader + 360) -+-#define mc_filter_b (rpi_shader + 670) -+-#define mc_filter_honly (rpi_shader + 894) -+-#define mc_exit (rpi_shader + 1048) -+-#define mc_exit1 (rpi_shader + 1066) -+-#define mc_interrupt_exit (rpi_shader + 1082) -+-#define mc_interrupt_exit4 (rpi_shader + 1120) -+-#define mc_interrupt_exit8 (rpi_shader + 1142) -+-#define mc_setup_uv (rpi_shader + 1172) -+-#define mc_filter_uv_b (rpi_shader + 1314) -+-#define mc_end (rpi_shader + 1542) -++#define mc_filter (rpi_shader + 364) -++#define mc_filter_b (rpi_shader + 674) -++#define mc_filter_honly (rpi_shader + 898) -++#define mc_exit (rpi_shader + 1052) -++#define mc_exit1 (rpi_shader + 1070) -++#define mc_interrupt_exit (rpi_shader + 1086) -++#define mc_interrupt_exit4 (rpi_shader + 1124) -++#define mc_interrupt_exit8 (rpi_shader + 1146) -++#define mc_setup_uv (rpi_shader + 1176) -++#define mc_filter_uv_b (rpi_shader + 1318) -++#define mc_end (rpi_shader + 1546) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 02fdcb2..4809e1d 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -21,7 +21,7 @@ -+ # rb19 next ra16 -+ # -+ # ra20 1 -+-# ra21 64 -++# ra21 32 -+ # ra22 256 -+ # ra23 8 -+ # -+@@ -97,7 +97,7 @@ add rb24, r1, r0 -+ # load constants -+ -+ mov ra20, 1 -+-mov ra21, 64 -++mov ra21, 32 -+ mov ra22, 256 -+ mov ra23, 8 -+ -+@@ -270,7 +270,7 @@ add t0s, ra_x2_base, r2 -+ -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+-mov r2, rb21 ; mul24 r2, r0, ra0 -++nop ; mul24 r2, r0, ra0 -+ nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+ nop ; mul24 r3, ra1 << 1, r0 << 1 -+ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+@@ -301,9 +301,9 @@ sub.setf -, r3, 8 ; mov r1, ra22 -+ -+ # apply horizontal filter -+ brr.anyn -, r:uvloop -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 14 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -++mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -++asr ra15, r0, 8 ; nop -++nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -+ -+ # apply vertical filter and write to VPM -+ -+@@ -315,12 +315,14 @@ add r1, r1, r0 ; mul24 r0, ra10, rb10 -+ add r1, r1, r0 ; mul24 r0, ra9, rb9 -+ add r1, r1, r0 ; mul24 r0, ra8, rb8 -+ add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-add.ifnn r1, r1, r0 ; mov -, vw_wait -++add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-brr.anyn -, r:uvloop -+ asr r1, r1, 14 -+-min r1, r1, rb22 -+-max vpm, r1, 0 -++add r1, r1, ra21 -++brr.anyn -, r:uvloop -++asr r1, r1, 6 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -+ -+ # DMA out for U -+ -+@@ -1161,7 +1163,7 @@ add rb24, r1, r0 -+ # load constants -+ -+ mov ra20, 1 -+-mov ra21, 64 -++mov ra21, 32 -+ mov ra22, 256 -+ mov ra23, 8 -+ -+-- -+2.7.4 -+ -+ -+From b7321192751956ed7deceeb3dabe22ccedb8e08d Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 14:37:32 +0100 -+Subject: [PATCH 19/68] Removed unused luma functions -+ -+--- -+ libavcodec/hevc.c | 4 +- -+ libavcodec/rpi_qpu.c | 32 +- -+ libavcodec/rpi_shader.c | 1097 +++++++++++++------------------------------- -+ libavcodec/rpi_shader.h | 19 +- -+ libavcodec/rpi_shader.qasm | 970 +++------------------------------------ -+ 5 files changed, 396 insertions(+), 1726 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index d6d78ee..31b8b2f 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2731,8 +2731,8 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ return; -+ for(k=0;k<8;k++) { -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP); // Also need a dummy for V -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for V -+ assert(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -+ } -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 4d9eda8..4e90cc1 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -172,7 +172,7 @@ static int gpu_init(volatile struct GPU **gpu) { -+ -+ // Now copy over the QPU code into GPU memory -+ { -+- int num_bytes = qpu_get_fn(QPU_MC_END) - qpu_get_fn(QPU_MC_SETUP); -++ int num_bytes = qpu_get_fn(QPU_MC_END) - qpu_get_fn(QPU_MC_SETUP_UV); -+ assert(num_bytes<=QPU_CODE_SIZE*sizeof(unsigned int)); -+ memcpy((void*)ptr->qpu_code, rpi_shader, num_bytes); -+ } -+@@ -612,24 +612,24 @@ unsigned int qpu_get_fn(int num) { -+ gpu_unlock(); -+ } -+ switch(num) { -+- case QPU_MC_SETUP: -+- fn = mc_setup; -+- break; -+- case QPU_MC_FILTER: -+- fn = mc_filter; -+- break; -++ //case QPU_MC_SETUP: -++ // fn = mc_setup; -++ // break; -++ //case QPU_MC_FILTER: -++ // fn = mc_filter; -++ // break; -+ case QPU_MC_EXIT: -+ fn = mc_exit; -+ break; -+- case QPU_MC_INTERRUPT_EXIT: -+- fn = mc_interrupt_exit; -+- break; -+- case QPU_MC_FILTER_B: -+- fn = mc_filter_b; -+- break; -+- case QPU_MC_FILTER_HONLY: -+- fn = mc_filter_honly; -+- break; -++ //case QPU_MC_INTERRUPT_EXIT: -++ // fn = mc_interrupt_exit; -++ // break; -++ //case QPU_MC_FILTER_B: -++ // fn = mc_filter_b; -++ // break; -++ //case QPU_MC_FILTER_HONLY: -++ // fn = mc_filter_honly; -++ // break; -+ case QPU_MC_SETUP_UV: -+ fn = mc_setup_uv; -+ break; -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 831633b..170e8ac 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -21,798 +21,331 @@ __declspec(align(8)) -+ __attribute__((aligned(8))) -+ #endif -+ unsigned int rpi_shader[] = { -+-// ::mc_setup -++// ::mc_setup_uv -+ /* [0x00000000] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+ /* [0x00000008] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -+ /* [0x00000010] */ 0x15827d80, 0x10020767, // mov ra_y, unif -+ /* [0x00000018] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -+-/* [0x00000020] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00000028] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x00000030] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x00000038] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000040] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x00000048] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x00000050] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000058] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+-/* [0x00000060] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x00000068] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x00000070] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000078] */ 0x00000040, 0xe0021567, // mov rb21, 64 -+-/* [0x00000080] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000088] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00000090] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x00000098] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x000000a0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x000000a8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x000000b0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000d0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000000d8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000000e0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000000e8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x000000f0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x000000f8] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000100] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000108] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000110] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000118] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000120] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000128] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000130] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000138] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000140] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000148] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000150] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000158] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000160] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000168] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000170] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000178] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x00000180] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000188] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x00000190] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x00000198] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000001a0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -++/* [0x00000020] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000028] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -++/* [0x00000030] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00000038] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00000040] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00000048] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000050] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000058] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000060] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000068] */ 0x00000020, 0xe0020567, // mov ra21, 32 -++/* [0x00000070] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000078] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -++/* [0x00000080] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000088] */ 0x00000040, 0xe0021567, // mov rb21, 64 -++/* [0x00000090] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000098] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x000000a0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x000000a8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000b0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000b8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000c0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000c8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000d0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000d8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000e0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000e8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000000f0] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000000f8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000100] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000108] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000110] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000118] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000120] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000128] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000130] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000138] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000140] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000148] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000150] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000158] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000160] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000168] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000170] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000178] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000180] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000188] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x00000190] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x00000198] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x000001a0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+ /* [0x000001a8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001b0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x000001b8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x000001c0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000001b0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001b8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001c0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+ /* [0x000001c8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001d0] */ 0x4c9d00cf, 0x10024821, // add r0, r0, r3; mul24 r1, r1, rb_pitch -+-/* [0x000001d8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x000001e0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001e8] */ 0x949dc5c0, 0xd0025890, // and r2, r2, ~3; mov ra_x_base, r0 -+-/* [0x000001f0] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x000001f8] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000200] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000208] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000210] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000218] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000220] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000228] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000230] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000238] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000240] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x000001d0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x000001d8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x000001e0] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x000001e8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000001f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000001f8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000200] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000208] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000210] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000218] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000220] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000228] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000230] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000248] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000250] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000258] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000260] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000268] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000270] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000278] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000280] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000288] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000290] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000298] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002a0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002b0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002d0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000002d8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000002e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002e8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002f0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000002f8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000300] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000330] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000340] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000350] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000360] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000368] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000370] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000378] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000380] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000388] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000390] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000398] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003a0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000238] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000240] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000248] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000250] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000258] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000260] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000268] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000270] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000278] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000280] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000288] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000290] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000298] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002a0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002a8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002b0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002b8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002c0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000002c8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002d0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000002e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000002f0] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x000002f8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000300] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000308] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000310] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000340] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000360] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000368] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000370] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000378] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000380] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000388] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000390] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003a8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003b0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003b8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003c0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003c8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003d0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003d8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003e0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000400] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000420] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000430] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000440] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000448] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000450] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000458] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000460] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000468] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000470] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000478] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000480] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000488] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000490] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000498] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000004a0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000004a8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000004b0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000004b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000004c0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000004c8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004d0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000004d8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000004e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000004e8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x000004f0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x000004f8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000500] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000508] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000510] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000518] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000520] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000528] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000530] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000538] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000540] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000548] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000550] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000558] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000560] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000568] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000570] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000578] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000580] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000588] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000590] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000598] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000005a0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000005a8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_filter -+-/* [0x000005b0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005b8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005c0] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x000005c8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005d0] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x000005d8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005e0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x000005e8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005f0] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x000005f8] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000600] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000608] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000610] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000618] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000620] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000628] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000630] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000638] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000640] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000648] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000650] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000658] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000660] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000668] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000670] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000678] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000680] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000688] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000690] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000698] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000006a0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000006c0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000006e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000700] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000708] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000710] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000718] */ 0x000001d0, 0xf07809e7, // brr.anynn -, r:fast_path -+-/* [0x00000720] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000728] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000730] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000738] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :loop -+-/* [0x00000740] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000748] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000750] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000758] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000760] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000768] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000770] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000778] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000780] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000788] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000790] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000798] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x000007a0] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000007a8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000007b0] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000007b8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007c0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000007c8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007d0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000007d8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007e0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000007e8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007f0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000007f8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000800] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000808] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000810] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x00000818] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000820] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000828] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000830] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000838] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000840] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000848] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000850] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000858] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:loop -+-/* [0x00000860] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000868] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000870] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000878] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000880] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000888] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000890] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000898] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x000008a0] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x000008a8] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x000008b0] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008b8] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x000008c0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008c8] */ 0xfffffe58, 0xf06809e7, // brr.anyn -, r:loop -+-/* [0x000008d0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000008d8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008e0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000008e8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000008f0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008f8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000900] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// :fast_path -+-/* [0x00000908] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :fast_loop -+-/* [0x00000910] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000918] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000920] */ 0x95727d9b, 0x1004475f, // mov.ifz ra_y, ra_y_next ; mov rb31, r3 -+-/* [0x00000928] */ 0x95690dbf, 0x10044623, // mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -+-/* [0x00000930] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000938] */ 0x929de5e4, 0x100248a1, // min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 -+-/* [0x00000940] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000948] */ 0xec414c87, 0x10024e20, // add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000950] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000958] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000960] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000968] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000970] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000978] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000980] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000988] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000990] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000998] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -+-/* [0x000009a0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x000009a8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000009b0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000009b8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000009c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000009c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009d0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000009d8] */ 0xffffff18, 0xf06809e7, // brr.anyn -, r:fast_loop -+-/* [0x000009e0] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x000009e8] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x000009f0] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x000009f8] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000a00] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000a08] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000a10] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000a18] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000a20] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000a28] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000a30] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000a38] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000a40] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000a48] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:fast_loop -+-/* [0x00000a50] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x00000a58] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a60] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a68] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a70] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a78] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a80] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_filter_b -+-/* [0x00000a88] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000a90] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000a98] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x00000aa0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000aa8] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000ab0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000ab8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x00000ac0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000ac8] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x00000ad0] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000ad8] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000ae0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000ae8] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000af0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000af8] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000b00] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000b08] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000b10] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000b18] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000b20] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000b28] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000b30] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000b38] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000b40] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000b48] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000b50] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000b58] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000b60] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000b68] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000b70] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000b78] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000b80] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -+-/* [0x00000b88] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000b90] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000b98] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ba0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ba8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000bb0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bb8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bc0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bc8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000bd0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bd8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000be0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000be8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000bf0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000bf8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000c00] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000c08] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000c10] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000c18] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000c20] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :bloop -+-/* [0x00000c28] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000c30] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000c38] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000c40] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000c48] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000c50] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000c58] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000c60] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000c68] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000c70] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000c78] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000c80] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000c88] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000c90] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000c98] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000ca0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000ca8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000cb0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000cb8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000cc0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000cc8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000cd0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000cd8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000ce0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000ce8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000cf0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000cf8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x00000d00] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000d08] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000d10] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000d18] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000d20] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000d28] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000d30] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000d38] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000d40] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:bloop -+-/* [0x00000d48] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000d50] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000d58] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000d60] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000d68] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000d70] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000d78] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000d80] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000d88] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000d90] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000d98] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000da0] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000da8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000db0] */ 0x8fc8f3f6, 0xd0020867, // asr r1, r1, 15 ; mov -, vr_wait -+-/* [0x00000db8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000dc0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x00000dc8] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:bloop -+-/* [0x00000dd0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000dd8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00000de0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x00000de8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000df0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000df8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000e00] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_filter_honly -+-/* [0x00000e08] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000e10] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000e18] */ 0x156e7d80, 0x10020667, // mov ra_x2shift, ra_x2shift_next -+-/* [0x00000e20] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000e28] */ 0x0c9c81c0, 0xd00208a7, // add r2, r0, 8 -+-/* [0x00000e30] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000e38] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3,unif -+-/* [0x00000e40] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000e48] */ 0x139c05c0, 0xd00208a7, // max r2, r2, 0 -+-/* [0x00000e50] */ 0x129d95c0, 0x100208a7, // min r2, r2, rb_frame_width_minus_1 -+-/* [0x00000e58] */ 0x119c35c0, 0xd00206e7, // shl ra_x2shift_next, r2, 3 -+-/* [0x00000e60] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000e68] */ 0x0c9e74c0, 0x100208a7, // add r2, r2, r3 -+-/* [0x00000e70] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000e78] */ 0x149dc5c0, 0xd00206a7, // and ra_x2_base_next, r2, ~3 -+-/* [0x00000e80] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000e88] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000e90] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000e98] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000ea0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000ea8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000eb0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000eb8] */ 0x0c9de1c0, 0xd0021467, // add rb17, r0, -2 -+-/* [0x00000ec0] */ 0x919c71c0, 0xd0024812, // shl r0, r0, 7 ; mov rb18,r0 -+-/* [0x00000ec8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000ed0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000ed8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000ee0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000ee8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f00] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000f08] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f10] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f18] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f20] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000f28] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000f30] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000f38] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000f40] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :loop_honly -+-/* [0x00000f48] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000f50] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000f58] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000f60] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000f68] */ 0xee654987, 0x10024860, // shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 -+-/* [0x00000f70] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000f78] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000f80] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000f88] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000f90] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000f98] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000fa0] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000fa8] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000fb0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000fb8] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000fc0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000fc8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000fd0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000fd8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000fe0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000fe8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000ff0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000ff8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001000] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001008] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001010] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001018] */ 0x8d9df4ff, 0x10024823, // sub r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001020] */ 0x8d5927f6, 0x100269e1, // sub.setf -, r3, rb18 ; mov r1, ra22 -+-/* [0x00001028] */ 0x559f2fc1, 0x100049e0, // mov -, vw_wait ; mul24 r0, r0, r1 -+-/* [0x00001030] */ 0xfffffef8, 0xf06809e7, // brr.anyn -, r:loop_honly -+-/* [0x00001038] */ 0x0f9cf1c0, 0xd0020827, // asr r0, r0, 15 -+-/* [0x00001040] */ 0x129d61c0, 0x10020827, // min r0, r0, rb22 -+-/* [0x00001048] */ 0x139c01c0, 0xd0020c27, // max vpm, r0, 0 -+-/* [0x00001050] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001058] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001060] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001068] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_exit -+-/* [0x00001070] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001078] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00001080] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001088] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001090] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001098] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010a0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000010a8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000010b0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_exit1 -+-/* [0x000010b8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000010c0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010c8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010d0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010d8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000010e0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000010e8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000010f0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_interrupt_exit -+-/* [0x000010f8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001100] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001108] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001110] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001118] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001120] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001128] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001130] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001138] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001140] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001148] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001150] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001158] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001160] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001168] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001170] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001178] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001180] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00001188] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_interrupt_exit4 -+-/* [0x00001190] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001198] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011a8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011b0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000011d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000011d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000011e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_interrupt_exit8 -+-/* [0x000011e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000011f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000011f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001200] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001208] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001210] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001218] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001220] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001228] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001230] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001238] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001240] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001248] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00001250] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00001258] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_setup_uv -+-/* [0x00001260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001268] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -+-/* [0x00001270] */ 0x15827d80, 0x10020767, // mov ra_y, unif -+-/* [0x00001278] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -+-/* [0x00001280] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00001288] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -+-/* [0x00001290] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00001298] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x000012a0] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x000012a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000012b0] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x000012b8] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x000012c0] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x000012c8] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+-/* [0x000012d0] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x000012d8] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x000012e0] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x000012e8] */ 0x00000040, 0xe0021567, // mov rb21, 64 -+-/* [0x000012f0] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x000012f8] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00001300] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x00001308] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x00001310] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x00001318] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x00001320] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x00001328] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x00001330] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x00001338] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x00001340] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00001348] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00001350] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00001358] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00001360] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00001368] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00001370] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00001378] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001380] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00001388] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00001390] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00001398] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000013a0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000013a8] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000013b0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x000013b8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x000013c0] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x000013c8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x000013d0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000013d8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x000013e0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x000013e8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x000013f0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000013f8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x00001400] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x00001408] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x00001410] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00001418] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00001420] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x00001428] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00001430] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x00001438] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x00001440] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00001448] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001450] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001458] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001460] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00001468] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00001470] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00001478] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001480] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00001488] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00001490] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000398] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003a0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003a8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003b0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003b8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003c0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003c8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003d0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003d8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003e0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003e8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003f0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003f8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000400] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000408] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000410] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000418] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000420] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000428] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000430] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000438] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000440] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000448] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000450] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000458] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000460] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000468] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000470] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000478] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000480] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000488] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000490] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000498] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000004a0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000004a8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000004b0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000004b8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004c0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000004c8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000004d0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000004d8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x000004e0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x000004e8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x000004f0] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x000004f8] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000500] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000508] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000510] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000518] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000520] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000528] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000530] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000538] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000540] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000560] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000568] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000570] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000578] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000580] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000588] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000590] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000598] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00001498] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000014a0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000014a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000014b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000014b8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000014c0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000014c8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000014d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000014d8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000014e0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000014e8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000014f0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000014f8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00001500] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001508] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00001510] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00001518] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00001520] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00001528] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00001530] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00001538] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00001540] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00001548] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00001550] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001558] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001560] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00001568] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -+-/* [0x00001570] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00001578] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001580] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001588] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001590] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001598] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000015a0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015a8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015b0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015b8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000015c0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015c8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015d0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015d8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000015e0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015e8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015f0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000015f8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00001600] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00001608] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001610] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000005a0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005a8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005b0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005b8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005c0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000005c8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005d0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000005d8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000005e0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000005e8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000005f0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000005f8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000600] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000608] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000610] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000618] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000620] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000628] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000630] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000638] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000640] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000648] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000650] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000658] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000660] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000668] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000670] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00000678] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000680] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000688] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000690] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000698] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000006a8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000006c8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000006e8] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f0] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f8] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000700] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000708] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000710] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000718] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00001618] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00001620] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00001628] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00001630] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00001638] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00001640] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00001648] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00001650] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00001658] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00001660] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00001668] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001670] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00001678] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-/* [0x00001680] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00001688] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00001690] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00001698] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000016a0] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000016a8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000016b0] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000016b8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000016c0] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000016c8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000016d0] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000016d8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000016e0] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000016e8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x000016f0] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -+-/* [0x000016f8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00001700] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00001708] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001710] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001718] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001720] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001728] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001730] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00001738] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00001740] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00001748] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00001750] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00001758] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00001760] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00001768] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00001770] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00001778] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00001780] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00001788] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00001790] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00001798] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-/* [0x000017a0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000017a8] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000017b0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000017b8] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x000017c0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000017c8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x000017d0] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x000017d8] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x000017e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000017e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000017f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000017f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00001800] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001808] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001810] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00001818] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001820] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000720] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000728] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000730] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000738] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000740] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000748] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000750] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000758] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000760] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000768] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000770] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000778] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -++/* [0x00000780] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -++/* [0x00000788] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000790] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000798] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000007a0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000007a8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007b0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000007b8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007c0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000007c8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007d0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000007d8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007e0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000007e8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000007f0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x000007f8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x00000800] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000808] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000810] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000818] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000820] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000828] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000830] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000838] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000848] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -++/* [0x00000850] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -++/* [0x00000858] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -++/* [0x00000860] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -++/* [0x00000868] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -++/* [0x00000870] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000878] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000880] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000888] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000890] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000898] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008a0] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x000008a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000008b0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x000008b8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008c0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x000008c8] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000008d0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000008d8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x000008e0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x000008e8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000008f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000900] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000908] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000910] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000918] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000920] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000928] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_exit -++/* [0x00000930] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000938] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000940] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000948] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000950] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000958] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000960] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000968] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000970] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit8 -++/* [0x00000978] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000980] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000988] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000990] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000998] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000009a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009d0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009d8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000009e0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000009e8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 3464cdb..9de4535 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -3,18 +3,11 @@ -+ -+ extern unsigned int rpi_shader[]; -+ -+-#define mc_setup (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 146) -+-#define mc_filter (rpi_shader + 364) -+-#define mc_filter_b (rpi_shader + 674) -+-#define mc_filter_honly (rpi_shader + 898) -+-#define mc_exit (rpi_shader + 1052) -+-#define mc_exit1 (rpi_shader + 1070) -+-#define mc_interrupt_exit (rpi_shader + 1086) -+-#define mc_interrupt_exit4 (rpi_shader + 1124) -+-#define mc_interrupt_exit8 (rpi_shader + 1146) -+-#define mc_setup_uv (rpi_shader + 1176) -+-#define mc_filter_uv_b (rpi_shader + 1318) -+-#define mc_end (rpi_shader + 1546) -++#define mc_setup_uv (rpi_shader + 0) -++#define mc_filter_uv (rpi_shader + 142) -++#define mc_filter_uv_b (rpi_shader + 360) -++#define mc_exit (rpi_shader + 588) -++#define mc_interrupt_exit8 (rpi_shader + 606) -++#define mc_end (rpi_shader + 636) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 4809e1d..cd7346d 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -71,8 +71,10 @@ -+ -+ .set rb_const_64, rb21 -+ -+-# mc_setup(next_kernel, x, y, ref_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1) -+-::mc_setup -++ -++################################################################################ -++# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -++::mc_setup_uv -+ -+ # Read starting kernel -+ mov ra31, unif -+@@ -80,7 +82,9 @@ mov ra31, unif -+ # Load first request location -+ add ra_x_base, unif, elem_num # Store x -+ mov ra_y, unif # Store y -+-mov ra_x2_base, unif # Store frame base -++mov ra_x2_base, unif # Store frame u base -++nop -++sub ra_u2v_ref_offset, unif, ra_x2_base # Store offset to add to move from u to v in reference frame -+ -+ # Read image dimensions -+ sub rb25,unif,1 -+@@ -143,29 +147,24 @@ mov r1, vpm_setup(0, 4, h8p(0, 0)) -+ add rb28, r0, r1 -+ -+ # Compute base address for first and second access -+-#add r0, unif, elem_num # x -+ mov r0, ra_x_base # Load x -+-add r2, r0, 8 # x+8 -+ max r0, r0, 0; mov r1, ra_y # Load y -+ min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -+-shl ra_xshift_next, r0, 3 -+-max r2, r2, 0 -++shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+ add ra_y, r1, 1 -+-min r2, r2, rb_frame_width_minus_1 -+-shl ra_x2shift_next, r2, 3 -+-max r1, r1, 0 # y -+-min r1, r1, rb_frame_height_minus_1 -+-add r0, r0, r3; mul24 r1, r1, rb_pitch -+-add r2, r2, r3 -++add r0, r0, r3 -+ and r0, r0, ~3 -+-and r2, r2, ~3; mov ra_x_base, r0 -++max r1, r1, 0 ; mov ra_x_base, r0 # y -++min r1, r1, rb_frame_height_minus_1 -+ # submit texture requests for first line -++add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+ add t0s, r0, r1 ; mov ra_x2_base, r2 -+ add t0s, r2, r1 -+ -+ # Dump padding words -+ mov r0, unif -+ mov r0, unif -++mov r0, unif -+ -+ # submit texture requests for second line -+ max r1, ra_y, 0 -+@@ -176,6 +175,8 @@ nop ; mul24 r1, r1, rb_pitch -+ add t0s, r1, ra_x_base -+ add t0s, r1, ra_x2_base -+ -++ -++ -+ ################################################################################ -+ -+ # mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -+@@ -341,453 +342,26 @@ add vw_setup, rb26, r0 # VDW setup 0 -+ mov vw_setup, rb29 # Stride -+ mov vw_addr, unif # start the VDW -+ -+-################################################################################ -+- -+- -+-# mc_filter(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -+- -+-# At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -+-::mc_filter -+-mov ra31, unif -+- -+-# per-channel shifts were calculated on the *previous* invocation -+- -+-mov ra_xshift, ra_xshift_next -+-mov ra_x2shift, ra_x2shift_next -+- -+-# get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # x -+-add r2, r0, 8 # x+8 -+-max r0, r0, 0; mov r1, unif # y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -+-shl ra_xshift_next, r0, 3 -+-max r2, r2, 0 -+-min r2, r2, rb_frame_width_minus_1 -+-shl ra_x2shift_next, r2, 3 -+-add r0, r0, r3 -+-add r2, r2, r3 -+-and rb_x_base_next, r0, ~3 -+-and ra_x2_base_next, r2, ~3 -+-mov ra_y_next, r1 -+- -+-# set up VPM write -+-mov vw_setup, rb28 -+- -+-# get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -+-shl r0, r0, 7 -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -+- -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+-# get filter coefficients -+- -+-mov r0, unif -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -+-asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-brr.anynn -, r:fast_path -+-asr rb12, r0, rb23 # delay slot 1 -+- -+-# r2 is elem_num -+-# r3 is loop counter -+- -+-mov r5rep, -8 # delay slot 2 -+- -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] # delay slot 3 -+- -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-## nop ; ldtmu0 # loop counter increment -+-## shr r0, r4, ra17 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 ; mul24 r3, r0, ra0 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-## sub r2, r2, r3 ; ldtmu0 -+-## -+-## mov r0, ra22 -+-## shr r0, r4, ra17 ; mul24 r2, r2, r0 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # apply horizontal filter -+-## -+-## asr r2, r2, 15 ; mul24 r3, r0, ra0 -+-## min r2, r2, rb22 -+-## max ra13, r2, 0 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-## sub r0, r2, r3 -+-## -+-## # apply horizontal filter -+-## -+-## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -+-## asr r0, r0, 15 -+-## min r0, r0, rb22 -+-## max ra14, r0, 0 -+-## -+-## -+-## -+-## -+-## nop ; ldtmu0 # loop counter increment -+-## shr r0, r4, ra17 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 ; mul24 r3, r0, ra0 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-## sub r0, r2, r3 -+-## -+-## # apply horizontal filter -+-## -+-## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -+-## asr r0, r0, 15 -+-## min r0, r0, rb22 -+-## max ra15, r0, 0 -+- -+- -+- -+- -+-mov r3, 0 -+- -+-:loop -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -+- -+-# generate seven shifted versions -+-# interleave with scroll of vertical context -+- -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+- -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 8 ; mov r1, ra22 -+- -+-# apply horizontal filter -+-brr.anyn -, r:loop -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -+- -+-# apply vertical filter and write to VPM -+- -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-brr.anyn -, r:loop -+-asr r1, r1, 15 -+-min r1, r1, rb22 -+-max vpm, r1, 0 -+- -+-# DMA out -+- -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -+-mov vw_setup, rb29 -+-mov vw_addr, unif # start the VDW -+- -+-#################################################### -+- -+-:fast_path -+-## nop ; ldtmu0 # loop counter increment -+-## shr r0, r4, ra17 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 ; mul24 r3, r0, ra0 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## sub r2, r2, r3 ; ldtmu0 -+-## -+-## mov r0, ra22 -+-## shr r0, r4, ra17 ; mul24 r2, r2, r0 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # apply horizontal filter -+-## -+-## asr r2, r2, 15 ; mul24 r3, r0, ra0 -+-## min r2, r2, rb22 -+-## max ra13, r2, 0 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## sub r0, r2, r3 -+-## -+-## # apply horizontal filter -+-## -+-## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -+-## asr r0, r0, 15 -+-## min r0, r0, rb22 -+-## max ra14, r0, 0 -+-## -+-## -+-## -+-## -+-## nop ; ldtmu0 # loop counter increment -+-## shr r0, r4, ra17 ; ldtmu0 -+-## shr r1, r4, ra17 ; v8subs r0, r0, rb20 -+-## add t0s, ra16, r5 ; v8subs r1, r1, rb20 -+-## add ra16, ra16, rb16 ; mov t0s, ra16 -+-## -+-## # generate seven shifted versions -+-## # interleave with scroll of vertical context -+-## -+-## mov r2, rb21 ; mul24 r3, r0, ra0 -+-## sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-## sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-## sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-## sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-## sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-## sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-## sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-## sub r0, r2, r3 -+-## -+-## # apply horizontal filter -+-## -+-## nop ; mul24 r0, r0, ra22 # last bit of context scroll, including clamp to zero -+-## asr r0, r0, 15 -+-## min r0, r0, rb22 -+-## max ra15, r0, 0 -+- -+- -+-mov r3, 0 # This signifies the amount of unrolling -+- -+-:fast_loop -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-# Due to pipelining we can only skip second pipeline instructions related to the fetched pixels -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_y, ra_y_next ; mov rb31, r3 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov r3, rb_pitch -+- -+-max r2, ra_y, 0 -+-min r2, r2, rb_frame_height_minus_1 ; mov r1, r4 # discard texture read -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r0, r0, rb20 -+-add t0s, ra_x2_base, r2 -+- -+-# generate seven shifted versions -+-# interleave with scroll of vertical context -+- -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-sub r0, r2, r3 ; mov r3, rb31 -+- -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 8 ; mov r1, ra22 -+- -+-# apply horizontal filter -+- -+-brr.anyn -, r:fast_loop -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -+- -+-# apply vertical filter and write to VPM -+- -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-brr.anyn -, r:fast_loop -+-asr r1, r1, 15 -+-min r1, r1, rb22 -+-max vpm, r1, 0 -+- -+-# DMA out -+- -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -+-mov vw_setup, rb29 -+-mov vw_addr, unif # start the VDW -+ -+ ################################################################################ -+ -+-# mc_filter_b(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -+- -+-# At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -+-::mc_filter_b -++::mc_filter_uv_b -+ mov ra31, unif -+ -+ # per-channel shifts were calculated on the *previous* invocation -+ -+ mov ra_xshift, ra_xshift_next -+-mov ra_x2shift, ra_x2shift_next -+ -+ # get base addresses and per-channel shifts for *next* invocation -+ add r0, unif, elem_num # x -+-add r2, r0, 8 # x+8 -+ max r0, r0, 0; mov r1, unif # y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -++min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+ shl ra_xshift_next, r0, 3 -+-max r2, r2, 0 -+-min r2, r2, rb_frame_width_minus_1 -+-shl ra_x2shift_next, r2, 3 -++sub r2, unif, r3 # compute offset from frame base u to frame base v -+ add r0, r0, r3 -+-add r2, r2, r3 -+ and rb_x_base_next, r0, ~3 -+-and ra_x2_base_next, r2, ~3 -+ mov ra_y_next, r1 -++add ra_x2_base_next, rb_x_base_next, r2 -+ -+ # set up VPM write -+ mov vw_setup, rb28 -+@@ -801,17 +375,22 @@ and r0, r0, rb22 # Extract height -+ add rb17, r0, 5 -+ add rb18, r0, 7 -+ shl r0, r0, 7 -++ -+ # r0 is currently height<<7 -+ # For vr_setup we want height<<20 (so 20-7=13 additional bits) -+ shl r3, r0, 13 -+ shl r3, r3, 8 # Mask off top 8 bits -+ shr r3, r3, 8 -++ -+ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+ add rb26, r0, rb27 -++ -+ # In a B frame, so also set up VPM read -+ add vr_setup, r3, rb28 -+ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -+ # get filter coefficients -+ -+ mov r0, unif -+@@ -837,9 +416,13 @@ asr rb12, r0, rb23 -+ -+ mov r5rep, -8 -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -+ mov r3, 0 -+ -+-:bloop -++:uvloop_b -+ # retrieve texture results and pick out bytes -+ # then submit two more texture requests -+ -+@@ -847,7 +430,7 @@ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+ shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+ mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -+ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+@@ -861,6 +444,7 @@ add t0s, ra_x2_base, r2 -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+ mov r2, rb21 ; mul24 r3, r0, ra0 -++nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+ sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+ sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+@@ -889,7 +473,7 @@ mov ra13, ra14 -+ sub.setf -, r3, 8 ; mov r1, ra22 -+ -+ # apply horizontal filter -+-brr.anyn -, r:bloop -++brr.anyn -, r:uvloop_b -+ max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+ asr r0, r0, 15 ; mov r1, ra21 -+ min.setf ra15, r0, rb22 -+@@ -906,213 +490,50 @@ sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+ sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+ sub.ifnn r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 15 ; mov -, vr_wait -++asr r1, r1, 15 -+ min r1, r1, rb22 -+ add r0, vpm, 1 # Blend in previous VPM contents at this location -+-brr.anyn -, r:bloop -++brr.anyn -, r:uvloop_b -+ max r1, r1, 0 -+ add r1, r1, r0 -+ shr vpm, r1, 1 -+ -+-# DMA out -++ -++# DMA out for U -++ -++mov vw_setup, rb26 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++# DMA out for V -++# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -++# Could potentially push this write into the start of the next pipeline stage. -++mov r0, 16 -++mov -, vw_wait -+ -+ bra -, ra31 -+-mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -+-mov vw_setup, rb29 -++add vw_setup, rb26, r0 # VDW setup 0 -++mov vw_setup, rb29 # Stride -+ mov vw_addr, unif # start the VDW -+ -+ ################################################################################ -+ -+-# mc_filter_honly(next_kernel, x, y, frame_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_dst) -+-# This filter only does horizontal filtering. -+-# It is assumed that the region to fetch does not include extra rows above. -++# mc_exit() -+ -+-# At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -+-::mc_filter_honly -+-mov ra31, unif -++::mc_exit -++mov -, vw_wait # wait on the VDW -+ -+-# per-channel shifts were calculated on the *previous* invocation -++mov -,srel(0) -+ -+-mov ra_xshift, ra_xshift_next -+-mov ra_x2shift, ra_x2shift_next -+- -+-# get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # x -+-add r2, r0, 8 # x+8 -+-max r0, r0, 0; mov r1, unif # y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3,unif # frame_base -+-shl ra_xshift_next, r0, 3 -+-max r2, r2, 0 -+-min r2, r2, rb_frame_width_minus_1 -+-shl ra_x2shift_next, r2, 3 -+-add r0, r0, r3 -+-add r2, r2, r3 -+-and rb_x_base_next, r0, ~3 -+-and ra_x2_base_next, r2, ~3 -+-mov ra_y_next, r1 -+- -+-# set up VPM write -+-mov vw_setup, rb28 -+- -+-# get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, -2 # Pipelining means we move data across 2 iterations early -+-shl r0, r0, 7 ; mov rb18,r0 -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -+- -+-# get filter coefficients -+- -+-mov r0, unif -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -+-mov r0, unif -+- -+-# r2 is elem_num -+-# r3 is loop counter -+-mov r5rep, -8 -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] # delay slot 3 -+-mov r3, 0 -+- -+-:loop_honly -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, ra_x2shift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -+- -+-# generate seven shifted versions -+-# interleave with scroll of vertical context -+- -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+- -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 ; mov r3, rb31 -+- -+-sub.setf -, r3, rb18 ; mov r1, ra22 -+- -+-mov -, vw_wait ; mul24 r0, r0, r1 -+-brr.anyn -, r:loop_honly -+-asr r0, r0, 15 # delay 1 -+-min r0, r0, rb22 # delay 2 -+-max vpm, r0, 0 # delay 3 -+- -+-# DMA out -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW: height rows, 16 8-bit units long -+-mov vw_setup, rb29 -+-mov vw_addr, unif # start the VDW -+- -+- -+-################################################################################ -+- -+-# mc_exit() -+- -+-::mc_exit -+-mov -, vw_wait # wait on the VDW -+- -+-mov -,srel(0) -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -+ -+ nop ; nop ; thrend -+ nop ; nop # delay slot 1 -+ nop ; nop # delay slot 2 -+ -+-::mc_exit1 -+-mov -, vw_wait # wait on the VDW -+- -+-#mov -,srel(1) -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+- -+-nop ; nop ; thrend -+-mov interrupt, 1; nop # delay slot 1 -+-nop ; nop # delay slot 2 -+- -+-# mc_interrupt_exit() -+-::mc_interrupt_exit -+-mov -, vw_wait # wait on the VDW -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+- -+-mov -,sacq(0) # 1 -+-mov -,sacq(0) # 2 -+-mov -,sacq(0) # 3 -+-mov -,sacq(0) # 4 -+-mov -,sacq(0) # 5 -+-mov -,sacq(0) # 6 -+-mov -,sacq(0) # 7 -+-mov -,sacq(0) # 8 -+-mov -,sacq(0) # 9 -+-mov -,sacq(0) # 10 -+-mov -,sacq(0) # 11 -+- -+-nop ; nop ; thrend -+-mov interrupt, 1; nop # delay slot 1 -+-nop ; nop # delay slot 2 -+- -+-# mc_interrupt_exit4() -+-::mc_interrupt_exit4 -+-mov -, vw_wait # wait on the VDW -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+- -+-mov -,sacq(0) # 1 -+-mov -,sacq(0) # 2 -+-mov -,sacq(0) # 3 -+- -+-nop ; nop ; thrend -+-mov interrupt, 1; nop # delay slot 1 -+-nop ; nop # delay slot 2 -+- -+ # mc_interrupt_exit8() -+ ::mc_interrupt_exit8 -+ mov -, vw_wait # wait on the VDW -+@@ -1134,282 +555,5 @@ nop ; nop ; thrend -+ mov interrupt, 1; nop # delay slot 1 -+ nop ; nop # delay slot 2 -+ -+-################################################################################ -+-# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -+-::mc_setup_uv -+- -+-# Read starting kernel -+-mov ra31, unif -+- -+-# Load first request location -+-add ra_x_base, unif, elem_num # Store x -+-mov ra_y, unif # Store y -+-mov ra_x2_base, unif # Store frame u base -+-nop -+-sub ra_u2v_ref_offset, unif, ra_x2_base # Store offset to add to move from u to v in reference frame -+- -+-# Read image dimensions -+-sub rb25,unif,1 -+-sub rb30,unif,1 -+- -+-# get source pitch -+-mov rb16, unif -+- -+-# get destination pitch -+-mov r0, unif -+-mov r1, vdw_setup_1(0) -+-add rb24, r1, r0 -+- -+-# load constants -+- -+-mov ra20, 1 -+-mov ra21, 32 -+-mov ra22, 256 -+-mov ra23, 8 -+- -+-mov rb20, 0xffffff00 -+-mov rb21, 64 -+-mov rb22, 255 -+-mov rb23, 24 -+- -+-# touch vertical context to keep simulator happy -+- -+-mov ra8, 0 -+-mov ra9, 0 -+-mov ra10, 0 -+-mov ra11, 0 -+-mov ra12, 0 -+-mov ra13, 0 -+-mov ra14, 0 -+-mov ra15, 0 -+- -+-# Compute part of VPM to use for DMA output -+-mov r2, qpu_num -+-and r2, r2, 15 -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -+-shl r0, r0, 5 -+-add rb27, r0, r1 -+- -+-# Compute part of VPM to save data into -+-mov r2, qpu_num -+-and r2, r2, 15 -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-add rb28, r0, r1 -+- -+-# Compute base address for first and second access -+-mov r0, ra_x_base # Load x -+-max r0, r0, 0; mov r1, ra_y # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -+-shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-add ra_y, r1, 1 -+-add r0, r0, r3 -+-and r0, r0, ~3 -+-max r1, r1, 0 ; mov ra_x_base, r0 # y -+-min r1, r1, rb_frame_height_minus_1 -+-# submit texture requests for first line -+-add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-add t0s, r0, r1 ; mov ra_x2_base, r2 -+-add t0s, r2, r1 -+- -+-# Dump padding words -+-mov r0, unif -+-mov r0, unif -+-mov r0, unif -+- -+-# submit texture requests for second line -+-max r1, ra_y, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 -+-bra -, ra31 -+-nop ; mul24 r1, r1, rb_pitch -+-add t0s, r1, ra_x_base -+-add t0s, r1, ra_x2_base -+- -+- -+- -+-################################################################################ -+- -+-::mc_filter_uv_b -+-mov ra31, unif -+- -+-# per-channel shifts were calculated on the *previous* invocation -+- -+-mov ra_xshift, ra_xshift_next -+- -+-# get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # x -+-max r0, r0, 0; mov r1, unif # y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+-shl ra_xshift_next, r0, 3 -+-sub r2, unif, r3 # compute offset from frame base u to frame base v -+-add r0, r0, r3 -+-and rb_x_base_next, r0, ~3 -+-mov ra_y_next, r1 -+-add ra_x2_base_next, rb_x_base_next, r2 -+- -+-# set up VPM write -+-mov vw_setup, rb28 -+- -+-# get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -+-shl r0, r0, 7 -+- -+-# r0 is currently height<<7 -+-# For vr_setup we want height<<20 (so 20-7=13 additional bits) -+-shl r3, r0, 13 -+-shl r3, r3, 8 # Mask off top 8 bits -+-shr r3, r3, 8 -+- -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -+- -+-# In a B frame, so also set up VPM read -+-add vr_setup, r3, rb28 -+- -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+-# get filter coefficients -+- -+-mov r0, unif -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -+-asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-asr rb12, r0, rb23 -+- -+-# r2 is elem_num -+-# r3 is loop counter -+- -+-mov r5rep, -8 -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+- -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-mov r3, 0 -+- -+-:uvloop_b -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -+- -+-# generate seven shifted versions -+-# interleave with scroll of vertical context -+- -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+- -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 8 ; mov r1, ra22 -+- -+-# apply horizontal filter -+-brr.anyn -, r:uvloop_b -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -+- -+-# apply vertical filter and write to VPM -+- -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 15 -+-min r1, r1, rb22 -+-add r0, vpm, 1 # Blend in previous VPM contents at this location -+-brr.anyn -, r:uvloop_b -+-max r1, r1, 0 -+-add r1, r1, r0 -+-shr vpm, r1, 1 -+- -+- -+-# DMA out for U -+- -+-mov vw_setup, rb26 # VDW setup 0 -+-mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW -+- -+-# DMA out for V -+-# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -+-# Could potentially push this write into the start of the next pipeline stage. -+-mov r0, 16 -+-mov -, vw_wait -+- -+-bra -, ra31 -+-add vw_setup, rb26, r0 # VDW setup 0 -+-mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW -+- -+ ::mc_end -++# Do not add code here because mc_end must appear after all other code. -+-- -+2.7.4 -+ -+ -+From d40d59de0f09fd1a6e7146532418b63d8e2711b7 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 14:54:25 +0100 -+Subject: [PATCH 20/68] Moved chroma P1 to QPUs -+ -+--- -+ libavcodec/hevc.c | 38 ++++++++++++++++++++++++++++++++++++++ -+ 1 file changed, 38 insertions(+) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 31b8b2f..391d139 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2070,6 +2070,44 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ s->sh.luma_offset_l1[current_mv.ref_idx[1]]); -+ -+ if (s->ps.sps->chroma_format_idc) { -++#ifdef RPI_INTER_QPU -++ if (s->enable_rpi) { -++ int reflist = 1; -++ int hshift = s->ps.sps->hshift[1]; -++ int vshift = s->ps.sps->vshift[1]; -++ const Mv *mv = ¤t_mv.mv[reflist]; -++ intptr_t mx = av_mod_uintp2(mv->x, 2 + hshift); -++ intptr_t my = av_mod_uintp2(mv->y, 2 + vshift); -++ intptr_t _mx = mx << (1 - hshift); -++ intptr_t _my = my << (1 - vshift); // Fractional part of motion vector -++ -++ int x1_c = x0_c + (mv->x >> (2 + hshift)); -++ int y1_c = y0_c + (mv->y >> (2 + hshift)); -++ //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ int chan = x0>>8; -++ -++ uint32_t *u = s->u_mvs[chan & 7]; -++ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -++ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -++ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -++ *u++ = rpi_filter_coefs[_mx][0]; -++ *u++ = rpi_filter_coefs[_mx][1]; -++ *u++ = rpi_filter_coefs[_my][0]; -++ *u++ = rpi_filter_coefs[_my][1]; -++ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ } -++ } -++ s->u_mvs[chan & 7] = u; -++ return; -++ } -++#endif -+ RPI_REDIRECT(chroma_mc_uni)(s, dst1, s->frame->linesize[1], ref1->frame->data[1], ref1->frame->linesize[1], -+ 1, x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, -+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][0], s->sh.chroma_offset_l1[current_mv.ref_idx[1]][0]); -+-- -+2.7.4 -+ -+ -+From 75777ba7927086e862104b14f6446e81bc789611 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 13 May 2015 15:13:47 +0100 -+Subject: [PATCH 21/68] Added B prediction - not quite right -+ -+--- -+ libavcodec/hevc.c | 58 ++++++++++++++++++++++++ -+ libavcodec/rpi_shader.c | 108 +++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 6 +-- -+ libavcodec/rpi_shader.qasm | 48 ++++++++++---------- -+ 4 files changed, 141 insertions(+), 79 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 391d139..47ddfff 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2127,6 +2127,64 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ ref1->frame, ¤t_mv.mv[1], ¤t_mv); -+ -+ if (s->ps.sps->chroma_format_idc) { -++#ifdef RPI_INTER_QPU -++ if (s->enable_rpi) { -++ int hshift = s->ps.sps->hshift[1]; -++ int vshift = s->ps.sps->vshift[1]; -++ const Mv *mv = ¤t_mv.mv[0]; -++ intptr_t mx = av_mod_uintp2(mv->x, 2 + hshift); -++ intptr_t my = av_mod_uintp2(mv->y, 2 + vshift); -++ intptr_t _mx = mx << (1 - hshift); -++ intptr_t _my = my << (1 - vshift); // Fractional part of motion vector -++ int x1_c = x0_c + (mv->x >> (2 + hshift)); -++ int y1_c = y0_c + (mv->y >> (2 + hshift)); -++ -++ const Mv *mv2 = ¤t_mv.mv[1]; -++ intptr_t mx2 = av_mod_uintp2(mv2->x, 2 + hshift); -++ intptr_t my2 = av_mod_uintp2(mv2->y, 2 + vshift); -++ intptr_t _mx2 = mx2 << (1 - hshift); -++ intptr_t _my2 = my2 << (1 - vshift); // Fractional part of motion vector -++ -++ int x2_c = x0_c + (mv2->x >> (2 + hshift)); -++ int y2_c = y0_c + (mv2->y >> (2 + hshift)); -++ -++ int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -++ -++ uint32_t *u = s->u_mvs[chan & 7]; -++ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -++ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -++ *u++ = ( (nPbW_cframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); // TODO this will become unused once we have a dedicated pass0 filter -++ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 3 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y2_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -++ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -++ *u++ = rpi_filter_coefs[_mx2][0]; -++ *u++ = rpi_filter_coefs[_mx2][1]; -++ *u++ = rpi_filter_coefs[_my2][0]; -++ *u++ = rpi_filter_coefs[_my2][1]; -++ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ } -++ } -++ s->u_mvs[chan & 7] = u; -++ return; -++ } -++#endif -+ RPI_REDIRECT(chroma_mc_bi)(s, dst1, s->frame->linesize[1], ref0->frame, ref1->frame, -+ x0_c, y0_c, nPbW_c, nPbH_c, ¤t_mv, 0); -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 170e8ac..5d00cb2 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -265,23 +265,23 @@ unsigned int rpi_shader[] = { -+ /* [0x00000760] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+ /* [0x00000768] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+ /* [0x00000770] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000778] */ 0x55015fc6, 0x100248a3, // mov r2, rb21 ; mul24 r3, r0, ra0 -+-/* [0x00000780] */ 0x40038031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-/* [0x00000788] */ 0x4d07f4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000778] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000780] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000788] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+ /* [0x00000790] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000798] */ 0x4d0be4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000798] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ /* [0x000007a0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007a8] */ 0x4d0fd4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007a8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ /* [0x000007b0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007b8] */ 0x4d13c4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007b8] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+ /* [0x000007c0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007c8] */ 0x4d17b4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007c8] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+ /* [0x000007d0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007d8] */ 0x4d1ba4f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007d8] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+ /* [0x000007e0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000007e8] */ 0x4d1f94f0, 0xd00248a3, // sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000007e8] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+ /* [0x000007f0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x000007f8] */ 0x0d9e74c0, 0x10020827, // sub r0, r2, r3 -++/* [0x000007f8] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+ /* [0x00000800] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+ /* [0x00000808] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+ /* [0x00000810] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+@@ -291,61 +291,63 @@ unsigned int rpi_shader[] = { -+ /* [0x00000830] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+ /* [0x00000838] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+ /* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000848] */ 0x533c0dc1, 0xd00243a0, // max ra14, ra15, 0 ; mul24 r0, r0, r1 -+-/* [0x00000850] */ 0x8f54f1f6, 0xd0024821, // asr r0, r0, 15 ; mov r1, ra21 -+-/* [0x00000858] */ 0x129d61c0, 0x100223e7, // min.setf ra15, r0, rb22 -+-/* [0x00000860] */ 0x4038e037, 0x100049e0, // nop ; mul24 r0, ra14, rb14 -+-/* [0x00000868] */ 0x4d34d237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-/* [0x00000870] */ 0x4d30c237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000878] */ 0x4d2cb237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000880] */ 0x4d28a237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000888] */ 0x4d249237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000890] */ 0x4d208237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000898] */ 0x4d3cf237, 0x10024860, // sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008a0] */ 0x8d9f223f, 0x100a0867, // sub.ifnn r1, r1, r0 ; mov -, vw_wait -++/* [0x00000848] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000850] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000858] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000860] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000868] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000870] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000878] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000880] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000888] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000890] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000898] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008a0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+ /* [0x000008a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008b0] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -+-/* [0x000008b8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008c0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x000008c8] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000008d0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x000008d8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x000008e0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x000008e8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000008f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000900] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000908] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000910] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000918] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000920] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000928] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000008b8] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x000008c0] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x000008c8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008d0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x000008d8] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000008e0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x000008e8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x000008f0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x000008f8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000900] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000908] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000910] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000918] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000920] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000928] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000930] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000938] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000930] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000938] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000940] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000948] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000940] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000948] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+ /* [0x00000950] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000958] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000960] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000968] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000970] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000960] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000968] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000970] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000978] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000980] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000978] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000980] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000988] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000988] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x00000990] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000998] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000009a8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x000009b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000009b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000009c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000009c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000009d0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009d8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000009e0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000009e8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000009d8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009e0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000009e8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000009f0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000009f8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 9de4535..e36c4ae 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -6,8 +6,8 @@ extern unsigned int rpi_shader[]; -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 142) -+ #define mc_filter_uv_b (rpi_shader + 360) -+-#define mc_exit (rpi_shader + 588) -+-#define mc_interrupt_exit8 (rpi_shader + 606) -+-#define mc_end (rpi_shader + 636) -++#define mc_exit (rpi_shader + 592) -++#define mc_interrupt_exit8 (rpi_shader + 610) -++#define mc_end (rpi_shader + 640) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index cd7346d..870437d2 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -443,23 +443,23 @@ add t0s, ra_x2_base, r2 -+ -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+-mov r2, rb21 ; mul24 r3, r0, ra0 -+-nop ; mul24.ifnz r3, ra0 << 8, r1 << 8 -+-sub r2, r2, r3 ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -+ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-sub r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-sub r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-sub r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+ nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-sub r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+ nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-sub r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+ nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-sub r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+ nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-sub r0, r2, r3 -++add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+@@ -474,23 +474,25 @@ sub.setf -, r3, 8 ; mov r1, ra22 -+ -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b -+-max ra14, ra15, 0 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr r0, r0, 15 ; mov r1, ra21 -+-min.setf ra15, r0, rb22 -++mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -++asr ra15, r0, 8 ; nop -++nop ; nop -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r0, ra14, rb14 -+-sub r1, r1, r0 ; mul24 r0, ra13, rb13 -+-sub r1, r1, r0 ; mul24 r0, ra12, rb12 -+-sub r1, r1, r0 ; mul24 r0, ra11, rb11 -+-sub r1, r1, r0 ; mul24 r0, ra10, rb10 -+-sub r1, r1, r0 ; mul24 r0, ra9, rb9 -+-sub r1, r1, r0 ; mul24 r0, ra8, rb8 -+-sub r1, r1, r0 ; mul24 r0, ra15, rb15 -+-sub.ifnn r1, r1, r0 ; mov -, vw_wait -++nop ; mul24 r1, ra14, rb14 -++nop ; mul24 r0, ra13, rb13 -++add r1, r1, r0 ; mul24 r0, ra12, rb12 -++add r1, r1, r0 ; mul24 r0, ra11, rb11 -++add r1, r1, r0 ; mul24 r0, ra10, rb10 -++add r1, r1, r0 ; mul24 r0, ra9, rb9 -++add r1, r1, r0 ; mul24 r0, ra8, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb15 -++add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 15 -++asr r1, r1, 14 -++add r1, r1, ra21 -++asr r1, r1, 6 -+ min r1, r1, rb22 -+ add r0, vpm, 1 # Blend in previous VPM contents at this location -+ brr.anyn -, r:uvloop_b -+-- -+2.7.4 -+ -+ -+From 3d4e94b8f0b08fe4c0b582fc7f1dbe9d1d9d60ed Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 08:15:55 +0100 -+Subject: [PATCH 22/68] Added flush for SAO -+ -+--- -+ libavcodec/hevc.c | 2 +- -+ libavcodec/hevc_filter.c | 39 ++++++++++++++++++++++++++------------- -+ 2 files changed, 27 insertions(+), 14 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 47ddfff..93e1eba 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2903,7 +2903,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ rpi_execute_inter_qpu(s); -+ #endif -+ // Transform all blocks -+- //printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -++ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 9b6e26d..92a8271 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -871,6 +871,21 @@ static void flush_buffer(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+ gpu_cache_flush(p); -+ } -++ -++static void ff_hevc_flush_chroma(HEVCContext *s) -++{ -++ if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N )) { -++ flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[2]); -++ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -++ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -++ //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -++ } -++} -+ #endif -+ -+ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+@@ -886,31 +901,29 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x - ctb_size, y); -+ if (y && x_end) { -+ sao_filter_CTB(s, x, y - ctb_size); -+- if (s->threads_type & FF_THREAD_FRAME ) -++ if (s->threads_type & FF_THREAD_FRAME ) { -++#ifdef RPI_INTER_QPU -++ ff_hevc_flush_chroma(s); -++#endif -+ ff_thread_report_progress(&s->ref->tf, y, 0); -++ } -+ } -+ if (x_end && y_end) { -+ sao_filter_CTB(s, x , y); -+- if (s->threads_type & FF_THREAD_FRAME ) -++ if (s->threads_type & FF_THREAD_FRAME ) { -++#ifdef RPI_INTER_QPU -++ ff_hevc_flush_chroma(s); -++#endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -++ } -+ } -+ } else if (s->threads_type & FF_THREAD_FRAME && x_end) { -+ //int newh = y + ctb_size - 4; -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -+- if (!( s->nal_unit_type == NAL_TRAIL_N || -+- s->nal_unit_type == NAL_TSA_N || -+- s->nal_unit_type == NAL_STSA_N || -+- s->nal_unit_type == NAL_RADL_N || -+- s->nal_unit_type == NAL_RASL_N )) { -+ #ifdef RPI_INTER_QPU -+- flush_buffer(s->frame->buf[1]); -+- flush_buffer(s->frame->buf[2]); -++ ff_hevc_flush_chroma(s); -+ #endif -+- //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -+- //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -+- //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -+- } -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+ } -+-- -+2.7.4 -+ -+ -+From 3e337b9c4ef0c356a0259be2254ad1bc4d5bbe29 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 09:17:28 +0100 -+Subject: [PATCH 23/68] Stopped using acceleration in unsupported cases -+ -+--- -+ libavcodec/hevc.c | 14 +++++++------- -+ libavcodec/hevc_cabac.c | 4 ++-- -+ 2 files changed, 9 insertions(+), 9 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 93e1eba..bfd5a55 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -1152,15 +1152,11 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (size * size); i++) { -+ coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -+- printf("Cross component not supported\n"); // TODO -+- exit(-1); -+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride); -+ } -+ } -+ -+ if (lc->tu.cross_pf) { -+- printf("Cross component not supported\n"); // TODO -+- exit(-1); -+ hls_cross_component_pred(s, 1); -+ } -+ for (i = 0; i < (s->ps.sps->chroma_format_idc == 2 ? 2 : 1); i++) { -+@@ -1189,8 +1185,6 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < (size * size); i++) { -+ coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); -+ } -+- printf("Cross component not supported\n"); // TODO -+- exit(-1); -+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride); -+ } -+ } -+@@ -2857,7 +2851,13 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -+ #ifdef RPI -+- s->enable_rpi = 1; // TODO this should depend on cross component and frame width etc. -++ s->enable_rpi = s->ps.sps->bit_depth == 8 -++ && s->ps.sps->width <= RPI_MAX_WIDTH -++ && !s->ps.pps->cross_component_prediction_enabled_flag -++ && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1 -++ && !(s->ps.pps->weighted_pred_flag && s->sh.slice_type == P_SLICE) -++ && !(s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE); -++ -+ #endif -+ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 4f072be..38f53de 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1513,9 +1513,9 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ #ifdef RPI -+ if (!use_vpu) { -+ int max_xy = FFMAX(last_significant_coeff_x, last_significant_coeff_y); -+- if (max_xy == 0) -++ if (max_xy == 0) { -+ s->hevcdsp.idct_dc[log2_trafo_size-2](coeffs); -+- else { -++ } else { -+ int col_limit = last_significant_coeff_x + last_significant_coeff_y + 4; -+ if (max_xy < 4) -+ col_limit = FFMIN(4, col_limit); -+-- -+2.7.4 -+ -+ -+From 3941d3e4c2305fa037e8aba5a14cf698ac8673db Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 09:42:16 +0100 -+Subject: [PATCH 24/68] Split B prediction into two passes -+ -+--- -+ libavcodec/hevc.c | 1 + -+ libavcodec/hevc.h | 1 + -+ libavcodec/rpi_qpu.c | 3 + -+ libavcodec/rpi_qpu.h | 1 + -+ libavcodec/rpi_shader.c | 559 +++++++++++++++++++++++++++------------------ -+ libavcodec/rpi_shader.h | 11 +- -+ libavcodec/rpi_shader.qasm | 196 ++++++++++++++-- -+ 7 files changed, 531 insertions(+), 241 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index bfd5a55..4b133d2 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3801,6 +3801,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ p += uv_commands_per_qpu; -+ } -+ s->mc_filter_uv = qpu_get_fn(QPU_MC_FILTER_UV); -++ s->mc_filter_uv_b0 = qpu_get_fn(QPU_MC_FILTER_UV_B0); -+ s->mc_filter_uv_b = qpu_get_fn(QPU_MC_FILTER_UV_B); -+ -+ } -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index d513579..4a39e39 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -917,6 +917,7 @@ typedef struct HEVCContext { -+ uint32_t *u_mvs[8]; -+ // Function pointers -+ uint32_t mc_filter_uv; -++ uint32_t mc_filter_uv_b0; -+ uint32_t mc_filter_uv_b; -+ #endif -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 4e90cc1..60bf079 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -636,6 +636,9 @@ unsigned int qpu_get_fn(int num) { -+ case QPU_MC_FILTER_UV: -+ fn = mc_filter_uv; -+ break; -++ case QPU_MC_FILTER_UV_B0: -++ fn = mc_filter_uv_b0; -++ break; -+ case QPU_MC_FILTER_UV_B: -+ fn = mc_filter_uv_b; -+ break; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index f9ad333..543c84b 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -29,6 +29,7 @@ enum { -+ QPU_MC_FILTER_HONLY, -+ QPU_MC_SETUP_UV, -+ QPU_MC_FILTER_UV, -++ QPU_MC_FILTER_UV_B0, -+ QPU_MC_FILTER_UV_B, -+ QPU_MC_INTERRUPT_EXIT8, -+ QPU_MC_END -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 5d00cb2..88ad20b 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -39,18 +39,18 @@ unsigned int rpi_shader[] = { -+ /* [0x00000070] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+ /* [0x00000078] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+ /* [0x00000080] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000088] */ 0x00000040, 0xe0021567, // mov rb21, 64 -+-/* [0x00000090] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000098] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x000000a0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x000000a8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x000000b0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x000000b8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x000000c0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x000000c8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x000000d0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x000000d8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000e0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000088] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000090] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000098] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x000000a0] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000a8] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000b0] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000b8] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000c0] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000c8] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000d0] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000d8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000e0] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+ /* [0x000000e8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+ /* [0x000000f0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+ /* [0x000000f8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+@@ -62,176 +62,176 @@ unsigned int rpi_shader[] = { -+ /* [0x00000128] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+ /* [0x00000130] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+ /* [0x00000138] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000140] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000148] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000150] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000158] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000160] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000168] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000170] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000178] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000180] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000188] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x00000190] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x00000198] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x000001a0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001a8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001b0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001b8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001c0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x000001c8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001d0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x000001d8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x000001e0] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x000001e8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000001f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000001f8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000200] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000208] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000210] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000218] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000220] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000228] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000230] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000140] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x00000148] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000150] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000158] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000160] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000168] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000170] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000178] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000180] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000188] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000190] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -++/* [0x00000198] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x000001a0] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -++/* [0x000001a8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x000001b0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000001b8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x000001c0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000001c8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001d8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001e0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -++/* [0x000001e8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001f0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x000001f8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x00000200] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x00000208] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000218] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000220] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000228] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000230] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000238] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000240] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000248] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000250] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000238] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000240] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000248] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000250] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000258] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000260] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000268] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000270] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000278] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000280] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000288] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000290] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000298] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002a0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002a8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002b0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002b8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002c0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000002c8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000002d0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000002e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000002f0] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x000002f8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000300] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000308] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000310] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000340] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000360] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000368] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000370] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000378] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000380] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000388] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000390] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000258] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000260] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000268] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000270] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000278] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000280] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000288] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000290] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000298] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000002a0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002a8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002b0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002b8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002c0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002c8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002d0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002d8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002e0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000002e8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002f0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000300] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000308] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000310] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000340] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000360] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000368] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000370] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000378] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000380] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000388] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000390] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000398] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x000003a0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000003a8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003b0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000398] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003a0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003a8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003b0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003b8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003c0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003c8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003d0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003d8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003e0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003e8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003f0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003f8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000400] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000408] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000410] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000418] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000420] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000428] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000430] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000438] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000440] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000448] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000450] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000458] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000460] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000468] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000470] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000478] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000480] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000488] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000490] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000498] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000004a0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000004a8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000004b0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000004b8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004c0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000004c8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000004d0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000004d8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x000004e0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x000004e8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x000004f0] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x000004f8] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000500] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000508] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000510] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000518] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000520] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000528] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000530] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000538] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000540] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000548] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000550] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000558] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000560] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000568] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000570] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000578] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000580] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000588] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000590] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000598] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-// ::mc_filter_uv_b -+-/* [0x000005a0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005a8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005b0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005b8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005c0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000005c8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005d0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000005d8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000005e0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000005e8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000005f0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000005f8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000600] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000608] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000610] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000618] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000620] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000628] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000630] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000638] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000640] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000648] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000650] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000658] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000660] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000668] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000670] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x000003b8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003c0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003c8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003d0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003d8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003e0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003e8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003f0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003f8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000400] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000408] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000410] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000418] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000420] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000428] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000430] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000438] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000440] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000448] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000450] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000458] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000460] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000468] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000470] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000478] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000480] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000488] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000490] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000498] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000004a0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x000004a8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000004b0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000004b8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000004c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000004c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000004d0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000004d8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004e0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000004e8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000004f0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000004f8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000500] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000508] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000510] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000518] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000520] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000528] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000530] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000538] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000540] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000548] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000550] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000558] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000560] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000568] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000570] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000578] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000580] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000588] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000590] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000598] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000005a0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000005a8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000005b0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000005b8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_uv_b0 -++/* [0x000005c0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005c8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005d0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005d8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005e0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000005e8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005f0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000005f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000600] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000608] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000610] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000618] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000620] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000628] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000630] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000638] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000640] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000648] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000650] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000658] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000660] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000668] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000670] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+ /* [0x00000678] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+ /* [0x00000680] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000688] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+@@ -253,7 +253,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000708] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+ /* [0x00000710] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ /* [0x00000718] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+-// :uvloop_b -++// :uvloop_b0 -+ /* [0x00000720] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+ /* [0x00000728] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+ /* [0x00000730] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+@@ -290,7 +290,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000828] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+ /* [0x00000830] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+ /* [0x00000838] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+ /* [0x00000848] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+ /* [0x00000850] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+ /* [0x00000858] */ 0x009e7000, 0x100009e7, // nop ; nop -+@@ -306,48 +306,163 @@ unsigned int rpi_shader[] = { -+ /* [0x000008a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ /* [0x000008b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+ /* [0x000008b8] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x000008c0] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x000008c8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008d0] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x000008d8] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000008e0] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x000008e8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x000008f0] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x000008f8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000900] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000908] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000910] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000918] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000920] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000928] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000930] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000938] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008c0] */ 0xfffffad8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000008c8] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x000008d0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000008d8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000008e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000008f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000900] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000908] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000910] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000918] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000920] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_uv_b -++/* [0x00000928] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000930] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000938] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000940] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000948] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000950] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000958] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000960] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000968] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000970] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000978] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000980] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000988] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000990] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000998] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000009a0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000009a8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000009b0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000009b8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000009c0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000009c8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000009d0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000009d8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x000009e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000009e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000009f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000009f8] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x00000a00] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000a08] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000a10] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a18] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a20] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a28] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000a30] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a38] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a40] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a48] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000a50] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a58] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a60] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a68] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000a70] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a78] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a80] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a88] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000a90] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000a98] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000aa0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :uvloop_b -++/* [0x00000aa8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000ab0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000ab8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000ac0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000ac8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000ad0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000ad8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000ae0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000ae8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000af0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000af8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000b00] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000b08] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000b10] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000b18] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000b20] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000b28] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000b30] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000b38] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000b40] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000b48] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000b50] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000b58] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000b60] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000b68] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000b70] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000b78] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000b80] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000b88] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000b90] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000b98] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000ba0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000ba8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000bb0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000bb8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000bc0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000bc8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000bd0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000bd8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000be0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000be8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000bf0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000bf8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000c00] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000c08] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000c10] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000c18] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000c20] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000c28] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000c30] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000c38] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000c40] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000c48] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000c50] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000c58] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -++/* [0x00000c60] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000c68] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000c70] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00000c78] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -++/* [0x00000c80] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000c88] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000c90] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000c98] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000ca0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ca8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000cb0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000cb8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000cc0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000940] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000948] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000950] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000958] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000960] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000968] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000970] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000978] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000980] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000cc8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000cd0] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000cd8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ce0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ce8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000cf0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000cf8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000d00] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000d08] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000988] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000990] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000998] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009a0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009a8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009d0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009d8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009e0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000009e8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000009f0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000009f8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000d10] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000d18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d30] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d38] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d40] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d58] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d60] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d70] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000d78] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000d80] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index e36c4ae..809e582 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,10 +4,11 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 142) -+-#define mc_filter_uv_b (rpi_shader + 360) -+-#define mc_exit (rpi_shader + 592) -+-#define mc_interrupt_exit8 (rpi_shader + 610) -+-#define mc_end (rpi_shader + 640) -++#define mc_filter_uv (rpi_shader + 150) -++#define mc_filter_uv_b0 (rpi_shader + 368) -++#define mc_filter_uv_b (rpi_shader + 586) -++#define mc_exit (rpi_shader + 818) -++#define mc_interrupt_exit8 (rpi_shader + 836) -++#define mc_end (rpi_shader + 866) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 870437d2..635b894 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -26,7 +26,7 @@ -+ # ra23 8 -+ # -+ # rb20 0xffffff00 -+-# rb21 64 -++# rb21 vpm_setup for writing 16bit results into VPM -+ # rb22 255 -+ # rb23 24 -+ # -+@@ -34,7 +34,7 @@ -+ # rb25 frame width-1 -+ # rb26 height<<23 + width<<16 + vdw_setup_0 -+ # rb27 vdw_setup_0 (depends on QPU number) -+-# rb28 vpm_setup (depends on QPU number) -++# rb28 vpm_setup (depends on QPU number) for writing 8bit results into VPM -+ # rb29 vdw_setup_1(dst_pitch-width) -+ # rb30 frame height-1 -+ # rb31 used as temp to count loop iterations -+@@ -69,8 +69,6 @@ -+ .set ra_y_next, ra28 -+ .set ra_y, ra29 -+ -+-.set rb_const_64, rb21 -+- -+ -+ ################################################################################ -+ # mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -+@@ -106,7 +104,6 @@ mov ra22, 256 -+ mov ra23, 8 -+ -+ mov rb20, 0xffffff00 -+-mov rb21, 64 -+ mov rb22, 255 -+ mov rb23, 24 -+ -+@@ -123,6 +120,7 @@ mov ra15, 0 -+ -+ # Compute part of VPM to use for DMA output -+ mov r2, qpu_num -++shl r2, r2, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -+ and r2, r2, 15 -+ mov r1, r2 -+ asr r1, r1, 2 -+@@ -135,16 +133,21 @@ shl r0, r0, 5 -+ add rb27, r0, r1 -+ -+ # Compute part of VPM to save data into -+-mov r2, qpu_num -+-and r2, r2, 15 -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vpm_setup(0, 4, h8p(0, 0)) -++mov r2, qpu_num # qpu_num = abcd -++shl r2, r2, 1 -++and r2, r2, 15 # r2 = bcd0 -++mov r1, r2 # r1 = bcd0 -++asr r1, r1, 2 # r1 = bc -++shl r1, r1, 6 # r1 = bc000000 -++mov r0, r2 # r0 = bcd0 -++and r0, r0, 3 # r0 = d0 -++add r0, r0, r1 # r0 = bc0000d0 -++mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -+ add rb28, r0, r1 -++asr r0, r0, 1 # r0 = bc0000d -++# Prepare VPM command for 16bit intermediates -++mov r1, vpm_setup(0, 2, h16p(0, 0)) # 2 is stride - stride acts on ADDR which is Y[5:0],H[0] for 16 bit -++add rb21, r0, r1 -+ -+ # Compute base address for first and second access -+ mov r0, ra_x_base # Load x -+@@ -345,6 +348,171 @@ mov vw_addr, unif # start the VDW -+ -+ ################################################################################ -+ -++# mc_filter_uv_b0(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -++ -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x_base, ra_x16_base point to the current coordinates for this block -++::mc_filter_uv_b0 -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # x -++max r0, r0, 0; mov r1, unif # y -++min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -++shl ra_xshift_next, r0, 3 -++sub r2, unif, r3 # compute offset from frame base u to frame base v -++add r0, r0, r3 -++and rb_x_base_next, r0, ~3 -++mov ra_y_next, r1 -++add ra_x2_base_next, rb_x_base_next, r2 -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -++ -++# get filter coefficients -++ -++mov r0, unif -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++asr rb15, r0, rb23; mul24 r0, r0, ra22 -++asr rb14, r0, rb23; mul24 r0, r0, ra22 -++asr rb13, r0, rb23; mul24 r0, r0, ra22 -++asr rb12, r0, rb23 -++ -++# r2 is elem_num -++# r3 is loop counter -++ -++mov r5rep, -8 -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:uvloop_b0 -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -++shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_x2_base, r2 -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++nop ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++add r0, r2, r3 -++ -++mov r3, rb31 -++ -++mov ra8, ra9 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++mov ra13, ra14 -++ -++sub.setf -, r3, 8 ; mov r1, ra22 -++ -++# apply horizontal filter -++brr.anyn -, r:uvloop_b0 -++mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -++asr ra15, r0, 8 ; nop -++nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r1, ra14, rb14 -++nop ; mul24 r0, ra13, rb13 -++add r1, r1, r0 ; mul24 r0, ra12, rb12 -++add r1, r1, r0 ; mul24 r0, ra11, rb11 -++add r1, r1, r0 ; mul24 r0, ra10, rb10 -++add r1, r1, r0 ; mul24 r0, ra9, rb9 -++add r1, r1, r0 ; mul24 r0, ra8, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb15 -++add r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 14 -++add r1, r1, ra21 -++brr.anyn -, r:uvloop -++asr r1, r1, 6 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -++ -++# DMA out for U -++ -++mov vw_setup, rb26 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++# DMA out for V -++# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -++# Could potentially push this write into the start of the next pipeline stage. -++mov r0, 16 -++mov -, vw_wait -++ -++bra -, ra31 -++add vw_setup, rb26, r0 # VDW setup 0 -++mov vw_setup, rb29 # Stride -++mov vw_addr, unif # start the VDW -++ -++################################################################################ -++ -+ ::mc_filter_uv_b -+ mov ra31, unif -+ -+-- -+2.7.4 -+ -+ -+From 85d0ffa2bcf6a2b94c1a0c8f84241cda9ac92ce2 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 10:04:55 +0100 -+Subject: [PATCH 25/68] Switch to using 16bit temp buffers -+ -+--- -+ libavcodec/hevc.c | 2 +- -+ libavcodec/rpi_shader.c | 4 ++-- -+ libavcodec/rpi_shader.qasm | 10 +++++----- -+ 3 files changed, 8 insertions(+), 8 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 4b133d2..28a6660 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2147,7 +2147,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+- u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b0; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 88ad20b..ffd3a07 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -220,7 +220,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000600] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+ /* [0x00000608] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+ /* [0x00000610] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000618] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000618] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+ /* [0x00000620] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+ /* [0x00000628] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000630] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+@@ -346,7 +346,7 @@ unsigned int rpi_shader[] = { -+ /* [0x000009e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+ /* [0x000009e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+ /* [0x000009f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000009f8] */ 0x0c9dc7c0, 0x10020c67, // add vr_setup, r3, rb28 -++/* [0x000009f8] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+ /* [0x00000a00] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+ /* [0x00000a08] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000a10] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 635b894..9577121 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -26,7 +26,7 @@ -+ # ra23 8 -+ # -+ # rb20 0xffffff00 -+-# rb21 vpm_setup for writing 16bit results into VPM -++# rb21 vpm_setup for reading/writing 16bit results into VPM -+ # rb22 255 -+ # rb23 24 -+ # -+@@ -370,8 +370,8 @@ and rb_x_base_next, r0, ~3 -+ mov ra_y_next, r1 -+ add ra_x2_base_next, rb_x_base_next, r2 -+ -+-# set up VPM write -+-mov vw_setup, rb28 -++# set up VPM write, we need to save 16bit precision -++mov vw_setup, rb21 -+ -+ # get width,height of block -+ mov r2, 16 -+@@ -554,8 +554,8 @@ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+ add rb26, r0, rb27 -+ -+-# In a B frame, so also set up VPM read -+-add vr_setup, r3, rb28 -++# In a B frame, so also set up VPM read (reading back 16bit precision) -++add vr_setup, r3, rb21 -+ -+ sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+ -+-- -+2.7.4 -+ -+ -+From abc51bf61df597082fbd7cf1bba5031e4d44318b Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 10:30:44 +0100 -+Subject: [PATCH 26/68] Corrected B prediction: matching md5 sum for hobbit50 -+ -+--- -+ libavcodec/rpi_shader.c | 815 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 12 +- -+ libavcodec/rpi_shader.qasm | 36 +- -+ 3 files changed, 429 insertions(+), 434 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index ffd3a07..77cca46 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -38,431 +38,428 @@ unsigned int rpi_shader[] = { -+ /* [0x00000068] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+ /* [0x00000070] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+ /* [0x00000078] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x00000080] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000088] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000090] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00000098] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x000000a0] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x000000a8] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x000000b0] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x000000b8] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x000000c0] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x000000c8] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x000000d0] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000d8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000000e0] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x000000e8] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000000f0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000000f8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000100] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000108] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000110] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000118] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000120] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000128] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000130] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000138] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000140] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x00000148] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000150] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000158] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000160] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000168] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000170] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000178] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000180] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000188] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000190] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -+-/* [0x00000198] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -+-/* [0x000001a0] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -+-/* [0x000001a8] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x000001b0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000001b8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x000001c0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001c8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001d8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001e0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x000001e8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001f0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x000001f8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x00000200] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000208] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000080] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000088] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000090] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000098] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x000000a0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x000000a8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000b0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000b8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000c0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000c8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000d0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000d8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000e0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000e8] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x000000f0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000000f8] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000100] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000108] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000110] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000118] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000120] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000128] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000130] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000138] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000140] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000148] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x00000150] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000158] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000160] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000168] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000170] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000178] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000180] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000188] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000190] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000198] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -++/* [0x000001a0] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x000001a8] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -++/* [0x000001b0] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -++/* [0x000001b8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000001c0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -++/* [0x000001c8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000001d0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001d8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001e0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001e8] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -++/* [0x000001f0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001f8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x00000200] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -++/* [0x00000208] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+ /* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000218] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000220] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000228] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000230] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000238] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000240] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000248] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000250] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000220] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000228] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000230] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000238] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000240] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000248] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000250] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000258] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000258] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000260] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000268] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000270] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000278] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000280] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000288] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000290] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000298] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000002a0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002a8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002b0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002b8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002c0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002c8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002d0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002d8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002e0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000002e8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000002f0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000300] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000308] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000310] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000340] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000360] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000368] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000370] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000378] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000380] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000388] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000390] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000398] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x000003a0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000003a8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003b0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000268] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000270] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000278] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000280] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000288] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000290] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000298] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000002a0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000002a8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002b0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002b8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002c0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002c8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002e8] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000002f0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000318] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000320] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000328] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000340] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000348] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000360] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000368] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000370] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000378] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000380] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000388] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000390] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000398] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000003a0] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x000003a8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000003b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003b8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003b8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003c0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003c8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003d0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003d8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003e0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003e8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003f0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003f8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000400] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000408] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000410] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000418] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000420] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000428] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000430] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000438] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000440] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000448] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000450] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000458] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000460] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000468] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000470] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000478] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000480] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000488] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000490] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000498] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000004a0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x000004a8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000004b0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000004b8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000004c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000004c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000004d0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000004d8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004e0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000004e8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000004f0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000004f8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000500] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000508] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000510] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000518] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000520] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000528] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000530] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000538] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000540] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000548] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000550] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000558] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000560] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000568] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000570] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000578] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000580] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000588] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000590] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000598] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000005a0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000005a8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000005b0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000005b8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000003c0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003c8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003d0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003d8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003e0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003e8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003f0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003f8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000400] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000408] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000410] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000418] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000420] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000428] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000430] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000438] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000440] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000448] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000450] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000458] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000460] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000468] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000470] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000478] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000480] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000488] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000490] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000498] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x000004a0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000004a8] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x000004b0] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x000004b8] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x000004c0] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x000004c8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000004d0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000004d8] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x000004e0] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004e8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000004f0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000004f8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000500] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000508] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000510] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000518] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000520] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000528] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000530] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000538] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000540] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000548] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000550] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000558] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000560] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000568] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000570] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000578] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000580] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000588] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000590] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000598] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000005a0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000005a8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000005b0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000005b8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000005c0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000005c0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005c8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005d0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005d8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005e0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000005e8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005f0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000005f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000600] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000608] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000610] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000618] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000620] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000628] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000630] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000638] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000640] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000648] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000650] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000658] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000660] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000668] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000670] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000678] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000680] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000688] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000690] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000698] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000006a8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000006c8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000006e8] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f0] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f8] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000700] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000708] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000710] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000718] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000005c8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000005d0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000005d8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000005e0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000005e8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000005f0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000005f8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000600] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000608] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000610] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000618] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000620] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000628] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000630] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000638] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000640] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000648] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000650] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000658] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000660] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000668] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000670] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000678] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000680] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000688] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000690] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000698] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000006b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000006d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000006f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000006f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000700] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000708] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000710] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000718] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000720] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000720] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000728] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000730] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000738] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000740] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000748] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000750] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000758] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000760] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000768] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000770] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000778] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000780] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000788] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000790] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000798] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000007a0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007a8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000007b0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007b8] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000007c0] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007c8] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000007d0] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007d8] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000007e0] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000007e8] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000007f0] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x000007f8] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000800] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000808] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000810] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000818] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000820] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000828] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000830] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000838] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000840] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000848] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000850] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000858] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000860] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000868] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000870] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000878] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000880] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000888] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000890] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000898] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008a0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000008a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000008b8] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x000008c0] */ 0xfffffad8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000008c8] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x000008d0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000008d8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000008e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000008f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000008f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000900] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000908] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000910] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000918] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000920] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000728] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000730] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000738] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000740] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000748] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000750] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000758] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000760] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000768] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000770] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000778] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000780] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000788] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000790] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000798] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000007a0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000007a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000007b0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000007b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000007c0] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000007c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000007d0] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000007d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000007e0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000007e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000007f0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000007f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000800] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000808] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000810] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000818] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000820] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000828] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000830] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000838] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000840] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000848] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000850] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000858] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000860] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000868] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000870] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000878] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000880] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000888] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000890] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000898] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x000008a0] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000008a8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000008b0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000008b8] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000008c0] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -++/* [0x000008c8] */ 0x009e7000, 0x100009e7, // nop -++/* [0x000008d0] */ 0x009e7000, 0x100009e7, // nop -++/* [0x000008d8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000008e0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000008e8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008f0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000008f8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000900] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000908] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000910] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000918] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00000928] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000930] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000938] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000940] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000948] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000950] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000958] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000960] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000968] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000970] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000978] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000980] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000988] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000990] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000998] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000009a0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000009a8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000009b0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000009b8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000009c0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000009c8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x000009d0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x000009d8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x000009e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000009e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000009f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000009f8] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000a00] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000a08] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000a10] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a18] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a20] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a28] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000a30] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a38] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a40] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a48] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000a50] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a58] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a60] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a68] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000a70] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a78] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a80] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a88] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000a90] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000a98] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000aa0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000920] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000928] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000930] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000938] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000940] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000948] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000950] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000958] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000960] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000968] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000970] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000978] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000980] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000988] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000990] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000998] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000009a0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000009a8] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000009b0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000009b8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000009c0] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000009c8] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000009d0] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x000009d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000009e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000009e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000009f0] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x000009f8] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000a00] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000a08] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a10] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a18] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a20] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000a28] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a30] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a38] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a40] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000a48] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a50] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a58] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a60] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000a68] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a70] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a78] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000a80] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000a88] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000a90] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000a98] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000aa8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000ab0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000ab8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000ac0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000ac8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000ad0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000ad8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000ae0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000ae8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000af0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000af8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000b00] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000b08] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000b10] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000b18] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000b20] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000b28] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000b30] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000b38] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000b40] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000b48] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000b50] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000b58] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000b60] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000b68] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000b70] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000b78] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000b80] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000b88] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000b90] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000b98] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000ba0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000ba8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000bb0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000bb8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000bc0] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000bc8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000bd0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000bd8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000be0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000be8] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000bf0] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000bf8] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000c00] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000c08] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000c10] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000c18] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000c20] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000c28] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000c30] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000c38] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000c40] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000c48] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000c50] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000c58] */ 0x0cc01dc0, 0xd0020827, // add r0, vpm, 1 -+-/* [0x00000c60] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000c68] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000c70] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00000c78] */ 0x0e9c13c0, 0xd0020c27, // shr vpm, r1, 1 -+-/* [0x00000c80] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000c88] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000c90] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000c98] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000ca0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000ca8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000cb0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000cb8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000cc0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000aa0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000aa8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000ab0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000ab8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000ac0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000ac8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000ad0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000ad8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000ae0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000ae8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000af0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000af8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000b00] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000b08] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000b10] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000b18] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000b20] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000b28] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000b30] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000b38] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000b40] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000b48] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000b50] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000b58] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000b60] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000b68] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000b70] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000b78] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000b80] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000b88] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000b90] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000b98] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000ba0] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000ba8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000bb0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000bb8] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000bc0] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000bc8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000bd0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000bd8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000be0] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000be8] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000bf0] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000bf8] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000c00] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000c08] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000c10] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000c18] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000c20] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000c28] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000c30] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000c38] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000c40] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000c48] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000c50] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000c58] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000c60] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000c68] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000c70] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000c78] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000c80] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000c88] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000c90] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000c98] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000ca0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000ca8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000cc8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000cd0] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000cb0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000cb8] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000cc0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000cc8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000cd0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000cd8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ce0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ce8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cf0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cf8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000d00] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000d08] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ce0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ce8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000cf0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000d10] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000cf8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000d00] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d08] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000d18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d30] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000d20] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d28] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000d30] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000d38] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000d40] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000d48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000d50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d58] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d60] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d70] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000d78] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000d80] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000d58] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000d60] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000d68] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 809e582..6562fa9 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,11 +4,11 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 150) -+-#define mc_filter_uv_b0 (rpi_shader + 368) -+-#define mc_filter_uv_b (rpi_shader + 586) -+-#define mc_exit (rpi_shader + 818) -+-#define mc_interrupt_exit8 (rpi_shader + 836) -+-#define mc_end (rpi_shader + 866) -++#define mc_filter_uv (rpi_shader + 152) -++#define mc_filter_uv_b0 (rpi_shader + 370) -++#define mc_filter_uv_b (rpi_shader + 584) -++#define mc_exit (rpi_shader + 812) -++#define mc_interrupt_exit8 (rpi_shader + 830) -++#define mc_end (rpi_shader + 860) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 9577121..562dc35 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -39,13 +39,13 @@ -+ # rb30 frame height-1 -+ # rb31 used as temp to count loop iterations -+ # -+-# ra24...ra30 15, 14, 13, 12, 11, 10, 9 -+ # ra24 clipped(row start address+8+elem_num)&~3 -+ # ra25 per-channel shifts 2 -+ # ra26 next ra24 -+ # ra27 next ra25 -+ # ra28 next y -+ # ra29 y for next texture access -++# ra30 64 -+ # -+ # ra31 next kernel address -+ -+@@ -102,6 +102,7 @@ mov ra20, 1 -+ mov ra21, 32 -+ mov ra22, 256 -+ mov ra23, 8 -++mov ra30, 64 -+ -+ mov rb20, 0xffffff00 -+ mov rb22, 255 -+@@ -472,7 +473,7 @@ sub.setf -, r3, 8 ; mov r1, ra22 -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b0 -+ mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -+-asr ra15, r0, 8 ; nop -++asr ra15, r0, 8 ; nop # TODO isn't ra15 already in 24bit precision, may not need the sign extension here? -+ nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -+ -+ # apply vertical filter and write to VPM -+@@ -487,18 +488,18 @@ add r1, r1, r0 ; mul24 r0, ra8, rb8 -+ add r1, r1, r0 ; mul24 r0, ra15, rb15 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 14 -+-add r1, r1, ra21 -+-brr.anyn -, r:uvloop -+-asr r1, r1, 6 # Delay 1 -+-min r1, r1, rb22 # Delay 2 -+-max vpm, r1, 0 # Delay 3 -++#asr r1, r1, 14 -++#add r1, r1, ra21 -++brr.anyn -, r:uvloop_b0 -++asr vpm, r1, 14 # Delay 1 shifts down by shift2=6, but results are still in 16bit precision TODO may be able to avoid the mul24 and use more delay slots -++nop # Delay 2 -++nop # Delay 3 -+ -+ # DMA out for U -+ -+ mov vw_setup, rb26 # VDW setup 0 -+ mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW -++mov vw_addr, unif # start the VDW # TODO in pass0 we don't need to save any results -+ -+ # DMA out for V -+ # We need to wait for the U to complete first, but have nothing useful to compute while we wait. -+@@ -639,12 +640,11 @@ mov ra12, ra13 -+ mov ra13, ra14 -+ -+ sub.setf -, r3, 8 ; mov r1, ra22 -+- -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b -+ mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+ asr ra15, r0, 8 ; nop -+-nop ; nop -++nop ; nop # TODO improve use of delay slots -+ -+ # apply vertical filter and write to VPM -+ -+@@ -658,15 +658,13 @@ add r1, r1, r0 ; mul24 r0, ra8, rb8 -+ add r1, r1, r0 ; mul24 r0, ra15, rb15 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 14 -+-add r1, r1, ra21 -+-asr r1, r1, 6 -+-min r1, r1, rb22 -+-add r0, vpm, 1 # Blend in previous VPM contents at this location -++asr r1, r1, 14 # shift2=6 -++add r1, r1, vpm # Blend in previous VPM contents at this location -++add r1, r1, ra30 -+ brr.anyn -, r:uvloop_b -+-max r1, r1, 0 -+-add r1, r1, r0 -+-shr vpm, r1, 1 -++asr r1, r1, 7 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -+ -+ -+ # DMA out for U -+-- -+2.7.4 -+ -+ -+From ea60373134f98099c4ebaf0d23cca666008b4bba Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 10:55:07 +0100 -+Subject: [PATCH 27/68] P prediction uses 4 tap filters -+ -+--- -+ libavcodec/hevc.c | 50 ++-- -+ libavcodec/rpi_shader.c | 631 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 10 +- -+ libavcodec/rpi_shader.qasm | 43 +-- -+ 4 files changed, 344 insertions(+), 390 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 28a6660..a47ebc5 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -65,15 +65,15 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+ // TODO Chroma only needs 4 taps -+-static uint32_t rpi_filter_coefs[8][2] = { -+- { ENCODE_COEFFS( 0, 0, 0, 64), ENCODE_COEFFS( 0, 0, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -2, 58), ENCODE_COEFFS( 10, -2, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -4, 54), ENCODE_COEFFS( 16, -2, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -6, 46), ENCODE_COEFFS( 28, -4, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -4, 36), ENCODE_COEFFS( 36, -4, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -4, 28), ENCODE_COEFFS( 46, -6, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -2, 16), ENCODE_COEFFS( 54, -4, 0, 0 ) }, -+- { ENCODE_COEFFS( 0, 0, -2, 10), ENCODE_COEFFS( 58, -2, 0, 0 ) } -++static uint32_t rpi_filter_coefs[8][1] = { -++ { ENCODE_COEFFS( 0, 64, 0, 0) }, -++ { ENCODE_COEFFS( -2, 58, 10, -2) }, -++ { ENCODE_COEFFS( -4, 54, 16, -2) }, -++ { ENCODE_COEFFS( -6, 46, 28, -4) }, -++ { ENCODE_COEFFS( -4, 36, 36, -4) }, -++ { ENCODE_COEFFS( -4, 28, 46, -6) }, -++ { ENCODE_COEFFS( -2, 16, 54, -4) }, -++ { ENCODE_COEFFS( -2, 10, 58, -2) } -+ }; -+ -+ static uint32_t get_vc_address(AVBufferRef *bref) { -+@@ -2027,16 +2027,16 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+- *u++ = rpi_filter_coefs[_mx][1]; -++ u++; -+ *u++ = rpi_filter_coefs[_my][0]; -+- *u++ = rpi_filter_coefs[_my][1]; -++ u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2084,16 +2084,16 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+- *u++ = rpi_filter_coefs[_mx][1]; -++ u++; -+ *u++ = rpi_filter_coefs[_my][0]; -+- *u++ = rpi_filter_coefs[_my][1]; -++ u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2148,29 +2148,29 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b0; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 3 + start_x; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+ *u++ = ( (nPbW_cframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); // TODO this will become unused once we have a dedicated pass0 filter -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 3 + start_x; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = y2_c - 3 + start_y; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 1 + start_x; -++ u++[-RPI_CHROMA_COMMAND_WORDS] = y2_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx2][0]; -+- *u++ = rpi_filter_coefs[_mx2][1]; -++ u++; -+ *u++ = rpi_filter_coefs[_my2][0]; -+- *u++ = rpi_filter_coefs[_my2][1]; -++ u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 77cca46..c8d0728 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -116,8 +116,8 @@ unsigned int rpi_shader[] = { -+ /* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+ /* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+ /* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002e8] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000002f0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000002e8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002f0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+ /* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+ /* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+ /* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+@@ -128,338 +128,315 @@ unsigned int rpi_shader[] = { -+ /* [0x00000330] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ /* [0x00000338] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ /* [0x00000340] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000348] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000360] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000368] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000370] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000378] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000380] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000388] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000390] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000398] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000003a0] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x000003a8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000003b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003b8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000348] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000350] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000360] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000368] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000370] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000378] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000380] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003c0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003c8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003d0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003d8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003e0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003e8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003f0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003f8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000400] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000408] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000410] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000418] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000420] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000428] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000430] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000438] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000440] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000448] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000450] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000458] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000460] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000468] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000470] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000478] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000480] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000488] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000490] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000498] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x000004a0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000004a8] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x000004b0] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x000004b8] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x000004c0] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x000004c8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000004d0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000004d8] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x000004e0] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004e8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000004f0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000004f8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000500] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000508] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000510] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000518] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000520] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000528] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000530] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000538] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000540] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000548] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000550] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000558] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000560] */ 0xfffffe40, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000568] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000570] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000578] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000580] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000588] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000590] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000598] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000005a0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000005a8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000005b0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000005b8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000005c0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000388] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000390] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000398] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003d0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000003f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000003f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000400] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000408] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000410] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000418] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000420] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000428] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000430] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000438] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000440] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x00000448] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000450] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000458] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000460] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000468] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000470] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000478] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000480] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000488] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000490] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000498] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000004a0] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x000004a8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004b0] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x000004b8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004c0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000004c8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004d0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004d8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004e0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004f0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004f8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000500] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000508] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000005c8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000005d0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000005d8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000005e0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000005e8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000005f0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000005f8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000600] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000608] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000610] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000618] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000620] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000628] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000630] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000638] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000640] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000648] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000650] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000658] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000660] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000668] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000670] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000678] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000680] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000688] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000690] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000698] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000006b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000006d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000006f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000006f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000700] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000708] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000710] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000718] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000720] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000510] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000518] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000520] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000528] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000530] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000538] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000540] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000548] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000550] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000558] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000560] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000568] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000570] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000578] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000580] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000588] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000590] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000598] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000005a0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x000005a8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000005b0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000005b8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005c0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000005c8] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x000005d0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005d8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005f0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005f8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000600] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000608] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000610] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000618] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000620] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000628] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000630] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000638] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000640] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000648] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000650] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000658] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000668] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000728] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000730] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000738] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000740] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000748] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000750] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000758] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000760] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000768] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000770] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000778] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000780] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000788] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000790] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000798] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000007a0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000007a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000007b0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000007b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000007c0] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000007c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000007d0] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000007d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000007e0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000007e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000007f0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000007f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000800] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000808] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000810] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000818] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000820] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000828] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000830] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000838] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000840] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000848] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000850] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000858] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000860] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000868] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000870] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000878] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000880] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000888] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000890] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000898] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x000008a0] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000008a8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000008b0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000008b8] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000008c0] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -+-/* [0x000008c8] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x000008d0] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x000008d8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000008e0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000008e8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000008f0] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000008f8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000900] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000908] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000910] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000918] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000670] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000678] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000680] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000688] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000690] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000698] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000006a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000006a8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000006b0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000006b8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000006c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000006c8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000006d0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000006d8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006e0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006e8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000006f0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006f8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000700] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000708] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000710] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000718] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000720] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000728] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000730] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000738] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000740] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000748] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000750] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000758] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000760] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000768] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000770] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000778] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000780] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000788] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000790] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000798] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000007a0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000007a8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000007b0] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x000007b8] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x000007c0] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x000007c8] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x000007d0] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x000007d8] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x000007e0] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x000007e8] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x000007f0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000007f8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000800] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000808] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -++/* [0x00000810] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000818] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000820] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000828] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000830] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000838] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000840] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000848] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000850] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000858] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000860] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00000920] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000928] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000930] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000938] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000940] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000948] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000950] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000958] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000960] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000968] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000970] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000978] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000980] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000988] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000990] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000998] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000009a0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000009a8] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000009b0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x000009b8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000009c0] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x000009c8] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x000009d0] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x000009d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000009e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000009e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000009f0] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x000009f8] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000a00] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000a08] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a10] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a18] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a20] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000a28] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a30] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a38] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a40] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000a48] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a50] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a58] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a60] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000a68] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a70] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a78] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000a80] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000a88] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000a90] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000a98] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000868] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000870] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000878] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000880] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000888] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000890] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000898] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000008a0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000008a8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000008b0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000008b8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000008c0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000008c8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000008d0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008d8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000008e0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000008e8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000008f0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x000008f8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000900] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000908] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000910] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000918] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000920] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000928] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000930] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000938] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000940] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000948] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000950] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000958] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000960] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000968] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000970] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000978] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000980] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000988] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000990] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000998] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009a0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009a8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000009b0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009b8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009c0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000009c8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x000009d0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000009d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000009e0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000aa0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000aa8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000ab0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000ab8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000ac0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000ac8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000ad0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000ad8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000ae0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000ae8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000af0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000af8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000b00] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000b08] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000b10] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000b18] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000b20] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000b28] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000b30] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000b38] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000b40] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000b48] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000b50] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000b58] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000b60] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000b68] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000b70] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000b78] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000b80] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000b88] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000b90] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000b98] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000ba0] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000ba8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000bb0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000bb8] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000bc0] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000bc8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000bd0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000bd8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000be0] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000be8] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000bf0] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000bf8] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000c00] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000c08] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000c10] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000c18] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000c20] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000c28] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000c30] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000c38] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000c40] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000c48] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000c50] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000c58] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000c60] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000c68] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000c70] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000c78] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000c80] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000c88] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000c90] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000c98] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000ca0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000ca8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009e8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000009f0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000009f8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000a00] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000a08] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000a10] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000a18] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000a20] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000a28] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000a30] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000a38] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000a40] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000a48] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000a50] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000a58] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000a60] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000a68] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000a70] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000a78] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000a80] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00000a88] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00000a90] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00000a98] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00000aa0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00000aa8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00000ab0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00000ab8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000ac0] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000ac8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000ad0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000ad8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000ae0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000ae8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000af0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000af8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000b00] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000b08] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000b10] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000b18] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000b20] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b28] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000b30] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000b38] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000b40] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000b48] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000b50] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000b58] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000b60] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000b68] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000b70] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000b78] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000b80] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000b88] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000b90] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000b98] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000ba0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000ba8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000bb0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000bb8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000bc0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000bc8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000bd0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000bd8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000be0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000be8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000bf0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000cb0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000cb8] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000cc0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cc8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cd0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000cd8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ce0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ce8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000cf0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000bf8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000c00] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000c08] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c28] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000c30] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000c38] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000cf8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000d00] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d08] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000d20] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d28] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d30] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d38] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d40] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000d58] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000d60] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000d68] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000c40] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000c48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000c68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000c98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ca0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ca8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000cb0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 6562fa9..1bf7a68 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -5,10 +5,10 @@ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 370) -+-#define mc_filter_uv_b (rpi_shader + 584) -+-#define mc_exit (rpi_shader + 812) -+-#define mc_interrupt_exit8 (rpi_shader + 830) -+-#define mc_end (rpi_shader + 860) -++#define mc_filter_uv_b0 (rpi_shader + 324) -++#define mc_filter_uv_b (rpi_shader + 538) -++#define mc_exit (rpi_shader + 766) -++#define mc_interrupt_exit8 (rpi_shader + 784) -++#define mc_end (rpi_shader + 814) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 562dc35..8e4f18f 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -16,8 +16,8 @@ -+ # ra19 next ra17 -+ # -+ # rb16 pitch -+-# rb17 height + 5 -+-# rb18 height + 7 -++# rb17 height + 1 -++# rb18 height + 3 -+ # rb19 next ra16 -+ # -+ # ra20 1 -+@@ -214,8 +214,8 @@ mov r0, unif -+ shr r1, r0, r2 # Extract width -+ sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+ and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -++add rb17, r0, 1 -++add rb18, r0, 3 -+ shl r0, r0, 7 -+ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+@@ -230,18 +230,11 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -++ mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-asr rb12, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -283,26 +276,14 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+ add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+ mov ra12, ra13 -+ mov ra13, ra14 -+ -+-sub.setf -, r3, 8 ; mov r1, ra22 -++sub.setf -, r3, 4 ; mov r1, ra22 -+ -+ # apply horizontal filter -+ brr.anyn -, r:uvloop -+@@ -312,14 +293,10 @@ nop ; nop # Delay slot 3 (TODO move more of the context scr -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r1, ra14, rb14 -+-nop ; mul24 r0, ra13, rb13 -+-add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb15 -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ asr r1, r1, 14 -+-- -+2.7.4 -+ -+ -+From e4bdd110d4640519b751ab428e7976a1e9a15802 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:03:51 +0100 -+Subject: [PATCH 28/68] Optimised B0 pass -+ -+--- -+ libavcodec/rpi_shader.c | 424 +++++++++++++++++++++------------------------ -+ libavcodec/rpi_shader.h | 8 +- -+ libavcodec/rpi_shader.qasm | 43 +---- -+ 3 files changed, 212 insertions(+), 263 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index c8d0728..1f63ee0 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -204,239 +204,215 @@ unsigned int rpi_shader[] = { -+ /* [0x00000580] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+ /* [0x00000588] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+ /* [0x00000590] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000598] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000005a0] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000598] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000005a0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+ /* [0x000005a8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+ /* [0x000005b0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+ /* [0x000005b8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+ /* [0x000005c0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005c8] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x000005d0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005d8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005f0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005f8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000600] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000608] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000610] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000618] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000620] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000628] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000630] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000638] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000640] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000648] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000650] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000658] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000668] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000005c8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005d0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005f8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000600] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000608] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000610] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000618] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000620] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000628] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000670] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000678] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000680] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000688] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000690] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000698] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000006a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000006a8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000006b0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000006b8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000006c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000006c8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000006d0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000006d8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006e0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006e8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000006f0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006f8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000700] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000708] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000710] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000718] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000720] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000728] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000730] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000738] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000740] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000748] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000750] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000758] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000760] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000768] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000770] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000778] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000780] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000788] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000790] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000798] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000007a0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000007a8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000007b0] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x000007b8] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x000007c0] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x000007c8] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x000007d0] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x000007d8] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x000007e0] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x000007e8] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x000007f0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000007f8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000800] */ 0xfffffe50, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000808] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -+-/* [0x00000810] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000818] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000820] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000828] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000830] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000838] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000840] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000848] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000850] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000858] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000860] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000630] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000638] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000640] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000648] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000650] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000658] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000660] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000668] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000670] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000678] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000680] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000688] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000690] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000698] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006a0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006a8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000006b0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006b8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000006c0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006c8] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x000006d0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000006d8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000006e0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006e8] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x000006f0] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006f8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000700] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000708] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000710] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000718] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000720] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000728] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000730] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000738] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000740] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000748] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -++/* [0x00000750] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000758] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000760] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000768] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000770] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000778] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000780] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000788] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000790] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000798] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000007a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00000868] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000870] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000878] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000880] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000888] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000890] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000898] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000008a0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000008a8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000008b0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000008b8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000008c0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000008c8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000008d0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008d8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000008e0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000008e8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000008f0] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x000008f8] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000900] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000908] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000910] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000918] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000920] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000928] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000930] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000938] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000940] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000948] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000950] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000958] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000960] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000968] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000970] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000978] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000980] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000988] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000990] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000998] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009a0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009a8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000009b0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009b8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009c0] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000009c8] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x000009d0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000009d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000009e0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000007a8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000007b0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007c0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007c8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007d0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007d8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007e0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007e8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000007f0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007f8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000800] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000808] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000810] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000830] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000838] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000858] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000860] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000880] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -++/* [0x00000888] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000890] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000898] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000008b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000008d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000008f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000900] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000908] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -++/* [0x00000910] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000918] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000920] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000009e8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000009f0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000009f8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000a00] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000a08] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000a10] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000a18] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000a20] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000a28] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000a30] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000a38] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000a40] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000a48] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000a50] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000a58] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000a60] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000a68] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000a70] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000a78] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000a80] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00000a88] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00000a90] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00000a98] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00000aa0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00000aa8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00000ab0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00000ab8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000ac0] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000ac8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000ad0] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000ad8] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000ae0] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000ae8] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000af0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000af8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000b00] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000b08] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000b10] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000b18] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000b20] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000b28] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000b30] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000b38] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000b40] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000b48] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000b50] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000b58] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000b60] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000b68] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000b70] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000b78] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000b80] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000b88] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000b90] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000b98] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000ba0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000ba8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000bb0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000bb8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000bc0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000bc8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000bd0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000bd8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000be0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000be8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000bf0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000928] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000930] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000938] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000940] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000948] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000950] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000958] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000960] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000968] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000970] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000978] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000980] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000988] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000990] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000998] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000009a0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000009a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000009b0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000009b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000009c0] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x000009c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x000009d0] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x000009d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x000009e0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x000009e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x000009f0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x000009f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00000a00] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000a08] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000a10] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -++/* [0x00000a18] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00000a20] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00000a28] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00000a30] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000a38] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000a40] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -++/* [0x00000a48] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a50] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x00000a58] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x00000a60] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a68] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -++/* [0x00000a70] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -++/* [0x00000a78] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -++/* [0x00000a80] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -++/* [0x00000a88] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -++/* [0x00000a90] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -++/* [0x00000a98] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -++/* [0x00000aa0] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -++/* [0x00000aa8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000ab0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000ab8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000ac0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000ac8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000ad0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000ad8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000ae0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000ae8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000af0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000af8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000b00] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000b08] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000b10] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000b18] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000b20] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000b28] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000b30] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000bf8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000c00] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000c08] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c28] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000c30] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000c38] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b38] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000b40] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000b48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b68] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b70] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b78] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000c40] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000c48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000c68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000c98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ca0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ca8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000cb0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b80] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000b88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000b98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ba0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ba8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bb0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bb8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bc0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bc8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bd0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000bd8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000be0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000be8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000bf0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 1bf7a68..cb74887 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -6,9 +6,9 @@ extern unsigned int rpi_shader[]; -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+ #define mc_filter_uv_b0 (rpi_shader + 324) -+-#define mc_filter_uv_b (rpi_shader + 538) -+-#define mc_exit (rpi_shader + 766) -+-#define mc_interrupt_exit8 (rpi_shader + 784) -+-#define mc_end (rpi_shader + 814) -++#define mc_filter_uv_b (rpi_shader + 490) -++#define mc_exit (rpi_shader + 718) -++#define mc_interrupt_exit8 (rpi_shader + 736) -++#define mc_end (rpi_shader + 766) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 8e4f18f..faa5755 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -357,15 +357,13 @@ mov r0, unif -+ shr r1, r0, r2 # Extract width -+ sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+ and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -++add rb17, r0, 1 -++add rb18, r0, 3 -+ shl r0, r0, 7 -+ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+ add rb26, r0, rb27 -+ -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+ # get filter coefficients -+ -+ mov r0, unif -+@@ -373,18 +371,11 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -++ mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-asr rb12, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -426,26 +417,14 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+ add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+ mov ra12, ra13 -+ mov ra13, ra14 -+ -+-sub.setf -, r3, 8 ; mov r1, ra22 -++sub.setf -, r3, 4 ; mov r1, ra22 -+ -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b0 -+@@ -455,18 +434,12 @@ nop ; nop # Delay slot 3 (TODO move more of the context scr -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r1, ra14, rb14 -+-nop ; mul24 r0, ra13, rb13 -+-add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb15 -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-#asr r1, r1, 14 -+-#add r1, r1, ra21 -+ brr.anyn -, r:uvloop_b0 -+ asr vpm, r1, 14 # Delay 1 shifts down by shift2=6, but results are still in 16bit precision TODO may be able to avoid the mul24 and use more delay slots -+ nop # Delay 2 -+-- -+2.7.4 -+ -+ -+From 93805e78a13d36e28ed84a0e8456da2eac45be89 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:12:43 +0100 -+Subject: [PATCH 29/68] Optimised B pass -+ -+--- -+ libavcodec/rpi_shader.c | 202 ++++++++++++++++++++------------------------- -+ libavcodec/rpi_shader.h | 6 +- -+ libavcodec/rpi_shader.qasm | 41 ++------- -+ 3 files changed, 100 insertions(+), 149 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 1f63ee0..4e6c5ea 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -289,8 +289,8 @@ unsigned int rpi_shader[] = { -+ /* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+ /* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+ /* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000830] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000838] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000830] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000838] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+ /* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+ /* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+ /* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+@@ -299,120 +299,96 @@ unsigned int rpi_shader[] = { -+ /* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+ /* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+ /* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000880] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000888] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000890] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000898] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000008b0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b8] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c8] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000008d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000008f0] */ 0x4f5971c6, 0x100253e0, // asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008f8] */ 0x4f5971c6, 0x100253a0, // asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000900] */ 0x4f5971c6, 0x10025360, // asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000908] */ 0x0f9d71c0, 0x10021327, // asr rb12, r0, rb23 -+-/* [0x00000910] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000918] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000920] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000880] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000888] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000890] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000898] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000008a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008b0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000008d0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008e0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000928] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000930] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000938] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000940] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000948] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000950] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000958] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000960] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000968] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000970] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000978] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000980] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000988] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000990] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000998] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000009a0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000009a8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000009b0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000009b8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000009c0] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x000009c8] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x000009d0] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x000009d8] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x000009e0] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x000009e8] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x000009f0] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x000009f8] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00000a00] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000a08] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000a10] */ 0x15267d80, 0x10020227, // mov ra8, ra9 -+-/* [0x00000a18] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00000a20] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00000a28] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00000a30] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000a38] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000a40] */ 0x8d5887f6, 0xd00269e1, // sub.setf -, r3, 8 ; mov r1, ra22 -+-/* [0x00000a48] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a50] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000a58] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000a60] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a68] */ 0x4038e037, 0x100049e1, // nop ; mul24 r1, ra14, rb14 -+-/* [0x00000a70] */ 0x4034d037, 0x100049e0, // nop ; mul24 r0, ra13, rb13 -+-/* [0x00000a78] */ 0x4c30c237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-/* [0x00000a80] */ 0x4c2cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-/* [0x00000a88] */ 0x4c28a237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-/* [0x00000a90] */ 0x4c249237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-/* [0x00000a98] */ 0x4c208237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-/* [0x00000aa0] */ 0x4c3cf237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb15 -+-/* [0x00000aa8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000ab0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000ab8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000ac0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000ac8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000ad0] */ 0xfffffe38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000ad8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000ae0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000ae8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000af0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000af8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000b00] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000b08] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000b10] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000b18] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000b20] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000b28] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000b30] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008e8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008f0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000008f8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000900] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000908] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000910] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000918] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000920] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000928] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000930] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000938] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000940] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000948] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000950] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000958] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000960] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000968] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000970] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000978] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000980] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000988] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000990] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000998] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009a0] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x000009a8] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009b0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000009b8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000009c0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000009c8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009d0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009d8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009e0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000a00] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000a08] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000a10] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a18] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a20] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a28] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a30] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a38] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a40] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a48] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a50] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a60] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000b38] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000b40] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000b48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b68] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b70] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000b78] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a78] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a80] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000aa0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ab0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000b80] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000b88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000b98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ba0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ba8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bb0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bb8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bc0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bc8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bd0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000bd8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000be0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000be8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000bf0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ac0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ae0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b10] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b18] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b20] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b28] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b30] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index cb74887..53da629 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -7,8 +7,8 @@ extern unsigned int rpi_shader[]; -+ #define mc_filter_uv (rpi_shader + 152) -+ #define mc_filter_uv_b0 (rpi_shader + 324) -+ #define mc_filter_uv_b (rpi_shader + 490) -+-#define mc_exit (rpi_shader + 718) -+-#define mc_interrupt_exit8 (rpi_shader + 736) -+-#define mc_end (rpi_shader + 766) -++#define mc_exit (rpi_shader + 670) -++#define mc_interrupt_exit8 (rpi_shader + 688) -++#define mc_end (rpi_shader + 718) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index faa5755..f38c926 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -491,8 +491,8 @@ mov r0, unif -+ shr r1, r0, r2 # Extract width -+ sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+ and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -++add rb17, r0, 1 -++add rb18, r0, 3 -+ shl r0, r0, 7 -+ -+ # r0 is currently height<<7 -+@@ -508,8 +508,6 @@ add rb26, r0, rb27 -+ # In a B frame, so also set up VPM read (reading back 16bit precision) -+ add vr_setup, r3, rb21 -+ -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+ # get filter coefficients -+ -+ mov r0, unif -+@@ -517,18 +515,11 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -++ mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23; mov r0, unif -+-asr rb15, r0, rb23; mul24 r0, r0, ra22 -+-asr rb14, r0, rb23; mul24 r0, r0, ra22 -+-asr rb13, r0, rb23; mul24 r0, r0, ra22 -+-asr rb12, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -570,26 +561,14 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+ add r0, r2, r3 -+ -+ mov r3, rb31 -+ -+-mov ra8, ra9 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+ mov ra12, ra13 -+ mov ra13, ra14 -+ -+-sub.setf -, r3, 8 ; mov r1, ra22 -++sub.setf -, r3, 4 ; mov r1, ra22 -+ # apply horizontal filter -+ brr.anyn -, r:uvloop_b -+ mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+@@ -598,14 +577,10 @@ nop ; nop # TODO improve use of delay slots -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r1, ra14, rb14 -+-nop ; mul24 r0, ra13, rb13 -+-add r1, r1, r0 ; mul24 r0, ra12, rb12 -+-add r1, r1, r0 ; mul24 r0, ra11, rb11 -+-add r1, r1, r0 ; mul24 r0, ra10, rb10 -+-add r1, r1, r0 ; mul24 r0, ra9, rb9 -+-add r1, r1, r0 ; mul24 r0, ra8, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb15 -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ asr r1, r1, 14 # shift2=6 -+-- -+2.7.4 -+ -+ -+From e48df43c16de74dddbc7c702d64dd01eaf8e6b39 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:17:09 +0100 -+Subject: [PATCH 30/68] Used P delay slots more efficiently -+ -+--- -+ libavcodec/rpi_shader.c | 437 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 10 +- -+ libavcodec/rpi_shader.qasm | 19 +- -+ 3 files changed, 228 insertions(+), 238 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 4e6c5ea..a1af4e3 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -156,239 +156,236 @@ unsigned int rpi_shader[] = { -+ /* [0x00000408] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ /* [0x00000410] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ /* [0x00000418] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000420] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000428] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000430] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000420] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000428] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000430] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+ /* [0x00000438] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000440] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x00000448] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000450] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000458] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000460] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000468] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000470] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000478] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000480] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000488] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000490] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000498] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000004a0] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x000004a8] */ 0xfffffec0, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004b0] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x000004b8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004c0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000004c8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000004d0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004d8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000004e0] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000004e8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000004f0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000004f8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000500] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000508] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000440] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000448] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000450] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000458] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000460] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000468] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000470] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000478] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000480] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000488] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000490] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000498] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x000004a0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004a8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000004b0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004b8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004c0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004c8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004d0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004d8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004e0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000004e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x00000510] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000518] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000520] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000528] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000530] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000538] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000540] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000548] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000550] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000558] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000560] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000568] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000570] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000578] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000580] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000588] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000590] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000598] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000005a0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000005a8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000005b0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000005b8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005c0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005c8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005d0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005d8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005f8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000600] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000608] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000610] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000618] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000620] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000628] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000004f8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000500] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000508] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000510] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000518] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000520] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000528] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000530] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000538] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000540] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000548] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000550] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000558] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000560] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000568] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000570] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000578] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000580] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000588] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000590] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000598] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000005a0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005a8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000005b0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005b8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005d8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000600] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000608] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000610] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000630] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000638] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000640] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000648] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000650] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000658] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000660] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000668] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000670] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000678] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000680] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000688] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000690] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000698] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006a0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006a8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000006b0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006b8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000006c0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000006c8] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x000006d0] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000006d8] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000006e0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000006e8] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x000006f0] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006f8] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x00000700] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x00000708] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000710] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000718] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000720] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000728] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000730] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000738] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000740] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000748] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -+-/* [0x00000750] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000758] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000760] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000768] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000770] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000778] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000780] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000788] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000790] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000798] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000007a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000618] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000620] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000628] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000630] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000638] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000640] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000648] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000650] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000658] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000660] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000668] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000670] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000678] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000680] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000688] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000690] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000698] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006a0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000006a8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006b0] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x000006b8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x000006c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x000006c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006d0] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x000006d8] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006e0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000006e8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000006f0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000006f8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000700] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000708] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000710] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000718] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000720] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000728] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000730] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -++/* [0x00000738] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000740] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000748] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000750] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000758] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000760] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000768] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000770] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000778] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000780] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000788] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x000007a8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000007b0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007c0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007c8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007d0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007d8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007e0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007e8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000007f0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007f8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000800] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000808] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000810] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000830] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000838] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000858] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000860] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000880] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000888] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000890] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000898] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000008a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008b0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000008d0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008e0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000790] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000798] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007a0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007a8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007b0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007b8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007c0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007c8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007d0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000007d8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007e0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000007e8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007f0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000007f8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000800] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000808] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000810] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000818] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000820] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000828] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000830] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000838] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000840] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000848] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000850] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000858] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000860] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000868] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000870] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000878] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000880] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000888] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000890] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000898] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000008b8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008c8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008e8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008f0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000008f8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000900] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000908] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000910] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000918] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000920] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000928] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000930] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000938] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000940] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000948] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000950] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000958] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000960] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000968] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000970] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000978] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000980] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000988] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000990] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000998] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009a0] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x000009a8] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009b0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000009b8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000009c0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000009c8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009d0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009d8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009e0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000a00] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000a08] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000a10] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a18] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a20] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a28] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a30] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a38] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a40] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a48] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a50] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a60] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008d0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008d8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000008e0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000008e8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000008f0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000008f8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000900] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000908] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000910] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000918] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000920] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000928] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000930] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000938] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000940] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000948] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000950] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000958] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000960] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000968] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -++/* [0x00000970] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -++/* [0x00000978] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00000980] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000988] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -++/* [0x00000990] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000998] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -++/* [0x000009a0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -++/* [0x000009a8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000009b0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009b8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009c0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009c8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000009e8] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x000009f0] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x000009f8] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a00] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a08] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a10] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a18] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a20] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a28] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a30] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a38] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a40] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a48] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a50] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a58] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a78] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a80] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a60] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a68] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a70] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000aa0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ab0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a90] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a98] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000aa0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000ac0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000aa8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ab0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ae0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b10] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b18] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b20] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b28] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b30] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b08] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b10] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b18] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 53da629..1fb3e37 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -5,10 +5,10 @@ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 324) -+-#define mc_filter_uv_b (rpi_shader + 490) -+-#define mc_exit (rpi_shader + 670) -+-#define mc_interrupt_exit8 (rpi_shader + 688) -+-#define mc_end (rpi_shader + 718) -++#define mc_filter_uv_b0 (rpi_shader + 318) -++#define mc_filter_uv_b (rpi_shader + 484) -++#define mc_exit (rpi_shader + 664) -++#define mc_interrupt_exit8 (rpi_shader + 682) -++#define mc_end (rpi_shader + 712) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index f38c926..02e95dd 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -268,6 +268,7 @@ add t0s, ra_x2_base, r2 -+ -+ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -++# apply horizontal filter -+ nop ; mul24 r2, r0, ra0 -+ nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+ nop ; mul24 r3, ra1 << 1, r0 << 1 -+@@ -276,20 +277,12 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 4 ; mov r1, ra22 -+- -+-# apply horizontal filter -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 4 ; mov ra12, ra13 -+ brr.anyn -, r:uvloop -+-mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -+-asr ra15, r0, 8 ; nop -+-nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -+ -+ # apply vertical filter and write to VPM -+ -+-- -+2.7.4 -+ -+ -+From b33dfc243ff5509299685add3c532ab7f207fd73 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:22:25 +0100 -+Subject: [PATCH 31/68] Improved use of delay slots -+ -+--- -+ libavcodec/rpi_shader.c | 503 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 10 +- -+ libavcodec/rpi_shader.qasm | 41 ++-- -+ 3 files changed, 265 insertions(+), 289 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index a1af4e3..c498f28 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -122,270 +122,263 @@ unsigned int rpi_shader[] = { -+ /* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+ /* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+ /* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000318] */ 0x0d9c8e40, 0xd00229e7, // sub.setf -,8,r1 -+-/* [0x00000320] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000328] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000340] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000348] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000350] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000360] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000368] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000370] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000378] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000380] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000340] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000348] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000360] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000368] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000370] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000378] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000388] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000390] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000398] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003d0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000003f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000003f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000400] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000408] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000410] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000418] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000420] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000428] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000430] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000438] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000440] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000448] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000450] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000458] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000460] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000468] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000470] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000478] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000480] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000488] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000490] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000498] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x000004a0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004a8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000004b0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000004b8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004c0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000004c8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000004d0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000004d8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000004e0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000004e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000380] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000388] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000390] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000398] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003a0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003a8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003b8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003c0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003c8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000003e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000003f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000003f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000400] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000408] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000410] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000418] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000420] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000428] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000430] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000438] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000440] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000448] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000450] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000458] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000460] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000468] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000470] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000478] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000480] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000488] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000490] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000498] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004a0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000004a8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004b0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004b8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004c0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004c8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004d0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004d8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000004e0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004e8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000004f8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000500] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000508] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000510] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000518] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000520] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000528] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000530] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000538] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000540] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000548] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000550] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000558] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000560] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000568] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000570] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000578] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000580] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000588] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000590] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000598] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000005a0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005a8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005b0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005b8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005d0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005d8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000600] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000608] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000610] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000004f0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000004f8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000500] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000508] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000510] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000518] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000520] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000528] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000530] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000538] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000540] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000548] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000550] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000558] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000560] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000568] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000570] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000578] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000580] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000588] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000590] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000598] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005a0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000005a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005b0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005b8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005d0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005d8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005e8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005f0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000005f8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000600] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000608] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000618] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000620] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000628] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000630] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000638] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000640] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000648] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000650] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000658] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000660] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000668] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000670] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000678] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000680] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000688] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000690] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000698] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006a0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000006a8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000006b0] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x000006b8] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x000006c0] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x000006c8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000006d0] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x000006d8] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006e0] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000006e8] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000006f0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000006f8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000700] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000708] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000710] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000718] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000720] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000728] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000730] */ 0x0f9ce3c0, 0xd0020c27, // asr vpm, r1, 14 -+-/* [0x00000738] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000740] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000748] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000750] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000758] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000760] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000768] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000770] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000778] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000780] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000788] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000610] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000618] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000620] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000628] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000630] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000638] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000640] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000648] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000650] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000658] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000668] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000670] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000678] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000680] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000688] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000690] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000698] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000006a0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006a8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x000006b0] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x000006b8] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006c0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006c8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000006d0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000006d8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000006e0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000006e8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000006f0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000006f8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000700] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000708] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000710] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000718] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000720] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000728] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000730] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000738] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000740] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000748] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000750] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000758] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000760] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000768] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b -+-/* [0x00000790] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000798] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007a0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007a8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007b0] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007b8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007c0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007c8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007d0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000007d8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007e0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000007e8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000007f0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000007f8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000800] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000808] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000810] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000818] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000820] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000828] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000830] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000838] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000840] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000848] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000850] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000858] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000860] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000868] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000870] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000878] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000880] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000888] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000890] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000898] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000008b8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008c8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000770] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000778] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000780] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000788] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000790] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000798] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007a0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007a8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007b0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000007b8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007c0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000007c8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007d0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000007d8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007e0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000007e8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000007f0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000007f8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000800] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000808] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000810] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000818] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000820] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000828] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000830] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000838] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000840] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000848] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000850] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000858] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000860] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000868] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000870] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000878] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000880] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000888] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000890] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000898] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008a0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008a8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008d0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008d8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000008e0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000008e8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000008f0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000008f8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000900] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000908] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000910] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000918] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000920] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000928] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000930] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000938] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000940] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000948] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000950] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000958] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000960] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000968] */ 0x0c9e74c0, 0x10020827, // add r0, r2, r3 -+-/* [0x00000970] */ 0x159dffc0, 0x100208e7, // mov r3, rb31 -+-/* [0x00000978] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00000980] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000988] */ 0x8d5847f6, 0xd00269e1, // sub.setf -, r3, 4 ; mov r1, ra22 -+-/* [0x00000990] */ 0xffffff20, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000998] */ 0x553e7d81, 0x100243a0, // mov ra14, ra15 ; mul24 r0, r0, r1 -+-/* [0x000009a0] */ 0x0f9c81c0, 0xd00203e7, // asr ra15, r0, 8 ; nop -+-/* [0x000009a8] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x000009b0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009b8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009c0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009c8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000009e8] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x000009f0] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x000009f8] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a00] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a08] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a10] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a18] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a20] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a28] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a30] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a38] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a40] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a48] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a50] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a58] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008b0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008b8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000008c0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000008c8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000008d0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000008d8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000008e0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000008e8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000008f0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000008f8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000900] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000908] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000910] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000918] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000920] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000928] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000930] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000938] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000940] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000948] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000950] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000958] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000960] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000968] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000970] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000978] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000980] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000988] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000990] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000998] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009a0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009a8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000009b0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x000009b8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x000009c0] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009c8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x000009d0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000009d8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000009e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000009e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a08] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a10] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a18] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a20] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a60] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a68] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000a70] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a28] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a30] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a38] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a40] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a58] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a60] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a68] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_interrupt_exit8 -++/* [0x00000a70] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+ /* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a90] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a98] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000aa0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-// ::mc_interrupt_exit8 -+-/* [0x00000aa8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000ab0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b08] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b10] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b18] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000aa0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000aa8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ab0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ab8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ac0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ac8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ad0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ad8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000ae0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 1fb3e37..3fac45f 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -5,10 +5,10 @@ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 318) -+-#define mc_filter_uv_b (rpi_shader + 484) -+-#define mc_exit (rpi_shader + 664) -+-#define mc_interrupt_exit8 (rpi_shader + 682) -+-#define mc_end (rpi_shader + 712) -++#define mc_filter_uv_b0 (rpi_shader + 316) -++#define mc_filter_uv_b (rpi_shader + 476) -++#define mc_exit (rpi_shader + 650) -++#define mc_interrupt_exit8 (rpi_shader + 668) -++#define mc_end (rpi_shader + 698) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 02e95dd..10f5113 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -221,8 +221,6 @@ add r0, r0, r1 # Combine width and height of destination area -+ shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+ add rb26, r0, rb27 -+ -+-sub.setf -,8,r1 # 8-r1, so if <0 (negative) we need to use the full code -+- -+ # get filter coefficients -+ -+ mov r0, unif -+@@ -410,20 +408,12 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 4 ; mov r1, ra22 -+- -+-# apply horizontal filter -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 4 ; mov ra12, ra13 -+ brr.anyn -, r:uvloop_b0 -+-mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll -+-asr ra15, r0, 8 ; nop # TODO isn't ra15 already in 24bit precision, may not need the sign extension here? -+-nop ; nop # Delay slot 3 (TODO move more of the context scroll into here) -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -+ -+ # apply vertical filter and write to VPM -+ -+@@ -432,9 +422,9 @@ nop ; mul24 r0, ra13, rb9 -+ add r1, r1, r0 ; mul24 r0, ra12, rb8 -+ add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++sub.setf -, r3, rb18 -+ brr.anyn -, r:uvloop_b0 -+-asr vpm, r1, 14 # Delay 1 shifts down by shift2=6, but results are still in 16bit precision TODO may be able to avoid the mul24 and use more delay slots -++asr vpm, r1, 6 # Delay 1 shifts down by shift2=6, but results are still in 16bit precision -+ nop # Delay 2 -+ nop # Delay 3 -+ -+@@ -554,19 +544,12 @@ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r0, r2, r3 -+- -+-mov r3, rb31 -+- -+-mov ra12, ra13 -+-mov ra13, ra14 -+- -+-sub.setf -, r3, 4 ; mov r1, ra22 -+-# apply horizontal filter -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 4 ; mov ra12, ra13 -+ brr.anyn -, r:uvloop_b -+-mov ra14, ra15 ; mul24 r0, r0, r1 # last bit of context scroll, including clamp to zero -+-asr ra15, r0, 8 ; nop -+-nop ; nop # TODO improve use of delay slots -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -+ -+ # apply vertical filter and write to VPM -+ -+-- -+2.7.4 -+ -+ -+From af59f8e00eb977e97debc5e72ba47e0077db1787 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:31:23 +0100 -+Subject: [PATCH 32/68] Avoid writeback of first B results -+ -+--- -+ libavcodec/rpi_shader.c | 229 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 8 +- -+ libavcodec/rpi_shader.qasm | 18 +--- -+ 3 files changed, 121 insertions(+), 134 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index c498f28..ba453a2 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -255,130 +255,125 @@ unsigned int rpi_shader[] = { -+ /* [0x00000710] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+ /* [0x00000718] */ 0x009e7000, 0x100009e7, // nop -+ /* [0x00000720] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000728] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000730] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000738] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000740] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000748] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000750] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000758] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000760] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000768] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000728] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000730] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000738] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000740] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x00000770] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000778] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000780] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000788] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000790] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000798] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007a0] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007a8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007b0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000007b8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007c0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000007c8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000007d0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000007d8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007e0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000007e8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000007f0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000007f8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000800] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000808] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000810] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000818] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000820] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000828] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000830] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000838] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000840] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000748] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000750] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000758] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000760] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000768] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000770] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000778] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000780] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000788] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000790] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000798] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000007a0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000007b0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000007c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000007c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000007d0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000007d8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000007e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000007e8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000007f0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000007f8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000800] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000808] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000810] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000818] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000820] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000828] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000830] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000838] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000840] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+ /* [0x00000848] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000850] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000858] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000860] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000868] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000870] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000878] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000880] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000888] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000890] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000898] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008a0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008a8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000850] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000858] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000860] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000868] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000870] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000878] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000880] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008b0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008b8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000008c0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000008c8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000008d0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000008d8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000008e0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000008e8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000008f0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000008f8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000900] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000908] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000910] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000918] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000920] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000928] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000930] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000938] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000940] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000948] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000950] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000958] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000960] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000968] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000970] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000978] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000980] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000988] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000990] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000998] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009a0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009a8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000009b0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x000009b8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x000009c0] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009c8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x000009d0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000009d8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000009e0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000009e8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009f0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000009f8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a08] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a10] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a18] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a20] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000888] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000890] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000898] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000008a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000008a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000008b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000008b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000008c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000008c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000008d0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000008e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000008f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000008f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000900] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000908] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000910] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000918] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000920] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000928] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000930] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000938] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000940] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000948] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000950] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000958] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000960] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000968] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000970] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000978] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000980] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000988] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000990] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000998] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009a0] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x000009a8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000009b0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000009b8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000009c0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009c8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009d0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000009e0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000009e8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000009f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a28] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a30] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000a38] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a40] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a48] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a58] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a60] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a68] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a08] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a30] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a38] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a40] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000a70] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a48] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a68] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000a98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000aa0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000aa8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ab0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ab8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ac0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ac8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ad0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ad8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000ae0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ab0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 3fac45f..45dbe0e 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -6,9 +6,9 @@ extern unsigned int rpi_shader[]; -+ #define mc_setup_uv (rpi_shader + 0) -+ #define mc_filter_uv (rpi_shader + 152) -+ #define mc_filter_uv_b0 (rpi_shader + 316) -+-#define mc_filter_uv_b (rpi_shader + 476) -+-#define mc_exit (rpi_shader + 650) -+-#define mc_interrupt_exit8 (rpi_shader + 668) -+-#define mc_end (rpi_shader + 698) -++#define mc_filter_uv_b (rpi_shader + 466) -++#define mc_exit (rpi_shader + 640) -++#define mc_interrupt_exit8 (rpi_shader + 658) -++#define mc_end (rpi_shader + 688) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 10f5113..e138c95 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -428,22 +428,14 @@ asr vpm, r1, 6 # Delay 1 shifts down by shift2=6, but results are still -+ nop # Delay 2 -+ nop # Delay 3 -+ -++# in pass0 we don't really need to save any results, but need to discard the uniforms -+ # DMA out for U -+ -+-mov vw_setup, rb26 # VDW setup 0 -+-mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW # TODO in pass0 we don't need to save any results -+- -+-# DMA out for V -+-# We need to wait for the U to complete first, but have nothing useful to compute while we wait. -+-# Could potentially push this write into the start of the next pipeline stage. -+-mov r0, 16 -+-mov -, vw_wait -+- -+ bra -, ra31 -+-add vw_setup, rb26, r0 # VDW setup 0 -+-mov vw_setup, rb29 # Stride -+-mov vw_addr, unif # start the VDW -++mov r0, unif # Delay 1 -++mov r0, unif # Delay 2 -++nop # Delay 3 -++ -+ -+ ################################################################################ -+ -+-- -+2.7.4 -+ -+ -+From 12e57278cb19a769d2e1488e8e94003027493d09 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 14 May 2015 11:36:24 +0100 -+Subject: [PATCH 33/68] Cutdown size of chroma prediction commands -+ -+--- -+ libavcodec/hevc.c | 17 +- -+ libavcodec/rpi_shader.c | 543 ++++++++++++++++++++++----------------------- -+ libavcodec/rpi_shader.h | 12 +- -+ libavcodec/rpi_shader.qasm | 11 +- -+ 4 files changed, 281 insertions(+), 302 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index a47ebc5..32b89d5 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -56,7 +56,7 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ -+ #ifdef RPI_INTER_QPU -+ -+-#define RPI_CHROMA_COMMAND_WORDS 12 -++#define RPI_CHROMA_COMMAND_WORDS 10 -+ #define UV_COMMANDS_PER_QPU ((1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS) -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+@@ -2032,11 +2032,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+- u++; -+ *u++ = rpi_filter_coefs[_my][0]; -+- u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2091,9 +2088,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+- u++; -+ *u++ = rpi_filter_coefs[_my][0]; -+- u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2154,11 +2149,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+ *u++ = ( (nPbW_cframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); // TODO this will become unused once we have a dedicated pass0 filter -+- *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ u+=2; // Intermediate results are not written back in first pass of B filtering -+ -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 1 + start_x; -+@@ -2166,11 +2158,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+ *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx2][0]; -+- u++; -+ *u++ = rpi_filter_coefs[_my2][0]; -+- u++; -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2808,7 +2797,7 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = pic_height; -+ *s->u_mvs[i]++ = s->frame->linesize[1]; -+ *s->u_mvs[i]++ = s->frame->linesize[2]; -+- s->u_mvs[i] += 3; // Padding words -++ s->u_mvs[i] += 1; // Padding words -+ } -+ } -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index ba453a2..b0b93b5 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -89,291 +89,286 @@ unsigned int rpi_shader[] = { -+ /* [0x00000200] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+ /* [0x00000208] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+ /* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000218] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000220] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000228] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000230] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000238] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000240] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000248] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000250] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000258] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000218] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000220] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000228] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000230] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000238] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000240] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000248] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000268] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000270] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000278] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000280] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000288] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000290] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000298] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000002a0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000002a8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002b0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002b8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002c0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002c8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002e8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002f0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000340] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000348] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000360] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000368] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000370] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000378] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000258] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000260] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000268] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000270] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000278] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000280] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000288] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000290] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000298] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002a0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002a8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002b0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002b8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002c0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002c8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002d0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002d8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002e0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002e8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002f0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002f8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000300] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000330] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000340] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000350] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000358] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000360] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000380] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000388] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000390] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000398] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003a0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003a8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003b8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003c0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003c8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000003e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000003f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000003f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000400] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000408] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000410] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000418] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000420] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000428] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000430] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000438] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000440] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000448] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000450] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000458] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000460] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000468] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000470] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000478] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000480] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000488] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000490] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000498] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004a0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000004a8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000004b0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004b8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000004c0] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000004c8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000004d0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000004d8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000004e0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004e8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000368] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000370] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000378] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000380] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000388] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000390] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000398] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003a0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003a8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000003b0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000003b8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003c0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003c8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000003d0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000003d8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000003e0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000003e8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000003f0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000003f8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000400] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000408] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000410] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000418] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000420] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000428] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000430] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000438] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000440] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000448] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000450] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000458] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000460] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000468] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -++/* [0x00000470] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000478] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00000480] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000488] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000490] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000498] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004a8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004b0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004b8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004c0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000004c8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004d0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000004f0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000004f8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000500] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000508] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000510] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000518] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000520] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000528] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000530] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000538] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000540] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000548] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000550] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000558] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000560] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000568] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000570] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000578] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000580] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000588] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000590] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000598] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005a0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005b0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005b8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005d0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005d8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005e8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005f0] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000005f8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000600] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000608] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000004d8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000004e0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000004e8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000004f0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000004f8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000500] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000508] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000510] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000518] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000520] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000528] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000530] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000538] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000540] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000548] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000550] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000558] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000560] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000568] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000570] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000578] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000580] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000588] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000590] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000598] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005a0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005a8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005b0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005b8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000005d8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000005e0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000005e8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000610] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000618] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000620] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000628] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000630] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000638] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000640] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000648] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000650] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000658] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000668] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000670] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000678] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000680] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000688] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000690] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000698] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000006a0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000006a8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x000006b0] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x000006b8] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006c0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000006c8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000006d0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000006d8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000006e0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000006e8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000006f0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000006f8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000700] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x00000708] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000710] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x00000718] */ 0x009e7000, 0x100009e7, // nop -++/* [0x000005f0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000005f8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000600] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000608] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000610] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000618] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000620] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000628] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000630] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000638] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000640] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000648] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000650] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000658] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000660] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000668] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000670] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000678] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000680] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000688] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000690] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000698] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006a0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006a8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000006b0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000006b8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000006c0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000006c8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000006d0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000006d8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000006e0] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x000006e8] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006f0] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x000006f8] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000700] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000708] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000710] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000718] */ 0x15827d80, 0x10020827, // mov r0, unif -+ /* [0x00000720] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000728] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000730] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000738] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000740] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x00000748] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000750] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000758] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000760] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000768] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000770] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000778] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000780] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000788] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000790] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000798] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000007a0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000007a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000007b0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000007c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000007c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000007d0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000007d8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000007e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000007e8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x000007f0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x000007f8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000800] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000808] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000810] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000818] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000820] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000828] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000830] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000838] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000840] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000848] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000850] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000858] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000860] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000868] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000870] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000878] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000880] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000728] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000730] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000738] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000740] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000748] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000750] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000758] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000760] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000768] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000770] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000778] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000780] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000788] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000790] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000798] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000007a0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000007a8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000007b0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000007b8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000007c0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000007c8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000007d0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000007d8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x000007e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000007e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000007f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000007f8] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000800] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000808] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000810] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000818] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000820] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000828] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000830] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000838] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000840] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000848] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000850] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000858] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000888] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000890] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000898] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000008a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000008a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000008b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000008b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000008c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000008c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000008d0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000008e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000008f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000008f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000900] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000908] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000910] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000918] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000920] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000928] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000930] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000938] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000940] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000948] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000950] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000958] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000960] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000968] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000970] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000978] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000980] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000988] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000990] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000998] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009a0] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x000009a8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000009b0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000009b8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000009c0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009c8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000009d0] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000009e0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000009e8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000009f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000860] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000868] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000870] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000878] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000880] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000888] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000890] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000898] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000008a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000008a8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000008b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000008c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000008c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000008d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000008d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000008e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000008e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000008f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000008f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000900] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000908] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000910] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000918] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000920] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000928] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000930] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000938] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000940] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000948] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000950] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000958] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000960] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000968] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000970] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000978] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000980] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000988] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000990] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000998] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009a8] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000009b0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000009b8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000009c0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000009c8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009d0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a08] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000a10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a18] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a30] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a38] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a40] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000009e0] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x000009e8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000009f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x000009f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a00] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a08] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a10] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a18] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000a48] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a58] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a68] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a20] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a30] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a38] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a40] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a58] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a60] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000a70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000a78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000aa0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ab0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a80] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a88] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000a90] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 45dbe0e..99927c4 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,11 +4,11 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 316) -+-#define mc_filter_uv_b (rpi_shader + 466) -+-#define mc_exit (rpi_shader + 640) -+-#define mc_interrupt_exit8 (rpi_shader + 658) -+-#define mc_end (rpi_shader + 688) -++#define mc_filter_uv (rpi_shader + 148) -++#define mc_filter_uv_b0 (rpi_shader + 310) -++#define mc_filter_uv_b (rpi_shader + 458) -++#define mc_exit (rpi_shader + 630) -++#define mc_interrupt_exit8 (rpi_shader + 648) -++#define mc_end (rpi_shader + 678) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index e138c95..d9ffcda 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -167,8 +167,6 @@ add t0s, r2, r1 -+ -+ # Dump padding words -+ mov r0, unif -+-mov r0, unif -+-mov r0, unif -+ -+ # submit texture requests for second line -+ max r1, ra_y, 0 -+@@ -228,11 +226,10 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+- mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -++asr rb8, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -362,11 +359,10 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+- mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -++asr rb8, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+@@ -490,11 +486,10 @@ asr ra3, r0, rb23; mul24 r0, r0, ra22 -+ asr ra2, r0, rb23; mul24 r0, r0, ra22 -+ asr ra1, r0, rb23; mul24 r0, r0, ra22 -+ asr ra0, r0, rb23; mov r0, unif -+- mov r0, unif -+ asr rb11, r0, rb23; mul24 r0, r0, ra22 -+ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -++asr rb8, r0, rb23 -+ -+ # r2 is elem_num -+ # r3 is loop counter -+-- -+2.7.4 -+ -+ -+From 3e8f02cf9d3e4bfcd07a5fcf321ace07c4f2e6f3 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 15:21:49 +0100 -+Subject: [PATCH 34/68] hevc: don't redirect when not rpi_enabled -+ -+--- -+ libavcodec/hevc.c | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 32b89d5..2459e34 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -1468,7 +1468,7 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size) -+ */ -+ -+ #ifdef RPI_INTER -+-#define RPI_REDIRECT(fn) rpi_ ## fn -++#define RPI_REDIRECT(fn) (s->enable_rpi ? rpi_ ## fn : fn) -+ static void rpi_luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref, const Mv *mv, int x_off, int y_off, -+ int block_w, int block_h, int luma_weight, int luma_offset) -+-- -+2.7.4 -+ -+ -+From 6da455b382b28c3c1f4e98c1703a695cdb946ad3 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 15:22:02 +0100 -+Subject: [PATCH 35/68] Use /dev/vcio for mailbox access -+ -+--- -+ libavcodec/rpi_mailbox.c | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/libavcodec/rpi_mailbox.c b/libavcodec/rpi_mailbox.c -+index 536896f..77a56dd 100644 -+--- a/libavcodec/rpi_mailbox.c -++++ b/libavcodec/rpi_mailbox.c -+@@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+ #define MAJOR_NUM 100 -+ #define IOCTL_MBOX_PROPERTY _IOWR(MAJOR_NUM, 0, char *) -+-#define DEVICE_FILE_NAME "/dev/char_dev" -++#define DEVICE_FILE_NAME "/dev/vcio" -+ -+ #include "rpi_mailbox.h" -+ -+-- -+2.7.4 -+ -+ -+From f96ef6131f16a4c03b8e2882bdf7319c3b646a6c Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 15:25:25 +0100 -+Subject: [PATCH 36/68] Use vcsm for all memory allocations -+ -+--- -+ libavcodec/rpi_qpu.c | 174 +++++++++++++++++++-------------------------------- -+ 1 file changed, 64 insertions(+), 110 deletions(-) -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 60bf079..f62051f 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -1,7 +1,5 @@ -+ #ifdef RPI -+-// define RPI_USE_VCSM to use the vcsm device for shared memory -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+-#define RPI_USE_VCSM -+ // define RPI_TIME_TOTAL_QPU to print out how much time is spent in the QPU code -+ #define RPI_TIME_TOTAL_QPU -+ // define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -+@@ -25,9 +23,7 @@ -+ #include "rpi_shader.h" -+ #include "rpi_hevc_transform.h" -+ -+-#ifdef RPI_USE_VCSM -+ #include "rpi_user_vcsm.h" -+-#endif -+ -+ // On Pi2 there is no way to access the VPU L2 cache -+ // GPU_MEM_FLG should be 4 for uncached memory. (Or C for alias to allocate in the VPU L2 cache) -+@@ -96,7 +92,6 @@ struct GPU -+ unsigned int vpu_code[VPU_CODE_SIZE]; -+ short transMatrix2even[16*16*2]; -+ int open_count; // Number of allocated video buffers -+- unsigned int vc_handle; // Handle of this memory -+ int mb; // Mailbox handle -+ int vc; // Address in GPU memory -+ int mail[12]; // These are used to pass pairs of code/unifs to the QPUs -+@@ -105,6 +100,7 @@ struct GPU -+ // Stop more than one thread trying to allocate memory or use the processing resources at once -+ static pthread_mutex_t gpu_mutex = PTHREAD_MUTEX_INITIALIZER; -+ static volatile struct GPU* gpu = NULL; -++static GPU_MEM_PTR_T gpu_mem_ptr; -+ -+ #if defined(RPI_TIME_TOTAL_QPU) || defined(RPI_TIME_TOTAL_VPU) -+ static unsigned int Microseconds(void) { -+@@ -132,39 +128,27 @@ static volatile int vpu_async_tail=0; // Contains the number of posted jobs -+ static volatile int vpu_async_head=0; -+ #endif -+ -++static int gpu_malloc_uncached_internal(int numbytes, GPU_MEM_PTR_T *p, int mb); -++static void gpu_free_internal(GPU_MEM_PTR_T *p); -++ -+ // Connect to QPU, returns 0 on success. -+ static int gpu_init(volatile struct GPU **gpu) { -+ int mb = mbox_open(); -+ int vc; -+- int handle; -+ volatile struct GPU* ptr; -+ if (mb < 0) -+ return -1; -+ -+ if (qpu_enable(mb, 1)) return -2; -+ -+-#ifdef RPI_USE_VCSM -+ vcsm_init(); -+-#endif -++ gpu_malloc_uncached_internal(sizeof(struct GPU), &gpu_mem_ptr, mb); -++ ptr = (volatile struct GPU*)gpu_mem_ptr.arm; -++ memset(ptr, 0, sizeof *ptr); -++ vc = gpu_mem_ptr.vc; -+ -+- handle = mem_alloc(mb, sizeof(struct GPU), 4096, GPU_MEM_FLG); -+- if (!handle) -+- { -+- qpu_enable(mb, 0); -+- return -3; -+- } -+- vc = mem_lock(mb, handle); -+- ptr = mapmem_shared((vc+GPU_MEM_MAP)&~0xc0000000, sizeof(struct GPU)); -+- if (ptr == NULL) -+- { mem_free(mb, handle); -+- mem_unlock(mb, handle); -+- qpu_enable(mb, 0); -+- return -4; -+- } -+- -+- ptr->mb = mb; -+- ptr->vc_handle = handle; -+- ptr->vc = vc; -++ ptr->mb = mb; -++ ptr->vc = vc; -+ -+ printf("GPU allocated at 0x%x\n",vc); -+ -+@@ -226,94 +210,74 @@ static void gpu_unlock(void) { -+ pthread_mutex_unlock(&gpu_mutex); -+ } -+ -++static int gpu_malloc_uncached_internal(int numbytes, GPU_MEM_PTR_T *p, int mb) { -++ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -++ assert(p->vcsm_handle); -++ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -++ assert(p->vc_handle); -++ p->arm = vcsm_lock(p->vcsm_handle); -++ assert(p->arm); -++ p->vc = mem_lock(mb, p->vc_handle); -++ assert(p->vc); -++ return 0; -++} -++ -+ // Allocate memory on GPU -+ // Fills in structure

containing ARM pointer, videocore handle, videocore memory address, numbytes -+ // Returns 0 on success. -+ // This allocates memory that will not be cached in ARM's data cache. -+ // Therefore safe to use without data cache flushing. -+-int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) { -++int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) -++{ -++ int r; -+ gpu_lock(); -+- p->vc_handle = mem_alloc(gpu->mb, numbytes, 4096, GPU_MEM_FLG); -+- p->vcsm_handle = 0; -+- if (!p->vc_handle) -+- { -+- qpu_enable(gpu->mb, 0); -+- return -3; -+- } -+- p->vc = mem_lock(gpu->mb, p->vc_handle); -+- p->arm = mapmem_shared((p->vc+GPU_MEM_MAP)&~0xc0000000,numbytes); -+- p->numbytes = numbytes; -+- if (p->arm == NULL) -+- { -+- mem_free(gpu->mb, p->vc_handle); -+- mem_unlock(gpu->mb, p->vc_handle); -+- gpu_unlock(); -+- qpu_enable(gpu->mb, 0); -+- return -4; -+- } -++ r = gpu_malloc_uncached_internal(numbytes, p, gpu->mb); -+ gpu->open_count++; -+ gpu_unlock(); -+- return 0; -++ return r; -+ } -+ -+ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ { -+- // This only works when using RPI_USE_VCSM -+ void *tmp = vcsm_lock(p->vcsm_handle); -+ vcsm_unlock_ptr(tmp); -+ } -+ -++static int gpu_malloc_cached_internal(int numbytes, GPU_MEM_PTR_T *p) { -++ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -++ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST_AND_VC, (char *)"Video Frame" ); -++ assert(p->vcsm_handle); -++ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -++ assert(p->vc_handle); -++ p->arm = vcsm_lock(p->vcsm_handle); -++ assert(p->arm); -++ p->vc = mem_lock(gpu->mb, p->vc_handle); -++ assert(p->vc); -++ return 0; -++} -++ -+ // This allocates data that will be -+ // Cached in ARM L2 -+ // Uncached in VPU L2 -+-int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p) { -++int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p) -++{ -++ int r; -+ gpu_lock(); -+-#ifdef RPI_USE_VCSM -+- { -+- p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); // f....... locks up for VP9 - retest this? -+- //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); // 3b...... works -+- //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); //fb...... locks up -+- //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST_AND_VC, (char *)"Video Frame" ); // 3b works (but corrupted due to caching) -+- p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -+- p->arm = vcsm_lock(p->vcsm_handle); -+- p->vc = mem_lock(gpu->mb, p->vc_handle); -+- } -+-#else -+- p->vc_handle = mem_alloc(gpu->mb, numbytes, 4096, GPU_MEM_FLG); -+- p->vcsm_handle = 0; -+- if (!p->handle) -+- { -+- qpu_enable(gpu->mb, 0); -+- return -3; -+- } -+- p->vc = mem_lock(gpu->mb, p->vc_handle); -+- printf("This mapmem_private does not seem to work\n"); -+- exit(-1); -+- p->arm = mapmem_private((p->vc+GPU_MEM_MAP)&~0xc0000000,numbytes); -+- p->numbytes = numbytes; -+- if (p->arm == NULL) -+- { -+- mem_free(gpu->mb, p->handle); -+- mem_unlock(gpu->mb, p->handle); -+- gpu_unlock(); -+- qpu_enable(gpu->mb, 0); -+- return -4; -+- } -+-#endif -++ r = gpu_malloc_cached_internal(numbytes, p); -+ gpu->open_count++; -+ gpu_unlock(); -+- return 0; -++ return r; -+ } -+ -+ static void gpu_term(void) -+ { -+- int mb; -+- unsigned handle; -++ int mb; -+ -+ if (gpu==NULL) -+ return; -+ mb = gpu->mb; -+- handle = gpu->vc_handle; -+ -+ #ifdef RPI_ASYNC -+ { -+@@ -323,37 +287,26 @@ static void gpu_term(void) -+ } -+ #endif -+ -++ qpu_enable(mb, 0); -++ gpu_free_internal(&gpu_mem_ptr); -+ -+- unmapmem((void*)gpu, sizeof(struct GPU)); -+- mem_unlock(mb, handle); -+- mem_free(mb, handle); -+- qpu_enable(mb, 0); -+-#ifdef RPI_USE_VCSM -+ vcsm_exit(); -+-#endif -+- mbox_close(mb); -++ -++ mbox_close(mb); -+ gpu = NULL; -+ } -+ -+-void gpu_free(GPU_MEM_PTR_T *p) { -++void gpu_free_internal(GPU_MEM_PTR_T *p) { -+ int mb = gpu->mb; -+- unsigned handle = p->vc_handle; -++ mem_unlock(mb,p->vc_handle); -++ vcsm_unlock_ptr(p->arm); -++ vcsm_free(p->vcsm_handle); -++} -++ -++void gpu_free(GPU_MEM_PTR_T *p) { -+ gpu_lock(); -+-#ifdef RPI_USE_VCSM -+- if (p->vcsm_handle) { -+- mem_unlock(mb,p->vc_handle); -+- vcsm_unlock_ptr(p->arm); -+- vcsm_free(p->vcsm_handle); -+- } else { -+- unmapmem((void*)p->arm, sizeof(struct GPU)); -+- mem_unlock(mb, handle); -+- mem_free(mb, handle); -+- } -+-#else -+- unmapmem((void*)p->arm, sizeof(struct GPU)); -+- mem_unlock(mb, handle); -+- mem_free(mb, handle); -+-#endif -++ -++ gpu_free_internal(p); -+ -+ gpu->open_count--; -+ if (gpu->open_count==0) { -+@@ -386,20 +339,21 @@ unsigned int vpu_get_constants(void) { -+ -+ static void *vpu_start(void *arg) { -+ while(1) { -++ int *p; -+ pthread_mutex_lock(&post_mutex); -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+ //printf("Checking number %d %d\n",vpu_async_head,vpu_async_tail); -+ pthread_cond_wait(&post_cond_tail, &post_mutex); -+ } -+- int *p = vpu_cmds[vpu_async_head%MAXCMDS]; -++ p = vpu_cmds[vpu_async_head%MAXCMDS]; -+ pthread_mutex_unlock(&post_mutex); -+ -+ if (p[6] == -1) { -+ break; // Last job -+ } -+ if (p[7]) { -+- GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -++ //GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -+ //gpu_cache_flush(buf); -+ } -+ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -+-- -+2.7.4 -+ -+ -+From 7c94b833b48a455d27d82eb2ca1b53a162705caf Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 15:43:17 +0100 -+Subject: [PATCH 37/68] Enable EARLY_MALLOC and fix sps access bug -+ -+--- -+ libavcodec/hevc.c | 5 +++-- -+ 1 file changed, 3 insertions(+), 2 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 2459e34..4e82a15 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -44,7 +44,7 @@ -+ #ifdef RPI -+ #include "rpi_qpu.h" -+ // For some unknown reason, the code seems to crash if I do a late malloc -+- #define EARLY_MALLOC -++ //#define EARLY_MALLOC -+ // Move Inter prediction into separate pass -+ #define RPI_INTER -+ #endif -+@@ -149,7 +149,8 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ #ifdef RPI -+ #ifdef EARLY_MALLOC -+ #else -+- int coeffs_in_ctb = (1 << s->ps.sps->log2_ctb_size) * (1 << s->ps.sps->log2_ctb_size); -++ assert(sps); -++ int coeffs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+ int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -+ printf("pic_arrays_init\n"); -+ printf("Allocated %d\n",coefs_per_row); -+-- -+2.7.4 -+ -+ -+From 0a0a92817a7959d213dca9c75a242b6ad88d6b80 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 14 May 2015 16:40:51 +0100 -+Subject: [PATCH 38/68] Add copy of av_mod_uintp2 for use with stable ffmpeg -+ -+--- -+ libavcodec/hevc.c | 8 ++++++++ -+ 1 file changed, 8 insertions(+) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 4e82a15..80db603 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -51,6 +51,14 @@ -+ -+ // #define DISABLE_MC -+ -++#ifndef av_mod_uintp2 -++static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a, unsigned p) -++{ -++ return a & ((1 << p) - 1); -++} -++# define av_mod_uintp2 av_mod_uintp2_c -++#endif -++ -+ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; -+ -+ -+-- -+2.7.4 -+ -+ -+From c48d08e968b24c2e260b0cc76c7901a1b4d75bbf Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 18 May 2015 11:11:02 +0100 -+Subject: [PATCH 39/68] Added support for weighted prediction in P frames -+ -+--- -+ libavcodec/hevc.c | 52 ++++- -+ libavcodec/rpi_shader.c | 566 +++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 12 +- -+ libavcodec/rpi_shader.qasm | 39 +++- -+ 4 files changed, 384 insertions(+), 285 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 80db603..9668ef8 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -64,7 +64,7 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ -+ #ifdef RPI_INTER_QPU -+ -+-#define RPI_CHROMA_COMMAND_WORDS 10 -++#define RPI_CHROMA_COMMAND_WORDS 12 -+ #define UV_COMMANDS_PER_QPU ((1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS) -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+@@ -2031,6 +2031,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+ //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+ int chan = x0>>8; -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+@@ -2043,6 +2045,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = ( (nPbW_csh.chroma_offset_l0[current_mv.ref_idx[0]][0] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0] & 0xffff); -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[0]][1] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[0]][1] & 0xffff); -++ } else { -++ *u++ = 1; // Weight of 1 and offset of 0 -++ *u++ = 1; -++ } -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2085,6 +2094,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+ //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+ int chan = x0>>8; -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+@@ -2098,6 +2109,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ // TODO chroma weight and offset... s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+ *u++ = rpi_filter_coefs[_my][0]; -++ if (weight_flag) { -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[1]][0] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[1]][0] & 0xffff); -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[1]][1] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[1]][1] & 0xffff); -++ } else { -++ *u++ = 1; // Weight of 1 and offset of 0 -++ *u++ = 1; -++ } -+ *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2159,6 +2177,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = ( (nPbW_cmc_filter_uv_b; -+@@ -2169,6 +2188,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = ( (nPbW_cframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+@@ -2795,6 +2815,9 @@ static void rpi_inter_clear(HEVCContext *s) -+ int i; -+ int pic_width = s->ps.sps->width >> s->ps.sps->hshift[1]; -+ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[1]; -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -++ -+ for(i=0;i<8;i++) { -+ s->u_mvs[i] = s->mvs_base[i]; -+ *s->u_mvs[i]++ = 0; -+@@ -2806,6 +2829,13 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = pic_height; -+ *s->u_mvs[i]++ = s->frame->linesize[1]; -+ *s->u_mvs[i]++ = s->frame->linesize[2]; -++ if (weight_flag) { -++ *s->u_mvs[i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -++ *s->u_mvs[i]++ = s->sh.chroma_log2_weight_denom + 6; -++ } else { -++ *s->u_mvs[i]++ = 1 << 5; -++ *s->u_mvs[i]++ = 6; -++ } -+ s->u_mvs[i] += 1; // Padding words -+ } -+ } -+@@ -2849,12 +2879,29 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ int ctb_addr_ts = s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]; -+ -+ #ifdef RPI -++#ifdef RPI_INTER_QPU -+ s->enable_rpi = s->ps.sps->bit_depth == 8 -+ && s->ps.sps->width <= RPI_MAX_WIDTH -+ && !s->ps.pps->cross_component_prediction_enabled_flag -+ && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1 -+- && !(s->ps.pps->weighted_pred_flag && s->sh.slice_type == P_SLICE) -+ && !(s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE); -++#else -++ s->enable_rpi = s->ps.sps->bit_depth == 8 -++ && s->ps.sps->width <= RPI_MAX_WIDTH -++ && !s->ps.pps->cross_component_prediction_enabled_flag -++ && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1; -++#endif -++ -++ /*if (!s->enable_rpi) { -++ if (s->ps.pps->cross_component_prediction_enabled_flag) -++ printf("Cross component\n"); -++ if (s->ps.pps->num_tile_rows > 1 || s->ps.pps->num_tile_columns > 1) -++ printf("Tiles\n"); -++ if (s->ps.pps->weighted_pred_flag && s->sh.slice_type == P_SLICE) -++ printf("Weighted P slice\n"); -++ if (s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE) -++ printf("Weighted B slice\n"); -++ }*/ -+ -+ #endif -+ -+@@ -2987,6 +3034,7 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int -+ -+ #ifdef RPI -+ s->enable_rpi = 0; -++ //printf("Wavefront\n"); -+ #endif -+ -+ if(ctb_row) { -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index b0b93b5..3f04d80 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -88,287 +88,307 @@ unsigned int rpi_shader[] = { -+ /* [0x000001f8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+ /* [0x00000200] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+ /* [0x00000208] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000218] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000220] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000228] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000230] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000238] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000240] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000248] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000210] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000218] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000220] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000228] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000230] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000238] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000240] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000248] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000250] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -++/* [0x00000258] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -+ // ::mc_filter_uv -+-/* [0x00000250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000258] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000260] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000268] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000270] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000278] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000280] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000288] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000290] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000298] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002a0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002a8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002b0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002b8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002c0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002c8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002d0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002d8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002e0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002e8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002f0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002f8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000300] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000330] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000340] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000350] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000358] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000360] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000268] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000270] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000278] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000280] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000288] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000290] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000298] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000002a0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000002a8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002b0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000002b8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002c0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002c8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002e8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002f0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000340] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000350] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000358] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000360] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000368] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000370] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000378] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000380] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000388] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000390] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -++/* [0x00000398] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000003a0] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -++/* [0x000003a8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000003b0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000368] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000370] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000378] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000380] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000388] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000390] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000398] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003a0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003a8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003b0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000003b8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003c0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003c8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000003d0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000003d8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000003e0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000003e8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000003f0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000003f8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000400] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000408] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000410] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000418] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000420] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000428] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000430] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000438] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000440] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000448] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000450] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000458] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000460] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000468] */ 0x0c567380, 0x10020867, // add r1, r1, ra21 -+-/* [0x00000470] */ 0xfffffed8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000478] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -+-/* [0x00000480] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000488] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000490] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000498] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000004a8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000004b0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000004b8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000004c0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000004c8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000004d0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000003b8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003c0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x000003c8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x000003d0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003d8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003e0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003e8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003f0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003f8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000400] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000408] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000410] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000418] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000420] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000428] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000430] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000438] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000440] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000448] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000450] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000458] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000460] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000468] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000470] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000478] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000480] */ 0x00000020, 0xe0021327, // mov rb12,32 -++/* [0x00000488] */ 0x00000006, 0xe0021367, // mov rb13,6 -++/* [0x00000490] */ 0x00000001, 0xe00213a7, // mov rb14,1 -++/* [0x00000498] */ 0x00000000, 0xe00213e7, // mov rb15,0 -++/* [0x000004a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000004a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000004b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000004b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000004c0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000004c8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000004d0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000004d8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x000004e0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x000004e8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x000004f0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004f8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00000500] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000508] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000510] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000518] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000520] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000528] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000530] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000538] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000540] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000548] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000550] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x000004d8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000004e0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000004e8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000004f0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000004f8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000500] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000508] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000510] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000518] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000520] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000528] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000530] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000538] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000540] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000548] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000550] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000558] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000560] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000568] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000570] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000578] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000580] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000588] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000590] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000598] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005a0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005a8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005b0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000005b8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005c8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000005d0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x000005d8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000005e0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000005e8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000558] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000560] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000568] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000570] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000578] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000580] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000588] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000590] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000598] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x000005a0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000005a8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x000005b0] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x000005b8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000005c0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005c8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000005d0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000005d8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000005e0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000005e8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000005f0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000005f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000600] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000608] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000610] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000618] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000620] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000628] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000630] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000638] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000640] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000648] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000650] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000658] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000660] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000668] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000670] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000678] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x000005f0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000005f8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000600] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000608] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000610] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000618] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000620] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000628] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000630] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000638] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000640] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000648] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000650] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000658] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000660] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000668] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000670] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000678] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000680] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000688] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000690] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000698] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006a0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000006a8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000006b0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000006b8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000006c0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000006c8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000006d0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000006d8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000006e0] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x000006e8] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x000006f0] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x000006f8] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000700] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000708] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000710] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000718] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000720] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000680] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000688] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000690] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000698] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000006a0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000006a8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000006b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000006b8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000006c0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x000006c8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x000006d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000006d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000006e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000006e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000700] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000708] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000710] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000718] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000720] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000728] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000730] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000738] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000740] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000748] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000750] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000758] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000760] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000768] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000770] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000778] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000780] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000788] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000790] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000798] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000007a0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007b0] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x00000728] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000730] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000738] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000740] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000748] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000750] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000758] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000760] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000768] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000770] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000778] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000780] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000788] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000790] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000798] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000007a0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000007a8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000007b0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000007b8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000007c0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000007c8] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x000007d0] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x000007d8] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x000007e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000007e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000007f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000007f8] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000800] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000808] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000810] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000818] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000820] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000828] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000830] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000838] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000840] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000848] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000850] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000858] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000007b8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000007c0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007c8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007d0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007d8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007e0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007e8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007f0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007f8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -++/* [0x00000800] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000808] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -++/* [0x00000810] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000818] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000820] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000828] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000830] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000838] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000840] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000848] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000850] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000858] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000860] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000868] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000870] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000878] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000880] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000888] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000890] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000898] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000008b8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008d0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000008d8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008e0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008e8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008f0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008f8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000860] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000868] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000870] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000878] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000880] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000888] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000890] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000898] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000008a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000008a8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000008b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000008c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000008c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000008d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000008d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000008e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000008e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000008f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000008f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000900] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000908] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000910] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000918] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000920] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000928] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000930] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000938] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000940] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000948] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000950] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x00000958] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000960] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000968] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000970] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000978] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000980] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000988] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000990] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000998] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009a0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x000009a8] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x000009b0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000009b8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000009c0] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x000009c8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x000009d0] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000900] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000908] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -++/* [0x00000910] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++/* [0x00000918] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000920] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000928] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000930] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000938] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000940] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -++/* [0x00000948] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -++/* [0x00000950] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000958] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000960] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000968] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000970] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000978] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000980] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000988] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000990] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000998] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x000009a0] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x000009a8] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009b0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009b8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000009c0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000009c8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009d0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009d8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009e0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000a00] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000a08] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000a10] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a18] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a20] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a28] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a30] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a38] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a40] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a48] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a50] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a60] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x000009e0] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x000009e8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009f0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x000009f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a00] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a08] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a10] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a18] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a78] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a80] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000aa0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ab0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000a20] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a28] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a30] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a38] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a40] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a48] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a50] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a58] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a60] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a68] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000a80] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a88] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000a90] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000ac0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ae0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b10] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b18] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000b20] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b28] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b30] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 99927c4..cec9901 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,11 +4,11 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 148) -+-#define mc_filter_uv_b0 (rpi_shader + 310) -+-#define mc_filter_uv_b (rpi_shader + 458) -+-#define mc_exit (rpi_shader + 630) -+-#define mc_interrupt_exit8 (rpi_shader + 648) -+-#define mc_end (rpi_shader + 678) -++#define mc_filter_uv (rpi_shader + 152) -++#define mc_filter_uv_b0 (rpi_shader + 342) -++#define mc_filter_uv_b (rpi_shader + 494) -++#define mc_exit (rpi_shader + 670) -++#define mc_interrupt_exit8 (rpi_shader + 688) -++#define mc_end (rpi_shader + 718) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index d9ffcda..97c4c02 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -9,7 +9,12 @@ -+ # (ra15 isn't clamped to zero - this happens during the -+ # copy to ra14, and during its use in the vertical filter) -+ # -+-# rb8...rb15 eight vertical filter coefficients -++# rb8...rb11 eight vertical filter coefficients -++ -++# rb12 offset to add before shift -++# rb13 shift -++# rb14 weight (U on left, V on right) -++# rb15 offset (U on left, V on right) -+ # -+ # ra16 clipped(row start address+elem_num)&~3 -+ # ra17 per-channel shifts -+@@ -165,6 +170,9 @@ add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+ add t0s, r0, r1 ; mov ra_x2_base, r2 -+ add t0s, r2, r1 -+ -++mov rb12,unif # offset before shift -++mov rb13,unif # offset after shift -++ -+ # Dump padding words -+ mov r0, unif -+ -+@@ -231,11 +239,21 @@ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23 -+ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++mov r0, unif # U offset/weight -++asr rb15, r0, r2 # Compute offset from MSBs -++shl r0, r0, r2 -++asr rb14, r0, r2 # Compute weight from LSBs -++mov r0, unif # V offset/weight -++asr.ifnz rb15, r0, r2 -++shl r0, r0, r2 -++asr.ifnz rb14, r0, r2 -++ -+ # r2 is elem_num -+ # r3 is loop counter -+ -+ mov r5rep, -8 -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+ # retrieve texture results and pick out bytes -+ # then submit two more texture requests -+@@ -279,6 +297,11 @@ mov ra13, ra14 # Delay slot 1 -+ mov ra14, ra15 # Delay slot 2 -+ mov ra15, r0 # Delay slot 3 -+ -++mov rb12,32 -++mov rb13,6 -++mov rb14,1 -++mov rb15,0 -++ -+ # apply vertical filter and write to VPM -+ -+ nop ; mul24 r1, ra14, rb10 -+@@ -288,9 +311,11 @@ add r1, r1, r0 ; mul24 r0, ra15, rb11 -+ add r1, r1, r0 ; mov -, vw_wait -+ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+ asr r1, r1, 14 -+-add r1, r1, ra21 -++nop ; mul24 r1, r1, rb14 -++add r1, r1, rb12 -++asr r1, r1, rb13 -+ brr.anyn -, r:uvloop -+-asr r1, r1, 6 # Delay 1 -++add r1, r1, rb15 # Delay 1 -+ min r1, r1, rb22 # Delay 2 -+ max vpm, r1, 0 # Delay 3 -+ -+@@ -364,6 +389,9 @@ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23 -+ -++mov r0, unif # U offset/weight -++mov r0, unif # V offset/weight -++ -+ # r2 is elem_num -+ # r3 is loop counter -+ -+@@ -491,6 +519,9 @@ asr rb10, r0, rb23; mul24 r0, r0, ra22 -+ asr rb9, r0, rb23; mul24 r0, r0, ra22 -+ asr rb8, r0, rb23 -+ -++mov r0, unif # U offset/weight -++mov r0, unif # V offset/weight -++ -+ # r2 is elem_num -+ # r3 is loop counter -+ -+-- -+2.7.4 -+ -+ -+From 310d994ea39e29b41a6a013abc4d94e6b90487b2 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 19 May 2015 08:43:30 +0100 -+Subject: [PATCH 40/68] Improved ordering of tasks -+ -+--- -+ libavcodec/hevc.c | 8 ++++---- -+ 1 file changed, 4 insertions(+), 4 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 9668ef8..951e2d3 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2943,15 +2943,15 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->dblk_cmds[s->num_dblk_cmds][0] = x_ctb; -+ s->dblk_cmds[s->num_dblk_cmds++][1] = y_ctb; -+ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+-#ifdef RPI_INTER_QPU -+- // Kick off inter prediction on QPUs -+- rpi_execute_inter_qpu(s); -+-#endif -+ // Transform all blocks -+ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -++#ifdef RPI_INTER_QPU -++ // Kick off inter prediction on QPUs -++ rpi_execute_inter_qpu(s); -++#endif -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -+ -+-- -+2.7.4 -+ -+ -+From d6e1ce7898196e49e52a6223c12979b3d0014588 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 20 May 2015 19:58:19 +0100 -+Subject: [PATCH 41/68] Drafted Luma inter prediction -+ -+--- -+ libavcodec/rpi_shader.qasm | 594 ++++++++++++++++++++++++++++++++++++++++++--- -+ 1 file changed, 554 insertions(+), 40 deletions(-) -+ -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 97c4c02..9cfc0d9 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -2,7 +2,10 @@ -+ # -+ # ra0...ra7 eight horizontal filter coefficients -+ # -+-# rb1...rb7 seven shifted copies of the current unfiltered row -++# rb0 rx_shift2 -++# rb1 ra_y2_next -++# -++# rb4...rb7 -+ # -+ # ra8...ra15 eight filtered rows of context (rb15 == most recent) -+ # -+@@ -26,9 +29,9 @@ -+ # rb19 next ra16 -+ # -+ # ra20 1 -+-# ra21 32 -++# ra21 ra_21 -+ # ra22 256 -+-# ra23 8 -++# ra23 rx_shift2_next -+ # -+ # rb20 0xffffff00 -+ # rb21 vpm_setup for reading/writing 16bit results into VPM -+@@ -57,16 +60,23 @@ -+ .set rb_frame_width_minus_1, rb25 -+ .set rb_frame_height_minus_1, rb30 -+ .set rb_pitch, rb16 -+-.set ra_x_base, ra16 -+-.set rb_x_base_next, rb19 -+-.set ra_x2_base, ra24 -+-.set ra_x2_base_next, ra26 -++.set ra_x, ra16 -++.set ra_y2, ra21 -++.set ra_y2_next, rb1 -++ -++.set rb_x_next, rb19 -++.set rx_frame_base2_next, rb19 -++ -++.set ra_frame_base, ra24 -++.set ra_frame_base_next, ra26 -+ .set ra_xshift, ra17 -+ -+-.set ra_x2shift, ra25 -+ .set ra_u2v_ref_offset, ra25 -++.set ra_frame_base2, ra25 -+ -+ .set ra_xshift_next, ra19 -++.set rx_xshift2, rb0 -++.set rx_xshift2_next, ra23 -+ -+ .set ra_x2shift_next, ra27 -+ .set ra_u2v_dst_offset, ra27 -+@@ -83,11 +93,11 @@ -+ mov ra31, unif -+ -+ # Load first request location -+-add ra_x_base, unif, elem_num # Store x -++add ra_x, unif, elem_num # Store x -+ mov ra_y, unif # Store y -+-mov ra_x2_base, unif # Store frame u base -++mov ra_frame_base, unif # Store frame u base -+ nop -+-sub ra_u2v_ref_offset, unif, ra_x2_base # Store offset to add to move from u to v in reference frame -++sub ra_u2v_ref_offset, unif, ra_frame_base # Store offset to add to move from u to v in reference frame -+ -+ # Read image dimensions -+ sub rb25,unif,1 -+@@ -104,9 +114,7 @@ add rb24, r1, r0 -+ # load constants -+ -+ mov ra20, 1 -+-mov ra21, 32 -+ mov ra22, 256 -+-mov ra23, 8 -+ mov ra30, 64 -+ -+ mov rb20, 0xffffff00 -+@@ -156,18 +164,18 @@ mov r1, vpm_setup(0, 2, h16p(0, 0)) # 2 is stride - stride acts on ADDR which i -+ add rb21, r0, r1 -+ -+ # Compute base address for first and second access -+-mov r0, ra_x_base # Load x -++mov r0, ra_x # Load x -+ max r0, r0, 0; mov r1, ra_y # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base # Load the frame base -++min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base # Load the frame base -+ shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+ add ra_y, r1, 1 -+ add r0, r0, r3 -+ and r0, r0, ~3 -+-max r1, r1, 0 ; mov ra_x_base, r0 # y -++max r1, r1, 0 ; mov ra_x, r0 # y -+ min r1, r1, rb_frame_height_minus_1 -+ # submit texture requests for first line -+ add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-add t0s, r0, r1 ; mov ra_x2_base, r2 -++add t0s, r0, r1 ; mov ra_frame_base, r2 -+ add t0s, r2, r1 -+ -+ mov rb12,unif # offset before shift -+@@ -182,8 +190,8 @@ min r1, r1, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 -+ bra -, ra31 -+ nop ; mul24 r1, r1, rb_pitch -+-add t0s, r1, ra_x_base -+-add t0s, r1, ra_x2_base -++add t0s, r1, ra_x -++add t0s, r1, ra_frame_base -+ -+ -+ -+@@ -192,7 +200,7 @@ add t0s, r1, ra_x2_base -+ # mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -+ -+ # At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -++# ra_x, ra_x16_base point to the current coordinates for this block -+ ::mc_filter_uv -+ mov ra31, unif -+ -+@@ -207,9 +215,9 @@ min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+ shl ra_xshift_next, r0, 3 -+ sub r2, unif, r3 # compute offset from frame base u to frame base v -+ add r0, r0, r3 -+-and rb_x_base_next, r0, ~3 -++and rb_x_next, r0, ~3 -+ mov ra_y_next, r1 -+-add ra_x2_base_next, rb_x_base_next, r2 -++add ra_frame_base_next, rb_x_next, r2 -+ -+ # set up VPM write -+ mov vw_setup, rb28 -+@@ -265,16 +273,16 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -+ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -++add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -297,7 +305,7 @@ mov ra13, ra14 # Delay slot 1 -+ mov ra14, ra15 # Delay slot 2 -+ mov ra15, r0 # Delay slot 3 -+ -+-mov rb12,32 -++mov rb12,32 # TODO remove these to make P weighted prediction work properly -+ mov rb13,6 -+ mov rb14,1 -+ mov rb15,0 -+@@ -342,7 +350,7 @@ mov vw_addr, unif # start the VDW -+ # mc_filter_uv_b0(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -+ -+ # At this point we have already issued two pairs of texture requests for the current block -+-# ra_x_base, ra_x16_base point to the current coordinates for this block -++# ra_x, ra_x16_base point to the current coordinates for this block -+ ::mc_filter_uv_b0 -+ mov ra31, unif -+ -+@@ -357,9 +365,9 @@ min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+ shl ra_xshift_next, r0, 3 -+ sub r2, unif, r3 # compute offset from frame base u to frame base v -+ add r0, r0, r3 -+-and rb_x_base_next, r0, ~3 -++and rb_x_next, r0, ~3 -+ mov ra_y_next, r1 -+-add ra_x2_base_next, rb_x_base_next, r2 -++add ra_frame_base_next, rb_x_next, r2 -+ -+ # set up VPM write, we need to save 16bit precision -+ mov vw_setup, rb21 -+@@ -408,16 +416,16 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -+ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -++add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -477,9 +485,9 @@ min r0, r0, rb_frame_width_minus_1 ; mov r3, unif # frame_base -+ shl ra_xshift_next, r0, 3 -+ sub r2, unif, r3 # compute offset from frame base u to frame base v -+ add r0, r0, r3 -+-and rb_x_base_next, r0, ~3 -++and rb_x_next, r0, ~3 -+ mov ra_y_next, r1 -+-add ra_x2_base_next, rb_x_base_next, r2 -++add ra_frame_base_next, rb_x_next, r2 -+ -+ # set up VPM write -+ mov vw_setup, rb28 -+@@ -538,16 +546,16 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -+ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_x2_base, r2 -++add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++add t0s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -642,5 +650,511 @@ nop ; nop ; thrend -+ mov interrupt, 1; nop # delay slot 1 -+ nop ; nop # delay slot 2 -+ -++ -++ -++ -++ -++# LUMA CODE -++ -++# The idea is to form B predictions by doing 8 pixels from ref0 in parallel with 8 pixels from ref1. -++# For P frames we make the second x,y coordinates offset by +8 -++ -++################################################################################ -++# mc_setup(next_kernel, x, y, ref_y_base, x2, y2, ref_y2_base, frame_width, frame_height, pitch, dst_pitch, offset, shift, pad2) -++::mc_setup -++ -++# Read starting kernel -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++mov ra31, unif -++ -++# Compute base address for first and second access -++add r0, unif, elem_num # Load x -++max r0, r0, 0; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl ra_xshift_next, r0, 3 # Compute shifts -++add ra_y, r1, 1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add r2, r2, r0 # r2 is address for frame0 (not including y offset) -++max r1, r1, 0 -++min r1, r1, rb_frame_height_minus_1 -++nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -++add t0s, r2, r1 ; mov ra_frame_base, r2 -++ -++add r0, unif, elem_num # Load x -++max r0, r0, 0; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl rx_xshift2_next, r0, 3 # Compute shifts -++add ra_y2, r1, 1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add r2, r2, r0 # r2 is address for frame1 (not including y offset) -++max r1, r1, 0 -++min r1, r1, rb_frame_height_minus_1 -++nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -++add t0s, r2, r1 ; mov ra_frame_base2, r2 -++ -++ -++# Read image dimensions -++sub rb25,unif,1 -++sub rb30,unif,1 -++ -++# get source pitch -++mov rb16, unif -++ -++# get destination pitch -++mov r0, unif -++mov r1, vdw_setup_1(0) -++add rb24, r1, r0 -++ -++# load constants -++ -++mov ra20, 1 -++mov ra22, 256 -++mov ra30, 64 -++ -++mov rb20, 0xffffff00 -++mov rb22, 255 -++mov rb23, 24 -++ -++# touch vertical context to keep simulator happy -++ -++mov ra8, 0 -++mov ra9, 0 -++mov ra10, 0 -++mov ra11, 0 -++mov ra12, 0 -++mov ra13, 0 -++mov ra14, 0 -++mov ra15, 0 -++ -++# Compute part of VPM to use for DMA output -++mov r2, qpu_num -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++shl r0, r0, 5 -++add rb27, r0, r1 -++ -++# Compute part of VPM to save data into -++mov r2, qpu_num # qpu_num = abcd -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -++mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -++add rb28, r0, r1 -++ -++mov rb12,unif # offset before shift -++mov rb13,unif # shift -++ -++# Dump padding words -++mov r0, unif -++ -++# submit texture requests for second line -++max r1, ra_y, 0 -++min r1, r1, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 -++nop ; mul24 r1, r1, rb_pitch -++add t0s, r1, ra_frame_base -++ -++max r1, ra_y2, 0 -++min r1, r1, rb_frame_height_minus_1 -++bra -, ra31 -++add ra_y2, ra_y2, 1 # Delay 1 -++nop ; mul24 r1, r1, rb_pitch # Delay 2 -++add t0s, r1, ra_frame_base2 # Delay 3 -++ -++ -++################################################################################ -++ -++# mc_filter(next_kernel, x, y, frame_base, x2, y2, frame_base2, height, hcoeffs[0], hcoeffs2[0], hcoeffs[1], hcoeffs2[1], vcoeffs[0], vcoeffs2[0], vcoeffs[1], vcoeffs2[1], offsetweight0, offsetweight1, this_dst) -++# In a P block, only the first half of coefficients contain used information. -++# At this point we have already issued two pairs of texture requests for the current block -++# ra_x, ra_x16_base point to the current coordinates for this block -++::mc_filter -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov rx_xshift2, rx_xshift2_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # Load x -++max r0, r0, 0; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl ra_xshift_next, r0, 3 # Compute shifts -++mov ra_y_next, r1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add ra_frame_base_next, r2, r0 # r2 is address for frame0 (not including y offset) -++ -++add r0, unif, elem_num # Load x -++max r0, r0, 0 ; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl rx_xshift2_next, r0, 3 # Compute shifts -++add ra_y2_next, r1, 1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -++ -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++# get filter coefficients and discard unused B frame values -++mov r0, unif -++mov.ifnz -, unif # Alternate coefficients are unused for P frames -++asr ra3, r0, rb23; mul24 r0, r0, ra22 # These may need some pre-rotation to be used in B frames correctly -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++mov.ifnz -, unif -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++asr ra4, r0, rb23; mov r0, unif -++mov.ifnz -, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++mov.ifnz -, unif -++asr rb7, r0, rb23; mul24 r0, r0, ra22 -++asr rb6, r0, rb23; mul24 r0, r0, ra22 -++asr rb5, r0, rb23; mul24 r0, r0, ra22 -++asr rb4, r0, rb23 -++ -++mov r0, unif # Frame0 offset/weight -++mov.ifnz -, unif # Frame1 offset/weight unused -++asr rb15, r0, r2 # Compute offset from MSBs -++shl r0, r0, r2 -++asr rb14, r0, r2 # Compute weight from LSBs -++ -++# r3 is loop counter -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:yloop -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++# If we knew there was no clipping then this code would get simpler. -++# Perhaps we could add on the pitch and clip using larger values? -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, rx_xshift2 -++mov.ifz ra_y2, ra_y2_next -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y2, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++ -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# apply horizontal filter -++nop ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 8 ; mov ra12, ra13 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++brr.anyn -, r:yloop -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -++add r1, r1, r0 ; mul24 r0, ra8, rb4 -++add r1, r1, r0 ; mul24 r0, ra9, rb5 -++add r1, r1, r0 ; mul24 r0, ra10, rb6 -++add r1, r1, r0 ; mul24 r0, ra11, rb7 -++ -++add r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 14 -++nop ; mul24 r1, r1, rb14 -++add r1, r1, rb12 -++asr r1, r1, rb13 -++brr.anyn -, r:yloop -++add r1, r1, rb15 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -++ -++# DMA out -++ -++bra -, ra31 -++mov vw_setup, rb26 # VDW setup 0 Delay 1 -++mov vw_setup, rb29 # Stride Delay 2 -++mov vw_addr, unif # start the VDW Delay 3 -++ -++ -++ -++################################################################################ -++ -++# mc_filter_b(next_kernel, x, y, frame_base, x2, y2, frame_base2, width_height, hcoeffs[0], hcoeffs2[0], hcoeffs[1], hcoeffs2[1], vcoeffs[0], vcoeffs2[0], vcoeffs[1], vcoeffs2[1], offsetweight0, offsetweight1, this_dst) -++# In a P block, only the first half of coefficients contain used information. -++# At this point we have already issued two pairs of texture requests for the current block -++# May be better to just send 16.16 motion vector and figure out the coefficients inside this block (only 4 cases so can compute hcoeffs in around 24 cycles?) -++# Can fill in the coefficients so only -++# Can also assume default weighted prediction for B frames. -++# Perhaps can unpack coefficients in a more efficient manner by doing H/V for a and b at the same time? -++# Or possibly by taking advantage of symmetry? -++# From 19->7 32bits per command. -++::mc_filter_b -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++mov ra31, unif -++ -++# per-channel shifts were calculated on the *previous* invocation -++ -++mov ra_xshift, ra_xshift_next -++mov rx_xshift2, rx_xshift2_next -++ -++# get base addresses and per-channel shifts for *next* invocation -++add r0, unif, elem_num # Load x -++max r0, r0, 0; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl ra_xshift_next, r0, 3 # Compute shifts -++mov ra_y_next, r1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add ra_frame_base_next, r2, r0 # r2 is address for frame0 (not including y offset) -++ -++add r0, unif, elem_num # Load x -++max r0, r0, 0 ; mov r1, unif # Load y -++min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++shl rx_xshift2_next, r0, 3 # Compute shifts -++add ra_y2_next, r1, 1 -++and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -++ -++ -++# set up VPM write -++mov vw_setup, rb28 -++ -++# get width,height of block -++mov r2, 16 -++mov r0, unif -++shr r1, r0, r2 # Extract width -++sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++and r0, r0, rb22 # Extract height -++add rb17, r0, 5 -++add rb18, r0, 7 -++shl r0, r0, 7 -++add r0, r0, r1 # Combine width and height of destination area -++shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -++add rb26, r0, rb27 -++ -++# get filter coefficients and discard unused B frame values -++mov r0, unif -++mov r1, 1 -++mov.ifnz r0, unif # Alternate coefficients are unused for P frames -++nop ; mul24 r0, r0 << 13, r1 << 13 -++asr ra3, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 14, r1 << 14 -++asr ra2, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 15, r1 << 15 # Adjust such that a rotate of 1 will produce the values with first 8 on left, second 8 on right -++asr ra1, r0, rb23; mul24 r0, r0, ra22 -++asr ra0, r0, rb23; mov r0, unif -++mov.ifnz r0, unif -++nop ; mul24 r0, r0 << 9, r1 << 9 -++asr ra7, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 10, r1 << 10 -++asr ra6, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 11, r1 << 11 -++asr ra5, r0, rb23; mul24 r0, r0, ra22 -++nop ; mul24 r0, r0 << 12, r1 << 12 -++asr ra4, r0, rb23; mov r0, unif -++mov.ifnz r0, unif -++asr rb11, r0, rb23; mul24 r0, r0, ra22 -++asr rb10, r0, rb23; mul24 r0, r0, ra22 -++asr rb9, r0, rb23; mul24 r0, r0, ra22 -++asr rb8, r0, rb23; mov r0, unif -++mov.ifnz r0, unif -++asr rb7, r0, rb23; mul24 r0, r0, ra22 -++asr rb6, r0, rb23; mul24 r0, r0, ra22 -++asr rb5, r0, rb23; mul24 r0, r0, ra22 -++asr rb4, r0, rb23 -++ -++mov r0, unif # Frame0 offset/weight -++mov.ifnz r0, unif # Frame1 offset/weight unused -++asr rb15, r0, r2 # Compute offset from MSBs -++shl r0, r0, r2 -++asr rb14, r0, r2 # Compute weight from LSBs -++ -++# r3 is loop counter -++ -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++mov r3, 0 -++ -++:yloopb -++# retrieve texture results and pick out bytes -++# then submit two more texture requests -++ -++# If we knew there was no clipping then this code would get simpler. -++# Perhaps we could add on the pitch and clip using larger values? -++ -++sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++shr r1, r4, rx_xshift2 -++mov.ifz ra_y2, ra_y2_next -++ -++max r2, ra_y, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -++ -++max r2, ra_y2, 0 # y -++min r2, r2, rb_frame_height_minus_1 -++add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++ -++ -++# generate seven shifted versions -++# interleave with scroll of vertical context -++ -++mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ -++# apply horizontal filter -++nop ; mul24 r2, r0, ra0 -++nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++nop ; mul24 r3, ra1 << 1, r0 << 1 -++nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++add r0, r2, r3 ; mov r3, rb31 -++sub.setf -, r3, 8 ; mov ra12, ra13 -++mov ra9, ra10 -++mov ra10, ra11 -++mov ra11, ra12 -++mov ra12, ra13 -++brr.anyn -, r:yloopb -++mov ra13, ra14 # Delay slot 1 -++mov ra14, ra15 # Delay slot 2 -++mov ra15, r0 # Delay slot 3 -++ -++# apply vertical filter and write to VPM -++ -++nop ; mul24 r1, ra14, rb10 -++nop ; mul24 r0, ra13, rb9 -++add r1, r1, r0 ; mul24 r0, ra12, rb8 -++add r1, r1, r0 ; mul24 r0, ra15, rb11 -++add r1, r1, r0 ; mul24 r0, ra8, rb4 -++add r1, r1, r0 ; mul24 r0, ra9, rb5 -++add r1, r1, r0 ; mul24 r0, ra10, rb6 -++add r1, r1, r0 ; mul24 r0, ra11, rb7 -++ -++add r1, r1, r0 ; mov -, vw_wait -++sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++asr r1, r1, 14 -++nop ; mul24 r1, r1 << 8, ra20 << 8 # Rotate to align left and right halves -++add r1, r1, ra30 ; mul24 r0, r1, rb14 -++add r1, r1, r0 -++brr.anyn -, r:yloopb -++asr r1, r1, 7 # Delay 1 -++min r1, r1, rb22 # Delay 2 -++max vpm, r1, 0 # Delay 3 -++ -++# DMA out -++bra -, ra31 -++mov vw_setup, rb26 # VDW setup 0 Delay 1 -++mov vw_setup, rb29 # Stride Delay 2 -++mov vw_addr, unif # start the VDW Delay 3 -++ -++################################################################################ -++ -++# mc_interrupt_exit12() -++::mc_interrupt_exit12 -++mov -, vw_wait # wait on the VDW -++ -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ldtmu0 -++ -++mov -,sacq(0) # 1 -++mov -,sacq(0) # 2 -++mov -,sacq(0) # 3 -++mov -,sacq(0) # 4 -++mov -,sacq(0) # 5 -++mov -,sacq(0) # 6 -++mov -,sacq(0) # 7 -++mov -,sacq(0) # 8 -++mov -,sacq(0) # 9 -++mov -,sacq(0) # 10 -++mov -,sacq(0) # 11 -++ -++nop ; nop ; thrend -++mov interrupt, 1; nop # delay slot 1 -++nop ; nop # delay slot 2 -++ -++ -+ ::mc_end -+ # Do not add code here because mc_end must appear after all other code. -+-- -+2.7.4 -+ -+ -+From f2ffe4186fa49cb27579953c276b51728a08a8b5 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 20 May 2015 19:58:30 +0100 -+Subject: [PATCH 42/68] Added support for fast cache flush in deblocker -+ -+--- -+ libavcodec/hevc_filter.c | 44 +- -+ libavcodec/rpi_qpu.c | 6 + -+ libavcodec/rpi_qpu.h | 2 + -+ libavcodec/rpi_shader.c | 1028 +++++++++++++++++++++++++++++--------------- -+ libavcodec/rpi_shader.h | 16 +- -+ libavcodec/rpi_user_vcsm.h | 22 + -+ 6 files changed, 768 insertions(+), 350 deletions(-) -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 92a8271..186317a 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -37,6 +37,11 @@ -+ -+ #include "bit_depth_template.c" -+ -++#ifdef RPI -++#include "rpi_user_vcsm.h" -++#include "rpi_qpu.h" -++#endif -++ -+ #define LUMA 0 -+ #define CB 1 -+ #define CR 2 -+@@ -872,15 +877,46 @@ static void flush_buffer(AVBufferRef *bref) { -+ gpu_cache_flush(p); -+ } -+ -+-static void ff_hevc_flush_chroma(HEVCContext *s) -++// Return Physical address for this image -++static int ff_hevc_buf_base(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ return p->vc & 0x3fffffff; -++} -++ -++static void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -+ { -+ if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -+ s->nal_unit_type == NAL_TSA_N || -+ s->nal_unit_type == NAL_STSA_N || -+ s->nal_unit_type == NAL_RADL_N || -+ s->nal_unit_type == NAL_RASL_N )) { -++#define RPI_FAST_CACHEFLUSH -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ int curr_y = f->progress->data[0]; -++ int sz,base; -++ if (curr_y < 0) curr_y = 0; -++ if (n<=curr_y) return; // Should not happen -++ sz = s->frame->linesize[1] * (n-curr_y); -++ base = s->frame->linesize[1] * curr_y; -++ iocache.s[0].cmd = 3; // Flush L1 cache -++ iocache.s[0].addr = 0; -++ iocache.s[0].size = 0; -++ -++ iocache.s[1].cmd = 2; -++ iocache.s[1].addr = ff_hevc_buf_base(s->frame->buf[1]) + base; -++ iocache.s[1].size = sz; -++ -++ iocache.s[2].cmd = 2; -++ iocache.s[2].addr = ff_hevc_buf_base(s->frame->buf[2]) + base; -++ iocache.s[2].size = sz; -++ -++ vcsm_clean_invalid( gpu_get_mailbox(), &iocache ); -++ -++#else -+ flush_buffer(s->frame->buf[1]); -+ flush_buffer(s->frame->buf[2]); -++#endif -+ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -+ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -+ //memcpy(s->dummy.arm,s->frame->data[2],1024*32); -+@@ -903,7 +939,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x, y - ctb_size); -+ if (s->threads_type & FF_THREAD_FRAME ) { -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s); -++ ff_hevc_flush_chroma(s,&s->ref->tf, y); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y, 0); -+ } -+@@ -912,7 +948,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x , y); -+ if (s->threads_type & FF_THREAD_FRAME ) { -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s); -++ ff_hevc_flush_chroma(s, &s->ref->tf, y + ctb_size); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -+ } -+@@ -922,7 +958,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s); -++ ff_hevc_flush_chroma(s, &s->ref->tf, y + ctb_size - 4); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index f62051f..fd8a276 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -237,6 +237,12 @@ int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) -+ return r; -+ } -+ -++int gpu_get_mailbox(void) -++{ -++ assert(gpu); -++ return gpu->mb; -++} -++ -+ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ { -+ void *tmp = vcsm_lock(p->vcsm_handle); -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 543c84b..88965e5 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -49,4 +49,6 @@ extern int rpi_test_shader(void); -+ extern void rpi_do_block(const unsigned char *in_buffer_vc, int src_pitch, unsigned char *dst_vc, int dst_pitch, unsigned char *dst); -+ extern void rpi_do_block_arm(const unsigned char *in_buffer, int src_pitch, unsigned char *dst, int dst_pitch); -+ -++extern int gpu_get_mailbox(void); -++ -+ #endif -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 3f04d80..9c30e32 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -23,11 +23,11 @@ __attribute__((aligned(8))) -+ unsigned int rpi_shader[] = { -+ // ::mc_setup_uv -+ /* [0x00000000] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000008] */ 0x0c9a0f80, 0x10020427, // add ra_x_base, unif, elem_num -++/* [0x00000008] */ 0x0c9a0f80, 0x10020427, // add ra_x, unif, elem_num -+ /* [0x00000010] */ 0x15827d80, 0x10020767, // mov ra_y, unif -+-/* [0x00000018] */ 0x15827d80, 0x10020627, // mov ra_x2_base, unif -++/* [0x00000018] */ 0x15827d80, 0x10020627, // mov ra_frame_base, unif -+ /* [0x00000020] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000028] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_x2_base -++/* [0x00000028] */ 0x0d620f80, 0x10020667, // sub ra_u2v_ref_offset, unif, ra_frame_base -+ /* [0x00000030] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+ /* [0x00000038] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+ /* [0x00000040] */ 0x15827d80, 0x10021427, // mov rb16, unif -+@@ -35,360 +35,708 @@ unsigned int rpi_shader[] = { -+ /* [0x00000050] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+ /* [0x00000058] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+ /* [0x00000060] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000068] */ 0x00000020, 0xe0020567, // mov ra21, 32 -+-/* [0x00000070] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x00000078] */ 0x00000008, 0xe00205e7, // mov ra23, 8 -+-/* [0x00000080] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -+-/* [0x00000088] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000090] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000098] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x000000a0] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x000000a8] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x000000b0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x000000b8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x000000c0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x000000c8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x000000d0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x000000d8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000e0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000000e8] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x000000f0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000000f8] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000100] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000108] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000110] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000118] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000120] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000128] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000130] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000138] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000140] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000148] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x00000150] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000158] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000160] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000168] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000170] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000178] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000180] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000188] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000190] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000198] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -+-/* [0x000001a0] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -+-/* [0x000001a8] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -+-/* [0x000001b0] */ 0x15427d80, 0x10020827, // mov r0, ra_x_base -+-/* [0x000001b8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000001c0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_x2_base -+-/* [0x000001c8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001d0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001d8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001e0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001e8] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x_base, r0 -+-/* [0x000001f0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001f8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x00000200] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_x2_base, r2 -+-/* [0x00000208] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000210] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000218] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000220] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000228] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000230] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000238] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000240] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000248] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000250] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x_base -+-/* [0x00000258] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_x2_base -++/* [0x00000068] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000070] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000078] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000080] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000088] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000090] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000098] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x000000a0] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x000000a8] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x000000b0] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x000000d0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x000000d8] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x000000e0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x000000e8] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x000000f0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x000000f8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000100] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000108] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000110] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000118] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000120] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000128] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000130] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000138] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x00000140] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000148] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000150] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000158] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000160] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000168] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000170] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000178] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000180] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000188] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -++/* [0x00000190] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x00000198] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -++/* [0x000001a0] */ 0x15427d80, 0x10020827, // mov r0, ra_x -++/* [0x000001a8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000001b0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -++/* [0x000001b8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000001c0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001c8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001d0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001d8] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -++/* [0x000001e0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001e8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x000001f0] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -++/* [0x000001f8] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x00000200] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000208] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000218] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000220] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000228] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000230] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000238] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000240] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -++/* [0x00000248] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -+ // ::mc_filter_uv -+-/* [0x00000260] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000268] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000270] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000278] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000280] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000288] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000290] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000298] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000002a0] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000002a8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002b0] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000002b8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002c0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002c8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002d0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002d8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002e0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002e8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002f0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002f8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000300] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000308] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000310] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000318] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000340] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000350] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000358] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000360] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000368] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000370] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000378] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000380] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000388] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000390] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -+-/* [0x00000398] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000003a0] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -+-/* [0x000003a8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000003b0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000258] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000260] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000268] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000270] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000278] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000280] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000288] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000290] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000298] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000002a0] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x000002a8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002b0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002b8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002c0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002c8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002d0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002d8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002e0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002e8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002f0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002f8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000300] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000330] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000340] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000348] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000350] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000358] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000360] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000368] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000370] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000378] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000380] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -++/* [0x00000388] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000390] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -++/* [0x00000398] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000003a0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003b8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003c0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x000003c8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x000003d0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003d8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003e0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003e8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003f0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003f8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000400] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000408] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000410] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000418] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000420] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000428] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000430] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000438] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000440] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000448] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000450] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000458] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000460] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000468] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000470] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000478] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000480] */ 0x00000020, 0xe0021327, // mov rb12,32 -+-/* [0x00000488] */ 0x00000006, 0xe0021367, // mov rb13,6 -+-/* [0x00000490] */ 0x00000001, 0xe00213a7, // mov rb14,1 -+-/* [0x00000498] */ 0x00000000, 0xe00213e7, // mov rb15,0 -+-/* [0x000004a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000004a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000004b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000004b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000004c0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000004c8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000004d0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000004d8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x000004e0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x000004e8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x000004f0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004f8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x00000500] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000508] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000510] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000518] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000520] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000528] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000530] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000538] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000540] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000548] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000550] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000003a8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003b0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x000003b8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x000003c0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003c8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003d0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003d8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003e0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000400] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000420] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000430] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000440] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000448] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000450] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000458] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000460] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000468] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000470] */ 0x00000020, 0xe0021327, // mov rb12,32 -++/* [0x00000478] */ 0x00000006, 0xe0021367, // mov rb13,6 -++/* [0x00000480] */ 0x00000001, 0xe00213a7, // mov rb14,1 -++/* [0x00000488] */ 0x00000000, 0xe00213e7, // mov rb15,0 -++/* [0x00000490] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000498] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000004a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000004a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000004b0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000004b8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000004c0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000004c8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x000004d0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x000004d8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x000004e0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004e8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x000004f0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004f8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000500] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000508] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000510] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000518] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000520] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000528] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000530] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000538] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000540] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x00000558] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000560] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000568] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000570] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000578] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000580] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000588] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000590] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000598] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x000005a0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000005a8] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x000005b0] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x000005b8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000005c0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005c8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000005d0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000005d8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000005e0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000005e8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000005f0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000005f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000600] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000608] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000610] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000618] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000620] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000628] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000630] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000638] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000640] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000648] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000650] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000658] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000660] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000668] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000670] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000678] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000548] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000550] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000558] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000560] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000568] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000570] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000578] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000580] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000588] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000590] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000598] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x000005a0] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x000005a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000005b0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000005c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000005c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000005d0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000005d8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000005e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000005e8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000005f0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005f8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000600] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000608] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000610] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000618] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000620] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000628] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000630] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000638] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000640] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000648] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000650] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000658] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000668] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000680] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000688] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000690] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000698] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000006a0] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000006a8] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000006b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000006b8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000006c0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x000006c8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x000006d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000006d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000006e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000006e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000700] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000708] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000710] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000718] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000720] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000728] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000730] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000738] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000740] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000748] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000750] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000758] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000760] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000768] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000770] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x00000778] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000780] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x00000788] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000790] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000798] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x000007a0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007b0] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000670] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000678] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x00000680] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000688] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000690] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000698] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000006a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000006a8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000006b0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000006b8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x000006c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000006c8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000006d0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000006d8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006e0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006e8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000006f0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006f8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000700] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000708] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000710] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000718] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000720] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000728] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000730] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000738] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000740] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000748] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000750] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000758] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000760] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000768] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000770] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000778] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000780] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000788] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000790] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000798] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007a0] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x000007b8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000007c0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007c8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007d0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007d8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007e0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007e8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007f0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007f8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_base_next, r0, ~3 -+-/* [0x00000800] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000808] */ 0x0c9d3e80, 0x100206a7, // add ra_x2_base_next, rb_x_base_next, r2 -+-/* [0x00000810] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000818] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000820] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000828] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000830] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000838] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000840] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000848] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000850] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000858] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000860] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000868] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000870] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000878] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000880] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000888] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000890] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000898] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000008b8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008d0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x000008d8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008e0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008e8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008f0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008f8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000007a8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000007b0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007c0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007c8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007d0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007d8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007e0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007e8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x000007f0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007f8] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000800] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000808] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000810] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000830] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000838] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000858] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000860] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000880] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000888] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000890] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000898] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000008a8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008c0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000008c8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008d0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008d8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008e0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008e8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x00000900] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000908] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x_base, rb_x_base_next ; ldtmu0 -+-/* [0x00000910] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_x2_base, ra_x2_base_next ; mov rb31, r3 -+-/* [0x00000918] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000920] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000928] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000930] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000938] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000940] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x_base, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000948] */ 0x0c627c80, 0x10020e27, // add t0s, ra_x2_base, r2 -+-/* [0x00000950] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000958] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000960] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000968] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000970] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000978] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000980] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000988] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000990] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000998] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x000009a0] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x000009a8] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009b0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009b8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000009c0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000009c8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009d0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009d8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009e0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x00000a00] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x00000a08] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000a10] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a18] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a20] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a28] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a30] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a38] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a40] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a48] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a50] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a58] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a60] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a68] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a70] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008f0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008f8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x00000900] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000908] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000910] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000918] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000920] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000928] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000930] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x00000938] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x00000940] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000948] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000950] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000958] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000960] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000968] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000970] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000978] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000980] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000988] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000990] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000998] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009a0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000009a8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000009b0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000009b8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009c0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009c8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009d0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009d8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009e0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009e8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000009f0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x000009f8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000a00] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000a08] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a10] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a18] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a20] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a28] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a30] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a38] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a40] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a48] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a50] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a58] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a60] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a78] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a80] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a68] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a70] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a98] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000aa0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000ab0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a98] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000aa0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000aa8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000ac0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ab0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ae0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b10] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b18] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b20] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b28] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b30] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b10] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b18] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b20] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_setup -++/* [0x00000b28] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000b30] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000b38] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000b40] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000b48] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000b50] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000b58] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00000b60] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000b68] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000b70] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000b78] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000b80] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000b88] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -++/* [0x00000b90] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000b98] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000ba0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000ba8] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000bb0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -++/* [0x00000bb8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000bc0] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000bc8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000bd0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000bd8] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000be0] */ 0x8c9e7452, 0x10025e19, // add t0s, r2, r1 ; mov ra_frame_base2, r2 -++/* [0x00000be8] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00000bf0] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00000bf8] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00000c00] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000c08] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000c10] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000c18] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000c20] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000c28] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000c30] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000c38] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000c40] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000c48] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000c50] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00000c58] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00000c60] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00000c68] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00000c70] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00000c78] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00000c80] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00000c88] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000c90] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000c98] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000ca0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000ca8] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000cb0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000cb8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000cc0] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000cc8] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000cd0] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000cd8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000ce0] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000ce8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000cf0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000cf8] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000d00] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000d08] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000d10] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000d18] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000d20] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000d28] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000d30] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000d38] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000d40] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d48] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000d50] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d58] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x00000d60] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -++/* [0x00000d68] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d70] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000d78] */ 0x0c541dc0, 0xd0020567, // add ra_y2, ra_y2, 1 -++/* [0x00000d80] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d88] */ 0x0c667380, 0x10020e27, // add t0s, r1, ra_frame_base2 -++// ::mc_filter -++/* [0x00000d90] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000d98] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000da0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000da8] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -++/* [0x00000db0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000db8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000dc0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000dc8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000dd0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000dd8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000de0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -++/* [0x00000de8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000df0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -++/* [0x00000df8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000e00] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000e08] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -++/* [0x00000e10] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000e18] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x00000e20] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e28] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000e30] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e38] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000e40] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000e48] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000e50] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000e58] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000e60] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000e68] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000e70] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000e78] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000e80] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e88] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000e90] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000e98] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ea0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ea8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000eb0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000eb8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ed0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000ed8] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000ee0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ef8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000f00] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000f08] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f10] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f18] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f20] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -++/* [0x00000f28] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000f30] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000f38] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000f40] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000f48] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000f50] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :yloop -++/* [0x00000f58] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000f60] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++/* [0x00000f68] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000f70] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000f78] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00000f80] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00000f88] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000f90] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000f98] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000fa0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00000fa8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x00000fb0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000fb8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x00000fc0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++/* [0x00000fc8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000fd0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000fd8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000fe0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000fe8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000ff0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000ff8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001000] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001008] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001010] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001018] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001020] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001028] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001030] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001038] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001040] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001048] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001050] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001058] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -++/* [0x00001060] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001068] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001070] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001078] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001080] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001088] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001090] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001098] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000010a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000010a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000010b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000010b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000010c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000010c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000010d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000010d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000010e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000010e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000010f0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000010f8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x00001100] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x00001108] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x00001110] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001118] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00001120] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001128] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001130] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001138] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001140] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001148] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_filter_b -++/* [0x00001150] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001158] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001160] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00001168] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -++/* [0x00001170] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00001178] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00001180] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00001188] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00001190] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00001198] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000011a0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -++/* [0x000011a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000011b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -++/* [0x000011b8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x000011c0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x000011c8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -++/* [0x000011d0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000011d8] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x000011e0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000011e8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000011f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000011f8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00001200] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00001208] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00001210] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00001218] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00001220] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00001228] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001230] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001238] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00001240] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001248] */ 0x00000001, 0xe0020867, // mov r1, 1 -++/* [0x00001250] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001258] */ 0x409f3001, 0xd00049e0, // nop ; mul24 r0, r0 << 13, r1 << 13 -++/* [0x00001260] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001268] */ 0x409f2001, 0xd00049e0, // nop ; mul24 r0, r0 << 14, r1 << 14 -++/* [0x00001270] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001278] */ 0x409f1001, 0xd00049e0, // nop ; mul24 r0, r0 << 15, r1 << 15 -++/* [0x00001280] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001288] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00001290] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001298] */ 0x409f7001, 0xd00049e0, // nop ; mul24 r0, r0 << 9, r1 << 9 -++/* [0x000012a0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012a8] */ 0x409f6001, 0xd00049e0, // nop ; mul24 r0, r0 << 10, r1 << 10 -++/* [0x000012b0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012b8] */ 0x409f5001, 0xd00049e0, // nop ; mul24 r0, r0 << 11, r1 << 11 -++/* [0x000012c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012c8] */ 0x409f4001, 0xd00049e0, // nop ; mul24 r0, r0 << 12, r1 << 12 -++/* [0x000012d0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000012d8] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x000012e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00001300] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001308] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001310] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001318] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001320] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -++/* [0x00001328] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001330] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001338] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00001340] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001348] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00001350] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++// :yloopb -++/* [0x00001358] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001360] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++/* [0x00001368] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00001370] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001378] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00001380] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00001388] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001390] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001398] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000013a0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x000013a8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x000013b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000013b8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x000013c0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++/* [0x000013c8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000013d0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000013d8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000013e0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000013e8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000013f0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000013f8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001400] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001408] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001410] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001418] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001420] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001428] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001430] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001438] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001440] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001448] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001450] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001458] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -++/* [0x00001460] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001468] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001470] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001478] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001480] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001488] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001490] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001498] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000014a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000014a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000014b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000014b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000014c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000014c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000014d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000014d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000014e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000014e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000014f0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000014f8] */ 0x4053800e, 0xd00049e1, // nop ; mul24 r1, r1 << 8, ra20 << 8 -++/* [0x00001500] */ 0x4c78e38f, 0x10024860, // add r1, r1, ra30 ; mul24 r0, r1, rb14 -++/* [0x00001508] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00001510] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001518] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00001520] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001528] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001530] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001538] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001540] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001548] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++// ::mc_interrupt_exit12 -++/* [0x00001550] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001558] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001560] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001568] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001570] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001578] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001580] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001588] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001590] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001598] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000015d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000015d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000015e0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index cec9901..3fa8531 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,11 +4,15 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 152) -+-#define mc_filter_uv_b0 (rpi_shader + 342) -+-#define mc_filter_uv_b (rpi_shader + 494) -+-#define mc_exit (rpi_shader + 670) -+-#define mc_interrupt_exit8 (rpi_shader + 688) -+-#define mc_end (rpi_shader + 718) -++#define mc_filter_uv (rpi_shader + 148) -++#define mc_filter_uv_b0 (rpi_shader + 338) -++#define mc_filter_uv_b (rpi_shader + 490) -++#define mc_exit (rpi_shader + 666) -++#define mc_interrupt_exit8 (rpi_shader + 684) -++#define mc_setup (rpi_shader + 714) -++#define mc_filter (rpi_shader + 868) -++#define mc_filter_b (rpi_shader + 1108) -++#define mc_interrupt_exit12 (rpi_shader + 1364) -++#define mc_end (rpi_shader + 1402) -+ -+ #endif -+diff --git a/libavcodec/rpi_user_vcsm.h b/libavcodec/rpi_user_vcsm.h -+index fbebbbe..95e6de1 100644 -+--- a/libavcodec/rpi_user_vcsm.h -++++ b/libavcodec/rpi_user_vcsm.h -+@@ -418,6 +418,28 @@ int vcsm_unlock_hdl( unsigned int handle ); -+ */ -+ int vcsm_unlock_hdl_sp( unsigned int handle, int cache_no_flush ); -+ -++/* Clean and/or invalidate the memory associated with this user opaque handle -++** -++** Returns: non-zero on error -++** -++** structure contains a list of flush/invalidate commands. Commands are: -++** 0: nop -++** 1: invalidate given physical range in L2 -++** 2: clean given physical range in L2 -++** 3: clean+invalidate all of L1 -++** 4: flush all of L2 and all of L1 -++*/ -++struct vcsm_user_clean_invalid_s { -++ struct { -++ unsigned int cmd; -++ unsigned int addr; -++ unsigned int size; -++ } s[8]; -++}; -++ -++int vcsm_clean_invalid( unsigned int handle, struct vcsm_user_clean_invalid_s *s ); -++ -++ -+ #ifdef __cplusplus -+ } -+ #endif -+-- -+2.7.4 -+ -+ -+From 09685ab55aecb9400e354522894e0fbbb6381ca9 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 20 May 2015 21:12:55 +0100 -+Subject: [PATCH 43/68] Added multi mailbox - not working -+ -+--- -+ libavcodec/hevc.c | 40 ++++++++++++++++++++++++++++--- -+ libavcodec/rpi_mailbox.c | 47 +++++++++++++++++++++++++++++++++++++ -+ libavcodec/rpi_mailbox.h | 5 ++++ -+ libavcodec/rpi_qpu.c | 61 ++++++++++++++++++++++++++++++++++++++++++++---- -+ libavcodec/rpi_qpu.h | 2 ++ -+ 5 files changed, 147 insertions(+), 8 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 951e2d3..ab63efd 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -47,6 +47,11 @@ -+ //#define EARLY_MALLOC -+ // Move Inter prediction into separate pass -+ #define RPI_INTER -++ -++ #ifdef RPI_INTER_QPU -++ // Define RPI_MULTI_MAILBOX to use the updated mailbox that can launch both QPU and VPU -++ #define RPI_MULTI_MAILBOX -++ #endif -+ #endif -+ -+ // #define DISABLE_MC -+@@ -2843,10 +2848,14 @@ static void rpi_inter_clear(HEVCContext *s) -+ static void rpi_execute_inter_qpu(HEVCContext *s) -+ { -+ int k; -++ int i; -+ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -+- -+- if (s->sh.slice_type == I_SLICE) -+- return; -++ if (s->sh.slice_type == I_SLICE) { -++#ifdef RPI_MULTI_MAILBOX -++ rpi_execute_transform(s); -++ return; -++#endif -++ } -+ for(k=0;k<8;k++) { -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+@@ -2856,6 +2865,22 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ -++#ifdef RPI_MULTI_MAILBOX -++ gpu_cache_flush(&s->coeffs_buf_accelerated); -++ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, -++ qpu_get_fn(QPU_MC_SETUP_UV), -++ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ ); -++ for(i=0;i<4;i++) -++ s->num_coeffs[i] = 0; -++#else -+ qpu_run_shader8(qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+@@ -2866,6 +2891,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -+ ); -++#endif -+ } -+ #endif -+ -+@@ -2945,6 +2971,12 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+ // Transform all blocks -+ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -++#ifdef RPI_MULTI_MAILBOX -++ // Kick off inter prediction on QPUs -++ rpi_execute_inter_qpu(s); -++ // Perform luma inter prediction -++ rpi_execute_inter_cmds(s); -++#else -+ rpi_execute_transform(s); -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+@@ -2952,6 +2984,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ // Kick off inter prediction on QPUs -+ rpi_execute_inter_qpu(s); -+ #endif -++#endif -++ -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -+ -+diff --git a/libavcodec/rpi_mailbox.c b/libavcodec/rpi_mailbox.c -+index 77a56dd..3904efc 100644 -+--- a/libavcodec/rpi_mailbox.c -++++ b/libavcodec/rpi_mailbox.c -+@@ -276,6 +276,53 @@ unsigned execute_qpu(int file_desc, unsigned num_qpus, unsigned control, unsigne -+ return p[5]; -+ } -+ -++void execute_multi(int file_desc, -++ unsigned num_qpus, unsigned control, unsigned noflush, unsigned timeout, -++ unsigned num_qpus_2, unsigned control_2, unsigned noflush_2, unsigned timeout_2, -++ unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -++ unsigned code_2, unsigned r0_2, unsigned r1_2, unsigned r2_2, unsigned r3_2, unsigned r4_2, unsigned r5_2) { -++ int i=0; -++ unsigned p[32]; -++ -++ p[i++] = 0; // size -++ p[i++] = 0x00000000; // process request -++ p[i++] = 0x30018; // (the tag id) -++ p[i++] = 88; // (size of the buffer) -++ p[i++] = 88; // (size of the data) -++ -++ p[i++] = num_qpus; -++ p[i++] = control; -++ p[i++] = noflush; -++ p[i++] = timeout; // ms -++ -++ p[i++] = num_qpus_2; -++ p[i++] = control_2; -++ p[i++] = noflush_2; -++ p[i++] = timeout_2; // ms -++ -++ p[i++] = code; -++ p[i++] = r0; -++ p[i++] = r1; -++ p[i++] = r2; -++ p[i++] = r3; -++ p[i++] = r4; -++ p[i++] = r5; -++ -++ p[i++] = code_2; -++ p[i++] = r0_2; -++ p[i++] = r1_2; -++ p[i++] = r2_2; -++ p[i++] = r3_2; -++ p[i++] = r4_2; -++ p[i++] = r5_2; -++ -++ p[i++] = 0x00000000; // end tag -++ p[0] = i*sizeof *p; // actual size -++ -++ mbox_property(file_desc, p); -++ return; -++} -++ -+ int mbox_open() { -+ int file_desc; -+ -+diff --git a/libavcodec/rpi_mailbox.h b/libavcodec/rpi_mailbox.h -+index c264d2e..5898102 100644 -+--- a/libavcodec/rpi_mailbox.h -++++ b/libavcodec/rpi_mailbox.h -+@@ -15,6 +15,11 @@ extern void unmapmem(void *addr, unsigned size); -+ -+ extern unsigned execute_code(int file_desc, unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -+ extern unsigned execute_qpu(int file_desc, unsigned num_qpus, unsigned control, unsigned noflush, unsigned timeout); -++extern void execute_multi(int file_desc, -++ unsigned num_qpus, unsigned control, unsigned noflush, unsigned timeout, -++ unsigned num_qpus_2, unsigned control_2, unsigned noflush_2, unsigned timeout_2, -++ unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -++ unsigned code_2, unsigned r0_2, unsigned r1_2, unsigned r2_2, unsigned r3_2, unsigned r4_2, unsigned r5_2); -+ extern unsigned qpu_enable(int file_desc, unsigned enable); -+ -+ #endif -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index fd8a276..feb3284 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -123,7 +123,7 @@ static pthread_cond_t post_cond_head = PTHREAD_COND_INITIALIZER; -+ static pthread_cond_t post_cond_tail = PTHREAD_COND_INITIALIZER; -+ static pthread_mutex_t post_mutex = PTHREAD_MUTEX_INITIALIZER; -+ -+-static int vpu_cmds[MAXCMDS][8]; -++static int vpu_cmds[MAXCMDS][16]; -+ static volatile int vpu_async_tail=0; // Contains the number of posted jobs -+ static volatile int vpu_async_head=0; -+ #endif -+@@ -346,6 +346,7 @@ unsigned int vpu_get_constants(void) { -+ static void *vpu_start(void *arg) { -+ while(1) { -+ int *p; -++ int qpu_code; -+ pthread_mutex_lock(&post_mutex); -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+@@ -358,12 +359,25 @@ static void *vpu_start(void *arg) { -+ if (p[6] == -1) { -+ break; // Last job -+ } -+- if (p[7]) { -++ qpu_code = p[7]; -++ //if (p[7]) { -+ //GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -+ //gpu_cache_flush(buf); -+- } -+- vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -++ //} -++ if (!qpu_code) { -++ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -++ } else { -++ int i; -++ for(i=0;i<8;i++) { -++ gpu->mail[i*2] = p[8+i]; -++ gpu->mail[i*2 + 1] = qpu_code; -++ } -+ -++ execute_multi(gpu->mb,8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -++ 0, 0, 0, 0, -++ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -++ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -++ } -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+ pthread_cond_broadcast(&post_cond_head); -+@@ -400,7 +414,43 @@ int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned -+ p[4] = r3; -+ p[5] = r4; -+ p[6] = r5; -+- p[7] = (int) buf; -++ p[7] = 0; -++ if (num<=1) -++ pthread_cond_broadcast(&post_cond_tail); // Otherwise the vpu thread must already be awake -++ pthread_mutex_unlock(&post_mutex); -++ return id; -++ } -++} -++ -++int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -++ int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8) -++{ -++ -++ pthread_mutex_lock(&post_mutex); -++ { -++ int id = vpu_async_tail++; -++ int *p = vpu_cmds[id%MAXCMDS]; -++ int num = vpu_async_tail - vpu_async_head; -++ if (num>MAXCMDS) { -++ printf("Too many commands submitted\n"); -++ exit(-1); -++ } -++ p[0] = vpu_code; -++ p[1] = r0; -++ p[2] = r1; -++ p[3] = r2; -++ p[4] = r3; -++ p[5] = r4; -++ p[6] = r5; -++ p[7] = qpu_code; -++ p[8 ] = unifs1; -++ p[9 ] = unifs2; -++ p[10] = unifs3; -++ p[11] = unifs4; -++ p[12] = unifs5; -++ p[13] = unifs6; -++ p[14] = unifs7; -++ p[15] = unifs8; -+ if (num<=1) -+ pthread_cond_broadcast(&post_cond_tail); // Otherwise the vpu thread must already be awake -+ pthread_mutex_unlock(&post_mutex); -+@@ -966,6 +1016,7 @@ void rpi_do_block(const uint8_t *in_buffer_vc, int src_pitch, uint8_t *dst_vc, i -+ } -+ -+ -++ -+ #endif -+ -+ #endif // RPI -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 88965e5..2f08f03 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -41,6 +41,8 @@ extern unsigned int vpu_get_fn(void); -+ extern unsigned int vpu_get_constants(void); -+ extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -+ extern int vpu_post_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf); -++int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -++ int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+ extern void vpu_wait( int id); -+ -+ // Simple test of shader code -+-- -+2.7.4 -+ -+ -+From 311f2da06d13a98d9bdda2df8684d7cf55b9a08e Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 21 May 2015 16:50:02 +0100 -+Subject: [PATCH 44/68] Pass qpu number in as uniform -+ -+--- -+ libavcodec/hevc.c | 2 +- -+ libavcodec/rpi_shader.c | 1288 ++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 20 +- -+ libavcodec/rpi_shader.qasm | 10 +- -+ 4 files changed, 657 insertions(+), 663 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index ab63efd..caadfaa 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -2834,6 +2834,7 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = pic_height; -+ *s->u_mvs[i]++ = s->frame->linesize[1]; -+ *s->u_mvs[i]++ = s->frame->linesize[2]; -++ *s->u_mvs[i]++ = i; -+ if (weight_flag) { -+ *s->u_mvs[i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -+ *s->u_mvs[i]++ = s->sh.chroma_log2_weight_denom + 6; -+@@ -2841,7 +2842,6 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = 1 << 5; -+ *s->u_mvs[i]++ = 6; -+ } -+- s->u_mvs[i] += 1; // Padding words -+ } -+ } -+ -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index 9c30e32..a0f0282 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -48,8 +48,8 @@ unsigned int rpi_shader[] = { -+ /* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+ /* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+ /* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000d0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x000000d8] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x000000d0] */ 0x15827d80, 0x100208e7, // mov r3, unif -++/* [0x000000d8] */ 0x119c17c0, 0xd00208a7, // shl r2, r3, 1 -+ /* [0x000000e0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+ /* [0x000000e8] */ 0x159e7480, 0x10020867, // mov r1, r2 -+ /* [0x000000f0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+@@ -60,669 +60,669 @@ unsigned int rpi_shader[] = { -+ /* [0x00000118] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+ /* [0x00000120] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+ /* [0x00000128] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000130] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000138] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-/* [0x00000140] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000148] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000150] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000158] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000160] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000168] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000170] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000178] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000180] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000188] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -+-/* [0x00000190] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -+-/* [0x00000198] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -+-/* [0x000001a0] */ 0x15427d80, 0x10020827, // mov r0, ra_x -+-/* [0x000001a8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000001b0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -+-/* [0x000001b8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001c0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001c8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001d0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001d8] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -+-/* [0x000001e0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001e8] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x000001f0] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -+-/* [0x000001f8] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x00000200] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000208] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000210] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000218] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000220] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000228] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000230] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000238] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000240] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -+-/* [0x00000248] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x00000130] */ 0x119c17c0, 0xd00208a7, // shl r2, r3, 1 -++/* [0x00000138] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000140] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000148] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000150] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000158] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000160] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000168] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000170] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000178] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000180] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -++/* [0x00000188] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x00000190] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -++/* [0x00000198] */ 0x15427d80, 0x10020827, // mov r0, ra_x -++/* [0x000001a0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000001a8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -++/* [0x000001b0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000001b8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000001c0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000001c8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000001d0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -++/* [0x000001d8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x000001e0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x000001e8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -++/* [0x000001f0] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -++/* [0x000001f8] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000200] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000208] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000210] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000218] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000220] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000228] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000230] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -++/* [0x00000238] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -+ // ::mc_filter_uv -+-/* [0x00000250] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000258] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000260] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000268] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000270] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000278] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000280] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000288] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000290] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x00000298] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000002a0] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x000002a8] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002b0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002b8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002c0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002c8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002d0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002d8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002e0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002e8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002f0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002f8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000300] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000308] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000310] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000320] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000330] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000340] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000348] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000350] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000358] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000360] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000368] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000370] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000378] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000380] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -+-/* [0x00000388] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000390] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -+-/* [0x00000398] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000003a0] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000240] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000248] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000250] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000258] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000260] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000268] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000270] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000278] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000280] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000288] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000290] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000298] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000002a0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000002a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002b0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000002b8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000002c0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000002c8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000002d0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002d8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000002f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000002f8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000300] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000308] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000310] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000318] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000320] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000328] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000330] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000338] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000340] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000348] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000350] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000358] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000360] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000368] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000370] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -++/* [0x00000378] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000380] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -++/* [0x00000388] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000390] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x000003a8] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003b0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x000003b8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x000003c0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003c8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003d0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003d8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003e0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003e8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003f0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x000003f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000400] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000408] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000410] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000418] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000420] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000428] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000430] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000438] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000440] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000448] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000450] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000458] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000460] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000468] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000470] */ 0x00000020, 0xe0021327, // mov rb12,32 -+-/* [0x00000478] */ 0x00000006, 0xe0021367, // mov rb13,6 -+-/* [0x00000480] */ 0x00000001, 0xe00213a7, // mov rb14,1 -+-/* [0x00000488] */ 0x00000000, 0xe00213e7, // mov rb15,0 -+-/* [0x00000490] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000498] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000004a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000004a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000004b0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000004b8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000004c0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000004c8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x000004d0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x000004d8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x000004e0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004e8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x000004f0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004f8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000500] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000508] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000510] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000518] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000520] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000528] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000530] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000538] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000540] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000398] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000003a0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x000003a8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x000003b0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000003b8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000003c0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000003c8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000003d0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003d8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000003e0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x000003e8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003f0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003f8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000400] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000408] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000410] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000418] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000420] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000428] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000430] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000438] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000440] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000448] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000450] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000458] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000460] */ 0x00000020, 0xe0021327, // mov rb12,32 -++/* [0x00000468] */ 0x00000006, 0xe0021367, // mov rb13,6 -++/* [0x00000470] */ 0x00000001, 0xe00213a7, // mov rb14,1 -++/* [0x00000478] */ 0x00000000, 0xe00213e7, // mov rb15,0 -++/* [0x00000480] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000488] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000490] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000498] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000004a0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000004a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000004b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000004b8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x000004c0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x000004c8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x000004d0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x000004d8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x000004e0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000004e8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000004f0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004f8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000500] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000508] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000510] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000518] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000520] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000528] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000530] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x00000548] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000550] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000558] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000560] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000568] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000570] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000578] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000580] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000588] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x00000590] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000598] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x000005a0] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x000005a8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000005b0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005b8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000005c0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000005c8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000005d0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000005d8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000005e0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000005e8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000005f0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005f8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000600] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000608] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000610] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000618] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000620] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000628] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000630] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000638] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000640] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000648] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000650] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000658] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000660] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000668] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000538] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000540] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000548] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000550] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000558] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000560] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000568] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000570] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000578] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000580] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000588] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000590] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000598] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000005a0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005a8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000005b0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000005b8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000005c0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000005c8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000005d0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000005d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000005e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000005e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000005f0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005f8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000600] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000608] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000610] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000618] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000620] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000628] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000630] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000638] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000640] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000648] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000650] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000658] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000670] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000678] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x00000680] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000688] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000690] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000698] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000006a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000006a8] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000006b0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x000006b8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x000006c0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000006c8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000006d0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000006d8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006e0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006e8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000006f0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006f8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000700] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000708] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000710] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000718] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000720] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000728] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000730] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000738] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000740] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000748] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000750] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000758] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000760] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x00000768] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000770] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x00000778] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000780] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000788] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000790] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000798] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000007a0] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000660] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000668] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x00000670] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000678] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000680] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000688] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000690] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000698] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000006a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000006a8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x000006b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000006b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000006c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000006c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000006d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000006d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000006e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000006e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000006f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000700] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000708] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000710] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000718] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000720] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000728] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000730] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000738] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000740] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000748] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000750] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000758] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000760] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000768] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000770] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000778] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000780] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000788] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000790] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x000007a8] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000007b0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007b8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007c0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007c8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007d0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007d8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007e0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007e8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x000007f0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007f8] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x00000800] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000808] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000810] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000818] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000820] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000828] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000830] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000838] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000840] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000848] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000850] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000858] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000860] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000868] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000870] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000878] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000880] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000888] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000890] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000898] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x000008a8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008c0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x000008c8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008d0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008d8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008e0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008e8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000798] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000007a0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000007a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000007b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x000007b8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x000007c0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x000007c8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x000007d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x000007d8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x000007e0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x000007e8] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x000007f0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007f8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000800] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000808] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000810] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000818] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000820] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000828] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000830] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000838] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x00000840] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x00000848] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x00000850] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000858] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000860] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000868] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000870] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000878] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000880] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000888] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000890] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000898] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008a8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000008b0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000008b8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008c0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000008c8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000008d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008d8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008f0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008f8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x00000900] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000908] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000910] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000918] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000920] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000928] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000930] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000938] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x00000940] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000948] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000950] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000958] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000960] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000968] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000970] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000978] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000980] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000988] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000990] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000998] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009a0] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x000009a8] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000009b0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000009b8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009c0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009c8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009d0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009d8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009e0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009e8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000009f0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x000009f8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x00000a00] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000a08] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a10] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a18] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a20] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a28] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a30] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a38] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a40] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a48] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a50] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a58] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a60] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000008e0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x000008e8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++/* [0x000008f0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x000008f8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000900] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000908] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000910] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000918] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000920] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x00000928] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -++/* [0x00000930] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000938] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000940] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000948] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000950] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000958] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000960] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000968] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000970] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000978] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000980] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000988] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000990] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000998] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000009a0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000009a8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000009b0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000009b8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000009c0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000009c8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000009d0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000009d8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000009e0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x000009e8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x000009f0] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009f8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00000a00] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000a08] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000a10] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00000a18] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a20] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000a28] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x00000a30] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a38] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000a40] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x00000a48] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00000a50] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a68] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a70] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a58] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a60] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a68] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a70] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a88] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a90] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a98] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000aa0] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000aa8] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a88] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a90] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a98] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000ab0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000aa0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000aa8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ab0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ad0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000ac8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000ad0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b00] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b08] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b10] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b18] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b20] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000b00] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000b08] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000b10] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_setup -+-/* [0x00000b28] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000b30] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000b38] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000b40] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000b48] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000b50] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000b58] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x00000b60] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000b68] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -+-/* [0x00000b70] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000b78] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000b80] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000b88] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -+-/* [0x00000b90] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000b98] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000ba0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000ba8] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x00000bb0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -+-/* [0x00000bb8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000bc0] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -+-/* [0x00000bc8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000bd0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000bd8] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000be0] */ 0x8c9e7452, 0x10025e19, // add t0s, r2, r1 ; mov ra_frame_base2, r2 -+-/* [0x00000be8] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00000bf0] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x00000bf8] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x00000c00] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000c08] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x00000c10] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x00000c18] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000c20] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x00000c28] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -+-/* [0x00000c30] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000c38] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000c40] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00000c48] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x00000c50] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x00000c58] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x00000c60] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x00000c68] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x00000c70] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x00000c78] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x00000c80] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x00000c88] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000c90] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000c98] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000ca0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000ca8] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000cb0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000cb8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000cc0] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000cc8] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000cd0] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000cd8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000ce0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000ce8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000cf0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000cf8] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000d00] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000d08] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000d10] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000d18] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000d20] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000d28] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000d30] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000d38] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000d40] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000d48] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000d50] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000d58] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -+-/* [0x00000d60] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -+-/* [0x00000d68] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000d70] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000d78] */ 0x0c541dc0, 0xd0020567, // add ra_y2, ra_y2, 1 -+-/* [0x00000d80] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000d88] */ 0x0c667380, 0x10020e27, // add t0s, r1, ra_frame_base2 -++/* [0x00000b18] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000b20] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000b28] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000b30] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000b38] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000b40] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000b48] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00000b50] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000b58] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000b60] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000b68] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000b70] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000b78] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -++/* [0x00000b80] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000b88] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000b90] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000b98] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000ba0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -++/* [0x00000ba8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000bb0] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000bb8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000bc0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000bc8] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000bd0] */ 0x8c9e7452, 0x10025e19, // add t0s, r2, r1 ; mov ra_frame_base2, r2 -++/* [0x00000bd8] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -++/* [0x00000be0] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -++/* [0x00000be8] */ 0x15827d80, 0x10021427, // mov rb16, unif -++/* [0x00000bf0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000bf8] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000c00] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000c08] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000c10] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000c18] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000c20] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000c28] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000c30] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000c38] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000c40] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00000c48] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00000c50] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00000c58] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00000c60] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00000c68] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00000c70] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00000c78] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000c80] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000c88] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000c90] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000c98] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000ca0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000ca8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000cb0] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000cb8] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000cc0] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000cc8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000cd0] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000cd8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000ce0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000ce8] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000cf0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000cf8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000d00] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000d08] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000d10] */ 0x15827d80, 0x10021327, // mov rb12,unif -++/* [0x00000d18] */ 0x15827d80, 0x10021367, // mov rb13,unif -++/* [0x00000d20] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000d28] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000d30] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d38] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000d40] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d48] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x00000d50] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -++/* [0x00000d58] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d60] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000d68] */ 0x0c541dc0, 0xd0020567, // add ra_y2, ra_y2, 1 -++/* [0x00000d70] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d78] */ 0x0c667380, 0x10020e27, // add t0s, r1, ra_frame_base2 -+ // ::mc_filter -+-/* [0x00000d90] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000d98] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000da0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000da8] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -+-/* [0x00000db0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000db8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000dc0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000dc8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000dd0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000dd8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000de0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -+-/* [0x00000de8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000df0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -+-/* [0x00000df8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000e00] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x00000e08] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -+-/* [0x00000e10] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000e18] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -+-/* [0x00000e20] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000e28] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000e30] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e38] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000e40] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000e48] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000e50] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000e58] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000e60] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000e68] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000e70] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000e78] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000e80] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e88] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000e90] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000e98] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ea0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ea8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000eb0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000eb8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ec0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ec8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ed0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000ed8] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000ee0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ef8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000f00] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000f08] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f10] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f18] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f20] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -+-/* [0x00000f28] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000f30] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000f38] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000f40] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000f48] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000f50] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000d80] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000d88] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000d90] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000d98] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -++/* [0x00000da0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000da8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000db0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000db8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000dc0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000dc8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000dd0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -++/* [0x00000dd8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000de0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -++/* [0x00000de8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000df0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000df8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -++/* [0x00000e00] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000e08] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x00000e10] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e18] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000e20] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e28] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000e30] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000e38] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000e40] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000e48] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000e50] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000e58] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000e60] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000e68] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000e70] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e78] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000e80] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000e88] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000e90] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000e98] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000ea0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000ea8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000eb0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000eb8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x00000ec8] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000ed0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ed8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ee8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x00000ef0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000ef8] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f00] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f08] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000f10] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -++/* [0x00000f18] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000f20] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -++/* [0x00000f28] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000f30] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000f38] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00000f40] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :yloop -+-/* [0x00000f58] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000f60] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-/* [0x00000f68] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000f70] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000f78] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -+-/* [0x00000f80] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -+-/* [0x00000f88] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000f90] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000f98] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000fa0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000fa8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -+-/* [0x00000fb0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000fb8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-/* [0x00000fc0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000fc8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000fd0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000fd8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000fe0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000fe8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000ff0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000ff8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00001000] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00001008] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00001010] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00001018] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00001020] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00001028] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00001030] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001038] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001040] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001048] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001050] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001058] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -+-/* [0x00001060] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001068] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001070] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001078] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001080] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -+-/* [0x00001088] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001090] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00001098] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000010a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000010a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000010b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000010b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000010c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-/* [0x000010c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-/* [0x000010d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-/* [0x000010d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -+-/* [0x000010e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000010e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000010f0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000010f8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x00001100] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x00001108] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x00001110] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -+-/* [0x00001118] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x00001120] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00001128] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00001130] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001138] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001140] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001148] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000f48] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000f50] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++/* [0x00000f58] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000f60] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000f68] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00000f70] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00000f78] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000f80] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000f88] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000f90] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00000f98] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x00000fa0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000fa8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x00000fb0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++/* [0x00000fb8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000fc0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000fc8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000fd0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000fd8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000fe0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000fe8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000ff0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000ff8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001000] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001008] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001010] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001018] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001020] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001028] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001030] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001038] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001040] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001048] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -++/* [0x00001050] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001058] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001060] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001068] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001070] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001078] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001080] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001088] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00001090] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00001098] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000010a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000010a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000010b0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000010b8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000010c0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000010c8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000010d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000010d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000010e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000010e8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x000010f0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x000010f8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x00001100] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001108] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00001110] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001118] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001120] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001128] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001130] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001138] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_b -+-/* [0x00001150] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001158] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001160] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00001168] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -+-/* [0x00001170] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00001178] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00001180] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00001188] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00001190] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00001198] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000011a0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -+-/* [0x000011a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000011b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -+-/* [0x000011b8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x000011c0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x000011c8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -+-/* [0x000011d0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000011d8] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -+-/* [0x000011e0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000011e8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000011f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000011f8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00001200] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00001208] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00001210] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00001218] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00001220] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00001228] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001230] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001238] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00001240] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001248] */ 0x00000001, 0xe0020867, // mov r1, 1 -+-/* [0x00001250] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001258] */ 0x409f3001, 0xd00049e0, // nop ; mul24 r0, r0 << 13, r1 << 13 -+-/* [0x00001260] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001268] */ 0x409f2001, 0xd00049e0, // nop ; mul24 r0, r0 << 14, r1 << 14 -+-/* [0x00001270] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001278] */ 0x409f1001, 0xd00049e0, // nop ; mul24 r0, r0 << 15, r1 << 15 -+-/* [0x00001280] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001288] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00001290] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001298] */ 0x409f7001, 0xd00049e0, // nop ; mul24 r0, r0 << 9, r1 << 9 -+-/* [0x000012a0] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012a8] */ 0x409f6001, 0xd00049e0, // nop ; mul24 r0, r0 << 10, r1 << 10 -+-/* [0x000012b0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012b8] */ 0x409f5001, 0xd00049e0, // nop ; mul24 r0, r0 << 11, r1 << 11 -+-/* [0x000012c0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012c8] */ 0x409f4001, 0xd00049e0, // nop ; mul24 r0, r0 << 12, r1 << 12 -+-/* [0x000012d0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000012d8] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x000012e0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012e8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012f0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012f8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00001300] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001308] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001310] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001318] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001320] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -+-/* [0x00001328] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001330] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001338] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00001340] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001348] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00001350] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00001140] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00001148] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00001150] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00001158] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -++/* [0x00001160] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00001168] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00001170] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00001178] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00001180] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00001188] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00001190] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -++/* [0x00001198] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000011a0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -++/* [0x000011a8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x000011b0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x000011b8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -++/* [0x000011c0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x000011c8] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x000011d0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000011d8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000011e0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000011e8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000011f0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000011f8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00001200] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00001208] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00001210] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00001218] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00001220] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001228] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00001230] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001238] */ 0x00000001, 0xe0020867, // mov r1, 1 -++/* [0x00001240] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001248] */ 0x409f3001, 0xd00049e0, // nop ; mul24 r0, r0 << 13, r1 << 13 -++/* [0x00001250] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001258] */ 0x409f2001, 0xd00049e0, // nop ; mul24 r0, r0 << 14, r1 << 14 -++/* [0x00001260] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001268] */ 0x409f1001, 0xd00049e0, // nop ; mul24 r0, r0 << 15, r1 << 15 -++/* [0x00001270] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001278] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00001280] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001288] */ 0x409f7001, 0xd00049e0, // nop ; mul24 r0, r0 << 9, r1 << 9 -++/* [0x00001290] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001298] */ 0x409f6001, 0xd00049e0, // nop ; mul24 r0, r0 << 10, r1 << 10 -++/* [0x000012a0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012a8] */ 0x409f5001, 0xd00049e0, // nop ; mul24 r0, r0 << 11, r1 << 11 -++/* [0x000012b0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012b8] */ 0x409f4001, 0xd00049e0, // nop ; mul24 r0, r0 << 12, r1 << 12 -++/* [0x000012c0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -++/* [0x000012c8] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x000012d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000012e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -++/* [0x000012f0] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x000012f8] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001300] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001308] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00001310] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -++/* [0x00001318] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001320] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -++/* [0x00001328] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00001330] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00001338] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -++/* [0x00001340] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :yloopb -+-/* [0x00001358] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00001360] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-/* [0x00001368] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00001370] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00001378] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -+-/* [0x00001380] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -+-/* [0x00001388] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00001390] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00001398] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000013a0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x000013a8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -+-/* [0x000013b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000013b8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-/* [0x000013c0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -+-/* [0x000013c8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000013d0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000013d8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000013e0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000013e8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000013f0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000013f8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00001400] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00001408] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00001410] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00001418] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00001420] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00001428] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00001430] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001438] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001440] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001448] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001450] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001458] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -+-/* [0x00001460] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001468] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001470] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001478] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001480] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -+-/* [0x00001488] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001490] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00001498] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000014a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000014a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000014b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000014b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000014c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-/* [0x000014c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-/* [0x000014d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-/* [0x000014d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -+-/* [0x000014e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000014e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000014f0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000014f8] */ 0x4053800e, 0xd00049e1, // nop ; mul24 r1, r1 << 8, ra20 << 8 -+-/* [0x00001500] */ 0x4c78e38f, 0x10024860, // add r1, r1, ra30 ; mul24 r0, r1, rb14 -+-/* [0x00001508] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00001510] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloopb -+-/* [0x00001518] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00001520] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00001528] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00001530] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001538] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001540] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001548] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00001348] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001350] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -++/* [0x00001358] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00001360] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001368] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00001370] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00001378] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001380] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001388] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00001390] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x00001398] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x000013a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000013a8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x000013b0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++/* [0x000013b8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000013c0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000013c8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000013d0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000013d8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000013e0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000013e8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000013f0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000013f8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001400] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001408] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001410] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001418] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001420] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001428] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001430] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001438] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001440] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001448] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -++/* [0x00001450] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001458] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001460] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001468] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001470] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001478] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001480] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001488] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00001490] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00001498] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000014a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000014a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000014b0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000014b8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000014c0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000014c8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000014d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000014d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000014e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x000014e8] */ 0x4053800e, 0xd00049e1, // nop ; mul24 r1, r1 << 8, ra20 << 8 -++/* [0x000014f0] */ 0x4c78e38f, 0x10024860, // add r1, r1, ra30 ; mul24 r0, r1, rb14 -++/* [0x000014f8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00001500] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001508] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x00001510] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001518] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001520] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001528] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001530] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001538] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_interrupt_exit12 -+-/* [0x00001550] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001540] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001548] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001550] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001558] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+ /* [0x00001560] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001568] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001570] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001568] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001570] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001578] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001580] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x00001588] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+@@ -732,11 +732,9 @@ unsigned int rpi_shader[] = { -+ /* [0x000015a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000015b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+ /* [0x000015b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015d0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000015d8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000015e0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x000015c0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000015c8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000015d0] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 3fa8531..6e552d9 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,15 +4,15 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 148) -+-#define mc_filter_uv_b0 (rpi_shader + 338) -+-#define mc_filter_uv_b (rpi_shader + 490) -+-#define mc_exit (rpi_shader + 666) -+-#define mc_interrupt_exit8 (rpi_shader + 684) -+-#define mc_setup (rpi_shader + 714) -+-#define mc_filter (rpi_shader + 868) -+-#define mc_filter_b (rpi_shader + 1108) -+-#define mc_interrupt_exit12 (rpi_shader + 1364) -+-#define mc_end (rpi_shader + 1402) -++#define mc_filter_uv (rpi_shader + 144) -++#define mc_filter_uv_b0 (rpi_shader + 334) -++#define mc_filter_uv_b (rpi_shader + 486) -++#define mc_exit (rpi_shader + 662) -++#define mc_interrupt_exit8 (rpi_shader + 680) -++#define mc_setup (rpi_shader + 710) -++#define mc_filter (rpi_shader + 864) -++#define mc_filter_b (rpi_shader + 1104) -++#define mc_interrupt_exit12 (rpi_shader + 1360) -++#define mc_end (rpi_shader + 1398) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 9cfc0d9..a0b8e5a 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -133,8 +133,8 @@ mov ra14, 0 -+ mov ra15, 0 -+ -+ # Compute part of VPM to use for DMA output -+-mov r2, qpu_num -+-shl r2, r2, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -++mov r3, unif -++shl r2, r3, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -+ and r2, r2, 15 -+ mov r1, r2 -+ asr r1, r1, 2 -+@@ -147,8 +147,7 @@ shl r0, r0, 5 -+ add rb27, r0, r1 -+ -+ # Compute part of VPM to save data into -+-mov r2, qpu_num # qpu_num = abcd -+-shl r2, r2, 1 -++shl r2, r3, 1 -+ and r2, r2, 15 # r2 = bcd0 -+ mov r1, r2 # r1 = bcd0 -+ asr r1, r1, 2 # r1 = bc -+@@ -181,9 +180,6 @@ add t0s, r2, r1 -+ mov rb12,unif # offset before shift -+ mov rb13,unif # offset after shift -+ -+-# Dump padding words -+-mov r0, unif -+- -+ # submit texture requests for second line -+ max r1, ra_y, 0 -+ min r1, r1, rb_frame_height_minus_1 -+-- -+2.7.4 -+ -+ -+From db6fe49d50e42c444b5833acc6206c0bbfaacef4 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sat, 23 May 2015 13:20:21 +0100 -+Subject: [PATCH 45/68] Add new cache flushing routine -+ -+--- -+ libavcodec/hevc.c | 8 +++-- -+ libavcodec/hevc_filter.c | 39 ++++++++++----------- -+ libavcodec/rpi_qpu.c | 17 +++++++-- -+ libavcodec/rpi_qpu.h | 2 ++ -+ libavcodec/rpi_user_vcsm.h | 86 ++++++++++++++++++++++++++-------------------- -+ 5 files changed, 91 insertions(+), 61 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index caadfaa..9d12583 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3575,9 +3575,13 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) -+ } -+ -+ fail: -+- if (s->ref && s->threads_type == FF_THREAD_FRAME) -++ if (s->ref && s->threads_type == FF_THREAD_FRAME) { -++#ifdef RPI_INTER_QPU -++ void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n); -++ ff_hevc_flush_chroma(s, &s->ref->tf, s->ps.sps->height); -++#endif -+ ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); -+- -++ } -+ return ret; -+ } -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 186317a..ec84e8a 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -883,36 +883,35 @@ static int ff_hevc_buf_base(AVBufferRef *bref) { -+ return p->vc & 0x3fffffff; -+ } -+ -+-static void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -++void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n); -++void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -+ { -+ if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -+ s->nal_unit_type == NAL_TSA_N || -+ s->nal_unit_type == NAL_STSA_N || -+ s->nal_unit_type == NAL_RADL_N || -+ s->nal_unit_type == NAL_RASL_N )) { -+-#define RPI_FAST_CACHEFLUSH -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+- int curr_y = f->progress->data[0]; -++ int curr_y = ((int *)f->progress->data)[0]; -++ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -++ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -+- if (curr_y < 0) curr_y = 0; -+- if (n<=curr_y) return; // Should not happen -+- sz = s->frame->linesize[1] * (n-curr_y); -+- base = s->frame->linesize[1] * curr_y; -+- iocache.s[0].cmd = 3; // Flush L1 cache -+- iocache.s[0].addr = 0; -+- iocache.s[0].size = 0; -+- -+- iocache.s[1].cmd = 2; -+- iocache.s[1].addr = ff_hevc_buf_base(s->frame->buf[1]) + base; -++ if (curr_uv < 0) curr_uv = 0; -++ if (n_uv<=curr_uv) { assert(0); return; } // Should not happen -++ sz = s->frame->linesize[1] * (n_uv-curr_uv); -++ base = s->frame->linesize[1] * curr_uv; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[1]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = p->arm + base; -++ iocache.s[0].size = sz; -++ p = av_buffer_pool_opaque(s->frame->buf[2]); -++ iocache.s[1].handle = p->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = p->arm + base; -+ iocache.s[1].size = sz; -+- -+- iocache.s[2].cmd = 2; -+- iocache.s[2].addr = ff_hevc_buf_base(s->frame->buf[2]) + base; -+- iocache.s[2].size = sz; -+- -+- vcsm_clean_invalid( gpu_get_mailbox(), &iocache ); -+- -++ vcsm_clean_invalid( &iocache ); -+ #else -+ flush_buffer(s->frame->buf[1]); -+ flush_buffer(s->frame->buf[2]); -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index feb3284..aa65a77 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -211,6 +211,7 @@ static void gpu_unlock(void) { -+ } -+ -+ static int gpu_malloc_uncached_internal(int numbytes, GPU_MEM_PTR_T *p, int mb) { -++ p->numbytes = numbytes; -+ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -+ assert(p->vcsm_handle); -+ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -+@@ -243,13 +244,25 @@ int gpu_get_mailbox(void) -+ return gpu->mb; -+ } -+ -++// Call this to clean and invalidate a region of memory -+ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ { -+- void *tmp = vcsm_lock(p->vcsm_handle); -+- vcsm_unlock_ptr(tmp); -++#define RPI_FAST_CACHEFLUSH -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = p->arm; -++ iocache.s[0].size = p->numbytes; -++ vcsm_clean_invalid( &iocache ); -++#else -++ void *tmp = vcsm_lock(p->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++#endif -+ } -+ -+ static int gpu_malloc_cached_internal(int numbytes, GPU_MEM_PTR_T *p) { -++ p->numbytes = numbytes; -+ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 2f08f03..0565a60 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -1,6 +1,8 @@ -+ #ifndef RPI_QPU_H -+ #define RPI_QPU_H -+ -++#define RPI_FAST_CACHEFLUSH -++ -+ typedef struct gpu_mem_ptr_s { -+ unsigned char *arm; // Pointer to memory mapped on ARM side -+ int vc_handle; // Videocore handle of relocatable memory -+diff --git a/libavcodec/rpi_user_vcsm.h b/libavcodec/rpi_user_vcsm.h -+index 95e6de1..db41a4d 100644 -+--- a/libavcodec/rpi_user_vcsm.h -++++ b/libavcodec/rpi_user_vcsm.h -+@@ -1,29 +1,41 @@ -+-/* -+-Copyright (c) 2012, Broadcom Europe 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. -+- * Neither the name of the copyright holder nor the -+- names of its contributors may be used to endorse or promote products -+- derived from this software without specific prior written permission. -+- -+-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -+-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -+-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+-*/ -++/***************************************************************************** -++* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. -++* -++* This program is the proprietary software of Broadcom Corporation and/or -++* its licensors, and may only be used, duplicated, modified or distributed -++* pursuant to the terms and conditions of a separate, written license -++* agreement executed between you and Broadcom (an "Authorized License"). -++* Except as set forth in an Authorized License, Broadcom grants no license -++* (express or implied), right to use, or waiver of any kind with respect to -++* the Software, and Broadcom expressly reserves all rights in and to the -++* Software and all intellectual property rights therein. IF YOU HAVE NO -++* AUTHORIZED LICENSE, THEN YOU HAVE NO RIGHT TO USE THIS SOFTWARE IN ANY -++* WAY, AND SHOULD IMMEDIATELY NOTIFY BROADCOM AND DISCONTINUE ALL USE OF -++* THE SOFTWARE. -++* -++* Except as expressly set forth in the Authorized License, -++* 1. This program, including its structure, sequence and organization, -++* constitutes the valuable trade secrets of Broadcom, and you shall use -++* all reasonable efforts to protect the confidentiality thereof, and to -++* use this information only in connection with your use of Broadcom -++* integrated circuit products. -++* 2. TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -++* AND WITH ALL FAULTS AND BROADCOM MAKES NO PROMISES, REPRESENTATIONS OR -++* WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH -++* RESPECT TO THE SOFTWARE. BROADCOM SPECIFICALLY DISCLAIMS ANY AND ALL -++* IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS -++* FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, -++* QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. YOU -++* ASSUME THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE. -++* 3. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL BROADCOM OR ITS -++* LICENSORS BE LIABLE FOR (i) CONSEQUENTIAL, INCIDENTAL, SPECIAL, INDIRECT, -++* OR EXEMPLARY DAMAGES WHATSOEVER ARISING OUT OF OR IN ANY WAY RELATING TO -++* YOUR USE OF OR INABILITY TO USE THE SOFTWARE EVEN IF BROADCOM HAS BEEN -++* ADVISED OF THE POSSIBILITY OF SUCH DAMAGES; OR (ii) ANY AMOUNT IN EXCESS -++* OF THE AMOUNT ACTUALLY PAID FOR THE SOFTWARE ITSELF OR U.S. $1, WHICHEVER -++* IS GREATER. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF -++* ESSENTIAL PURPOSE OF ANY LIMITED REMEDY. -++*****************************************************************************/ -+ -+ #ifndef __USER_VCSM__H__INCLUDED__ -+ #define __USER_VCSM__H__INCLUDED__ -+@@ -424,21 +436,21 @@ int vcsm_unlock_hdl_sp( unsigned int handle, int cache_no_flush ); -+ ** -+ ** structure contains a list of flush/invalidate commands. Commands are: -+ ** 0: nop -+-** 1: invalidate given physical range in L2 -+-** 2: clean given physical range in L2 -+-** 3: clean+invalidate all of L1 -+-** 4: flush all of L2 and all of L1 -++** 1: invalidate given virtual range in L1/L2 -++** 2: clean given virtual range in L1/L2 -++** 3: clean+invalidate given virtual range in L1/L2 -++** 4: flush all L1/L2 -+ */ -+ struct vcsm_user_clean_invalid_s { -+- struct { -+- unsigned int cmd; -+- unsigned int addr; -+- unsigned int size; -+- } s[8]; -++ struct { -++ unsigned int cmd; -++ unsigned int handle; -++ unsigned int addr; -++ unsigned int size; -++ } s[8]; -+ }; -+ -+-int vcsm_clean_invalid( unsigned int handle, struct vcsm_user_clean_invalid_s *s ); -+- -++int vcsm_clean_invalid( struct vcsm_user_clean_invalid_s *s ); -+ -+ #ifdef __cplusplus -+ } -+-- -+2.7.4 -+ -+ -+From 87a6cb3a4f7189e711c85de6d20077b6453b2ebe Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sat, 23 May 2015 21:10:10 +0100 -+Subject: [PATCH 46/68] Fix multi mailbox extra transform call -+ -+--- -+ libavcodec/hevc.c | 2 ++ -+ 1 file changed, 2 insertions(+) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 9d12583..30f5834 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3024,7 +3024,9 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI_INTER_QPU -+ rpi_execute_inter_qpu(s); -+ #endif -++#ifndef RPI_MULTI_MAILBOX -+ rpi_execute_transform(s); -++#endif -+ rpi_execute_inter_cmds(s); -+ vpu_wait(s->vpu_id); -+ rpi_execute_pred_cmds(s); -+-- -+2.7.4 -+ -+ -+From 2a3672a1bda0296453953bebe8b17d69445260b4 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 27 May 2015 16:44:29 +0100 -+Subject: [PATCH 47/68] Added support for running luma prediction on QPUs -+ -+--- -+ libavcodec/hevc.c | 237 +++++++- -+ libavcodec/hevc.h | 26 +- -+ libavcodec/hevc_filter.c | 23 +- -+ libavcodec/rpi_qpu.c | 156 ++++-- -+ libavcodec/rpi_qpu.h | 8 +- -+ libavcodec/rpi_shader.c | 1313 ++++++++++++++++++++++---------------------- -+ libavcodec/rpi_shader.h | 21 +- -+ libavcodec/rpi_shader.qasm | 883 ++++++++++++++--------------- -+ 8 files changed, 1464 insertions(+), 1203 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 30f5834..2da88ec 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -52,6 +52,11 @@ -+ // Define RPI_MULTI_MAILBOX to use the updated mailbox that can launch both QPU and VPU -+ #define RPI_MULTI_MAILBOX -+ #endif -++ -++ // Define RPI_CACHE_UNIF_MVS to write motion vector uniform stream to cached memory -++ // RPI_CACHE_UNIF_MVS doesn't seem to make much difference, so left undefined. -++ -++ -+ #endif -+ -+ // #define DISABLE_MC -+@@ -74,6 +79,13 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+ -++// Split image of 2048 into parts 64 wide -++// So some QPUs will have 3 blocks of 64 to do, and others 2 blocks for an image 2048 wide with 32 blocks across -++// Each block of 64*64 -++// Smallest CTU size is 16x16, so smallest block is 8x8 -++// Corresponds to a total of 83kbytes over all 12 QPUs -++#define RPI_LUMA_COMMAND_WORDS 9 -++#define Y_COMMANDS_PER_QPU ((1+3*(64*64)/(8*8)) * RPI_LUMA_COMMAND_WORDS) -+ -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+@@ -2015,10 +2027,46 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref0->frame, -++#ifdef RPI_LUMA_QPU -++ if (s->enable_rpi) { -++ int reflist = 0; -++ const Mv *mv = ¤t_mv.mv[reflist]; -++ int mx = mv->x & 3; -++ int my = mv->y & 3; -++ int my_mx = (my<<8) + mx; -++ int my2_mx2_my_mx = (my_mx << 16) + my_mx; -++ int x1 = x0 + (mv->x >> 2); -++ int y1 = y0 + (mv->y >> 2); -++ int chan = x0>>6; // 64 wide blocks per QPU -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -++ uint32_t *y = s->y_mvs[chan % 12]; -++ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -++ for(int start_x=0;start_x < nPbW;start_x+=16) { -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ *y++ = ( (nPbW<16 ? nPbW : 16) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = my2_mx2_my_mx; -++ if (weight_flag) { -++ *y++ = (s->sh.luma_offset_l0[current_mv.ref_idx[reflist]] << 16) + (s->sh.luma_weight_l0[current_mv.ref_idx[reflist]] & 0xffff); -++ } else { -++ *y++ = 1; // Weight of 1 and offset of 0 -++ } -++ *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -++ } -++ } -++ s->y_mvs[chan % 12] = y; -++ } else -++#endif -++ { -++ RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref0->frame, -+ ¤t_mv.mv[0], x0, y0, nPbW, nPbH, -+ s->sh.luma_weight_l0[current_mv.ref_idx[0]], -+ s->sh.luma_offset_l0[current_mv.ref_idx[0]]); -++ } -+ -+ if (s->ps.sps->chroma_format_idc) { -+ #ifdef RPI_INTER_QPU -+@@ -2078,10 +2126,47 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref1->frame, -++#ifdef RPI_LUMA_QPU -++ if (s->enable_rpi) { -++ int reflist = 1; -++ const Mv *mv = ¤t_mv.mv[reflist]; -++ int mx = mv->x & 3; -++ int my = mv->y & 3; -++ int my_mx = (my<<8) + mx; -++ int my2_mx2_my_mx = (my_mx << 16) + my_mx; -++ int x1 = x0 + (mv->x >> 2); -++ int y1 = y0 + (mv->y >> 2); -++ int chan = x0>>6; // 64 wide blocks per QPU -++ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -++ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -++ uint32_t *y = s->y_mvs[chan % 12]; -++ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -++ for(int start_x=0;start_x < nPbW;start_x+=16) { -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ *y++ = ( (nPbW<16 ? nPbW : 16) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = my2_mx2_my_mx; -++ if (weight_flag) { -++ *y++ = (s->sh.luma_offset_l0[current_mv.ref_idx[reflist]] << 16) + (s->sh.luma_weight_l0[current_mv.ref_idx[reflist]] & 0xffff); -++ } else { -++ *y++ = 1; // Weight of 1 and offset of 0 -++ } -++ *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -++ } -++ } -++ s->y_mvs[chan % 12] = y; -++ } else -++#endif -++ -++ { -++ RPI_REDIRECT(luma_mc_uni)(s, dst0, s->frame->linesize[0], ref1->frame, -+ ¤t_mv.mv[1], x0, y0, nPbW, nPbH, -+ s->sh.luma_weight_l1[current_mv.ref_idx[1]], -+ s->sh.luma_offset_l1[current_mv.ref_idx[1]]); -++ } -+ -+ if (s->ps.sps->chroma_format_idc) { -+ #ifdef RPI_INTER_QPU -+@@ -2115,8 +2200,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = rpi_filter_coefs[_mx][0]; -+ *u++ = rpi_filter_coefs[_my][0]; -+ if (weight_flag) { -+- *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[1]][0] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[1]][0] & 0xffff); -+- *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[1]][1] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[1]][1] & 0xffff); -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[reflist]][0] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[reflist]][0] & 0xffff); -++ *u++ = (s->sh.chroma_offset_l0[current_mv.ref_idx[reflist]][1] << 16) + (s->sh.chroma_weight_l0[current_mv.ref_idx[reflist]][1] & 0xffff); -+ } else { -+ *u++ = 1; // Weight of 1 and offset of 0 -+ *u++ = 1; -+@@ -2143,9 +2228,44 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int nPbW_c = nPbW >> s->ps.sps->hshift[1]; -+ int nPbH_c = nPbH >> s->ps.sps->vshift[1]; -+ -+- RPI_REDIRECT(luma_mc_bi)(s, dst0, s->frame->linesize[0], ref0->frame, -++#ifdef RPI_LUMA_QPU -++ if (s->enable_rpi) { -++ const Mv *mv = ¤t_mv.mv[0]; -++ int mx = mv->x & 3; -++ int my = mv->y & 3; -++ int my_mx = (my<<8) + mx; -++ const Mv *mv2 = ¤t_mv.mv[1]; -++ int mx2 = mv2->x & 3; -++ int my2 = mv2->y & 3; -++ int my2_mx2 = (my2<<8) + mx2; -++ int my2_mx2_my_mx = (my2_mx2 << 16) + my_mx; -++ int x1 = x0 + (mv->x >> 2); -++ int y1 = y0 + (mv->y >> 2); -++ int x2 = x0 + (mv2->x >> 2); -++ int y2 = y0 + (mv2->y >> 2); -++ int chan = x0>>6; // 64 wide blocks per QPU -++ uint32_t *y = s->y_mvs[chan % 12]; -++ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -++ for(int start_x=0;start_x < nPbW;start_x+=8) { // B blocks work 8 at a time -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = ((y2 - 3 + start_y) << 16) + ( (x2 - 3 + start_x) & 0xffff); // Second fetch is for ref1 -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ *y++ = ( (nPbW<8 ? nPbW : 8) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = my2_mx2_my_mx; -++ *y++ = 1; // B frame weighted prediction not supported -++ *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter_b; -++ } -++ } -++ s->y_mvs[chan % 12] = y; -++ } else -++#endif -++ { -++ RPI_REDIRECT(luma_mc_bi)(s, dst0, s->frame->linesize[0], ref0->frame, -+ ¤t_mv.mv[0], x0, y0, nPbW, nPbH, -+ ref1->frame, ¤t_mv.mv[1], ¤t_mv); -++ } -+ -+ if (s->ps.sps->chroma_format_idc) { -+ #ifdef RPI_INTER_QPU -+@@ -2834,7 +2954,6 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = pic_height; -+ *s->u_mvs[i]++ = s->frame->linesize[1]; -+ *s->u_mvs[i]++ = s->frame->linesize[2]; -+- *s->u_mvs[i]++ = i; -+ if (weight_flag) { -+ *s->u_mvs[i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -+ *s->u_mvs[i]++ = s->sh.chroma_log2_weight_denom + 6; -+@@ -2842,7 +2961,31 @@ static void rpi_inter_clear(HEVCContext *s) -+ *s->u_mvs[i]++ = 1 << 5; -+ *s->u_mvs[i]++ = 6; -+ } -++ *s->u_mvs[i]++ = i; // Select section of VPM (avoid collisions with 3d unit) -++ } -++ -++#ifdef RPI_LUMA_QPU -++ for(i=0;i<12;i++) { -++ s->y_mvs[i] = s->y_mvs_base[i]; -++ *s->y_mvs[i]++ = 0; // y_x -++ *s->y_mvs[i]++ = 0; // ref_y_base -++ *s->y_mvs[i]++ = 0; // y2_x2 -++ *s->y_mvs[i]++ = 0; // ref_y2_base -++ *s->y_mvs[i]++ = (s->ps.sps->width << 16) + s->ps.sps->height; -++ *s->y_mvs[i]++ = s->frame->linesize[0]; // pitch -++ *s->y_mvs[i]++ = s->frame->linesize[0]; // dst_pitch -++ if (weight_flag) { -++ int offset = 1 << (s->sh.luma_log2_weight_denom + 6 - 1); -++ int shift = s->sh.luma_log2_weight_denom + 6; -++ *s->y_mvs[i]++ = (offset << 16) + shift; -++ } else { -++ int offset = 1 << 5; -++ int shift = 6; -++ *s->y_mvs[i]++ = (offset << 16) + shift; -++ } -++ *s->y_mvs[i]++ = 0; // Next kernel -+ } -++#endif -+ } -+ -+ static void rpi_execute_inter_qpu(HEVCContext *s) -+@@ -2850,6 +2993,9 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ int k; -+ int i; -+ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -++#ifdef RPI_LUMA_QPU -++ uint32_t *y_unif_vc = (uint32_t *)s->y_unif_mvs_ptr.vc; -++#endif -+ if (s->sh.slice_type == I_SLICE) { -+ #ifdef RPI_MULTI_MAILBOX -+ rpi_execute_transform(s); -+@@ -2865,8 +3011,23 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ -++#ifdef RPI_LUMA_QPU -++ for(k=0;k<12;k++) { -++ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+1] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for second request -++ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ assert(s->y_mvs[k] - s->y_mvs_base[k] < Y_COMMANDS_PER_QPU); -++ } -++ s->y_mvs[12-1][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT12); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++#endif -++ -++ -+ #ifdef RPI_MULTI_MAILBOX -++#ifdef RPI_CACHE_UNIF_MVS -++ gpu_cache_flush3(&s->coeffs_buf_accelerated,&s->y_unif_mvs_ptr, &s->unif_mvs_ptr); -++#else -+ gpu_cache_flush(&s->coeffs_buf_accelerated); -++#endif -+ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+@@ -2876,7 +3037,27 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++#ifdef RPI_LUMA_QPU -++ qpu_get_fn(QPU_MC_SETUP), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[0 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[1 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[2 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[3 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[4 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[5 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[6 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[7 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[8 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[9 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[10 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[11 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)) -++#else -++ 0, -++ 0,0,0,0, -++ 0,0,0,0, -++ 0,0,0,0 -++#endif -+ ); -+ for(i=0;i<4;i++) -+ s->num_coeffs[i] = 0; -+@@ -2892,6 +3073,8 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -+ ); -+ #endif -++ -++ -+ } -+ #endif -+ -+@@ -3579,8 +3762,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) -+ fail: -+ if (s->ref && s->threads_type == FF_THREAD_FRAME) { -+ #ifdef RPI_INTER_QPU -+- void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n); -+- ff_hevc_flush_chroma(s, &s->ref->tf, s->ps.sps->height); -++ ff_hevc_flush_buffer(s, &s->ref->tf, s->ps.sps->height); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); -+ } -+@@ -3767,7 +3949,6 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ -+ #ifdef RPI -+ av_freep(&s->unif_mv_cmds); -+- av_freep(&s->unif_xfm_cmds); -+ av_freep(&s->univ_pred_cmds); -+ -+ #ifdef RPI_INTER_QPU -+@@ -3776,7 +3957,12 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ s->unif_mvs = 0; -+ } -+ #endif -+- //gpu_free(&s->dummy); -++#ifdef RPI_LUMA_QPU -++ if (s->y_unif_mvs) { -++ gpu_free( &s->y_unif_mvs_ptr ); -++ s->y_unif_mvs = 0; -++ } -++#endif -+ -+ #ifdef EARLY_MALLOC -+ printf("hevc_decode_free\n"); -+@@ -3861,9 +4047,6 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->unif_mv_cmds = av_mallocz(sizeof(HEVCMvCmd)*RPI_MAX_MV_CMDS); -+ if (!s->unif_mv_cmds) -+ goto fail; -+- s->unif_xfm_cmds = av_mallocz(sizeof(HEVCXfmCmd)*RPI_MAX_XFM_CMDS); -+- if (!s->unif_xfm_cmds) -+- goto fail; -+ s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -+ if (!s->univ_pred_cmds) -+ goto fail; -+@@ -3877,7 +4060,11 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ { -+ int uv_commands_per_qpu = UV_COMMANDS_PER_QPU; -+ uint32_t *p; -++#ifdef RPI_CACHE_UNIF_MVS -++ gpu_malloc_cached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++#else -+ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++#endif -+ s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -+ -+ // Set up initial locations for uniform streams -+@@ -3892,6 +4079,28 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ -+ } -+ #endif -++#ifdef RPI_LUMA_QPU -++ { -++ int y_commands_per_qpu = Y_COMMANDS_PER_QPU; -++ uint32_t *p; -++#ifdef RPI_CACHE_UNIF_MVS -++ gpu_malloc_cached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr ); -++#else -++ gpu_malloc_uncached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr ); -++#endif -++ s->y_unif_mvs = (uint32_t *) s->y_unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -++ -++ // Set up initial locations for uniform streams -++ p = s->y_unif_mvs; -++ for(i = 0; i < 12; i++) { -++ s->y_mvs_base[i] = p; -++ p += y_commands_per_qpu; -++ } -++ s->mc_filter = qpu_get_fn(QPU_MC_FILTER); -++ s->mc_filter_b = qpu_get_fn(QPU_MC_FILTER_B); -++ -++ } -++#endif -+ //gpu_malloc_uncached(2048*64,&s->dummy); -+ -+ #ifdef EARLY_MALLOC -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 4a39e39..5df9dcd 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -44,9 +44,13 @@ -+ #ifdef RPI -+ -+ #include "rpi_qpu.h" -+- // Use QPU for inter prediction -++ // Define RPI_INTER_QPU to use QPU for chroma inter prediction -+ #define RPI_INTER_QPU -+ -++ #ifdef RPI_INTER_QPU -++ // Define RPI_LUMA_QPU to also use QPU for luma inter prediction -++ #define RPI_LUMA_QPU -++ #endif -+ #endif -+ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+@@ -809,7 +813,6 @@ typedef struct HEVCLocalContext { -+ -+ // Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane, * 2 for bi -+ #define RPI_MAX_MV_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+-#define RPI_MAX_XFM_CMDS (16*3*(RPI_MAX_WIDTH/4)) -+ // Each block can have an intra prediction and a transform_add command -+ #define RPI_MAX_PRED_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+ // Worst case is 16x16 CTUs -+@@ -844,9 +847,6 @@ typedef struct HEVCMvCmd { -+ int8_t ref_idx[2]; -+ } HEVCMvCmd; -+ -+-// Command for transform to process a block of coefficients -+-typedef struct HEVCXfmCmd { -+-} HEVCXfmCmd; -+ -+ // Command for intra prediction and transform_add of predictions to coefficients -+ #define RPI_PRED_TRANSFORM_ADD 0 -+@@ -892,8 +892,7 @@ typedef struct HEVCContext { -+ -+ #ifdef RPI -+ int enable_rpi; -+- HEVCMvCmd *unif_mv_cmds; // TODO rename -+- HEVCXfmCmd *unif_xfm_cmds; -++ HEVCMvCmd *unif_mv_cmds; -+ HEVCPredCmd *univ_pred_cmds; -+ int buf_width; -+ GPU_MEM_PTR_T coeffs_buf_default; -+@@ -920,6 +919,15 @@ typedef struct HEVCContext { -+ uint32_t mc_filter_uv_b0; -+ uint32_t mc_filter_uv_b; -+ #endif -++#ifdef RPI_LUMA_QPU -++ GPU_MEM_PTR_T y_unif_mvs_ptr; -++ uint32_t *y_unif_mvs; // Base of memory for motion vector commands -++ uint32_t *y_mvs_base[12]; -++ uint32_t *y_mvs[12]; -++ // Function pointers -++ uint32_t mc_filter; -++ uint32_t mc_filter_b; -++#endif -+ -+ #endif -+ -+@@ -1166,6 +1174,10 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int log2_trafo_size, enum ScanType scan_idx, -+ int c_idx); -+ -++#ifdef RPI_INTER_QPU -++extern void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n); -++#endif -++ -+ void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size); -+ -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index ec84e8a..11629e4 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -883,8 +883,7 @@ static int ff_hevc_buf_base(AVBufferRef *bref) { -+ return p->vc & 0x3fffffff; -+ } -+ -+-void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n); -+-void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -++void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ { -+ if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -+ s->nal_unit_type == NAL_TSA_N || -+@@ -911,10 +910,24 @@ void ff_hevc_flush_chroma(HEVCContext *s, ThreadFrame *f, int n) -+ iocache.s[1].cmd = 3; // clean+invalidate -+ iocache.s[1].addr = p->arm + base; -+ iocache.s[1].size = sz; -++ -++#ifdef RPI_LUMA_QPU -++ p = av_buffer_pool_opaque(s->frame->buf[0]); -++ sz = s->frame->linesize[0] * (n-curr_y); -++ base = s->frame->linesize[0] * curr_y; -++ iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = p->arm + base; -++ iocache.s[2].size = sz; -++#endif -+ vcsm_clean_invalid( &iocache ); -+ #else -+ flush_buffer(s->frame->buf[1]); -+ flush_buffer(s->frame->buf[2]); -++#ifdef RPI_LUMA_QPU -++ flush_buffer(s->frame->buf[1]); -++#endif -++ -+ #endif -+ //memcpy(s->dummy.arm,s->frame->data[0],2048*64); -+ //memcpy(s->dummy.arm,s->frame->data[1],1024*32); -+@@ -938,7 +951,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x, y - ctb_size); -+ if (s->threads_type & FF_THREAD_FRAME ) { -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s,&s->ref->tf, y); -++ ff_hevc_flush_buffer(s,&s->ref->tf, y); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y, 0); -+ } -+@@ -947,7 +960,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ sao_filter_CTB(s, x , y); -+ if (s->threads_type & FF_THREAD_FRAME ) { -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s, &s->ref->tf, y + ctb_size); -++ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); -+ } -+@@ -957,7 +970,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -+ #ifdef RPI_INTER_QPU -+- ff_hevc_flush_chroma(s, &s->ref->tf, y + ctb_size - 4); -++ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size - 4); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index aa65a77..e12304b 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -1,9 +1,11 @@ -+ #ifdef RPI -+ // This works better than the mmap in that the memory can be cached, but requires a kernel modification to enable the device. -+ // define RPI_TIME_TOTAL_QPU to print out how much time is spent in the QPU code -+-#define RPI_TIME_TOTAL_QPU -++//#define RPI_TIME_TOTAL_QPU -+ // define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -+ //#define RPI_TIME_TOTAL_VPU -++// define RPI_TIME_TOTAL_POSTED to print out how much time is spent in the multi execute QPU/VPU combined -++//#define RPI_TIME_TOTAL_POSTED -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+ #define RPI_ASYNC -+ -+@@ -94,7 +96,8 @@ struct GPU -+ int open_count; // Number of allocated video buffers -+ int mb; // Mailbox handle -+ int vc; // Address in GPU memory -+- int mail[12]; // These are used to pass pairs of code/unifs to the QPUs -++ int mail[12*2]; // These are used to pass pairs of code/unifs to the QPUs for the first QPU task -++ int mail2[12*2]; // These are used to pass pairs of code/unifs to the QPUs for the second QPU task -+ }; -+ -+ // Stop more than one thread trying to allocate memory or use the processing resources at once -+@@ -102,7 +105,7 @@ static pthread_mutex_t gpu_mutex = PTHREAD_MUTEX_INITIALIZER; -+ static volatile struct GPU* gpu = NULL; -+ static GPU_MEM_PTR_T gpu_mem_ptr; -+ -+-#if defined(RPI_TIME_TOTAL_QPU) || defined(RPI_TIME_TOTAL_VPU) -++#if defined(RPI_TIME_TOTAL_QPU) || defined(RPI_TIME_TOTAL_VPU) || defined(RPI_TIME_TOTAL_POSTED) -+ static unsigned int Microseconds(void) { -+ struct timespec ts; -+ unsigned int x; -+@@ -123,7 +126,7 @@ static pthread_cond_t post_cond_head = PTHREAD_COND_INITIALIZER; -+ static pthread_cond_t post_cond_tail = PTHREAD_COND_INITIALIZER; -+ static pthread_mutex_t post_mutex = PTHREAD_MUTEX_INITIALIZER; -+ -+-static int vpu_cmds[MAXCMDS][16]; -++static int vpu_cmds[MAXCMDS][32]; -+ static volatile int vpu_async_tail=0; // Contains the number of posted jobs -+ static volatile int vpu_async_head=0; -+ #endif -+@@ -247,7 +250,6 @@ int gpu_get_mailbox(void) -+ // Call this to clean and invalidate a region of memory -+ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ { -+-#define RPI_FAST_CACHEFLUSH -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ iocache.s[0].handle = p->vcsm_handle; -+@@ -261,6 +263,34 @@ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ #endif -+ } -+ -++void gpu_cache_flush3(GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2) -++{ -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ iocache.s[0].handle = p0->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = (int) p0->arm; -++ iocache.s[0].size = p0->numbytes; -++ iocache.s[1].handle = p1->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = (int) p1->arm; -++ iocache.s[1].size = p1->numbytes; -++ iocache.s[2].handle = p2->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = (int) p2->arm; -++ iocache.s[2].size = p2->numbytes; -++ vcsm_clean_invalid( &iocache ); -++#else -++ void *tmp; -++ tmp = vcsm_lock(p0->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++ tmp = vcsm_lock(p1->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++ tmp = vcsm_lock(p2->vcsm_handle); -++ vcsm_unlock_ptr(tmp); -++#endif -++} -++ -+ static int gpu_malloc_cached_internal(int numbytes, GPU_MEM_PTR_T *p) { -+ p->numbytes = numbytes; -+ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST, (char *)"Video Frame" ); -+@@ -357,9 +387,19 @@ unsigned int vpu_get_constants(void) { -+ #ifdef RPI_ASYNC -+ -+ static void *vpu_start(void *arg) { -++#ifdef RPI_TIME_TOTAL_POSTED -++ int last_time=0; -++ long long on_time=0; -++ long long off_time=0; -++ int start_time; -++ int end_time; -++ int count=0; -++#endif -+ while(1) { -++ int i; -+ int *p; -+ int qpu_code; -++ int qpu_codeb; -+ pthread_mutex_lock(&post_mutex); -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+@@ -373,24 +413,49 @@ static void *vpu_start(void *arg) { -+ break; // Last job -+ } -+ qpu_code = p[7]; -++ qpu_codeb = p[16]; -+ //if (p[7]) { -+ //GPU_MEM_PTR_T *buf = (GPU_MEM_PTR_T *)p[7]; -+ //gpu_cache_flush(buf); -+ //} -++ -++#ifdef RPI_TIME_TOTAL_POSTED -++ start_time = Microseconds(); -++ if (last_time==0) -++ last_time = start_time; -++ off_time += start_time-last_time; -++#endif -++ -+ if (!qpu_code) { -+ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -+ } else { -+- int i; -+ for(i=0;i<8;i++) { -+ gpu->mail[i*2] = p[8+i]; -+ gpu->mail[i*2 + 1] = qpu_code; -+ } -+- -+- execute_multi(gpu->mb,8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+- 0, 0, 0, 0, -++ for(i=0;i<12;i++) { -++ gpu->mail2[i*2] = p[17+i]; -++ gpu->mail2[i*2 + 1] = qpu_codeb; -++ } -++#if (0) -++ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -++ execute_qpu(gpu->mb,8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */); -++#else -++ execute_multi(gpu->mb, -++ 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -+ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -++#endif -+ } -++#ifdef RPI_TIME_TOTAL_POSTED -++ end_time = Microseconds(); -++ last_time = end_time; -++ on_time += end_time - start_time; -++ count++; -++ if ((count&0x7f)==0) -++ printf("Posted %d On=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(off_time/1000)); -++#endif -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+ pthread_cond_broadcast(&post_cond_head); -+@@ -436,7 +501,9 @@ int vpu_post_code(unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned -+ } -+ -+ int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -+- int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8) -++ int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, -++ int qpu_codeb, int unifs1b, int unifs2b, int unifs3b, int unifs4b, int unifs5b, int unifs6b, int unifs7b, int unifs8b, int unifs9b, int unifs10b, int unifs11b, int unifs12b -++ ) -+ { -+ -+ pthread_mutex_lock(&post_mutex); -+@@ -464,6 +531,21 @@ int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, -+ p[13] = unifs6; -+ p[14] = unifs7; -+ p[15] = unifs8; -++ -++ p[16] = qpu_codeb; -++ p[17] = unifs1b; -++ p[18] = unifs2b; -++ p[19] = unifs3b; -++ p[20] = unifs4b; -++ p[21] = unifs5b; -++ p[22] = unifs6b; -++ p[23] = unifs7b; -++ p[24] = unifs8b; -++ p[25] = unifs9b; -++ p[26] = unifs10b; -++ p[27] = unifs11b; -++ p[28] = unifs12b; -++ -+ if (num<=1) -+ pthread_cond_broadcast(&post_cond_tail); // Otherwise the vpu thread must already be awake -+ pthread_mutex_unlock(&post_mutex); -+@@ -544,27 +626,27 @@ void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int un -+ off_time += start_time-last_time; -+ #endif -+ for(i=0;imail[i*2 + 1] = code; -++ gpu->mail2[i*2 + 1] = code; -+ } -+ for(;imail[i*2 + 1] = code2; -++ gpu->mail2[i*2 + 1] = code2; -+ } -+- gpu->mail[0 ] = unifs1; -+- gpu->mail[2 ] = unifs2; -+- gpu->mail[4 ] = unifs3; -+- gpu->mail[6 ] = unifs4; -+- gpu->mail[8 ] = unifs5; -+- gpu->mail[10] = unifs6; -+- gpu->mail[12] = unifs7; -+- gpu->mail[14] = unifs8; -+- gpu->mail[16] = unifs9; -+- gpu->mail[18] = unifs10; -+- gpu->mail[20] = unifs11; -+- gpu->mail[22] = unifs12; -++ gpu->mail2[0 ] = unifs1; -++ gpu->mail2[2 ] = unifs2; -++ gpu->mail2[4 ] = unifs3; -++ gpu->mail2[6 ] = unifs4; -++ gpu->mail2[8 ] = unifs5; -++ gpu->mail2[10] = unifs6; -++ gpu->mail2[12] = unifs7; -++ gpu->mail2[14] = unifs8; -++ gpu->mail2[16] = unifs9; -++ gpu->mail2[18] = unifs10; -++ gpu->mail2[20] = unifs11; -++ gpu->mail2[22] = unifs12; -+ execute_qpu( -+ gpu->mb, -+ 12 /* Number of QPUs */, -+- gpu->vc + offsetof(struct GPU, mail), -++ gpu->vc + offsetof(struct GPU, mail2), -+ 1 /* no flush */, // Don't flush VPU L1 cache -+ 5000 /* timeout ms */); -+ #ifdef RPI_TIME_TOTAL_QPU -+@@ -635,21 +717,21 @@ unsigned int qpu_get_fn(int num) { -+ gpu_unlock(); -+ } -+ switch(num) { -+- //case QPU_MC_SETUP: -+- // fn = mc_setup; -+- // break; -+- //case QPU_MC_FILTER: -+- // fn = mc_filter; -+- // break; -++ case QPU_MC_SETUP: -++ fn = mc_setup; -++ break; -++ case QPU_MC_FILTER: -++ fn = mc_filter; -++ break; -+ case QPU_MC_EXIT: -+ fn = mc_exit; -+ break; -+- //case QPU_MC_INTERRUPT_EXIT: -+- // fn = mc_interrupt_exit; -+- // break; -+- //case QPU_MC_FILTER_B: -+- // fn = mc_filter_b; -+- // break; -++ case QPU_MC_INTERRUPT_EXIT12: -++ fn = mc_interrupt_exit12; -++ break; -++ case QPU_MC_FILTER_B: -++ fn = mc_filter_b; -++ break; -+ //case QPU_MC_FILTER_HONLY: -+ // fn = mc_filter_honly; -+ // break; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 0565a60..81c2bb1 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -1,6 +1,7 @@ -+ #ifndef RPI_QPU_H -+ #define RPI_QPU_H -+ -++// Define RPI_FAST_CACHEFLUSH to use the VCSM cache flush code -+ #define RPI_FAST_CACHEFLUSH -+ -+ typedef struct gpu_mem_ptr_s { -+@@ -16,6 +17,7 @@ extern int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p); -+ extern int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p); -+ extern void gpu_free(GPU_MEM_PTR_T *p); -+ extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -++extern void gpu_cache_flush3(GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -+ -+ // QPU specific functions -+ extern void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+@@ -26,7 +28,7 @@ enum { -+ QPU_MC_SETUP, -+ QPU_MC_FILTER, -+ QPU_MC_EXIT, -+- QPU_MC_INTERRUPT_EXIT, -++ QPU_MC_INTERRUPT_EXIT12, -+ QPU_MC_FILTER_B, -+ QPU_MC_FILTER_HONLY, -+ QPU_MC_SETUP_UV, -+@@ -44,7 +46,9 @@ extern unsigned int vpu_get_constants(void); -+ extern unsigned vpu_execute_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5); -+ extern int vpu_post_code( unsigned code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, GPU_MEM_PTR_T *buf); -+ int vpu_qpu_post_code(unsigned vpu_code, unsigned r0, unsigned r1, unsigned r2, unsigned r3, unsigned r4, unsigned r5, -+- int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -++ int qpu_code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, -++ int qpu_codeb, int unifs1b, int unifs2b, int unifs3b, int unifs4b, int unifs5b, int unifs6b, int unifs7b, int unifs8b, int unifs9b, int unifs10b, int unifs11b, int unifs12b -++ ); -+ extern void vpu_wait( int id); -+ -+ // Simple test of shader code -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index a0f0282..e86eb30 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -48,693 +48,674 @@ unsigned int rpi_shader[] = { -+ /* [0x000000b8] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+ /* [0x000000c0] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+ /* [0x000000c8] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x000000d0] */ 0x15827d80, 0x100208e7, // mov r3, unif -+-/* [0x000000d8] */ 0x119c17c0, 0xd00208a7, // shl r2, r3, 1 -+-/* [0x000000e0] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x000000e8] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x000000f0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x000000f8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000100] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000108] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000110] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000118] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000120] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000128] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000130] */ 0x119c17c0, 0xd00208a7, // shl r2, r3, 1 -+-/* [0x00000138] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -+-/* [0x00000140] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000148] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000150] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000158] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000160] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000168] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000170] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000178] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000180] */ 0x0f9c11c0, 0xd0020827, // asr r0, r0, 1 -+-/* [0x00000188] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -+-/* [0x00000190] */ 0x0c9e7040, 0x10021567, // add rb21, r0, r1 -+-/* [0x00000198] */ 0x15427d80, 0x10020827, // mov r0, ra_x -+-/* [0x000001a0] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -+-/* [0x000001a8] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -+-/* [0x000001b0] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -+-/* [0x000001b8] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x000001c0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000001c8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000001d0] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -++/* [0x000000d0] */ 0x15427d80, 0x10020827, // mov r0, ra_x -++/* [0x000000d8] */ 0x937401f6, 0xd0024821, // max r0, r0, 0; mov r1, ra_y -++/* [0x000000e0] */ 0x926191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, ra_frame_base -++/* [0x000000e8] */ 0x916431f6, 0xd00244e2, // shl ra_xshift_next, r0, 3 ; mov r2, ra_u2v_ref_offset -++/* [0x000000f0] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x000000f8] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000100] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000108] */ 0x939c03c0, 0xd0025850, // max r1, r1, 0 ; mov ra_x, r0 -++/* [0x00000110] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000118] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -++/* [0x00000120] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -++/* [0x00000128] */ 0x0c9e7440, 0x10020f27, // add t1s, r2, r1 -++/* [0x00000130] */ 0x00000008, 0xe00208a7, // mov r2,8 -++/* [0x00000138] */ 0x11827c80, 0x10021327, // shl rb12,unif, r2 -++/* [0x00000140] */ 0x0c827c80, 0x10021367, // add rb13,unif,r2 -++/* [0x00000148] */ 0x15827d80, 0x100208a7, // mov r2, unif -++/* [0x00000150] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -++/* [0x00000158] */ 0x149cf5c0, 0xd00208a7, // and r2, r2, 15 -++/* [0x00000160] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000168] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000170] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000178] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000180] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000188] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000190] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000198] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x000001a0] */ 0x0f9c11c0, 0xd00208a7, // asr r2, r0, 1 -++/* [0x000001a8] */ 0x00002900, 0xe0020867, // mov r1, vpm_setup(0, 2, h16p(0, 0)) -++/* [0x000001b0] */ 0x0c9e7440, 0x10021567, // add rb21, r2, r1 -++/* [0x000001b8] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x000001c0] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x000001c8] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x000001d0] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+ /* [0x000001d8] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x000001e0] */ 0x4c9d040f, 0x100248a1, // add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+-/* [0x000001e8] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -+-/* [0x000001f0] */ 0x0c9e7440, 0x10020e27, // add t0s, r2, r1 -+-/* [0x000001f8] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000200] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000208] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000210] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000218] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000220] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000228] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000230] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -+-/* [0x00000238] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x000001e0] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x000001e8] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000001f0] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x000001f8] */ 0x0c427380, 0x10020e27, // add t0s, r1, ra_x -++/* [0x00000200] */ 0x0c627380, 0x10020f27, // add t1s, r1, ra_frame_base -+ // ::mc_filter_uv -+-/* [0x00000240] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000248] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000250] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000258] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000260] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000268] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000270] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000278] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000280] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x00000288] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000290] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x00000298] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000002a0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000002a8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000002b0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000002b8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000002c0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000002c8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000002d0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000002d8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000002e0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000002e8] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000002f0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000002f8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000300] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000308] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000310] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000318] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000320] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000328] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000330] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000338] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000340] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000348] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000350] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000358] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000360] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000368] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000370] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -+-/* [0x00000378] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000380] */ 0x0f9e7080, 0x100613a7, // asr.ifnz rb14, r0, r2 -+-/* [0x00000388] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000390] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000208] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000210] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000218] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000220] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000228] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000230] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000238] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000240] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000248] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000250] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000258] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000260] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000268] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000270] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000278] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000280] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000288] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000290] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000298] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000002a0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000002a8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x000002b0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x000002b8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x000002c0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000002c8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002d0] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002d8] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002e0] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000002e8] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002f0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000002f8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000300] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000308] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000310] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000318] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -++/* [0x00000320] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000328] */ 0x0f9e7080, 0x100208e7, // asr r3, r0, r2 -++/* [0x00000330] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000338] */ 0x0f9e7080, 0x100613e7, // asr.ifnz rb15, r0, r2 -++/* [0x00000340] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000348] */ 0x0f9e7080, 0x100608e7, // asr.ifnz r3, r0, r2 -++/* [0x00000350] */ 0x119c87c0, 0xd00213a7, // shl rb14,r3,8 -++/* [0x00000358] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop -+-/* [0x00000398] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000003a0] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x000003a8] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x000003b0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x000003b8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x000003c0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x000003c8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000003d0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000003d8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x000003e0] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x000003e8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000003f0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000003f8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000400] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000408] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000410] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000418] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000420] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000428] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000430] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000438] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000440] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x00000448] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000450] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000458] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000460] */ 0x00000020, 0xe0021327, // mov rb12,32 -+-/* [0x00000468] */ 0x00000006, 0xe0021367, // mov rb13,6 -+-/* [0x00000470] */ 0x00000001, 0xe00213a7, // mov rb14,1 -+-/* [0x00000478] */ 0x00000000, 0xe00213e7, // mov rb15,0 -+-/* [0x00000480] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000488] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000490] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000498] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000004a0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000004a8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000004b0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000004b8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x000004c0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x000004c8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x000004d0] */ 0xfffffea8, 0xf06809e7, // brr.anyn -, r:uvloop -+-/* [0x000004d8] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x000004e0] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x000004e8] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x000004f0] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x000004f8] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000500] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000508] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000510] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000518] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000520] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000528] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000530] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000360] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000368] */ 0x8e4539bf, 0xb0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -++/* [0x00000370] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000378] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000380] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000388] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000390] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000398] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000003a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000003a8] */ 0x0c627c80, 0x10020f27, // add t1s, ra_frame_base, r2 -++/* [0x000003b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000003b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000003c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000003c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000003d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000003d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000003e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x000003e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x000003f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000003f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000400] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000408] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000410] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000418] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000420] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000428] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000430] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000438] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000440] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000448] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000450] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000458] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000460] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x00000468] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x00000470] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x00000478] */ 0xfffffec8, 0xf06809e7, // brr.anyn -, r:uvloop -++/* [0x00000480] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00000488] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00000490] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00000498] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000004a0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004a8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000004b0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000004b8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000004c0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000004c8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000004d0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000004d8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_uv_b0 -+-/* [0x00000538] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000540] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00000548] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000550] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000558] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x00000560] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000568] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x00000570] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x00000578] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x00000580] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000588] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x00000590] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -+-/* [0x00000598] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000005a0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005a8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000005b0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000005b8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x000005c0] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x000005c8] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x000005d0] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x000005d8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x000005e0] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x000005e8] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x000005f0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000005f8] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000600] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000608] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000610] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000618] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000620] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000628] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000630] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x00000638] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000640] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000648] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x00000650] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000658] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x000004e0] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x000004e8] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x000004f0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x000004f8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000500] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000508] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000510] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000518] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000520] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000528] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000530] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000538] */ 0x159d5fc0, 0x10021c67, // mov vw_setup, rb21 -++/* [0x00000540] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x00000548] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000550] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x00000558] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000560] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000568] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x00000570] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x00000578] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000580] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000588] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000590] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000598] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005a0] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005a8] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005b0] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005b8] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x000005c0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005c8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x000005d8] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x000005e0] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005e8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000005f0] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x000005f8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000600] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b0 -+-/* [0x00000660] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000668] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x00000670] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000678] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000680] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000688] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000690] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000698] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x000006a0] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x000006a8] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x000006b0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000006b8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000006c0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000006c8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000006d0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000006d8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000006e0] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000006e8] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000006f0] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x000006f8] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000700] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000708] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000710] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000718] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00000720] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00000728] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00000730] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x00000738] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x00000740] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x00000748] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x00000750] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -+-/* [0x00000758] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -+-/* [0x00000760] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -+-/* [0x00000768] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000770] */ 0x009e7000, 0x100009e7, // nop -+-/* [0x00000778] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000780] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000788] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000790] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000608] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000610] */ 0x8e4539bf, 0xb0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -++/* [0x00000618] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00000620] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00000628] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x00000630] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00000638] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00000640] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x00000648] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x00000650] */ 0x0c627c80, 0x10020f27, // add t1s, ra_frame_base, r2 -++/* [0x00000658] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000660] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x00000668] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x00000670] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x00000678] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000680] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000688] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000690] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000698] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x000006a0] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x000006a8] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x000006b0] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x000006b8] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x000006c0] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000006c8] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000006d0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000006d8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000006e0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000006e8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000006f0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000006f8] */ 0x0d9d27c0, 0x100229e7, // sub.setf -, r3, rb18 -++/* [0x00000700] */ 0xfffffee8, 0xf06809e7, // brr.anyn -, r:uvloop_b0 -++/* [0x00000708] */ 0x0f9c63c0, 0xd0020c27, // asr vpm, r1, 6 -++/* [0x00000710] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000718] */ 0x009e7000, 0x100009e7, // nop -++/* [0x00000720] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000728] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000730] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000738] */ 0x009e7000, 0x100009e7, // nop -+ // ::mc_filter_uv_b -+-/* [0x00000798] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x000007a0] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x000007a8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000007b0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x000007b8] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -+-/* [0x000007c0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x000007c8] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -+-/* [0x000007d0] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -+-/* [0x000007d8] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -+-/* [0x000007e0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x000007e8] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -+-/* [0x000007f0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000007f8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000800] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000808] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000810] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000818] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000820] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -+-/* [0x00000828] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -+-/* [0x00000830] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000838] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -+-/* [0x00000840] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -+-/* [0x00000848] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -+-/* [0x00000850] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000858] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000860] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000868] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -+-/* [0x00000870] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000878] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000880] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000888] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000890] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000898] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a0] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008a8] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000008b0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -+-/* [0x000008b8] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008c0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000008c8] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -+-/* [0x000008d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000008d8] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000740] */ 0x15827d80, 0x100207e7, // mov ra31, unif -++/* [0x00000748] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -++/* [0x00000750] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -++/* [0x00000758] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -++/* [0x00000760] */ 0x928191f6, 0x10024823, // min r0, r0, rb_frame_width_minus_1 ; mov r3, unif -++/* [0x00000768] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000770] */ 0x0d827cc0, 0x100208a7, // sub r2, unif, r3 -++/* [0x00000778] */ 0x0c9e70c0, 0x10020827, // add r0, r0, r3 -++/* [0x00000780] */ 0x149dc1c0, 0xd00214e7, // and rb_x_next, r0, ~3 -++/* [0x00000788] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000790] */ 0x0c9d3e80, 0x100206a7, // add ra_frame_base_next, rb_x_next, r2 -++/* [0x00000798] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x000007a0] */ 0x00000010, 0xe00208a7, // mov r2, 16 -++/* [0x000007a8] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x000007b0] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -++/* [0x000007b8] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x000007c0] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x000007c8] */ 0x0c9c11c0, 0xd0021467, // add rb17, r0, 1 -++/* [0x000007d0] */ 0x0c9c31c0, 0xd00214a7, // add rb18, r0, 3 -++/* [0x000007d8] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x000007e0] */ 0x119cd1c0, 0xd00208e7, // shl r3, r0, 13 -++/* [0x000007e8] */ 0x119c87c0, 0xd00208e7, // shl r3, r3, 8 -++/* [0x000007f0] */ 0x0e9c87c0, 0xd00208e7, // shr r3, r3, 8 -++/* [0x000007f8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000800] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -++/* [0x00000808] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000810] */ 0x0c9d57c0, 0x10020c67, // add vr_setup, r3, rb21 -++/* [0x00000818] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000820] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000828] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000830] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000838] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -++/* [0x00000840] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000848] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000850] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000858] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000860] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000868] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000870] */ 0xfffffff8, 0xe0021967, // mov r5rep, -8 -++/* [0x00000878] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x00000880] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :uvloop_b -+-/* [0x000008e0] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x000008e8] */ 0x8e4539bf, 0xa0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -+-/* [0x000008f0] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x000008f8] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000900] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -+-/* [0x00000908] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000910] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000918] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000920] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-/* [0x00000928] */ 0x0c627c80, 0x10020e27, // add t0s, ra_frame_base, r2 -+-/* [0x00000930] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000938] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000940] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000948] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000950] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000958] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000960] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000968] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000970] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00000978] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00000980] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -+-/* [0x00000988] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x00000990] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00000998] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x000009a0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x000009a8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x000009b0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000009b8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000009c0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000009c8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000009d0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000009d8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000009e0] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -+-/* [0x000009e8] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -+-/* [0x000009f0] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -+-/* [0x000009f8] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00000a00] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00000a08] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00000a10] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00000a18] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a20] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+-/* [0x00000a28] */ 0x00000010, 0xe0020827, // mov r0, 16 -+-/* [0x00000a30] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a38] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00000a40] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -+-/* [0x00000a48] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00000a50] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00000888] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00000890] */ 0x8e4539bf, 0xb0029810, // shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -++/* [0x00000898] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x000008a0] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x000008a8] */ 0xee454987, 0x10024860, // shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 -++/* [0x000008b0] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x000008b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000008c0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000008c8] */ 0xec414c8f, 0x10024e21, // add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -++/* [0x000008d0] */ 0x0c627c80, 0x10020f27, // add t1s, ra_frame_base, r2 -++/* [0x000008d8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000008e0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000008e8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000008f0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000008f8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x00000900] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00000908] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00000910] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00000918] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00000920] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00000928] */ 0x8d3447f6, 0xd00279cc, // sub.setf -, r3, 4 ; mov ra12, ra13 -++/* [0x00000930] */ 0xffffff38, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x00000938] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00000940] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00000948] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x00000950] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x00000958] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x00000960] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x00000968] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x00000970] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x00000978] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x00000980] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00000988] */ 0x0cc27380, 0x10020867, // add r1, r1, vpm -++/* [0x00000990] */ 0x0c7a7380, 0x10020867, // add r1, r1, ra30 -++/* [0x00000998] */ 0xfffffed0, 0xf06809e7, // brr.anyn -, r:uvloop_b -++/* [0x000009a0] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -++/* [0x000009a8] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x000009b0] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x000009b8] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x000009c0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009c8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x000009d0] */ 0x00000010, 0xe0020827, // mov r0, 16 -++/* [0x000009d8] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000009e0] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x000009e8] */ 0x0c9dae00, 0x10021c67, // add vw_setup, rb26, r0 -++/* [0x000009f0] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x000009f8] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_exit -+-/* [0x00000a58] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000a60] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -+-/* [0x00000a68] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a70] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a78] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a80] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000a88] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000a90] */ 0x009e7000, 0x100009e7, // nop ; nop -+-/* [0x00000a98] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a00] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a08] */ 0x00000000, 0xe80009e7, // mov -,srel(0) -++/* [0x00000a10] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a18] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00000a20] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a28] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00000a30] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000a38] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a40] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_interrupt_exit8 -+-/* [0x00000aa0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00000aa8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ab0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ab8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac0] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00000ac8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ad0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ad8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ae0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000ae8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000af0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000af8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00000b00] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x00000b08] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x00000b10] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00000a48] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00000a50] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a58] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00000a60] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00000a68] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00000a70] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a78] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a80] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a88] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a90] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000a98] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000aa0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00000aa8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00000ab0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00000ab8] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_setup -+-/* [0x00000b18] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000b20] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00000b28] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000b30] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000b38] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000b40] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000b48] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -+-/* [0x00000b50] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000b58] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -+-/* [0x00000b60] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000b68] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000b70] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000b78] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -+-/* [0x00000b80] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000b88] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000b90] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000b98] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x00000ba0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -+-/* [0x00000ba8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000bb0] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -+-/* [0x00000bb8] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -+-/* [0x00000bc0] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000bc8] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000bd0] */ 0x8c9e7452, 0x10025e19, // add t0s, r2, r1 ; mov ra_frame_base2, r2 -+-/* [0x00000bd8] */ 0x0d801dc0, 0xd0021667, // sub rb25,unif,1 -+-/* [0x00000be0] */ 0x0d801dc0, 0xd00217a7, // sub rb30,unif,1 -+-/* [0x00000be8] */ 0x15827d80, 0x10021427, // mov rb16, unif -+-/* [0x00000bf0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000bf8] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -+-/* [0x00000c00] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -+-/* [0x00000c08] */ 0x00000001, 0xe0020527, // mov ra20, 1 -+-/* [0x00000c10] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -+-/* [0x00000c18] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -+-/* [0x00000c20] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -+-/* [0x00000c28] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -+-/* [0x00000c30] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -+-/* [0x00000c38] */ 0x00000000, 0xe0020227, // mov ra8, 0 -+-/* [0x00000c40] */ 0x00000000, 0xe0020267, // mov ra9, 0 -+-/* [0x00000c48] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -+-/* [0x00000c50] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -+-/* [0x00000c58] */ 0x00000000, 0xe0020327, // mov ra12, 0 -+-/* [0x00000c60] */ 0x00000000, 0xe0020367, // mov ra13, 0 -+-/* [0x00000c68] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -+-/* [0x00000c70] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -+-/* [0x00000c78] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000c80] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000c88] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000c90] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000c98] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000ca0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000ca8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000cb0] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -+-/* [0x00000cb8] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -+-/* [0x00000cc0] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -+-/* [0x00000cc8] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -+-/* [0x00000cd0] */ 0x159e7480, 0x10020867, // mov r1, r2 -+-/* [0x00000cd8] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -+-/* [0x00000ce0] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -+-/* [0x00000ce8] */ 0x159e7480, 0x10020827, // mov r0, r2 -+-/* [0x00000cf0] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -+-/* [0x00000cf8] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000d00] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -+-/* [0x00000d08] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -+-/* [0x00000d10] */ 0x15827d80, 0x10021327, // mov rb12,unif -+-/* [0x00000d18] */ 0x15827d80, 0x10021367, // mov rb13,unif -+-/* [0x00000d20] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000d28] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -+-/* [0x00000d30] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000d38] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -+-/* [0x00000d40] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000d48] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -+-/* [0x00000d50] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -+-/* [0x00000d58] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+-/* [0x00000d60] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00000ac0] */ 0x00000010, 0xe00208e7, // mov r3, 16 -++/* [0x00000ac8] */ 0x15827d80, 0x10020227, // mov ra8, unif -++/* [0x00000ad0] */ 0x15827d80, 0x10020267, // mov ra9, unif -++/* [0x00000ad8] */ 0x15827d80, 0x100202a7, // mov ra10, unif -++/* [0x00000ae0] */ 0x15827d80, 0x100202e7, // mov ra11, unif -++/* [0x00000ae8] */ 0x15827d80, 0x10020867, // mov r1, unif -++/* [0x00000af0] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000af8] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000b00] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000b08] */ 0x0d9c13c0, 0xd0021667, // sub rb_frame_width_minus_1,r1,1 -++/* [0x00000b10] */ 0x0d9c11c0, 0xd00217a7, // sub rb_frame_height_minus_1,r0,1 -++/* [0x00000b18] */ 0x15827d80, 0x10021427, // mov rb_pitch, unif -++/* [0x00000b20] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000b28] */ 0xc0000000, 0xe0020867, // mov r1, vdw_setup_1(0) -++/* [0x00000b30] */ 0x0c9e7200, 0x10021627, // add rb24, r1, r0 -++/* [0x00000b38] */ 0x15227d80, 0x10020867, // mov r1, ra8 -++/* [0x00000b40] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000b48] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000b50] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000b58] */ 0x0c9a7180, 0x10020827, // add r0, r0, elem_num -++/* [0x00000b60] */ 0x139c01c0, 0xd0020827, // max r0, r0, 0 -++/* [0x00000b68] */ 0x922591f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, ra9 -++/* [0x00000b70] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000b78] */ 0x0c9c13c0, 0xd0020767, // add ra_y, r1, 1 -++/* [0x00000b80] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000b88] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000b90] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000b98] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000ba0] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000ba8] */ 0x8c9e7452, 0x10025e18, // add t0s, r2, r1 ; mov ra_frame_base, r2 -++/* [0x00000bb0] */ 0x152a7d80, 0x10020867, // mov r1, ra10 -++/* [0x00000bb8] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000bc0] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000bc8] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000bd0] */ 0x0c9a7180, 0x10020827, // add r0, r0, elem_num -++/* [0x00000bd8] */ 0x139c01c0, 0xd0020827, // max r0, r0, 0 -++/* [0x00000be0] */ 0x922d91f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, ra11 -++/* [0x00000be8] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000bf0] */ 0x0c9c13c0, 0xd0020567, // add ra_y2, r1, 1 -++/* [0x00000bf8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000c00] */ 0x0c9e7400, 0x100208a7, // add r2, r2, r0 -++/* [0x00000c08] */ 0x139c03c0, 0xd0020867, // max r1, r1, 0 -++/* [0x00000c10] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000c18] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000c20] */ 0x8c9e7452, 0x10025f19, // add t1s, r2, r1 ; mov ra_frame_base2, r2 -++/* [0x00000c28] */ 0x00000001, 0xe0020527, // mov ra20, 1 -++/* [0x00000c30] */ 0x00000100, 0xe00205a7, // mov ra22, 256 -++/* [0x00000c38] */ 0x00000040, 0xe00207a7, // mov ra30, 64 -++/* [0x00000c40] */ 0xffffff00, 0xe0021527, // mov rb20, 0xffffff00 -++/* [0x00000c48] */ 0x000000ff, 0xe00215a7, // mov rb22, 255 -++/* [0x00000c50] */ 0x00000018, 0xe00215e7, // mov rb23, 24 -++/* [0x00000c58] */ 0x00000000, 0xe0020227, // mov ra8, 0 -++/* [0x00000c60] */ 0x00000000, 0xe0020267, // mov ra9, 0 -++/* [0x00000c68] */ 0x00000000, 0xe00202a7, // mov ra10, 0 -++/* [0x00000c70] */ 0x00000000, 0xe00202e7, // mov ra11, 0 -++/* [0x00000c78] */ 0x00000000, 0xe0020327, // mov ra12, 0 -++/* [0x00000c80] */ 0x00000000, 0xe0020367, // mov ra13, 0 -++/* [0x00000c88] */ 0x00000000, 0xe00203a7, // mov ra14, 0 -++/* [0x00000c90] */ 0x00000000, 0xe00203e7, // mov ra15, 0 -++/* [0x00000c98] */ 0x00004000, 0xe00204a7, // mov ra18, 0x4000 -++/* [0x00000ca0] */ 0x159e6fc0, 0x100208a7, // mov r2, qpu_num -++/* [0x00000ca8] */ 0x159e7480, 0x10020867, // mov r1, r2 -++/* [0x00000cb0] */ 0x0f9c23c0, 0xd0020867, // asr r1, r1, 2 -++/* [0x00000cb8] */ 0x119c63c0, 0xd0020867, // shl r1, r1, 6 -++/* [0x00000cc0] */ 0x159e7480, 0x10020827, // mov r0, r2 -++/* [0x00000cc8] */ 0x149c31c0, 0xd0020827, // and r0, r0, 3 -++/* [0x00000cd0] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000cd8] */ 0x00004800, 0xe0020867, // mov r1, vpm_setup(0, 4, h8p(0, 0)) -++/* [0x00000ce0] */ 0x0c9e7040, 0x10021727, // add rb28, r0, r1 -++/* [0x00000ce8] */ 0x80004004, 0xe0020867, // mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) -++/* [0x00000cf0] */ 0x119c51c0, 0xd0020827, // shl r0, r0, 5 -++/* [0x00000cf8] */ 0x0c9e7040, 0x100216e7, // add rb27, r0, r1 -++/* [0x00000d00] */ 0x15827d80, 0x10020867, // mov r1, unif -++/* [0x00000d08] */ 0x919c82ff, 0xd0024822, // shl r0,r1,r3 ; mov r2,8 -++/* [0x00000d10] */ 0x0f9e70c0, 0x10021367, // asr rb13,r0,r3 -++/* [0x00000d18] */ 0x0f9e72c0, 0x10021327, // asr rb12,r1,r3 -++/* [0x00000d20] */ 0x0c9cde80, 0x10021367, // add rb13,rb13,r2 -++/* [0x00000d28] */ 0x119cce80, 0x10021327, // shl rb12, rb12, r2 -++/* [0x00000d30] */ 0x13740dc0, 0xd0020867, // max r1, ra_y, 0 -++/* [0x00000d38] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -++/* [0x00000d40] */ 0x0c741dc0, 0xd0020767, // add ra_y, ra_y, 1 -++/* [0x00000d48] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -++/* [0x00000d50] */ 0x0c627380, 0x10020e27, // add t0s, r1, ra_frame_base -++/* [0x00000d58] */ 0x13540dc0, 0xd0020867, // max r1, ra_y2, 0 -++/* [0x00000d60] */ 0x129de3c0, 0x10020867, // min r1, r1, rb_frame_height_minus_1 -+ /* [0x00000d68] */ 0x0c541dc0, 0xd0020567, // add ra_y2, ra_y2, 1 -+ /* [0x00000d70] */ 0x409d000f, 0x100049e1, // nop ; mul24 r1, r1, rb_pitch -+-/* [0x00000d78] */ 0x0c667380, 0x10020e27, // add t0s, r1, ra_frame_base2 -+-// ::mc_filter -++/* [0x00000d78] */ 0x0c667380, 0x10020f27, // add t1s, r1, ra_frame_base2 -++// :per_block_setup -+ /* [0x00000d80] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ /* [0x00000d88] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+ /* [0x00000d90] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+ /* [0x00000d98] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -+-/* [0x00000da0] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000da8] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00000db0] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000db8] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00000dc0] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00000dc8] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000dd0] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -+-/* [0x00000dd8] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00000de0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -+-/* [0x00000de8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00000df0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x00000df8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -+-/* [0x00000e00] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00000e08] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -+-/* [0x00000e10] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x00000e18] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x00000e20] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e28] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x00000e30] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x00000e38] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00000e40] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00000e48] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00000e50] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00000e58] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00000e60] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000e68] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00000e70] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000e78] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000e80] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000e88] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000e90] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000e98] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00000ea0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000ea8] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000eb0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000eb8] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ec0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x00000ec8] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000ed0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ed8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000ee8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x00000ef0] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000ef8] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f00] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00000f08] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000da0] */ 0x00000010, 0xe00208e7, // mov r3, 16 -++/* [0x00000da8] */ 0x15827d80, 0x10020867, // mov r1, unif -++/* [0x00000db0] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000db8] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000dc0] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000dc8] */ 0x0c9a7180, 0x10020827, // add r0, r0, elem_num -++/* [0x00000dd0] */ 0x139c01c0, 0xd0020827, // max r0, r0, 0 -++/* [0x00000dd8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000de0] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -++/* [0x00000de8] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -++/* [0x00000df0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000df8] */ 0x8c827436, 0x100246a1, // add ra_frame_base_next, r2, r0 ; mov r1, unif -++/* [0x00000e00] */ 0x119e72c0, 0x10020827, // shl r0,r1,r3 -++/* [0x00000e08] */ 0x0f9e72c0, 0x10020867, // asr r1,r1,r3 -++/* [0x00000e10] */ 0x0f9e70c0, 0x10020827, // asr r0,r0,r3 -++/* [0x00000e18] */ 0x0c9a7180, 0x10020827, // add r0, r0, elem_num -++/* [0x00000e20] */ 0x139c01c0, 0xd0020827, // max r0, r0, 0 -++/* [0x00000e28] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -++/* [0x00000e30] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -++/* [0x00000e38] */ 0x159e7240, 0x10021067, // mov ra_y2_next, r1 -++/* [0x00000e40] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -++/* [0x00000e48] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -++/* [0x00000e50] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -++/* [0x00000e58] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00000e60] */ 0x0e9e70c0, 0x10020867, // shr r1, r0, r3 -++/* [0x00000e68] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -++/* [0x00000e70] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -++/* [0x00000e78] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -++/* [0x00000e80] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -++/* [0x00000e88] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -++/* [0x00000e90] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -++/* [0x00000e98] */ 0x119e70c0, 0x10020827, // shl r0, r0, r3 -++/* [0x00000ea0] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -++/* [0x00000ea8] */ 0x95801dbf, 0xd0024821, // mov r0, unif ; mov r1,1 -++/* [0x00000eb0] */ 0x4f5971c6, 0x10024260, // asr ra9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000eb8] */ 0x4f5971c6, 0x10024220, // asr ra8, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec0] */ 0x4f5971c6, 0x10044260, // asr.ifz ra9, r0, rb23; mul24 r0, r0, ra22 -++/* [0x00000ec8] */ 0x0f9d71c0, 0x10040227, // asr.ifz ra8, r0, rb23 -++/* [0x00000ed0] */ 0x0d243f80, 0xd0020267, // sub ra9,3,ra9 -++/* [0x00000ed8] */ 0x0d203f80, 0xd0020227, // sub ra8,3,ra8 -++/* [0x00000ee0] */ 0x11243dc0, 0xd0020267, // shl ra9,ra9,3 -++/* [0x00000ee8] */ 0x11203dc0, 0xd0020227, // shl ra8,ra8,3 -++/* [0x00000ef0] */ 0x00ffff00, 0xe0020867, // mov r1,0xffff00 -++/* [0x00000ef8] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000f00] */ 0x0f9d71c0, 0x10020027, // asr ra0, r0, rb23 -++/* [0x00000f08] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -+ /* [0x00000f10] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -+-/* [0x00000f18] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00000f20] */ 0x15827d80, 0x100009e7, // mov.ifnz -, unif -+-/* [0x00000f28] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00000f30] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00000f38] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00000f40] */ 0x00000000, 0xe00208e7, // mov r3, 0 -++/* [0x00000f18] */ 0x01040400, 0xe0020867, // mov r1,0x1040400 -++/* [0x00000f20] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000f28] */ 0x0f9d71c0, 0x10020067, // asr ra1, r0, rb23 -++/* [0x00000f30] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000f38] */ 0x0f9d71c0, 0x10021167, // asr rb5, r0, rb23 -++/* [0x00000f40] */ 0xfbf5f600, 0xe0020867, // mov r1,0xfbf5f600 -++/* [0x00000f48] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000f50] */ 0x0f9d71c0, 0x100200a7, // asr ra2, r0, rb23 -++/* [0x00000f58] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000f60] */ 0x0f9d71c0, 0x100211a7, // asr rb6, r0, rb23 -++/* [0x00000f68] */ 0x11283a40, 0xe0020867, // mov r1,0x11283a40 -++/* [0x00000f70] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000f78] */ 0x0f9d71c0, 0x100200e7, // asr ra3, r0, rb23 -++/* [0x00000f80] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000f88] */ 0x0f9d71c0, 0x100211e7, // asr rb7, r0, rb23 -++/* [0x00000f90] */ 0x3a281100, 0xe0020867, // mov r1,0x3a281100 -++/* [0x00000f98] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000fa0] */ 0x0f9d71c0, 0x10020127, // asr ra4, r0, rb23 -++/* [0x00000fa8] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000fb0] */ 0x0f9d71c0, 0x10021227, // asr rb8, r0, rb23 -++/* [0x00000fb8] */ 0xf6f5fb00, 0xe0020867, // mov r1,0xf6f5fb00 -++/* [0x00000fc0] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000fc8] */ 0x0f9d71c0, 0x10020167, // asr ra5, r0, rb23 -++/* [0x00000fd0] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00000fd8] */ 0x0f9d71c0, 0x10021267, // asr rb9, r0, rb23 -++/* [0x00000fe0] */ 0x04040100, 0xe0020867, // mov r1,0x4040100 -++/* [0x00000fe8] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00000ff0] */ 0x0f9d71c0, 0x100201a7, // asr ra6, r0, rb23 -++/* [0x00000ff8] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00001000] */ 0x0f9d71c0, 0x100212a7, // asr rb10, r0, rb23 -++/* [0x00001008] */ 0xffff0000, 0xe0020867, // mov r1,0xffff0000 -++/* [0x00001010] */ 0x11227380, 0x10020827, // shl r0, r1, ra8 -++/* [0x00001018] */ 0x0f9d71c0, 0x100201e7, // asr ra7, r0, rb23 -++/* [0x00001020] */ 0x11267380, 0x10020827, // shl r0, r1, ra9 -++/* [0x00001028] */ 0x0f9d71c0, 0x100212e7, // asr rb11, r0, rb23 -++/* [0x00001030] */ 0x15827d80, 0x10020827, // mov r0, unif -++/* [0x00001038] */ 0x0f9e70c0, 0x100213e7, // asr rb15, r0, r3 -++/* [0x00001040] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -++/* [0x00001048] */ 0x119e70c0, 0x10020827, // shl r0, r0, r3 -++/* [0x00001050] */ 0x8f9c00ff, 0xd0024823, // asr r0, r0, r3 ; mov r3, 0 -++/* [0x00001058] */ 0x119c81c0, 0xd00213a7, // shl rb14, r0, 8 -++// ::mc_filter -+ // :yloop -+-/* [0x00000f48] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00000f50] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-/* [0x00000f58] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00000f60] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00000f68] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -+-/* [0x00000f70] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -+-/* [0x00000f78] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00000f80] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000f88] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00000f90] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000f98] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -+-/* [0x00000fa0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00000fa8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-/* [0x00000fb0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -+-/* [0x00000fb8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00000fc0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x00000fc8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x00000fd0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x00000fd8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x00000fe0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x00000fe8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x00000ff0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x00000ff8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00001000] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00001008] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00001010] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00001018] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00001020] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001028] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001030] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001038] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001040] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001048] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -+-/* [0x00001050] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001058] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001060] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001068] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001070] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -+-/* [0x00001078] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001080] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00001088] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00001090] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00001098] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000010a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000010a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000010b0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-/* [0x000010b8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-/* [0x000010c0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-/* [0x000010c8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -+-/* [0x000010d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000010d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000010e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000010e8] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -+-/* [0x000010f0] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -+-/* [0x000010f8] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -+-/* [0x00001100] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -+-/* [0x00001108] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -+-/* [0x00001110] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00001118] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00001120] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001128] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001130] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001138] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00001060] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001068] */ 0x8e4539bf, 0xb0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu1 -++/* [0x00001070] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00001078] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001080] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00001088] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00001090] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001098] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000010a0] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000010a8] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x000010b0] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x000010b8] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000010c0] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x000010c8] */ 0xec654c8f, 0x10024f21, // add t1s, ra_frame_base2, r2 ; v8subs r1, r1, rb20 -++/* [0x000010d0] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000010d8] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000010e0] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000010e8] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000010f0] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000010f8] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x00001100] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001108] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001110] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001118] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001120] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001128] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001130] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001138] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001140] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001148] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001150] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001158] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001160] */ 0x8d2487f6, 0xd00279c8, // sub.setf -, r3, 8 ; mov ra8, ra9 -++/* [0x00001168] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001170] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001178] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001180] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001188] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001190] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001198] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x000011a0] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000011a8] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000011b0] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000011b8] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000011c0] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000011c8] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000011d0] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000011d8] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000011e0] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000011e8] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000011f0] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000011f8] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -++/* [0x00001200] */ 0x409ce00f, 0x100049e1, // nop ; mul24 r1, r1, rb14 -++/* [0x00001208] */ 0x0c9cc3c0, 0x10020867, // add r1, r1, rb12 -++/* [0x00001210] */ 0x0f9cd3c0, 0x10020867, // asr r1, r1, rb13 -++/* [0x00001218] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloop -++/* [0x00001220] */ 0x0c9cf3c0, 0x10020867, // add r1, r1, rb15 -++/* [0x00001228] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001230] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001238] */ 0xfffffb28, 0xf0f809e7, // brr -, r:per_block_setup -++/* [0x00001240] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001248] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001250] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_filter_b -+-/* [0x00001140] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x00001148] */ 0x15827d80, 0x100207e7, // mov ra31, unif -+-/* [0x00001150] */ 0x154e7d80, 0x10020467, // mov ra_xshift, ra_xshift_next -+-/* [0x00001158] */ 0x155e7d80, 0x10021027, // mov rx_xshift2, rx_xshift2_next -+-/* [0x00001160] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x00001168] */ 0x938001f6, 0xd0024821, // max r0, r0, 0; mov r1, unif -+-/* [0x00001170] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x00001178] */ 0x119c31c0, 0xd00204e7, // shl ra_xshift_next, r0, 3 -+-/* [0x00001180] */ 0x159e7240, 0x10020727, // mov ra_y_next, r1 -+-/* [0x00001188] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x00001190] */ 0x0c9e7400, 0x100206a7, // add ra_frame_base_next, r2, r0 -+-/* [0x00001198] */ 0x0c9a0f80, 0x10020827, // add r0, unif, elem_num -+-/* [0x000011a0] */ 0x938001f6, 0xd0024821, // max r0, r0, 0 ; mov r1, unif -+-/* [0x000011a8] */ 0x928191f6, 0x10024822, // min r0, r0, rb_frame_width_minus_1 ; mov r2, unif -+-/* [0x000011b0] */ 0x119c31c0, 0xd00205e7, // shl rx_xshift2_next, r0, 3 -+-/* [0x000011b8] */ 0x0c9c13c0, 0xd0021067, // add ra_y2_next, r1, 1 -+-/* [0x000011c0] */ 0x149dc1c0, 0xd0020827, // and r0, r0, ~3 -+-/* [0x000011c8] */ 0x0c9e7400, 0x100214e7, // add rx_frame_base2_next, r2, r0 -+-/* [0x000011d0] */ 0x159dcfc0, 0x10021c67, // mov vw_setup, rb28 -+-/* [0x000011d8] */ 0x00000010, 0xe00208a7, // mov r2, 16 -+-/* [0x000011e0] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x000011e8] */ 0x0e9e7080, 0x10020867, // shr r1, r0, r2 -+-/* [0x000011f0] */ 0x0d9d8e40, 0x10021767, // sub rb29, rb24, r1 -+-/* [0x000011f8] */ 0x149d61c0, 0x10020827, // and r0, r0, rb22 -+-/* [0x00001200] */ 0x0c9c51c0, 0xd0021467, // add rb17, r0, 5 -+-/* [0x00001208] */ 0x0c9c71c0, 0xd00214a7, // add rb18, r0, 7 -+-/* [0x00001210] */ 0x119c71c0, 0xd0020827, // shl r0, r0, 7 -+-/* [0x00001218] */ 0x0c9e7040, 0x10020827, // add r0, r0, r1 -+-/* [0x00001220] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001228] */ 0x0c9db1c0, 0x100216a7, // add rb26, r0, rb27 -+-/* [0x00001230] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001238] */ 0x00000001, 0xe0020867, // mov r1, 1 -+-/* [0x00001240] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001248] */ 0x409f3001, 0xd00049e0, // nop ; mul24 r0, r0 << 13, r1 << 13 -+-/* [0x00001250] */ 0x4f5971c6, 0x100240e0, // asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001258] */ 0x409f2001, 0xd00049e0, // nop ; mul24 r0, r0 << 14, r1 << 14 -+-/* [0x00001260] */ 0x4f5971c6, 0x100240a0, // asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001268] */ 0x409f1001, 0xd00049e0, // nop ; mul24 r0, r0 << 15, r1 << 15 -+-/* [0x00001270] */ 0x4f5971c6, 0x10024060, // asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001278] */ 0x8f8171f6, 0x10024020, // asr ra0, r0, rb23; mov r0, unif -+-/* [0x00001280] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001288] */ 0x409f7001, 0xd00049e0, // nop ; mul24 r0, r0 << 9, r1 << 9 -+-/* [0x00001290] */ 0x4f5971c6, 0x100241e0, // asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001298] */ 0x409f6001, 0xd00049e0, // nop ; mul24 r0, r0 << 10, r1 << 10 -+-/* [0x000012a0] */ 0x4f5971c6, 0x100241a0, // asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012a8] */ 0x409f5001, 0xd00049e0, // nop ; mul24 r0, r0 << 11, r1 << 11 -+-/* [0x000012b0] */ 0x4f5971c6, 0x10024160, // asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012b8] */ 0x409f4001, 0xd00049e0, // nop ; mul24 r0, r0 << 12, r1 << 12 -+-/* [0x000012c0] */ 0x8f8171f6, 0x10024120, // asr ra4, r0, rb23; mov r0, unif -+-/* [0x000012c8] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x000012d0] */ 0x4f5971c6, 0x100252e0, // asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012d8] */ 0x4f5971c6, 0x100252a0, // asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012e0] */ 0x4f5971c6, 0x10025260, // asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x000012e8] */ 0x8f8171f6, 0x10025220, // asr rb8, r0, rb23; mov r0, unif -+-/* [0x000012f0] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x000012f8] */ 0x4f5971c6, 0x100251e0, // asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001300] */ 0x4f5971c6, 0x100251a0, // asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001308] */ 0x4f5971c6, 0x10025160, // asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-/* [0x00001310] */ 0x0f9d71c0, 0x10021127, // asr rb4, r0, rb23 -+-/* [0x00001318] */ 0x15827d80, 0x10020827, // mov r0, unif -+-/* [0x00001320] */ 0x15827d80, 0x10060827, // mov.ifnz r0, unif -+-/* [0x00001328] */ 0x0f9e7080, 0x100213e7, // asr rb15, r0, r2 -+-/* [0x00001330] */ 0x119e7080, 0x10020827, // shl r0, r0, r2 -+-/* [0x00001338] */ 0x0f9e7080, 0x100213a7, // asr rb14, r0, r2 -+-/* [0x00001340] */ 0x00000000, 0xe00208e7, // mov r3, 0 -+ // :yloopb -+-/* [0x00001348] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-/* [0x00001350] */ 0x8e4539bf, 0xa0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-/* [0x00001358] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-/* [0x00001360] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-/* [0x00001368] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -+-/* [0x00001370] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -+-/* [0x00001378] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -+-/* [0x00001380] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x00001388] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-/* [0x00001390] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -+-/* [0x00001398] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -+-/* [0x000013a0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -+-/* [0x000013a8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-/* [0x000013b0] */ 0xec654c87, 0x10024e20, // add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -+-/* [0x000013b8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-/* [0x000013c0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -+-/* [0x000013c8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-/* [0x000013d0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -+-/* [0x000013d8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-/* [0x000013e0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-/* [0x000013e8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-/* [0x000013f0] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-/* [0x000013f8] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-/* [0x00001400] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-/* [0x00001408] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-/* [0x00001410] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-/* [0x00001418] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-/* [0x00001420] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-/* [0x00001428] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-/* [0x00001430] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-/* [0x00001438] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-/* [0x00001440] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -+-/* [0x00001448] */ 0x8d3487f6, 0xd00279cc, // sub.setf -, r3, 8 ; mov ra12, ra13 -+-/* [0x00001450] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -+-/* [0x00001458] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -+-/* [0x00001460] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -+-/* [0x00001468] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -+-/* [0x00001470] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -+-/* [0x00001478] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -+-/* [0x00001480] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -+-/* [0x00001488] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -+-/* [0x00001490] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -+-/* [0x00001498] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -+-/* [0x000014a0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-/* [0x000014a8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-/* [0x000014b0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-/* [0x000014b8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-/* [0x000014c0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-/* [0x000014c8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -+-/* [0x000014d0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -+-/* [0x000014d8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-/* [0x000014e0] */ 0x0f9ce3c0, 0xd0020867, // asr r1, r1, 14 -+-/* [0x000014e8] */ 0x4053800e, 0xd00049e1, // nop ; mul24 r1, r1 << 8, ra20 << 8 -+-/* [0x000014f0] */ 0x4c78e38f, 0x10024860, // add r1, r1, ra30 ; mul24 r0, r1, rb14 -+-/* [0x000014f8] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -+-/* [0x00001500] */ 0xfffffe28, 0xf06809e7, // brr.anyn -, r:yloopb -+-/* [0x00001508] */ 0x0f9c73c0, 0xd0020867, // asr r1, r1, 7 -+-/* [0x00001510] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -+-/* [0x00001518] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -+-/* [0x00001520] */ 0x00000000, 0xf0f7e9e7, // bra -, ra31 -+-/* [0x00001528] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -+-/* [0x00001530] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -+-/* [0x00001538] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -++/* [0x00001258] */ 0xcd5117de, 0xa00269e3, // sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++/* [0x00001260] */ 0x8e4539bf, 0xb0029819, // shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu1 -++/* [0x00001268] */ 0x956a7d9b, 0x1004461f, // mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++/* [0x00001270] */ 0x95710dbf, 0x10044763, // mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++/* [0x00001278] */ 0x0e9c09c0, 0x10020867, // shr r1, r4, rx_xshift2 -++/* [0x00001280] */ 0x159c1fc0, 0x10040567, // mov.ifz ra_y2, ra_y2_next -++/* [0x00001288] */ 0x13740dc0, 0xd00208a7, // max r2, ra_y, 0 -++/* [0x00001290] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x00001298] */ 0x4c741dd3, 0xd0024762, // add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++/* [0x000012a0] */ 0xec614c87, 0x10024e20, // add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 -++/* [0x000012a8] */ 0x13540dc0, 0xd00208a7, // max r2, ra_y2, 0 -++/* [0x000012b0] */ 0x129de5c0, 0x100208a7, // min r2, r2, rb_frame_height_minus_1 -++/* [0x000012b8] */ 0x4c541dd3, 0xd0024562, // add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++/* [0x000012c0] */ 0xec654c8f, 0x10024f21, // add t1s, ra_frame_base2, r2 ; v8subs r1, r1, rb20 -++/* [0x000012c8] */ 0x0000ff00, 0xe20229e7, // mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++/* [0x000012d0] */ 0x40027006, 0x100049e2, // nop ; mul24 r2, r0, ra0 -++/* [0x000012d8] */ 0x40038031, 0xd000c9e2, // nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++/* [0x000012e0] */ 0x4007f030, 0xd00049e3, // nop ; mul24 r3, ra1 << 1, r0 << 1 -++/* [0x000012e8] */ 0x40077031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++/* [0x000012f0] */ 0x4c0be4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++/* [0x000012f8] */ 0x400b6031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++/* [0x00001300] */ 0x4c0fd4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++/* [0x00001308] */ 0x400f5031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++/* [0x00001310] */ 0x4c13c4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++/* [0x00001318] */ 0x40134031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++/* [0x00001320] */ 0x4c17b4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++/* [0x00001328] */ 0x40173031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++/* [0x00001330] */ 0x4c1ba4f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++/* [0x00001338] */ 0x401b2031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++/* [0x00001340] */ 0x4c1f94f0, 0xd00248a3, // add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++/* [0x00001348] */ 0x401f1031, 0xd000c9e3, // nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++/* [0x00001350] */ 0x8c9df4ff, 0x10024823, // add r0, r2, r3 ; mov r3, rb31 -++/* [0x00001358] */ 0x8d2487f6, 0xd00279c8, // sub.setf -, r3, 8 ; mov ra8, ra9 -++/* [0x00001360] */ 0x152a7d80, 0x10020267, // mov ra9, ra10 -++/* [0x00001368] */ 0x152e7d80, 0x100202a7, // mov ra10, ra11 -++/* [0x00001370] */ 0x15327d80, 0x100202e7, // mov ra11, ra12 -++/* [0x00001378] */ 0x15367d80, 0x10020327, // mov ra12, ra13 -++/* [0x00001380] */ 0xfffffeb8, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001388] */ 0x153a7d80, 0x10020367, // mov ra13, ra14 -++/* [0x00001390] */ 0x153e7d80, 0x100203a7, // mov ra14, ra15 -++/* [0x00001398] */ 0x159e7000, 0x100203e7, // mov ra15, r0 -++/* [0x000013a0] */ 0x4038a037, 0x100049e1, // nop ; mul24 r1, ra14, rb10 -++/* [0x000013a8] */ 0x40349037, 0x100049e0, // nop ; mul24 r0, ra13, rb9 -++/* [0x000013b0] */ 0x4c308237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra12, rb8 -++/* [0x000013b8] */ 0x4c3cb237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra15, rb11 -++/* [0x000013c0] */ 0x4c204237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra8, rb4 -++/* [0x000013c8] */ 0x4c245237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra9, rb5 -++/* [0x000013d0] */ 0x4c286237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra10, rb6 -++/* [0x000013d8] */ 0x4c2c7237, 0x10024860, // add r1, r1, r0 ; mul24 r0, ra11, rb7 -++/* [0x000013e0] */ 0x8c9f223f, 0x10020867, // add r1, r1, r0 ; mov -, vw_wait -++/* [0x000013e8] */ 0x4d5927ce, 0x100269e1, // sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++/* [0x000013f0] */ 0x0f9ce3c0, 0xd0020827, // asr r0, r1, 14 -++/* [0x000013f8] */ 0x0f9c63c0, 0xd0020867, // asr r1, r1, 6 -++/* [0x00001400] */ 0x405b8006, 0xd00049e0, // nop ; mul24 r0, r0 << 8, ra22 << 8 -++/* [0x00001408] */ 0x0c4a7380, 0x10020867, // add r1, r1, ra18 -++/* [0x00001410] */ 0x0c9e7200, 0x10020867, // add r1, r1, r0 -++/* [0x00001418] */ 0xfffffe20, 0xf06809e7, // brr.anyn -, r:yloopb -++/* [0x00001420] */ 0x0f9cf3c0, 0xd0020867, // asr r1, r1, 15 -++/* [0x00001428] */ 0x129d63c0, 0x10020867, // min r1, r1, rb22 -++/* [0x00001430] */ 0x139c03c0, 0xd0020c27, // max vpm, r1, 0 -++/* [0x00001438] */ 0xfffff928, 0xf0f809e7, // brr -, r:per_block_setup -++/* [0x00001440] */ 0x159dafc0, 0x10021c67, // mov vw_setup, rb26 -++/* [0x00001448] */ 0x159ddfc0, 0x10021c67, // mov vw_setup, rb29 -++/* [0x00001450] */ 0x15827d80, 0x10021ca7, // mov vw_addr, unif -+ // ::mc_interrupt_exit12 -+-/* [0x00001540] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -+-/* [0x00001548] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001550] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001558] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001560] */ 0x009e7000, 0xa00009e7, // ldtmu0 -+-/* [0x00001568] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001570] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001578] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001580] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001588] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001590] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x00001598] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -+-/* [0x000015c0] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -+-/* [0x000015c8] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -+-/* [0x000015d0] */ 0x009e7000, 0x100009e7, // nop ; nop -++/* [0x00001458] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x00001460] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001468] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001470] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00001478] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00001480] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001488] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001490] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x00001498] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014a0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014a8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014b0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014b8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014c0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014c8] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014d0] */ 0x00000010, 0xe80009e7, // mov -,sacq(0) -++/* [0x000014d8] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x000014e0] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x000014e8] */ 0x009e7000, 0x100009e7, // nop ; nop -++// ::mc_exit1 -++/* [0x000014f0] */ 0x159f2fc0, 0x100009e7, // mov -, vw_wait -++/* [0x000014f8] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001500] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00001508] */ 0x009e7000, 0xa00009e7, // ldtmu0 -++/* [0x00001510] */ 0x009e7000, 0xb00009e7, // ldtmu1 -++/* [0x00001518] */ 0x009e7000, 0x300009e7, // nop ; nop ; thrend -++/* [0x00001520] */ 0x00000001, 0xe00209a7, // mov interrupt, 1; nop -++/* [0x00001528] */ 0x009e7000, 0x100009e7, // nop ; nop -+ // ::mc_end -+ }; -+ #ifdef __HIGHC__ -+diff --git a/libavcodec/rpi_shader.h b/libavcodec/rpi_shader.h -+index 6e552d9..760bd17 100644 -+--- a/libavcodec/rpi_shader.h -++++ b/libavcodec/rpi_shader.h -+@@ -4,15 +4,16 @@ -+ extern unsigned int rpi_shader[]; -+ -+ #define mc_setup_uv (rpi_shader + 0) -+-#define mc_filter_uv (rpi_shader + 144) -+-#define mc_filter_uv_b0 (rpi_shader + 334) -+-#define mc_filter_uv_b (rpi_shader + 486) -+-#define mc_exit (rpi_shader + 662) -+-#define mc_interrupt_exit8 (rpi_shader + 680) -+-#define mc_setup (rpi_shader + 710) -+-#define mc_filter (rpi_shader + 864) -+-#define mc_filter_b (rpi_shader + 1104) -+-#define mc_interrupt_exit12 (rpi_shader + 1360) -+-#define mc_end (rpi_shader + 1398) -++#define mc_filter_uv (rpi_shader + 130) -++#define mc_filter_uv_b0 (rpi_shader + 312) -++#define mc_filter_uv_b (rpi_shader + 464) -++#define mc_exit (rpi_shader + 640) -++#define mc_interrupt_exit8 (rpi_shader + 658) -++#define mc_setup (rpi_shader + 688) -++#define mc_filter (rpi_shader + 1048) -++#define mc_filter_b (rpi_shader + 1174) -++#define mc_interrupt_exit12 (rpi_shader + 1302) -++#define mc_exit1 (rpi_shader + 1340) -++#define mc_end (rpi_shader + 1356) -+ -+ #endif -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index a0b8e5a..60d1ec2 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -21,6 +21,7 @@ -+ # -+ # ra16 clipped(row start address+elem_num)&~3 -+ # ra17 per-channel shifts -++# ra18 0x4000 -+ # ra19 next ra17 -+ # -+ # rb16 pitch -+@@ -86,7 +87,7 @@ -+ -+ -+ ################################################################################ -+-# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, pad0, pad1, pad2) -++# mc_setup_uv(next_kernel, x, y, ref_u_base, ref_v_base, frame_width, frame_height, pitch, dst_pitch, offset, denom, vpm_id) -+ ::mc_setup_uv -+ -+ # Read starting kernel -+@@ -132,36 +133,6 @@ mov ra13, 0 -+ mov ra14, 0 -+ mov ra15, 0 -+ -+-# Compute part of VPM to use for DMA output -+-mov r3, unif -+-shl r2, r3, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -+-and r2, r2, 15 -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -+-shl r0, r0, 5 -+-add rb27, r0, r1 -+- -+-# Compute part of VPM to save data into -+-shl r2, r3, 1 -+-and r2, r2, 15 # r2 = bcd0 -+-mov r1, r2 # r1 = bcd0 -+-asr r1, r1, 2 # r1 = bc -+-shl r1, r1, 6 # r1 = bc000000 -+-mov r0, r2 # r0 = bcd0 -+-and r0, r0, 3 # r0 = d0 -+-add r0, r0, r1 # r0 = bc0000d0 -+-mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -+-add rb28, r0, r1 -+-asr r0, r0, 1 # r0 = bc0000d -+-# Prepare VPM command for 16bit intermediates -+-mov r1, vpm_setup(0, 2, h16p(0, 0)) # 2 is stride - stride acts on ADDR which is Y[5:0],H[0] for 16 bit -+-add rb21, r0, r1 -+- -+ # Compute base address for first and second access -+ mov r0, ra_x # Load x -+ max r0, r0, 0; mov r1, ra_y # Load y -+@@ -175,10 +146,31 @@ min r1, r1, rb_frame_height_minus_1 -+ # submit texture requests for first line -+ add r2, r2, r0 ; mul24 r1, r1, rb_pitch -+ add t0s, r0, r1 ; mov ra_frame_base, r2 -+-add t0s, r2, r1 -++add t1s, r2, r1 -++ -++mov r2,8 -++shl rb12,unif, r2 # offset before shift -++add rb13,unif,r2 # offset after shift -++ -++# Compute part of VPM to use for DMA output -++mov r2, unif -++shl r2, r2, 1 # Convert QPU numbers to be even (this means we can only use 8 QPUs, but is necessary as we need to save 16bit intermediate results) -++and r2, r2, 15 -++mov r1, r2 -++asr r1, r1, 2 -++shl r1, r1, 6 -++mov r0, r2 -++and r0, r0, 3 -++add r0, r0, r1 -+ -+-mov rb12,unif # offset before shift -+-mov rb13,unif # offset after shift -++mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -++add rb28, r0, r1 # VPM 8bit storage -++asr r2, r0, 1 # r0 = bc0000d -++mov r1, vpm_setup(0, 2, h16p(0, 0)) # 2 is stride - stride acts on ADDR which is Y[5:0],H[0] for 16 bit -++add rb21, r2, r1 # VPM for 16bit intermediates -++mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++shl r0, r0, 5 -++add rb27, r0, r1 # DMA out -+ -+ # submit texture requests for second line -+ max r1, ra_y, 0 -+@@ -187,7 +179,7 @@ add ra_y, ra_y, 1 -+ bra -, ra31 -+ nop ; mul24 r1, r1, rb_pitch -+ add t0s, r1, ra_x -+-add t0s, r1, ra_frame_base -++add t1s, r1, ra_frame_base -+ -+ -+ -+@@ -248,17 +240,15 @@ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ mov r0, unif # U offset/weight -+ asr rb15, r0, r2 # Compute offset from MSBs -+ shl r0, r0, r2 -+-asr rb14, r0, r2 # Compute weight from LSBs -++asr r3, r0, r2 # Compute weight from LSBs -+ mov r0, unif # V offset/weight -+ asr.ifnz rb15, r0, r2 -+ shl r0, r0, r2 -+-asr.ifnz rb14, r0, r2 -++asr.ifnz r3, r0, r2 -++shl rb14,r3,8 # Scale up weights so we can use mul24 in signed fashion -+ -+ # r2 is elem_num -+ # r3 is loop counter -+- -+-mov r5rep, -8 -+- -+ # retrieve texture results and pick out bytes -+ # then submit two more texture requests -+ -+@@ -269,7 +259,7 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -+ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+@@ -278,7 +268,7 @@ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+ add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_frame_base, r2 -++add t1s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -301,11 +291,6 @@ mov ra13, ra14 # Delay slot 1 -+ mov ra14, ra15 # Delay slot 2 -+ mov ra15, r0 # Delay slot 3 -+ -+-mov rb12,32 # TODO remove these to make P weighted prediction work properly -+-mov rb13,6 -+-mov rb14,1 -+-mov rb15,0 -+- -+ # apply vertical filter and write to VPM -+ -+ nop ; mul24 r1, ra14, rb10 -+@@ -412,7 +397,7 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -+ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+@@ -421,7 +406,7 @@ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+ add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_frame_base, r2 -++add t1s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -542,7 +527,7 @@ mov r3, 0 -+ # then submit two more texture requests -+ -+ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 # loop counter increment -+-shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu0 -++shr r0, r4, ra_xshift ; mov.ifz ra_x, rb_x_next ; ldtmu1 -+ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+ shr r1, r4, ra_xshift ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+@@ -551,7 +536,7 @@ max r2, ra_y, 0 # y -+ min r2, r2, rb_frame_height_minus_1 -+ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+ add t0s, ra_x, r2 ; v8subs r1, r1, rb20 -+-add t0s, ra_frame_base, r2 -++add t1s, ra_frame_base, r2 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+@@ -617,9 +602,9 @@ mov -, vw_wait # wait on the VDW -+ mov -,srel(0) -+ -+ ldtmu0 -++ldtmu1 -+ ldtmu0 -+-ldtmu0 -+-ldtmu0 -++ldtmu1 -+ -+ nop ; nop ; thrend -+ nop ; nop # delay slot 1 -+@@ -630,9 +615,9 @@ nop ; nop # delay slot 2 -+ mov -, vw_wait # wait on the VDW -+ -+ ldtmu0 -++ldtmu1 -+ ldtmu0 -+-ldtmu0 -+-ldtmu0 -++ldtmu1 -+ -+ mov -,sacq(0) # 1 -+ mov -,sacq(0) # 2 -+@@ -656,200 +641,249 @@ nop ; nop # delay slot 2 -+ # For P frames we make the second x,y coordinates offset by +8 -+ -+ ################################################################################ -+-# mc_setup(next_kernel, x, y, ref_y_base, x2, y2, ref_y2_base, frame_width, frame_height, pitch, dst_pitch, offset, shift, pad2) -++# mc_setup(y_x, ref_y_base, y2_x2, ref_y2_base, frame_width_height, pitch, dst_pitch, offset_shift, next_kernel) -+ ::mc_setup -++ mov r3, 16 -+ -+-# Read starting kernel -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-mov ra31, unif -+- -+-# Compute base address for first and second access -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl ra_xshift_next, r0, 3 # Compute shifts -+-add ra_y, r1, 1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add r2, r2, r0 # r2 is address for frame0 (not including y offset) -+-max r1, r1, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -+-add t0s, r2, r1 ; mov ra_frame_base, r2 -+- -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl rx_xshift2_next, r0, 3 # Compute shifts -+-add ra_y2, r1, 1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add r2, r2, r0 # r2 is address for frame1 (not including y offset) -+-max r1, r1, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -+-add t0s, r2, r1 ; mov ra_frame_base2, r2 -+- -++ # Need to save these because we need to know the frame dimensions before computing texture coordinates -++ mov ra8, unif -++ mov ra9, unif -++ mov ra10, unif -++ mov ra11, unif -+ -+ # Read image dimensions -+-sub rb25,unif,1 -+-sub rb30,unif,1 -++ mov r1, unif # width_height -++ shl r0,r1,r3 -++ asr r1,r1,r3 # width -++ asr r0,r0,r3 # height -++ sub rb_frame_width_minus_1,r1,1 -++ sub rb_frame_height_minus_1,r0,1 -+ -+ # get source pitch -+-mov rb16, unif -++ mov rb_pitch, unif -+ -+ # get destination pitch -+-mov r0, unif -+-mov r1, vdw_setup_1(0) -+-add rb24, r1, r0 -++ mov r0, unif -++ mov r1, vdw_setup_1(0) -++ add rb24, r1, r0 -+ -+-# load constants -+- -+-mov ra20, 1 -+-mov ra22, 256 -+-mov ra30, 64 -+- -+-mov rb20, 0xffffff00 -+-mov rb22, 255 -+-mov rb23, 24 -++# Compute base address for first and second access -++ mov r1, ra8 # y_x -++ shl r0,r1,r3 # r0 is x<<16 -++ asr r1,r1,r3 # r1 is y -++ asr r0,r0,r3 # r0 is x -++ add r0, r0, elem_num # Load x -++ max r0, r0, 0 -++ min r0, r0, rb_frame_width_minus_1 ; mov r2, ra9 # Load the frame base -++ shl ra_xshift_next, r0, 3 # Compute shifts -++ add ra_y, r1, 1 -++ and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++ add r2, r2, r0 # r2 is address for frame0 (not including y offset) -++ max r1, r1, 0 -++ min r1, r1, rb_frame_height_minus_1 -++ nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -++ add t0s, r2, r1 ; mov ra_frame_base, r2 -++ -++ mov r1, ra10 # y_x -++ shl r0,r1,r3 # r0 is x<<16 -++ asr r1,r1,r3 # r1 is y -++ asr r0,r0,r3 # r0 is x -++ add r0, r0, elem_num # Load x -++ max r0, r0, 0 -++ min r0, r0, rb_frame_width_minus_1 ; mov r2, ra11 # Load the frame base -++ shl rx_xshift2_next, r0, 3 # Compute shifts -++ add ra_y2, r1, 1 -++ and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++ add r2, r2, r0 # r2 is address for frame1 (not including y offset) -++ max r1, r1, 0 -++ min r1, r1, rb_frame_height_minus_1 -++ nop ; mul24 r1, r1, rb_pitch # r2 contains the addresses (not including y offset) for frame0 -++ add t1s, r2, r1 ; mov ra_frame_base2, r2 -+ -+-# touch vertical context to keep simulator happy -+ -+-mov ra8, 0 -+-mov ra9, 0 -+-mov ra10, 0 -+-mov ra11, 0 -+-mov ra12, 0 -+-mov ra13, 0 -+-mov ra14, 0 -+-mov ra15, 0 -++# load constants -+ -+-# Compute part of VPM to use for DMA output -+-mov r2, qpu_num -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -+-shl r0, r0, 5 -+-add rb27, r0, r1 -++ mov ra20, 1 -++ mov ra22, 256 -++ mov ra30, 64 -+ -+-# Compute part of VPM to save data into -+-mov r2, qpu_num # qpu_num = abcd -+-mov r1, r2 -+-asr r1, r1, 2 -+-shl r1, r1, 6 -+-mov r0, r2 -+-and r0, r0, 3 -+-add r0, r0, r1 -+-mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -+-add rb28, r0, r1 -++ mov rb20, 0xffffff00 -++ mov rb22, 255 -++ mov rb23, 24 -+ -+-mov rb12,unif # offset before shift -+-mov rb13,unif # shift -++# touch vertical context to keep simulator happy -+ -+-# Dump padding words -+-mov r0, unif -++ mov ra8, 0 -++ mov ra9, 0 -++ mov ra10, 0 -++ mov ra11, 0 -++ mov ra12, 0 -++ mov ra13, 0 -++ mov ra14, 0 -++ mov ra15, 0 -++ mov ra18, 0x4000 -++ -++# Compute part of VPM to use -++ mov r2, qpu_num -++ mov r1, r2 -++ asr r1, r1, 2 -++ shl r1, r1, 6 -++ mov r0, r2 -++ and r0, r0, 3 -++ add r0, r0, r1 -++ mov r1, vpm_setup(0, 4, h8p(0, 0)) # 4 is stride - stride acts on ADDR which is Y[5:0],B[1:0] for 8 bit -++ add rb28, r0, r1 # VPM for saving data -++ mov r1, vdw_setup_0(0, 0, dma_h8p(0,0,0)) # height,width added later -++ shl r0, r0, 5 -++ add rb27, r0, r1 # Command for dma output -++ -++# Weighted prediction denom -++ -++ mov r1, unif # offset_shift -++ shl r0,r1,r3 ; mov r2,8 -++ asr rb13,r0,r3 # shift -++ asr rb12,r1,r3 # offset -++ add rb13,rb13,r2 # mul24 is unsigned so scale up into high bits -++ shl rb12, rb12, r2 # Account for larger shift -+ -+ # submit texture requests for second line -+-max r1, ra_y, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 -+-nop ; mul24 r1, r1, rb_pitch -+-add t0s, r1, ra_frame_base -+- -+-max r1, ra_y2, 0 -+-min r1, r1, rb_frame_height_minus_1 -+-bra -, ra31 -+-add ra_y2, ra_y2, 1 # Delay 1 -+-nop ; mul24 r1, r1, rb_pitch # Delay 2 -+-add t0s, r1, ra_frame_base2 # Delay 3 -+- -+- -+-################################################################################ -+- -+-# mc_filter(next_kernel, x, y, frame_base, x2, y2, frame_base2, height, hcoeffs[0], hcoeffs2[0], hcoeffs[1], hcoeffs2[1], vcoeffs[0], vcoeffs2[0], vcoeffs[1], vcoeffs2[1], offsetweight0, offsetweight1, this_dst) -+-# In a P block, only the first half of coefficients contain used information. -+-# At this point we have already issued two pairs of texture requests for the current block -+-# ra_x, ra_x16_base point to the current coordinates for this block -+-::mc_filter -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-mov ra31, unif -++ max r1, ra_y, 0 -++ min r1, r1, rb_frame_height_minus_1 -++ add ra_y, ra_y, 1 -++ nop ; mul24 r1, r1, rb_pitch -++ add t0s, r1, ra_frame_base -++ -++ max r1, ra_y2, 0 -++ min r1, r1, rb_frame_height_minus_1 -++ add ra_y2, ra_y2, 1 -++ nop ; mul24 r1, r1, rb_pitch -++ add t1s, r1, ra_frame_base2 -++ -++# FALL THROUGHT TO PER-BLOCK SETUP -++ -++# Start of per-block setup code -++# P and B blocks share the same setup code to save on Icache space -++:per_block_setup -++ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ mov ra31, unif -+ -+ # per-channel shifts were calculated on the *previous* invocation -+- -+-mov ra_xshift, ra_xshift_next -+-mov rx_xshift2, rx_xshift2_next -++ mov ra_xshift, ra_xshift_next -++ mov rx_xshift2, rx_xshift2_next -+ -+ # get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl ra_xshift_next, r0, 3 # Compute shifts -+-mov ra_y_next, r1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add ra_frame_base_next, r2, r0 # r2 is address for frame0 (not including y offset) -+- -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0 ; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl rx_xshift2_next, r0, 3 # Compute shifts -+-add ra_y2_next, r1, 1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -+- -++ mov r3, 16 -++ mov r1, unif # y_x -++ shl r0,r1,r3 # r0 is x<<16 -++ asr r1,r1,r3 # r1 is y -++ asr r0,r0,r3 # r0 is x -++ add r0, r0, elem_num # Load x -++ max r0, r0, 0 -++ min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++ shl ra_xshift_next, r0, 3 # Compute shifts -++ mov ra_y_next, r1 -++ and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++ add ra_frame_base_next, r2, r0 ; mov r1, unif # y2_x2 -++ -++ shl r0,r1,r3 # r0 is x2<<16 -++ asr r1,r1,r3 # r1 is y2 -++ asr r0,r0,r3 # r0 is x2 -++ add r0, r0, elem_num # Load x -++ max r0, r0, 0 -++ min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -++ shl rx_xshift2_next, r0, 3 # Compute shifts -++ mov ra_y2_next, r1 -++ and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -++ add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -+ -+ # set up VPM write -+-mov vw_setup, rb28 -++ mov vw_setup, rb28 -+ -+ # get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -+-shl r0, r0, 7 -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -++ mov r0, unif -++ shr r1, r0, r3 # Extract width -++ sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -++ and r0, r0, rb22 # Extract height -++ add rb17, r0, 5 -++ add rb18, r0, 7 -++ shl r0, r0, 7 -++ add r0, r0, r1 # Combine width and height of destination area -++ shl r0, r0, r3 # Shift into bits 16 upwards of the vdw_setup0 register -++ add rb26, r0, rb27 -+ -+ # get filter coefficients and discard unused B frame values -+-mov r0, unif -+-mov.ifnz -, unif # Alternate coefficients are unused for P frames -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 # These may need some pre-rotation to be used in B frames correctly -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-mov.ifnz -, unif -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-asr ra4, r0, rb23; mov r0, unif -+-mov.ifnz -, unif -+-asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -+-mov.ifnz -, unif -+-asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-asr rb4, r0, rb23 -+- -+-mov r0, unif # Frame0 offset/weight -+-mov.ifnz -, unif # Frame1 offset/weight unused -+-asr rb15, r0, r2 # Compute offset from MSBs -+-shl r0, r0, r2 -+-asr rb14, r0, r2 # Compute weight from LSBs -+- -+-# r3 is loop counter -++ mov r0, unif ; mov r1,1 # Packed filter offsets, unpack into ra8... (to be used for vertical context later) -++ asr ra9, r0, rb23; mul24 r0, r0, ra22 # my2 -++ asr ra8, r0, rb23; mul24 r0, r0, ra22 # mx2 -++ asr.ifz ra9, r0, rb23; mul24 r0, r0, ra22 # my:my2 -++ asr.ifz ra8, r0, rb23 # mx:mx2 -++ sub ra9,3,ra9 -++ sub ra8,3,ra8 -++ shl ra9,ra9,3 # Scale up by 8 -++ shl ra8,ra8,3 # Scale up by 8 -++# Now if we want aligned we have a mul of 1, so put 0 coefficients at the top -++ mov r1,0xffff00 -++ shl r0, r1, ra8 -++ asr ra0, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb4, r0, rb23 -++ -++ mov r1,0x1040400 -++ shl r0, r1, ra8 -++ asr ra1, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb5, r0, rb23 -++ -++ mov r1,0xfbf5f600 -++ shl r0, r1, ra8 -++ asr ra2, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb6, r0, rb23 -++ -++ mov r1,0x11283a40 -++ shl r0, r1, ra8 -++ asr ra3, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb7, r0, rb23 -++ -++ mov r1,0x3a281100 -++ shl r0, r1, ra8 -++ asr ra4, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb8, r0, rb23 -++ -++ mov r1,0xf6f5fb00 -++ shl r0, r1, ra8 -++ asr ra5, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb9, r0, rb23 -++ -++ mov r1,0x4040100 -++ shl r0, r1, ra8 -++ asr ra6, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb10, r0, rb23 -++ -++ mov r1,0xffff0000 -++ shl r0, r1, ra8 -++ asr ra7, r0, rb23 -++ shl r0, r1, ra9 -++ asr rb11, r0, rb23 -++ -++# Extract weighted prediction information -++ mov r0, unif # offset/weight TODO move up -++ asr rb15, r0, r3 # Compute offset from MSBs -++ bra -, ra31 -++ shl r0, r0, r3 # Delay 1 -++ asr r0, r0, r3 ; mov r3, 0 # Compute weight from LSBs and reset loop counter Delay 2 -++ shl rb14, r0, 8 # Use a larger shift to avoid unsigned multiply problem Delay 3 -+ -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -++################################################################################ -++# mc_filter(y_x, frame_base, y2_x2, frame_base2, width_height, my2_mx2_my_mx, offsetweight0, this_dst, next_kernel) -++# In a P block, y2_x2 should be y_x+8 -++# At this point we have already issued two pairs of texture requests for the current block -+ -+-mov r3, 0 -++::mc_filter -+ -+ :yloop -+ # retrieve texture results and pick out bytes -+@@ -858,91 +892,90 @@ mov r3, 0 -+ # If we knew there was no clipping then this code would get simpler. -+ # Perhaps we could add on the pitch and clip using larger values? -+ -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, rx_xshift2 -+-mov.ifz ra_y2, ra_y2_next -++ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++ shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu1 -++ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++ shr r1, r4, rx_xshift2 -++ mov.ifz ra_y2, ra_y2_next -+ -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y2, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++ max r2, ra_y, 0 # y -++ min r2, r2, rb_frame_height_minus_1 -++ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++ add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -++ max r2, ra_y2, 0 # y -++ min r2, r2, rb_frame_height_minus_1 -++ add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++ add t1s, ra_frame_base2, r2 ; v8subs r1, r1, rb20 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+ -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+ # apply horizontal filter -+-nop ; mul24 r2, r0, ra0 -+-nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-nop ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-add r0, r2, r3 ; mov r3, rb31 -+-sub.setf -, r3, 8 ; mov ra12, ra13 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-brr.anyn -, r:yloop -+-mov ra13, ra14 # Delay slot 1 -+-mov ra14, ra15 # Delay slot 2 -+-mov ra15, r0 # Delay slot 3 -++ nop ; mul24 r2, r0, ra0 -++ nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++ nop ; mul24 r3, ra1 << 1, r0 << 1 -++ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++ add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++ nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++ add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++ nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++ add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++ nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++ add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++ nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++ add r0, r2, r3 ; mov r3, rb31 -++ sub.setf -, r3, 8 ; mov ra8, ra9 -++ mov ra9, ra10 -++ mov ra10, ra11 -++ mov ra11, ra12 -++ mov ra12, ra13 -++ brr.anyn -, r:yloop -++ mov ra13, ra14 # Delay slot 1 -++ mov ra14, ra15 # Delay slot 2 -++ mov ra15, r0 # Delay slot 3 -+ -+ # apply vertical filter and write to VPM -+ -+-nop ; mul24 r1, ra14, rb10 -+-nop ; mul24 r0, ra13, rb9 -+-add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-add r1, r1, r0 ; mul24 r0, ra11, rb7 -+- -+-add r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 14 -+-nop ; mul24 r1, r1, rb14 -+-add r1, r1, rb12 -+-asr r1, r1, rb13 -+-brr.anyn -, r:yloop -+-add r1, r1, rb15 # Delay 1 -+-min r1, r1, rb22 # Delay 2 -+-max vpm, r1, 0 # Delay 3 -++ nop ; mul24 r1, ra14, rb10 -++ nop ; mul24 r0, ra13, rb9 -++ add r1, r1, r0 ; mul24 r0, ra12, rb8 -++ add r1, r1, r0 ; mul24 r0, ra15, rb11 -++ add r1, r1, r0 ; mul24 r0, ra8, rb4 -++ add r1, r1, r0 ; mul24 r0, ra9, rb5 -++ add r1, r1, r0 ; mul24 r0, ra10, rb6 -++ add r1, r1, r0 ; mul24 r0, ra11, rb7 -++ -++ add r1, r1, r0 ; mov -, vw_wait -++ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++ asr r1, r1, 14 -++ nop ; mul24 r1, r1, rb14 -++ add r1, r1, rb12 -++ asr r1, r1, rb13 -++ brr.anyn -, r:yloop -++ add r1, r1, rb15 # Delay 1 -++ min r1, r1, rb22 # Delay 2 -++ max vpm, r1, 0 # Delay 3 -+ -+ # DMA out -+ -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW setup 0 Delay 1 -+-mov vw_setup, rb29 # Stride Delay 2 -+-mov vw_addr, unif # start the VDW Delay 3 -++ brr -, r:per_block_setup -++ mov vw_setup, rb26 # VDW setup 0 Delay 1 -++ mov vw_setup, rb29 # Stride Delay 2 -++ mov vw_addr, unif # start the VDW Delay 3 -+ -+ -+ -+ ################################################################################ -+ -+-# mc_filter_b(next_kernel, x, y, frame_base, x2, y2, frame_base2, width_height, hcoeffs[0], hcoeffs2[0], hcoeffs[1], hcoeffs2[1], vcoeffs[0], vcoeffs2[0], vcoeffs[1], vcoeffs2[1], offsetweight0, offsetweight1, this_dst) -++# mc_filter_b(y_x, frame_base, y2_x2, frame_base2, width_height, my2_mx2_my_mx, offsetweight0, this_dst, next_kernel) -+ # In a P block, only the first half of coefficients contain used information. -+ # At this point we have already issued two pairs of texture requests for the current block -+ # May be better to just send 16.16 motion vector and figure out the coefficients inside this block (only 4 cases so can compute hcoeffs in around 24 cycles?) -+@@ -952,92 +985,6 @@ mov vw_addr, unif # start the VDW Delay 3 -+ # Or possibly by taking advantage of symmetry? -+ # From 19->7 32bits per command. -+ ::mc_filter_b -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+-mov ra31, unif -+- -+-# per-channel shifts were calculated on the *previous* invocation -+- -+-mov ra_xshift, ra_xshift_next -+-mov rx_xshift2, rx_xshift2_next -+- -+-# get base addresses and per-channel shifts for *next* invocation -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl ra_xshift_next, r0, 3 # Compute shifts -+-mov ra_y_next, r1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add ra_frame_base_next, r2, r0 # r2 is address for frame0 (not including y offset) -+- -+-add r0, unif, elem_num # Load x -+-max r0, r0, 0 ; mov r1, unif # Load y -+-min r0, r0, rb_frame_width_minus_1 ; mov r2, unif # Load the frame base -+-shl rx_xshift2_next, r0, 3 # Compute shifts -+-add ra_y2_next, r1, 1 -+-and r0, r0, ~3 # r0 gives the clipped and aligned x coordinate -+-add rx_frame_base2_next, r2, r0 # r2 is address for frame1 (not including y offset) -+- -+- -+-# set up VPM write -+-mov vw_setup, rb28 -+- -+-# get width,height of block -+-mov r2, 16 -+-mov r0, unif -+-shr r1, r0, r2 # Extract width -+-sub rb29, rb24, r1 # Compute vdw_setup1(dst_pitch-width) -+-and r0, r0, rb22 # Extract height -+-add rb17, r0, 5 -+-add rb18, r0, 7 -+-shl r0, r0, 7 -+-add r0, r0, r1 # Combine width and height of destination area -+-shl r0, r0, r2 # Shift into bits 16 upwards of the vdw_setup0 register -+-add rb26, r0, rb27 -+- -+-# get filter coefficients and discard unused B frame values -+-mov r0, unif -+-mov r1, 1 -+-mov.ifnz r0, unif # Alternate coefficients are unused for P frames -+-nop ; mul24 r0, r0 << 13, r1 << 13 -+-asr ra3, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 14, r1 << 14 -+-asr ra2, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 15, r1 << 15 # Adjust such that a rotate of 1 will produce the values with first 8 on left, second 8 on right -+-asr ra1, r0, rb23; mul24 r0, r0, ra22 -+-asr ra0, r0, rb23; mov r0, unif -+-mov.ifnz r0, unif -+-nop ; mul24 r0, r0 << 9, r1 << 9 -+-asr ra7, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 10, r1 << 10 -+-asr ra6, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 11, r1 << 11 -+-asr ra5, r0, rb23; mul24 r0, r0, ra22 -+-nop ; mul24 r0, r0 << 12, r1 << 12 -+-asr ra4, r0, rb23; mov r0, unif -+-mov.ifnz r0, unif -+-asr rb11, r0, rb23; mul24 r0, r0, ra22 -+-asr rb10, r0, rb23; mul24 r0, r0, ra22 -+-asr rb9, r0, rb23; mul24 r0, r0, ra22 -+-asr rb8, r0, rb23; mov r0, unif -+-mov.ifnz r0, unif -+-asr rb7, r0, rb23; mul24 r0, r0, ra22 -+-asr rb6, r0, rb23; mul24 r0, r0, ra22 -+-asr rb5, r0, rb23; mul24 r0, r0, ra22 -+-asr rb4, r0, rb23 -+- -+-mov r0, unif # Frame0 offset/weight -+-mov.ifnz r0, unif # Frame1 offset/weight unused -+-asr rb15, r0, r2 # Compute offset from MSBs -+-shl r0, r0, r2 -+-asr rb14, r0, r2 # Compute weight from LSBs -+- -+-# r3 is loop counter -+- -+-# retrieve texture results and pick out bytes -+-# then submit two more texture requests -+- -+-mov r3, 0 -+- -+ :yloopb -+ # retrieve texture results and pick out bytes -+ # then submit two more texture requests -+@@ -1045,111 +992,123 @@ mov r3, 0 -+ # If we knew there was no clipping then this code would get simpler. -+ # Perhaps we could add on the pitch and clip using larger values? -+ -+-sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -+-shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu0 -+-mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -+-mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -+-shr r1, r4, rx_xshift2 -+-mov.ifz ra_y2, ra_y2_next -++ sub.setf -, r3, rb17 ; v8adds r3, r3, ra20 ; ldtmu0 -++ shr r0, r4, ra_xshift ; mov.ifz ra_frame_base2, rx_frame_base2_next ; ldtmu1 -++ mov.ifz ra_frame_base, ra_frame_base_next ; mov rb31, r3 -++ mov.ifz ra_y, ra_y_next ; mov r3, rb_pitch -++ shr r1, r4, rx_xshift2 -++ mov.ifz ra_y2, ra_y2_next -+ -+-max r2, ra_y, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+- -+-max r2, ra_y2, 0 # y -+-min r2, r2, rb_frame_height_minus_1 -+-add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -+-add t0s, ra_frame_base2, r2 ; v8subs r0, r0, rb20 -++ max r2, ra_y, 0 # y -++ min r2, r2, rb_frame_height_minus_1 -++ add ra_y, ra_y, 1 ; mul24 r2, r2, r3 -++ add t0s, ra_frame_base, r2 ; v8subs r0, r0, rb20 # v8subs masks out all but bottom byte -+ -++ max r2, ra_y2, 0 # y -++ min r2, r2, rb_frame_height_minus_1 -++ add ra_y2, ra_y2, 1 ; mul24 r2, r2, r3 -++ add t1s, ra_frame_base2, r2 ; v8subs r1, r1, rb20 -+ -+ # generate seven shifted versions -+ # interleave with scroll of vertical context -+ -+-mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -++ mov.setf -, [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1] -+ -+ # apply horizontal filter -+-nop ; mul24 r2, r0, ra0 -+-nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -+-nop ; mul24 r3, ra1 << 1, r0 << 1 -+-nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -+-add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -+-nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -+-add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -+-nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -+-add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -+-nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -+-add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -+-nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -+-add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -+-nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -+-add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -+-nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -+-add r0, r2, r3 ; mov r3, rb31 -+-sub.setf -, r3, 8 ; mov ra12, ra13 -+-mov ra9, ra10 -+-mov ra10, ra11 -+-mov ra11, ra12 -+-mov ra12, ra13 -+-brr.anyn -, r:yloopb -+-mov ra13, ra14 # Delay slot 1 -+-mov ra14, ra15 # Delay slot 2 -+-mov ra15, r0 # Delay slot 3 -+- -+-# apply vertical filter and write to VPM -+- -+-nop ; mul24 r1, ra14, rb10 -+-nop ; mul24 r0, ra13, rb9 -+-add r1, r1, r0 ; mul24 r0, ra12, rb8 -+-add r1, r1, r0 ; mul24 r0, ra15, rb11 -+-add r1, r1, r0 ; mul24 r0, ra8, rb4 -+-add r1, r1, r0 ; mul24 r0, ra9, rb5 -+-add r1, r1, r0 ; mul24 r0, ra10, rb6 -+-add r1, r1, r0 ; mul24 r0, ra11, rb7 -+- -+-add r1, r1, r0 ; mov -, vw_wait -+-sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -+-asr r1, r1, 14 -+-nop ; mul24 r1, r1 << 8, ra20 << 8 # Rotate to align left and right halves -+-add r1, r1, ra30 ; mul24 r0, r1, rb14 -+-add r1, r1, r0 -+-brr.anyn -, r:yloopb -+-asr r1, r1, 7 # Delay 1 -+-min r1, r1, rb22 # Delay 2 -+-max vpm, r1, 0 # Delay 3 -++ nop ; mul24 r2, r0, ra0 -++ nop ; mul24.ifnz r2, ra0 << 8, r1 << 8 -++ nop ; mul24 r3, ra1 << 1, r0 << 1 -++ nop ; mul24.ifnz r3, ra1 << 9, r1 << 9 -++ add r2, r2, r3 ; mul24 r3, ra2 << 2, r0 << 2 -++ nop ; mul24.ifnz r3, ra2 << 10, r1 << 10 -++ add r2, r2, r3 ; mul24 r3, ra3 << 3, r0 << 3 -++ nop ; mul24.ifnz r3, ra3 << 11, r1 << 11 -++ add r2, r2, r3 ; mul24 r3, ra4 << 4, r0 << 4 -++ nop ; mul24.ifnz r3, ra4 << 12, r1 << 12 -++ add r2, r2, r3 ; mul24 r3, ra5 << 5, r0 << 5 -++ nop ; mul24.ifnz r3, ra5 << 13, r1 << 13 -++ add r2, r2, r3 ; mul24 r3, ra6 << 6, r0 << 6 -++ nop ; mul24.ifnz r3, ra6 << 14, r1 << 14 -++ add r2, r2, r3 ; mul24 r3, ra7 << 7, r0 << 7 -++ nop ; mul24.ifnz r3, ra7 << 15, r1 << 15 -++ add r0, r2, r3 ; mov r3, rb31 -++ sub.setf -, r3, 8 ; mov ra8, ra9 -++ mov ra9, ra10 -++ mov ra10, ra11 -++ mov ra11, ra12 -++ mov ra12, ra13 -++ brr.anyn -, r:yloopb -++ mov ra13, ra14 # Delay slot 1 -++ mov ra14, ra15 # Delay slot 2 -++ mov ra15, r0 # Delay slot 3 -++ -++ # apply vertical filter and write to VPM -++ -++ nop ; mul24 r1, ra14, rb10 -++ nop ; mul24 r0, ra13, rb9 -++ add r1, r1, r0 ; mul24 r0, ra12, rb8 -++ add r1, r1, r0 ; mul24 r0, ra15, rb11 -++ add r1, r1, r0 ; mul24 r0, ra8, rb4 -++ add r1, r1, r0 ; mul24 r0, ra9, rb5 -++ add r1, r1, r0 ; mul24 r0, ra10, rb6 -++ add r1, r1, r0 ; mul24 r0, ra11, rb7 -++ -++ add r1, r1, r0 ; mov -, vw_wait -++ sub.setf -, r3, rb18 ; mul24 r1, r1, ra22 -++ asr r0, r1, 14 -++ asr r1, r1, 6 # Wait state so we can use the rotate instruction -++ nop ; mul24 r0, r0 << 8, ra22 << 8 # Rotate to align left and right halves -++ add r1, r1, ra18 -++ add r1, r1, r0 -++ brr.anyn -, r:yloopb -++ asr r1, r1, 15 # Delay 1 -++ min r1, r1, rb22 # Delay 2 -++ max vpm, r1, 0 # Delay 3 -+ -+ # DMA out -+-bra -, ra31 -+-mov vw_setup, rb26 # VDW setup 0 Delay 1 -+-mov vw_setup, rb29 # Stride Delay 2 -+-mov vw_addr, unif # start the VDW Delay 3 -++ brr -, r:per_block_setup -++ mov vw_setup, rb26 # VDW setup 0 Delay 1 -++ mov vw_setup, rb29 # Stride Delay 2 -++ mov vw_addr, unif # start the VDW Delay 3 -+ -+ ################################################################################ -+ -+ # mc_interrupt_exit12() -+ ::mc_interrupt_exit12 -+-mov -, vw_wait # wait on the VDW -+- -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+-ldtmu0 -+- -+-mov -,sacq(0) # 1 -+-mov -,sacq(0) # 2 -+-mov -,sacq(0) # 3 -+-mov -,sacq(0) # 4 -+-mov -,sacq(0) # 5 -+-mov -,sacq(0) # 6 -+-mov -,sacq(0) # 7 -+-mov -,sacq(0) # 8 -+-mov -,sacq(0) # 9 -+-mov -,sacq(0) # 10 -+-mov -,sacq(0) # 11 -+- -+-nop ; nop ; thrend -+-mov interrupt, 1; nop # delay slot 1 -+-nop ; nop # delay slot 2 -++ mov -, vw_wait # wait on the VDW -++ -++ ldtmu0 -++ ldtmu0 -++ ldtmu1 -++ ldtmu1 -++ -++ mov -,sacq(0) # 1 -++ mov -,sacq(0) # 2 -++ mov -,sacq(0) # 3 -++ mov -,sacq(0) # 4 -++ mov -,sacq(0) # 5 -++ mov -,sacq(0) # 6 -++ mov -,sacq(0) # 7 -++ mov -,sacq(0) # 8 -++ mov -,sacq(0) # 9 -++ mov -,sacq(0) # 10 -++ mov -,sacq(0) # 11 -++ -++ nop ; nop ; thrend -++ mov interrupt, 1; nop # delay slot 1 -++ nop ; nop # delay slot 2 -++ -++ -++::mc_exit1 -++ mov -, vw_wait # wait on the VDW -++ -++ ldtmu0 -++ ldtmu1 -++ ldtmu0 -++ ldtmu1 -++ nop ; nop ; thrend -++ mov interrupt, 1; nop # delay slot 1 -++ nop ; nop # delay slot 2 -+ -+ -+ ::mc_end -+-- -+2.7.4 -+ -+ -+From f02ec34c772aad3caa17432c6a4860f9ed0d5dc6 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 2 Jun 2015 10:58:25 +0100 -+Subject: [PATCH 48/68] Added option to simulate QPUs -+ -+--- -+ libavcodec/hevc.c | 288 +++++++++++++++++++++++++++++++++++++++++++-- -+ libavcodec/rpi_qpu.c | 24 ++-- -+ libavcodec/rpi_shader.qasm | 6 +- -+ 3 files changed, 295 insertions(+), 23 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 2da88ec..34d92e2 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -56,6 +56,8 @@ -+ // Define RPI_CACHE_UNIF_MVS to write motion vector uniform stream to cached memory -+ // RPI_CACHE_UNIF_MVS doesn't seem to make much difference, so left undefined. -+ -++ // Define RPI_SIMULATE_QPUS for debugging to run QPU code on the ARMs -++ //#define RPI_SIMULATE_QPUS -+ -+ #endif -+ -+@@ -124,7 +126,6 @@ static void pic_arrays_free(HEVCContext *s) -+ -+ #ifdef EARLY_MALLOC -+ #else -+- printf("pic_arrays_free\n"); -+ if (s->coeffs_buf_arm[0]) { -+ gpu_free(&s->coeffs_buf_default); -+ s->coeffs_buf_arm[0] = 0; -+@@ -174,11 +175,9 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ #ifdef RPI -+ #ifdef EARLY_MALLOC -+ #else -+- assert(sps); -++ av_assert0(sps); -+ int coeffs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+ int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -+- printf("pic_arrays_init\n"); -+- printf("Allocated %d\n",coefs_per_row); -+ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -+ s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -+ if (!s->coeffs_buf_arm[0]) -+@@ -2988,6 +2987,274 @@ static void rpi_inter_clear(HEVCContext *s) -+ #endif -+ } -+ -++ -++#ifdef RPI_SIMULATE_QPUS -++ -++static int32_t clipx(int x,int FRAME_WIDTH) -++{ -++ if (x<=0) return 0; -++ if (x>=FRAME_WIDTH) return FRAME_WIDTH-1; -++ return x; -++} -++ -++static int32_t clipy(int y,int FRAME_HEIGHT) -++{ -++ if (y<=0) return 0; -++ if (y>=FRAME_HEIGHT) return FRAME_HEIGHT-1; -++ return y; -++} -++ -++/*static int32_t filter8(uint8_t *data, int x0, int y0, int pitch, int mx, int my,int round,int denom,int weight,int offset) -++{ -++ int32_t vsum = 0; -++ int x, y; -++ -++ for (y = 0; y < 8; y++) { -++ int32_t hsum = 0; -++ -++ for (x = 0; x < 8; x++) -++ hsum += lumaFilter[mx][x]*data[clipx(x + x0) + clipy(y + y0) * pitch]; -++ -++ vsum += lumaFilter[my][y]*hsum; -++ } -++ vsum >>= 6; -++ vsum = (((vsum*weight)+round)>>denom)+offset; -++ -++ return av_clip_uint8( vsum ); -++}*/ -++ -++static int32_t filter8_chroma(uint8_t *data, int x0, int y0, int pitch, int hcoeffs, int vcoeffs,int offset_weight,int offset_before,int denom,int pic_width, int pic_height) -++{ -++ int32_t vsum = 0; -++ int x, y; -++ int chromaFilterH[4]; -++ int chromaFilterV[4]; -++ int i; -++ int offset_after = offset_weight>>16; -++ int weight = (offset_weight<<16)>>16; -++ for(i=0;i<4;i++) { -++ chromaFilterH[i] = ((hcoeffs>>(8*i))<<24)>>24; -++ chromaFilterV[i] = ((vcoeffs>>(8*i))<<24)>>24; -++ } -++ -++ for (y = 0; y < 4; y++) { -++ int32_t hsum = 0; -++ -++ for (x = 0; x < 4; x++) -++ hsum += chromaFilterH[x]*data[clipx(x + x0,pic_width) + clipy(y + y0,pic_height) * pitch]; -++ -++ vsum += chromaFilterV[y]*hsum; -++ } -++ vsum >>= 6; -++ vsum = (((vsum*weight)+offset_before)>>denom)+offset_after; -++ -++ return vsum; -++} -++ -++int lumaFilter[4][8]={ {0,0,0,64,0,0,0,0},{-1,4,-10,58,17,-5,1,0},{-1,4,-11,40,40,-11,4,-1},{0,1,-5,17,58,-10,4,-1} }; -++ -++static int32_t filter8_luma(uint8_t *data, int x0, int y0, int pitch, int my_mx,int offset_weight,int offset_before,int denom,int pic_width, int pic_height) -++{ -++ int32_t vsum = 0; -++ int x, y; -++ int i; -++ int offset_after = offset_weight>>16; -++ int weight = (offset_weight<<16)>>16; -++ -++ for (y = 0; y < 8; y++) { -++ int32_t hsum = 0; -++ -++ for (x = 0; x < 8; x++) -++ hsum += lumaFilter[my_mx&3][x]*data[clipx(x + x0,pic_width) + clipy(y + y0,pic_height) * pitch]; -++ -++ vsum += lumaFilter[(my_mx>>8)&3][y]*hsum; -++ } -++ vsum >>= 6; -++ vsum = (((vsum*weight)+offset_before)>>denom)+offset_after; -++ -++ return vsum; -++} -++ -++static uint8_t *test_frame(HEVCContext *s,uint32_t p, AVFrame *frame, int cIdx) -++{ -++ //int pic_width = s->ps.sps->width >> s->ps.sps->hshift[cIdx]; -++ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[cIdx]; -++ int pitch = frame->linesize[cIdx]; -++ uint32_t base = get_vc_address(frame->buf[cIdx]); -++ if (p>=base && pdata[cIdx] + (p-base); -++ } -++ return NULL; -++} -++ -++static uint8_t *compute_arm_addr(HEVCContext *s,uint32_t p, int cIdx) -++{ -++ SliceHeader *sh = &s->sh; -++ uint8_t *arm = test_frame(s,p,s->frame,cIdx); -++ int i; -++ if (arm) return arm; -++ if (sh->slice_type == P_SLICE || sh->slice_type == B_SLICE) -++ { -++ for(i=0;inb_refs[L0];i++) { -++ arm = test_frame(s,p,s->ref->refPicList[0].ref[i]->frame,cIdx); -++ if (arm) return arm; -++ } -++ } -++ if (sh->slice_type == B_SLICE) { -++ for(i=0;inb_refs[L1];i++) { -++ arm = test_frame(s,p,s->ref->refPicList[1].ref[i]->frame,cIdx); -++ if (arm) return arm; -++ } -++ } -++ printf("Frame 0x%x not found! Exit=%x\n",p,qpu_get_fn(QPU_MC_EXIT)); -++ exit(-1); -++ return NULL; -++} -++ -++static void rpi_simulate_inter_chroma(HEVCContext *s,uint32_t *p) -++{ -++ uint32_t next_kernel; -++ uint32_t x0; -++ uint32_t y0; -++ uint8_t *ref_u_base; -++ uint8_t *ref_v_base; -++ uint32_t frame_width = p[5]; -++ uint32_t frame_height = p[6]; -++ uint32_t pitch = p[7]; -++ uint32_t dst_pitch = p[8]; -++ int32_t offset_before = p[9]; -++ int32_t denom = p[10]; -++ uint32_t vpm_id = p[11]; -++ uint32_t tmp_u_dst[256]; -++ uint32_t tmp_v_dst[256]; -++ while(1) { -++ p += 12; -++ next_kernel = p[0-12]; -++ x0 = p[1-12]; -++ y0 = p[2-12]; -++ if (next_kernel==s->mc_filter_uv || next_kernel==s->mc_filter_uv_b0 || next_kernel==s->mc_filter_uv_b) { -++ int x,y; -++ uint32_t width_height = p[5]; -++ uint32_t hcoeffs = p[6]; -++ uint32_t vcoeffs = p[7]; -++ uint32_t offset_weight_u = p[8]; -++ uint32_t offset_weight_v = p[9]; -++ uint8_t *this_u_dst; -++ uint8_t *this_v_dst; -++ uint32_t width = width_height >> 16; -++ uint32_t height = (width_height << 16) >> 16; -++ ref_u_base = compute_arm_addr(s,p[3-12],1); -++ ref_v_base = compute_arm_addr(s,p[4-12],2); -++ if (next_kernel!=s->mc_filter_uv_b0) -++ { -++ this_u_dst = compute_arm_addr(s,p[10],1); -++ this_v_dst = compute_arm_addr(s,p[11],2); -++ } -++ for (y=0; ymc_filter_uv) { -++ int32_t refa = filter8_chroma(ref_u_base,x+x0, y+y0, pitch, hcoeffs, vcoeffs, offset_weight_u,offset_before,denom,frame_width,frame_height); -++ int32_t refb = filter8_chroma(ref_v_base,x+x0, y+y0, pitch, hcoeffs, vcoeffs, offset_weight_v,offset_before,denom,frame_width,frame_height); -++ this_u_dst[x+y*dst_pitch] = av_clip_uint8(refa); -++ this_v_dst[x+y*dst_pitch] = av_clip_uint8(refb); -++ } else if (next_kernel==s->mc_filter_uv_b0) { -++ int32_t refa = filter8_chroma(ref_u_base, x+x0, y+y0, pitch, hcoeffs, vcoeffs, 1,0,0,frame_width,frame_height); -++ int32_t refb = filter8_chroma(ref_v_base, x+x0, y+y0, pitch, hcoeffs, vcoeffs, 1,0,0,frame_width,frame_height); -++ tmp_u_dst[x+y*16] = refa; -++ tmp_v_dst[x+y*16] = refb; -++ } else { -++ int32_t refa = filter8_chroma(ref_u_base, x+x0, y+y0, pitch, hcoeffs, vcoeffs, 1, 64 + tmp_u_dst[x+y*16], 7, frame_width, frame_height); -++ int32_t refb = filter8_chroma(ref_v_base, x+x0, y+y0, pitch, hcoeffs, vcoeffs, 1, 64 + tmp_v_dst[x+y*16], 7, frame_width, frame_height); -++ this_u_dst[x+y*dst_pitch] = av_clip_uint8(refa); -++ this_v_dst[x+y*dst_pitch] = av_clip_uint8(refb); -++ } -++ } -++ } -++ } else { -++ av_assert0(next_kernel==qpu_get_fn(QPU_MC_INTERRUPT_EXIT8) || next_kernel==qpu_get_fn(QPU_MC_EXIT) ); -++ break; -++ } -++ } -++} -++ -++// mc_setup(y_x, ref_y_base, y2_x2, ref_y2_base, frame_width_height, pitch, dst_pitch, offset_shift, next_kernel) -++static void rpi_simulate_inter_luma(HEVCContext *s,uint32_t *p) -++{ -++ uint32_t next_kernel; -++ int y_x,y2_x2; -++ uint32_t x0; -++ uint32_t y0; -++ uint32_t x2; -++ uint32_t y2; -++ uint8_t *ref_y_base; -++ uint8_t *ref_y2_base; -++ uint32_t frame_width_height = p[4]; -++ uint32_t frame_width = frame_width_height>>16; -++ uint32_t frame_height = (frame_width_height<<16)>>16; -++ uint32_t pitch = p[5]; -++ uint32_t dst_pitch = p[6]; -++ int offset_shift = p[7]; -++ int32_t offset_before = offset_shift>>16; -++ int32_t denom = (offset_shift<<16)>>16; -++ while(1) { -++ p += 9; -++ next_kernel = p[8-9]; -++ y_x = p[0-9]; -++ x0 = (y_x<<16)>>16; -++ y0 = y_x>>16; -++ y2_x2 = p[2-9]; -++ x2 = (y2_x2<<16)>>16; -++ y2 = y2_x2>>16; -++ -++ if (next_kernel==s->mc_filter || next_kernel==s->mc_filter_b) { -++ // y_x, frame_base, y2_x2, frame_base2, width_height, my2_mx2_my_mx, offsetweight0, this_dst, next_kernel) -++ int x,y; -++ uint32_t width_height = p[4]; -++ uint32_t my2_mx2_my_mx = p[5]; -++ uint32_t offset_weight = p[6]; -++ uint8_t *this_dst = compute_arm_addr(s,p[7],0); -++ uint32_t width = width_height >> 16; -++ uint32_t height = (width_height << 16) >> 16; -++ ref_y_base = compute_arm_addr(s,p[1-9],0); -++ ref_y2_base = compute_arm_addr(s,p[3-9],0); -++ for (y=0; ymc_filter) { -++ int32_t refa = filter8_luma(ref_y_base,x+x0, y+y0, pitch, my2_mx2_my_mx, offset_weight,offset_before,denom,frame_width,frame_height); -++ this_dst[x+y*dst_pitch] = av_clip_uint8(refa); -++ } -++ else { -++ int32_t refa = filter8_luma(ref_y_base, x+x0, y+y0, pitch, my2_mx2_my_mx, 1, 0, 0, frame_width, frame_height); -++ int32_t refb = filter8_luma(ref_y2_base, x+x2, y+y2, pitch, my2_mx2_my_mx>>16, 1, 64 + refa, 7, frame_width, frame_height); -++ this_dst[x+y*dst_pitch] = av_clip_uint8(refb); -++ } -++ } -++ } -++ } else { -++ av_assert0(next_kernel==qpu_get_fn(QPU_MC_INTERRUPT_EXIT12) || next_kernel==qpu_get_fn(QPU_MC_EXIT) ); -++ break; -++ } -++ } -++} -++ -++static void rpi_simulate_inter_qpu(HEVCContext *s) -++{ -++ // First run the transform as normal -++ int i; -++ rpi_execute_transform(s); -++ for(i=0;i<8;i++) -++ { -++ rpi_simulate_inter_chroma(s,s->mvs_base[i]); -++ } -++ for(i=0;i<12;i++) -++ { -++ rpi_simulate_inter_luma(s,s->y_mvs_base[i]); -++ } -++} -++ -++#endif -++ -++ -+ static void rpi_execute_inter_qpu(HEVCContext *s) -+ { -+ int k; -+@@ -3006,7 +3273,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+ s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for V -+- assert(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -++ av_assert0(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -+ } -+ -+ s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+@@ -3016,11 +3283,16 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+1] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for second request -+ s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+- assert(s->y_mvs[k] - s->y_mvs_base[k] < Y_COMMANDS_PER_QPU); -++ av_assert0(s->y_mvs[k] - s->y_mvs_base[k] < Y_COMMANDS_PER_QPU); -+ } -+ s->y_mvs[12-1][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT12); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ #endif -+ -++#ifdef RPI_SIMULATE_QPUS -++ rpi_simulate_inter_qpu(s); -++ s->vpu_id = -1; -++ return; -++#endif -+ -+ #ifdef RPI_MULTI_MAILBOX -+ #ifdef RPI_CACHE_UNIF_MVS -+@@ -3101,7 +3373,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1; -+ #endif -+ -+- /*if (!s->enable_rpi) { -++ if (!s->enable_rpi) { -+ if (s->ps.pps->cross_component_prediction_enabled_flag) -+ printf("Cross component\n"); -+ if (s->ps.pps->num_tile_rows > 1 || s->ps.pps->num_tile_columns > 1) -+@@ -3110,7 +3382,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ printf("Weighted P slice\n"); -+ if (s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE) -+ printf("Weighted B slice\n"); -+- }*/ -++ } -+ -+ #endif -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index e12304b..4480f72 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -13,7 +13,7 @@ -+ #include -+ #include -+ #include -+-#include -++#include "libavutil/avassert.h" -+ -+ #include "config.h" -+ -+@@ -160,13 +160,13 @@ static int gpu_init(volatile struct GPU **gpu) { -+ // Now copy over the QPU code into GPU memory -+ { -+ int num_bytes = qpu_get_fn(QPU_MC_END) - qpu_get_fn(QPU_MC_SETUP_UV); -+- assert(num_bytes<=QPU_CODE_SIZE*sizeof(unsigned int)); -++ av_assert0(num_bytes<=QPU_CODE_SIZE*sizeof(unsigned int)); -+ memcpy((void*)ptr->qpu_code, rpi_shader, num_bytes); -+ } -+ // And the VPU code -+ { -+ int num_bytes = sizeof(rpi_hevc_transform); -+- assert(num_bytes<=VPU_CODE_SIZE*sizeof(unsigned int)); -++ av_assert0(num_bytes<=VPU_CODE_SIZE*sizeof(unsigned int)); -+ memcpy((void*)ptr->vpu_code, rpi_hevc_transform, num_bytes); -+ } -+ // And the transform coefficients -+@@ -216,13 +216,13 @@ static void gpu_unlock(void) { -+ static int gpu_malloc_uncached_internal(int numbytes, GPU_MEM_PTR_T *p, int mb) { -+ p->numbytes = numbytes; -+ p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -+- assert(p->vcsm_handle); -++ av_assert0(p->vcsm_handle); -+ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -+- assert(p->vc_handle); -++ av_assert0(p->vc_handle); -+ p->arm = vcsm_lock(p->vcsm_handle); -+- assert(p->arm); -++ av_assert0(p->arm); -+ p->vc = mem_lock(mb, p->vc_handle); -+- assert(p->vc); -++ av_assert0(p->vc); -+ return 0; -+ } -+ -+@@ -243,7 +243,7 @@ int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p) -+ -+ int gpu_get_mailbox(void) -+ { -+- assert(gpu); -++ av_assert0(gpu); -+ return gpu->mb; -+ } -+ -+@@ -297,13 +297,13 @@ static int gpu_malloc_cached_internal(int numbytes, GPU_MEM_PTR_T *p) { -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_VC, (char *)"Video Frame" ); -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_NONE, (char *)"Video Frame" ); -+ //p->vcsm_handle = vcsm_malloc_cache(numbytes, VCSM_CACHE_TYPE_HOST_AND_VC, (char *)"Video Frame" ); -+- assert(p->vcsm_handle); -++ av_assert0(p->vcsm_handle); -+ p->vc_handle = vcsm_vc_hdl_from_hdl(p->vcsm_handle); -+- assert(p->vc_handle); -++ av_assert0(p->vc_handle); -+ p->arm = vcsm_lock(p->vcsm_handle); -+- assert(p->arm); -++ av_assert0(p->arm); -+ p->vc = mem_lock(gpu->mb, p->vc_handle); -+- assert(p->vc); -++ av_assert0(p->vc); -+ return 0; -+ } -+ -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 60d1ec2..0686249 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -149,8 +149,8 @@ add t0s, r0, r1 ; mov ra_frame_base, r2 -+ add t1s, r2, r1 -+ -+ mov r2,8 -+-shl rb12,unif, r2 # offset before shift -+-add rb13,unif,r2 # offset after shift -++shl rb12,unif,r2 # offset before shift -++add rb13,unif,r2 # denominator -+ -+ # Compute part of VPM to use for DMA output -+ mov r2, unif -+@@ -185,7 +185,7 @@ add t1s, r1, ra_frame_base -+ -+ ################################################################################ -+ -+-# mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, height, hcoeffs[0], hcoeffs[1], vcoeffs[0], vcoeffs[1], this_u_dst, this_v_dst) -++# mc_filter_uv(next_kernel, x, y, frame_u_base, frame_v_base, width_height, hcoeffs, vcoeffs, offset_weight_u, offset_weight_v, this_u_dst, this_v_dst) -+ -+ # At this point we have already issued two pairs of texture requests for the current block -+ # ra_x, ra_x16_base point to the current coordinates for this block -+-- -+2.7.4 -+ -+ -+From 8bdf6b06c612ff4971c2ce99a62d093cf92468ca Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 2 Jun 2015 13:17:50 +0100 -+Subject: [PATCH 49/68] Increased motion vector memory and fixed block size -+ computation for non-multiple of 2 block sizes -+ -+--- -+ libavcodec/hevc.c | 50 +++++++++++++++++++++++++++++++------------------- -+ 1 file changed, 31 insertions(+), 19 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 34d92e2..3fb1e2a 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -83,11 +83,9 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ -+ // Split image of 2048 into parts 64 wide -+ // So some QPUs will have 3 blocks of 64 to do, and others 2 blocks for an image 2048 wide with 32 blocks across -+-// Each block of 64*64 -+-// Smallest CTU size is 16x16, so smallest block is 8x8 -+-// Corresponds to a total of 83kbytes over all 12 QPUs -++// For each block of 64*64 the smallest block size is 8x4 -+ #define RPI_LUMA_COMMAND_WORDS 9 -+-#define Y_COMMANDS_PER_QPU ((1+3*(64*64)/(8*8)) * RPI_LUMA_COMMAND_WORDS) -++#define Y_COMMANDS_PER_QPU ((1+3*(64*64)/(8*4)) * RPI_LUMA_COMMAND_WORDS) -+ -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+@@ -2042,11 +2040,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *y = s->y_mvs[chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -++ int bw = nPbW-start_x; -++ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -+- *y++ = ( (nPbW<16 ? nPbW : 16) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = ( (bw<16 ? bw : 16) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ if (weight_flag) { -+ *y++ = (s->sh.luma_offset_l0[current_mv.ref_idx[reflist]] << 16) + (s->sh.luma_weight_l0[current_mv.ref_idx[reflist]] & 0xffff); -+@@ -2089,12 +2089,14 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ int bw = nPbW_c-start_x; -++ int bh = nPbH_c-start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+- *u++ = ( (nPbW_cy_mvs[chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -++ int bw = nPbW-start_x; -++ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -+- *y++ = ( (nPbW<16 ? nPbW : 16) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = ( (bw<16 ? bw : 16) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ if (weight_flag) { -+ *y++ = (s->sh.luma_offset_l0[current_mv.ref_idx[reflist]] << 16) + (s->sh.luma_weight_l0[current_mv.ref_idx[reflist]] & 0xffff); -+@@ -2189,12 +2193,14 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ int bw = nPbW_c-start_x; -++ int bh = nPbH_c-start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+- *u++ = ( (nPbW_csh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+ *u++ = rpi_filter_coefs[_my][0]; -+@@ -2246,11 +2252,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *y = s->y_mvs[chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=8) { // B blocks work 8 at a time -++ int bw = nPbW-start_x; -++ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y2 - 3 + start_y) << 16) + ( (x2 - 3 + start_x) & 0xffff); // Second fetch is for ref1 -+ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -+- *y++ = ( (nPbW<8 ? nPbW : 8) << 16 ) + (nPbH<16 ? nPbH : 16); -++ *y++ = ( (bw<8 ? bw : 8) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ *y++ = 1; // B frame weighted prediction not supported -+ *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -+@@ -2293,12 +2301,14 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ uint32_t *u = s->u_mvs[chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -++ int bw = nPbW_c-start_x; -++ int bh = nPbH_c-start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b0; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -+- *u++ = ( (nPbW_cframe->buf[1]); -+ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -+- *u++ = ( (nPbW_c> 16; -+ uint32_t height = (width_height << 16) >> 16; -++ uint8_t *dst_base = s->frame->data[0]; -+ ref_y_base = compute_arm_addr(s,p[1-9],0); -+ ref_y2_base = compute_arm_addr(s,p[3-9],0); -+ for (y=0; ymc_filter) { -+ int32_t refa = filter8_luma(ref_y_base,x+x0, y+y0, pitch, my2_mx2_my_mx, offset_weight,offset_before,denom,frame_width,frame_height); -+- this_dst[x+y*dst_pitch] = av_clip_uint8(refa); -++ refa = av_clip_uint8(refa); -++ this_dst[x+y*dst_pitch] = refa; -+ } -+ else { -+ int32_t refa = filter8_luma(ref_y_base, x+x0, y+y0, pitch, my2_mx2_my_mx, 1, 0, 0, frame_width, frame_height); -+@@ -3248,7 +3261,7 @@ static void rpi_simulate_inter_qpu(HEVCContext *s) -+ } -+ for(i=0;i<12;i++) -+ { -+- rpi_simulate_inter_luma(s,s->y_mvs_base[i]); -++ rpi_simulate_inter_luma(s,s->y_mvs_base[i],i); -+ } -+ } -+ -+@@ -3290,7 +3303,6 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ #ifdef RPI_SIMULATE_QPUS -+ rpi_simulate_inter_qpu(s); -+- s->vpu_id = -1; -+ return; -+ #endif -+ -+-- -+2.7.4 -+ -+ -+From da5ae7e96dd961ccc7bc162c8acf336d54a50092 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 2 Jun 2015 14:36:54 +0100 -+Subject: [PATCH 50/68] Added support for skip deblock -+ -+--- -+ libavcodec/hevc.c | 5 +++++ -+ libavcodec/hevc.h | 2 ++ -+ libavcodec/hevc_filter.c | 14 ++++---------- -+ 3 files changed, 11 insertions(+), 10 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 3fb1e2a..0ac4f4c 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3397,6 +3397,11 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ -+ #endif -++ s->used_for_ref = !(s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N); -+ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+ av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 5df9dcd..5cb90b5 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -890,6 +890,8 @@ typedef struct HEVCContext { -+ int width; -+ int height; -+ -++ int used_for_ref; -++ -+ #ifdef RPI -+ int enable_rpi; -+ HEVCMvCmd *unif_mv_cmds; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 11629e4..14a0952 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -512,16 +512,14 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->ps.pps->transquant_bypass_enable_flag; -+ -+ #ifdef DISABLE_DEBLOCK_NONREF -+- if ( s->nal_unit_type == NAL_TRAIL_N || -+- s->nal_unit_type == NAL_TSA_N || -+- s->nal_unit_type == NAL_STSA_N || -+- s->nal_unit_type == NAL_RADL_N || -+- s->nal_unit_type == NAL_RASL_N ) -++ if (!s->used_for_ref) -+ return; // Don't deblock non-reference frames -+ #endif -+ #ifdef DISABLE_DEBLOCK -+ return; -+ #endif -++ if (!s->used_for_ref && s->avctx->skip_loop_filter >= AVDISCARD_NONREF) -++ return; -+ -+ if (x0) { -+ left_tc_offset = s->deblock[ctb - 1].tc_offset; -+@@ -885,11 +883,7 @@ static int ff_hevc_buf_base(AVBufferRef *bref) { -+ -+ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ { -+- if (s->enable_rpi && !( s->nal_unit_type == NAL_TRAIL_N || -+- s->nal_unit_type == NAL_TSA_N || -+- s->nal_unit_type == NAL_STSA_N || -+- s->nal_unit_type == NAL_RADL_N || -+- s->nal_unit_type == NAL_RASL_N )) { -++ if (s->enable_rpi && s->used_for_ref) { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ int curr_y = ((int *)f->progress->data)[0]; -+-- -+2.7.4 -+ -+ -+From 6401d88c310cd3bfec7be94bf3ceb6d0c5736c7e Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Tue, 2 Jun 2015 15:22:52 +0100 -+Subject: [PATCH 51/68] Added support for skip_frame -+ -+--- -+ libavcodec/hevc.c | 15 ++++++++++----- -+ 1 file changed, 10 insertions(+), 5 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 0ac4f4c..639e4df 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3397,11 +3397,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ -+ #endif -+- s->used_for_ref = !(s->nal_unit_type == NAL_TRAIL_N || -+- s->nal_unit_type == NAL_TSA_N || -+- s->nal_unit_type == NAL_STSA_N || -+- s->nal_unit_type == NAL_RADL_N || -+- s->nal_unit_type == NAL_RASL_N); -+ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+ av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); -+@@ -3925,6 +3920,16 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) -+ if (ret < 0) -+ return ret; -+ -++ s->used_for_ref = !(s->nal_unit_type == NAL_TRAIL_N || -++ s->nal_unit_type == NAL_TSA_N || -++ s->nal_unit_type == NAL_STSA_N || -++ s->nal_unit_type == NAL_RADL_N || -++ s->nal_unit_type == NAL_RASL_N); -++ -++ if (!s->used_for_ref && s->avctx->skip_frame >= AVDISCARD_NONREF) { -++ s->is_decoded = 0; -++ break; -++ } -+ if (s->max_ra == INT_MAX) { -+ if (s->nal_unit_type == NAL_CRA_NUT || IS_BLA(s)) { -+ s->max_ra = s->poc; -+-- -+2.7.4 -+ -+ -+From d2951e2ca73e234d1b775621e3993948a4a2c8ea Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 09:15:38 +0100 -+Subject: [PATCH 52/68] Fixed cache flushing of luma when using old method -+ -+--- -+ libavcodec/hevc_filter.c | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 14a0952..b286bbf 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -919,7 +919,7 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ flush_buffer(s->frame->buf[1]); -+ flush_buffer(s->frame->buf[2]); -+ #ifdef RPI_LUMA_QPU -+- flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[0]); -+ #endif -+ -+ #endif -+-- -+2.7.4 -+ -+ -+From 7ae612e69c1cabcc7d0b37b65efa8c5bdcfa7bf5 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 11:37:27 +0100 -+Subject: [PATCH 53/68] Option to parallelise coefficient decode and inter -+ prediction and deblock for each frame -+ -+--- -+ libavcodec/hevc.c | 701 +++++++++++++++++++++++++++-------------- -+ libavcodec/hevc.h | 74 +++-- -+ libavcodec/hevc_cabac.c | 12 +- -+ libavcodec/hevcpred_template.c | 5 +- -+ 4 files changed, 522 insertions(+), 270 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 639e4df..12aacc5 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -43,8 +43,6 @@ -+ -+ #ifdef RPI -+ #include "rpi_qpu.h" -+- // For some unknown reason, the code seems to crash if I do a late malloc -+- //#define EARLY_MALLOC -+ // Move Inter prediction into separate pass -+ #define RPI_INTER -+ -+@@ -58,6 +56,21 @@ -+ -+ // Define RPI_SIMULATE_QPUS for debugging to run QPU code on the ARMs -+ //#define RPI_SIMULATE_QPUS -++ #ifdef RPI_WORKER -++ #include "pthread.h" -++ #endif -++ -++ static void rpi_execute_dblk_cmds(HEVCContext *s); -++ static void rpi_execute_transform(HEVCContext *s); -++ static void rpi_execute_inter_qpu(HEVCContext *s); -++ static void rpi_execute_pred_cmds(HEVCContext *s); -++ static void rpi_execute_inter_cmds(HEVCContext *s); -++ static void rpi_inter_clear(HEVCContext *s); -++ -++ // Define INTER_PASS0 to do inter prediction in first pass -++ //#define INTER_PASS0 -++ // Define LAUNCH_PASS0 to launch QPU/VPU from pass0 -++ //#define LAUNCH_PASS0 -+ -+ #endif -+ -+@@ -105,6 +118,143 @@ static uint32_t get_vc_address(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+ return p->vc; -+ } -++#endif -++ -++ -++#ifdef RPI_WORKER -++ -++//#define LOG_ENTER printf("Enter %s: p0=%d p1=%d (%d jobs) %p\n", __func__,s->pass0_job,s->pass1_job,s->worker_tail-s->worker_head,s); -++//#define LOG_EXIT printf("Exit %s: p0=%d p1=%d (%d jobs) %p\n", __func__,s->pass0_job,s->pass1_job,s->worker_tail-s->worker_head,s); -++ -++#define LOG_ENTER -++#define LOG_EXIT -++ -++// Call this when we have completed pass0 and wish to trigger pass1 for the current job -++static void worker_submit_job(HEVCContext *s) -++{ -++ LOG_ENTER -++ //pthread_mutex_lock(&s->worker_mutex); -++ s->worker_tail++; // This is the only place that can change tail so we do not need the mutex -++ s->pass0_job = (s->pass0_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -++ pthread_cond_broadcast(&s->worker_cond_tail); // Let people know that the tail has moved -++ //pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++// Call this to say we have completed pass1 -++static void worker_complete_middle_job(HEVCContext *s) -++{ -++ LOG_ENTER -++ //pthread_mutex_lock(&s->worker_mutex); -++ s->worker_middle++; // This is the only place that can change head so we do not need the mutex -++ s->pass1_job = (s->pass1_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -++ pthread_cond_broadcast(&s->worker_cond_middle); // Let people know that the tail has moved -++ //pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++// Call this to say we have completed pass2 -++static void worker_complete_job(HEVCContext *s) -++{ -++ LOG_ENTER -++ //pthread_mutex_lock(&s->worker_mutex); -++ s->worker_head++; // This is the only place that can change head so we do not need the mutex -++ s->pass2_job = (s->pass2_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -++ pthread_cond_broadcast(&s->worker_cond_head); // Let people know that the tail has moved -++ //pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++// Call this to wait for all jobs to have completed at the end of a frame -++static void worker_wait(HEVCContext *s) -++{ -++ LOG_ENTER -++ pthread_mutex_lock(&s->worker_mutex); -++ while( s->worker_head !=s->worker_tail) -++ { -++ pthread_cond_wait(&s->worker_cond_head, &s->worker_mutex); -++ } -++ pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++// Call worker_pass0_ready to wait until the s->pass0_job slot becomes -++// available to receive the next job. -++static void worker_pass0_ready(HEVCContext *s) -++{ -++ LOG_ENTER -++ pthread_mutex_lock(&s->worker_mutex); -++ // tail is number of submitted jobs -++ // head is number of completed jobs -++ // tail-head is number of outstanding jobs in the queue -++ // we need to ensure there is at least 1 space left for us to use -++ while( s->worker_tail - s->worker_head >= RPI_MAX_JOBS) -++ { -++ // Wait until another job is completed -++ pthread_cond_wait(&s->worker_cond_head, &s->worker_mutex); -++ } -++ pthread_mutex_unlock(&s->worker_mutex); -++ LOG_EXIT -++} -++ -++static void *worker_start(void *arg) -++{ -++ HEVCContext *s = (HEVCContext *)arg; -++ while(1) { -++ pthread_mutex_lock(&s->worker_mutex); -++ -++ while( !s->kill_worker && s->worker_tail - s->worker_middle <= 0) -++ { -++ pthread_cond_wait(&s->worker_cond_tail, &s->worker_mutex); -++ } -++ pthread_mutex_unlock(&s->worker_mutex); -++ -++ if (s->kill_worker) { -++ break; -++ } -++ LOG_ENTER -++ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -++#ifndef LAUNCH_PASS0 -++ rpi_execute_inter_qpu(s); -++#endif -++#ifndef INTER_PASS0 -++ // Perform inter prediction -++ rpi_execute_inter_cmds(s); -++#endif -++ // Wait for transform completion -++ vpu_wait(s->vpu_id); -++ -++ worker_complete_middle_job(s); -++ LOG_EXIT -++ } -++ return NULL; -++} -++ -++static void *worker_deblock_start(void *arg) -++{ -++ HEVCContext *s = (HEVCContext *)arg; -++ while(1) { -++ pthread_mutex_lock(&s->worker_mutex); -++ while( !s->kill_worker && s->worker_middle - s->worker_head <= 0) -++ { -++ pthread_cond_wait(&s->worker_cond_middle, &s->worker_mutex); -++ } -++ pthread_mutex_unlock(&s->worker_mutex); -++ -++ if (s->kill_worker) { -++ break; -++ } -++ LOG_ENTER -++ // Perform intra prediction and residual reconstruction -++ rpi_execute_pred_cmds(s); -++ // Perform deblocking for CTBs in this row -++ rpi_execute_dblk_cmds(s); -++ -++ worker_complete_job(s); -++ LOG_EXIT -++ } -++ return NULL; -++} -+ -+ #endif -+ -+@@ -121,19 +271,18 @@ static uint32_t get_vc_address(AVBufferRef *bref) { -+ static void pic_arrays_free(HEVCContext *s) -+ { -+ #ifdef RPI -+- -+-#ifdef EARLY_MALLOC -+-#else -+- if (s->coeffs_buf_arm[0]) { -+- gpu_free(&s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = 0; -+- } -+- if (s->coeffs_buf_arm[2]) { -+- gpu_free(&s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = 0; -++ int job; -++ for(job=0;jobcoeffs_buf_arm[job][0]) { -++ gpu_free(&s->coeffs_buf_default[job]); -++ s->coeffs_buf_arm[job][0] = 0; -++ } -++ if (s->coeffs_buf_arm[job][2]) { -++ gpu_free(&s->coeffs_buf_accelerated[job]); -++ s->coeffs_buf_arm[job][2] = 0; -++ } -+ } -+ #endif -+-#endif -+ av_freep(&s->sao); -+ av_freep(&s->deblock); -+ -+@@ -171,24 +320,26 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ int min_pu_size = sps->min_pu_width * sps->min_pu_height; -+ -+ #ifdef RPI -+-#ifdef EARLY_MALLOC -+-#else -+ av_assert0(sps); -+ int coeffs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+ int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -+- if (!s->coeffs_buf_arm[0]) -+- goto fail; -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -+- s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -+- if (!s->coeffs_buf_arm[2]) -+- goto fail; -+- s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -+- s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -+- printf("Done\n"); -+-#endif -++ int job; -++ for(job=0;jobcoeffs_buf_default[job]); -++ s->coeffs_buf_arm[job][0] = (int16_t*) s->coeffs_buf_default[job].arm; -++ if (!s->coeffs_buf_arm[job][0]) -++ goto fail; -++ gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated[job]); -++ s->coeffs_buf_arm[job][2] = (int16_t*) s->coeffs_buf_accelerated[job].arm; -++ s->coeffs_buf_vc[job][2] = s->coeffs_buf_accelerated[job].vc; -++ if (!s->coeffs_buf_arm[job][2]) -++ goto fail; -++ s->coeffs_buf_arm[job][3] = coefs_per_row + s->coeffs_buf_arm[job][2]; -++ s->coeffs_buf_vc[job][3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[job][2]; -++ } -++ } -+ #endif -+ -+ s->bs_width = (width >> 2) + 1; -+@@ -1036,7 +1187,7 @@ static void rpi_intra_pred(HEVCContext *s, int log2_trafo_size, int x0, int y0, -+ { -+ if (s->enable_rpi) { -+ HEVCLocalContext *lc = s->HEVClc; -+- HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -++ HEVCPredCmd *cmd = s->univ_pred_cmds[s->pass0_job] + s->num_pred_cmds[s->pass0_job]++; -+ cmd->type = RPI_PRED_INTRA; -+ cmd->size = log2_trafo_size; -+ cmd->c_idx = c_idx; -+@@ -1496,7 +1647,7 @@ static void rpi_luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref, const Mv *mv, int x_off, int y_off, -+ int block_w, int block_h, int luma_weight, int luma_offset) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds[s->pass0_job] + s->num_mv_cmds[s->pass0_job]++; -+ cmd->cmd = RPI_CMD_LUMA_UNI; -+ cmd->dst = dst; -+ cmd->dststride = dststride; -+@@ -1515,7 +1666,7 @@ static void rpi_luma_mc_bi(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, -+ AVFrame *ref0, const Mv *mv0, int x_off, int y_off, -+ int block_w, int block_h, AVFrame *ref1, const Mv *mv1, struct MvField *current_mv) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds[s->pass0_job] + s->num_mv_cmds[s->pass0_job]++; -+ cmd->cmd = RPI_CMD_LUMA_BI; -+ cmd->dst = dst; -+ cmd->dststride = dststride; -+@@ -1537,7 +1688,7 @@ static void rpi_chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ ptrdiff_t dststride, uint8_t *src0, ptrdiff_t srcstride, int reflist, -+ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int chroma_weight, int chroma_offset) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds[s->pass0_job] + s->num_mv_cmds[s->pass0_job]++; -+ cmd->cmd = RPI_CMD_CHROMA_UNI; -+ cmd->dst = dst0; -+ cmd->dststride = dststride; -+@@ -1555,7 +1706,7 @@ static void rpi_chroma_mc_uni(HEVCContext *s, uint8_t *dst0, -+ static void rpi_chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVFrame *ref0, AVFrame *ref1, -+ int x_off, int y_off, int block_w, int block_h, struct MvField *current_mv, int cidx) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds + s->num_mv_cmds++; -++ HEVCMvCmd *cmd = s->unif_mv_cmds[s->pass0_job] + s->num_mv_cmds[s->pass0_job]++; -+ cmd->cmd = RPI_CMD_CHROMA_BI+cidx; -+ cmd->dst = dst0; -+ cmd->dststride = dststride; -+@@ -2037,7 +2188,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int chan = x0>>6; // 64 wide blocks per QPU -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+- uint32_t *y = s->y_mvs[chan % 12]; -++ uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -+ int bw = nPbW-start_x; -+@@ -2057,7 +2208,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+- s->y_mvs[chan % 12] = y; -++ s->y_mvs[s->pass0_job][chan % 12] = y; -+ } else -+ #endif -+ { -+@@ -2086,7 +2237,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+- uint32_t *u = s->u_mvs[chan & 7]; -++ uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2110,7 +2261,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[chan & 7] = u; -++ s->u_mvs[s->pass0_job][chan & 7] = u; -+ return; -+ } -+ #endif -+@@ -2140,7 +2291,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int chan = x0>>6; // 64 wide blocks per QPU -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+- uint32_t *y = s->y_mvs[chan % 12]; -++ uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -+ int bw = nPbW-start_x; -+@@ -2160,7 +2311,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+- s->y_mvs[chan % 12] = y; -++ s->y_mvs[s->pass0_job][chan % 12] = y; -+ } else -+ #endif -+ -+@@ -2190,7 +2341,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+- uint32_t *u = s->u_mvs[chan & 7]; -++ uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2215,7 +2366,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[chan & 7] = u; -++ s->u_mvs[s->pass0_job][chan & 7] = u; -+ return; -+ } -+ #endif -+@@ -2249,7 +2400,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int x2 = x0 + (mv2->x >> 2); -+ int y2 = y0 + (mv2->y >> 2); -+ int chan = x0>>6; // 64 wide blocks per QPU -+- uint32_t *y = s->y_mvs[chan % 12]; -++ uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=8) { // B blocks work 8 at a time -+ int bw = nPbW-start_x; -+@@ -2265,7 +2416,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter_b; -+ } -+ } -+- s->y_mvs[chan % 12] = y; -++ s->y_mvs[s->pass0_job][chan % 12] = y; -+ } else -+ #endif -+ { -+@@ -2298,7 +2449,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ -+ int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+ -+- uint32_t *u = s->u_mvs[chan & 7]; -++ uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2327,7 +2478,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[chan & 7] = u; -++ s->u_mvs[s->pass0_job][chan & 7] = u; -+ return; -+ } -+ #endif -+@@ -2832,40 +2983,54 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ static void rpi_execute_dblk_cmds(HEVCContext *s) -+ { -+ int n; -++ int job = s->pass2_job; -+ int ctb_size = 1 << s->ps.sps->log2_ctb_size; -+- int (*p)[2] = s->dblk_cmds; -+- for(n = s->num_dblk_cmds; n>0 ;n--,p++) { -++ int (*p)[2] = s->dblk_cmds[job]; -++ for(n = s->num_dblk_cmds[job]; n>0 ;n--,p++) { -+ ff_hevc_hls_filters(s, (*p)[0], (*p)[1], ctb_size); -+ } -+- s->num_dblk_cmds = 0; -++ s->num_dblk_cmds[job] = 0; -+ } -+ -+ static void rpi_execute_transform(HEVCContext *s) -+ { -+ int i=2; -++#ifdef LAUNCH_PASS0 -++ int job = s->pass0_job; -++#else -++ int job = s->pass1_job; -++#endif -+ //int j; -+ //int16_t *coeffs = s->coeffs_buf_arm[i]; -+ //for(j=s->num_coeffs[i]; j > 0; j-= 16*16, coeffs+=16*16) { -+ // s->hevcdsp.idct[4-2](coeffs, 16); -+ //} -+ -+- gpu_cache_flush(&s->coeffs_buf_accelerated); -+- s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, &s->coeffs_buf_accelerated); -++ gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -++ s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], -++ s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], -++ s->num_coeffs[job][3] >> 10, 0, &s->coeffs_buf_accelerated[job]); -+ //vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -+ //gpu_cache_flush(&s->coeffs_buf_accelerated); -+ //vpu_wait(s->vpu_id); -+ -+ for(i=0;i<4;i++) -+- s->num_coeffs[i] = 0; -++ s->num_coeffs[job][i] = 0; -+ } -+ -+ static void rpi_execute_pred_cmds(HEVCContext *s) -+ { -+ int i; -+- HEVCPredCmd *cmd = s->univ_pred_cmds; -++ int job = s->pass2_job; -++ HEVCPredCmd *cmd = s->univ_pred_cmds[job]; -++#ifdef RPI_WORKER -++ HEVCLocalContextIntra *lc = &s->HEVClcIntra; -++#else -+ HEVCLocalContext *lc = s->HEVClc; -++#endif -+ -+- for(i = s->num_pred_cmds; i > 0; i--, cmd++) { -++ for(i = s->num_pred_cmds[job]; i > 0; i--, cmd++) { -++ //printf("i=%d cmd=%p job1=%d job0=%d\n",i,cmd,s->pass1_job,s->pass0_job); -+ if (cmd->type == RPI_PRED_INTRA) { -+ lc->tu.intra_pred_mode_c = lc->tu.intra_pred_mode = cmd->mode; -+ lc->na.cand_bottom_left = (cmd->na >> 4) & 1; -+@@ -2884,21 +3049,26 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ #endif -+ } -+ } -+- s->num_pred_cmds = 0; -++ s->num_pred_cmds[job] = 0; -+ } -+ -+ static void rpi_execute_inter_cmds(HEVCContext *s) -+ { -+- HEVCMvCmd *cmd = s->unif_mv_cmds; -++#ifdef INTER_PASS0 -++ int job = s->pass0_job; -++#else -++ int job = s->pass1_job; -++#endif -++ HEVCMvCmd *cmd = s->unif_mv_cmds[job]; -+ int n,cidx; -+ AVFrame myref; -+ AVFrame myref1; -+ struct MvField mymv; -+- if (s->num_mv_cmds > RPI_MAX_MV_CMDS) { -++ if (s->num_mv_cmds[job] > RPI_MAX_MV_CMDS) { -+ printf("Overflow inter_cmds\n"); -+ exit(-1); -+ } -+- for(n = s->num_mv_cmds; n>0 ; n--, cmd++) { -++ for(n = s->num_mv_cmds[job]; n>0 ; n--, cmd++) { -+ switch(cmd->cmd) { -+ case RPI_CMD_LUMA_UNI: -+ myref.data[0] = cmd->src; -+@@ -2938,7 +3108,28 @@ static void rpi_execute_inter_cmds(HEVCContext *s) -+ break; -+ } -+ } -+- s->num_mv_cmds = 0; -++ s->num_mv_cmds[job] = 0; -++} -++ -++static void rpi_do_all_passes(HEVCContext *s) -++{ -++#ifdef RPI_INTER_QPU -++ // Kick off inter prediction on QPUs -++ rpi_execute_inter_qpu(s); -++#else -++ rpi_execute_transform(s); -++#endif -++ // Perform luma inter prediction -++ rpi_execute_inter_cmds(s); -++ // Wait for transform completion -++ vpu_wait(s->vpu_id); -++ // Perform intra prediction and residual reconstruction -++ rpi_execute_pred_cmds(s); -++ // Perform deblocking for CTBs in this row -++ rpi_execute_dblk_cmds(s); -++#ifdef RPI_INTER_QPU -++ rpi_inter_clear(s); -++#endif -+ } -+ -+ #endif -+@@ -2946,6 +3137,7 @@ static void rpi_execute_inter_cmds(HEVCContext *s) -+ #ifdef RPI_INTER_QPU -+ static void rpi_inter_clear(HEVCContext *s) -+ { -++ int job = s->pass0_job; -+ int i; -+ int pic_width = s->ps.sps->width >> s->ps.sps->hshift[1]; -+ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[1]; -+@@ -2953,51 +3145,50 @@ static void rpi_inter_clear(HEVCContext *s) -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+ for(i=0;i<8;i++) { -+- s->u_mvs[i] = s->mvs_base[i]; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = 0; -+- *s->u_mvs[i]++ = pic_width; -+- *s->u_mvs[i]++ = pic_height; -+- *s->u_mvs[i]++ = s->frame->linesize[1]; -+- *s->u_mvs[i]++ = s->frame->linesize[2]; -++ s->u_mvs[job][i] = s->mvs_base[job][i]; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = 0; -++ *s->u_mvs[job][i]++ = pic_width; -++ *s->u_mvs[job][i]++ = pic_height; -++ *s->u_mvs[job][i]++ = s->frame->linesize[1]; -++ *s->u_mvs[job][i]++ = s->frame->linesize[2]; -+ if (weight_flag) { -+- *s->u_mvs[i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -+- *s->u_mvs[i]++ = s->sh.chroma_log2_weight_denom + 6; -++ *s->u_mvs[job][i]++ = 1 << (s->sh.chroma_log2_weight_denom + 6 - 1); -++ *s->u_mvs[job][i]++ = s->sh.chroma_log2_weight_denom + 6; -+ } else { -+- *s->u_mvs[i]++ = 1 << 5; -+- *s->u_mvs[i]++ = 6; -++ *s->u_mvs[job][i]++ = 1 << 5; -++ *s->u_mvs[job][i]++ = 6; -+ } -+- *s->u_mvs[i]++ = i; // Select section of VPM (avoid collisions with 3d unit) -++ *s->u_mvs[job][i]++ = i; // Select section of VPM (avoid collisions with 3d unit) -+ } -+ -+ #ifdef RPI_LUMA_QPU -+ for(i=0;i<12;i++) { -+- s->y_mvs[i] = s->y_mvs_base[i]; -+- *s->y_mvs[i]++ = 0; // y_x -+- *s->y_mvs[i]++ = 0; // ref_y_base -+- *s->y_mvs[i]++ = 0; // y2_x2 -+- *s->y_mvs[i]++ = 0; // ref_y2_base -+- *s->y_mvs[i]++ = (s->ps.sps->width << 16) + s->ps.sps->height; -+- *s->y_mvs[i]++ = s->frame->linesize[0]; // pitch -+- *s->y_mvs[i]++ = s->frame->linesize[0]; // dst_pitch -++ s->y_mvs[job][i] = s->y_mvs_base[job][i]; -++ *s->y_mvs[job][i]++ = 0; // y_x -++ *s->y_mvs[job][i]++ = 0; // ref_y_base -++ *s->y_mvs[job][i]++ = 0; // y2_x2 -++ *s->y_mvs[job][i]++ = 0; // ref_y2_base -++ *s->y_mvs[job][i]++ = (s->ps.sps->width << 16) + s->ps.sps->height; -++ *s->y_mvs[job][i]++ = s->frame->linesize[0]; // pitch -++ *s->y_mvs[job][i]++ = s->frame->linesize[0]; // dst_pitch -+ if (weight_flag) { -+ int offset = 1 << (s->sh.luma_log2_weight_denom + 6 - 1); -+ int shift = s->sh.luma_log2_weight_denom + 6; -+- *s->y_mvs[i]++ = (offset << 16) + shift; -++ *s->y_mvs[job][i]++ = (offset << 16) + shift; -+ } else { -+ int offset = 1 << 5; -+ int shift = 6; -+- *s->y_mvs[i]++ = (offset << 16) + shift; -++ *s->y_mvs[job][i]++ = (offset << 16) + shift; -+ } -+- *s->y_mvs[i]++ = 0; // Next kernel -++ *s->y_mvs[job][i]++ = 0; // Next kernel -+ } -+ #endif -+ } -+ -+- -+ #ifdef RPI_SIMULATE_QPUS -+ -+ static int32_t clipx(int x,int FRAME_WIDTH) -+@@ -3271,10 +3462,15 @@ static void rpi_simulate_inter_qpu(HEVCContext *s) -+ static void rpi_execute_inter_qpu(HEVCContext *s) -+ { -+ int k; -++#ifdef LAUNCH_PASS0 -++ int job = s->pass0_job; -++#else -++ int job = s->pass1_job; -++#endif -+ int i; -+- uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr.vc; -++ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr[job].vc; -+ #ifdef RPI_LUMA_QPU -+- uint32_t *y_unif_vc = (uint32_t *)s->y_unif_mvs_ptr.vc; -++ uint32_t *y_unif_vc = (uint32_t *)s->y_unif_mvs_ptr[job].vc; -+ #endif -+ if (s->sh.slice_type == I_SLICE) { -+ #ifdef RPI_MULTI_MAILBOX -+@@ -3283,22 +3479,22 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ #endif -+ } -+ for(k=0;k<8;k++) { -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+- s->u_mvs[k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for V -+- av_assert0(s->u_mvs[k] - s->mvs_base[k] < UV_COMMANDS_PER_QPU); -++ s->u_mvs[job][k][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ s->u_mvs[job][k][-RPI_CHROMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->u_mvs[job][k][-RPI_CHROMA_COMMAND_WORDS+4] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for V -++ av_assert0(s->u_mvs[job][k] - s->mvs_base[job][k] < UV_COMMANDS_PER_QPU); -+ } -+ -+- s->u_mvs[8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++ s->u_mvs[job][8-1][-RPI_CHROMA_COMMAND_WORDS] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT8); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ -+ #ifdef RPI_LUMA_QPU -+ for(k=0;k<12;k++) { -+- s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+1] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -+- s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for second request -+- s->y_mvs[k][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -+- av_assert0(s->y_mvs[k] - s->y_mvs_base[k] < Y_COMMANDS_PER_QPU); -++ s->y_mvs[job][k][-RPI_LUMA_COMMAND_WORDS+1] = qpu_get_fn(QPU_MC_SETUP_UV); // A dummy texture location (maps to our code) - this is needed as the texture requests are pipelined -++ s->y_mvs[job][k][-RPI_LUMA_COMMAND_WORDS+3] = qpu_get_fn(QPU_MC_SETUP_UV); // Also need a dummy for second request -++ s->y_mvs[job][k][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_EXIT); // Add exit command -++ av_assert0(s->y_mvs[job][k] - s->y_mvs_base[job][k] < Y_COMMANDS_PER_QPU); -+ } -+- s->y_mvs[12-1][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT12); // This QPU will signal interrupt when all others are done and have acquired a semaphore -++ s->y_mvs[job][12-1][-RPI_LUMA_COMMAND_WORDS+8] = qpu_get_fn(QPU_MC_INTERRUPT_EXIT12); // This QPU will signal interrupt when all others are done and have acquired a semaphore -+ #endif -+ -+ #ifdef RPI_SIMULATE_QPUS -+@@ -3308,34 +3504,34 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ #ifdef RPI_MULTI_MAILBOX -+ #ifdef RPI_CACHE_UNIF_MVS -+- gpu_cache_flush3(&s->coeffs_buf_accelerated,&s->y_unif_mvs_ptr, &s->unif_mvs_ptr); -++ gpu_cache_flush3(&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job]); -+ #else -+- gpu_cache_flush(&s->coeffs_buf_accelerated); -++ gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -+ #endif -+- s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0, -++ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+- (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][1 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][2 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][3 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][4 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][5 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][6 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][7 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+ #ifdef RPI_LUMA_QPU -+ qpu_get_fn(QPU_MC_SETUP), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[0 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[1 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[2 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[3 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[4 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[5 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[6 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[7 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[8 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[9 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[10 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)), -+- (uint32_t)(y_unif_vc+(s->y_mvs_base[11 ] - (uint32_t*)s->y_unif_mvs_ptr.arm)) -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][0 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][1 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][2 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][3 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][4 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][5 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][6 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][7 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][8 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][9 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][10 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)), -++ (uint32_t)(y_unif_vc+(s->y_mvs_base[job][11 ] - (uint32_t*)s->y_unif_mvs_ptr[job].arm)) -+ #else -+ 0, -+ 0,0,0,0, -+@@ -3344,17 +3540,17 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ #endif -+ ); -+ for(i=0;i<4;i++) -+- s->num_coeffs[i] = 0; -++ s->num_coeffs[job][i] = 0; -+ #else -+ qpu_run_shader8(qpu_get_fn(QPU_MC_SETUP_UV), -+- (uint32_t)(unif_vc+(s->mvs_base[0 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[1 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[2 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[3 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[4 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[5 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[6 ] - (uint32_t*)s->unif_mvs_ptr.arm)), -+- (uint32_t)(unif_vc+(s->mvs_base[7 ] - (uint32_t*)s->unif_mvs_ptr.arm)) -++ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][1 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][2 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][3 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][4 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][5 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][6 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -++ (uint32_t)(unif_vc+(s->mvs_base[job][7 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)) -+ ); -+ #endif -+ -+@@ -3411,6 +3607,11 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ } -+ -++#ifdef RPI_WORKER -++ s->pass0_job = 0; -++ s->pass1_job = 0; -++ s->pass2_job = 0; -++#endif -+ #ifdef RPI_INTER_QPU -+ rpi_inter_clear(s); -+ #endif -+@@ -3431,46 +3632,42 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -++ -+ #ifdef RPI -+ if (s->enable_rpi) { -+- s->dblk_cmds[s->num_dblk_cmds][0] = x_ctb; -+- s->dblk_cmds[s->num_dblk_cmds++][1] = y_ctb; -++ s->dblk_cmds[s->pass0_job][s->num_dblk_cmds[s->pass0_job]][0] = x_ctb; -++ s->dblk_cmds[s->pass0_job][s->num_dblk_cmds[s->pass0_job]++][1] = y_ctb; -+ if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -+- // Transform all blocks -+- // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+-#ifdef RPI_MULTI_MAILBOX -+- // Kick off inter prediction on QPUs -+- rpi_execute_inter_qpu(s); -+- // Perform luma inter prediction -+- rpi_execute_inter_cmds(s); -+-#else -+- rpi_execute_transform(s); -+- // Perform inter prediction -+- rpi_execute_inter_cmds(s); -+-#ifdef RPI_INTER_QPU -+- // Kick off inter prediction on QPUs -+- rpi_execute_inter_qpu(s); -+-#endif -+-#endif -+- -+- // Wait for transform completion -+- vpu_wait(s->vpu_id); -+- -+- // Copy back reconstructed data -+- //memcpy(s->frame->data[0],s->dummy.arm,2048*64); -+- //memcpy(s->frame->data[1],s->dummy.arm,1024*32); -+- //memcpy(s->frame->data[2],s->dummy.arm,1024*32); -++#ifdef RPI_WORKER -++ if (s->used_for_ref) { -++ // Split work load onto separate threads so we make as rapid progress as possible with this frame -++ #ifdef INTER_PASS0 -++ rpi_execute_inter_cmds(s); -++ #endif -++ #ifdef LAUNCH_PASS0 -++ rpi_execute_inter_qpu(s); -++ #endif -++ // Pass on this job to worker thread -++ worker_submit_job(s); -++ // Make sure we have space to prepare the next job -++ worker_pass0_ready(s); -+ -+- // Perform intra prediction and residual reconstruction -+- rpi_execute_pred_cmds(s); -+- // Perform deblocking for CTBs in this row -+- rpi_execute_dblk_cmds(s); -++ // Prepare the next batch of commands -+ #ifdef RPI_INTER_QPU -+- rpi_inter_clear(s); -++ rpi_inter_clear(s); -++#endif -++ } else { -++ // Non-ref frame so do it all on this thread -++ rpi_do_all_passes(s); -++ } -++#else -++ rpi_do_all_passes(s); -+ #endif -+ } -+ } -+ #endif -++ -++ -+ if (more_data < 0) { -+ s->tab_slice_address[ctb_addr_rs] = -1; -+ return more_data; -+@@ -3487,18 +3684,21 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ } -+ -+ #ifdef RPI -+- if (s->enable_rpi && s->num_dblk_cmds) { -+-#ifdef RPI_INTER_QPU -+- rpi_execute_inter_qpu(s); -+-#endif -+-#ifndef RPI_MULTI_MAILBOX -+- rpi_execute_transform(s); -++ -++#ifdef RPI_WORKER -++ // Wait for the worker to finish all its jobs -++ if (s->enable_rpi) { -++ worker_wait(s); -++ av_assert0(s->pass0_job==s->pass1_job); -++ av_assert0(s->pass1_job==s->pass2_job); -++ } -+ #endif -+- rpi_execute_inter_cmds(s); -+- vpu_wait(s->vpu_id); -+- rpi_execute_pred_cmds(s); -+- rpi_execute_dblk_cmds(s); -++ -++ // Finish off any half-completed rows -++ if (s->enable_rpi && s->num_dblk_cmds[s->pass0_job]) { -++ rpi_do_all_passes(s); -+ } -++ -+ #endif -+ -+ if (x_ctb + ctb_size >= s->ps.sps->width && -+@@ -4230,6 +4430,48 @@ fail: -+ return AVERROR(ENOMEM); -+ } -+ -++#ifdef RPI_WORKER -++static av_cold void hevc_init_worker(HEVCContext *s) -++{ -++ int err; -++ pthread_cond_init(&s->worker_cond_head, NULL); -++ pthread_cond_init(&s->worker_cond_middle, NULL); -++ pthread_cond_init(&s->worker_cond_tail, NULL); -++ pthread_mutex_init(&s->worker_mutex, NULL); -++ -++ s->worker_tail=0; -++ s->worker_middle=0; -++ s->worker_head=0; -++ s->kill_worker=0; -++ err = pthread_create(&s->worker_thread, NULL, worker_start, s); -++ err = pthread_create(&s->worker_deblock_thread, NULL, worker_deblock_start, s); -++ if (err) { -++ printf("Failed to create worker thread\n"); -++ exit(-1); -++ } -++} -++ -++static av_cold void hevc_exit_worker(HEVCContext *s) -++{ -++ void *res; -++ s->kill_worker=1; -++ pthread_cond_broadcast(&s->worker_cond_tail); -++ pthread_cond_broadcast(&s->worker_cond_middle); -++ pthread_join(s->worker_thread, &res); -++ pthread_join(s->worker_deblock_thread, &res); -++ -++ pthread_cond_destroy(&s->worker_cond_head); -++ pthread_cond_destroy(&s->worker_cond_middle); -++ pthread_cond_destroy(&s->worker_cond_tail); -++ pthread_mutex_destroy(&s->worker_mutex); -++ -++ s->worker_tail=0; -++ s->worker_middle=0; -++ s->worker_head=0; -++ s->kill_worker=0; -++} -++#endif -++ -+ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ { -+ HEVCContext *s = avctx->priv_data; -+@@ -4242,33 +4484,29 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) -+ av_freep(&s->cabac_state); -+ -+ #ifdef RPI -+- av_freep(&s->unif_mv_cmds); -+- av_freep(&s->univ_pred_cmds); -++ -++#ifdef RPI_WORKER -++ hevc_exit_worker(s); -++#endif -++ -++ for(i=0;iunif_mv_cmds[i]); -++ av_freep(&s->univ_pred_cmds[i]); -+ -+ #ifdef RPI_INTER_QPU -+- if (s->unif_mvs) { -+- gpu_free( &s->unif_mvs_ptr ); -+- s->unif_mvs = 0; -+- } -++ if (s->unif_mvs[i]) { -++ gpu_free( &s->unif_mvs_ptr[i] ); -++ s->unif_mvs[i] = 0; -++ } -+ #endif -+ #ifdef RPI_LUMA_QPU -+- if (s->y_unif_mvs) { -+- gpu_free( &s->y_unif_mvs_ptr ); -+- s->y_unif_mvs = 0; -+- } -++ if (s->y_unif_mvs[i]) { -++ gpu_free( &s->y_unif_mvs_ptr[i] ); -++ s->y_unif_mvs[i] = 0; -++ } -+ #endif -+- -+-#ifdef EARLY_MALLOC -+- printf("hevc_decode_free\n"); -+- if (s->coeffs_buf_arm[0]) { -+- gpu_free(&s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = 0; -+- } -+- if (s->coeffs_buf_arm[2]) { -+- gpu_free(&s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = 0; -+ } -+-#endif -++ -+ #endif -+ -+ for (i = 0; i < 3; i++) { -+@@ -4328,6 +4566,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ { -+ HEVCContext *s = avctx->priv_data; -+ int i; -++ int job; -+ -+ s->avctx = avctx; -+ -+@@ -4338,12 +4577,14 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ s->sList[0] = s; -+ -+ #ifdef RPI -+- s->unif_mv_cmds = av_mallocz(sizeof(HEVCMvCmd)*RPI_MAX_MV_CMDS); -+- if (!s->unif_mv_cmds) -+- goto fail; -+- s->univ_pred_cmds = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -+- if (!s->univ_pred_cmds) -+- goto fail; -++ for(job=0;jobunif_mv_cmds[job] = av_mallocz(sizeof(HEVCMvCmd)*RPI_MAX_MV_CMDS); -++ if (!s->unif_mv_cmds[job]) -++ goto fail; -++ s->univ_pred_cmds[job] = av_mallocz(sizeof(HEVCPredCmd)*RPI_MAX_PRED_CMDS); -++ if (!s->univ_pred_cmds[job]) -++ goto fail; -++ } -+ -+ #ifdef RPI_INTER_QPU -+ // We divide the image into blocks 256 wide and 64 high -+@@ -4354,18 +4595,20 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ { -+ int uv_commands_per_qpu = UV_COMMANDS_PER_QPU; -+ uint32_t *p; -++ for(job=0;jobunif_mvs_ptr ); -++ gpu_malloc_cached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr[job] ); -+ #else -+- gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr ); -++ gpu_malloc_uncached( 8 * uv_commands_per_qpu * sizeof(uint32_t), &s->unif_mvs_ptr[job] ); -+ #endif -+- s->unif_mvs = (uint32_t *) s->unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -++ s->unif_mvs[job] = (uint32_t *) s->unif_mvs_ptr[job].arm; -+ -+- // Set up initial locations for uniform streams -+- p = s->unif_mvs; -+- for(i = 0; i < 8; i++) { -+- s->mvs_base[i] = p; -++ // Set up initial locations for uniform streams -++ p = s->unif_mvs[job]; -++ for(i = 0; i < 8; i++) { -++ s->mvs_base[job][i] = p; -+ p += uv_commands_per_qpu; -++ } -+ } -+ s->mc_filter_uv = qpu_get_fn(QPU_MC_FILTER_UV); -+ s->mc_filter_uv_b0 = qpu_get_fn(QPU_MC_FILTER_UV_B0); -+@@ -4374,61 +4617,35 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) -+ } -+ #endif -+ #ifdef RPI_LUMA_QPU -++ for(job=0;joby_unif_mvs_ptr ); -++ gpu_malloc_cached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr[job] ); -+ #else -+- gpu_malloc_uncached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr ); -++ gpu_malloc_uncached( 12 * y_commands_per_qpu * sizeof(uint32_t), &s->y_unif_mvs_ptr[job] ); -+ #endif -+- s->y_unif_mvs = (uint32_t *) s->y_unif_mvs_ptr.arm; // TODO support this allocation in non EARLY_MALLOC -++ s->y_unif_mvs[job] = (uint32_t *) s->y_unif_mvs_ptr[job].arm; -+ -+ // Set up initial locations for uniform streams -+- p = s->y_unif_mvs; -++ p = s->y_unif_mvs[job]; -+ for(i = 0; i < 12; i++) { -+- s->y_mvs_base[i] = p; -++ s->y_mvs_base[job][i] = p; -+ p += y_commands_per_qpu; -+ } -+- s->mc_filter = qpu_get_fn(QPU_MC_FILTER); -+- s->mc_filter_b = qpu_get_fn(QPU_MC_FILTER_B); -+- -+ } -++ s->mc_filter = qpu_get_fn(QPU_MC_FILTER); -++ s->mc_filter_b = qpu_get_fn(QPU_MC_FILTER_B); -+ #endif -+ //gpu_malloc_uncached(2048*64,&s->dummy); -+ -+-#ifdef EARLY_MALLOC -+- { -+- int coeffs_in_ctb = 64*64; -+- int coefs_per_row = (2048/64) * coeffs_in_ctb * 3; // Allow space for chroma -+- s->coeffs_buf_arm[0] = 0; -+- s->coeffs_buf_arm[2] = 0; -+- printf("Allocated %d\n",coefs_per_row); -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row, &s->coeffs_buf_default); -+- s->coeffs_buf_arm[0] = (int16_t*) s->coeffs_buf_default.arm; -+- if (!s->coeffs_buf_arm[0]) -+- goto fail; -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated); -+- s->coeffs_buf_arm[2] = (int16_t*) s->coeffs_buf_accelerated.arm; -+- s->coeffs_buf_vc[2] = s->coeffs_buf_accelerated.vc; -+- if (!s->coeffs_buf_arm[2]) -+- goto fail; -+- s->coeffs_buf_arm[3] = coefs_per_row + s->coeffs_buf_arm[2]; -+- s->coeffs_buf_vc[3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[2]; -+- printf("Done\n"); -+-#ifdef RPI_PRECLEAR -+- //memset(s->coeffs_buf_arm[0],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[0], coefs_per_row); -+- //memset(s->coeffs_buf_arm[2],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[2], coefs_per_row); -+- //memset(s->coeffs_buf_arm[3],0, sizeof(int16_t) * coefs_per_row); -+- memclear16(s->coeffs_buf_arm[3], coefs_per_row); -+-#endif -+- } -+-#endif -+- -+ s->enable_rpi = 0; -+ -++#ifdef RPI_WORKER -++ hevc_init_worker(s); -++#endif -++ -+ #endif -+ -+ s->cabac_state = av_malloc(HEVC_CONTEXTS); -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 5cb90b5..7bd295a 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -51,6 +51,12 @@ -+ // Define RPI_LUMA_QPU to also use QPU for luma inter prediction -+ #define RPI_LUMA_QPU -+ #endif -++ -++ // By passing jobs to a worker thread we hope to be able to catch up during slow frames -++ #define RPI_MAX_JOBS 2 -++ // Define RPI_WORKER to launch a worker thread for pixel processing tasks -++ #define RPI_WORKER -++ -+ #endif -+ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+@@ -806,6 +812,13 @@ typedef struct HEVCLocalContext { -+ int boundary_flags; -+ } HEVCLocalContext; -+ -++#ifdef RPI_WORKER -++typedef struct HEVCLocalContextIntra { -++ TransformUnit tu; -++ NeighbourAvailable na; -++} HEVCLocalContextIntra; -++#endif -++ -+ #ifdef RPI -+ -+ // RPI_MAX_WIDTH is maximum width in pixels supported by the accelerated code -+@@ -874,7 +887,7 @@ typedef struct HEVCPredCmd { -+ -+ typedef struct HEVCContext { -+ #ifdef RPI -+- int dblk_cmds[RPI_MAX_DEBLOCK_CMDS][2]; -++ int dblk_cmds[RPI_MAX_JOBS][RPI_MAX_DEBLOCK_CMDS][2]; -+ #endif -+ const AVClass *c; // needed by private avoptions -+ AVCodecContext *avctx; -+@@ -883,7 +896,9 @@ typedef struct HEVCContext { -+ -+ HEVCLocalContext *HEVClcList[MAX_NB_THREADS]; -+ HEVCLocalContext *HEVClc; -+- -++#ifdef RPI_WORKER -++ HEVCLocalContextIntra HEVClcIntra; -++#endif -+ uint8_t threads_type; -+ uint8_t threads_number; -+ -+@@ -894,43 +909,60 @@ typedef struct HEVCContext { -+ -+ #ifdef RPI -+ int enable_rpi; -+- HEVCMvCmd *unif_mv_cmds; -+- HEVCPredCmd *univ_pred_cmds; -++ HEVCMvCmd *unif_mv_cmds[RPI_MAX_JOBS]; -++ HEVCPredCmd *univ_pred_cmds[RPI_MAX_JOBS]; -+ int buf_width; -+- GPU_MEM_PTR_T coeffs_buf_default; -+- GPU_MEM_PTR_T coeffs_buf_accelerated; -+- int16_t *coeffs_buf_arm[4]; -+- unsigned int coeffs_buf_vc[4]; -+- int num_coeffs[4]; -+- int num_xfm_cmds; -+- int num_mv_cmds; -+- int num_pred_cmds; -+- int num_dblk_cmds; -++ GPU_MEM_PTR_T coeffs_buf_default[RPI_MAX_JOBS]; -++ GPU_MEM_PTR_T coeffs_buf_accelerated[RPI_MAX_JOBS]; -++ int16_t *coeffs_buf_arm[RPI_MAX_JOBS][4]; -++ unsigned int coeffs_buf_vc[RPI_MAX_JOBS][4]; -++ int num_coeffs[RPI_MAX_JOBS][4]; -++ int num_xfm_cmds[RPI_MAX_JOBS]; -++ int num_mv_cmds[RPI_MAX_JOBS]; -++ int num_pred_cmds[RPI_MAX_JOBS]; -++ int num_dblk_cmds[RPI_MAX_JOBS]; -+ int vpu_id; -+ //GPU_MEM_PTR_T dummy; -++ int pass0_job; // Pass0 does coefficient decode -++ int pass1_job; // Pass1 does pixel processing -++ int pass2_job; // Pass2 does reconstruction and deblocking -+ #ifdef RPI_INTER_QPU -+- GPU_MEM_PTR_T unif_mvs_ptr; -+- uint32_t *unif_mvs; // Base of memory for motion vector commands -++ GPU_MEM_PTR_T unif_mvs_ptr[RPI_MAX_JOBS]; -++ uint32_t *unif_mvs[RPI_MAX_JOBS]; // Base of memory for motion vector commands -+ -+ // _base pointers are to the start of the row -+- uint32_t *mvs_base[8]; -++ uint32_t *mvs_base[RPI_MAX_JOBS][8]; -+ // these pointers are to the next free space -+- uint32_t *u_mvs[8]; -++ uint32_t *u_mvs[RPI_MAX_JOBS][8]; -+ // Function pointers -+ uint32_t mc_filter_uv; -+ uint32_t mc_filter_uv_b0; -+ uint32_t mc_filter_uv_b; -+ #endif -+ #ifdef RPI_LUMA_QPU -+- GPU_MEM_PTR_T y_unif_mvs_ptr; -+- uint32_t *y_unif_mvs; // Base of memory for motion vector commands -+- uint32_t *y_mvs_base[12]; -+- uint32_t *y_mvs[12]; -++ GPU_MEM_PTR_T y_unif_mvs_ptr[RPI_MAX_JOBS]; -++ uint32_t *y_unif_mvs[RPI_MAX_JOBS]; // Base of memory for motion vector commands -++ uint32_t *y_mvs_base[RPI_MAX_JOBS][12]; -++ uint32_t *y_mvs[RPI_MAX_JOBS][12]; -+ // Function pointers -+ uint32_t mc_filter; -+ uint32_t mc_filter_b; -+ #endif -+ -++#ifdef RPI_WORKER -++ pthread_t worker_thread; -++ pthread_t worker_deblock_thread; -++ pthread_cond_t worker_cond_head; -++ pthread_cond_t worker_cond_tail; -++ pthread_cond_t worker_cond_middle; -++ pthread_mutex_t worker_mutex; -++ -++ int worker_tail; // Contains the number of posted jobs -++ int worker_head; // Contains the number of completed jobs -++ int worker_middle; // Contains the number of completed jobs -++ int kill_worker; // set to 1 to terminate the worker -++#endif -++ -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 38f53de..f0982cd 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1051,11 +1051,11 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ if (s->enable_rpi) { -+ int n = trafo_size * trafo_size; -+ if (use_vpu) { -+- coeffs = s->coeffs_buf_arm[log2_trafo_size - 2] + s->num_coeffs[log2_trafo_size - 2]; -+- s->num_coeffs[log2_trafo_size - 2] += n; -++ coeffs = s->coeffs_buf_arm[s->pass0_job][log2_trafo_size - 2] + s->num_coeffs[s->pass0_job][log2_trafo_size - 2]; -++ s->num_coeffs[s->pass0_job][log2_trafo_size - 2] += n; -+ } else { -+- coeffs = s->coeffs_buf_arm[0] + s->num_coeffs[0]; -+- s->num_coeffs[0] += n; -++ coeffs = s->coeffs_buf_arm[s->pass0_job][0] + s->num_coeffs[s->pass0_job][0]; -++ s->num_coeffs[s->pass0_job][0] += n; -+ } -+ } -+ // We now do the memset after transform_add while we know the data is cached. -+@@ -1508,7 +1508,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ s->hevcdsp.transform_rdpcm(coeffs, log2_trafo_size, mode); -+ } -+ } else if (lc->cu.pred_mode == MODE_INTRA && c_idx == 0 && log2_trafo_size == 2) { -+- s->hevcdsp.idct_4x4_luma(coeffs); -++ s->hevcdsp.idct_4x4_luma(coeffs); -+ } else { -+ #ifdef RPI -+ if (!use_vpu) { -+@@ -1553,7 +1553,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ #ifdef RPI -+ if (s->enable_rpi) { -+- HEVCPredCmd *cmd = s->univ_pred_cmds + s->num_pred_cmds++; -++ HEVCPredCmd *cmd = s->univ_pred_cmds[s->pass0_job] + s->num_pred_cmds[s->pass0_job]++; -+ cmd->type = RPI_PRED_TRANSFORM_ADD; -+ cmd->size = log2_trafo_size; -+ cmd->buf = coeffs; -+diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c -+index 71c6d52..344e021 100644 -+--- a/libavcodec/hevcpred_template.c -++++ b/libavcodec/hevcpred_template.c -+@@ -71,8 +71,11 @@ do { \ -+ AV_WN4P(&ptr[i], a); \ -+ else \ -+ a = PIXEL_SPLAT_X4(ptr[i + 3]) -+- -++#ifdef RPI_WORKER -++ HEVCLocalContextIntra *lc = &s->HEVClcIntra; -++#else -+ HEVCLocalContext *lc = s->HEVClc; -++#endif -+ int i; -+ int hshift = s->ps.sps->hshift[c_idx]; -+ int vshift = s->ps.sps->vshift[c_idx]; -+-- -+2.7.4 -+ -+ -+From 1e0885f8d98175777fff65b4cedd708176c2abcf Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 13:43:48 +0100 -+Subject: [PATCH 54/68] Avoid lockup bug with RPI_WORKER enabled -+ -+--- -+ libavcodec/hevc.c | 22 +++++++++++----------- -+ libavcodec/hevc_cabac.c | 1 - -+ 2 files changed, 11 insertions(+), 12 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 12aacc5..182a82f 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -133,11 +133,11 @@ static uint32_t get_vc_address(AVBufferRef *bref) { -+ static void worker_submit_job(HEVCContext *s) -+ { -+ LOG_ENTER -+- //pthread_mutex_lock(&s->worker_mutex); -+- s->worker_tail++; // This is the only place that can change tail so we do not need the mutex -++ pthread_mutex_lock(&s->worker_mutex); -++ s->worker_tail++; -+ s->pass0_job = (s->pass0_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+ pthread_cond_broadcast(&s->worker_cond_tail); // Let people know that the tail has moved -+- //pthread_mutex_unlock(&s->worker_mutex); -++ pthread_mutex_unlock(&s->worker_mutex); -+ LOG_EXIT -+ } -+ -+@@ -145,11 +145,11 @@ static void worker_submit_job(HEVCContext *s) -+ static void worker_complete_middle_job(HEVCContext *s) -+ { -+ LOG_ENTER -+- //pthread_mutex_lock(&s->worker_mutex); -+- s->worker_middle++; // This is the only place that can change head so we do not need the mutex -++ pthread_mutex_lock(&s->worker_mutex); -++ s->worker_middle++; -+ s->pass1_job = (s->pass1_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+- pthread_cond_broadcast(&s->worker_cond_middle); // Let people know that the tail has moved -+- //pthread_mutex_unlock(&s->worker_mutex); -++ pthread_cond_broadcast(&s->worker_cond_middle); // Let people know that the middle has moved -++ pthread_mutex_unlock(&s->worker_mutex); -+ LOG_EXIT -+ } -+ -+@@ -157,11 +157,11 @@ static void worker_complete_middle_job(HEVCContext *s) -+ static void worker_complete_job(HEVCContext *s) -+ { -+ LOG_ENTER -+- //pthread_mutex_lock(&s->worker_mutex); -+- s->worker_head++; // This is the only place that can change head so we do not need the mutex -++ pthread_mutex_lock(&s->worker_mutex); -++ s->worker_head++; -+ s->pass2_job = (s->pass2_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+- pthread_cond_broadcast(&s->worker_cond_head); // Let people know that the tail has moved -+- //pthread_mutex_unlock(&s->worker_mutex); -++ pthread_cond_broadcast(&s->worker_cond_head); // Let people know that the head has moved -++ pthread_mutex_unlock(&s->worker_mutex); -+ LOG_EXIT -+ } -+ -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index f0982cd..6523e66 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1497,7 +1497,6 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ for (i = 0; i < 8; i++) -+ FFSWAP(int16_t, coeffs[i], coeffs[16 - i - 1]); -+ } -+- -+ s->hevcdsp.transform_skip(coeffs, log2_trafo_size); -+ -+ if (explicit_rdpcm_flag || (s->ps.sps->implicit_rdpcm_enabled_flag && -+-- -+2.7.4 -+ -+ -+From 1d7ad81069dec6914ec7e9983855d7a1b5e4b123 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 15:37:19 +0100 -+Subject: [PATCH 55/68] Added code to flush buffers at start of frame -+ -+--- -+ libavcodec/hevc.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -+ 1 file changed, 72 insertions(+) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 182a82f..e5b9f1e 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -43,6 +43,7 @@ -+ -+ #ifdef RPI -+ #include "rpi_qpu.h" -++ #include "rpi_user_vcsm.h" -+ // Move Inter prediction into separate pass -+ #define RPI_INTER -+ -+@@ -3508,6 +3509,7 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ #else -+ gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -+ #endif -++ -+ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+@@ -3558,6 +3560,71 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ } -+ #endif -+ -++#ifdef RPI -++ -++static void flush_buffer(AVBufferRef *bref) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -++ gpu_cache_flush(p); -++} -++ -++static void flush_frame(HEVCContext *s,AVFrame *frame) -++{ -++#if 1 -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ int n = s->ps.sps->height; -++ int curr_y = 0; -++ int curr_uv = 0; -++ int n_uv = n >> s->ps.sps->vshift[1]; -++ int sz,base; -++ sz = s->frame->linesize[1] * (n_uv-curr_uv); -++ base = s->frame->linesize[1] * curr_uv; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = p->arm + base; -++ iocache.s[0].size = sz; -++ p = av_buffer_pool_opaque(frame->buf[2]); -++ iocache.s[1].handle = p->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = p->arm + base; -++ iocache.s[1].size = sz; -++ p = av_buffer_pool_opaque(frame->buf[0]); -++ sz = s->frame->linesize[0] * (n-curr_y); -++ base = s->frame->linesize[0] * curr_y; -++ iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = p->arm + base; -++ iocache.s[2].size = sz; -++ vcsm_clean_invalid( &iocache ); -++#else -++ flush_buffer(frame->buf[0]); -++ flush_buffer(frame->buf[1]); -++ flush_buffer(frame->buf[2]); -++#endif -++} -++ -++static void flush_all(HEVCContext *s) -++{ -++#if 0 -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[0]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 4; // Flush all -++ iocache.s[0].addr = p->arm; -++ iocache.s[0].size = 4096; -++ vcsm_clean_invalid( &iocache ); -++#else -++ int i,k; -++ for(i=0;i<2;i++) { -++ for (k = 0; k < s->sh.nb_refs[i]; k++) { -++ flush_frame(s,s->ref->refPicList[i].ref[k]->frame); -++ } -++ } -++ flush_frame(s,s->frame); -++#endif -++} -++#endif -++ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ { -+ HEVCContext *s = avctxt->priv_data; -+@@ -3592,8 +3659,12 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ printf("Weighted B slice\n"); -+ } -+ -++ // Now flush all reference frames and our destination frame to get everything ready for decode -++ flush_all(s); -+ #endif -+ -++ //printf("L0=%d L1=%d\n",s->sh.nb_refs[L1],s->sh.nb_refs[L1]); -++ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+ av_log(s->avctx, AV_LOG_ERROR, "Impossible initial tile.\n"); -+ return AVERROR_INVALIDDATA; -+@@ -3664,6 +3735,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ rpi_do_all_passes(s); -+ #endif -+ } -++ -+ } -+ #endif -+ -+-- -+2.7.4 -+ -+ -+From 7a57f233dcd4048e20a0b5bc06bc20abb589d3fa Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 3 Jun 2015 16:42:24 +0100 -+Subject: [PATCH 56/68] Reduce the amount that needs to be flushed -+ -+--- -+ libavcodec/hevc.c | 35 +++++++++++------------------------ -+ 1 file changed, 11 insertions(+), 24 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index e5b9f1e..73d7f74 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3569,7 +3569,7 @@ static void flush_buffer(AVBufferRef *bref) { -+ -+ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ { -+-#if 1 -++#ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ int n = s->ps.sps->height; -+ int curr_y = 0; -+@@ -3603,26 +3603,6 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ #endif -+ } -+ -+-static void flush_all(HEVCContext *s) -+-{ -+-#if 0 -+- struct vcsm_user_clean_invalid_s iocache = {}; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[0]); -+- iocache.s[0].handle = p->vcsm_handle; -+- iocache.s[0].cmd = 4; // Flush all -+- iocache.s[0].addr = p->arm; -+- iocache.s[0].size = 4096; -+- vcsm_clean_invalid( &iocache ); -+-#else -+- int i,k; -+- for(i=0;i<2;i++) { -+- for (k = 0; k < s->sh.nb_refs[i]; k++) { -+- flush_frame(s,s->ref->refPicList[i].ref[k]->frame); -+- } -+- } -+- flush_frame(s,s->frame); -+-#endif -+-} -+ #endif -+ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+@@ -3658,9 +3638,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ if (s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE) -+ printf("Weighted B slice\n"); -+ } -+- -+- // Now flush all reference frames and our destination frame to get everything ready for decode -+- flush_all(s); -+ #endif -+ -+ //printf("L0=%d L1=%d\n",s->sh.nb_refs[L1],s->sh.nb_refs[L1]); -+@@ -4130,6 +4107,11 @@ static int hevc_frame_start(HEVCContext *s) -+ if (!s->avctx->hwaccel) -+ ff_thread_finish_setup(s->avctx); -+ -++#ifdef RPI_INTER_QPU -++ // Invalidate the output data buffer so it is ready for the QPUs to write into it. -++ flush_frame(s,s->frame); -++#endif -++ -+ return 0; -+ -+ fail: -+@@ -4331,6 +4313,11 @@ fail: -+ ff_hevc_flush_buffer(s, &s->ref->tf, s->ps.sps->height); -+ #endif -+ ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); -++ } else if (s->ref) { -++#ifdef RPI_INTER_QPU -++ // When running single threaded we need to flush the whole frame -++ flush_frame(s,s->frame); -++#endif -+ } -+ return ret; -+ } -+-- -+2.7.4 -+ -+ -+From 26eba8e3266cc5f2120e8284a1ce486d6a402010 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 4 Jun 2015 07:59:28 +0100 -+Subject: [PATCH 57/68] Corrected support for disabled rpi when using -+ RPI_WORKER -+ -+--- -+ libavcodec/hevc.h | 18 ++++++++++-------- -+ libavcodec/hevcpred_template.c | 2 +- -+ 2 files changed, 11 insertions(+), 9 deletions(-) -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 7bd295a..3cb34bd 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -769,7 +769,17 @@ typedef struct HEVCFrame { -+ uint8_t flags; -+ } HEVCFrame; -+ -++#ifdef RPI_WORKER -++typedef struct HEVCLocalContextIntra { -++ TransformUnit tu; -++ NeighbourAvailable na; -++} HEVCLocalContextIntra; -++#endif -++ -+ typedef struct HEVCLocalContext { -++ TransformUnit tu; -++ NeighbourAvailable na; // WARNING tu and na must be the first two fields to match HEVCLocalContextIntra -++ -+ uint8_t cabac_state[HEVC_CONTEXTS]; -+ -+ uint8_t stat_coeff[4]; -+@@ -784,7 +794,6 @@ typedef struct HEVCLocalContext { -+ -+ int qPy_pred; -+ -+- TransformUnit tu; -+ -+ uint8_t ctb_left_flag; -+ uint8_t ctb_up_flag; -+@@ -801,7 +810,6 @@ typedef struct HEVCLocalContext { -+ int ct_depth; -+ CodingUnit cu; -+ PredictionUnit pu; -+- NeighbourAvailable na; -+ -+ #define BOUNDARY_LEFT_SLICE (1 << 0) -+ #define BOUNDARY_LEFT_TILE (1 << 1) -+@@ -812,12 +820,6 @@ typedef struct HEVCLocalContext { -+ int boundary_flags; -+ } HEVCLocalContext; -+ -+-#ifdef RPI_WORKER -+-typedef struct HEVCLocalContextIntra { -+- TransformUnit tu; -+- NeighbourAvailable na; -+-} HEVCLocalContextIntra; -+-#endif -+ -+ #ifdef RPI -+ -+diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c -+index 344e021..325b60e 100644 -+--- a/libavcodec/hevcpred_template.c -++++ b/libavcodec/hevcpred_template.c -+@@ -72,7 +72,7 @@ do { \ -+ else \ -+ a = PIXEL_SPLAT_X4(ptr[i + 3]) -+ #ifdef RPI_WORKER -+- HEVCLocalContextIntra *lc = &s->HEVClcIntra; -++ HEVCLocalContextIntra *lc = s->enable_rpi ? &s->HEVClcIntra : (HEVCLocalContextIntra *)s->HEVClc ; -+ #else -+ HEVCLocalContext *lc = s->HEVClc; -+ #endif -+-- -+2.7.4 -+ -+ -+From 5b3eee9be88a5326df7621de95095def969e05a8 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 4 Jun 2015 11:52:55 +0100 -+Subject: [PATCH 58/68] Draft support for tiles -+ -+--- -+ libavcodec/hevc.c | 140 +++++++++++++++++++++++------------------ -+ libavcodec/hevc.h | 21 +++++-- -+ libavcodec/hevc_filter.c | 2 +- -+ libavcodec/hevcpred_template.c | 2 +- -+ 4 files changed, 99 insertions(+), 66 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 73d7f74..ec67252 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -63,10 +63,10 @@ -+ -+ static void rpi_execute_dblk_cmds(HEVCContext *s); -+ static void rpi_execute_transform(HEVCContext *s); -+- static void rpi_execute_inter_qpu(HEVCContext *s); -++ static void rpi_launch_vpu_qpu(HEVCContext *s); -+ static void rpi_execute_pred_cmds(HEVCContext *s); -+ static void rpi_execute_inter_cmds(HEVCContext *s); -+- static void rpi_inter_clear(HEVCContext *s); -++ static void rpi_begin(HEVCContext *s); -+ -+ // Define INTER_PASS0 to do inter prediction in first pass -+ //#define INTER_PASS0 -+@@ -90,16 +90,18 @@ const uint8_t ff_hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12 -+ -+ #ifdef RPI_INTER_QPU -+ -++// Each luma QPU processes 2*RPI_NUM_CHUNKS 64x64 blocks -++// Each chroma QPU processes 3*RPI_NUM_CHUNKS 64x64 blocks, but requires two commands for B blocks -++// For each block of 64*64 the smallest block size is 8x4 -++// We also need an extra command for the setup information -++ -+ #define RPI_CHROMA_COMMAND_WORDS 12 -+-#define UV_COMMANDS_PER_QPU ((1 + (256*64*2)/(4*4)) * RPI_CHROMA_COMMAND_WORDS) -++#define UV_COMMANDS_PER_QPU ((1 + 3*RPI_NUM_CHUNKS*(64*64)*2/(8*4)) * RPI_CHROMA_COMMAND_WORDS) -+ // The QPU code for UV blocks only works up to a block width of 8 -+ #define RPI_CHROMA_BLOCK_WIDTH 8 -+ -+-// Split image of 2048 into parts 64 wide -+-// So some QPUs will have 3 blocks of 64 to do, and others 2 blocks for an image 2048 wide with 32 blocks across -+-// For each block of 64*64 the smallest block size is 8x4 -+ #define RPI_LUMA_COMMAND_WORDS 9 -+-#define Y_COMMANDS_PER_QPU ((1+3*(64*64)/(8*4)) * RPI_LUMA_COMMAND_WORDS) -++#define Y_COMMANDS_PER_QPU ((1+2*RPI_NUM_CHUNKS*(64*64)/(8*4)) * RPI_LUMA_COMMAND_WORDS) -+ -+ #define ENCODE_COEFFS(c0, c1, c2, c3) (((c0) & 0xff) | ((c1) & 0xff) << 8 | ((c2) & 0xff) << 16 | ((c3) & 0xff) << 24) -+ -+@@ -216,7 +218,7 @@ static void *worker_start(void *arg) -+ LOG_ENTER -+ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+ #ifndef LAUNCH_PASS0 -+- rpi_execute_inter_qpu(s); -++ rpi_launch_vpu_qpu(s); -+ #endif -+ #ifndef INTER_PASS0 -+ // Perform inter prediction -+@@ -322,9 +324,14 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ -+ #ifdef RPI -+ av_assert0(sps); -+- int coeffs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+- int coefs_per_row = sps->ctb_width * coeffs_in_ctb * 3; // Allow space for chroma -++ int coefs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -++ int coefs_per_luma = 64*64*24*RPI_NUM_CHUNKS; -++ int coefs_per_chroma = (coefs_per_luma * 2) >> sps->vshift[1] >> sps->hshift[1]; -++ int coefs_per_row = coefs_per_luma + coefs_per_chroma; -+ int job; -++ s->max_ctu_count = coefs_per_luma / coefs_in_ctb; -++ s->ctu_per_y_chan = s->max_ctu_count / 12; -++ s->ctu_per_uv_chan = s->max_ctu_count / 8; -+ for(job=0;jobx >> 2); -+ int y1 = y0 + (mv->y >> 2); -+- int chan = x0>>6; // 64 wide blocks per QPU -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+- uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -++ uint32_t *y = s->curr_y_mvs; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -+ int bw = nPbW-start_x; -+@@ -2209,7 +2215,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+- s->y_mvs[s->pass0_job][chan % 12] = y; -++ s->curr_y_mvs = y; -+ } else -+ #endif -+ { -+@@ -2233,12 +2239,10 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ -+ int x1_c = x0_c + (mv->x >> (2 + hshift)); -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+- //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+- int chan = x0>>8; -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+- uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -++ uint32_t *u = s->curr_u_mvs; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2262,7 +2266,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[s->pass0_job][chan & 7] = u; -++ s->curr_u_mvs = u; -+ return; -+ } -+ #endif -+@@ -2289,10 +2293,9 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int my2_mx2_my_mx = (my_mx << 16) + my_mx; -+ int x1 = x0 + (mv->x >> 2); -+ int y1 = y0 + (mv->y >> 2); -+- int chan = x0>>6; // 64 wide blocks per QPU -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+- uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -++ uint32_t *y = s->curr_y_mvs; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=16) { -+ int bw = nPbW-start_x; -+@@ -2312,7 +2315,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+- s->y_mvs[s->pass0_job][chan % 12] = y; -++ s->curr_y_mvs = y; -+ } else -+ #endif -+ -+@@ -2337,12 +2340,10 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ -+ int x1_c = x0_c + (mv->x >> (2 + hshift)); -+ int y1_c = y0_c + (mv->y >> (2 + hshift)); -+- //int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+- int chan = x0>>8; -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+ (s->sh.slice_type == B_SLICE && s->ps.pps->weighted_bipred_flag); -+ -+- uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -++ uint32_t *u = s->curr_u_mvs; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2367,7 +2368,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[s->pass0_job][chan & 7] = u; -++ s->curr_u_mvs = u; -+ return; -+ } -+ #endif -+@@ -2400,8 +2401,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int y1 = y0 + (mv->y >> 2); -+ int x2 = x0 + (mv2->x >> 2); -+ int y2 = y0 + (mv2->y >> 2); -+- int chan = x0>>6; // 64 wide blocks per QPU -+- uint32_t *y = s->y_mvs[s->pass0_job][chan % 12]; -++ uint32_t *y = s->curr_y_mvs; -+ for(int start_y=0;start_y < nPbH;start_y+=16) { // Potentially we could change the assembly code to support taller sizes in one go -+ for(int start_x=0;start_x < nPbW;start_x+=8) { // B blocks work 8 at a time -+ int bw = nPbW-start_x; -+@@ -2417,7 +2417,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter_b; -+ } -+ } -+- s->y_mvs[s->pass0_job][chan % 12] = y; -++ s->curr_y_mvs = y; -+ } else -+ #endif -+ { -+@@ -2448,9 +2448,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int x2_c = x0_c + (mv2->x >> (2 + hshift)); -+ int y2_c = y0_c + (mv2->y >> (2 + hshift)); -+ -+- int chan = x0>>8; // Allocate commands for the first 256 luma pixels across to the first QPU. This is optimised for images around 1920 width -+ -+- uint32_t *u = s->u_mvs[s->pass0_job][chan & 7]; -++ uint32_t *u = s->curr_u_mvs; -+ for(int start_y=0;start_y < nPbH_c;start_y+=16) { -+ for(int start_x=0;start_x < nPbW_c;start_x+=RPI_CHROMA_BLOCK_WIDTH) { -+ int bw = nPbW_c-start_x; -+@@ -2479,7 +2478,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+- s->u_mvs[s->pass0_job][chan & 7] = u; -++ s->curr_u_mvs = u; -+ return; -+ } -+ #endif -+@@ -3114,12 +3113,8 @@ static void rpi_execute_inter_cmds(HEVCContext *s) -+ -+ static void rpi_do_all_passes(HEVCContext *s) -+ { -+-#ifdef RPI_INTER_QPU -+- // Kick off inter prediction on QPUs -+- rpi_execute_inter_qpu(s); -+-#else -+- rpi_execute_transform(s); -+-#endif -++ // Kick off QPUs and VPUs -++ rpi_launch_vpu_qpu(s); -+ // Perform luma inter prediction -+ rpi_execute_inter_cmds(s); -+ // Wait for transform completion -+@@ -3128,18 +3123,18 @@ static void rpi_do_all_passes(HEVCContext *s) -+ rpi_execute_pred_cmds(s); -+ // Perform deblocking for CTBs in this row -+ rpi_execute_dblk_cmds(s); -+-#ifdef RPI_INTER_QPU -+- rpi_inter_clear(s); -+-#endif -++ // Prepare next batch -++ rpi_begin(s); -+ } -+ -+ #endif -+ -+-#ifdef RPI_INTER_QPU -+-static void rpi_inter_clear(HEVCContext *s) -++#ifdef RPI -++static void rpi_begin(HEVCContext *s) -+ { -+ int job = s->pass0_job; -+ int i; -++#ifdef RPI_INTER_QPU -+ int pic_width = s->ps.sps->width >> s->ps.sps->hshift[1]; -+ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[1]; -+ int weight_flag = (s->sh.slice_type == P_SLICE && s->ps.pps->weighted_pred_flag) || -+@@ -3165,6 +3160,8 @@ static void rpi_inter_clear(HEVCContext *s) -+ } -+ *s->u_mvs[job][i]++ = i; // Select section of VPM (avoid collisions with 3d unit) -+ } -++ s->curr_u_mvs = s->u_mvs[job][0]; -++#endif -+ -+ #ifdef RPI_LUMA_QPU -+ for(i=0;i<12;i++) { -+@@ -3187,8 +3184,11 @@ static void rpi_inter_clear(HEVCContext *s) -+ } -+ *s->y_mvs[job][i]++ = 0; // Next kernel -+ } -++ s->curr_y_mvs = s->y_mvs[job][0]; -+ #endif -++ s->ctu_count = 0; -+ } -++#endif -+ -+ #ifdef RPI_SIMULATE_QPUS -+ -+@@ -3459,8 +3459,9 @@ static void rpi_simulate_inter_qpu(HEVCContext *s) -+ -+ #endif -+ -++#ifdef RPI_INTER_QPU -+ -+-static void rpi_execute_inter_qpu(HEVCContext *s) -++static void rpi_launch_vpu_qpu(HEVCContext *s) -+ { -+ int k; -+ #ifdef LAUNCH_PASS0 -+@@ -3558,6 +3559,15 @@ static void rpi_execute_inter_qpu(HEVCContext *s) -+ -+ -+ } -++#else -++ -++#ifdef RPI -++static void rpi_launch_vpu_qpu(HEVCContext *s) -++{ -++ rpi_execute_transform(s); -++} -++#endif -++ -+ #endif -+ -+ #ifdef RPI -+@@ -3617,29 +3627,20 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI -+ #ifdef RPI_INTER_QPU -+ s->enable_rpi = s->ps.sps->bit_depth == 8 -+- && s->ps.sps->width <= RPI_MAX_WIDTH -+ && !s->ps.pps->cross_component_prediction_enabled_flag -+- && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1 -+ && !(s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE); -+ #else -+ s->enable_rpi = s->ps.sps->bit_depth == 8 -+- && s->ps.sps->width <= RPI_MAX_WIDTH -+- && !s->ps.pps->cross_component_prediction_enabled_flag -+- && s->ps.pps->num_tile_rows <= 1 && s->ps.pps->num_tile_columns <= 1; -++ && !s->ps.pps->cross_component_prediction_enabled_flag; -+ #endif -+ -+ if (!s->enable_rpi) { -+ if (s->ps.pps->cross_component_prediction_enabled_flag) -+ printf("Cross component\n"); -+- if (s->ps.pps->num_tile_rows > 1 || s->ps.pps->num_tile_columns > 1) -+- printf("Tiles\n"); -+- if (s->ps.pps->weighted_pred_flag && s->sh.slice_type == P_SLICE) -+- printf("Weighted P slice\n"); -+ if (s->ps.pps->weighted_bipred_flag && s->sh.slice_type == B_SLICE) -+ printf("Weighted B slice\n"); -+ } -+ #endif -+- -+ //printf("L0=%d L1=%d\n",s->sh.nb_refs[L1],s->sh.nb_refs[L1]); -+ -+ if (!ctb_addr_ts && s->sh.dependent_slice_segment_flag) { -+@@ -3660,8 +3661,8 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->pass1_job = 0; -+ s->pass2_job = 0; -+ #endif -+-#ifdef RPI_INTER_QPU -+- rpi_inter_clear(s); -++#ifdef RPI -++ rpi_begin(s); -+ #endif -+ -+ while (more_data && ctb_addr_ts < s->ps.sps->ctb_size) { -+@@ -3679,13 +3680,34 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->deblock[ctb_addr_rs].tc_offset = s->sh.tc_offset; -+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; -+ -++#ifdef RPI_INTER_QPU -++ s->curr_u_mvs = s->u_mvs[s->pass0_job][s->ctu_count / s->ctu_per_uv_chan]; -++#endif -++#ifdef RPI_LUMA_QPU -++ s->curr_y_mvs = s->y_mvs[s->pass0_job][s->ctu_count / s->ctu_per_y_chan]; -++#endif -++ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ -++#ifdef RPI_INTER_QPU -++ s->u_mvs[s->pass0_job][s->ctu_count / s->ctu_per_uv_chan] = s->curr_u_mvs; -++#endif -++#ifdef RPI_LUMA_QPU -++ s->y_mvs[s->pass0_job][s->ctu_count / s->ctu_per_y_chan] = s->curr_y_mvs; -++#endif -++ -+ #ifdef RPI -+ if (s->enable_rpi) { -++ //av_assert0(s->num_dblk_cmds[s->pass0_job]>=0); -++ //av_assert0(s->num_dblk_cmds[s->pass0_job]pass0_jobpass0_job>=0); -+ s->dblk_cmds[s->pass0_job][s->num_dblk_cmds[s->pass0_job]][0] = x_ctb; -+ s->dblk_cmds[s->pass0_job][s->num_dblk_cmds[s->pass0_job]++][1] = y_ctb; -+- if ( (((y_ctb + ctb_size)&63) == 0) && x_ctb + ctb_size >= s->ps.sps->width) { -++ s->ctu_count++; -++ //printf("%d %d/%d job=%d\n",s->ctu_count,s->num_dblk_cmds[s->pass0_job],RPI_MAX_DEBLOCK_CMDS,s->pass0_job); -++ -++ if ( s->ctu_count >= s->max_ctu_count ) { -+ #ifdef RPI_WORKER -+ if (s->used_for_ref) { -+ // Split work load onto separate threads so we make as rapid progress as possible with this frame -+@@ -3693,7 +3715,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ rpi_execute_inter_cmds(s); -+ #endif -+ #ifdef LAUNCH_PASS0 -+- rpi_execute_inter_qpu(s); -++ rpi_launch_vpu_qpu(s); -+ #endif -+ // Pass on this job to worker thread -+ worker_submit_job(s); -+@@ -3701,9 +3723,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ worker_pass0_ready(s); -+ -+ // Prepare the next batch of commands -+-#ifdef RPI_INTER_QPU -+- rpi_inter_clear(s); -+-#endif -++ rpi_begin(s); -+ } else { -+ // Non-ref frame so do it all on this thread -+ rpi_do_all_passes(s); -+@@ -3744,7 +3764,7 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #endif -+ -+ // Finish off any half-completed rows -+- if (s->enable_rpi && s->num_dblk_cmds[s->pass0_job]) { -++ if (s->enable_rpi && s->ctu_count) { -+ rpi_do_all_passes(s); -+ } -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 3cb34bd..a141316 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -823,8 +823,15 @@ typedef struct HEVCLocalContext { -+ -+ #ifdef RPI -+ -++// The processing is done in chunks -++// Each chunk corresponds to 24 64x64 luma blocks (24 so it is divisible by 8 for chroma and 12 for luma) -++// This is a distance of 1536 pixels across the screen -++// Increasing RPI_NUM_CHUNKS will reduce time spent activating QPUs and cache flushing, -++// but allocate more memory and increase the latency before data in the next frame can be processed -++#define RPI_NUM_CHUNKS 1 -++ -+ // RPI_MAX_WIDTH is maximum width in pixels supported by the accelerated code -+-#define RPI_MAX_WIDTH 2048 -++#define RPI_MAX_WIDTH (RPI_NUM_CHUNKS*64*24) -+ -+ // Worst case is for 4:4:4 4x4 blocks with 64 high coding tree blocks, so 16 MV cmds per 4 pixels across for each colour plane, * 2 for bi -+ #define RPI_MAX_MV_CMDS (2*16*3*(RPI_MAX_WIDTH/4)) -+@@ -888,9 +895,6 @@ typedef struct HEVCPredCmd { -+ #endif -+ -+ typedef struct HEVCContext { -+-#ifdef RPI -+- int dblk_cmds[RPI_MAX_JOBS][RPI_MAX_DEBLOCK_CMDS][2]; -+-#endif -+ const AVClass *c; // needed by private avoptions -+ AVCodecContext *avctx; -+ -+@@ -928,6 +932,10 @@ typedef struct HEVCContext { -+ int pass0_job; // Pass0 does coefficient decode -+ int pass1_job; // Pass1 does pixel processing -+ int pass2_job; // Pass2 does reconstruction and deblocking -++ int ctu_count; // Number of CTUs done in pass0 so far -++ int max_ctu_count; // Number of CTUs when we trigger a round of processing -++ int ctu_per_y_chan; // Number of CTUs per luma QPU -++ int ctu_per_uv_chan; // Number of CTUs per chroma QPU -+ #ifdef RPI_INTER_QPU -+ GPU_MEM_PTR_T unif_mvs_ptr[RPI_MAX_JOBS]; -+ uint32_t *unif_mvs[RPI_MAX_JOBS]; // Base of memory for motion vector commands -+@@ -936,6 +944,7 @@ typedef struct HEVCContext { -+ uint32_t *mvs_base[RPI_MAX_JOBS][8]; -+ // these pointers are to the next free space -+ uint32_t *u_mvs[RPI_MAX_JOBS][8]; -++ uint32_t *curr_u_mvs; // Current uniform stream to use for chroma -+ // Function pointers -+ uint32_t mc_filter_uv; -+ uint32_t mc_filter_uv_b0; -+@@ -946,6 +955,7 @@ typedef struct HEVCContext { -+ uint32_t *y_unif_mvs[RPI_MAX_JOBS]; // Base of memory for motion vector commands -+ uint32_t *y_mvs_base[RPI_MAX_JOBS][12]; -+ uint32_t *y_mvs[RPI_MAX_JOBS][12]; -++ uint32_t *curr_y_mvs; // Current uniform stream for luma -+ // Function pointers -+ uint32_t mc_filter; -+ uint32_t mc_filter_b; -+@@ -1084,6 +1094,9 @@ typedef struct HEVCContext { -+ uint32_t max_mastering_luminance; -+ uint32_t min_mastering_luminance; -+ -++#ifdef RPI -++ int dblk_cmds[RPI_MAX_JOBS][RPI_MAX_DEBLOCK_CMDS][2]; -++#endif -+ } HEVCContext; -+ -+ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx, -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index b286bbf..1f04790 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -891,7 +891,7 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -+ if (curr_uv < 0) curr_uv = 0; -+- if (n_uv<=curr_uv) { assert(0); return; } // Should not happen -++ if (n_uv<=curr_uv) { return; } -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[1]); -+diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c -+index 325b60e..28d2653 100644 -+--- a/libavcodec/hevcpred_template.c -++++ b/libavcodec/hevcpred_template.c -+@@ -72,7 +72,7 @@ do { \ -+ else \ -+ a = PIXEL_SPLAT_X4(ptr[i + 3]) -+ #ifdef RPI_WORKER -+- HEVCLocalContextIntra *lc = s->enable_rpi ? &s->HEVClcIntra : (HEVCLocalContextIntra *)s->HEVClc ; -++ HEVCLocalContextIntra *lc = (s->enable_rpi) ? &s->HEVClcIntra : (HEVCLocalContextIntra *)s->HEVClc ; -+ #else -+ HEVCLocalContext *lc = s->HEVClc; -+ #endif -+-- -+2.7.4 -+ -+ -+From 1674a80d147e5342ef6ea9a4fb4ddfc640c15a05 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 4 Jun 2015 15:48:10 +0100 -+Subject: [PATCH 59/68] Move deblocker into second pass -+ -+--- -+ libavcodec/hevc.c | 79 +++++++++++++++++++++++++++++++++++++++++++++---------- -+ 1 file changed, 65 insertions(+), 14 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index ec67252..6cecbdd 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -67,6 +67,8 @@ -+ static void rpi_execute_pred_cmds(HEVCContext *s); -+ static void rpi_execute_inter_cmds(HEVCContext *s); -+ static void rpi_begin(HEVCContext *s); -++ static void flush_frame(HEVCContext *s,AVFrame *frame); -++ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -+ -+ // Define INTER_PASS0 to do inter prediction in first pass -+ //#define INTER_PASS0 -+@@ -227,6 +229,11 @@ static void *worker_start(void *arg) -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -+ -++ // Perform intra prediction and residual reconstruction -++ rpi_execute_pred_cmds(s); -++ // Perform deblocking for CTBs in this row -++ rpi_execute_dblk_cmds(s); -++ -+ worker_complete_middle_job(s); -+ LOG_EXIT -+ } -+@@ -248,10 +255,6 @@ static void *worker_deblock_start(void *arg) -+ break; -+ } -+ LOG_ENTER -+- // Perform intra prediction and residual reconstruction -+- rpi_execute_pred_cmds(s); -+- // Perform deblocking for CTBs in this row -+- rpi_execute_dblk_cmds(s); -+ -+ worker_complete_job(s); -+ LOG_EXIT -+@@ -2983,7 +2986,7 @@ static void hls_decode_neighbour(HEVCContext *s, int x_ctb, int y_ctb, -+ static void rpi_execute_dblk_cmds(HEVCContext *s) -+ { -+ int n; -+- int job = s->pass2_job; -++ int job = s->pass1_job; -+ int ctb_size = 1 << s->ps.sps->log2_ctb_size; -+ int (*p)[2] = s->dblk_cmds[job]; -+ for(n = s->num_dblk_cmds[job]; n>0 ;n--,p++) { -+@@ -3021,7 +3024,7 @@ static void rpi_execute_transform(HEVCContext *s) -+ static void rpi_execute_pred_cmds(HEVCContext *s) -+ { -+ int i; -+- int job = s->pass2_job; -++ int job = s->pass1_job; -+ HEVCPredCmd *cmd = s->univ_pred_cmds[job]; -+ #ifdef RPI_WORKER -+ HEVCLocalContextIntra *lc = &s->HEVClcIntra; -+@@ -3506,11 +3509,10 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ -+ #ifdef RPI_MULTI_MAILBOX -+ #ifdef RPI_CACHE_UNIF_MVS -+- gpu_cache_flush3(&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job]); -++ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job]); -+ #else -+- gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -++ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],NULL,NULL); -+ #endif -+- -+ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+@@ -3613,6 +3615,60 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ #endif -+ } -+ -++static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2) -++{ -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ int n = s->ps.sps->height; -++ int curr_y = 0; -++ int curr_uv = 0; -++ int n_uv = n >> s->ps.sps->vshift[1]; -++ int sz,base; -++ sz = s->frame->linesize[1] * (n_uv-curr_uv); -++ base = s->frame->linesize[1] * curr_uv; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = p->arm + base; -++ iocache.s[0].size = sz; -++ p = av_buffer_pool_opaque(frame->buf[2]); -++ iocache.s[1].handle = p->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = p->arm + base; -++ iocache.s[1].size = sz; -++ p = av_buffer_pool_opaque(frame->buf[0]); -++ sz = s->frame->linesize[0] * (n-curr_y); -++ base = s->frame->linesize[0] * curr_y; -++ iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = p->arm + base; -++ iocache.s[2].size = sz; -++ -++ iocache.s[3].handle = p0->vcsm_handle; -++ iocache.s[3].cmd = 3; // clean+invalidate -++ iocache.s[3].addr = (int) p0->arm; -++ iocache.s[3].size = p0->numbytes; -++ if (p1) { -++ iocache.s[4].handle = p1->vcsm_handle; -++ iocache.s[4].cmd = 3; // clean+invalidate -++ iocache.s[4].addr = (int) p1->arm; -++ iocache.s[4].size = p1->numbytes; -++ } -++ if (p2) { -++ iocache.s[5].handle = p2->vcsm_handle; -++ iocache.s[5].cmd = 3; // clean+invalidate -++ iocache.s[5].addr = (int) p2->arm; -++ iocache.s[5].size = p2->numbytes; -++ } -++ vcsm_clean_invalid( &iocache ); -++#else -++ flush_buffer(frame->buf[0]); -++ flush_buffer(frame->buf[1]); -++ flush_buffer(frame->buf[2]); -++ gpu_cache_flush3(p0, p1, p2); -++#endif -++} -++ -+ #endif -+ -+ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+@@ -4127,11 +4183,6 @@ static int hevc_frame_start(HEVCContext *s) -+ if (!s->avctx->hwaccel) -+ ff_thread_finish_setup(s->avctx); -+ -+-#ifdef RPI_INTER_QPU -+- // Invalidate the output data buffer so it is ready for the QPUs to write into it. -+- flush_frame(s,s->frame); -+-#endif -+- -+ return 0; -+ -+ fail: -+-- -+2.7.4 -+ -+ -+From a453fe438c4ab311d6476955d0a40a5d2ed8a1c6 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Thu, 4 Jun 2015 16:10:23 +0100 -+Subject: [PATCH 60/68] Change order of ctu accesses to improve qpu performance -+ -+--- -+ libavcodec/hevc.c | 8 ++++---- -+ 1 file changed, 4 insertions(+), 4 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 6cecbdd..ec17e64 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -3737,19 +3737,19 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; -+ -+ #ifdef RPI_INTER_QPU -+- s->curr_u_mvs = s->u_mvs[s->pass0_job][s->ctu_count / s->ctu_per_uv_chan]; -++ s->curr_u_mvs = s->u_mvs[s->pass0_job][s->ctu_count % 8]; -+ #endif -+ #ifdef RPI_LUMA_QPU -+- s->curr_y_mvs = s->y_mvs[s->pass0_job][s->ctu_count / s->ctu_per_y_chan]; -++ s->curr_y_mvs = s->y_mvs[s->pass0_job][s->ctu_count % 12]; -+ #endif -+ -+ more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->ps.sps->log2_ctb_size, 0); -+ -+ #ifdef RPI_INTER_QPU -+- s->u_mvs[s->pass0_job][s->ctu_count / s->ctu_per_uv_chan] = s->curr_u_mvs; -++ s->u_mvs[s->pass0_job][s->ctu_count % 8]= s->curr_u_mvs; -+ #endif -+ #ifdef RPI_LUMA_QPU -+- s->y_mvs[s->pass0_job][s->ctu_count / s->ctu_per_y_chan] = s->curr_y_mvs; -++ s->y_mvs[s->pass0_job][s->ctu_count % 12] = s->curr_y_mvs; -+ #endif -+ -+ #ifdef RPI -+-- -+2.7.4 -+ -+ -+From 504de0435e8f660c1b7b2d6ec053dc922a2d2896 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 8 Jun 2015 09:36:59 +0100 -+Subject: [PATCH 61/68] Removed deblocker thread -+ -+--- -+ libavcodec/hevc.c | 77 +++---------------------------------------------------- -+ libavcodec/hevc.h | 4 --- -+ 2 files changed, 4 insertions(+), 77 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index ec17e64..1868532 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -70,11 +70,6 @@ -+ static void flush_frame(HEVCContext *s,AVFrame *frame); -+ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -+ -+- // Define INTER_PASS0 to do inter prediction in first pass -+- //#define INTER_PASS0 -+- // Define LAUNCH_PASS0 to launch QPU/VPU from pass0 -+- //#define LAUNCH_PASS0 -+- -+ #endif -+ -+ // #define DISABLE_MC -+@@ -147,24 +142,12 @@ static void worker_submit_job(HEVCContext *s) -+ } -+ -+ // Call this to say we have completed pass1 -+-static void worker_complete_middle_job(HEVCContext *s) -+-{ -+- LOG_ENTER -+- pthread_mutex_lock(&s->worker_mutex); -+- s->worker_middle++; -+- s->pass1_job = (s->pass1_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+- pthread_cond_broadcast(&s->worker_cond_middle); // Let people know that the middle has moved -+- pthread_mutex_unlock(&s->worker_mutex); -+- LOG_EXIT -+-} -+- -+-// Call this to say we have completed pass2 -+ static void worker_complete_job(HEVCContext *s) -+ { -+ LOG_ENTER -+ pthread_mutex_lock(&s->worker_mutex); -+ s->worker_head++; -+- s->pass2_job = (s->pass2_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -++ s->pass1_job = (s->pass1_job + 1) % RPI_MAX_JOBS; // Move onto the next slot -+ pthread_cond_broadcast(&s->worker_cond_head); // Let people know that the head has moved -+ pthread_mutex_unlock(&s->worker_mutex); -+ LOG_EXIT -+@@ -208,7 +191,7 @@ static void *worker_start(void *arg) -+ while(1) { -+ pthread_mutex_lock(&s->worker_mutex); -+ -+- while( !s->kill_worker && s->worker_tail - s->worker_middle <= 0) -++ while( !s->kill_worker && s->worker_tail - s->worker_head <= 0) -+ { -+ pthread_cond_wait(&s->worker_cond_tail, &s->worker_mutex); -+ } -+@@ -219,13 +202,9 @@ static void *worker_start(void *arg) -+ } -+ LOG_ENTER -+ // printf("%d %d %d : %d %d %d %d\n",s->poc, x_ctb, y_ctb, s->num_pred_cmds,s->num_mv_cmds,s->num_coeffs[2] >> 8,s->num_coeffs[3] >> 10); -+-#ifndef LAUNCH_PASS0 -+ rpi_launch_vpu_qpu(s); -+-#endif -+-#ifndef INTER_PASS0 -+ // Perform inter prediction -+ rpi_execute_inter_cmds(s); -+-#endif -+ // Wait for transform completion -+ vpu_wait(s->vpu_id); -+ -+@@ -234,28 +213,6 @@ static void *worker_start(void *arg) -+ // Perform deblocking for CTBs in this row -+ rpi_execute_dblk_cmds(s); -+ -+- worker_complete_middle_job(s); -+- LOG_EXIT -+- } -+- return NULL; -+-} -+- -+-static void *worker_deblock_start(void *arg) -+-{ -+- HEVCContext *s = (HEVCContext *)arg; -+- while(1) { -+- pthread_mutex_lock(&s->worker_mutex); -+- while( !s->kill_worker && s->worker_middle - s->worker_head <= 0) -+- { -+- pthread_cond_wait(&s->worker_cond_middle, &s->worker_mutex); -+- } -+- pthread_mutex_unlock(&s->worker_mutex); -+- -+- if (s->kill_worker) { -+- break; -+- } -+- LOG_ENTER -+- -+ worker_complete_job(s); -+ LOG_EXIT -+ } -+@@ -2998,11 +2955,7 @@ static void rpi_execute_dblk_cmds(HEVCContext *s) -+ static void rpi_execute_transform(HEVCContext *s) -+ { -+ int i=2; -+-#ifdef LAUNCH_PASS0 -+- int job = s->pass0_job; -+-#else -+ int job = s->pass1_job; -+-#endif -+ //int j; -+ //int16_t *coeffs = s->coeffs_buf_arm[i]; -+ //for(j=s->num_coeffs[i]; j > 0; j-= 16*16, coeffs+=16*16) { -+@@ -3057,11 +3010,7 @@ static void rpi_execute_pred_cmds(HEVCContext *s) -+ -+ static void rpi_execute_inter_cmds(HEVCContext *s) -+ { -+-#ifdef INTER_PASS0 -+- int job = s->pass0_job; -+-#else -+ int job = s->pass1_job; -+-#endif -+ HEVCMvCmd *cmd = s->unif_mv_cmds[job]; -+ int n,cidx; -+ AVFrame myref; -+@@ -3467,11 +3416,7 @@ static void rpi_simulate_inter_qpu(HEVCContext *s) -+ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ { -+ int k; -+-#ifdef LAUNCH_PASS0 -+- int job = s->pass0_job; -+-#else -+ int job = s->pass1_job; -+-#endif -+ int i; -+ uint32_t *unif_vc = (uint32_t *)s->unif_mvs_ptr[job].vc; -+ #ifdef RPI_LUMA_QPU -+@@ -3574,10 +3519,12 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ -+ #ifdef RPI -+ -++#ifndef RPI_FAST_CACHEFLUSH -+ static void flush_buffer(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+ gpu_cache_flush(p); -+ } -++#endif -+ -+ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ { -+@@ -3715,7 +3662,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI_WORKER -+ s->pass0_job = 0; -+ s->pass1_job = 0; -+- s->pass2_job = 0; -+ #endif -+ #ifdef RPI -+ rpi_begin(s); -+@@ -3767,12 +3713,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ #ifdef RPI_WORKER -+ if (s->used_for_ref) { -+ // Split work load onto separate threads so we make as rapid progress as possible with this frame -+- #ifdef INTER_PASS0 -+- rpi_execute_inter_cmds(s); -+- #endif -+- #ifdef LAUNCH_PASS0 -+- rpi_launch_vpu_qpu(s); -+- #endif -+ // Pass on this job to worker thread -+ worker_submit_job(s); -+ // Make sure we have space to prepare the next job -+@@ -3814,8 +3754,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) -+ // Wait for the worker to finish all its jobs -+ if (s->enable_rpi) { -+ worker_wait(s); -+- av_assert0(s->pass0_job==s->pass1_job); -+- av_assert0(s->pass1_job==s->pass2_job); -+ } -+ #endif -+ -+@@ -4565,16 +4503,13 @@ static av_cold void hevc_init_worker(HEVCContext *s) -+ { -+ int err; -+ pthread_cond_init(&s->worker_cond_head, NULL); -+- pthread_cond_init(&s->worker_cond_middle, NULL); -+ pthread_cond_init(&s->worker_cond_tail, NULL); -+ pthread_mutex_init(&s->worker_mutex, NULL); -+ -+ s->worker_tail=0; -+- s->worker_middle=0; -+ s->worker_head=0; -+ s->kill_worker=0; -+ err = pthread_create(&s->worker_thread, NULL, worker_start, s); -+- err = pthread_create(&s->worker_deblock_thread, NULL, worker_deblock_start, s); -+ if (err) { -+ printf("Failed to create worker thread\n"); -+ exit(-1); -+@@ -4586,17 +4521,13 @@ static av_cold void hevc_exit_worker(HEVCContext *s) -+ void *res; -+ s->kill_worker=1; -+ pthread_cond_broadcast(&s->worker_cond_tail); -+- pthread_cond_broadcast(&s->worker_cond_middle); -+ pthread_join(s->worker_thread, &res); -+- pthread_join(s->worker_deblock_thread, &res); -+ -+ pthread_cond_destroy(&s->worker_cond_head); -+- pthread_cond_destroy(&s->worker_cond_middle); -+ pthread_cond_destroy(&s->worker_cond_tail); -+ pthread_mutex_destroy(&s->worker_mutex); -+ -+ s->worker_tail=0; -+- s->worker_middle=0; -+ s->worker_head=0; -+ s->kill_worker=0; -+ } -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index a141316..ef5bfb1 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -931,7 +931,6 @@ typedef struct HEVCContext { -+ //GPU_MEM_PTR_T dummy; -+ int pass0_job; // Pass0 does coefficient decode -+ int pass1_job; // Pass1 does pixel processing -+- int pass2_job; // Pass2 does reconstruction and deblocking -+ int ctu_count; // Number of CTUs done in pass0 so far -+ int max_ctu_count; // Number of CTUs when we trigger a round of processing -+ int ctu_per_y_chan; // Number of CTUs per luma QPU -+@@ -963,15 +962,12 @@ typedef struct HEVCContext { -+ -+ #ifdef RPI_WORKER -+ pthread_t worker_thread; -+- pthread_t worker_deblock_thread; -+ pthread_cond_t worker_cond_head; -+ pthread_cond_t worker_cond_tail; -+- pthread_cond_t worker_cond_middle; -+ pthread_mutex_t worker_mutex; -+ -+ int worker_tail; // Contains the number of posted jobs -+ int worker_head; // Contains the number of completed jobs -+- int worker_middle; // Contains the number of completed jobs -+ int kill_worker; // set to 1 to terminate the worker -+ #endif -+ -+-- -+2.7.4 -+ -+ -+From 74892301cdb0829de959b798debac6ffe1c71603 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 8 Jun 2015 11:04:43 +0100 -+Subject: [PATCH 62/68] Reduced amount of output frame that is invalidated -+ -+--- -+ libavcodec/hevc.c | 45 +++++++++++++++++++++++++++++---------------- -+ 1 file changed, 29 insertions(+), 16 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 1868532..cbb4f46 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -68,7 +68,7 @@ -+ static void rpi_execute_inter_cmds(HEVCContext *s); -+ static void rpi_begin(HEVCContext *s); -+ static void flush_frame(HEVCContext *s,AVFrame *frame); -+- static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -++ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2, int job); -+ -+ #endif -+ -+@@ -3454,9 +3454,9 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ -+ #ifdef RPI_MULTI_MAILBOX -+ #ifdef RPI_CACHE_UNIF_MVS -+- flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job]); -++ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],&s->y_unif_mvs_ptr[job], &s->unif_mvs_ptr[job], job); -+ #else -+- flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],NULL,NULL); -++ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],NULL,NULL, job); -+ #endif -+ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+@@ -3530,6 +3530,7 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -+ int n = s->ps.sps->height; -+ int curr_y = 0; -+ int curr_uv = 0; -+@@ -3537,22 +3538,21 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ int sz,base; -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -+ iocache.s[0].handle = p->vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = p->arm + base; -++ iocache.s[0].addr = (int)(p->arm) + base; -+ iocache.s[0].size = sz; -+ p = av_buffer_pool_opaque(frame->buf[2]); -+ iocache.s[1].handle = p->vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = p->arm + base; -++ iocache.s[1].addr = (int)(p->arm) + base; -+ iocache.s[1].size = sz; -+ p = av_buffer_pool_opaque(frame->buf[0]); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+ iocache.s[2].handle = p->vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = p->arm + base; -++ iocache.s[2].addr = (int)(p->arm) + base; -+ iocache.s[2].size = sz; -+ vcsm_clean_invalid( &iocache ); -+ #else -+@@ -3562,33 +3562,46 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ #endif -+ } -+ -+-static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2) -++static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2, int job) -+ { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+- int n = s->ps.sps->height; -+- int curr_y = 0; -+- int curr_uv = 0; -+- int n_uv = n >> s->ps.sps->vshift[1]; -++ int n; -++ int curr_y; -++ int curr_uv; -++ int n_uv; -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -+ int sz,base; -++ int (*d)[2] = s->dblk_cmds[job]; -++ int low=(*d)[1]; -++ int high=(*d)[1]; -++ for(n = s->num_dblk_cmds[job]; n>0 ;n--,d++) { -++ int y = (*d)[1]; -++ low=FFMIN(low,y); -++ high=FFMAX(high,y); -++ } -++ curr_y = low; -++ n = high+(1 << s->ps.sps->log2_ctb_size); -++ curr_uv = curr_y >> s->ps.sps->vshift[1]; -++ n_uv = n >> s->ps.sps->vshift[1]; -++ -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -+ iocache.s[0].handle = p->vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = p->arm + base; -++ iocache.s[0].addr = (int)(p->arm) + base; -+ iocache.s[0].size = sz; -+ p = av_buffer_pool_opaque(frame->buf[2]); -+ iocache.s[1].handle = p->vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = p->arm + base; -++ iocache.s[1].addr = (int)(p->arm) + base; -+ iocache.s[1].size = sz; -+ p = av_buffer_pool_opaque(frame->buf[0]); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+ iocache.s[2].handle = p->vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = p->arm + base; -++ iocache.s[2].addr = (int)(p->arm) + base; -+ iocache.s[2].size = sz; -+ -+ iocache.s[3].handle = p0->vcsm_handle; -+-- -+2.7.4 -+ -+ -+From 090b6be5b501bd3c547700926e540397f0b39e69 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Mon, 8 Jun 2015 11:55:29 +0100 -+Subject: [PATCH 63/68] Packed 16x16 and 32x32 into the same buffer -+ -+--- -+ libavcodec/hevc.c | 24 +++++++++++++++--------- -+ libavcodec/hevc_cabac.c | 9 ++++++++- -+ libavcodec/rpi_qpu.c | 2 +- -+ 3 files changed, 24 insertions(+), 11 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index cbb4f46..a596534 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -299,12 +299,12 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ s->coeffs_buf_arm[job][0] = (int16_t*) s->coeffs_buf_default[job].arm; -+ if (!s->coeffs_buf_arm[job][0]) -+ goto fail; -+- gpu_malloc_cached(sizeof(int16_t) * coefs_per_row * 2, &s->coeffs_buf_accelerated[job]); -++ gpu_malloc_cached(sizeof(int16_t) * (coefs_per_row + 32*32), &s->coeffs_buf_accelerated[job]); // We prefetch past the end so provide an extra blocks worth of data -+ s->coeffs_buf_arm[job][2] = (int16_t*) s->coeffs_buf_accelerated[job].arm; -+ s->coeffs_buf_vc[job][2] = s->coeffs_buf_accelerated[job].vc; -+ if (!s->coeffs_buf_arm[job][2]) -+ goto fail; -+- s->coeffs_buf_arm[job][3] = coefs_per_row + s->coeffs_buf_arm[job][2]; -++ s->coeffs_buf_arm[job][3] = coefs_per_row + s->coeffs_buf_arm[job][2]; // This points to just beyond the end of the buffer. Coefficients fill in backwards. -+ s->coeffs_buf_vc[job][3] = sizeof(int16_t) * coefs_per_row + s->coeffs_buf_vc[job][2]; -+ } -+ } -+@@ -2956,15 +2956,20 @@ static void rpi_execute_transform(HEVCContext *s) -+ { -+ int i=2; -+ int job = s->pass1_job; -+- //int j; -+- //int16_t *coeffs = s->coeffs_buf_arm[i]; -+- //for(j=s->num_coeffs[i]; j > 0; j-= 16*16, coeffs+=16*16) { -+- // s->hevcdsp.idct[4-2](coeffs, 16); -+- //} -++ /*int j; -++ int16_t *coeffs = s->coeffs_buf_arm[job][i]; -++ for(j=s->num_coeffs[job][i]; j > 0; j-= 16*16, coeffs+=16*16) { -++ s->hevcdsp.idct[4-2](coeffs, 16); -++ } -++ i=3; -++ coeffs = s->coeffs_buf_arm[job][i] - s->num_coeffs[job][i]; -++ for(j=s->num_coeffs[job][i]; j > 0; j-= 32*32, coeffs+=32*32) { -++ s->hevcdsp.idct[5-2](coeffs, 32); -++ }*/ -+ -+ gpu_cache_flush(&s->coeffs_buf_accelerated[job]); -+ s->vpu_id = vpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], -+- s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], -++ s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3] - sizeof(int16_t) * s->num_coeffs[job][3], -+ s->num_coeffs[job][3] >> 10, 0, &s->coeffs_buf_accelerated[job]); -+ //vpu_execute_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[2], s->num_coeffs[2] >> 8, s->coeffs_buf_vc[3], s->num_coeffs[3] >> 10, 0); -+ //gpu_cache_flush(&s->coeffs_buf_accelerated); -+@@ -3458,7 +3463,8 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ #else -+ flush_frame3(s, s->frame,&s->coeffs_buf_accelerated[job],NULL,NULL, job); -+ #endif -+- s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, s->coeffs_buf_vc[job][3], s->num_coeffs[job][3] >> 10, 0, -++ s->vpu_id = vpu_qpu_post_code( vpu_get_fn(), vpu_get_constants(), s->coeffs_buf_vc[job][2], s->num_coeffs[job][2] >> 8, -++ s->coeffs_buf_vc[job][3] - sizeof(int16_t) * s->num_coeffs[job][3], s->num_coeffs[job][3] >> 10, 0, -+ qpu_get_fn(QPU_MC_SETUP_UV), -+ (uint32_t)(unif_vc+(s->mvs_base[job][0 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+ (uint32_t)(unif_vc+(s->mvs_base[job][1 ] - (uint32_t*)s->unif_mvs_ptr[job].arm)), -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 6523e66..8656917 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -1051,7 +1051,14 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ if (s->enable_rpi) { -+ int n = trafo_size * trafo_size; -+ if (use_vpu) { -+- coeffs = s->coeffs_buf_arm[s->pass0_job][log2_trafo_size - 2] + s->num_coeffs[s->pass0_job][log2_trafo_size - 2]; -++ // We support size 4 and size 5. -++ // Size 4 grows from the front (Coeffs_buf_arm[2] points to start of buf) -++ // Size 5 grows from the back (Coeffs_buf_arm[3] points to end of buf) -++ // num_coeffs is indexed by log2_trafo_size-2 -++ if (log2_trafo_size == 4) -++ coeffs = s->coeffs_buf_arm[s->pass0_job][log2_trafo_size - 2] + s->num_coeffs[s->pass0_job][log2_trafo_size - 2]; -++ else -++ coeffs = s->coeffs_buf_arm[s->pass0_job][log2_trafo_size - 2] - s->num_coeffs[s->pass0_job][log2_trafo_size - 2] - n; -+ s->num_coeffs[s->pass0_job][log2_trafo_size - 2] += n; -+ } else { -+ coeffs = s->coeffs_buf_arm[s->pass0_job][0] + s->num_coeffs[s->pass0_job][0]; -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 4480f72..0121fca 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -5,7 +5,7 @@ -+ // define RPI_TIME_TOTAL_VPU to print out how much time is spent in the VPI code -+ //#define RPI_TIME_TOTAL_VPU -+ // define RPI_TIME_TOTAL_POSTED to print out how much time is spent in the multi execute QPU/VPU combined -+-//#define RPI_TIME_TOTAL_POSTED -++#define RPI_TIME_TOTAL_POSTED -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+ #define RPI_ASYNC -+ -+-- -+2.7.4 -+ -+ -+From ed359bbce56817bf9db0e54701103bd0505c353b Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Thu, 25 Jun 2015 09:02:47 +0100 -+Subject: [PATCH 64/68] Moved luma deblock to VPU -+ -+--- -+ libavcodec/hevc.c | 18 +- -+ libavcodec/hevc.h | 11 + -+ libavcodec/hevc_filter.c | 120 ++- -+ libavcodec/rpi_hevc_transform.h | 1802 ++++++++++++++++++++++++++++++++++++++- -+ libavcodec/rpi_hevc_transform.s | 426 +++++++++ -+ libavcodec/rpi_qpu.c | 12 +- -+ libavcodec/rpi_shader.c | 2 +- -+ 7 files changed, 2378 insertions(+), 13 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index a596534..4ce94a7 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -246,6 +246,12 @@ static void pic_arrays_free(HEVCContext *s) -+ } -+ } -+ #endif -++#ifdef RPI_DEBLOCK_VPU -++ if (s->y_setup_arm) { -++ gpu_free(&s->y_setup_ptr); -++ s->y_setup_arm = 0; -++ } -++#endif -+ av_freep(&s->sao); -+ av_freep(&s->deblock); -+ -+@@ -283,12 +289,12 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ int min_pu_size = sps->min_pu_width * sps->min_pu_height; -+ -+ #ifdef RPI -+- av_assert0(sps); -+ int coefs_in_ctb = (1 << sps->log2_ctb_size) * (1 << sps->log2_ctb_size); -+ int coefs_per_luma = 64*64*24*RPI_NUM_CHUNKS; -+ int coefs_per_chroma = (coefs_per_luma * 2) >> sps->vshift[1] >> sps->hshift[1]; -+ int coefs_per_row = coefs_per_luma + coefs_per_chroma; -+ int job; -++ av_assert0(sps); -+ s->max_ctu_count = coefs_per_luma / coefs_in_ctb; -+ s->ctu_per_y_chan = s->max_ctu_count / 12; -+ s->ctu_per_uv_chan = s->max_ctu_count / 8; -+@@ -309,6 +315,16 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ } -+ } -+ #endif -++#ifdef RPI_DEBLOCK_VPU -++ s->enable_rpi_deblock = !sps->sao_enabled; -++ s->setup_width = (sps->width+15) / 16; -++ s->setup_height = (sps->height+15) / 16; -++ gpu_malloc_uncached(sizeof(*s->y_setup_arm) * s->setup_width * s->setup_height, &s->y_setup_ptr); // TODO make this cached -++ s->y_setup_arm = (void*)s->y_setup_ptr.arm; -++ s->y_setup_vc = (void*)s->y_setup_ptr.vc; -++ memset(s->y_setup_arm, 0, s->y_setup_ptr.numbytes); -++ printf("Setup %d by %d by %d\n",s->setup_width,s->setup_height,sizeof(*s->y_setup_arm)); -++#endif -+ -+ s->bs_width = (width >> 2) + 1; -+ s->bs_height = (height >> 2) + 1; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index ef5bfb1..cf08489 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -57,6 +57,8 @@ -+ // Define RPI_WORKER to launch a worker thread for pixel processing tasks -+ #define RPI_WORKER -+ -++ #define RPI_DEBLOCK_VPU -++ -+ #endif -+ -+ #define MAX_DPB_SIZE 16 // A.4.1 -+@@ -971,6 +973,15 @@ typedef struct HEVCContext { -+ int kill_worker; // set to 1 to terminate the worker -+ #endif -+ -++#ifdef RPI_DEBLOCK_VPU -++ int enable_rpi_deblock; -++ GPU_MEM_PTR_T y_setup_ptr; -++ uint8_t (*y_setup_arm)[2][2][2][4]; -++ uint8_t (*y_setup_vc)[2][2][2][4]; -++ int setup_width; // Number of 16x16 blocks across the image -++ int setup_height; // Number of 16x16 blocks down the image -++#endif -++ -+ #endif -+ -+ uint8_t *cabac_state; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 1f04790..06371da 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -564,6 +564,19 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->frame->linesize[LUMA], -+ beta, tc, no_p, no_q); -+ } else -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ uint8_t (*setup)[2][2][4]; -++ int num16 = (y>>4)*s->setup_width + (x>>4); -++ int a = ((y>>3) & 1) << 1; -++ int b = (x>>3) & 1; -++ setup = s->y_setup_arm[num16]; -++ setup[0][b][0][a] = beta; -++ setup[0][b][0][a + 1] = beta; -++ setup[0][b][1][a] = tc[0]; -++ setup[0][b][1][a + 1] = tc[1]; -++ } else -++#endif -+ s->hevcdsp.hevc_v_loop_filter_luma(src, -+ s->frame->linesize[LUMA], -+ beta, tc, no_p, no_q); -+@@ -596,6 +609,19 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->frame->linesize[LUMA], -+ beta, tc, no_p, no_q); -+ } else -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ uint8_t (*setup)[2][2][4]; -++ int num16 = (y>>4)*s->setup_width + (x>>4); -++ int a = ((x>>3) & 1) << 1; -++ int b = (y>>3) & 1; -++ setup = s->y_setup_arm[num16]; -++ setup[1][b][0][a] = beta; -++ setup[1][b][0][a + 1] = beta; -++ setup[1][b][1][a] = tc[0]; -++ setup[1][b][1][a + 1] = tc[1]; -++ } else -++#endif -+ s->hevcdsp.hevc_h_loop_filter_luma(src, -+ s->frame->linesize[LUMA], -+ beta, tc, no_p, no_q); -+@@ -876,33 +902,85 @@ static void flush_buffer(AVBufferRef *bref) { -+ } -+ -+ // Return Physical address for this image -+-static int ff_hevc_buf_base(AVBufferRef *bref) { -++static uint32_t get_vc_address(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- return p->vc & 0x3fffffff; -++ return p->vc; -+ } -+ -++// ff_hevc_flush_buffer_lines -++// flushes and invalidates all pixel rows in [start,end-1] -++static void ff_hevc_flush_buffer_lines(HEVCContext *s, int start, int end, int flush_luma, int flush_chroma) -++{ -++#ifdef RPI_FAST_CACHEFLUSH -++ struct vcsm_user_clean_invalid_s iocache = {}; -++ int curr_y = start; -++ int n = end; -++ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -++ int n_uv = n >> s->ps.sps->vshift[1]; -++ int sz,base; -++ GPU_MEM_PTR_T *p; -++ if (curr_uv < 0) curr_uv = 0; -++ if (n_uv<=curr_uv) { return; } -++ sz = s->frame->linesize[1] * (n_uv-curr_uv); -++ base = s->frame->linesize[1] * curr_uv; -++ if (flush_chroma) { -++ p = av_buffer_pool_opaque(s->frame->buf[1]); -++ iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].cmd = 3; // clean+invalidate -++ iocache.s[0].addr = (int)p->arm + base; -++ iocache.s[0].size = sz; -++ p = av_buffer_pool_opaque(s->frame->buf[2]); -++ iocache.s[1].handle = p->vcsm_handle; -++ iocache.s[1].cmd = 3; // clean+invalidate -++ iocache.s[1].addr = (int)p->arm + base; -++ iocache.s[1].size = sz; -++ } -++ if (flush_luma) { -++ p = av_buffer_pool_opaque(s->frame->buf[0]); -++ sz = s->frame->linesize[0] * (n-curr_y); -++ base = s->frame->linesize[0] * curr_y; -++ iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].cmd = 3; // clean+invalidate -++ iocache.s[2].addr = (int)p->arm + base; -++ iocache.s[2].size = sz; -++ } -++ vcsm_clean_invalid( &iocache ); -++#else -++ if (flush_chroma) { -++ flush_buffer(s->frame->buf[1]); -++ flush_buffer(s->frame->buf[2]); -++ } -++ if (flush_luma) { -++ flush_buffer(s->frame->buf[0]); -++ } -++#endif -++} -++ -++ -+ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ { -+ if (s->enable_rpi && s->used_for_ref) { -++ // TODO make this use ff_hevc_flush_buffer_lines -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ int curr_y = ((int *)f->progress->data)[0]; -+ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -+ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -++ GPU_MEM_PTR_T *p; -+ if (curr_uv < 0) curr_uv = 0; -+ if (n_uv<=curr_uv) { return; } -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(s->frame->buf[1]); -++ p = av_buffer_pool_opaque(s->frame->buf[1]); -+ iocache.s[0].handle = p->vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = p->arm + base; -++ iocache.s[0].addr = (int)p->arm + base; -+ iocache.s[0].size = sz; -+ p = av_buffer_pool_opaque(s->frame->buf[2]); -+ iocache.s[1].handle = p->vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = p->arm + base; -++ iocache.s[1].addr = (int)p->arm + base; -+ iocache.s[1].size = sz; -+ -+ #ifdef RPI_LUMA_QPU -+@@ -911,7 +989,7 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ base = s->frame->linesize[0] * curr_y; -+ iocache.s[2].handle = p->vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = p->arm + base; -++ iocache.s[2].addr = (int)p->arm + base; -+ iocache.s[2].size = sz; -+ #endif -+ vcsm_clean_invalid( &iocache ); -+@@ -930,11 +1008,40 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ } -+ #endif -+ -++#ifdef RPI_DEBLOCK_VPU -++/* rpi_deblock deblocks an entire row of ctbs using the VPU */ -++static void rpi_deblock(HEVCContext *s, int y, int ctb_size) -++{ -++ // Flush image, 4 lines above to bottom of ctb stripe -++ ff_hevc_flush_buffer_lines(s, FFMAX(y-4,0), y+ctb_size, 1, 0); -++ // TODO flush buffer of beta/tc setup when it becomes cached -++ // Call VPU -++ // TODO add this to a separate pipeline of VPU jobs that can be run in parallel and wait for completion -++ vpu_wait(vpu_post_code( vpu_get_fn(), get_vc_address(s->frame->buf[0]) + s->frame->linesize[0] * y, s->frame->linesize[0], -++ s->setup_width, (int) ( s->y_setup_vc + s->setup_width * (y>>4) ), -++ ctb_size>>4, 2, 0)); // 2 means to do the deblocking code -++} -++ -++static void rpi_deblock2(HEVCContext *s, int y, int ctb_size) -++{ -++ int y2; -++ for(y2=y;y2= s->ps.sps->width - ctb_size; -+ if (s->avctx->skip_loop_filter < AVDISCARD_ALL) -+ deblocking_filter_CTB(s, x, y); -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock && x_end) -++ { -++ rpi_deblock(s, y, ctb_size); -++ } -++#endif -+ if (s->ps.sps->sao_enabled) { -+ int y_end = y >= s->ps.sps->height - ctb_size; -+ if (y && x) -+@@ -965,6 +1072,7 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ //if (((y + ctb_size)&63)==0) -+ #ifdef RPI_INTER_QPU -+ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size - 4); -++ // TODO we no longer need to flush the luma buffer as it is in GPU memory when using deblocking on the rpi -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -+ } -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index 4f13622..b3f155f 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -3,7 +3,13 @@ unsigned char rpi_hevc_transform [] = { -+ 106, -+ 0, -+ 144, -+-35, -++38, -++1, -++37, -++106, -++0, -++144, -++57, -+ 1, -+ 169, -+ 3, -+@@ -627,4 +633,1798 @@ unsigned char rpi_hevc_transform [] = { -+ 30, -+ 90, -+ 0, -++169, -++3, -++73, -++64, -++52, -++64, -++45, -++64, -++2, -++64, -++10, -++64, -++64, -++198, -++1, -++7, -++8, -++232, -++63, -++0, -++0, -++0, -++6, -++232, -++253, -++255, -++255, -++255, -++0, -++246, -++0, -++0, -++0, -++4, -++215, -++64, -++3, -++96, -++2, -++248, -++0, -++35, -++0, -++0, -++64, -++56, -++0, -++0, -++4, -++248, -++0, -++36, -++0, -++0, -++64, -++56, -++8, -++0, -++0, -++240, -++64, -++0, -++132, -++3, -++128, -++240, -++0, -++0, -++132, -++3, -++128, -++144, -++137, -++0, -++131, -++98, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++129, -++0, -++131, -++102, -++0, -++158, -++67, -++0, -++2, -++248, -++0, -++35, -++0, -++0, -++64, -++56, -++0, -++0, -++4, -++248, -++0, -++36, -++0, -++0, -++64, -++56, -++8, -++0, -++0, -++240, -++64, -++0, -++132, -++3, -++128, -++240, -++0, -++0, -++132, -++3, -++128, -++144, -++108, -++0, -++131, -++98, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++100, -++0, -++131, -++102, -++0, -++248, -++64, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++248, -++0, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++144, -++161, -++0, -++188, -++64, -++67, -++232, -++0, -++2, -++0, -++0, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++150, -++0, -++195, -++232, -++0, -++2, -++0, -++0, -++12, -++128, -++7, -++192, -++130, -++248, -++0, -++0, -++112, -++192, -++224, -++16, -++195, -++31, -++132, -++248, -++1, -++0, -++112, -++0, -++224, -++16, -++203, -++31, -++3, -++99, -++131, -++71, -++68, -++232, -++32, -++0, -++0, -++0, -++0, -++99, -++2, -++99, -++23, -++102, -++7, -++106, -++127, -++156, -++182, -++255, -++0, -++248, -++64, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++248, -++0, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++144, -++112, -++0, -++188, -++64, -++67, -++232, -++0, -++2, -++0, -++0, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++101, -++0, -++195, -++232, -++0, -++2, -++0, -++0, -++12, -++128, -++7, -++192, -++130, -++248, -++0, -++0, -++112, -++192, -++224, -++16, -++195, -++31, -++132, -++248, -++1, -++0, -++112, -++0, -++224, -++16, -++203, -++31, -++25, -++102, -++9, -++106, -++2, -++30, -++41, -++3, -++26, -++87, -++162, -++64, -++64, -++198, -++1, -++23, -++127, -++158, -++103, -++255, -++239, -++3, -++0, -++254, -++0, -++143, -++92, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++64, -++143, -++93, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++143, -++94, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++143, -++95, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++142, -++208, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++142, -++209, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++64, -++142, -++210, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++0, -++142, -++211, -++0, -++0, -++240, -++12, -++0, -++128, -++144, -++107, -++0, -++8, -++255, -++99, -++23, -++0, -++212, -++192, -++51, -++0, -++0, -++8, -++255, -++163, -++23, -++0, -++228, -++192, -++51, -++0, -++0, -++8, -++255, -++227, -++23, -++0, -++244, -++192, -++51, -++0, -++0, -++8, -++255, -++35, -++52, -++0, -++180, -++192, -++51, -++0, -++0, -++8, -++255, -++99, -++52, -++0, -++164, -++192, -++51, -++0, -++0, -++8, -++255, -++163, -++52, -++0, -++148, -++192, -++51, -++0, -++0, -++111, -++3, -++239, -++3, -++0, -++254, -++0, -++143, -++12, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++64, -++143, -++13, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++143, -++14, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++143, -++15, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++142, -++16, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++142, -++17, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++64, -++142, -++18, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++0, -++142, -++19, -++0, -++0, -++240, -++12, -++0, -++128, -++144, -++33, -++0, -++8, -++255, -++99, -++3, -++0, -++212, -++192, -++51, -++0, -++0, -++8, -++255, -++163, -++3, -++0, -++228, -++192, -++51, -++0, -++0, -++8, -++255, -++227, -++3, -++0, -++244, -++192, -++51, -++0, -++0, -++8, -++255, -++35, -++4, -++0, -++180, -++192, -++51, -++0, -++0, -++8, -++255, -++99, -++4, -++0, -++164, -++192, -++51, -++0, -++0, -++8, -++255, -++163, -++4, -++0, -++148, -++192, -++51, -++0, -++0, -++111, -++3, -++32, -++246, -++192, -++11, -++1, -++16, -++32, -++246, -++2, -++137, -++47, -++240, -++40, -++246, -++2, -++140, -++47, -++240, -++128, -++245, -++99, -++140, -++5, -++4, -++0, -++247, -++99, -++140, -++1, -++20, -++88, -++246, -++99, -++140, -++1, -++20, -++0, -++247, -++35, -++136, -++62, -++226, -++32, -++247, -++35, -++136, -++32, -++210, -++0, -++247, -++34, -++136, -++63, -++2, -++208, -++246, -++34, -++136, -++0, -++4, -++0, -++247, -++99, -++136, -++58, -++162, -++32, -++247, -++99, -++136, -++33, -++146, -++0, -++247, -++98, -++136, -++59, -++18, -++208, -++246, -++98, -++136, -++0, -++20, -++0, -++247, -++162, -++136, -++33, -++2, -++88, -++246, -++98, -++137, -++2, -++68, -++88, -++246, -++162, -++137, -++3, -++68, -++208, -++254, -++227, -++136, -++60, -++242, -++192, -++243, -++188, -++11, -++208, -++254, -++227, -++136, -++56, -++178, -++192, -++243, -++188, -++10, -++32, -++255, -++226, -++136, -++38, -++58, -++192, -++243, -++60, -++0, -++208, -++254, -++227, -++136, -++59, -++242, -++192, -++243, -++60, -++128, -++32, -++255, -++226, -++136, -++49, -++58, -++192, -++243, -++60, -++128, -++0, -++255, -++226, -++136, -++34, -++34, -++192, -++243, -++60, -++128, -++32, -++255, -++226, -++136, -++37, -++58, -++192, -++243, -++60, -++128, -++0, -++254, -++192, -++136, -++1, -++4, -++0, -++240, -++0, -++160, -++0, -++255, -++194, -++8, -++0, -++52, -++195, -++243, -++0, -++128, -++0, -++255, -++202, -++40, -++0, -++52, -++195, -++243, -++0, -++128, -++0, -++254, -++0, -++240, -++35, -++10, -++0, -++240, -++60, -++0, -++0, -++254, -++192, -++136, -++1, -++4, -++0, -++240, -++0, -++160, -++0, -++255, -++226, -++140, -++34, -++34, -++195, -++243, -++60, -++0, -++32, -++255, -++227, -++140, -++36, -++58, -++192, -++243, -++60, -++0, -++0, -++254, -++192, -++136, -++0, -++4, -++0, -++240, -++0, -++160, -++16, -++246, -++226, -++136, -++35, -++50, -++16, -++246, -++226, -++136, -++35, -++50, -++32, -++246, -++226, -++136, -++35, -++50, -++32, -++254, -++226, -++136, -++35, -++58, -++192, -++243, -++60, -++0, -++11, -++96, -++0, -++254, -++0, -++240, -++1, -++4, -++0, -++240, -++64, -++115, -++5, -++106, -++0, -++144, -++173, -++1, -++27, -++96, -++0, -++254, -++0, -++240, -++1, -++4, -++0, -++240, -++64, -++147, -++5, -++106, -++0, -++144, -++227, -++0, -++64, -++246, -++163, -++140, -++1, -++4, -++0, -++246, -++192, -++175, -++63, -++2, -++0, -++246, -++192, -++174, -++59, -++2, -++0, -++246, -++128, -++175, -++62, -++2, -++0, -++246, -++128, -++174, -++58, -++2, -++0, -++246, -++64, -++175, -++61, -++2, -++0, -++246, -++64, -++174, -++57, -++2, -++0, -++255, -++43, -++240, -++4, -++212, -++192, -++243, -++128, -++11, -++64, -++254, -++43, -++240, -++1, -++228, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++240, -++1, -++244, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++240, -++1, -++180, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++141, -++0, -++164, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++32, -++247, -++35, -++141, -++191, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++235, -++143, -++52, -++242, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++2, -++212, -++192, -++243, -++128, -++11, -++0, -++255, -++43, -++240, -++191, -++226, -++192, -++243, -++188, -++10, -++64, -++254, -++43, -++141, -++0, -++180, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++2, -++68, -++32, -++247, -++35, -++141, -++190, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++171, -++143, -++52, -++226, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++4, -++180, -++192, -++243, -++128, -++11, -++0, -++255, -++43, -++240, -++191, -++226, -++192, -++243, -++188, -++10, -++128, -++253, -++43, -++240, -++3, -++212, -++192, -++243, -++128, -++10, -++64, -++254, -++35, -++141, -++1, -++196, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++32, -++247, -++35, -++141, -++189, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++107, -++143, -++52, -++210, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++4, -++148, -++192, -++243, -++128, -++11, -++64, -++254, -++43, -++240, -++1, -++164, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++240, -++1, -++180, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++240, -++1, -++244, -++192, -++243, -++128, -++10, -++64, -++254, -++43, -++141, -++0, -++228, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++32, -++247, -++35, -++141, -++187, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++235, -++142, -++52, -++178, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++2, -++148, -++192, -++243, -++128, -++11, -++0, -++255, -++43, -++240, -++187, -++162, -++192, -++243, -++188, -++10, -++64, -++254, -++43, -++141, -++0, -++244, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++2, -++68, -++32, -++247, -++35, -++141, -++186, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++171, -++142, -++52, -++162, -++192, -++243, -++60, -++128, -++0, -++255, -++43, -++240, -++4, -++244, -++192, -++243, -++128, -++11, -++0, -++255, -++43, -++240, -++187, -++162, -++192, -++243, -++188, -++10, -++128, -++253, -++43, -++240, -++3, -++148, -++192, -++243, -++128, -++10, -++64, -++254, -++35, -++141, -++1, -++132, -++192, -++243, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++32, -++247, -++35, -++141, -++185, -++66, -++240, -++246, -++35, -++141, -++50, -++66, -++0, -++255, -++107, -++142, -++52, -++146, -++192, -++243, -++60, -++128, -++64, -++255, -++98, -++141, -++0, -++52, -++192, -++243, -++0, -++0, -++0, -++254, -++0, -++240, -++53, -++10, -++0, -++240, -++60, -++0, -++0, -++254, -++0, -++240, -++1, -++4, -++0, -++240, -++64, -++147, -++5, -++106, -++0, -++144, -++177, -++0, -++88, -++246, -++163, -++140, -++1, -++4, -++128, -++245, -++99, -++141, -++10, -++4, -++88, -++246, -++162, -++138, -++1, -++68, -++0, -++247, -++162, -++138, -++36, -++162, -++88, -++254, -++162, -++138, -++3, -++164, -++192, -++243, -++128, -++11, -++0, -++255, -++226, -++137, -++32, -++2, -++195, -++243, -++60, -++0, -++32, -++247, -++226, -++137, -++42, -++114, -++0, -++255, -++34, -++138, -++33, -++18, -++195, -++243, -++60, -++0, -++32, -++247, -++34, -++138, -++42, -++130, -++16, -++246, -++98, -++138, -++40, -++114, -++16, -++246, -++98, -++138, -++41, -++146, -++32, -++246, -++98, -++138, -++41, -++146, -++32, -++246, -++226, -++137, -++41, -++146, -++40, -++246, -++34, -++138, -++41, -++146, -++32, -++247, -++163, -++141, -++63, -++178, -++32, -++247, -++227, -++141, -++62, -++162, -++0, -++254, -++0, -++240, -++8, -++4, -++0, -++240, -++128, -++11, -++128, -++253, -++35, -++240, -++9, -++100, -++192, -++243, -++128, -++10, -++128, -++253, -++163, -++141, -++128, -++115, -++192, -++243, -++152, -++10, -++88, -++246, -++163, -++141, -++4, -++100, -++208, -++246, -++35, -++139, -++0, -++100, -++32, -++255, -++34, -++139, -++53, -++202, -++192, -++243, -++60, -++128, -++0, -++254, -++0, -++139, -++0, -++4, -++0, -++240, -++0, -++160, -++240, -++246, -++163, -++141, -++48, -++98, -++0, -++247, -++99, -++139, -++63, -++210, -++0, -++247, -++98, -++139, -++1, -++212, -++88, -++254, -++98, -++139, -++1, -++212, -++192, -++243, -++128, -++11, -++32, -++255, -++99, -++139, -++62, -++98, -++192, -++243, -++188, -++10, -++88, -++246, -++98, -++139, -++1, -++212, -++240, -++246, -++98, -++139, -++50, -++210, -++0, -++247, -++163, -++128, -++59, -++146, -++0, -++247, -++160, -++128, -++1, -++36, -++88, -++254, -++160, -++128, -++1, -++36, -++192, -++243, -++128, -++11, -++0, -++247, -++163, -++128, -++58, -++98, -++64, -++255, -++35, -++240, -++0, -++100, -++192, -++243, -++128, -++10, -++64, -++255, -++163, -++128, -++0, -++164, -++192, -++243, -++128, -++10, -++88, -++246, -++160, -++128, -++1, -++36, -++240, -++246, -++160, -++128, -++50, -++34, -++8, -++255, -++227, -++143, -++54, -++242, -++192, -++243, -++60, -++128, -++40, -++255, -++227, -++142, -++54, -++178, -++192, -++243, -++60, -++128, -++0, -++254, -++0, -++240, -++39, -++10, -++0, -++240, -++60, -++128, -++8, -++255, -++163, -++143, -++45, -++226, -++192, -++243, -++60, -++128, -++0, -++254, -++0, -++240, -++44, -++10, -++0, -++240, -++60, -++0, -++0, -++254, -++0, -++240, -++40, -++10, -++0, -++240, -++60, -++128, -++8, -++255, -++163, -++142, -++2, -++162, -++192, -++243, -++60, -++128, -++90, -++0, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index fd159bc..b055208 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -83,6 +83,8 @@ -+ hevc_trans_16x16: -+ cmp r5,1 -+ beq memclear16 -++ cmp r5,2 -++ beq hevc_deblock_16x16 -+ push r6-r15, lr # TODO cut down number of used registers -+ mov r14,r3 # coeffs32 -+ mov r15,r4 # num32 -+@@ -282,3 +284,427 @@ loop: -+ cmp r1,0 -+ bgt loop -+ b lr -++ -++ -++################################################################################ -++# HEVC VPU Deblock -++# -++# Vertical edges before horizontal -++# Decision can change every 4 pixels, but only 8 pixel boundaries are deblocked -++# -++# ARM is responsible for storing beta and tc for each 4 pixels horiz and vert edge. -++# The VPU code works in units of 16x16 blocks. -++# We do vertical filtering for the current block followed by horizontal filtering for the previous (except for the first time). -++# One final horizontal filter is required at the end. -++# PCM is not allowed in this code. -++# -++# -++# H(16-4:16+15,0) contains previous block (note that we need 4 lines above of context that may get altered during filtering) -++# H(16:31,16) contains current block (note that we do not need the upper lines until the horizontal filtering. -++ -++.set P0,63 -++.set P1,62 -++.set P2,61 -++.set P3,60 -++.set Q0,59 -++.set Q1,58 -++.set Q2,57 -++.set Q3,56 -++ -++.set dp,32 -++.set dq,33 -++.set d,34 -++.set decision,35 -++.set beta,36 -++.set beta2,37 -++.set beta3,38 -++.set ptest,39 -++.set qtest,40 -++.set pqtest,41 -++.set thresh,42 -++.set deltatest, 44 -++.set deltap1, 45 -++.set tc25, 46 -++.set setup,47 -++.set tc,48 -++.set tc25,49 -++.set tc2, 50 -++.set do_filter, 51 -++.set delta, 52 -++.set tc10, 53 -++.set delta0, 54 -++.set delta1, 55 -++.set zeros, 0 -++.set setup_input, 1 -++.set deltaq1, 2 -++ -++ -++ -++# hevc_deblock_16x16 deblocks an entire row that is 16 pixels high by the full width of the image. -++# Row has num16 16x16 blocks across -++# Beta goes from 0 to 64 -++# tc goes from 0 to 24 -++# setup[block_idx][0=vert,1=horz][0=first edge, 1=second edge][0=beta,1=tc][0..3=edge number] -++# has 8 bytes per edge -++# has 16 bytes per direction -++# has 32 bytes per 16x16 block -++# hevc_deblock_16x16(uint8_t *img (r0), int stride (r1), int num16w (r2), uint8_t setup[num16][2][2][2][4](r3),int num16h(r4)) -++hevc_deblock_16x16: -++ push r6-r15, lr -++ mov r9,r4 -++ mov r4,r3 -++ mov r13,r2 -++ mov r2,r0 -++ mov r10,r0 -++ subscale4 r0,r1 -++ mov r8,63 -++ mov r6,-3 -++ vmov H(zeros,0),0 -++# r7 is number of blocks still to load -++# r0 is location of current block - 4 * stride -++# r1 is stride -++# r2 is location of current block -++# r3 is offset of start of block (actual edges start at H(16,16)+r3 for horizontal and H(16,0)+r3 for vertical -++# r4 is setup -++# r5 is for temporary calculations -++# r8 holds 63 -++# r6 holds -3 -++# r9 holds the number of 16 high rows to process -++# r10 holds the original img base -++# r11 returns 0 if no filtering was done on the edge -++# r12 saves a copy of this -++# r13 is copy of width -++ -++process_row: -++ # First iteration does not do horizontal filtering on previous -++ mov r7, r13 -++ mov r3,0 -++ vldb H(12++,16)+r3,(r0 += r1) REP 4 # Load the current block -++ vldb H(16++,16)+r3,(r2 += r1) REP 16 -++ vldb H(setup_input,0), (r4) # We may wish to prefetch these -++ vstb H(zeros,0),(r4) -++ bl vert_filter -++ add r3,8 -++ vadd H(setup_input,0),H(setup_input,8),0 # Rotate to second set of 8 -++ bl vert_filter -++ sub r3,8 -++ b start_deblock_loop -++deblock_loop: -++ # Middle iterations do vertical on current block and horizontal on preceding -++ vldb H(12++,16)+r3,(r0 += r1) REP 4 # load the current block -++ vldb H(16++,16)+r3,(r2 += r1) REP 16 -++ vldb H(setup_input,0), (r4) -++ vstb H(zeros,0),(r4) -++ bl vert_filter -++ add r3,8 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl vert_filter -++ sub r3,8 -++ vldb H(setup_input,0), -16(r4) -++ vstb H(zeros,0),-16(r4) -++ bl horz_filter -++ mov r12,r11 -++ add r3,8*64 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl horz_filter -++ sub r3,8*64 -++ addcmpbeq r12,0,0,skip_save_top -++ vstb H(12++,0)+r3,-16(r0 += r1) REP 4 # Save the deblocked pixels for the previous block -++skip_save_top: -++ vstb H(16++,0)+r3,-16(r2 += r1) REP 16 -++start_deblock_loop: -++ # move onto next 16x16 (could do this with circular buffer support instead) -++ add r3,16 -++ and r3,r8 -++ add r4,32 -++ # Perform loop counter operations (may work with an addcmpbgt as well?) -++ add r0,16 -++ add r2,16 -++ sub r7,1 -++ cmp r7,0 # Are there still more blocks to load -++ bgt deblock_loop -++ -++ # Final iteration needs to just do horizontal filtering -++ vldb H(setup_input,0), -16(r4) -++ vstb H(zeros,0),-16(r4) -++ bl horz_filter -++ mov r12,r11 -++ add r3,8*64 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl horz_filter -++ sub r3,64*8 -++ addcmpbeq r12,0,0,skip_save_top2 -++ vstb H(12++,0)+r3,-16(r0 += r1) REP 4 # Save the deblocked pixels for the previous block -++skip_save_top2: -++ vstb H(16++,0)+r3,-16(r2 += r1) REP 16 -++ -++# Now look to see if we should do another row -++ sub r9,1 -++ cmp r9,0 -++ bgt start_again -++ pop r6-r15, pc -++start_again: -++ # Need to sort out r0,r2 to point to next row down -++ addscale16 r10,r1 -++ mov r2,r10 -++ subscale4 r0,r2,r1 -++ b process_row -++ -++ -++# At this stage H(16,16)+r3 points to the first pixel of the 16 high edge to be filtered -++# So we can reuse the code we move the parts to be filtered into HX(P0/P1/P2/P3/Q0/Q1/Q2/Q3,0) - we will perform a final saturation step on placing them back into the correct locations -++ -++vert_filter: -++ push lr -++ -++ vmov HX(P3,0), V(16,12)+r3 -++ vmov HX(P2,0), V(16,13)+r3 -++ vmov HX(P1,0), V(16,14)+r3 -++ vmov HX(P0,0), V(16,15)+r3 -++ vmov HX(Q0,0), V(16,16)+r3 -++ vmov HX(Q1,0), V(16,17)+r3 -++ vmov HX(Q2,0), V(16,18)+r3 -++ vmov HX(Q3,0), V(16,19)+r3 -++ -++ bl do_luma_filter -++ -++ vadds V(16,13)+r3, HX(P2,0), 0 -++ vadds V(16,14)+r3, HX(P1,0), 0 -++ vadds V(16,15)+r3, HX(P0,0), 0 -++ # P3 and Q3 never change so don't bother saving back -++ vadds V(16,16)+r3, HX(Q0,0), 0 -++ vadds V(16,17)+r3, HX(Q1,0), 0 -++ vadds V(16,18)+r3, HX(Q2,0), 0 -++ -++ pop pc -++ -++# Filter edge at H(16,0)+r3 -++horz_filter: -++ push lr -++ -++ vmov HX(P3,0), H(12,0)+r3 -++ vmov HX(P2,0), H(13,0)+r3 -++ vmov HX(P1,0), H(14,0)+r3 -++ vmov HX(P0,0), H(15,0)+r3 -++ vmov HX(Q0,0), H(16,0)+r3 -++ vmov HX(Q1,0), H(17,0)+r3 -++ vmov HX(Q2,0), H(18,0)+r3 -++ vmov HX(Q3,0), H(19,0)+r3 -++ -++ bl do_luma_filter -++ -++ vadds H(13,0)+r3, HX(P2,0), 0 -++ vadds H(14,0)+r3, HX(P1,0), 0 -++ vadds H(15,0)+r3, HX(P0,0), 0 -++ # P3 and Q3 never change so don't bother saving back -++ vadds H(16,0)+r3, HX(Q0,0), 0 -++ vadds H(17,0)+r3, HX(Q1,0), 0 -++ vadds H(18,0)+r3, HX(Q2,0), 0 -++ -++ pop pc -++ -++# r4 points to array of beta/tc for each 4 length edge -++do_luma_filter: -++ valtl H(setup,0),H(setup_input,0),H(setup_input,0) # b*8tc*8 -++ valtl HX(beta,0),H(setup,0),H(setup,0) -++ valtu HX(tc,0),H(setup,0),H(setup,0) -++ vmul HX(tc25,0), HX(tc,0), 5 -++ vadd HX(tc25,0),HX(tc25,0), 1 -++ vasr HX(tc25,0), HX(tc25,0), 1 -++ -++ # Compute decision -++ vadd HX(dp,0),HX(P1,0),HX(P1,0) # 2*P1 -++ vsub HX(dp,0),HX(P2,0),HX(dp,0) # P2-2*P1 -++ vadd HX(dp,0),HX(dp,0),HX(P0,0) # P2-2*P1+P0 -++ vdist HX(dp,0),HX(dp,0),0 # abs(P2-2*P1+P0) # dp0 -++ -++ vadd HX(dq,0),HX(Q1,0),HX(Q1,0) # 2*Q1 -++ vsub HX(dq,0),HX(Q2,0),HX(dq,0) # Q2-2*Q1 -++ vadd HX(dq,0),HX(dq,0),HX(Q0,0) # Q2-2*Q1+Q0 -++ vdist HX(dq,0),HX(dq,0),0 # abs(Q2-2*Q1+Q0) # dq0 -++ -++ vadd HX(d,0), HX(dp,0), HX(dq,0) -++ vasr HX(beta2,0),HX(beta,0),2 -++ vasr HX(beta3,0),HX(beta,0),3 -++ -++ # Compute flags that are negative if all conditions pass -++ vdist HX(decision,0), HX(P0,0), HX(P3,0) CLRA SACC -++ vdist HX(decision,0), HX(Q0,0), HX(Q3,0) SACC -++ vsub HX(decision,0), HX(decision,0), HX(beta3,0) SETF -++ -++ vdist HX(decision,0), HX(P0,0), HX(Q0,0) IFN -++ vsub HX(decision,0), HX(decision,0), HX(tc25,0) IFN SETF -++ vadd HX(decision,0), HX(d,0), HX(d,0) IFN -++ vsub HX(decision,0), HX(decision,0), HX(beta2,0) IFN SETF -++ vmov HX(decision,0), 1 IFNN -++ vadd H(decision,0),H(decision,3),0 IFN -++ vadd H(decision,16),H(decision,19),0 IFN -++ vmov -,HX(decision,0) SETF # N marks strong filter -++ vmov HX(decision,0), 1 IFNN # NN marks normal filter -++ -++ vadd HX(do_filter,0), HX(d,3), HX(d,0) -++ vsub HX(do_filter,0), HX(do_filter,0), HX(beta,0) SETF # IFNN means no filter -++ vmov HX(decision,0),0 IFNN # Z marks no filter -++ -++ # Expand out decision (currently valid one every 4 pixels) 0...1...2...3 -++ # First extract out even terms -++ vodd HX(decision,0),HX(decision,0),HX(decision,0) # 0.1.2.3 -++ vodd HX(decision,0),HX(decision,0),HX(decision,0) # 0123 -++ # Now expand back -++ valtl HX(decision,0),HX(decision,0),HX(decision,0) # 00112233 -++ valtl HX(decision,0),HX(decision,0),HX(decision,0) SETF # 0000111122223333 -++ -++ # HX(decision,0) is negative if want strong filtering, 1 if want normal filtering, 0 if want no filtering -++ -++ # Do a quick check to see if there is anything to do -++ mov r11, 0 # Signal no filtering -++ vmov -,1 IFNZ SUMS r5 -++ cmp r5,0 -++ beq filtering_done -++ mov r11, 1 # Signal some filtering -++ # And whether there is any strong filtering -++ vmov -,1 IFN SUMS r5 -++ cmp r5,0 -++ beq normal_filtering -++ -++ ############################################################################## -++ # Strong filtering - could maybe fast case if all have same sign? (especially if all disabled!) -++ vshl HX(tc2,0), HX(tc,0), 1 # Note that in normal filtering tx2 is tc/2, while here it is tc*2 -++ -++ # Take a copy of the original pixels for use in decision calculation -++ vmov HX(P0,32),HX(P0,0) -++ vmov HX(Q0,32),HX(Q0,0) -++ vmov HX(P1,32),HX(P1,0) -++ vmov HX(Q1,32),HX(Q1,0) -++ vmov HX(P2,32),HX(P2,0) -++ vmov HX(Q2,32),HX(Q2,0) -++ -++ vadd -,HX(P2,32),4 CLRA SACC -++ vshl -,HX(P1,32),1 SACC -++ vshl -,HX(P0,32),1 SACC -++ vshl -,HX(Q0,32),1 SACC -++ vshl HX(delta,0),HX(Q1,32),0 SACC -++ vasr HX(delta,0),HX(delta,0), 3 -++ vsub HX(delta,0),HX(delta,0),HX(P0,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(P0,0),HX(P0,32),HX(delta,0) IFN -++ -++ vadd -,HX(P2,32),2 CLRA SACC -++ vadd -,HX(P1,32),HX(P0,32) SACC -++ vshl HX(delta,0),HX(Q0,32),0 SACC -++ vasr HX(delta,0),HX(delta,0), 2 -++ vsub HX(delta,0),HX(delta,0),HX(P1,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(P1,0),HX(P1,32),HX(delta,0) IFN -++ -++ vadd -,HX(Q0,32),4 CLRA SACC -++ vadd -,HX(P1,32),HX(P0,32) SACC -++ vmul -,HX(P2,32),3 SACC -++ vshl HX(delta,0),HX(P3,0),1 SACC # Note that we have not made a copy of P3, so using P3,0 is correct -++ vasr HX(delta,0),HX(delta,0), 3 -++ vsub HX(delta,0),HX(delta,0),HX(P2,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(P2,0),HX(P2,32),HX(delta,0) IFN -++ #vmov HX(P2,0),3 IFN -++ -++ # Now reverse all P/Qs -++ -++ vadd -,HX(Q2,32),4 CLRA SACC -++ vshl -,HX(Q1,32),1 SACC -++ vshl -,HX(Q0,32),1 SACC -++ vshl -,HX(P0,32),1 SACC -++ vshl HX(delta,0),HX(P1,32),0 SACC -++ vasr HX(delta,0),HX(delta,0), 3 -++ vsub HX(delta,0),HX(delta,0),HX(Q0,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(Q0,0),HX(Q0,32),HX(delta,0) IFN -++ -++ vadd -,HX(Q2,32),2 CLRA SACC -++ vadd -,HX(Q1,32),HX(Q0,32) SACC -++ vshl HX(delta,0),HX(P0,32),0 SACC -++ vasr HX(delta,0),HX(delta,0), 2 -++ vsub HX(delta,0),HX(delta,0),HX(Q1,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(Q1,0),HX(Q1,32),HX(delta,0) IFN -++ -++ vadd -,HX(P0,32),4 CLRA SACC -++ vadd -,HX(Q1,32),HX(Q0,32) SACC -++ vmul -,HX(Q2,32),3 SACC -++ vshl HX(delta,0),HX(Q3,0),1 SACC # Note that we have not made a copy of Q3, so using Q3,0 is correct -++ vasr HX(delta,0),HX(delta,0), 3 -++ vsub HX(delta,0),HX(delta,0),HX(Q2,32) -++ vclamps HX(delta,0), HX(delta,0), HX(tc2,0) -++ vadd HX(Q2,0),HX(Q2,32),HX(delta,0) IFN -++ -++ ############################################################################## -++ # Normal filtering -++normal_filtering: -++ # Invert the decision flags -++ # make instruction more complicated as assembler has error and loses SETF -++ vrsub HX(tc10,0), HX(decision,0), 0 SETF # IFN means normal filtering -++ vmov -, HX(tc10,0) SETF # IFN means normal filtering -++ -++ vmov -,1 IFN SUMS r5 -++ cmp r5,0 -++ beq filtering_done -++ -++ vasr HX(tc2,0), HX(tc,0), 1 -++ vmul HX(tc10,0), HX(tc,0), 10 -++ -++ vasr HX(thresh,0), HX(beta,0), 1 -++ vadd HX(thresh,0), HX(thresh,0), HX(beta,0) -++ vasr HX(thresh,0), HX(thresh,0), 3 CLRA SACC -++ -++ vadd HX(ptest,0),HX(dp,3),HX(dp,0) -++ vsub HX(ptest,0),HX(ptest,0),HX(thresh,0) # ptest is negative if we need to do the P2 pixel -++ vadd HX(qtest,0),HX(dq,3),HX(dq,0) -++ vsub HX(qtest,0),HX(qtest,0),HX(thresh,0) # qtest is negative if we need to do the Q2 pixel -++ # Expand ptest and qtest together -++ vodd HX(pqtest,0),HX(ptest,0),HX(qtest,0) # p.p.p.p.q.q.q.q -++ vodd HX(pqtest,0),HX(pqtest,0),HX(pqtest,0) # ppppqqqq........ -++ valtl HX(pqtest,0),HX(pqtest,0),HX(pqtest,0) # ppppppppqqqqqqqq -++ valtl HX(ptest,0),HX(pqtest,0),HX(pqtest,0) -++ valtu HX(qtest,0),HX(pqtest,0),HX(pqtest,0) -++ -++ vsub HX(delta0,0), HX(Q0,0), HX(P0,0) -++ vsub HX(delta1,0), HX(Q1,0), HX(P1,0) -++ vmov -,8 CLRA SACC -++ vmul -,HX(delta0,0), 9 SACC -++ vmul HX(delta0,0),HX(delta1,0), r6 SACC -++ vasr HX(delta0,0), HX(delta0,0), 4 -++ vdist HX(deltatest,0), HX(delta0,0), 0 -++ vsub HX(deltatest,0), HX(deltatest,0), HX(tc10,0) IFN SETF # negative if still need to do something -++ vmov HX(deltatest,0), 0 IFNN # clear if no need to do anything so we can reload flags later -++ -++ vclamps HX(delta0,0), HX(delta0,0), HX(tc,0) -++ -++ vadd HX(deltap1,0), HX(P2,0), HX(P0,0) -++ vadd HX(deltap1,0), HX(deltap1,0), 1 -++ vasr HX(deltap1,0), HX(deltap1,0), 1 CLRA SACC -++ vsub HX(deltap1,0), HX(delta0,0), HX(P1,0) SACC -++ vasr HX(deltap1,0), HX(deltap1,0), 1 -++ vclamps HX(deltap1,0), HX(deltap1,0), HX(tc2,0) -++ -++ vadd HX(deltaq1,0), HX(Q2,0), HX(Q0,0) -++ vadd HX(deltaq1,0), HX(deltaq1,0), 1 -++ vasr HX(deltaq1,0), HX(deltaq1,0), 1 CLRA SACC -++ vadd HX(deltaq1,0), HX(delta0,0), HX(Q1,0) -++ vrsub -, HX(delta0,0), 0 SACC -++ vrsub HX(deltaq1,0), HX(Q1,0), 0 SACC -++ vasr HX(deltaq1,0), HX(deltaq1,0), 1 -++ vclamps HX(deltaq1,0), HX(deltaq1,0), HX(tc2,0) -++ -++ vadds HX(P0,0), HX(P0,0), HX(delta0,0) IFN -++ vsubs HX(Q0,0), HX(Q0,0), HX(delta0,0) IFN -++ -++ vmov -,HX(ptest,0) IFN SETF # Negative if need to do p1 -++ vadds HX(P1,0), HX(P1,0), HX(deltap1,0) IFN -++ -++ vmov -,HX(deltatest,0) SETF -++ vmov -,HX(qtest,0) IFN SETF # Negative if need to do q1 -++ vadds HX(Q1,0), HX(Q1,0), HX(deltaq1,0) IFN -++ -++ #vmov HX(P2,0),1 IFN -++ -++filtering_done: -++ b lr -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 0121fca..05b2169 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -147,7 +147,7 @@ static int gpu_init(volatile struct GPU **gpu) { -+ vcsm_init(); -+ gpu_malloc_uncached_internal(sizeof(struct GPU), &gpu_mem_ptr, mb); -+ ptr = (volatile struct GPU*)gpu_mem_ptr.arm; -+- memset(ptr, 0, sizeof *ptr); -++ memset((void*)ptr, 0, sizeof *ptr); -+ vc = gpu_mem_ptr.vc; -+ -+ ptr->mb = mb; -+@@ -254,7 +254,7 @@ void gpu_cache_flush(GPU_MEM_PTR_T *p) -+ struct vcsm_user_clean_invalid_s iocache = {}; -+ iocache.s[0].handle = p->vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = p->arm; -++ iocache.s[0].addr = (int) p->arm; -+ iocache.s[0].size = p->numbytes; -+ vcsm_clean_invalid( &iocache ); -+ #else -+@@ -390,6 +390,7 @@ static void *vpu_start(void *arg) { -+ #ifdef RPI_TIME_TOTAL_POSTED -+ int last_time=0; -+ long long on_time=0; -++ long long on_time_deblock=0; -+ long long off_time=0; -+ int start_time; -+ int end_time; -+@@ -451,10 +452,13 @@ static void *vpu_start(void *arg) { -+ #ifdef RPI_TIME_TOTAL_POSTED -+ end_time = Microseconds(); -+ last_time = end_time; -+- on_time += end_time - start_time; -++ if (p[6]==2) -++ on_time_deblock += end_time - start_time; -++ else -++ on_time += end_time - start_time; -+ count++; -+ if ((count&0x7f)==0) -+- printf("Posted %d On=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(off_time/1000)); -++ printf("Posted %d On=%dms, On_deblock=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(on_time_deblock/1000),(int)(off_time/1000)); -+ #endif -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+diff --git a/libavcodec/rpi_shader.c b/libavcodec/rpi_shader.c -+index e86eb30..c5d8b29 100644 -+--- a/libavcodec/rpi_shader.c -++++ b/libavcodec/rpi_shader.c -+@@ -61,7 +61,7 @@ unsigned int rpi_shader[] = { -+ /* [0x00000120] */ 0x8c9e7052, 0x10025e18, // add t0s, r0, r1 ; mov ra_frame_base, r2 -+ /* [0x00000128] */ 0x0c9e7440, 0x10020f27, // add t1s, r2, r1 -+ /* [0x00000130] */ 0x00000008, 0xe00208a7, // mov r2,8 -+-/* [0x00000138] */ 0x11827c80, 0x10021327, // shl rb12,unif, r2 -++/* [0x00000138] */ 0x11827c80, 0x10021327, // shl rb12,unif,r2 -+ /* [0x00000140] */ 0x0c827c80, 0x10021367, // add rb13,unif,r2 -+ /* [0x00000148] */ 0x15827d80, 0x100208a7, // mov r2, unif -+ /* [0x00000150] */ 0x119c15c0, 0xd00208a7, // shl r2, r2, 1 -+-- -+2.7.4 -+ -+ -+From e9c59f0d7b42dfb10d85ab2477f95b44484a8d70 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 1 Jul 2015 09:21:17 +0100 -+Subject: [PATCH 65/68] Added ability to combine jobs -+ -+--- -+ libavcodec/rpi_qpu.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++- -+ 1 file changed, 80 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 05b2169..91777be 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -8,6 +8,8 @@ -+ #define RPI_TIME_TOTAL_POSTED -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+ #define RPI_ASYNC -++// Define RPI_COMBINE_JOBS to find jobs that can be executed in parallel -++#define RPI_COMBINE_JOBS -+ -+ #include -+ #include -+@@ -398,9 +400,15 @@ static void *vpu_start(void *arg) { -+ #endif -+ while(1) { -+ int i; -+- int *p; -++ int *p; // Pointer for a QPU/VPU job -++#ifdef RPI_COMBINE_JOBS -++ int *q = NULL; // Pointer for a VPU only job -++ int have_qpu = 0; -++ int have_vpu = 0; -++#endif -+ int qpu_code; -+ int qpu_codeb; -++ int num_jobs; // Number of jobs available -+ pthread_mutex_lock(&post_mutex); -+ while( vpu_async_tail - vpu_async_head <= 0) -+ { -+@@ -408,13 +416,38 @@ static void *vpu_start(void *arg) { -+ pthread_cond_wait(&post_cond_tail, &post_mutex); -+ } -+ p = vpu_cmds[vpu_async_head%MAXCMDS]; -++ num_jobs = vpu_async_tail - vpu_async_head; -+ pthread_mutex_unlock(&post_mutex); -+ -+ if (p[6] == -1) { -+ break; // Last job -+ } -++ if (p[7] == 0 && p[0] == 0 && p[16]==0) -++ goto job_done_early; -++ -++#ifdef RPI_COMBINE_JOBS -++ // First scan for a qpu job -++ for (int x=0;xmail[i*2] = p[8+i]; -++ gpu->mail[i*2 + 1] = qpu_code; -++ } -++ for(i=0;i<12;i++) { -++ gpu->mail2[i*2] = p[17+i]; -++ gpu->mail2[i*2 + 1] = qpu_codeb; -++ } -++ if (have_vpu) { -++ execute_multi(gpu->mb, -++ 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -++ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -++ q[0], q[1], q[2], q[3], q[4], q[5], q[6]); // VPU1 -++ q[0] = 0; -++ } else { -++ execute_multi(gpu->mb, -++ 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -++ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -++ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -++ } -++ p[0] = 0; -++ p[7] = 0; -++ p[16] = 0; -++ } else { -++ av_assert0(have_vpu); -++ vpu_execute_code(q[0], q[1], q[2], q[3], q[4], q[5], q[6]); -++ q[0] = 0; -++ } -++#else -++ -+ if (!qpu_code) { -+ vpu_execute_code(p[0], p[1], p[2], p[3], p[4], p[5], p[6]); -+ } else { -+@@ -449,17 +516,29 @@ static void *vpu_start(void *arg) { -+ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -+ #endif -+ } -++#endif -++ -+ #ifdef RPI_TIME_TOTAL_POSTED -+ end_time = Microseconds(); -+ last_time = end_time; -++#ifdef RPI_COMBINE_JOBS -++ // There are three cases we may wish to distinguish of VPU/QPU activity -++ on_time += end_time - start_time; -++#else -+ if (p[6]==2) -+ on_time_deblock += end_time - start_time; -+ else -+ on_time += end_time - start_time; -++#endif -+ count++; -+ if ((count&0x7f)==0) -++#ifdef RPI_COMBINE_JOBS -+ printf("Posted %d On=%dms, On_deblock=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(on_time_deblock/1000),(int)(off_time/1000)); -++#else -++ printf("Posted %d On=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(off_time/1000)); -++#endif -+ #endif -++job_done_early: -+ pthread_mutex_lock(&post_mutex); -+ vpu_async_head++; -+ pthread_cond_broadcast(&post_cond_head); -+-- -+2.7.4 -+ -+ -+From 0d54661f303b2a8903e806648ed54a34dcf315dc Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 1 Jul 2015 12:53:10 +0100 -+Subject: [PATCH 66/68] Added chroma deblocking -+ -+--- -+ libavcodec/hevc.c | 20 ++ -+ libavcodec/hevc.h | 12 +- -+ libavcodec/hevc_filter.c | 92 +++++- -+ libavcodec/rpi_hevc_transform.h | 644 +++++++++++++++++++++++++++++++++++++++- -+ libavcodec/rpi_hevc_transform.s | 207 +++++++++++++ -+ libavcodec/rpi_qpu.c | 27 +- -+ libavcodec/rpi_shader.qasm | 11 + -+ 7 files changed, 988 insertions(+), 25 deletions(-) -+ -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 4ce94a7..8437e10 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -251,6 +251,14 @@ static void pic_arrays_free(HEVCContext *s) -+ gpu_free(&s->y_setup_ptr); -+ s->y_setup_arm = 0; -+ } -++ if (s->uv_setup_arm) { -++ gpu_free(&s->uv_setup_ptr); -++ s->uv_setup_arm = 0; -++ } -++ if (s->vpu_cmds_arm) { -++ gpu_free(&s->vpu_cmds_ptr); -++ s->vpu_cmds_arm = 0; -++ } -+ #endif -+ av_freep(&s->sao); -+ av_freep(&s->deblock); -+@@ -324,6 +332,18 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) -+ s->y_setup_vc = (void*)s->y_setup_ptr.vc; -+ memset(s->y_setup_arm, 0, s->y_setup_ptr.numbytes); -+ printf("Setup %d by %d by %d\n",s->setup_width,s->setup_height,sizeof(*s->y_setup_arm)); -++ -++ s->uv_setup_width = ( (sps->width >> sps->hshift[1]) + 15) / 16; -++ s->uv_setup_height = ( (sps->height >> sps->vshift[1]) + 15) / 16; -++ gpu_malloc_uncached(sizeof(*s->uv_setup_arm) * s->uv_setup_width * s->uv_setup_height, &s->uv_setup_ptr); // TODO make this cached -++ s->uv_setup_arm = (void*)s->uv_setup_ptr.arm; -++ s->uv_setup_vc = (void*)s->uv_setup_ptr.vc; -++ memset(s->uv_setup_arm, 0, s->uv_setup_ptr.numbytes); -++ printf("Setup uv %d by %d by %d\n",s->uv_setup_width,s->uv_setup_height,sizeof(*s->uv_setup_arm)); -++ -++ gpu_malloc_uncached(sizeof(*s->vpu_cmds_arm) * 3,&s->vpu_cmds_ptr); -++ s->vpu_cmds_arm = (void*) s->vpu_cmds_ptr.arm; -++ s->vpu_cmds_vc = s->vpu_cmds_ptr.vc; -+ #endif -+ -+ s->bs_width = (width >> 2) + 1; -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index cf08489..7eb37e6 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -56,7 +56,7 @@ -+ #define RPI_MAX_JOBS 2 -+ // Define RPI_WORKER to launch a worker thread for pixel processing tasks -+ #define RPI_WORKER -+- -++ // Define RPI_DEBLOCK_VPU to perform deblocking on the VPUs -+ #define RPI_DEBLOCK_VPU -+ -+ #endif -+@@ -980,6 +980,16 @@ typedef struct HEVCContext { -+ uint8_t (*y_setup_vc)[2][2][2][4]; -+ int setup_width; // Number of 16x16 blocks across the image -+ int setup_height; // Number of 16x16 blocks down the image -++ -++ GPU_MEM_PTR_T uv_setup_ptr; -++ uint8_t (*uv_setup_arm)[2][2][2][4]; // Half of this is unused [][][1][], but easier for the VPU as it allows us to store with zeros and addresses are aligned -++ uint8_t (*uv_setup_vc)[2][2][2][4]; -++ int uv_setup_width; -++ int uv_setup_height; -++ -++ GPU_MEM_PTR_T vpu_cmds_ptr; -++ int (*vpu_cmds_arm)[6]; // r0-r5 for each command -++ int vpu_cmds_vc; -+ #endif -+ -+ #endif -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 06371da..6367068 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -656,9 +656,23 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->frame->linesize[chroma], -+ c_tc, no_p, no_q); -+ } else -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ uint8_t (*setup)[2][2][4]; -++ int xc = x>>s->ps.sps->hshift[chroma]; -++ int yc = y>>s->ps.sps->vshift[chroma]; -++ int num16 = (yc>>4)*s->uv_setup_width + (xc>>4); -++ int a = ((yc>>3) & 1) << 1; -++ int b = (xc>>3) & 1; -++ setup = s->uv_setup_arm[num16]; -++ setup[0][b][0][a] = c_tc[0]; -++ setup[0][b][0][a + 1] = c_tc[1]; -++ } else -++#endif -+ s->hevcdsp.hevc_v_loop_filter_chroma(src, -+ s->frame->linesize[chroma], -+ c_tc, no_p, no_q); -++ -+ } -+ } -+ -+@@ -689,6 +703,19 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ s->frame->linesize[chroma], -+ c_tc, no_p, no_q); -+ } else -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ uint8_t (*setup)[2][2][4]; -++ int xc = x>>s->ps.sps->hshift[chroma]; -++ int yc = y>>s->ps.sps->vshift[chroma]; -++ int num16 = (yc>>4)*s->uv_setup_width + (xc>>4); -++ int a = ((xc>>3) & 1) << 1; -++ int b = (yc>>3) & 1; -++ setup = s->uv_setup_arm[num16]; -++ setup[1][b][0][a] = c_tc[0]; -++ setup[1][b][0][a + 1] = c_tc[1]; -++ } else -++#endif -+ s->hevcdsp.hevc_h_loop_filter_chroma(src, -+ s->frame->linesize[chroma], -+ c_tc, no_p, no_q); -+@@ -1013,33 +1040,56 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ static void rpi_deblock(HEVCContext *s, int y, int ctb_size) -+ { -+ // Flush image, 4 lines above to bottom of ctb stripe -+- ff_hevc_flush_buffer_lines(s, FFMAX(y-4,0), y+ctb_size, 1, 0); -++ ff_hevc_flush_buffer_lines(s, FFMAX(y-4,0), y+ctb_size, 1, 1); -+ // TODO flush buffer of beta/tc setup when it becomes cached -++ -++ // Prepare three commands at once to avoid calling overhead -++ s->vpu_cmds_arm[0][0] = get_vc_address(s->frame->buf[0]) + s->frame->linesize[0] * y; -++ s->vpu_cmds_arm[0][1] = s->frame->linesize[0]; -++ s->vpu_cmds_arm[0][2] = s->setup_width; -++ s->vpu_cmds_arm[0][3] = (int) ( s->y_setup_vc + s->setup_width * (y>>4) ); -++ s->vpu_cmds_arm[0][4] = ctb_size>>4; -++ s->vpu_cmds_arm[0][5] = 2; -++ -++ s->vpu_cmds_arm[1][0] = get_vc_address(s->frame->buf[1]) + s->frame->linesize[1] * (y>> s->ps.sps->vshift[1]); -++ s->vpu_cmds_arm[1][1] = s->frame->linesize[1]; -++ s->vpu_cmds_arm[1][2] = s->uv_setup_width; -++ s->vpu_cmds_arm[1][3] = (int) ( s->uv_setup_vc + s->uv_setup_width * ((y>>4)>> s->ps.sps->vshift[1]) ); -++ s->vpu_cmds_arm[1][4] = (ctb_size>>4)>> s->ps.sps->vshift[1]; -++ s->vpu_cmds_arm[1][5] = 3; -++ -++ s->vpu_cmds_arm[2][0] = get_vc_address(s->frame->buf[2]) + s->frame->linesize[2] * (y>> s->ps.sps->vshift[2]); -++ s->vpu_cmds_arm[2][1] = s->frame->linesize[2]; -++ s->vpu_cmds_arm[2][2] = s->uv_setup_width; -++ s->vpu_cmds_arm[2][3] = (int) ( s->uv_setup_vc + s->uv_setup_width * ((y>>4)>> s->ps.sps->vshift[1]) ); -++ s->vpu_cmds_arm[2][4] = (ctb_size>>4)>> s->ps.sps->vshift[1]; -++ s->vpu_cmds_arm[2][5] = 4; -++ -+ // Call VPU -+- // TODO add this to a separate pipeline of VPU jobs that can be run in parallel and wait for completion -+- vpu_wait(vpu_post_code( vpu_get_fn(), get_vc_address(s->frame->buf[0]) + s->frame->linesize[0] * y, s->frame->linesize[0], -+- s->setup_width, (int) ( s->y_setup_vc + s->setup_width * (y>>4) ), -+- ctb_size>>4, 2, 0)); // 2 means to do the deblocking code -++ vpu_wait(vpu_post_code( vpu_get_fn(), s->vpu_cmds_vc, 3, 0, 0, 0, 5, 0)); // 5 means to do all the commands -+ } -+ -+-static void rpi_deblock2(HEVCContext *s, int y, int ctb_size) -+-{ -+- int y2; -+- for(y2=y;y2= s->ps.sps->width - ctb_size; -++#ifdef RPI_DEBLOCK_VPU -++ int done_deblock = 0; -++#endif -+ if (s->avctx->skip_loop_filter < AVDISCARD_ALL) -+ deblocking_filter_CTB(s, x, y); -+ #ifdef RPI_DEBLOCK_VPU -+ if (s->enable_rpi_deblock && x_end) -+ { -+- rpi_deblock(s, y, ctb_size); -++ int y_at_end = y >= s->ps.sps->height - ctb_size; -++ int height = 64; // Deblock in units 64 high to avoid too many VPU calls -++ int y_start = y&~63; -++ if (y_at_end) height = s->ps.sps->height - y_start; -++ if ((((y+ctb_size)&63)==0) || y_at_end) { -++ done_deblock = 1; -++ rpi_deblock(s, y_start, height); -++ } -+ } -+ #endif -+ if (s->ps.sps->sao_enabled) { -+@@ -1070,11 +1120,25 @@ void ff_hevc_hls_filter(HEVCContext *s, int x, int y, int ctb_size) -+ //int newh = y + ctb_size - 4; -+ //int currh = s->ref->tf.progress->data[0]; -+ //if (((y + ctb_size)&63)==0) -++#ifdef RPI_DEBLOCK_VPU -++ if (s->enable_rpi_deblock) { -++ // we no longer need to flush the luma buffer as it is in GPU memory when using deblocking on the rpi -++ if (done_deblock) { -++ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -++ } -++ } else { -++#ifdef RPI_INTER_QPU -++ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size - 4); -++#endif -++ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -++ } -++#else -+ #ifdef RPI_INTER_QPU -+ ff_hevc_flush_buffer(s, &s->ref->tf, y + ctb_size - 4); -+- // TODO we no longer need to flush the luma buffer as it is in GPU memory when using deblocking on the rpi -++ // we no longer need to flush the luma buffer as it is in GPU memory when using deblocking on the rpi -+ #endif -+ ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); -++#endif -+ } -+ } -+ -+diff --git a/libavcodec/rpi_hevc_transform.h b/libavcodec/rpi_hevc_transform.h -+index b3f155f..4309f1c 100644 -+--- a/libavcodec/rpi_hevc_transform.h -++++ b/libavcodec/rpi_hevc_transform.h -+@@ -3,14 +3,32 @@ unsigned char rpi_hevc_transform [] = { -+ 106, -+ 0, -+ 144, -+-38, -++47, -+ 1, -+ 37, -+ 106, -+ 0, -+ 144, -+-57, -++66, -+ 1, -++53, -++106, -++0, -++144, -++192, -++4, -++69, -++106, -++0, -++144, -++192, -++4, -++85, -++106, -++0, -++144, -++220, -++5, -+ 169, -+ 3, -+ 62, -+@@ -2427,4 +2445,626 @@ unsigned char rpi_hevc_transform [] = { -+ 128, -+ 90, -+ 0, -++169, -++3, -++14, -++96, -++4, -++31, -++169, -++3, -++30, -++96, -++1, -++31, -++73, -++64, -++52, -++64, -++45, -++64, -++2, -++64, -++10, -++64, -++64, -++198, -++1, -++7, -++8, -++232, -++63, -++0, -++0, -++0, -++6, -++232, -++253, -++255, -++255, -++255, -++0, -++246, -++0, -++0, -++0, -++4, -++215, -++64, -++3, -++96, -++2, -++248, -++0, -++35, -++0, -++0, -++64, -++56, -++0, -++0, -++4, -++248, -++0, -++36, -++0, -++0, -++64, -++56, -++8, -++0, -++0, -++240, -++64, -++0, -++132, -++3, -++30, -++106, -++132, -++24, -++128, -++240, -++0, -++0, -++132, -++3, -++128, -++144, -++143, -++0, -++131, -++98, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++135, -++0, -++131, -++102, -++0, -++158, -++71, -++0, -++2, -++248, -++0, -++35, -++0, -++0, -++64, -++56, -++0, -++0, -++4, -++248, -++0, -++36, -++0, -++0, -++64, -++56, -++8, -++0, -++0, -++240, -++64, -++0, -++132, -++3, -++30, -++106, -++132, -++24, -++128, -++240, -++0, -++0, -++132, -++3, -++128, -++144, -++112, -++0, -++131, -++98, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++104, -++0, -++131, -++102, -++0, -++248, -++64, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++30, -++106, -++134, -++24, -++128, -++248, -++0, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++144, -++123, -++0, -++188, -++64, -++67, -++232, -++0, -++2, -++0, -++0, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++112, -++0, -++195, -++232, -++0, -++2, -++0, -++0, -++12, -++128, -++7, -++192, -++130, -++248, -++0, -++0, -++112, -++192, -++224, -++16, -++195, -++31, -++132, -++248, -++1, -++0, -++112, -++0, -++224, -++16, -++203, -++31, -++3, -++99, -++131, -++71, -++68, -++232, -++32, -++0, -++0, -++0, -++0, -++99, -++2, -++99, -++23, -++102, -++7, -++106, -++127, -++156, -++178, -++255, -++0, -++248, -++64, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++30, -++106, -++134, -++24, -++128, -++248, -++0, -++0, -++112, -++0, -++192, -++243, -++211, -++31, -++128, -++144, -++72, -++0, -++188, -++64, -++67, -++232, -++0, -++2, -++0, -++0, -++0, -++255, -++64, -++0, -++0, -++20, -++200, -++243, -++0, -++0, -++128, -++144, -++61, -++0, -++195, -++232, -++0, -++2, -++0, -++0, -++12, -++128, -++7, -++192, -++130, -++248, -++0, -++0, -++112, -++192, -++224, -++16, -++195, -++31, -++132, -++248, -++1, -++0, -++112, -++0, -++224, -++16, -++203, -++31, -++25, -++102, -++9, -++106, -++2, -++30, -++41, -++3, -++26, -++87, -++162, -++64, -++64, -++198, -++1, -++23, -++127, -++158, -++95, -++255, -++239, -++3, -++0, -++254, -++128, -++143, -++94, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++143, -++95, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++142, -++208, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++142, -++209, -++0, -++0, -++240, -++12, -++0, -++128, -++144, -++47, -++0, -++8, -++255, -++227, -++23, -++0, -++244, -++192, -++51, -++0, -++0, -++8, -++255, -++35, -++52, -++0, -++180, -++192, -++51, -++0, -++0, -++111, -++3, -++239, -++3, -++0, -++254, -++128, -++143, -++14, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++143, -++15, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++192, -++142, -++16, -++0, -++0, -++240, -++12, -++0, -++0, -++254, -++128, -++142, -++17, -++0, -++0, -++240, -++12, -++0, -++128, -++144, -++13, -++0, -++8, -++255, -++227, -++3, -++0, -++244, -++192, -++51, -++0, -++0, -++8, -++255, -++35, -++4, -++0, -++180, -++192, -++51, -++0, -++0, -++111, -++3, -++32, -++246, -++192, -++11, -++1, -++16, -++32, -++246, -++2, -++140, -++47, -++240, -++32, -++247, -++35, -++141, -++63, -++178, -++64, -++254, -++35, -++141, -++2, -++68, -++192, -++243, -++128, -++11, -++32, -++255, -++35, -++240, -++58, -++226, -++192, -++243, -++188, -++10, -++0, -++254, -++0, -++141, -++4, -++4, -++0, -++240, -++128, -++10, -++88, -++246, -++35, -++141, -++3, -++68, -++240, -++246, -++35, -++141, -++48, -++66, -++0, -++247, -++227, -++143, -++52, -++242, -++32, -++247, -++227, -++142, -++52, -++178, -++90, -++0, -++161, -++3, -++6, -++64, -++23, -++64, -++96, -++8, -++70, -++98, -++97, -++8, -++70, -++98, -++98, -++8, -++70, -++98, -++99, -++8, -++70, -++98, -++100, -++8, -++70, -++98, -++101, -++8, -++70, -++98, -++255, -++159, -++8, -++250, -++23, -++102, -++7, -++106, -++112, -++30, -++33, -++3, -+ }; -+diff --git a/libavcodec/rpi_hevc_transform.s b/libavcodec/rpi_hevc_transform.s -+index b055208..5543093 100644 -+--- a/libavcodec/rpi_hevc_transform.s -++++ b/libavcodec/rpi_hevc_transform.s -+@@ -85,6 +85,13 @@ hevc_trans_16x16: -+ beq memclear16 -+ cmp r5,2 -+ beq hevc_deblock_16x16 -++ cmp r5,3 -++ beq hevc_uv_deblock_16x16 -++ cmp r5,4 -++ beq hevc_uv_deblock_16x16_with_clear -++ cmp r5,5 -++ beq hevc_run_command_list -++ -+ push r6-r15, lr # TODO cut down number of used registers -+ mov r14,r3 # coeffs32 -+ mov r15,r4 # num32 -+@@ -708,3 +715,203 @@ normal_filtering: -+ -+ filtering_done: -+ b lr -++ -++ -++hevc_uv_deblock_16x16: -++ push r6-r15, lr -++ mov r14,0 -++ b hevc_uv_start -++hevc_uv_deblock_16x16_with_clear: -++ push r6-r15, lr -++ mov r14,1 -++ b hevc_uv_start -++ -++hevc_uv_start: -++ mov r9,r4 -++ mov r4,r3 -++ mov r13,r2 -++ mov r2,r0 -++ mov r10,r0 -++ subscale4 r0,r1 -++ mov r8,63 -++ mov r6,-3 -++ vmov H(zeros,0),0 -++# r7 is number of blocks still to load -++# r0 is location of current block - 4 * stride -++# r1 is stride -++# r2 is location of current block -++# r3 is offset of start of block (actual edges start at H(16,16)+r3 for horizontal and H(16,0)+r3 for vertical -++# r4 is setup -++# r5 is for temporary calculations -++# r8 holds 63 -++# r6 holds -3 -++# r9 holds the number of 16 high rows to process -++# r10 holds the original img base -++# r11 returns 0 if no filtering was done on the edge -++# r12 saves a copy of this -++# r13 is copy of width -++# r14 is 1 if we should clear the old contents, or 0 if not -++ -++uv_process_row: -++ # First iteration does not do horizontal filtering on previous -++ mov r7, r13 -++ mov r3,0 -++ vldb H(12++,16)+r3,(r0 += r1) REP 4 # Load the current block -++ vldb H(16++,16)+r3,(r2 += r1) REP 16 -++ vldb H(setup_input,0), (r4) # We may wish to prefetch these -++ cmp r14,1 -++ bne uv_skip0 -++ vstb H(zeros,0),(r4) -++uv_skip0: -++ bl uv_vert_filter -++ add r3,8 -++ vadd H(setup_input,0),H(setup_input,8),0 # Rotate to second set of 8 -++ bl uv_vert_filter -++ sub r3,8 -++ b uv_start_deblock_loop -++uv_deblock_loop: -++ # Middle iterations do vertical on current block and horizontal on preceding -++ vldb H(12++,16)+r3,(r0 += r1) REP 4 # load the current block -++ vldb H(16++,16)+r3,(r2 += r1) REP 16 -++ vldb H(setup_input,0), (r4) -++ cmp r14,1 -++ bne uv_skip1 -++ vstb H(zeros,0),(r4) -++uv_skip1: -++ bl uv_vert_filter -++ add r3,8 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl uv_vert_filter -++ sub r3,8 -++ vldb H(setup_input,0), -16(r4) -++ cmp r14,1 -++ bne uv_skip3 -++ vstb H(zeros,0),-16(r4) -++uv_skip3: -++ bl uv_horz_filter -++ mov r12,r11 -++ add r3,8*64 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl uv_horz_filter -++ sub r3,8*64 -++ addcmpbeq r12,0,0,uv_skip_save_top -++ vstb H(12++,0)+r3,-16(r0 += r1) REP 4 # Save the deblocked pixels for the previous block -++uv_skip_save_top: -++ vstb H(16++,0)+r3,-16(r2 += r1) REP 16 -++uv_start_deblock_loop: -++ # move onto next 16x16 (could do this with circular buffer support instead) -++ add r3,16 -++ and r3,r8 -++ add r4,32 -++ # Perform loop counter operations (may work with an addcmpbgt as well?) -++ add r0,16 -++ add r2,16 -++ sub r7,1 -++ cmp r7,0 # Are there still more blocks to load -++ bgt uv_deblock_loop -++ -++ # Final iteration needs to just do horizontal filtering -++ vldb H(setup_input,0), -16(r4) -++ cmp r14,1 -++ bne uv_skip2 -++ vstb H(zeros,0),-16(r4) -++uv_skip2: -++ bl uv_horz_filter -++ mov r12,r11 -++ add r3,8*64 -++ vadd H(setup_input,0),H(setup_input,8),0 -++ bl uv_horz_filter -++ sub r3,64*8 -++ addcmpbeq r12,0,0,uv_skip_save_top2 -++ vstb H(12++,0)+r3,-16(r0 += r1) REP 4 # Save the deblocked pixels for the previous block -++uv_skip_save_top2: -++ vstb H(16++,0)+r3,-16(r2 += r1) REP 16 -++ -++# Now look to see if we should do another row -++ sub r9,1 -++ cmp r9,0 -++ bgt uv_start_again -++ pop r6-r15, pc -++uv_start_again: -++ # Need to sort out r0,r2 to point to next row down -++ addscale16 r10,r1 -++ mov r2,r10 -++ subscale4 r0,r2,r1 -++ b uv_process_row -++ -++ -++# At this stage H(16,16)+r3 points to the first pixel of the 16 high edge to be filtered -++# So we can reuse the code we move the parts to be filtered into HX(P0/P1/P2/P3/Q0/Q1/Q2/Q3,0) - we will perform a final saturation step on placing them back into the correct locations -++ -++uv_vert_filter: -++ push lr -++ -++ vmov HX(P1,0), V(16,14)+r3 -++ vmov HX(P0,0), V(16,15)+r3 -++ vmov HX(Q0,0), V(16,16)+r3 -++ vmov HX(Q1,0), V(16,17)+r3 -++ -++ bl do_chroma_filter -++ -++ vadds V(16,15)+r3, HX(P0,0), 0 -++ vadds V(16,16)+r3, HX(Q0,0), 0 -++ -++ pop pc -++ -++# Filter edge at H(16,0)+r3 -++uv_horz_filter: -++ push lr -++ -++ vmov HX(P1,0), H(14,0)+r3 -++ vmov HX(P0,0), H(15,0)+r3 -++ vmov HX(Q0,0), H(16,0)+r3 -++ vmov HX(Q1,0), H(17,0)+r3 -++ -++ bl do_chroma_filter -++ -++ vadds H(15,0)+r3, HX(P0,0), 0 -++ # P3 and Q3 never change so don't bother saving back -++ vadds H(16,0)+r3, HX(Q0,0), 0 -++ -++ pop pc -++ -++# r4 points to array of beta/tc for each 4 length edge -++do_chroma_filter: -++ valtl H(setup,0),H(setup_input,0),H(setup_input,0) # tc*8 -++ valtl HX(tc,0),H(setup,0),H(setup,0) -++ -++ vsub HX(delta,0),HX(Q0,0),HX(P0,0) -++ vshl HX(delta,0),HX(delta,0),2 CLRA SACC -++ vsub -,HX(P1,0),HX(Q1,0) SACC -++ vmov HX(delta,0),4 SACC -++ vasr HX(delta,0),HX(delta,0),3 -++ vclamps HX(delta,0), HX(delta,0), HX(tc,0) -++ vadd HX(P0,0),HX(P0,0),HX(delta,0) -++ vsub HX(Q0,0),HX(Q0,0),HX(delta,0) -++ b lr -++ -++# r0 = list -++# r1 = number -++hevc_run_command_list: -++ push r6-r7, lr -++ mov r6, r0 -++ mov r7, r1 -++loop_cmds: -++ ld r0,(r6) # How to encode r6++? -++ add r6,4 -++ ld r1,(r6) -++ add r6,4 -++ ld r2,(r6) -++ add r6,4 -++ ld r3,(r6) -++ add r6,4 -++ ld r4,(r6) -++ add r6,4 -++ ld r5,(r6) -++ add r6,4 -++ bl hevc_trans_16x16 -++ sub r7,1 -++ cmp r7,0 -++ bgt loop_cmds -++ -++ pop r6-r7, pc -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 91777be..5aa0432 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -397,6 +397,8 @@ static void *vpu_start(void *arg) { -+ int start_time; -+ int end_time; -+ int count=0; -++ int count_deblock=0; -++ int count_qpu=0; -+ #endif -+ while(1) { -+ int i; -+@@ -442,7 +444,7 @@ static void *vpu_start(void *arg) { -+ break; -+ } -+ } -+- printf("Have_qpu = %d, have_vpu=%d\n",have_qpu,have_vpu); -++ //printf("Have_qpu = %d, have_vpu=%d\n",have_qpu,have_vpu); -+ #endif -+ qpu_code = p[7]; -+ qpu_codeb = p[16]; -+@@ -460,6 +462,12 @@ static void *vpu_start(void *arg) { -+ off_time += start_time-last_time; -+ #endif -+ -++#define NO_FLUSH 1 -++#define CLEAR_PROFILE 2 -++#define OUTPUT_COUNTS 4 -++ -++#define FLAGS_FOR_PROFILING (NO_FLUSH) -++ -+ #ifdef RPI_COMBINE_JOBS -+ if (have_qpu) { -+ for(i=0;i<8;i++) { -+@@ -472,14 +480,14 @@ static void *vpu_start(void *arg) { -+ } -+ if (have_vpu) { -+ execute_multi(gpu->mb, -+- 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 12,gpu->vc + offsetof(struct GPU, mail2), FLAGS_FOR_PROFILING, 5000, -+ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -+ q[0], q[1], q[2], q[3], q[4], q[5], q[6]); // VPU1 -+ q[0] = 0; -+ } else { -+ execute_multi(gpu->mb, -+- 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 12,gpu->vc + offsetof(struct GPU, mail2), FLAGS_FOR_PROFILING, 5000, -+ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -+ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -+@@ -510,7 +518,7 @@ static void *vpu_start(void *arg) { -+ execute_qpu(gpu->mb,8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */); -+ #else -+ execute_multi(gpu->mb, -+- 12,gpu->vc + offsetof(struct GPU, mail2), 1, 5000, -++ 12,gpu->vc + offsetof(struct GPU, mail2), FLAGS_FOR_PROFILING , 5000, -+ 8,gpu->vc + offsetof(struct GPU, mail), 1 /* no flush */, 5000 /* timeout ms */, -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], // VPU0 -+ 0, 0 , 0 , 0 , 0 , 0 , 0); // VPU1 -+@@ -525,17 +533,20 @@ static void *vpu_start(void *arg) { -+ // There are three cases we may wish to distinguish of VPU/QPU activity -+ on_time += end_time - start_time; -+ #else -+- if (p[6]==2) -++ if (p[6]>1) { -++ count_deblock++; -+ on_time_deblock += end_time - start_time; -+- else -++ } else { -+ on_time += end_time - start_time; -++ count_qpu++; -++ } -+ #endif -+ count++; -+ if ((count&0x7f)==0) -+ #ifdef RPI_COMBINE_JOBS -+- printf("Posted %d On=%dms, On_deblock=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(on_time_deblock/1000),(int)(off_time/1000)); -+-#else -+ printf("Posted %d On=%dms, Off=%dms\n",count,(int)(on_time/1000),(int)(off_time/1000)); -++#else -++ printf("Posted %d On=%dms (%d calls), On_deblock=%dms (%d calls), Off=%dms\n",count,(int)(on_time/1000),count_qpu,(int)(on_time_deblock/1000),count_deblock,(int)(off_time/1000)); -+ #endif -+ #endif -+ job_done_early: -+diff --git a/libavcodec/rpi_shader.qasm b/libavcodec/rpi_shader.qasm -+index 0686249..64bf5b0 100644 -+--- a/libavcodec/rpi_shader.qasm -++++ b/libavcodec/rpi_shader.qasm -+@@ -1077,6 +1077,17 @@ nop ; nop # delay slot 2 -+ ::mc_interrupt_exit12 -+ mov -, vw_wait # wait on the VDW -+ -++ # Dummy wait to test instructions -++# mov r3,1000000 -++#:dummy_loop -++# sub.setf r3, r3, 1 -++# nop -++# nop -++# brr.anynn -, r:dummy_loop -++# nop -++# nop -++# nop -++ -+ ldtmu0 -+ ldtmu0 -+ ldtmu1 -+-- -+2.7.4 -+ -+ -+From 12a194bddd049ab97154e9fbdd46b63b558a3bee Mon Sep 17 00:00:00 2001 -+From: Ben Avison -+Date: Tue, 23 Jun 2015 23:42:03 +0100 -+Subject: [PATCH 67/68] armv7/hevc: Optimise deblocking boundary strength -+ calculation -+ -+--- -+ libavcodec/arm/hevcdsp_deblock_neon.S | 115 +++++++++++++++++ -+ libavcodec/arm/hevcdsp_init_neon.c | 9 ++ -+ libavcodec/hevc.h | 11 -- -+ libavcodec/hevc_filter.c | 224 ++++++++++++++-------------------- -+ libavcodec/hevcdsp.c | 116 ++++++++++++++++++ -+ libavcodec/hevcdsp.h | 14 +++ -+ 6 files changed, 344 insertions(+), 145 deletions(-) -+ -+diff --git a/libavcodec/arm/hevcdsp_deblock_neon.S b/libavcodec/arm/hevcdsp_deblock_neon.S -+index 166bddb..bad4589 100644 -+--- a/libavcodec/arm/hevcdsp_deblock_neon.S -++++ b/libavcodec/arm/hevcdsp_deblock_neon.S -+@@ -383,3 +383,118 @@ function ff_hevc_h_loop_filter_chroma_neon, export=1 -+ vst1.8 {d4}, [r0] -+ bx lr -+ endfunc -++ -++/* ff_hevc_deblocking_boundary_strengths_neon(int pus, int dup, int in_inc, int out_inc, -++ * int *curr_rpl0, int *curr_rpl1, int *neigh_rpl0, int *neigh_rpl1, -++ * MvField *curr, MvField *neigh, uint8_t *bs) -++ */ -++function ff_hevc_deblocking_boundary_strengths_neon, export=1 -++ add ip, sp, #4*4 -++ push {a2-a4,v1-v8,lr} -++ ldmia ip, {v5-v7} -++1: ldmdb ip, {v1-v4} -++ ldrsb a3, [v5, #8] @ curr->ref_idx -++ ldrsb v8, [v5, #9] -++ ldrsb ip, [v6, #8] @ neigh->ref_idx -++ ldrsb lr, [v6, #9] -++ ldr v1, [v1, a3, lsl #2] -++ ldrb a3, [v5, #10] @ curr->pred_flag -++ ldr v2, [v2, v8, lsl #2] -++ ldrb v8, [v6, #10] @ neigh->pred_flag -++ ldr v3, [v3, ip, lsl #2] -++ ldr v4, [v4, lr, lsl #2] -++ teq a3, #3 -++ beq 20f -++ teq v8, #3 -++ beq 90f -++ -++ tst a3, #1 -++ ldrne a3, [v5, #0] @ curr->mv[0] -++ ldreq a3, [v5, #4] @ curr->mv[1] -++ moveq v1, v2 -++ tst v8, #1 -++ ldrne v8, [v6, #0] @ neigh->mv[0] -++ ldreq v8, [v6, #4] @ neigh->mv[1] -++ moveq v3, v4 -++ teq v1, v3 -++ bne 10f -++ ldr lr, =0xFFFCFFFC -++ ssub16 ip, v8, a3 -++ ssub16 a3, a3, v8 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ @ drop through -++10: movne a3, #1 -++11: subs a2, a2, #1 -++12: strbhs a3, [v7], a4 -++ subs a2, a2, #1 -++ bhs 12b -++ -++ ldm sp, {a2, a3} -++ add ip, sp, #16*4 -++ subs a1, a1, #1 -++ add v5, v5, a3 -++ add v6, v6, a3 -++ bhi 1b -++ pop {a2-a4,v1-v8,pc} -++ -++20: teq v8, #3 -++ bne 10b -++ -++ teq v1, v3 -++ teqeq v2, v4 -++ bne 40f -++ teq v1, v2 -++ bne 30f -++ -++ ldrd v1, v2, [v5] @ curr->mv -++ ldrd v3, v4, [v6] @ neigh->mv -++ ldr lr, =0xFFFCFFFC -++ ssub16 ip, v3, v1 -++ ssub16 a3, v1, v3 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ bne 25f -++ ssub16 ip, v4, v2 -++ ssub16 a3, v2, v4 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ beq 11b -++ @ drop through -++25: ssub16 ip, v4, v1 -++ ssub16 a3, v1, v4 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ bne 10b -++ ssub16 ip, v3, v2 -++ ssub16 a3, v2, v3 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ b 10b -++ -++30: ldrd v1, v2, [v5] @ curr->mv -++ ldrd v3, v4, [v6] @ neigh->mv -++ ldr lr, =0xFFFCFFFC -++ ssub16 ip, v3, v1 -++ ssub16 a3, v1, v3 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ bne 10b -++ ssub16 ip, v4, v2 -++ ssub16 a3, v2, v4 -++ sel a3, a3, ip -++ ands a3, a3, lr -++ b 10b -++ -++40: teq v1, v4 -++ teqeq v2, v3 -++ bne 10b -++ -++ ldrd v1, v2, [v5] @ curr->mv -++ ldrd v3, v4, [v6] @ neigh->mv -++ ldr lr, =0xFFFCFFFC -++ b 25b -++ -++90: mov a3, #1 -++ b 11b -++endfunc -+diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c -+index e5da7e9..49c70dd 100644 -+--- a/libavcodec/arm/hevcdsp_init_neon.c -++++ b/libavcodec/arm/hevcdsp_init_neon.c -+@@ -290,6 +290,10 @@ static void ff_hevc_sao_edge_neon_wrapper(uint8_t *_dst /* align 16 */, uint8_t -+ } -+ #undef CMP -+ -++void ff_hevc_deblocking_boundary_strengths_neon(int pus, int dup, int in_inc, int out_inc, -++ int *curr_rpl0, int *curr_rpl1, int *neigh_rpl0, int *neigh_rpl1, -++ MvField *curr, MvField *neigh, uint8_t *bs); -++ -+ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ { -+ if (bit_depth == 8) { -+@@ -387,4 +391,9 @@ av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) -+ c->put_hevc_qpel_uni[8][0][0] = ff_hevc_put_qpel_uw_pixels_w48_neon_8; -+ c->put_hevc_qpel_uni[9][0][0] = ff_hevc_put_qpel_uw_pixels_w64_neon_8; -+ } -++ -++ assert(offsetof(MvField, mv) == 0); -++ assert(offsetof(MvField, ref_idx) == 8); -++ assert(offsetof(MvField, pred_flag) == 10); -++ c->hevc_deblocking_boundary_strengths = ff_hevc_deblocking_boundary_strengths_neon; -+ } -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 7eb37e6..496c0e1 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -684,17 +684,6 @@ typedef struct CodingUnit { -+ uint8_t cu_transquant_bypass_flag; -+ } CodingUnit; -+ -+-typedef struct Mv { -+- int16_t x; ///< horizontal component of motion vector -+- int16_t y; ///< vertical component of motion vector -+-} Mv; -+- -+-typedef struct MvField { -+- DECLARE_ALIGNED(4, Mv, mv)[2]; -+- int8_t ref_idx[2]; -+- int8_t pred_flag; -+-} MvField; -+- -+ typedef struct NeighbourAvailable { -+ int cand_bottom_left; -+ int cand_left; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 6367068..826a82f 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -726,69 +726,6 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) -+ } -+ } -+ -+-static int boundary_strength(HEVCContext *s, MvField *curr, MvField *neigh, -+- RefPicList *neigh_refPicList) -+-{ -+- if (curr->pred_flag == PF_BI && neigh->pred_flag == PF_BI) { -+- // same L0 and L1 -+- if (s->ref->refPicList[0].list[curr->ref_idx[0]] == neigh_refPicList[0].list[neigh->ref_idx[0]] && -+- s->ref->refPicList[0].list[curr->ref_idx[0]] == s->ref->refPicList[1].list[curr->ref_idx[1]] && -+- neigh_refPicList[0].list[neigh->ref_idx[0]] == neigh_refPicList[1].list[neigh->ref_idx[1]]) { -+- if ((FFABS(neigh->mv[0].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[0].y) >= 4 || -+- FFABS(neigh->mv[1].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[1].y) >= 4) && -+- (FFABS(neigh->mv[1].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[0].y) >= 4 || -+- FFABS(neigh->mv[0].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[1].y) >= 4)) -+- return 1; -+- else -+- return 0; -+- } else if (neigh_refPicList[0].list[neigh->ref_idx[0]] == s->ref->refPicList[0].list[curr->ref_idx[0]] && -+- neigh_refPicList[1].list[neigh->ref_idx[1]] == s->ref->refPicList[1].list[curr->ref_idx[1]]) { -+- if (FFABS(neigh->mv[0].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[0].y) >= 4 || -+- FFABS(neigh->mv[1].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[1].y) >= 4) -+- return 1; -+- else -+- return 0; -+- } else if (neigh_refPicList[1].list[neigh->ref_idx[1]] == s->ref->refPicList[0].list[curr->ref_idx[0]] && -+- neigh_refPicList[0].list[neigh->ref_idx[0]] == s->ref->refPicList[1].list[curr->ref_idx[1]]) { -+- if (FFABS(neigh->mv[1].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[0].y) >= 4 || -+- FFABS(neigh->mv[0].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[1].y) >= 4) -+- return 1; -+- else -+- return 0; -+- } else { -+- return 1; -+- } -+- } else if ((curr->pred_flag != PF_BI) && (neigh->pred_flag != PF_BI)){ // 1 MV -+- Mv A, B; -+- int ref_A, ref_B; -+- -+- if (curr->pred_flag & 1) { -+- A = curr->mv[0]; -+- ref_A = s->ref->refPicList[0].list[curr->ref_idx[0]]; -+- } else { -+- A = curr->mv[1]; -+- ref_A = s->ref->refPicList[1].list[curr->ref_idx[1]]; -+- } -+- -+- if (neigh->pred_flag & 1) { -+- B = neigh->mv[0]; -+- ref_B = neigh_refPicList[0].list[neigh->ref_idx[0]]; -+- } else { -+- B = neigh->mv[1]; -+- ref_B = neigh_refPicList[1].list[neigh->ref_idx[1]]; -+- } -+- -+- if (ref_A == ref_B) { -+- if (FFABS(A.x - B.x) >= 4 || FFABS(A.y - B.y) >= 4) -+- return 1; -+- else -+- return 0; -+- } else -+- return 1; -+- } -+- -+- return 1; -+-} -+ -+ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ int log2_trafo_size) -+@@ -799,10 +736,17 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ int log2_min_tu_size = s->ps.sps->log2_min_tb_size; -+ int min_pu_width = s->ps.sps->min_pu_width; -+ int min_tu_width = s->ps.sps->min_tb_width; -+- int is_intra = tab_mvf[(y0 >> log2_min_pu_size) * min_pu_width + -+- (x0 >> log2_min_pu_size)].pred_flag == PF_INTRA; -+ int boundary_upper, boundary_left; -+- int i, j, bs; -++ int i, j; -++ RefPicList *rpl = s->ref->refPicList; -++ int min_pu_in_4pix = (1 << log2_min_pu_size) >> 2; -++ int trafo_in_min_pus = (1 << log2_trafo_size) >> log2_min_pu_size; -++ int y_pu = y0 >> log2_min_pu_size; -++ int x_pu = x0 >> log2_min_pu_size; -++ MvField *curr = &tab_mvf[y_pu * min_pu_width + x_pu]; -++ int is_intra = curr->pred_flag == PF_INTRA; -++ int inc = log2_min_pu_size == 2 ? 2 : 1; -++ uint8_t *bs; -+ -+ #ifdef DISABLE_STRENGTHS -+ return; -+@@ -818,34 +762,56 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ (y0 % (1 << s->ps.sps->log2_ctb_size)) == 0))) -+ boundary_upper = 0; -+ -++ bs = &s->horizontal_bs[(x0 + y0 * s->bs_width) >> 2]; -++ -+ if (boundary_upper) { -+ RefPicList *rpl_top = (lc->boundary_flags & BOUNDARY_UPPER_SLICE) ? -+ ff_hevc_get_ref_list(s, s->ref, x0, y0 - 1) : -+- s->ref->refPicList; -+- int yp_pu = (y0 - 1) >> log2_min_pu_size; -+- int yq_pu = y0 >> log2_min_pu_size; -+- int yp_tu = (y0 - 1) >> log2_min_tu_size; -+- int yq_tu = y0 >> log2_min_tu_size; -++ rpl; -++ MvField *top = curr - min_pu_width; -++ -++ if (is_intra) { -++ for (i = 0; i < (1 << log2_trafo_size); i += 4) -++ bs[i >> 2] = 2; -++ -++ } else { -++ int y_tu = y0 >> log2_min_tu_size; -++ int x_tu = x0 >> log2_min_tu_size; -++ uint8_t *curr_cbf_luma = &s->cbf_luma[y_tu * min_tu_width + x_tu]; -++ uint8_t *top_cbf_luma = curr_cbf_luma - min_tu_width; -++ -++ s->hevcdsp.hevc_deblocking_boundary_strengths(trafo_in_min_pus, -++ min_pu_in_4pix, sizeof (MvField), 4 >> 2, -++ rpl[0].list, rpl[1].list, rpl_top[0].list, rpl_top[1].list, -++ curr, top, bs); -+ -+ for (i = 0; i < (1 << log2_trafo_size); i += 4) { -+- int x_pu = (x0 + i) >> log2_min_pu_size; -+- int x_tu = (x0 + i) >> log2_min_tu_size; -+- MvField *top = &tab_mvf[yp_pu * min_pu_width + x_pu]; -+- MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu]; -+- uint8_t top_cbf_luma = s->cbf_luma[yp_tu * min_tu_width + x_tu]; -+- uint8_t curr_cbf_luma = s->cbf_luma[yq_tu * min_tu_width + x_tu]; -+- -+- if (curr->pred_flag == PF_INTRA || top->pred_flag == PF_INTRA) -+- bs = 2; -+- else if (curr_cbf_luma || top_cbf_luma) -+- bs = 1; -+- else -+- bs = boundary_strength(s, curr, top, rpl_top); -+- s->horizontal_bs[((x0 + i) + y0 * s->bs_width) >> 2] = bs; -++ int i_pu = i >> log2_min_pu_size; -++ int i_tu = i >> log2_min_tu_size; -++ -++ if (top[i_pu].pred_flag == PF_INTRA) -++ bs[i >> 2] = 2; -++ else if (curr_cbf_luma[i_tu] || top_cbf_luma[i_tu]) -++ bs[i >> 2] = 1; -+ } -++ } -++ } -++ -++ if (!is_intra) { -++ for (j = inc; j < trafo_in_min_pus; j += inc) { -++ MvField *top; -++ -++ curr += min_pu_width * inc; -++ top = curr - min_pu_width; -++ bs += s->bs_width * inc << log2_min_pu_size >> 2; -++ -++ s->hevcdsp.hevc_deblocking_boundary_strengths(trafo_in_min_pus, -++ min_pu_in_4pix, sizeof (MvField), 4 >> 2, -++ rpl[0].list, rpl[1].list, rpl[0].list, rpl[1].list, -++ curr, top, bs); -++ } -+ } -+ -+- // bs for vertical TU boundaries -+ boundary_left = x0 > 0 && !(x0 & 7); -+ if (boundary_left && -+ ((!s->sh.slice_loop_filter_across_slices_enabled_flag && -+@@ -856,64 +822,54 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ (x0 % (1 << s->ps.sps->log2_ctb_size)) == 0))) -+ boundary_left = 0; -+ -++ curr = &tab_mvf[y_pu * min_pu_width + x_pu]; -++ bs = &s->vertical_bs[(x0 + y0 * s->bs_width) >> 2]; -++ -+ if (boundary_left) { -+ RefPicList *rpl_left = (lc->boundary_flags & BOUNDARY_LEFT_SLICE) ? -+ ff_hevc_get_ref_list(s, s->ref, x0 - 1, y0) : -+- s->ref->refPicList; -+- int xp_pu = (x0 - 1) >> log2_min_pu_size; -+- int xq_pu = x0 >> log2_min_pu_size; -+- int xp_tu = (x0 - 1) >> log2_min_tu_size; -+- int xq_tu = x0 >> log2_min_tu_size; -+- -+- for (i = 0; i < (1 << log2_trafo_size); i += 4) { -+- int y_pu = (y0 + i) >> log2_min_pu_size; -+- int y_tu = (y0 + i) >> log2_min_tu_size; -+- MvField *left = &tab_mvf[y_pu * min_pu_width + xp_pu]; -+- MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu]; -+- uint8_t left_cbf_luma = s->cbf_luma[y_tu * min_tu_width + xp_tu]; -+- uint8_t curr_cbf_luma = s->cbf_luma[y_tu * min_tu_width + xq_tu]; -+- -+- if (curr->pred_flag == PF_INTRA || left->pred_flag == PF_INTRA) -+- bs = 2; -+- else if (curr_cbf_luma || left_cbf_luma) -+- bs = 1; -+- else -+- bs = boundary_strength(s, curr, left, rpl_left); -+- s->vertical_bs[(x0 + (y0 + i) * s->bs_width) >> 2] = bs; -+- } -+- } -++ rpl; -++ MvField *left = curr - 1; -+ -+- if (log2_trafo_size > log2_min_pu_size && !is_intra) { -+- RefPicList *rpl = s->ref->refPicList; -++ if (is_intra) { -++ for (j = 0; j < (1 << log2_trafo_size); j += 4) -++ bs[j * s->bs_width >> 2] = 2; -+ -+- // bs for TU internal horizontal PU boundaries -+- for (j = 8; j < (1 << log2_trafo_size); j += 8) { -+- int yp_pu = (y0 + j - 1) >> log2_min_pu_size; -+- int yq_pu = (y0 + j) >> log2_min_pu_size; -+- -+- for (i = 0; i < (1 << log2_trafo_size); i += 4) { -+- int x_pu = (x0 + i) >> log2_min_pu_size; -+- MvField *top = &tab_mvf[yp_pu * min_pu_width + x_pu]; -+- MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu]; -+- -+- bs = boundary_strength(s, curr, top, rpl); -+- s->horizontal_bs[((x0 + i) + (y0 + j) * s->bs_width) >> 2] = bs; -++ } else { -++ int y_tu = y0 >> log2_min_tu_size; -++ int x_tu = x0 >> log2_min_tu_size; -++ uint8_t *curr_cbf_luma = &s->cbf_luma[y_tu * min_tu_width + x_tu]; -++ uint8_t *left_cbf_luma = curr_cbf_luma - 1; -++ -++ s->hevcdsp.hevc_deblocking_boundary_strengths(trafo_in_min_pus, -++ min_pu_in_4pix, min_pu_width * sizeof (MvField), 4 * s->bs_width >> 2, -++ rpl[0].list, rpl[1].list, rpl_left[0].list, rpl_left[1].list, -++ curr, left, bs); -++ -++ for (j = 0; j < (1 << log2_trafo_size); j += 4) { -++ int j_pu = j >> log2_min_pu_size; -++ int j_tu = j >> log2_min_tu_size; -++ -++ if (left[j_pu * min_pu_width].pred_flag == PF_INTRA) -++ bs[j * s->bs_width >> 2] = 2; -++ else if (curr_cbf_luma[j_tu * min_tu_width] || left_cbf_luma[j_tu * min_tu_width]) -++ bs[j * s->bs_width >> 2] = 1; -+ } -+ } -++ } -+ -+- // bs for TU internal vertical PU boundaries -+- for (j = 0; j < (1 << log2_trafo_size); j += 4) { -+- int y_pu = (y0 + j) >> log2_min_pu_size; -++ if (!is_intra) { -++ for (i = inc; i < trafo_in_min_pus; i += inc) { -++ MvField *left; -+ -+- for (i = 8; i < (1 << log2_trafo_size); i += 8) { -+- int xp_pu = (x0 + i - 1) >> log2_min_pu_size; -+- int xq_pu = (x0 + i) >> log2_min_pu_size; -+- MvField *left = &tab_mvf[y_pu * min_pu_width + xp_pu]; -+- MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu]; -++ curr += inc; -++ left = curr - 1; -++ bs += inc << log2_min_pu_size >> 2; -+ -+- bs = boundary_strength(s, curr, left, rpl); -+- s->vertical_bs[((x0 + i) + (y0 + j) * s->bs_width) >> 2] = bs; -+- } -++ s->hevcdsp.hevc_deblocking_boundary_strengths(trafo_in_min_pus, -++ min_pu_in_4pix, min_pu_width * sizeof (MvField), 4 * s->bs_width >> 2, -++ rpl[0].list, rpl[1].list, rpl[0].list, rpl[1].list, -++ curr, left, bs); -+ } -+ } -+ } -+diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c -+index 9d773d9..a6534a9 100644 -+--- a/libavcodec/hevcdsp.c -++++ b/libavcodec/hevcdsp.c -+@@ -123,6 +123,120 @@ DECLARE_ALIGNED(16, const int8_t, ff_hevc_qpel_filters[3][16]) = { -+ #include "hevcdsp_template.c" -+ #undef BIT_DEPTH -+ -++static void hevc_deblocking_boundary_strengths(int pus, int dup, int in_inc, int out_inc, -++ int *curr_rpl0, int *curr_rpl1, int *neigh_rpl0, int *neigh_rpl1, -++ MvField *curr, MvField *neigh, uint8_t *bs) -++{ -++ for (; pus > 0; pus--) { -++ int strength, out; -++ int curr_refL0 = curr_rpl0[curr->ref_idx[0]]; -++ int curr_refL1 = curr_rpl1[curr->ref_idx[1]]; -++ int neigh_refL0 = neigh_rpl0[neigh->ref_idx[0]]; -++ int neigh_refL1 = neigh_rpl1[neigh->ref_idx[1]]; -++ -++#if 1 // This more directly matches the original implementation -++ if (curr->pred_flag == PF_BI && neigh->pred_flag == PF_BI) { -++ // same L0 and L1 -++ if (curr_refL0 == neigh_refL0 && -++ curr_refL0 == curr_refL1 && -++ neigh_refL0 == neigh_refL1) { -++ if ((FFABS(neigh->mv[0].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[0].y) >= 4 || -++ FFABS(neigh->mv[1].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[1].y) >= 4) && -++ (FFABS(neigh->mv[1].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[0].y) >= 4 || -++ FFABS(neigh->mv[0].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[1].y) >= 4)) -++ strength = 1; -++ else -++ strength = 0; -++ } else if (neigh_refL0 == curr_refL0 && -++ neigh_refL1 == curr_refL1) { -++ if (FFABS(neigh->mv[0].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[0].y) >= 4 || -++ FFABS(neigh->mv[1].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[1].y) >= 4) -++ strength = 1; -++ else -++ strength = 0; -++ } else if (neigh_refL1 == curr_refL0 && -++ neigh_refL0 == curr_refL1) { -++ if (FFABS(neigh->mv[1].x - curr->mv[0].x) >= 4 || FFABS(neigh->mv[1].y - curr->mv[0].y) >= 4 || -++ FFABS(neigh->mv[0].x - curr->mv[1].x) >= 4 || FFABS(neigh->mv[0].y - curr->mv[1].y) >= 4) -++ strength = 1; -++ else -++ strength = 0; -++ } else { -++ strength = 1; -++ } -++ } else if ((curr->pred_flag != PF_BI) && (neigh->pred_flag != PF_BI)){ // 1 MV -++ Mv curr_mv0, neigh_mv0; -++ -++ if (curr->pred_flag & 1) { -++ curr_mv0 = curr->mv[0]; -++ } else { -++ curr_mv0 = curr->mv[1]; -++ curr_refL0 = curr_refL1; -++ } -++ -++ if (neigh->pred_flag & 1) { -++ neigh_mv0 = neigh->mv[0]; -++ } else { -++ neigh_mv0 = neigh->mv[1]; -++ neigh_refL0 = neigh_refL1; -++ } -++ -++ if (curr_refL0 == neigh_refL0) { -++ if (FFABS(curr_mv0.x - neigh_mv0.x) >= 4 || FFABS(curr_mv0.y - neigh_mv0.y) >= 4) -++ strength = 1; -++ else -++ strength = 0; -++ } else -++ strength = 1; -++ } else -++ strength = 1; -++#else // This has exactly the same effect, but is more suitable for vectorisation -++ Mv curr_mv[2]; -++ Mv neigh_mv[2]; -++ memcpy(curr_mv, curr->mv, sizeof curr_mv); -++ memcpy(neigh_mv, neigh->mv, sizeof neigh_mv); -++ -++ if (!(curr->pred_flag & 2)) { -++ curr_mv[1] = curr_mv[0]; -++ curr_refL1 = curr_refL0; -++ } -++ if (!(neigh->pred_flag & 2)) { -++ neigh_mv[1] = neigh_mv[0]; -++ neigh_refL1 = neigh_refL0; -++ } -++ if (!(curr->pred_flag & 1)) { -++ curr_mv[0] = curr_mv[1]; -++ curr_refL0 = curr_refL1; -++ } -++ if (!(neigh->pred_flag & 1)) { -++ neigh_mv[0] = neigh_mv[1]; -++ neigh_refL0 = neigh_refL1; -++ } -++ -++ strength = 1; -++ -++ strength &= (neigh_refL0 != curr_refL0) | (neigh_refL1 != curr_refL1) | -++ (FFABS(neigh_mv[0].x - curr_mv[0].x) >= 4) | (FFABS(neigh_mv[0].y - curr_mv[0].y) >= 4) | -++ (FFABS(neigh_mv[1].x - curr_mv[1].x) >= 4) | (FFABS(neigh_mv[1].y - curr_mv[1].y) >= 4); -++ -++ strength &= (neigh_refL1 != curr_refL0) | (neigh_refL0 != curr_refL1) | -++ (FFABS(neigh_mv[1].x - curr_mv[0].x) >= 4) | (FFABS(neigh_mv[1].y - curr_mv[0].y) >= 4) | -++ (FFABS(neigh_mv[0].x - curr_mv[1].x) >= 4) | (FFABS(neigh_mv[0].y - curr_mv[1].y) >= 4); -++ -++ strength |= (((curr->pred_flag + 1) ^ (neigh->pred_flag + 1)) >> 2); -++#endif -++ -++ curr += in_inc / sizeof (MvField); -++ neigh += in_inc / sizeof (MvField); -++ -++ for (out = dup; out > 0; out--) -++ { -++ *bs = strength; -++ bs += out_inc; -++ } -++ } -++} -++ -+ void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth) -+ { -+ #undef FUNC -+@@ -257,6 +371,8 @@ int i = 0; -+ break; -+ } -+ -++ hevcdsp->hevc_deblocking_boundary_strengths = hevc_deblocking_boundary_strengths; -++ -+ if (ARCH_X86) -+ ff_hevc_dsp_init_x86(hevcdsp, bit_depth); -+ if (ARCH_ARM) -+diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h -+index 9f1f6dd..e221e54 100644 -+--- a/libavcodec/hevcdsp.h -++++ b/libavcodec/hevcdsp.h -+@@ -42,6 +42,17 @@ typedef struct SAOParams { -+ uint8_t type_idx[3]; ///< sao_type_idx -+ } SAOParams; -+ -++typedef struct Mv { -++ int16_t x; ///< horizontal component of motion vector -++ int16_t y; ///< vertical component of motion vector -++} Mv; -++ -++typedef struct MvField { -++ DECLARE_ALIGNED(4, Mv, mv)[2]; -++ int8_t ref_idx[2]; -++ int8_t pred_flag; -++} MvField; -++ -+ typedef struct HEVCDSPContext { -+ void (*put_pcm)(uint8_t *_dst, ptrdiff_t _stride, int width, int height, -+ struct GetBitContext *gb, int pcm_bit_depth); -+@@ -120,6 +131,9 @@ typedef struct HEVCDSPContext { -+ void (*hevc_v_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride, -+ int32_t *tc, uint8_t *no_p, -+ uint8_t *no_q); -++ void (*hevc_deblocking_boundary_strengths)(int pus, int dup, int in_inc, int out_inc, -++ int *curr_rpl0, int *curr_rpl1, int *neigh_rpl0, int *neigh_rpl1, -++ MvField *curr, MvField *neigh, uint8_t *bs); -+ } HEVCDSPContext; -+ -+ void ff_hevc_dsp_init(HEVCDSPContext *hpc, int bit_depth); -+-- -+2.7.4 -+ -+ -+From 619366d6acfd5f040a3116fda97b1146c8e40250 Mon Sep 17 00:00:00 2001 -+From: Peter de Rivaz -+Date: Wed, 15 Jul 2015 09:09:11 +0100 -+Subject: [PATCH 68/68] Only enable qpu when needed -+ -+--- -+ libavcodec/hevc.h | 2 +- -+ libavcodec/rpi_qpu.c | 21 ++++++++++++++++----- -+ 2 files changed, 17 insertions(+), 6 deletions(-) -+ -+diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h -+index 496c0e1..ce14975 100644 -+--- a/libavcodec/hevc.h -++++ b/libavcodec/hevc.h -+@@ -57,7 +57,7 @@ -+ // Define RPI_WORKER to launch a worker thread for pixel processing tasks -+ #define RPI_WORKER -+ // Define RPI_DEBLOCK_VPU to perform deblocking on the VPUs -+- #define RPI_DEBLOCK_VPU -++ //#define RPI_DEBLOCK_VPU -+ -+ #endif -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index 5aa0432..ffd13ca 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -9,7 +9,7 @@ -+ // define RPI_ASYNC to run the VPU in a separate thread, need to make a separate call to check for completion -+ #define RPI_ASYNC -+ // Define RPI_COMBINE_JOBS to find jobs that can be executed in parallel -+-#define RPI_COMBINE_JOBS -++//#define RPI_COMBINE_JOBS -+ -+ #include -+ #include -+@@ -143,9 +143,9 @@ static int gpu_init(volatile struct GPU **gpu) { -+ volatile struct GPU* ptr; -+ if (mb < 0) -+ return -1; -+- -++#ifndef RPI_ASYNC -+ if (qpu_enable(mb, 1)) return -2; -+- -++#endif -+ vcsm_init(); -+ gpu_malloc_uncached_internal(sizeof(struct GPU), &gpu_mem_ptr, mb); -+ ptr = (volatile struct GPU*)gpu_mem_ptr.arm; -+@@ -336,9 +336,9 @@ static void gpu_term(void) -+ vpu_post_code(0, 0, 0, 0, 0, 0, -1, NULL); -+ pthread_join(vpu_thread, &res); -+ } -+-#endif -+- -++#else -+ qpu_enable(mb, 0); -++#endif -+ gpu_free_internal(&gpu_mem_ptr); -+ -+ vcsm_exit(); -+@@ -400,6 +400,7 @@ static void *vpu_start(void *arg) { -+ int count_deblock=0; -+ int count_qpu=0; -+ #endif -++ int qpu_started = 0; -+ while(1) { -+ int i; -+ int *p; // Pointer for a QPU/VPU job -+@@ -427,6 +428,12 @@ static void *vpu_start(void *arg) { -+ if (p[7] == 0 && p[0] == 0 && p[16]==0) -+ goto job_done_early; -+ -++ if (!qpu_started) { -++ int result = qpu_enable(gpu->mb, 1); -++ av_assert0(result==0); -++ qpu_started = 1; -++ } -++ -+ #ifdef RPI_COMBINE_JOBS -+ // First scan for a qpu job -+ for (int x=0;xmb, 0); -++ } -++ -+ return NULL; -+ } -+ -+-- -+2.7.4 -+ -+From a0d0946951b53e64ce103dd61b455f8d1f72caf9 Mon Sep 17 00:00:00 2001 -+From: John Cox -+Date: Tue, 9 Feb 2016 11:57:40 +0000 -+Subject: [PATCH 1/2] Zero copy code v6 -+ -+This version has GPU buffer pooling code -+--- -+ ffmpeg.c | 123 +++++++++----- -+ libavcodec/Makefile | 2 + -+ libavcodec/avcodec.h | 6 + -+ libavcodec/hevc.c | 92 ++++++----- -+ libavcodec/hevc_filter.c | 83 +++++----- -+ libavcodec/rpi_qpu.c | 2 +- -+ libavcodec/rpi_qpu.h | 109 ++++++++++++- -+ libavcodec/rpi_zc.c | 406 +++++++++++++++++++++++++++++++++++++++++++++++ -+ libavcodec/rpi_zc.h | 83 ++++++++++ -+ 9 files changed, 779 insertions(+), 127 deletions(-) -+ create mode 100644 libavcodec/rpi_zc.c -+ create mode 100644 libavcodec/rpi_zc.h -+ -+diff --git a/ffmpeg.c b/ffmpeg.c -+index 50c6e86..953e5b8 100644 -+--- a/ffmpeg.c -++++ b/ffmpeg.c -+@@ -25,7 +25,7 @@ -+ -+ #ifdef RPI -+ #define RPI_DISPLAY -+-//#define RPI_ZERO_COPY -++#define RPI_ZERO_COPY -+ #endif -+ -+ #include "config.h" -+@@ -80,9 +80,7 @@ -+ #include -+ #include -+ #include -+-#ifdef RPI_ZERO_COPY -+-#include "libavcodec/rpi_qpu.h" -+-#endif -++#include "libavcodec/rpi_zc.h" -+ #endif -+ -+ #if HAVE_SYS_RESOURCE_H -+@@ -183,13 +181,7 @@ static void free_input_threads(void); -+ -+ static MMAL_COMPONENT_T* rpi_display = NULL; -+ static MMAL_POOL_T *rpi_pool = NULL; -+- -+-#ifdef RPI_ZERO_COPY -+-static uint8_t *get_vc_handle(AVBufferRef *bref) { -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- return (uint8_t *)p->vc_handle; -+-} -+-#endif -++static volatile int rpi_display_count = 0; -+ -+ static MMAL_POOL_T* display_alloc_pool(MMAL_PORT_T* port, size_t w, size_t h) -+ { -+@@ -206,7 +198,7 @@ static MMAL_POOL_T* display_alloc_pool(MMAL_PORT_T* port, size_t w, size_t h) -+ for (i = 0; i < NUM_BUFFERS; ++i) -+ { -+ MMAL_BUFFER_HEADER_T* buffer = pool->header[i]; -+- void* bufPtr = buffer->data; -++ char * bufPtr = buffer->data; -+ memset(bufPtr, i*30, w*h); -+ memset(bufPtr+w*h, 128, (w*h)/2); -+ } -+@@ -215,23 +207,31 @@ static MMAL_POOL_T* display_alloc_pool(MMAL_PORT_T* port, size_t w, size_t h) -+ return pool; -+ } -+ -+-static void display_cb_input(MMAL_PORT_T *port,MMAL_BUFFER_HEADER_T *buffer) { -++static void display_cb_input(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) { -++#ifdef RPI_ZERO_COPY -++ av_rpi_zc_unref(buffer->user_data); -++ --rpi_display_count; -++#endif -++ mmal_buffer_header_release(buffer); -++} -++ -++static void display_cb_control(MMAL_PORT_T *port,MMAL_BUFFER_HEADER_T *buffer) { -+ mmal_buffer_header_release(buffer); -+ } -+ -+ static MMAL_COMPONENT_T* display_init(size_t x, size_t y, size_t w, size_t h) -+ { -+ MMAL_COMPONENT_T* display; -+- int w2 = (w+31)&~31; -+- int h2 = (h+15)&~15; -+ MMAL_DISPLAYREGION_T region = -+ { -+- {MMAL_PARAMETER_DISPLAYREGION, sizeof(region)}, -++ .hdr = {MMAL_PARAMETER_DISPLAYREGION, sizeof(region)}, -+ .set = MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_FULLSCREEN | MMAL_DISPLAY_SET_DEST_RECT, -+ .layer = 2, -+ .fullscreen = 0, -+ .dest_rect = {x, y, w, h} -+ }; -++ const AVRpiZcFrameGeometry geo = av_rpi_zc_frame_geometry(w, h); -++ -+ bcm_host_init(); // TODO is this needed? -+ mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_RENDERER, &display); -+ assert(display); -+@@ -240,8 +240,8 @@ static MMAL_COMPONENT_T* display_init(size_t x, size_t y, size_t w, size_t h) -+ -+ MMAL_ES_FORMAT_T* format = display->input[0]->format; -+ format->encoding = MMAL_ENCODING_I420; -+- format->es->video.width = w2; -+- format->es->video.height = h2; -++ format->es->video.width = geo.stride_y; -++ format->es->video.height = geo.height_y; -+ format->es->video.crop.x = 0; -+ format->es->video.crop.y = 0; -+ format->es->video.crop.width = w; -+@@ -250,46 +250,75 @@ static MMAL_COMPONENT_T* display_init(size_t x, size_t y, size_t w, size_t h) -+ -+ mmal_component_enable(display); -+ -+- rpi_pool = display_alloc_pool(display->input[0], w2, h2); -++ rpi_pool = display_alloc_pool(display->input[0], geo.stride_y, geo.height_y); -+ -+ mmal_port_enable(display->input[0],display_cb_input); -+- mmal_port_enable(display->control,display_cb_input); -++ mmal_port_enable(display->control,display_cb_control); -+ -+- printf("Allocated display %d %d\n",w,h); -++ printf("Allocated display %dx%d in %dx%d\n", w, h, geo.stride_y, geo.height_y); -+ -+ return display; -+ } -+ -+-static void display_frame(MMAL_COMPONENT_T* display,AVFrame* fr) -++static void display_frame(struct AVCodecContext * const s, MMAL_COMPONENT_T* const display, const AVFrame* const fr) -+ { -+- int w = fr->width; -+- int h = fr->height; -+- int w2 = (w+31)&~31; -+- int h2 = (h+15)&~15; -+ if (!display || !rpi_pool) -+ return; -++ -++ if (rpi_display_count >= 3) { -++ av_log(s, AV_LOG_VERBOSE, "Frame dropped\n"); -++ return; -++ } -++ -+ MMAL_BUFFER_HEADER_T* buf = mmal_queue_get(rpi_pool->queue); -+ if (!buf) { -+- // Running too fast so drop the frame -+- return; -++ // Running too fast so drop the frame -++ printf("Q alloc failure\n"); -++ return; -+ } -+ assert(buf); -+ buf->cmd = 0; -+- buf->length = (w2 * h2 * 3)/2; -+ buf->offset = 0; // Offset to valid data -+ buf->flags = 0; -+ #ifdef RPI_ZERO_COPY -+- buf->data = get_vc_handle(fr->buf[0]); -+- buf->alloc_size = (w2*h2*3)/2; -++{ -++ const AVRpiZcRefPtr fr_buf = av_rpi_zc_ref(s, fr, 1); -++ -++ buf->user_data = fr_buf; -++ buf->data = av_rpi_zc_vc_handle(fr_buf); -++ buf->alloc_size = -++ buf->length = av_rpi_zc_numbytes(fr_buf); -++ -++ ++rpi_display_count; -++} -+ #else -++{ -++#error YYY -++ int w = fr->width; -++ int h = fr->height; -++ int w2 = (w+31)&~31; -++ int h2 = (h+15)&~15; -++ -++ buf->length = (w2 * h2 * 3)/2; -++ buf->user_data = NULL; -++ -+ //mmal_buffer_header_mem_lock(buf); -+ memcpy(buf->data, fr->data[0], w2 * h); -+ memcpy(buf->data+w2*h2, fr->data[1], w2 * h / 4); -+ memcpy(buf->data+w2*h2*5/4, fr->data[2], w2 * h / 4); -+ //mmal_buffer_header_mem_unlock(buf); -++} -+ #endif -+ -+- mmal_port_send_buffer(display->input[0], buf); // I assume this will automatically get released -++ while (rpi_display_count >= 3) { -++ usleep(5000); -++ } -++ -++ if (mmal_port_send_buffer(display->input[0], buf) != MMAL_SUCCESS) -++ { -++ printf("** send failed: depth=%d\n", rpi_display_count); -++ display_cb_input(NULL, buf); -++ } -+ } -+ -+ static void display_exit(MMAL_COMPONENT_T* display) -+@@ -687,6 +716,11 @@ static void ffmpeg_cleanup(int ret) -+ avformat_close_input(&input_files[i]->ctx); -+ av_freep(&input_files[i]); -+ } -++ -++#ifdef RPI_DISPLAY -++ display_exit(rpi_display); -++#endif -++ -+ for (i = 0; i < nb_input_streams; i++) { -+ InputStream *ist = input_streams[i]; -+ -+@@ -698,6 +732,9 @@ static void ffmpeg_cleanup(int ret) -+ av_freep(&ist->filters); -+ av_freep(&ist->hwaccel_device); -+ -++#ifdef RPI_ZERO_COPY -++ av_rpi_zc_uninit(ist->dec_ctx); -++#endif -+ avcodec_free_context(&ist->dec_ctx); -+ -+ av_freep(&input_streams[i]); -+@@ -729,9 +766,6 @@ static void ffmpeg_cleanup(int ret) -+ term_exit(); -+ ffmpeg_exited = 1; -+ -+-#ifdef RPI_DISPLAY -+- display_exit(rpi_display); -+-#endif -+ } -+ -+ void remove_avoptions(AVDictionary **a, AVDictionary *b) -+@@ -1091,18 +1125,19 @@ static void do_video_out(AVFormatContext *s, -+ int frame_size = 0; -+ InputStream *ist = NULL; -+ AVFilterContext *filter = ost->filter->filter; -++ -++ if (ost->source_index >= 0) -++ ist = input_streams[ost->source_index]; -++ -+ #ifdef RPI_DISPLAY -+- if (next_picture) -++ if (next_picture && ist != NULL) -+ { -+- if (!rpi_display) -++ if (!rpi_display) -+ rpi_display = display_init(0,0,next_picture->width,next_picture->height); -+- display_frame(rpi_display,next_picture); -++ display_frame(ist->dec_ctx, rpi_display, next_picture); -+ } -+ #endif -+ -+- if (ost->source_index >= 0) -+- ist = input_streams[ost->source_index]; -+- -+ if (filter->inputs[0]->frame_rate.num > 0 && -+ filter->inputs[0]->frame_rate.den > 0) -+ duration = 1/(av_q2d(filter->inputs[0]->frame_rate) * av_q2d(enc->time_base)); -+@@ -2708,6 +2743,12 @@ static int init_input_stream(int ist_index, char *error, int error_len) -+ ist->dec_ctx->opaque = ist; -+ ist->dec_ctx->get_format = get_format; -+ ist->dec_ctx->get_buffer2 = get_buffer; -++ -++#ifdef RPI_ZERO_COPY -++ // Overrides the above get_buffer2 -++ av_rpi_zc_init(ist->dec_ctx); -++#endif -++ -+ ist->dec_ctx->thread_safe_callbacks = 1; -+ -+ av_opt_set_int(ist->dec_ctx, "refcounted_frames", 1, 0); -+diff --git a/libavcodec/Makefile b/libavcodec/Makefile -+index 03065cd..21e4514 100644 -+--- a/libavcodec/Makefile -++++ b/libavcodec/Makefile -+@@ -9,6 +9,7 @@ HEADERS = avcodec.h \ -+ rpi_shader.h \ -+ rpi_mailbox.h \ -+ rpi_hevc_transform.h \ -++ rpi_zc.h \ -+ d3d11va.h \ -+ dirac.h \ -+ dv_profile.h \ -+@@ -50,6 +51,7 @@ OBJS = allcodecs.o \ -+ rpi_qpu.o \ -+ rpi_shader.o \ -+ rpi_mailbox.o \ -++ rpi_zc.o \ -+ vorbis_parser.o \ -+ xiph.o \ -+ -+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -+index 39713ed..a1ba217 100644 -+--- a/libavcodec/avcodec.h -++++ b/libavcodec/avcodec.h -+@@ -3505,6 +3505,12 @@ typedef struct AVCodecContext { -+ #define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1 -+ #endif -+ -++ /** -++ * Opaque pointer for use by replacement get_buffer2 code -++ * -++ * @author jc (08/02/2016) -++ */ -++ void * get_buffer_context; -+ } AVCodecContext; -+ -+ AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); -+diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c -+index 8437e10..51736c7 100644 -+--- a/libavcodec/hevc.c -++++ b/libavcodec/hevc.c -+@@ -114,10 +114,6 @@ static uint32_t rpi_filter_coefs[8][1] = { -+ { ENCODE_COEFFS( -2, 10, 58, -2) } -+ }; -+ -+-static uint32_t get_vc_address(AVBufferRef *bref) { -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- return p->vc; -+-} -+ #endif -+ -+ -+@@ -2197,9 +2193,9 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int bw = nPbW-start_x; -+ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref0->frame); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref0->frame); -+ *y++ = ( (bw<16 ? bw : 16) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ if (weight_flag) { -+@@ -2207,7 +2203,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ } else { -+ *y++ = 1; // Weight of 1 and offset of 0 -+ } -+- *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ *y++ = (get_vc_address_y(s->frame) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+@@ -2246,8 +2242,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_u(ref0->frame); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_v(ref0->frame); -+ *u++ = ( (bwframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+- *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ *u++ = (get_vc_address_u(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address_v(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+ s->curr_u_mvs = u; -+@@ -2297,9 +2293,9 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int bw = nPbW-start_x; -+ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref1->frame); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + 8 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref1->frame); -+ *y++ = ( (bw<16 ? bw : 16) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ if (weight_flag) { -+@@ -2307,7 +2303,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ } else { -+ *y++ = 1; // Weight of 1 and offset of 0 -+ } -+- *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ *y++ = (get_vc_address_y(s->frame) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter; -+ } -+ } -+@@ -2347,8 +2343,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_u(ref1->frame); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_v(ref1->frame); -+ *u++ = ( (bwsh.chroma_weight_l0[current_mv.ref_idx[0]][0], s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0] -+ *u++ = rpi_filter_coefs[_mx][0]; -+@@ -2360,8 +2356,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ *u++ = 1; // Weight of 1 and offset of 0 -+ *u++ = 1; -+ } -+- *u++ = (get_vc_address(s->frame->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+- *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ *u++ = (get_vc_address_u(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address_v(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+ s->curr_u_mvs = u; -+@@ -2403,13 +2399,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ int bw = nPbW-start_x; -+ int bh = nPbH-start_y; -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y1 - 3 + start_y) << 16) + ( (x1 - 3 + start_x) & 0xffff); -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref0->frame); -+ y++[-RPI_LUMA_COMMAND_WORDS] = ((y2 - 3 + start_y) << 16) + ( (x2 - 3 + start_x) & 0xffff); // Second fetch is for ref1 -+- y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[0]); -++ y++[-RPI_LUMA_COMMAND_WORDS] = get_vc_address_y(ref1->frame); -+ *y++ = ( (bw<8 ? bw : 8) << 16 ) + (bh<16 ? bh : 16); -+ *y++ = my2_mx2_my_mx; -+ *y++ = 1; // B frame weighted prediction not supported -+- *y++ = (get_vc_address(s->frame->buf[0]) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -++ *y++ = (get_vc_address_y(s->frame) + x0 + start_x + (start_y + y0) * s->frame->linesize[0]); -+ y++[-RPI_LUMA_COMMAND_WORDS] = s->mc_filter_b; -+ } -+ } -+@@ -2453,8 +2449,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, -+ u++[-RPI_CHROMA_COMMAND_WORDS] = s->mc_filter_uv_b0; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x1_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y1_c - 1 + start_y; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[1]); -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref0->frame->buf[2]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_u(ref0->frame); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_v(ref0->frame); -+ *u++ = ( (bwmc_filter_uv_b; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = x2_c - 1 + start_x; -+ u++[-RPI_CHROMA_COMMAND_WORDS] = y2_c - 1 + start_y; -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[1]); -+- u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address(ref1->frame->buf[2]); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_u(ref1->frame); -++ u++[-RPI_CHROMA_COMMAND_WORDS] = get_vc_address_v(ref1->frame); -+ *u++ = ( (bwframe->buf[1]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -+- *u++ = (get_vc_address(s->frame->buf[2]) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -++ *u++ = (get_vc_address_u(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[1]); -++ *u++ = (get_vc_address_v(s->frame) + x0_c + start_x + (start_y + y0_c) * s->frame->linesize[2]); -+ } -+ } -+ s->curr_u_mvs = u; -+@@ -3270,12 +3266,13 @@ static int32_t filter8_luma(uint8_t *data, int x0, int y0, int pitch, int my_mx, -+ return vsum; -+ } -+ -+-static uint8_t *test_frame(HEVCContext *s,uint32_t p, AVFrame *frame, int cIdx) -++static uint8_t *test_frame(HEVCContext *s,uint32_t p, AVFrame *frame, const int cIdx) -+ { -+ //int pic_width = s->ps.sps->width >> s->ps.sps->hshift[cIdx]; -+ int pic_height = s->ps.sps->height >> s->ps.sps->vshift[cIdx]; -+ int pitch = frame->linesize[cIdx]; -+- uint32_t base = get_vc_address(frame->buf[cIdx]); -++ uint32_t base = c_idx == 0 ? get_vc_address_y(frame); -++ c_idx == 1 ? get_vc_address_u(frame) : get_vc_address_v(frame); -+ if (p>=base && pdata[cIdx] + (p-base); -+ } -+@@ -3562,6 +3559,7 @@ static void rpi_launch_vpu_qpu(HEVCContext *s) -+ #ifdef RPI -+ -+ #ifndef RPI_FAST_CACHEFLUSH -++#error RPI_FAST_CACHEFLUSH is broken -+ static void flush_buffer(AVBufferRef *bref) { -+ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+ gpu_cache_flush(p); -+@@ -3572,7 +3570,7 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_u(s->frame); -+ int n = s->ps.sps->height; -+ int curr_y = 0; -+ int curr_uv = 0; -+@@ -3580,21 +3578,21 @@ static void flush_frame(HEVCContext *s,AVFrame *frame) -+ int sz,base; -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].handle = p.vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = (int)(p->arm) + base; -++ iocache.s[0].addr = (int)(p.arm) + base; -+ iocache.s[0].size = sz; -+- p = av_buffer_pool_opaque(frame->buf[2]); -+- iocache.s[1].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_v(s->frame); -++ iocache.s[1].handle = p.vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = (int)(p->arm) + base; -++ iocache.s[1].addr = (int)(p.arm) + base; -+ iocache.s[1].size = sz; -+- p = av_buffer_pool_opaque(frame->buf[0]); -++ p = get_gpu_mem_ptr_y(s->frame); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+- iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].handle = p.vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = (int)(p->arm) + base; -++ iocache.s[2].addr = (int)(p.arm) + base; -+ iocache.s[2].size = sz; -+ vcsm_clean_invalid( &iocache ); -+ #else -+@@ -3612,7 +3610,7 @@ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM -+ int curr_y; -+ int curr_uv; -+ int n_uv; -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_u(s->frame); -+ int sz,base; -+ int (*d)[2] = s->dblk_cmds[job]; -+ int low=(*d)[1]; -+@@ -3629,21 +3627,21 @@ static void flush_frame3(HEVCContext *s,AVFrame *frame,GPU_MEM_PTR_T *p0,GPU_MEM -+ -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- iocache.s[0].handle = p->vcsm_handle; -++ iocache.s[0].handle = p.vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = (int)(p->arm) + base; -++ iocache.s[0].addr = (int)(p.arm) + base; -+ iocache.s[0].size = sz; -+- p = av_buffer_pool_opaque(frame->buf[2]); -+- iocache.s[1].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_v(s->frame); -++ iocache.s[1].handle = p.vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = (int)(p->arm) + base; -++ iocache.s[1].addr = (int)(p.arm) + base; -+ iocache.s[1].size = sz; -+- p = av_buffer_pool_opaque(frame->buf[0]); -++ p = get_gpu_mem_ptr_y(s->frame); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+- iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].handle = p.vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = (int)(p->arm) + base; -++ iocache.s[2].addr = (int)(p.arm) + base; -+ iocache.s[2].size = sz; -+ -+ iocache.s[3].handle = p0->vcsm_handle; -+diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c -+index 826a82f..c4fa305 100644 -+--- a/libavcodec/hevc_filter.c -++++ b/libavcodec/hevc_filter.c -+@@ -879,17 +879,25 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, -+ #undef CR -+ -+ #ifdef RPI_INTER_QPU -+-static void flush_buffer(AVBufferRef *bref) { -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- gpu_cache_flush(p); -++static void flush_buffer_y(const AVFrame * const frame) { -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_y(frame); -++ gpu_cache_flush(&p); -+ } -+ -+-// Return Physical address for this image -+-static uint32_t get_vc_address(AVBufferRef *bref) { -+- GPU_MEM_PTR_T *p = av_buffer_pool_opaque(bref); -+- return p->vc; -++static void flush_buffer_u(const AVFrame * const frame) { -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_u(frame); -++ gpu_cache_flush(&p); -+ } -+ -++static void flush_buffer_v(const AVFrame * const frame) { -++ GPU_MEM_PTR_T p = get_gpu_mem_ptr_v(frame); -++ gpu_cache_flush(&p); -++} -++ -++ -++#ifdef RPI_DEBLOCK_VPU -++#error Not fixed yet -++ -+ // ff_hevc_flush_buffer_lines -+ // flushes and invalidates all pixel rows in [start,end-1] -+ static void ff_hevc_flush_buffer_lines(HEVCContext *s, int start, int end, int flush_luma, int flush_chroma) -+@@ -901,44 +909,44 @@ static void ff_hevc_flush_buffer_lines(HEVCContext *s, int start, int end, int f -+ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -+ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -+- GPU_MEM_PTR_T *p; -++ GPU_MEM_PTR_T p; -+ if (curr_uv < 0) curr_uv = 0; -+ if (n_uv<=curr_uv) { return; } -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+ if (flush_chroma) { -+- p = av_buffer_pool_opaque(s->frame->buf[1]); -+- iocache.s[0].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_u(s->frame); -++ iocache.s[0].handle = p.vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = (int)p->arm + base; -++ iocache.s[0].addr = (int)p.arm + base; -+ iocache.s[0].size = sz; -+- p = av_buffer_pool_opaque(s->frame->buf[2]); -+- iocache.s[1].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_v(s->frame); -++ iocache.s[1].handle = p.vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = (int)p->arm + base; -++ iocache.s[1].addr = (int)p.arm + base; -+ iocache.s[1].size = sz; -+ } -+ if (flush_luma) { -+- p = av_buffer_pool_opaque(s->frame->buf[0]); -++ p = get_gpu_mem_ptr_y(s->frame); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+- iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].handle = p.vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = (int)p->arm + base; -++ iocache.s[2].addr = (int)p.arm + base; -+ iocache.s[2].size = sz; -+ } -+ vcsm_clean_invalid( &iocache ); -+ #else -+ if (flush_chroma) { -+- flush_buffer(s->frame->buf[1]); -+- flush_buffer(s->frame->buf[2]); -++ flush_buffer_u(s->frame); -++ flush_buffer_v(s->frame); -+ } -+ if (flush_luma) { -+- flush_buffer(s->frame->buf[0]); -++ flush_buffer_y(s->frame); -+ } -+ #endif -+ } -+- -++#endif -+ -+ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ { -+@@ -950,37 +958,37 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ int curr_uv = curr_y >> s->ps.sps->vshift[1]; -+ int n_uv = n >> s->ps.sps->vshift[1]; -+ int sz,base; -+- GPU_MEM_PTR_T *p; -++ GPU_MEM_PTR_T p; -+ if (curr_uv < 0) curr_uv = 0; -+ if (n_uv<=curr_uv) { return; } -+ sz = s->frame->linesize[1] * (n_uv-curr_uv); -+ base = s->frame->linesize[1] * curr_uv; -+- p = av_buffer_pool_opaque(s->frame->buf[1]); -+- iocache.s[0].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_u(s->frame); -++ iocache.s[0].handle = p.vcsm_handle; -+ iocache.s[0].cmd = 3; // clean+invalidate -+- iocache.s[0].addr = (int)p->arm + base; -++ iocache.s[0].addr = (int)p.arm + base; -+ iocache.s[0].size = sz; -+- p = av_buffer_pool_opaque(s->frame->buf[2]); -+- iocache.s[1].handle = p->vcsm_handle; -++ p = get_gpu_mem_ptr_v(s->frame); -++ iocache.s[1].handle = p.vcsm_handle; -+ iocache.s[1].cmd = 3; // clean+invalidate -+- iocache.s[1].addr = (int)p->arm + base; -++ iocache.s[1].addr = (int)p.arm + base; -+ iocache.s[1].size = sz; -+ -+ #ifdef RPI_LUMA_QPU -+- p = av_buffer_pool_opaque(s->frame->buf[0]); -++ p = get_gpu_mem_ptr_y(s->frame); -+ sz = s->frame->linesize[0] * (n-curr_y); -+ base = s->frame->linesize[0] * curr_y; -+- iocache.s[2].handle = p->vcsm_handle; -++ iocache.s[2].handle = p.vcsm_handle; -+ iocache.s[2].cmd = 3; // clean+invalidate -+- iocache.s[2].addr = (int)p->arm + base; -++ iocache.s[2].addr = (int)p.arm + base; -+ iocache.s[2].size = sz; -+ #endif -+ vcsm_clean_invalid( &iocache ); -+ #else -+- flush_buffer(s->frame->buf[1]); -+- flush_buffer(s->frame->buf[2]); -++ flush_buffer_u(s->frame); -++ flush_buffer_v(s->frame); -+ #ifdef RPI_LUMA_QPU -+- flush_buffer(s->frame->buf[0]); -++ flush_buffer_y(s->frame); -+ #endif -+ -+ #endif -+@@ -992,6 +1000,7 @@ void ff_hevc_flush_buffer(HEVCContext *s, ThreadFrame *f, int n) -+ #endif -+ -+ #ifdef RPI_DEBLOCK_VPU -++#error XXX -+ /* rpi_deblock deblocks an entire row of ctbs using the VPU */ -+ static void rpi_deblock(HEVCContext *s, int y, int ctb_size) -+ { -+@@ -1000,21 +1009,21 @@ static void rpi_deblock(HEVCContext *s, int y, int ctb_size) -+ // TODO flush buffer of beta/tc setup when it becomes cached -+ -+ // Prepare three commands at once to avoid calling overhead -+- s->vpu_cmds_arm[0][0] = get_vc_address(s->frame->buf[0]) + s->frame->linesize[0] * y; -++ s->vpu_cmds_arm[0][0] = get_vc_address_y(s->frame) + s->frame->linesize[0] * y; -+ s->vpu_cmds_arm[0][1] = s->frame->linesize[0]; -+ s->vpu_cmds_arm[0][2] = s->setup_width; -+ s->vpu_cmds_arm[0][3] = (int) ( s->y_setup_vc + s->setup_width * (y>>4) ); -+ s->vpu_cmds_arm[0][4] = ctb_size>>4; -+ s->vpu_cmds_arm[0][5] = 2; -+ -+- s->vpu_cmds_arm[1][0] = get_vc_address(s->frame->buf[1]) + s->frame->linesize[1] * (y>> s->ps.sps->vshift[1]); -++ s->vpu_cmds_arm[1][0] = get_vc_address_u(s->frame) + s->frame->linesize[1] * (y>> s->ps.sps->vshift[1]); -+ s->vpu_cmds_arm[1][1] = s->frame->linesize[1]; -+ s->vpu_cmds_arm[1][2] = s->uv_setup_width; -+ s->vpu_cmds_arm[1][3] = (int) ( s->uv_setup_vc + s->uv_setup_width * ((y>>4)>> s->ps.sps->vshift[1]) ); -+ s->vpu_cmds_arm[1][4] = (ctb_size>>4)>> s->ps.sps->vshift[1]; -+ s->vpu_cmds_arm[1][5] = 3; -+ -+- s->vpu_cmds_arm[2][0] = get_vc_address(s->frame->buf[2]) + s->frame->linesize[2] * (y>> s->ps.sps->vshift[2]); -++ s->vpu_cmds_arm[2][0] = get_vc_address_v(s->frame) + s->frame->linesize[2] * (y>> s->ps.sps->vshift[2]); -+ s->vpu_cmds_arm[2][1] = s->frame->linesize[2]; -+ s->vpu_cmds_arm[2][2] = s->uv_setup_width; -+ s->vpu_cmds_arm[2][3] = (int) ( s->uv_setup_vc + s->uv_setup_width * ((y>>4)>> s->ps.sps->vshift[1]) ); -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index ffd13ca..b0c9bc5 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -250,7 +250,7 @@ int gpu_get_mailbox(void) -+ } -+ -+ // Call this to clean and invalidate a region of memory -+-void gpu_cache_flush(GPU_MEM_PTR_T *p) -++void gpu_cache_flush(const GPU_MEM_PTR_T * const p) -+ { -+ #ifdef RPI_FAST_CACHEFLUSH -+ struct vcsm_user_clean_invalid_s iocache = {}; -+diff --git a/libavcodec/rpi_qpu.h b/libavcodec/rpi_qpu.h -+index 81c2bb1..b913f79 100644 -+--- a/libavcodec/rpi_qpu.h -++++ b/libavcodec/rpi_qpu.h -+@@ -2,8 +2,11 @@ -+ #define RPI_QPU_H -+ -+ // Define RPI_FAST_CACHEFLUSH to use the VCSM cache flush code -++// *** N.B. Code has rotted & crashes if this is unset (before this set of changes) -+ #define RPI_FAST_CACHEFLUSH -+ -++#define RPI_ONE_BUF 1 -++ -+ typedef struct gpu_mem_ptr_s { -+ unsigned char *arm; // Pointer to memory mapped on ARM side -+ int vc_handle; // Videocore handle of relocatable memory -+@@ -16,9 +19,113 @@ typedef struct gpu_mem_ptr_s { -+ extern int gpu_malloc_cached(int numbytes, GPU_MEM_PTR_T *p); -+ extern int gpu_malloc_uncached(int numbytes, GPU_MEM_PTR_T *p); -+ extern void gpu_free(GPU_MEM_PTR_T *p); -+-extern void gpu_cache_flush(GPU_MEM_PTR_T *p); -++extern void gpu_cache_flush(const GPU_MEM_PTR_T * const p); -+ extern void gpu_cache_flush3(GPU_MEM_PTR_T *p0,GPU_MEM_PTR_T *p1,GPU_MEM_PTR_T *p2); -+ -++#include "libavutil/frame.h" -++#if !RPI_ONE_BUF -++static inline uint32_t get_vc_address_y(const AVFrame * const frame) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[0]); -++ return p->vc; -++} -++ -++static inline uint32_t get_vc_address_u(const AVFrame * const frame) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[1]); -++ return p->vc; -++} -++ -++static inline uint32_t get_vc_address_v(const AVFrame * const frame) { -++ GPU_MEM_PTR_T *p = av_buffer_pool_opaque(frame->buf[2]); -++ return p->vc; -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_y(const AVFrame * const frame) { -++ return *(GPU_MEM_PTR_T *)av_buffer_pool_opaque(frame->buf[0]); -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_u(const AVFrame * const frame) { -++ return *(GPU_MEM_PTR_T *)av_buffer_pool_opaque(frame->buf[1]); -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_v(const AVFrame * const frame) { -++ return *(GPU_MEM_PTR_T *)av_buffer_pool_opaque(frame->buf[2]); -++} -++ -++#else -++ -++static inline int gpu_is_buf1(const AVFrame * const frame) -++{ -++ return frame->buf[1] == NULL; -++} -++ -++static inline GPU_MEM_PTR_T * gpu_buf1_gmem(const AVFrame * const frame) -++{ -++ return av_buffer_get_opaque(frame->buf[0]); -++} -++ -++static inline GPU_MEM_PTR_T * gpu_buf3_gmem(const AVFrame * const frame, const int n) -++{ -++ return av_buffer_pool_opaque(frame->buf[n]); -++} -++ -++ -++static inline uint32_t get_vc_address_y(const AVFrame * const frame) { -++ return gpu_is_buf1(frame) ? gpu_buf1_gmem(frame)->vc : gpu_buf3_gmem(frame, 0)->vc; -++} -++ -++static inline uint32_t get_vc_address_u(const AVFrame * const frame) { -++ return gpu_is_buf1(frame) ? -++ gpu_buf1_gmem(frame)->vc + frame->data[1] - frame->data[0] : -++ gpu_buf3_gmem(frame, 1)->vc; -++} -++ -++static inline uint32_t get_vc_address_v(const AVFrame * const frame) { -++ return gpu_is_buf1(frame) ? -++ gpu_buf1_gmem(frame)->vc + frame->data[2] - frame->data[0] : -++ gpu_buf3_gmem(frame, 2)->vc; -++} -++ -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_y(const AVFrame * const frame) { -++ if (gpu_is_buf1(frame)) -++ { -++ GPU_MEM_PTR_T g = *gpu_buf1_gmem(frame); -++ g.numbytes = frame->data[1] - frame->data[0]; -++ return g; -++ } -++ else -++ return *gpu_buf3_gmem(frame, 0); -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_u(const AVFrame * const frame) { -++ if (gpu_is_buf1(frame)) -++ { -++ GPU_MEM_PTR_T g = *gpu_buf1_gmem(frame); -++ g.arm += frame->data[1] - frame->data[0]; -++ g.vc += frame->data[1] - frame->data[0]; -++ g.numbytes = frame->data[2] - frame->data[1]; // chroma size -++ return g; -++ } -++ else -++ return *gpu_buf3_gmem(frame, 1); -++} -++ -++static inline GPU_MEM_PTR_T get_gpu_mem_ptr_v(const AVFrame * const frame) { -++ if (gpu_is_buf1(frame)) -++ { -++ GPU_MEM_PTR_T g = *gpu_buf1_gmem(frame); -++ g.arm += frame->data[2] - frame->data[0]; -++ g.vc += frame->data[2] - frame->data[0]; -++ g.numbytes = frame->data[2] - frame->data[1]; // chroma size -++ return g; -++ } -++ else -++ return *gpu_buf3_gmem(frame, 2); -++} -++ -++#endif -++ -++ -+ // QPU specific functions -+ extern void qpu_run_shader8(int code, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8); -+ extern void qpu_run_shader12(int code, int num, int code2, int num2, int unifs1, int unifs2, int unifs3, int unifs4, int unifs5, int unifs6, int unifs7, int unifs8, int unifs9, int unifs10, int unifs11, int unifs12); -+diff --git a/libavcodec/rpi_zc.c b/libavcodec/rpi_zc.c -+new file mode 100644 -+index 0000000..9580165 -+--- /dev/null -++++ b/libavcodec/rpi_zc.c -+@@ -0,0 +1,406 @@ -++#include "config.h" -++#ifdef RPI -++#include "rpi_qpu.h" -++#include "rpi_zc.h" -++ -++#include "libavutil/buffer_internal.h" -++ -++struct ZcPoolEnt; -++ -++typedef struct ZcPool -++{ -++ int numbytes; -++ struct ZcPoolEnt * head; -++ pthread_mutex_t lock; -++} ZcPool; -++ -++typedef struct ZcPoolEnt -++{ -++ // It is important that we start with gmem as other bits of code will expect to see that -++ GPU_MEM_PTR_T gmem; -++ struct ZcPoolEnt * next; -++ struct ZcPool * pool; -++} ZcPoolEnt; -++ -++static ZcPoolEnt * zc_pool_ent_alloc(ZcPool * const pool, const int size) -++{ -++ ZcPoolEnt * const zp = av_malloc(sizeof(ZcPoolEnt)); -++ -++ if (zp == NULL) { -++ av_log(NULL, AV_LOG_ERROR, "av_malloc(ZcPoolEnt) failed\n"); -++ goto fail0; -++ } -++ -++ if (gpu_malloc_cached(size, &zp->gmem) != 0) -++ { -++ av_log(NULL, AV_LOG_ERROR, "av_gpu_malloc_cached(%d) failed\n", size); -++ goto fail1; -++ } -++ -++ zp->next = NULL; -++ zp->pool = pool; -++ return zp; -++ -++fail1: -++ av_free(zp); -++fail0: -++ return NULL; -++} -++ -++static void zc_pool_ent_free(ZcPoolEnt * const zp) -++{ -++ gpu_free(&zp->gmem); -++ av_free(zp); -++} -++ -++static void zc_pool_flush(ZcPool * const pool) -++{ -++ ZcPoolEnt * p = pool->head; -++ pool->head = NULL; -++ while (p != NULL) -++ { -++ ZcPoolEnt * const zp = p; -++ p = p->next; -++ zc_pool_ent_free(zp); -++ } -++} -++ -++static ZcPoolEnt * zc_pool_alloc(ZcPool * const pool, const int numbytes) -++{ -++ ZcPoolEnt * zp; -++ pthread_mutex_lock(&pool->lock); -++ -++ if (numbytes != pool->numbytes) -++ { -++ zc_pool_flush(pool); -++ pool->numbytes = numbytes; -++ } -++ -++ if (pool->head != NULL) -++ { -++ zp = pool->head; -++ pool->head = zp->next; -++ } -++ else -++ { -++ zp = zc_pool_ent_alloc(pool, numbytes); -++ } -++ -++ pthread_mutex_unlock(&pool->lock); -++ return zp; -++} -++ -++static void zc_pool_free(ZcPoolEnt * const zp) -++{ -++ ZcPool * const pool = zp == NULL ? NULL : zp->pool; -++ if (zp != NULL) -++ { -++ pthread_mutex_lock(&pool->lock); -++ if (pool->numbytes == zp->gmem.numbytes) -++ { -++ zp->next = pool->head; -++ pool->head = zp; -++ pthread_mutex_unlock(&pool->lock); -++ } -++ else -++ { -++ pthread_mutex_unlock(&pool->lock); -++ zc_pool_ent_free(zp); -++ } -++ } -++} -++ -++static void -++zc_pool_init(ZcPool * const pool) -++{ -++ pool->numbytes = -1; -++ pool->head = NULL; -++ pthread_mutex_init(&pool->lock, NULL); -++} -++ -++static void -++zc_pool_destroy(ZcPool * const pool) -++{ -++ pool->numbytes = -1; -++ zc_pool_flush(pool); -++ pthread_mutex_destroy(&pool->lock); -++} -++ -++ -++typedef struct AVZcEnv -++{ -++ ZcPool pool; -++} ZcEnv; -++ -++// Callback when buffer unrefed to zero -++static void rpi_free_display_buffer(void *opaque, uint8_t *data) -++{ -++ ZcPoolEnt *const zp = opaque; -++// printf("%s: data=%p\n", __func__, data); -++ zc_pool_free(zp); -++} -++ -++static inline GPU_MEM_PTR_T * pic_gm_ptr(AVBufferRef * const buf) -++{ -++ // Kludge where we check the free fn to check this is really -++ // one of our buffers - can't think of a better way -++ return buf == NULL || buf->buffer->free != rpi_free_display_buffer ? NULL : -++ av_buffer_get_opaque(buf); -++} -++ -++AVRpiZcFrameGeometry av_rpi_zc_frame_geometry( -++ const unsigned int video_width, const unsigned int video_height) -++{ -++ AVRpiZcFrameGeometry geo; -++ geo.stride_y = (video_width + 32 + 31) & ~31; -++ geo.stride_c = geo.stride_y / 2; -++// geo.height_y = (video_height + 15) & ~15; -++ geo.height_y = (video_height + 32 + 31) & ~31; -++ geo.height_c = geo.height_y / 2; -++ return geo; -++} -++ -++static AVBufferRef * rpi_buf_pool_alloc(ZcPool * const pool, int size) -++{ -++ ZcPoolEnt *const zp = zc_pool_alloc(pool, size); -++ AVBufferRef * buf; -++ -++ if (zp == NULL) { -++ av_log(NULL, AV_LOG_ERROR, "zc_pool_alloc(%d) failed\n", size); -++ goto fail0; -++ } -++ -++ if ((buf = av_buffer_create(zp->gmem.arm, size, rpi_free_display_buffer, zp, AV_BUFFER_FLAG_READONLY)) == NULL) -++ { -++ av_log(NULL, AV_LOG_ERROR, "av_buffer_create() failed\n"); -++ goto fail2; -++ } -++ -++ return buf; -++ -++fail2: -++ zc_pool_free(zp); -++fail0: -++ return NULL; -++} -++ -++static int rpi_get_display_buffer(struct AVCodecContext * const s, AVFrame * const frame) -++{ -++ ZcEnv *const zc = s->get_buffer_context; -++ const AVRpiZcFrameGeometry geo = av_rpi_zc_frame_geometry(frame->width, frame->height); -++ const unsigned int size_y = geo.stride_y * geo.height_y; -++ const unsigned int size_c = geo.stride_c * geo.height_c; -++ const unsigned int size_pic = size_y + size_c * 2; -++ AVBufferRef * buf; -++ unsigned int i; -++ -++// printf("Do local alloc: format=%#x, %dx%d: %u\n", frame->format, frame->width, frame->height, size_pic); -++ -++ if ((buf = rpi_buf_pool_alloc(&zc->pool, size_pic)) == NULL) -++ { -++ av_log(s, AV_LOG_ERROR, "rpi_get_display_buffer: Failed to get buffer from pool\n"); -++ return AVERROR(ENOMEM); -++ } -++ -++ for (i = 0; i < AV_NUM_DATA_POINTERS; i++) { -++ frame->buf[i] = NULL; -++ frame->data[i] = NULL; -++ frame->linesize[i] = 0; -++ } -++ -++ frame->buf[0] = buf; -++ frame->linesize[0] = geo.stride_y; -++ frame->linesize[1] = geo.stride_c; -++ frame->linesize[2] = geo.stride_c; -++ frame->data[0] = buf->data; -++ frame->data[1] = frame->data[0] + size_y; -++ frame->data[2] = frame->data[1] + size_c; -++ frame->extended_data = frame->data; -++ // Leave extended buf alone -++ -++ return 0; -++} -++ -++ -++#define RPI_GET_BUFFER2 1 -++ -++int av_rpi_zc_get_buffer2(struct AVCodecContext *s, AVFrame *frame, int flags) -++{ -++#if !RPI_GET_BUFFER2 -++ return avcodec_default_get_buffer2(s, frame, flags); -++#else -++ int rv; -++ -++ if ((s->codec->capabilities & AV_CODEC_CAP_DR1) == 0 || -++ frame->format != AV_PIX_FMT_YUV420P) -++ { -++// printf("Do default alloc: format=%#x\n", frame->format); -++ rv = avcodec_default_get_buffer2(s, frame, flags); -++ } -++ else -++ { -++ rv = rpi_get_display_buffer(s, frame); -++ } -++ -++#if 0 -++ printf("%s: %dx%d lsize=%d/%d/%d data=%p/%p/%p bref=%p/%p/%p opaque[0]=%p\n", __func__, -++ frame->width, frame->height, -++ frame->linesize[0], frame->linesize[1], frame->linesize[2], -++ frame->data[0], frame->data[1], frame->data[2], -++ frame->buf[0], frame->buf[1], frame->buf[2], -++ av_buffer_get_opaque(frame->buf[0])); -++#endif -++ return rv; -++#endif -++} -++ -++ -++static AVBufferRef * zc_copy(struct AVCodecContext * const s, -++ const AVFrame * const src) -++{ -++ AVFrame dest_frame; -++ AVFrame * const dest = &dest_frame; -++ unsigned int i; -++ uint8_t * psrc, * pdest; -++ -++ dest->width = src->width; -++ dest->height = src->height; -++ -++ if (rpi_get_display_buffer(s, dest) != 0) -++ { -++ return NULL; -++ } -++ -++ for (i = 0, psrc = src->data[0], pdest = dest->data[0]; -++ i != dest->height; -++ ++i, psrc += src->linesize[0], pdest += dest->linesize[0]) -++ { -++ memcpy(pdest, psrc, dest->width); -++ } -++ for (i = 0, psrc = src->data[1], pdest = dest->data[1]; -++ i != dest->height / 2; -++ ++i, psrc += src->linesize[1], pdest += dest->linesize[1]) -++ { -++ memcpy(pdest, psrc, dest->width / 2); -++ } -++ for (i = 0, psrc = src->data[2], pdest = dest->data[2]; -++ i != dest->height / 2; -++ ++i, psrc += src->linesize[2], pdest += dest->linesize[2]) -++ { -++ memcpy(pdest, psrc, dest->width / 2); -++ } -++ -++ return dest->buf[0]; -++} -++ -++ -++AVRpiZcRefPtr av_rpi_zc_ref(struct AVCodecContext * const s, -++ const AVFrame * const frame, const int maycopy) -++{ -++ assert(s != NULL); -++ -++ if (frame->format != AV_PIX_FMT_YUV420P) -++ { -++ av_log(s, AV_LOG_WARNING, "%s: *** Format not YUV420P: %d\n", __func__, frame->format); -++ return NULL; -++ } -++ -++ if (frame->buf[1] != NULL) -++ { -++ if (maycopy) -++ { -++ av_log(s, AV_LOG_INFO, "%s: *** Not a single buf frame: copying\n", __func__); -++ return zc_copy(s, frame); -++ } -++ else -++ { -++ av_log(s, AV_LOG_WARNING, "%s: *** Not a single buf frame: NULL\n", __func__); -++ return NULL; -++ } -++ } -++ -++ if (pic_gm_ptr(frame->buf[0]) == NULL) -++ { -++ if (maycopy) -++ { -++ av_log(s, AV_LOG_INFO, "%s: *** Not one of our buffers: copying\n", __func__); -++ return zc_copy(s, frame); -++ } -++ else -++ { -++ av_log(s, AV_LOG_WARNING, "%s: *** Not one of our buffers: NULL\n", __func__); -++ return NULL; -++ } -++ } -++ -++ return av_buffer_ref(frame->buf[0]); -++} -++ -++int av_rpi_zc_vc_handle(const AVRpiZcRefPtr fr_ref) -++{ -++ const GPU_MEM_PTR_T * const p = pic_gm_ptr(fr_ref); -++ return p == NULL ? -1 : p->vc_handle; -++} -++ -++int av_rpi_zc_numbytes(const AVRpiZcRefPtr fr_ref) -++{ -++ const GPU_MEM_PTR_T * const p = pic_gm_ptr(fr_ref); -++ return p == NULL ? 0 : p->numbytes; -++} -++ -++void av_rpi_zc_unref(AVRpiZcRefPtr fr_ref) -++{ -++ if (fr_ref != NULL) -++ { -++ av_buffer_unref(&fr_ref); -++ } -++} -++ -++AVZcEnvPtr av_rpi_zc_env_alloc(void) -++{ -++ ZcEnv * const zc = av_mallocz(sizeof(ZcEnv)); -++ if (zc == NULL) -++ { -++ av_log(NULL, AV_LOG_ERROR, "av_rpi_zc_env_alloc: Context allocation failed\n"); -++ return NULL; -++ } -++ -++ zc_pool_init(&zc->pool); -++ return zc; -++} -++ -++void av_rpi_zc_env_free(AVZcEnvPtr zc) -++{ -++ if (zc != NULL) -++ { -++ zc_pool_destroy(&zc->pool); ; -++ av_free(zc); -++ } -++} -++ -++int av_rpi_zc_init(struct AVCodecContext * const s) -++{ -++ ZcEnv * const zc = av_rpi_zc_env_alloc(); -++ if (zc == NULL) -++ { -++ return AVERROR(ENOMEM); -++ } -++ -++ s->get_buffer_context = zc; -++ s->get_buffer2 = av_rpi_zc_get_buffer2; -++ return 0; -++} -++ -++void av_rpi_zc_uninit(struct AVCodecContext * const s) -++{ -++ if (s->get_buffer2 == av_rpi_zc_get_buffer2) -++ { -++ ZcEnv * const zc = s->get_buffer_context; -++ s->get_buffer2 = avcodec_default_get_buffer2; -++ s->get_buffer_context = NULL; -++ av_rpi_zc_env_free(zc); -++ } -++} -++ -++#endif // RPI -++ -+diff --git a/libavcodec/rpi_zc.h b/libavcodec/rpi_zc.h -+new file mode 100644 -+index 0000000..f0109f4 -+--- /dev/null -++++ b/libavcodec/rpi_zc.h -+@@ -0,0 +1,83 @@ -++#ifndef LIBAVCODEC_RPI_ZC_H -++#define LIBAVCODEC_RPI_ZC_H -++ -++// Zero-Copy frame code for RPi -++// RPi needs Y/U/V planes to be contiguous for display. By default -++// ffmpeg will allocate separated planes so a memcpy is needed before -++// display. This code prodes a method a making ffmpeg allocate a single -++// bit of memory for the frame when can then be refrence counted until -++// display ahs finsihed with it. -++ -++#include "libavutil/frame.h" -++#include "libavcodec/avcodec.h" -++ -++// "Opaque" pointer to whatever we are using as a buffer reference -++typedef AVBufferRef * AVRpiZcRefPtr; -++ -++struct AVZcEnv; -++typedef struct AVZcEnv * AVZcEnvPtr; -++ -++typedef struct AVRpiZcFrameGeometry -++{ -++ unsigned int stride_y; -++ unsigned int height_y; -++ unsigned int stride_c; -++ unsigned int height_c; -++} AVRpiZcFrameGeometry; -++ -++ -++AVRpiZcFrameGeometry av_rpi_zc_frame_geometry( -++ const unsigned int video_width, const unsigned int video_height); -++ -++// Replacement fn for avctx->get_buffer2 -++// Should be set before calling avcodec_decode_open2 -++// -++// N.B. in addition to to setting avctx->get_buffer2, avctx->refcounted_frames -++// must be set to 1 as otherwise the buffer info is killed before being returned -++// by avcodec_decode_video2. Note also that this means that the AVFrame that is -++// return must be manually derefed with av_frame_unref. This should be done -++// after av_rpi_zc_ref has been called. -++int av_rpi_zc_get_buffer2(struct AVCodecContext *s, AVFrame *frame, int flags); -++ -++// Generate a ZC reference to the buffer(s) in this frame -++// If the buffer doesn't appear to be one allocated by _get_buffer_2 -++// then the behaviour depends on maycopy: -++// If maycopy=0 then return NULL -++// If maycopy=1 && the src frame is in a form where we can easily copy -++// the data, then allocate a new buffer and copy the data into it -++// Otherwise return NULL -++AVRpiZcRefPtr av_rpi_zc_ref(struct AVCodecContext * const s, -++ const AVFrame * const frame, const int maycopy); -++ -++// Get the vc_handle from the frame ref -++// Returns -1 if ref doesn't look valid -++int av_rpi_zc_vc_handle(const AVRpiZcRefPtr fr_ref); -++// Get the number of bytes allocated from the frame ref -++// Returns 0 if ref doesn't look valid -++int av_rpi_zc_numbytes(const AVRpiZcRefPtr fr_ref); -++ -++// Unreference the buffer refed/allocated by _zc_ref -++// If fr_ref is NULL then this will NOP -++void av_rpi_zc_unref(AVRpiZcRefPtr fr_ref); -++ -++// Allocate an environment for the buffer pool used by the ZC code -++// This should be put in avctx->get_buffer_context so it can be found by -++// av_rpi_zc_get_buffer2 when it is called from ffmpeg -++AVZcEnvPtr av_rpi_zc_env_alloc(void); -++ -++// Allocate the environment used by the ZC code -++void av_rpi_zc_env_free(AVZcEnvPtr); -++ -++ -++// Init ZC into a context -++// There is nothing magic in this fn - it just packages setting -++// get_buffer2 & get_buffer_context -++int av_rpi_zc_init(struct AVCodecContext * const s); -++ -++// Free ZC from a context -++// There is nothing magic in this fn - it just packages unsetting -++// get_buffer2 & get_buffer_context -++void av_rpi_zc_uninit(struct AVCodecContext * const s); -++ -++#endif -++ -+-- -+2.7.4 -+ -+ -+From a6da64e1ca42f0394ccfa55dca782a456841da94 Mon Sep 17 00:00:00 2001 -+From: John Cox -+Date: Tue, 1 Mar 2016 14:21:25 +0000 -+Subject: [PATCH 2/2] Set VPU scheduling thread to high priority after creation -+ -+--- -+ libavcodec/rpi_qpu.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- -+ 1 file changed, 47 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c -+index b0c9bc5..ee19231 100644 -+--- a/libavcodec/rpi_qpu.c -++++ b/libavcodec/rpi_qpu.c -+@@ -182,9 +182,55 @@ static int gpu_init(volatile struct GPU **gpu) { -+ err = pthread_create(&vpu_thread, NULL, vpu_start, NULL); -+ //printf("Created thread\n"); -+ if (err) { -+- printf("Failed to create vpu thread\n"); -++ av_log(NULL, AV_LOG_FATAL, "Failed to create vpu thread\n"); -+ return -4; -+ } -++ -++ { -++ struct sched_param param = {0}; -++ int policy = 0; -++ -++ if (pthread_getschedparam(vpu_thread, &policy, ¶m) != 0) -++ { -++ av_log(NULL, AV_LOG_ERROR, "Unable to get VPU thread scheduling parameters\n"); -++ } -++ else -++ { -++ av_log(NULL, AV_LOG_INFO, "VPU thread: policy=%d (%s), pri=%d\n", -++ policy, -++ policy == SCHED_RR ? "RR" : policy == SCHED_FIFO ? "FIFO" : "???" , -++ param.sched_priority); -++ -++ policy = SCHED_FIFO; -++ param.sched_priority = sched_get_priority_max(SCHED_FIFO); -++ -++ av_log(NULL, AV_LOG_INFO, "Attempt to set: policy=%d (%s), pri=%d\n", -++ policy, -++ policy == SCHED_RR ? "RR" : policy == SCHED_FIFO ? "FIFO" : "???" , -++ param.sched_priority); -++ -++ if (pthread_setschedparam(vpu_thread, policy, ¶m) != 0) -++ { -++ av_log(NULL, AV_LOG_ERROR, "Unable to set VPU thread scheduling parameters\n"); -++ } -++ else -++ { -++ if (pthread_getschedparam(vpu_thread, &policy, ¶m) != 0) -++ { -++ av_log(NULL, AV_LOG_ERROR, "Unable to get VPU thread scheduling parameters\n"); -++ } -++ else -++ { -++ av_log(NULL, AV_LOG_INFO, "VPU thread (after): policy=%d (%s), pri=%d\n", -++ policy, -++ policy == SCHED_RR ? "RR" : policy == SCHED_FIFO ? "FIFO" : "???" , -++ param.sched_priority); -++ } -++ } -++ } -++ -++ } -++ -+ } -+ #endif -+ -+-- -+2.7.4 -+ - -From 978ac05eba662e8eb7b043d0e51d8ad90e8e04f5 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 12 Jan 2016 16:29:57 +0000 -Subject: [PATCH 28/61] ffmpeg: Add cabac opimisations for hevc - ---- - .../0001-Squashed-commit-of-the-following.patch | 2179 ++++++++++++++++++++ - tools/depends/target/ffmpeg/Makefile | 5 +- - tools/depends/target/ffmpeg/autobuild.sh | 2 + - 3 files changed, 2185 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/0001-Squashed-commit-of-the-following.patch - -diff --git a/tools/depends/target/ffmpeg/0001-Squashed-commit-of-the-following.patch b/tools/depends/target/ffmpeg/0001-Squashed-commit-of-the-following.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..38554af0af30a85b7d88d31b7d21775cf294b0e3 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/0001-Squashed-commit-of-the-following.patch -@@ -0,0 +1,2179 @@ -+From d08594462136274636c1f2f476a6410ff92a9e16 Mon Sep 17 00:00:00 2001 -+From: John Cox -+Date: Wed, 13 Jan 2016 16:13:33 +0000 -+Subject: [PATCH] H.265 residual decode rework (v2) -+ -+Rework the cabac decode functions -+Simplify the code flow and variable usage where possible -+ -+(Remove profiling and other spurious deltas that were in v1) -+--- -+ libavcodec/arm/cabac.h | 155 ++++- -+ libavcodec/arm/hevc_cabac.h | 491 +++++++++++++++ -+ libavcodec/arm/hevcdsp_deblock_neon.S | 13 +- -+ libavcodec/arm/hevcdsp_epel_neon.S | 9 +- -+ libavcodec/cabac.h | 9 +- -+ libavcodec/hevc_cabac.c | 1096 +++++++++++++++++++++++++-------- -+ 6 files changed, 1509 insertions(+), 264 deletions(-) -+ create mode 100644 libavcodec/arm/hevc_cabac.h -+ -+diff --git a/libavcodec/arm/cabac.h b/libavcodec/arm/cabac.h -+index fdbf86b..0a3980a 100644 -+--- a/libavcodec/arm/cabac.h -++++ b/libavcodec/arm/cabac.h -+@@ -26,13 +26,34 @@ -+ #include "libavutil/internal.h" -+ #include "libavcodec/cabac.h" -+ -++ -++#if UNCHECKED_BITSTREAM_READER -++#define LOAD_16BITS_BEHI\ -++ "ldrh %[tmp] , [%[ptr]] , #2 \n\t"\ -++ "rev %[tmp] , %[tmp] \n\t" -++#elif CONFIG_THUMB -++#define LOAD_16BITS_BEHI\ -++ "ldr %[tmp] , [%[c], %[end]] \n\t"\ -++ "cmp %[tmp] , %[ptr] \n\t"\ -++ "it cs \n\t"\ -++ "ldrhcs %[tmp] , [%[ptr]] , #2 \n\t"\ -++ "rev %[tmp] , %[tmp] \n\t" -++#else -++#define LOAD_16BITS_BEHI\ -++ "ldr %[tmp] , [%[c], %[end]] \n\t"\ -++ "cmp %[tmp] , %[ptr] \n\t"\ -++ "ldrcsh %[tmp] , [%[ptr]] , #2 \n\t"\ -++ "rev %[tmp] , %[tmp] \n\t" -++#endif -++ -++ -+ #define get_cabac_inline get_cabac_inline_arm -+ static av_always_inline int get_cabac_inline_arm(CABACContext *c, -+ uint8_t *const state) -+ { -+ int bit; -++#if 0 -+ void *reg_b, *reg_c, *tmp; -+- -+ __asm__ volatile( -+ "ldrb %[bit] , [%[state]] \n\t" -+ "add %[r_b] , %[tables] , %[lps_off] \n\t" -+@@ -100,9 +121,141 @@ static av_always_inline int get_cabac_inline_arm(CABACContext *c, -+ [mlps_off]"I"(H264_MLPS_STATE_OFFSET + 128) -+ : "memory", "cc" -+ ); -++#else -++ // *** Not thumb compatible yet -++ unsigned int reg_b, tmp; -++ __asm__ ( -++ "ldrb %[bit] , [%[state]] \n\t" -++ "sub %[r_b] , %[mlps_tables], %[lps_off] \n\t" -++ "and %[tmp] , %[range] , #0xC0 \n\t" -++ "add %[r_b] , %[r_b] , %[bit] \n\t" -++ "ldrb %[tmp] , [%[r_b] , %[tmp], lsl #1] \n\t" -++// %bit = *state -++// %range = range -++// %tmp = RangeLPS -++ "sub %[range] , %[range] , %[tmp] \n\t" -++ -++ "cmp %[low] , %[range] , lsl #17 \n\t" -++ "ittt ge \n\t" -++ "subge %[low] , %[low] , %[range], lsl #17 \n\t" -++ "mvnge %[bit] , %[bit] \n\t" -++ "movge %[range] , %[tmp] \n\t" -++ -++ "clz %[tmp] , %[range] \n\t" -++ "sub %[tmp] , #23 \n\t" -++ -++ "ldrb %[r_b] , [%[mlps_tables], %[bit]] \n\t" -++ "lsl %[low] , %[low] , %[tmp] \n\t" -++ "lsl %[range] , %[range] , %[tmp] \n\t" -++ -++ "strb %[r_b] , [%[state]] \n\t" -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ -++ "bne 2f \n\t" -++ LOAD_16BITS_BEHI -++ "lsr %[tmp] , %[tmp] , #15 \n\t" -++ "movw %[r_b] , #0xFFFF \n\t" -++ "sub %[tmp] , %[tmp] , %[r_b] \n\t" -++ -++ "rbit %[r_b] , %[low] \n\t" -++ "clz %[r_b] , %[r_b] \n\t" -++ "sub %[r_b] , %[r_b] , #16 \n\t" -++#if CONFIG_THUMB -++ "lsl %[tmp] , %[tmp] , %[r_b] \n\t" -++ "add %[low] , %[low] , %[tmp] \n\t" -++#else -++ "add %[low] , %[low] , %[tmp], lsl %[r_b] \n\t" -++#endif -++ "2: \n\t" -++ : [bit]"=&r"(bit), -++ [low]"+&r"(c->low), -++ [range]"+&r"(c->range), -++ [r_b]"=&r"(reg_b), -++ [ptr]"+&r"(c->bytestream), -++ [tmp]"=&r"(tmp) -++ : [state]"r"(state), -++ [mlps_tables]"r"(ff_h264_cabac_tables + H264_MLPS_STATE_OFFSET + 128), -++ [byte]"M"(offsetof(CABACContext, bytestream)), -++#if !UNCHECKED_BITSTREAM_READER -++ [c]"r"(c), -++ [end]"M"(offsetof(CABACContext, bytestream_end)), -++#endif -++ [lps_off]"I"((H264_MLPS_STATE_OFFSET + 128) - H264_LPS_RANGE_OFFSET) -++ : "memory", "cc" -++ ); -++#endif -+ -+ return bit & 1; -+ } -++ -++#define get_cabac_bypass get_cabac_bypass_arm -++static inline int get_cabac_bypass_arm(CABACContext * const c) -++{ -++ int rv = 0; -++ unsigned int tmp; -++ __asm ( -++ "lsl %[low] , #1 \n\t" -++ "cmp %[low] , %[range] , lsl #17 \n\t" -++ "adc %[rv] , %[rv] , #0 \n\t" -++ "it cs \n\t" -++ "subcs %[low] , %[low] , %[range], lsl #17 \n\t" -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ "bne 1f \n\t" -++ LOAD_16BITS_BEHI -++ "add %[low] , %[low] , %[tmp], lsr #15 \n\t" -++ "movw %[tmp] , #0xFFFF \n\t" -++ "sub %[low] , %[low] , %[tmp] \n\t" -++ "1: \n\t" -++ : // Outputs -++ [rv]"+&r"(rv), -++ [low]"+&r"(c->low), -++ [tmp]"=&r"(tmp), -++ [ptr]"+&r"(c->bytestream) -++ : // Inputs -++#if !UNCHECKED_BITSTREAM_READER -++ [c]"r"(c), -++ [end]"M"(offsetof(CABACContext, bytestream_end)), -++#endif -++ [range]"r"(c->range) -++ : "cc" -++ ); -++ return rv; -++} -++ -++ -++#define get_cabac_bypass_sign get_cabac_bypass_sign_arm -++static inline int get_cabac_bypass_sign_arm(CABACContext * const c, int rv) -++{ -++ unsigned int tmp; -++ __asm ( -++ "lsl %[low] , #1 \n\t" -++ "cmp %[low] , %[range] , lsl #17 \n\t" -++ "ite cc \n\t" -++ "rsbcc %[rv] , %[rv] , #0 \n\t" -++ "subcs %[low] , %[low] , %[range], lsl #17 \n\t" -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ "bne 1f \n\t" -++ LOAD_16BITS_BEHI -++ "add %[low] , %[low] , %[tmp], lsr #15 \n\t" -++ "movw %[tmp] , #0xFFFF \n\t" -++ "sub %[low] , %[low] , %[tmp] \n\t" -++ "1: \n\t" -++ : // Outputs -++ [rv]"+&r"(rv), -++ [low]"+&r"(c->low), -++ [tmp]"=&r"(tmp), -++ [ptr]"+&r"(c->bytestream) -++ : // Inputs -++#if !UNCHECKED_BITSTREAM_READER -++ [c]"r"(c), -++ [end]"M"(offsetof(CABACContext, bytestream_end)), -++#endif -++ [range]"r"(c->range) -++ : "cc" -++ ); -++ return rv; -++} -++ -+ #endif /* HAVE_ARMV6T2_INLINE */ -+ -+ #endif /* AVCODEC_ARM_CABAC_H */ -+diff --git a/libavcodec/arm/hevc_cabac.h b/libavcodec/arm/hevc_cabac.h -+new file mode 100644 -+index 0000000..31d3c59 -+--- /dev/null -++++ b/libavcodec/arm/hevc_cabac.h -+@@ -0,0 +1,491 @@ -++/* -++ * This file is part of FFmpeg. -++ * -++ * FFmpeg is free software; you can redistribute it and/or -++ * modify it under the terms of the GNU Lesser General Public -++ * License as published by the Free Software Foundation; either -++ * version 2.1 of the License, or (at your option) any later version. -++ * -++ * FFmpeg is distributed in the hope that it will be useful, -++ * but WITHOUT ANY WARRANTY; without even the implied warranty of -++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -++ * Lesser General Public License for more details. -++ * -++ * You should have received a copy of the GNU Lesser General Public -++ * License along with FFmpeg; if not, write to the Free Software -++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -++ */ -++ -++#ifndef AVCODEC_ARM_HEVC_CABAC_H -++#define AVCODEC_ARM_HEVC_CABAC_H -++ -++#include "config.h" -++#if HAVE_ARMV6T2_INLINE -++ -++#define hevc_mem_bits32 hevc_mem_bits32_arm -++static inline uint32_t hevc_mem_bits32_arm(const void * p, const unsigned int bits) -++{ -++ unsigned int n; -++ __asm__ ( -++ "rev %[n], %[x] \n\t" -++ : [n]"=r"(n) -++ : [x]"r"(*(const uint32_t *)((const uint8_t *)p + (bits >> 3))) -++ : -++ ); -++ return n << (bits & 7); -++} -++ -++ -++// --------------------------------------------------------------------------- -++// -++// Helper fns - little bits of code where ARM has an instraction that the -++// compiler doesn't know about / use -++ -++#define trans_scale_sat trans_scale_sat_arm -++static inline int trans_scale_sat_arm(const int level, const unsigned int scale, const unsigned int scale_m, const unsigned int shift) -++{ -++ int rv; -++ int t = ((level * (int)(scale * scale_m)) >> shift) + 1; -++ -++ __asm__ ( -++ "ssat %[rv], #16, %[t], ASR #1 \n\t" -++ : [rv]"=r"(rv) -++ : [t]"r"(t) -++ : -++ ); -++ return rv; -++} -++ -++#define update_rice update_rice_arm -++static inline void update_rice_arm(uint8_t * const stat_coeff, -++ const unsigned int last_coeff_abs_level_remaining, -++ const unsigned int c_rice_param) -++{ -++ int t; -++ __asm__ ( -++ "lsl %[t], %[coeff], #1 \n\t" -++ "lsrs %[t], %[t], %[shift] \n\t" -++ "it eq \n\t" -++ "subeq %[stat], %[stat], #1 \n\t" -++ "cmp %[t], #6 \n\t" -++ "adc %[stat], %[stat], #0 \n\t" -++ "usat %[stat], #8, %[stat] \n\t" -++ : [stat]"+&r"(*stat_coeff), -++ [t]"=&r"(t) -++ : [coeff]"r"(last_coeff_abs_level_remaining), -++ [shift]"r"(c_rice_param) -++ : "cc" -++ ); -++} -++ -++// --------------------------------------------------------------------------- -++// -++// CABAC get loops -++// -++// Where the loop is simple enough we can normally do 10-30% better than the -++// compiler -++ -++// Get the residual greater than 1 bits -++ -++#define get_cabac_greater1_bits get_cabac_greater1_bits_arm -++static inline unsigned int get_cabac_greater1_bits_arm(CABACContext * const c, const unsigned int n, -++ uint8_t * const state0) -++{ -++ unsigned int i, reg_b, st, tmp, bit, rv; -++ __asm__ ( -++ "mov %[i] , #0 \n\t" -++ "mov %[rv] , #0 \n\t" -++ "1: \n\t" -++ "add %[i] , %[i] , #1 \n\t" -++ "cmp %[rv] , #0 \n\t" -++ "ite eq \n\t" -++ "usateq %[st] , #2 , %[i] \n\t" -++ "movne %[st] , #0 \n\t" -++ -++ "ldrb %[bit] , [%[state0], %[st]] \n\t" -++ "sub %[r_b] , %[mlps_tables], %[lps_off] \n\t" -++ "and %[tmp] , %[range] , #0xC0 \n\t" -++ "add %[r_b] , %[r_b] , %[bit] \n\t" -++ "ldrb %[tmp] , [%[r_b], %[tmp], lsl #1] \n\t" -++ "sub %[range] , %[range] , %[tmp] \n\t" -++ -++ "cmp %[low] , %[range], lsl #17 \n\t" -++ "ittt ge \n\t" -++ "subge %[low] , %[low] , %[range], lsl #17 \n\t" -++ "mvnge %[bit] , %[bit] \n\t" -++ "movge %[range] , %[tmp] \n\t" -++ -++ "ldrb %[r_b] , [%[mlps_tables], %[bit]] \n\t" -++ "and %[bit] , %[bit] , #1 \n\t" -++ "orr %[rv] , %[bit] , %[rv], lsl #1 \n\t" -++ -++ "clz %[tmp] , %[range] \n\t" -++ "sub %[tmp] , #23 \n\t" -++ -++ "lsl %[low] , %[low] , %[tmp] \n\t" -++ "lsl %[range] , %[range] , %[tmp] \n\t" -++ -++ "strb %[r_b] , [%[state0], %[st]] \n\t" -++// There is a small speed gain from combining both conditions, using a single -++// branch and then working out what that meant later -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ "it ne \n\t" -++ "cmpne %[n] , %[i] \n\t" -++ "bne 1b \n\t" -++ -++// If reload is not required then we must have run out of flags to decode -++ "tst %[tmp] , %[tmp] \n\t" -++ "bne 2f \n\t" -++ -++// Do reload -++ "ldrh %[tmp] , [%[bptr]] , #2 \n\t" -++ "movw %[r_b] , #0xFFFF \n\t" -++ "rev %[tmp] , %[tmp] \n\t" -++ "rsb %[tmp] , %[r_b] , %[tmp], lsr #15 \n\t" -++ -++ "rbit %[r_b] , %[low] \n\t" -++ "clz %[r_b] , %[r_b] \n\t" -++ "sub %[r_b] , %[r_b] , #16 \n\t" -++ -++#if CONFIG_THUMB -++ "lsl %[tmp] , %[tmp] , %[r_b] \n\t" -++ "add %[low] , %[low] , %[tmp] \n\t" -++#else -++ "add %[low] , %[low] , %[tmp], lsl %[r_b] \n\t" -++#endif -++ -++ "cmp %[n] , %[i] \n\t" -++ "bne 1b \n\t" -++ "2: \n\t" -++ : [bit]"=&r"(bit), -++ [low]"+&r"(c->low), -++ [range]"+&r"(c->range), -++ [r_b]"=&r"(reg_b), -++ [bptr]"+&r"(c->bytestream), -++ [i]"=&r"(i), -++ [tmp]"=&r"(tmp), -++ [st]"=&r"(st), -++ [rv]"=&r"(rv) -++ : [state0]"r"(state0), -++ [n]"r"(n), -++ [mlps_tables]"r"(ff_h264_cabac_tables + H264_MLPS_STATE_OFFSET + 128), -++ [byte]"M"(offsetof(CABACContext, bytestream)), -++ [lps_off]"I"((H264_MLPS_STATE_OFFSET + 128) - H264_LPS_RANGE_OFFSET) -++ : "memory", "cc" -++ ); -++ return rv; -++} -++ -++ -++// n must be > 0 on entry -++#define get_cabac_sig_coeff_flag_idxs get_cabac_sig_coeff_flag_idxs_arm -++static inline uint8_t * get_cabac_sig_coeff_flag_idxs_arm(CABACContext * const c, uint8_t * const state0, -++ unsigned int n, -++ const uint8_t const * ctx_map, -++ uint8_t * p) -++{ -++ unsigned int reg_b, tmp, st, bit; -++ __asm__ ( -++ "1: \n\t" -++// Get bin from map -++ "ldrb %[st] , [%[ctx_map], %[n]] \n\t" -++ -++// Load state & ranges -++ "sub %[r_b] , %[mlps_tables], %[lps_off] \n\t" -++ "ldrb %[bit] , [%[state0], %[st]] \n\t" -++ "and %[tmp] , %[range] , #0xC0 \n\t" -++ "add %[r_b] , %[r_b] , %[tmp], lsl #1 \n\t" -++ "ldrb %[tmp] , [%[r_b], %[bit]] \n\t" -++ "sub %[range] , %[range] , %[tmp] \n\t" -++ -++ "cmp %[low] , %[range], lsl #17 \n\t" -++ "ittt ge \n\t" -++ "subge %[low] , %[low] , %[range], lsl #17 \n\t" -++ "mvnge %[bit] , %[bit] \n\t" -++ "movge %[range] , %[tmp] \n\t" -++ -++ "ldrb %[r_b] , [%[mlps_tables], %[bit]] \n\t" -++ "tst %[bit] , #1 \n\t" -++// GCC asm seems to need strbne written differently for thumb and arm -++#if CONFIG_THUMB -++ "it ne \n\t" -++ "strbne %[n] , [%[idx]] , #1 \n\t" -++#else -++ "strneb %[n] , [%[idx]] , #1 \n\t" -++#endif -++ -++// Renorm -++ "clz %[tmp] , %[range] \n\t" -++ "sub %[tmp] , #23 \n\t" -++ "lsl %[low] , %[low] , %[tmp] \n\t" -++ "lsl %[range] , %[range] , %[tmp] \n\t" -++ -++ "strb %[r_b] , [%[state0], %[st]] \n\t" -++// There is a small speed gain from combining both conditions, using a single -++// branch and then working out what that meant later -++ "subs %[n] , %[n] , #1 \n\t" -++#if CONFIG_THUMB -++ "itt ne \n\t" -++ "lslsne %[tmp] , %[low] , #16 \n\t" -++ "bne 1b \n\t" -++#else -++ "lslnes %[tmp] , %[low] , #16 \n\t" -++ "bne 1b \n\t" -++#endif -++ -++// If we have bits left then n must be 0 so give up now -++ "lsls %[tmp] , %[low] , #16 \n\t" -++ "bne 2f \n\t" -++ -++// Do reload -++ "ldrh %[tmp] , [%[bptr]] , #2 \n\t" -++ "movw %[r_b] , #0xFFFF \n\t" -++ "rev %[tmp] , %[tmp] \n\t" -++ "rsb %[tmp] , %[r_b] , %[tmp], lsr #15 \n\t" -++ -++ "rbit %[r_b] , %[low] \n\t" -++ "clz %[r_b] , %[r_b] \n\t" -++ "sub %[r_b] , %[r_b] , #16 \n\t" -++ -++#if CONFIG_THUMB -++ "lsl %[tmp] , %[tmp] , %[r_b] \n\t" -++ "add %[low] , %[low] , %[tmp] \n\t" -++#else -++ "add %[low] , %[low] , %[tmp], lsl %[r_b] \n\t" -++#endif -++ -++// Check to see if we still have more to do -++ "cmp %[n] , #0 \n\t" -++ "bne 1b \n\t" -++ "2: \n\t" -++ : [bit]"=&r"(bit), -++ [low]"+&r"(c->low), -++ [range]"+&r"(c->range), -++ [r_b]"=&r"(reg_b), -++ [bptr]"+&r"(c->bytestream), -++ [idx]"+&r"(p), -++ [n]"+&r"(n), -++ [tmp]"=&r"(tmp), -++ [st]"=&r"(st) -++ : [state0]"r"(state0), -++ [ctx_map]"r"(ctx_map), -++ [mlps_tables]"r"(ff_h264_cabac_tables + H264_MLPS_STATE_OFFSET + 128), -++ [byte]"M"(offsetof(CABACContext, bytestream)), -++ [lps_off]"I"((H264_MLPS_STATE_OFFSET + 128) - H264_LPS_RANGE_OFFSET) -++ : "memory", "cc" -++ ); -++ -++ return p; -++} -++ -++// --------------------------------------------------------------------------- -++// -++// CABAC_BY22 functions -++// -++// By and large these are (at best) no faster than their C equivalents - the -++// only one worth having is _peek where we do a slightly better job than the -++// compiler -++// -++// The others have been stashed here for reference in case larger scale asm -++// is attempted in which case they might be a useful base -++ -++ -++#define get_cabac_by22_peek get_cabac_by22_peek_arm -++static inline uint32_t get_cabac_by22_peek_arm(const CABACContext *const c) -++{ -++ uint32_t rv, tmp; -++ __asm__ ( -++ "bic %[rv] , %[low], #1 \n\t" -++ "cmp %[inv] , #0 \n\t" -++ "it ne \n\t" -++ "umullne %[tmp] , %[rv] , %[inv], %[rv] \n\t" -++ : // Outputs -++ [rv]"=&r"(rv), -++ [tmp]"=r"(tmp) -++ : // Inputs -++ [low]"r"(c->low), -++ [inv]"r"(c->range) -++ : // Clobbers -++ "cc" -++ ); -++ return rv << 1; -++} -++ -++#if 0 -++ -++// ***** Slower than the C :-( -++#define get_cabac_by22_flush get_cabac_by22_flush_arm -++static inline void get_cabac_by22_flush_arm(CABACContext *const c, const unsigned int n, const uint32_t val) -++{ -++ uint32_t m, tmp; -++ __asm__ ( -++ "add %[bits], %[bits], %[n] \n\t" -++ "ldr %[m], [%[ptr], %[bits], lsr #3] \n\t" -++ -++ "rsb %[tmp], %[n], #32 \n\t" -++ "lsr %[tmp], %[val], %[tmp] \n\t" -++ "mul %[tmp], %[range], %[tmp] \n\t" -++ -++ "rev %[m], %[m] \n\t" -++ -++ "lsl %[tmp], %[tmp], #23 \n\t" -++ "rsb %[low], %[tmp], %[low], lsl %[n] \n\t" -++ -++ "and %[tmp], %[bits], #7 \n\t" -++ "lsl %[m], %[m], %[tmp] \n\t" -++ -++ "orr %[low], %[low], %[m], lsr #9 \n\t" -++ : // Outputs -++ [m]"=&r"(m), -++ [tmp]"=&r"(tmp), -++ [bits]"+&r"(c->by22.bits), -++ [low]"+&r"(c->low) -++ : // Inputs -++ [n]"r"(n), -++ [val]"r"(val), -++ [inv]"r"(c->range), -++ [range]"r"(c->by22.range), -++ [ptr]"r"(c->bytestream) -++ : // Clobbers -++ ); -++} -++ -++ -++// Works but slower than C -++#define coeff_abs_level_remaining_decode_by22(c,r) coeff_abs_level_remaining_decode_by22_arm(c, r) -++static int coeff_abs_level_remaining_decode_by22_arm(CABACContext * const c, const unsigned int c_rice_param) -++{ -++ uint32_t n, val, tmp, level; -++ -++// PROFILE_START(); -++ -++ __asm__ ( -++ // Peek -++ "bic %[val], %[low], #1 \n\t" -++ "cmp %[inv], #0 \n\t" -++ "umullne %[tmp], %[val], %[inv], %[val] \n\t" -++ "lsl %[val], %[val], #1 \n\t" -++ -++ // Count bits (n = prefix) -++ "mvn %[n], %[val] \n\t" -++ "clz %[n], %[n] \n\t" -++ -++ "lsl %[level], %[val], %[n] \n\t" -++ "subs %[tmp], %[n], #3 \n\t" -++ "blo 2f \n\t" -++ -++ // prefix >= 3 -++ // < tmp = prefix - 3 -++ // > tmp = prefix + rice - 3 -++ "add %[tmp], %[tmp], %[rice] \n\t" -++ // > n = prefix * 2 + rice - 3 -++ "add %[n], %[tmp], %[n] \n\t" -++ "cmp %[n], #21 \n\t" -++ "bhi 3f \n\t" -++ -++ "orr %[level], %[level], #0x80000000 \n\t" -++ "rsb %[tmp], %[tmp], #31 \n\t" -++ "lsr %[level], %[level], %[tmp] \n\t" -++ -++ "mov %[tmp], #2 \n\t" -++ "add %[level], %[level], %[tmp], lsl %[rice] \n\t" -++ "b 1f \n\t" -++ -++ // > 22 bits used in total - need reload -++ "3: \n\t" -++ -++ // Stash prefix + rice - 3 in level (only spare reg) -++ "mov %[level], %[tmp] \n\t" -++ // Restore n to flush value (prefix) -++ "sub %[n], %[n], %[tmp] \n\t" -++ -++ // Flush + reload -++ -++// "rsb %[tmp], %[n], #32 \n\t" -++// "lsr %[tmp], %[val], %[tmp] \n\t" -++// "mul %[tmp], %[range], %[tmp] \n\t" -++ -++ // As it happens we know that all the bits we are flushing are 1 -++ // so we can cheat slightly -++ "rsb %[tmp], %[range], %[range], lsl %[n] \n\t" -++ "lsl %[tmp], %[tmp], #23 \n\t" -++ "rsb %[low], %[tmp], %[low], lsl %[n] \n\t" -++ -++ "add %[bits], %[bits], %[n] \n\t" -++ "ldr %[n], [%[ptr], %[bits], lsr #3] \n\t" -++ "rev %[n], %[n] \n\t" -++ "and %[tmp], %[bits], #7 \n\t" -++ "lsl %[n], %[n], %[tmp] \n\t" -++ -++ "orr %[low], %[low], %[n], lsr #9 \n\t" -++ -++ // (reload) -++ -++ "bic %[val], %[low], #1 \n\t" -++ "cmp %[inv], #0 \n\t" -++ "umullne %[tmp], %[val], %[inv], %[val] \n\t" -++ "lsl %[val], %[val], #1 \n\t" -++ -++ // Build value -++ -++ "mov %[n], %[level] \n\t" -++ -++ "orr %[tmp], %[val], #0x80000000 \n\t" -++ "rsb %[level], %[level], #31 \n\t" -++ "lsr %[level], %[tmp], %[level] \n\t" -++ -++ "mov %[tmp], #2 \n\t" -++ "add %[level], %[level], %[tmp], lsl %[rice] \n\t" -++ "b 1f \n\t" -++ -++ // prefix < 3 -++ "2: \n\t" -++ "rsb %[tmp], %[rice], #31 \n\t" -++ "lsr %[level], %[level], %[tmp] \n\t" -++ "orr %[level], %[level], %[n], lsl %[rice] \n\t" -++ "add %[n], %[n], %[rice] \n\t" -++ -++ "1: \n\t" -++ // Flush -++ "add %[n], %[n], #1 \n\t" -++ -++ "rsb %[tmp], %[n], #32 \n\t" -++ "lsr %[tmp], %[val], %[tmp] \n\t" -++ -++ "add %[bits], %[bits], %[n] \n\t" -++ "ldr %[val], [%[ptr], %[bits], lsr #3] \n\t" -++ -++ "mul %[tmp], %[range], %[tmp] \n\t" -++ "lsl %[tmp], %[tmp], #23 \n\t" -++ "rsb %[low], %[tmp], %[low], lsl %[n] \n\t" -++ -++ "rev %[val], %[val] \n\t" -++ "and %[tmp], %[bits], #7 \n\t" -++ "lsl %[val], %[val], %[tmp] \n\t" -++ -++ "orr %[low], %[low], %[val], lsr #9 \n\t" -++ : // Outputs -++ [level]"=&r"(level), -++ [n]"=&r"(n), -++ [val]"=&r"(val), -++ [tmp]"=&r"(tmp), -++ [bits]"+&r"(c->by22.bits), -++ [low]"+&r"(c->low) -++ : // Inputs -++ [rice]"r"(c_rice_param), -++ [inv]"r"(c->range), -++ [range]"r"(c->by22.range), -++ [ptr]"r"(c->bytestream) -++ : // Clobbers -++ "cc" -++ ); -++ -++// PROFILE_ACC(residual_abs); -++ -++ return level; -++} -++#endif -++ -++#endif /* HAVE_ARMV6T2_INLINE */ -++ -++#endif /* AVCODEC_ARM_HEVC_CABAC_H */ -+diff --git a/libavcodec/arm/hevcdsp_deblock_neon.S b/libavcodec/arm/hevcdsp_deblock_neon.S -+index bad4589..a088cc3 100644 -+--- a/libavcodec/arm/hevcdsp_deblock_neon.S -++++ b/libavcodec/arm/hevcdsp_deblock_neon.S -+@@ -409,10 +409,12 @@ function ff_hevc_deblocking_boundary_strengths_neon, export=1 -+ beq 90f -+ -+ tst a3, #1 -++ itee ne -+ ldrne a3, [v5, #0] @ curr->mv[0] -+ ldreq a3, [v5, #4] @ curr->mv[1] -+ moveq v1, v2 -+ tst v8, #1 -++ itee ne -+ ldrne v8, [v6, #0] @ neigh->mv[0] -+ ldreq v8, [v6, #4] @ neigh->mv[1] -+ moveq v3, v4 -+@@ -424,9 +426,14 @@ function ff_hevc_deblocking_boundary_strengths_neon, export=1 -+ sel a3, a3, ip -+ ands a3, a3, lr -+ @ drop through -+-10: movne a3, #1 -++10: it ne -++ movne a3, #1 -+ 11: subs a2, a2, #1 -+-12: strbhs a3, [v7], a4 -++12: -++A strbhs a3, [v7], a4 -++T itt hs -++T strbhs a3, [v7] -++T addhs v7, v7, a4 -+ subs a2, a2, #1 -+ bhs 12b -+ -+@@ -442,6 +449,7 @@ function ff_hevc_deblocking_boundary_strengths_neon, export=1 -+ bne 10b -+ -+ teq v1, v3 -++ it eq -+ teqeq v2, v4 -+ bne 40f -+ teq v1, v2 -+@@ -487,6 +495,7 @@ function ff_hevc_deblocking_boundary_strengths_neon, export=1 -+ b 10b -+ -+ 40: teq v1, v4 -++ ite eq -+ teqeq v2, v3 -+ bne 10b -+ -+diff --git a/libavcodec/arm/hevcdsp_epel_neon.S b/libavcodec/arm/hevcdsp_epel_neon.S -+index 516ae5b..00eab9e 100644 -+--- a/libavcodec/arm/hevcdsp_epel_neon.S -++++ b/libavcodec/arm/hevcdsp_epel_neon.S -+@@ -110,7 +110,9 @@ function ff_hevc_put_epel_h_neon_8, export=1 -+ sub r7, #1 -+ lsl r7, #2 -+ vpush {d8-d15} -+- adrl r12, epel_coeffs -++@ adr reaches if we are in thumb mode but not in arm -++T adr r12, epel_coeffs -++A adrl r12, epel_coeffs -+ add r7, r12 -+ sub r1, #1 -+ lsl r4, #1 -+@@ -170,7 +172,8 @@ function ff_hevc_put_epel_v_neon_8, export=1 -+ sub r7, #1 -+ lsl r7, #2 -+ vpush {d8-d15} -+- adrl r12, epel_coeffs -++T adr r12, epel_coeffs -++A adrl r12, epel_coeffs -+ add r7, r12 -+ load_coeffs_16b r7 -+ sub r1, r2 -+@@ -246,7 +249,7 @@ function ff_hevc_put_epel_hv_neon_8, export=1 -+ sub r7, #1 -+ lsl r7, #2 -+ vpush {d8-d15} -+- adrl r12, epel_coeffs -++ adr r12, epel_coeffs -+ sub r6, #1 -+ lsl r6, #2 -+ add r6, r12 // mx epel coeff offset -+diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h -+index 1bf1c62..ccfa991 100644 -+--- a/libavcodec/cabac.h -++++ b/libavcodec/cabac.h -+@@ -43,7 +43,14 @@ extern const uint8_t ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63]; -+ typedef struct CABACContext{ -+ int low; -+ int range; -+- int outstanding_count; -++ union -++ { -++ int outstanding_count; -++ struct { -++ uint16_t bits; -++ uint16_t range; -++ } by22; -++ }; -+ const uint8_t *bytestream_start; -+ const uint8_t *bytestream; -+ const uint8_t *bytestream_end; -+diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c -+index 8656917..4caf720 100644 -+--- a/libavcodec/hevc_cabac.c -++++ b/libavcodec/hevc_cabac.c -+@@ -21,14 +21,72 @@ -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -++#define UNCHECKED_BITSTREAM_READER 1 -++ -+ #include "libavutil/attributes.h" -+ #include "libavutil/common.h" -+ -+-#include "cabac_functions.h" -+ #include "hevc.h" -++#include "cabac_functions.h" -++ -++// BY22 is probably faster than simple bypass if the processor has -++// either a fast 32-bit divide or a fast 32x32->64[63:32] instruction -++// x86 has fast int divide -++// Arm doesn't have divide or general fast 64 bit, but does have the multiply -++// * Beware: ARCH_xxx isn't set if configure --disable-asm is used -++#define USE_BY22 (HAVE_FAST_64BIT || ARCH_ARM || ARCH_X86) -++// Use native divide if we have a fast one - otherwise use mpy 1/x -++// x86 has a fast integer divide - arm doesn't - unsure about other -++// architectures -++#define USE_BY22_DIV ARCH_X86 -++ -++// Special case blocks with a single significant ceoff -++// Decreases the complexity of the code for a common case but increases the -++// code size. -++#define USE_N_END_1 1 -++ -++#if ARCH_ARM -++#include "arm/hevc_cabac.h" -++#endif -+ -+ #define CABAC_MAX_BIN 31 -+ -++ -++#if USE_BY22 && !USE_BY22_DIV -++#define I(x) (uint32_t)((0x10000000000ULL / (uint64_t)(x)) + 1ULL) -++ -++static const uint32_t cabac_by22_inv_range[256] = { -++ 0, I(257), I(258), I(259), -++ I(260), I(261), I(262), I(263), I(264), I(265), I(266), I(267), I(268), I(269), -++ I(270), I(271), I(272), I(273), I(274), I(275), I(276), I(277), I(278), I(279), -++ I(280), I(281), I(282), I(283), I(284), I(285), I(286), I(287), I(288), I(289), -++ I(290), I(291), I(292), I(293), I(294), I(295), I(296), I(297), I(298), I(299), -++ I(300), I(301), I(302), I(303), I(304), I(305), I(306), I(307), I(308), I(309), -++ I(310), I(311), I(312), I(313), I(314), I(315), I(316), I(317), I(318), I(319), -++ I(320), I(321), I(322), I(323), I(324), I(325), I(326), I(327), I(328), I(329), -++ I(330), I(331), I(332), I(333), I(334), I(335), I(336), I(337), I(338), I(339), -++ I(340), I(341), I(342), I(343), I(344), I(345), I(346), I(347), I(348), I(349), -++ I(350), I(351), I(352), I(353), I(354), I(355), I(356), I(357), I(358), I(359), -++ I(360), I(361), I(362), I(363), I(364), I(365), I(366), I(367), I(368), I(369), -++ I(370), I(371), I(372), I(373), I(374), I(375), I(376), I(377), I(378), I(379), -++ I(380), I(381), I(382), I(383), I(384), I(385), I(386), I(387), I(388), I(389), -++ I(390), I(391), I(392), I(393), I(394), I(395), I(396), I(397), I(398), I(399), -++ I(400), I(401), I(402), I(403), I(404), I(405), I(406), I(407), I(408), I(409), -++ I(410), I(411), I(412), I(413), I(414), I(415), I(416), I(417), I(418), I(419), -++ I(420), I(421), I(422), I(423), I(424), I(425), I(426), I(427), I(428), I(429), -++ I(430), I(431), I(432), I(433), I(434), I(435), I(436), I(437), I(438), I(439), -++ I(440), I(441), I(442), I(443), I(444), I(445), I(446), I(447), I(448), I(449), -++ I(450), I(451), I(452), I(453), I(454), I(455), I(456), I(457), I(458), I(459), -++ I(460), I(461), I(462), I(463), I(464), I(465), I(466), I(467), I(468), I(469), -++ I(470), I(471), I(472), I(473), I(474), I(475), I(476), I(477), I(478), I(479), -++ I(480), I(481), I(482), I(483), I(484), I(485), I(486), I(487), I(488), I(489), -++ I(490), I(491), I(492), I(493), I(494), I(495), I(496), I(497), I(498), I(499), -++ I(500), I(501), I(502), I(503), I(504), I(505), I(506), I(507), I(508), I(509), -++ I(510), I(511) -++}; -++#undef I -++#endif // USE_BY22 -++ -+ /** -+ * number of bin by SyntaxElement. -+ */ -+@@ -445,6 +503,211 @@ static const uint8_t diag_scan8x8_inv[8][8] = { -+ { 28, 36, 43, 49, 54, 58, 61, 63, }, -+ }; -+ -++ -++typedef struct -++{ -++ uint16_t coeff; -++ uint16_t scale; -++} xy_off_t; -++ -++#define XYT_C(x,y,t) ((x) + ((y) << (t))) -++#define SCALE_TRAFO(t) ((t) > 3 ? 3 : (t)) -++#define SCALE_SHR(t) ((t) - SCALE_TRAFO(t)) -++#define XYT_S(x,y,t) (((x) >> SCALE_SHR(t)) + (((y) >> SCALE_SHR(t)) << SCALE_TRAFO(t))) -++ -++#define XYT(x,y,t) {XYT_C(x,y,t), XYT_S(x,y,t)} -++ -++#define OFF_DIAG(t) {\ -++ XYT(0,0,t), XYT(0,1,t), XYT(1,0,t), XYT(0,2,t),\ -++ XYT(1,1,t), XYT(2,0,t), XYT(0,3,t), XYT(1,2,t),\ -++ XYT(2,1,t), XYT(3,0,t), XYT(1,3,t), XYT(2,2,t),\ -++ XYT(3,1,t), XYT(2,3,t), XYT(3,2,t), XYT(3,3,t)\ -++} -++ -++#define OFF_HORIZ(t) {\ -++ XYT(0,0,t), XYT(1,0,t), XYT(2,0,t), XYT(3,0,t),\ -++ XYT(0,1,t), XYT(1,1,t), XYT(2,1,t), XYT(3,1,t),\ -++ XYT(0,2,t), XYT(1,2,t), XYT(2,2,t), XYT(3,2,t),\ -++ XYT(0,3,t), XYT(1,3,t), XYT(2,3,t), XYT(3,3,t)\ -++} -++ -++#define OFF_VERT(t) {\ -++ XYT(0,0,t), XYT(0,1,t), XYT(0,2,t), XYT(0,3,t),\ -++ XYT(1,0,t), XYT(1,1,t), XYT(1,2,t), XYT(1,3,t),\ -++ XYT(2,0,t), XYT(2,1,t), XYT(2,2,t), XYT(2,3,t),\ -++ XYT(3,0,t), XYT(3,1,t), XYT(3,2,t), XYT(3,3,t)\ -++} -++ -++static const xy_off_t off_xys[3][4][16] = -++{ -++ {OFF_DIAG(2), OFF_DIAG(3), OFF_DIAG(4), OFF_DIAG(5)}, -++ {OFF_HORIZ(2), OFF_HORIZ(3), OFF_HORIZ(4), OFF_HORIZ(5)}, -++ {OFF_VERT(2), OFF_VERT(3), OFF_VERT(4), OFF_VERT(5)} -++}; -++ -++ -++// Helper fns -++#ifndef hevc_mem_bits32 -++static av_always_inline uint32_t hevc_mem_bits32(const void * buf, const unsigned int offset) -++{ -++ return AV_RB32((const uint8_t *)buf + (offset >> 3)) << (offset & 7); -++} -++#endif -++ -++#if AV_GCC_VERSION_AT_LEAST(3,4) && !defined(hevc_clz32) -++#define hevc_clz32 hevc_clz32_builtin -++static av_always_inline unsigned int hevc_clz32_builtin(const uint32_t x) -++{ -++ // __builtin_clz says it works on ints - so adjust if int is >32 bits long -++ return __builtin_clz(x) - (sizeof(int) * 8 - 32); -++} -++#endif -++ -++// It is unlikely that we will ever need this but include for completeness -++#ifndef hevc_clz32 -++static inline unsigned int hevc_clz32(unsigned int x) -++{ -++ unsigned int n = 1; -++ if ((x & 0xffff0000) == 0) { -++ n += 16; -++ x <<= 16; -++ } -++ if ((x & 0xff000000) == 0) { -++ n += 8; -++ x <<= 8; -++ } -++ if ((x & 0xf0000000) == 0) { -++ n += 4; -++ x <<= 4; -++ } -++ if ((x & 0xc0000000) == 0) { -++ n += 2; -++ x <<= 2; -++ } -++ return n - ((x >> 31) & 1); -++} -++#endif -++ -++ -++#if !USE_BY22 -++// If no by22 then _by22 functions will revert to normal and so _peek/_flush -++// will no longer be called but the setup calls will still exist and we want -++// to null them out -++#define bypass_start(s) -++#define bypass_finish(s) -++#else -++// Use BY22 for residual bypass block -++ -++#define bypass_start(s) get_cabac_by22_start(&s->HEVClc->cc) -++#define bypass_finish(s) get_cabac_by22_finish(&s->HEVClc->cc) -++ -++// BY22 notes that bypass is simply a divide into the bitstream and so we -++// can peek out large quantities of bits at one and treat the result as if -++// it was VLC. In many cases this will lead to O(1) processing rather than -++// O(n) though the setup and teardown is sufficiently expensive that it is -++// only worth using if we expect to be dealing with more than a few bits -++// The definition of "a few bits" will vary from platform to platform but -++// tests on ARM show that it probably isn't worth it for a single coded -++// residual, but is for >1 - this is probaly reinforced that if there are -++// more residuals then they are likely to be bigger and this will make the -++// O(1) nature of the code more worthwhile. -++ -++ -++#if !USE_BY22_DIV -++// * 1/x @ 32 bits gets us 22 bits of accuracy -++#define CABAC_BY22_PEEK_BITS 22 -++#else -++// A real 32-bit divide gets us another bit -++// If we have a 64 bit int & a unit time divider then we should get a lot -++// of bits (55) but that is untested and it is unclear if it would give -++// us a large advantage -++#define CABAC_BY22_PEEK_BITS 23 -++#endif -++ -++// Bypass block start -++// Must be called before _by22_peek is used as it sets the CABAC environment -++// into the correct state. _by22_finish must be called to return to 'normal' -++// (i.e. non-bypass) cabac decoding -++static inline void get_cabac_by22_start(CABACContext * const c) -++{ -++ const unsigned int bits = __builtin_ctz(c->low); -++ const uint32_t m = hevc_mem_bits32(c->bytestream, 0); -++ uint32_t x = (c->low << (22 - CABAC_BITS)) ^ ((m ^ 0x80000000U) >> (9 + CABAC_BITS - bits)); -++#if !USE_BY22_DIV -++ const uint32_t inv = cabac_by22_inv_range[c->range & 0xff]; -++#endif -++ -++ c->bytestream -= (CABAC_BITS / 8); -++ c->by22.bits = bits; -++#if !USE_BY22_DIV -++ c->by22.range = c->range; -++ c->range = inv; -++#endif -++ c->low = x; -++} -++ -++// Bypass block finish -++// Must be called at the end of the bypass block to return to normal operation -++static inline void get_cabac_by22_finish(CABACContext * const c) -++{ -++ unsigned int used = c->by22.bits; -++ unsigned int bytes_used = (used / CABAC_BITS) * (CABAC_BITS / 8); -++ unsigned int bits_used = used & (CABAC_BITS == 16 ? 15 : 7); -++ -++ c->bytestream += bytes_used + (CABAC_BITS / 8); -++ c->low = (((uint32_t)c->low >> (22 - CABAC_BITS + bits_used)) | 1) << bits_used; -++#if !USE_BY22_DIV -++ c->range = c->by22.range; -++#endif -++} -++ -++// Peek bypass bits -++// _by22_start must be called before _by22_peek is called and _by22_flush -++// must be called afterwards to flush any used bits -++// The actual number of valid bits returned is -++// min(, CABAC_BY22_PEEK_BITS). CABAC_BY22_PEEK_BITS -++// will be at least 22 which should be long enough for any prefix or suffix -++// though probably not long enough for the worst case combination -++#ifndef get_cabac_by22_peek -++static inline uint32_t get_cabac_by22_peek(const CABACContext * const c) -++{ -++#if USE_BY22_DIV -++ return ((unsigned int)c->low / (unsigned int)c->range) << 9; -++#else -++ uint32_t x = c->low & ~1U; -++ const uint32_t inv = c->range; -++ -++ if (inv != 0) -++ x = (uint32_t)(((uint64_t)x * (uint64_t)inv) >> 32); -++ -++ return x << 1; -++#endif -++} -++#endif -++ -++// Flush bypass bits peeked by _by22_peek -++// Flush n bypass bits. n must be >= 1 to guarantee correct operation -++// val is an unmodified copy of whatever _by22_peek returned -++#ifndef get_cabac_by22_flush -++static inline void get_cabac_by22_flush(CABACContext * c, const unsigned int n, const uint32_t val) -++{ -++ // Subtract the bits used & reshift up to the top of the word -++#if USE_BY22_DIV -++ const uint32_t low = (((unsigned int)c->low << n) - (((val >> (32 - n)) * (unsigned int)c->range) << 23)); -++#else -++ const uint32_t low = (((uint32_t)c->low << n) - (((val >> (32 - n)) * c->by22.range) << 23)); -++#endif -++ -++ // and refill lower bits -++ // We will probably OR over some existing bits but that doesn't matter -++ c->by22.bits += n; -++ c->low = low | (hevc_mem_bits32(c->bytestream, c->by22.bits) >> 9); -++} -++#endif -++ -++#endif // USE_BY22 -++ -++ -+ void ff_hevc_save_states(HEVCContext *s, int ctb_addr_ts) -+ { -+ if (s->ps.pps->entropy_coding_sync_enabled_flag && -+@@ -863,19 +1126,19 @@ int ff_hevc_cbf_luma_decode(HEVCContext *s, int trafo_depth) -+ return GET_CABAC(elem_offset[CBF_LUMA] + !trafo_depth); -+ } -+ -+-static int hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx) -++static int hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx_nz) -+ { -+- return GET_CABAC(elem_offset[TRANSFORM_SKIP_FLAG] + !!c_idx); -++ return GET_CABAC(elem_offset[TRANSFORM_SKIP_FLAG] + c_idx_nz); -+ } -+ -+-static int explicit_rdpcm_flag_decode(HEVCContext *s, int c_idx) -++static int explicit_rdpcm_flag_decode(HEVCContext *s, int c_idx_nz) -+ { -+- return GET_CABAC(elem_offset[EXPLICIT_RDPCM_FLAG] + !!c_idx); -++ return GET_CABAC(elem_offset[EXPLICIT_RDPCM_FLAG] + c_idx_nz); -+ } -+ -+-static int explicit_rdpcm_dir_flag_decode(HEVCContext *s, int c_idx) -++static int explicit_rdpcm_dir_flag_decode(HEVCContext *s, int c_idx_nz) -+ { -+- return GET_CABAC(elem_offset[EXPLICIT_RDPCM_DIR_FLAG] + !!c_idx); -++ return GET_CABAC(elem_offset[EXPLICIT_RDPCM_DIR_FLAG] + c_idx_nz); -+ } -+ -+ int ff_hevc_log2_res_scale_abs(HEVCContext *s, int idx) { -+@@ -891,14 +1154,14 @@ int ff_hevc_res_scale_sign_flag(HEVCContext *s, int idx) { -+ return GET_CABAC(elem_offset[RES_SCALE_SIGN_FLAG] + idx); -+ } -+ -+-static av_always_inline void last_significant_coeff_xy_prefix_decode(HEVCContext *s, int c_idx, -++static av_always_inline void last_significant_coeff_xy_prefix_decode(HEVCContext *s, int c_idx_nz, -+ int log2_size, int *last_scx_prefix, int *last_scy_prefix) -+ { -+ int i = 0; -+ int max = (log2_size << 1) - 1; -+ int ctx_offset, ctx_shift; -+ -+- if (!c_idx) { -++ if (!c_idx_nz) { -+ ctx_offset = 3 * (log2_size - 2) + ((log2_size - 1) >> 2); -+ ctx_shift = (log2_size + 1) >> 2; -+ } else { -+@@ -929,22 +1192,16 @@ static av_always_inline int last_significant_coeff_suffix_decode(HEVCContext *s, -+ return value; -+ } -+ -+-static av_always_inline int significant_coeff_group_flag_decode(HEVCContext *s, int c_idx, int ctx_cg) -++static av_always_inline int significant_coeff_group_flag_decode(HEVCContext *s, int c_idx_nz, int ctx_cg) -+ { -+ int inc; -+ -+- inc = FFMIN(ctx_cg, 1) + (c_idx>0 ? 2 : 0); -++ inc = (ctx_cg != 0) + (c_idx_nz << 1); -+ -+ return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_GROUP_FLAG] + inc); -+ } -+-static av_always_inline int significant_coeff_flag_decode(HEVCContext *s, int x_c, int y_c, -+- int offset, const uint8_t *ctx_idx_map) -+-{ -+- int inc = ctx_idx_map[(y_c << 2) + x_c] + offset; -+- return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_FLAG] + inc); -+-} -+ -+-static av_always_inline int significant_coeff_flag_decode_0(HEVCContext *s, int c_idx, int offset) -++static av_always_inline int significant_coeff_flag_decode_0(HEVCContext *s, int offset) -+ { -+ return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_FLAG] + offset); -+ } -+@@ -966,65 +1223,305 @@ static av_always_inline int coeff_abs_level_greater2_flag_decode(HEVCContext *s, -+ return GET_CABAC(elem_offset[COEFF_ABS_LEVEL_GREATER2_FLAG] + inc); -+ } -+ -+-static av_always_inline int coeff_abs_level_remaining_decode(HEVCContext *s, int rc_rice_param) -++ -++#if !USE_BY22 -++#define coeff_abs_level_remaining_decode_bypass(s,r) coeff_abs_level_remaining_decode(s, r) -++#endif -++ -++ -++#ifndef coeff_abs_level_remaining_decode_bypass -++static int coeff_abs_level_remaining_decode_bypass(HEVCContext * const s, const unsigned int rice_param) -++{ -++ CABACContext * const c = &s->HEVClc->cc; -++ uint32_t y; -++ unsigned int prefix; -++ unsigned int last_coeff_abs_level_remaining; -++ unsigned int n; -++ -++ y = get_cabac_by22_peek(c); -++ prefix = hevc_clz32(~y); -++ // y << prefix will always have top bit 0 -++ -++ if (prefix < 3) { -++ const unsigned int suffix = (y << prefix) >> (31 - rice_param); -++ last_coeff_abs_level_remaining = (prefix << rice_param) + suffix; -++ n = prefix + 1 + rice_param; -++ } -++ else if (prefix * 2 + rice_param <= CABAC_BY22_PEEK_BITS + 2) -++ { -++ const uint32_t suffix = ((y << prefix) | 0x80000000) >> (34 - (prefix + rice_param)); -++ -++ last_coeff_abs_level_remaining = (2 << rice_param) + suffix; -++ n = prefix * 2 + rice_param - 2; -++ } -++ else { -++ unsigned int suffix; -++ -++ get_cabac_by22_flush(c, prefix, y); -++ y = get_cabac_by22_peek(c); -++ -++ suffix = (y | 0x80000000) >> (34 - (prefix + rice_param)); -++ last_coeff_abs_level_remaining = (2 << rice_param) + suffix; -++ n = prefix + rice_param - 2; -++ } -++ -++ get_cabac_by22_flush(c, n, y); -++ -++ return last_coeff_abs_level_remaining; -++} -++#endif -++ -++static int coeff_abs_level_remaining_decode(HEVCContext * const s, int rc_rice_param) -+ { -++ CABACContext * const c = &s->HEVClc->cc; -+ int prefix = 0; -+ int suffix = 0; -+ int last_coeff_abs_level_remaining; -+ int i; -+ -+- while (prefix < CABAC_MAX_BIN && get_cabac_bypass(&s->HEVClc->cc)) -++ while (prefix < CABAC_MAX_BIN && get_cabac_bypass(c)) -+ prefix++; -+ if (prefix == CABAC_MAX_BIN) { -+ av_log(s->avctx, AV_LOG_ERROR, "CABAC_MAX_BIN : %d\n", prefix); -+ return 0; -+ } -++ -+ if (prefix < 3) { -+ for (i = 0; i < rc_rice_param; i++) -+- suffix = (suffix << 1) | get_cabac_bypass(&s->HEVClc->cc); -++ suffix = (suffix << 1) | get_cabac_bypass(c); -+ last_coeff_abs_level_remaining = (prefix << rc_rice_param) + suffix; -+ } else { -+ int prefix_minus3 = prefix - 3; -+ for (i = 0; i < prefix_minus3 + rc_rice_param; i++) -+- suffix = (suffix << 1) | get_cabac_bypass(&s->HEVClc->cc); -++ suffix = (suffix << 1) | get_cabac_bypass(c); -+ last_coeff_abs_level_remaining = (((1 << prefix_minus3) + 3 - 1) -+ << rc_rice_param) + suffix; -+ } -++ -+ return last_coeff_abs_level_remaining; -+ } -+ -+-static av_always_inline int coeff_sign_flag_decode(HEVCContext *s, uint8_t nb) -++#if !USE_BY22 -++#define coeff_sign_flag_decode_bypass coeff_sign_flag_decode -++static inline uint32_t coeff_sign_flag_decode(HEVCContext * const s, const unsigned int nb) -+ { -+- int i; -+- int ret = 0; -++ CABACContext * const c = &s->HEVClc->cc; -++ unsigned int i; -++ uint32_t ret = 0; -+ -+ for (i = 0; i < nb; i++) -+- ret = (ret << 1) | get_cabac_bypass(&s->HEVClc->cc); -+- return ret; -++ ret = (ret << 1) | get_cabac_bypass(c); -++ -++ return ret << (32 - nb); -+ } -++#endif -++ -++#ifndef coeff_sign_flag_decode_bypass -++static inline uint32_t coeff_sign_flag_decode_bypass(HEVCContext * const s, const unsigned int nb) -++{ -++ CABACContext * const c = &s->HEVClc->cc; -++ uint32_t y; -++ y = get_cabac_by22_peek(c); -++ get_cabac_by22_flush(c, nb, y); -++ return y & ~(0xffffffffU >> nb); -++} -++#endif -++ -++ -++#ifndef get_cabac_greater1_bits -++static inline unsigned int get_cabac_greater1_bits(CABACContext * const c, const unsigned int n, -++ uint8_t * const state0) -++{ -++ unsigned int i; -++ unsigned int rv = 0; -++ for (i = 0; i != n; ++i) { -++ const unsigned int idx = rv != 0 ? 0 : i < 3 ? i + 1 : 3; -++ const unsigned int b = get_cabac(c, state0 + idx); -++ rv = (rv << 1) | b; -++ } -++ return rv; -++} -++#endif -++ -++ -++// N.B. levels returned are the values assuming coeff_abs_level_remaining -++// is uncoded, so 1 must be added if it is coded. sum_abs also reflects -++// this version of events. -++static inline uint32_t get_greaterx_bits(HEVCContext * const s, const unsigned int n_end, int * const levels, -++ int * const pprev_subset_coded, int * const psum, -++ const unsigned int idx0_gt1, const unsigned int idx_gt2) -++{ -++ CABACContext * const c = &s->HEVClc->cc; -++ uint8_t * const state0 = s->HEVClc->cabac_state + idx0_gt1; -++ uint8_t * const state_gt2 = s->HEVClc->cabac_state + idx_gt2; -++ unsigned int rv; -++ unsigned int i; -++ const unsigned int n = FFMIN(n_end, 8); -++ -++ // Really this is i != n but the simple unconditional loop is cheaper -++ // and faster -++ for (i = 0; i != 8; ++i) -++ levels[i] = 1; -++ -++ rv = get_cabac_greater1_bits(c, n, state0); -++ -++ *pprev_subset_coded = 0; -++ *psum = n; -++ -++ rv <<= (32 - n); -++ if (rv != 0) -++ { -++ *pprev_subset_coded = 1; -++ *psum = n + 1; -++ i = hevc_clz32(rv); -++ levels[i] = 2; -++ if (get_cabac(c, state_gt2) == 0) -++ { -++ // Unset first coded bit -++ rv &= ~(0x80000000U >> i); -++ } -++ } -++ -++ if (n_end > 8) { -++ const unsigned int g8 = n_end - 8; -++ rv |= ((1 << g8) - 1) << (24 - g8); -++ for (i = 0; i != g8; ++i) { -++ levels[i + 8] = 0; -++ } -++ } -++ -++ return rv; -++} -++ -++// extended_precision_processing_flag must be false given we are -++// putting the result into a 16-bit array -++// So trans_coeff_level must fit in 16 bits too (7.4.9.1 definition of coeff_abs_level_remaining) -++// scale_m is uint8_t -++// -++// scale is [40 - 72] << [0..12] based on qp- worst case is (45 << 12) -++// or it can be 2 (if we have transquant_bypass) -++// shift is set to one less than we really want but would normally be -++// s->ps.sps->bit_depth (max 16, min 8) + log2_trafo_size (max 5, min 2?) - 5 = max 16 min 5? -++// however the scale shift is substracted from shift to a min 0 so scale_m worst = 45 << 6 -++// This can still theoretically lead to overflow but the coding would have to be very odd (& inefficient) -++// to achieve it -++ -++#ifndef trans_scale_sat -++static inline int trans_scale_sat(const int level, const unsigned int scale, const unsigned int scale_m, const unsigned int shift) -++{ -++ return av_clip_int16((((level * (int)(scale * scale_m)) >> shift) + 1) >> 1); -++} -++#endif -++ -++ -++#ifndef update_rice -++static inline void update_rice(uint8_t * const stat_coeff, -++ const unsigned int last_coeff_abs_level_remaining, -++ const unsigned int c_rice_param) -++{ -++ const unsigned int x = (last_coeff_abs_level_remaining << 1) >> c_rice_param; -++ if (x >= 6) -++ (*stat_coeff)++; -++ else if (x == 0 && *stat_coeff > 0) -++ (*stat_coeff)--; -++} -++#endif -++ -++ -++// n must be > 0 on entry -++#ifndef get_cabac_sig_coeff_flag_idxs -++static inline uint8_t * get_cabac_sig_coeff_flag_idxs(CABACContext * const c, uint8_t * const state0, -++ unsigned int n, -++ const uint8_t const * ctx_map, -++ uint8_t * p) -++{ -++ do { -++ if (get_cabac(c, state0 + ctx_map[n])) -++ *p++ = n; -++ } while (--n != 0); -++ return p; -++} -++#endif -++ -++ -++static int get_sig_coeff_flag_idxs(CABACContext * const c, uint8_t * const state0, -++ unsigned int n, -++ const uint8_t const * ctx_map, -++ uint8_t * const flag_idx) -++{ -++ int rv; -++ -++ rv = get_cabac_sig_coeff_flag_idxs(c, state0, n, ctx_map, flag_idx) - flag_idx; -++ -++ return rv; -++} -++ -++#define H4x4(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15) {\ -++ x0, x1, x2, x3,\ -++ x4, x5, x6, x7,\ -++ x8, x9, x10, x11,\ -++ x12, x13, x14, x15} -++ -++#define V4x4(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15) {\ -++ x0, x4, x8, x12,\ -++ x1, x5, x9, x13,\ -++ x2, x6, x10, x14,\ -++ x3, x7, x11, x15} -++ -++#define D4x4(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15) {\ -++ x0, x4, x1, x8,\ -++ x5, x2, x12, x9,\ -++ x6, x3, x13, x10,\ -++ x7, x14, x11, x15} -++ -++ -++static inline int next_subset(HEVCContext * const s, int i, const int c_idx_nz, -++ uint8_t * const significant_coeff_group_flag, -++ const uint8_t * const scan_x_cg, const uint8_t * const scan_y_cg, -++ int * const pPrev_sig) -++{ -++ while (--i >= 0) { -++ unsigned int x_cg = scan_x_cg[i]; -++ unsigned int y_cg = scan_y_cg[i]; -++ -++ // For the flag decode we only care about Z/NZ but -++ // we use the full Right + Down * 2 when calculating -++ // significant coeff flags so we obtain it here -++ //. -++ // The group flag array is one longer than it needs to -++ // be so we don't need to check for y_cg limits -++ unsigned int prev_sig = ((significant_coeff_group_flag[y_cg] >> (x_cg + 1)) & 1) | -++ (((significant_coeff_group_flag[y_cg + 1] >> x_cg) & 1) << 1); -++ -++ if (i == 0 || -++ significant_coeff_group_flag_decode(s, c_idx_nz, prev_sig)) -++ { -++ significant_coeff_group_flag[y_cg] |= (1 << x_cg); -++ *pPrev_sig = prev_sig; -++ break; -++ } -++ } -++ -++ return i; -++} -++ -+ -+ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int log2_trafo_size, enum ScanType scan_idx, -+ int c_idx) -+ { -+-#define GET_COORD(offset, n) \ -+- do { \ -+- x_c = (x_cg << 2) + scan_x_off[n]; \ -+- y_c = (y_cg << 2) + scan_y_off[n]; \ -+- } while (0) -+- HEVCLocalContext *lc = s->HEVClc; -+- int transform_skip_flag = 0; -++ HEVCLocalContext * const lc = s->HEVClc; -++ int trans_skip_or_bypass = lc->cu.cu_transquant_bypass_flag; -+ -+ int last_significant_coeff_x, last_significant_coeff_y; -+- int last_scan_pos; -+- int n_end; -+ int num_coeff = 0; -+- int greater1_ctx = 1; -++ int prev_subset_coded = 0; -+ -+ int num_last_subset; -+ int x_cg_last_sig, y_cg_last_sig; -+ -+- const uint8_t *scan_x_cg, *scan_y_cg, *scan_x_off, *scan_y_off; -++ const uint8_t *scan_x_cg, *scan_y_cg; -++ const xy_off_t * scan_xy_off; -+ -+ ptrdiff_t stride = s->frame->linesize[c_idx]; -+ int hshift = s->ps.sps->hshift[c_idx]; -+@@ -1032,21 +1529,28 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ uint8_t *dst = &s->frame->data[c_idx][(y0 >> vshift) * stride + -+ ((x0 >> hshift) << s->ps.sps->pixel_shift)]; -+ #ifdef RPI -+- int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag && !transform_skip_flag && !lc->tu.cross_pf && log2_trafo_size>=4; -++ //***** transform_skip_flag decoded later! -++ int use_vpu = s->enable_rpi && !lc->cu.cu_transquant_bypass_flag /* && !transform_skip_flag*/ && !lc->tu.cross_pf && log2_trafo_size>=4; -+ #endif -+ int16_t *coeffs = (int16_t*)(c_idx ? lc->edge_emu_buffer2 : lc->edge_emu_buffer); -+- uint8_t significant_coeff_group_flag[8][8] = {{0}}; -++ uint8_t significant_coeff_group_flag[9] = {0}; // Allow 1 final byte that is always zero -+ int explicit_rdpcm_flag = 0; -+ int explicit_rdpcm_dir_flag; -+ -+ int trafo_size = 1 << log2_trafo_size; -+ int i; -+- int qp,shift,add,scale,scale_m; -++ int qp,shift,scale; -+ static const uint8_t level_scale[] = { 40, 45, 51, 57, 64, 72 }; -+ const uint8_t *scale_matrix = NULL; -+ uint8_t dc_scale; -+ int pred_mode_intra = (c_idx == 0) ? lc->tu.intra_pred_mode : -+ lc->tu.intra_pred_mode_c; -++ -++ int prev_sig = 0; -++ const int c_idx_nz = (c_idx != 0); -++ -++ int may_hide_sign; -++ -+ #ifdef RPI -+ if (s->enable_rpi) { -+ int n = trafo_size * trafo_size; -+@@ -1078,7 +1582,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ -+ // Derive QP for dequant -+ if (!lc->cu.cu_transquant_bypass_flag) { -+- static const int qp_c[] = { 29, 30, 31, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37 }; -++ static const uint8_t qp_c[] = { 29, 30, 31, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37 }; -+ static const uint8_t rem6[51 + 4 * 6 + 1] = { -+ 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, -+ 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, -+@@ -1094,9 +1598,19 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ }; -+ int qp_y = lc->qp_y; -+ -++ may_hide_sign = s->ps.pps->sign_data_hiding_flag; -++ -+ if (s->ps.pps->transform_skip_enabled_flag && -+ log2_trafo_size <= s->ps.pps->log2_max_transform_skip_block_size) { -+- transform_skip_flag = hevc_transform_skip_flag_decode(s, c_idx); -++ int transform_skip_flag = hevc_transform_skip_flag_decode(s, c_idx_nz); -++ if (transform_skip_flag) { -++ trans_skip_or_bypass = 1; -++ if (lc->cu.pred_mode == MODE_INTRA && -++ s->ps.sps->implicit_rdpcm_enabled_flag && -++ (pred_mode_intra == 10 || pred_mode_intra == 26)) { -++ may_hide_sign = 0; -++ } -++ } -+ } -+ -+ if (c_idx == 0) { -+@@ -1129,39 +1643,73 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ qp += s->ps.sps->qp_bd_offset; -+ } -+ -+- shift = s->ps.sps->bit_depth + log2_trafo_size - 5; -+- add = 1 << (shift-1); -+- scale = level_scale[rem6[qp]] << (div6[qp]); -+- scale_m = 16; // default when no custom scaling lists. -+- dc_scale = 16; -++ // Shift is set to one less than will actually occur as the scale -++ // and saturate step adds 1 and then shifts right again -++ shift = s->ps.sps->bit_depth + log2_trafo_size - 6; -++ scale = level_scale[rem6[qp]]; -++ if (div6[qp] >= shift) { -++ scale <<= (div6[qp] - shift); -++ shift = 0; -++ } else { -++ shift -= div6[qp]; -++ } -+ -+- if (s->ps.sps->scaling_list_enable_flag && !(transform_skip_flag && log2_trafo_size > 2)) { -++ if (s->ps.sps->scaling_list_enable_flag && !(trans_skip_or_bypass && log2_trafo_size > 2)) { -+ const ScalingList *sl = s->ps.pps->scaling_list_data_present_flag ? -+- &s->ps.pps->scaling_list : &s->ps.sps->scaling_list; -++ &s->ps.pps->scaling_list : &s->ps.sps->scaling_list; -+ int matrix_id = lc->cu.pred_mode != MODE_INTRA; -+ -+ matrix_id = 3 * matrix_id + c_idx; -+ -+ scale_matrix = sl->sl[log2_trafo_size - 2][matrix_id]; -++ dc_scale = scale_matrix[0]; -+ if (log2_trafo_size >= 4) -+ dc_scale = sl->sl_dc[log2_trafo_size - 4][matrix_id]; -+ } -++ else -++ { -++ static const uint8_t sixteen_scale[64] = { -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16, -++ 16, 16, 16, 16, 16, 16, 16, 16 -++ }; -++ scale_matrix = sixteen_scale; -++ dc_scale = 16; -++ } -+ } else { -++ static const uint8_t unit_scale[64] = { -++ 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, -++ }; -++ scale_matrix = unit_scale; -+ shift = 0; -+- add = 0; -+- scale = 0; -+- dc_scale = 0; -++ scale = 2; // We will shift right to kill this -++ dc_scale = 1; -++ -++ may_hide_sign = 0; -+ } -+ -+ if (lc->cu.pred_mode == MODE_INTER && s->ps.sps->explicit_rdpcm_enabled_flag && -+- (transform_skip_flag || lc->cu.cu_transquant_bypass_flag)) { -+- explicit_rdpcm_flag = explicit_rdpcm_flag_decode(s, c_idx); -++ trans_skip_or_bypass) { -++ explicit_rdpcm_flag = explicit_rdpcm_flag_decode(s, c_idx_nz); -+ if (explicit_rdpcm_flag) { -+- explicit_rdpcm_dir_flag = explicit_rdpcm_dir_flag_decode(s, c_idx); -++ may_hide_sign = 0; -++ explicit_rdpcm_dir_flag = explicit_rdpcm_dir_flag_decode(s, c_idx_nz); -+ } -+ } -+ -+- last_significant_coeff_xy_prefix_decode(s, c_idx, log2_trafo_size, -++ last_significant_coeff_xy_prefix_decode(s, c_idx_nz, log2_trafo_size, -+ &last_significant_coeff_x, &last_significant_coeff_y); -+ -+ if (last_significant_coeff_x > 3) { -+@@ -1189,119 +1737,113 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ int last_x_c = last_significant_coeff_x & 3; -+ int last_y_c = last_significant_coeff_y & 3; -+ -+- scan_x_off = ff_hevc_diag_scan4x4_x; -+- scan_y_off = ff_hevc_diag_scan4x4_y; -+ num_coeff = diag_scan4x4_inv[last_y_c][last_x_c]; -+- if (trafo_size == 4) { -++ -++ switch (log2_trafo_size) { -++ case 2: -+ scan_x_cg = scan_1x1; -+ scan_y_cg = scan_1x1; -+- } else if (trafo_size == 8) { -++ break; -++ case 3: -+ num_coeff += diag_scan2x2_inv[y_cg_last_sig][x_cg_last_sig] << 4; -+ scan_x_cg = diag_scan2x2_x; -+ scan_y_cg = diag_scan2x2_y; -+- } else if (trafo_size == 16) { -++ break; -++ case 4: -+ num_coeff += diag_scan4x4_inv[y_cg_last_sig][x_cg_last_sig] << 4; -+ scan_x_cg = ff_hevc_diag_scan4x4_x; -+ scan_y_cg = ff_hevc_diag_scan4x4_y; -+- } else { // trafo_size == 32 -++ break; -++ case 5: -++ default: -+ num_coeff += diag_scan8x8_inv[y_cg_last_sig][x_cg_last_sig] << 4; -+ scan_x_cg = ff_hevc_diag_scan8x8_x; -+ scan_y_cg = ff_hevc_diag_scan8x8_y; -++ break; -+ } -+ break; -+ } -+ case SCAN_HORIZ: -+ scan_x_cg = horiz_scan2x2_x; -+ scan_y_cg = horiz_scan2x2_y; -+- scan_x_off = horiz_scan4x4_x; -+- scan_y_off = horiz_scan4x4_y; -+ num_coeff = horiz_scan8x8_inv[last_significant_coeff_y][last_significant_coeff_x]; -+ break; -+ default: //SCAN_VERT -+ scan_x_cg = horiz_scan2x2_y; -+ scan_y_cg = horiz_scan2x2_x; -+- scan_x_off = horiz_scan4x4_y; -+- scan_y_off = horiz_scan4x4_x; -+ num_coeff = horiz_scan8x8_inv[last_significant_coeff_x][last_significant_coeff_y]; -+ break; -+ } -+ num_coeff++; -+ num_last_subset = (num_coeff - 1) >> 4; -+ -+- for (i = num_last_subset; i >= 0; i--) { -+- int n, m; -+- int x_cg, y_cg, x_c, y_c, pos; -+- int implicit_non_zero_coeff = 0; -+- int64_t trans_coeff_level; -+- int prev_sig = 0; -+- int offset = i << 4; -+- int rice_init = 0; -+- -+- uint8_t significant_coeff_flag_idx[16]; -+- uint8_t nb_significant_coeff_flag = 0; -++ significant_coeff_group_flag[y_cg_last_sig] = 1 << x_cg_last_sig; // 1st subset always significant -+ -+- x_cg = scan_x_cg[i]; -+- y_cg = scan_y_cg[i]; -++ scan_xy_off = off_xys[scan_idx][log2_trafo_size - 2]; -+ -+- if ((i < num_last_subset) && (i > 0)) { -+- int ctx_cg = 0; -+- if (x_cg < (1 << (log2_trafo_size - 2)) - 1) -+- ctx_cg += significant_coeff_group_flag[x_cg + 1][y_cg]; -+- if (y_cg < (1 << (log2_trafo_size - 2)) - 1) -+- ctx_cg += significant_coeff_group_flag[x_cg][y_cg + 1]; -+- -+- significant_coeff_group_flag[x_cg][y_cg] = -+- significant_coeff_group_flag_decode(s, c_idx, ctx_cg); -+- implicit_non_zero_coeff = 1; -+- } else { -+- significant_coeff_group_flag[x_cg][y_cg] = -+- ((x_cg == x_cg_last_sig && y_cg == y_cg_last_sig) || -+- (x_cg == 0 && y_cg == 0)); -+- } -++ i = num_last_subset; -++ do { -++ int implicit_non_zero_coeff = 0; -++ int n_end; -+ -+- last_scan_pos = num_coeff - offset - 1; -++ uint8_t significant_coeff_flag_idx[16]; -++ unsigned int nb_significant_coeff_flag = 0; -+ -+ if (i == num_last_subset) { -++ // First time through -++ int last_scan_pos = num_coeff - (i << 4) - 1; -+ n_end = last_scan_pos - 1; -+ significant_coeff_flag_idx[0] = last_scan_pos; -+ nb_significant_coeff_flag = 1; -+ } else { -+ n_end = 15; -++ implicit_non_zero_coeff = (i != 0); -+ } -+ -+- if (x_cg < ((1 << log2_trafo_size) - 1) >> 2) -+- prev_sig = !!significant_coeff_group_flag[x_cg + 1][y_cg]; -+- if (y_cg < ((1 << log2_trafo_size) - 1) >> 2) -+- prev_sig += (!!significant_coeff_group_flag[x_cg][y_cg + 1] << 1); -+- -+- if (significant_coeff_group_flag[x_cg][y_cg] && n_end >= 0) { -+- static const uint8_t ctx_idx_map[] = { -+- 0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8, // log2_trafo_size == 2 -+- 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, // prev_sig == 0 -+- 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, // prev_sig == 1 -+- 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, // prev_sig == 2 -+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 // default -++ if (n_end >= 0) { -++ static const uint8_t ctx_idx_maps_ts2[3][16] = { -++ D4x4(0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8), // log2_trafo_size == 2 -++ H4x4(0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8), // log2_trafo_size == 2 -++ V4x4(0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8) // log2_trafo_size == 2 -++ }; -++ static const uint8_t ctx_idx_maps[3][4][16] = { -++ { -++ D4x4(1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 0 -++ D4x4(2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 1 -++ D4x4(2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0), // prev_sig == 2 -++ D4x4(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) // prev_sig == 3, default -++ }, -++ { -++ H4x4(1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 0 -++ H4x4(2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 1 -++ H4x4(2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0), // prev_sig == 2 -++ H4x4(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) // prev_sig == 3, default -++ }, -++ { -++ V4x4(1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 0 -++ V4x4(2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0), // prev_sig == 1 -++ V4x4(2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0, 2, 1, 0, 0), // prev_sig == 2 -++ V4x4(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2) // prev_sig == 3, default -++ } -+ }; -+ const uint8_t *ctx_idx_map_p; -+ int scf_offset = 0; -+- if (s->ps.sps->transform_skip_context_enabled_flag && -+- (transform_skip_flag || lc->cu.cu_transquant_bypass_flag)) { -+- ctx_idx_map_p = (uint8_t*) &ctx_idx_map[4 * 16]; -+- if (c_idx == 0) { -+- scf_offset = 40; -+- } else { -+- scf_offset = 14 + 27; -+- } -++ -++ if (s->ps.sps->transform_skip_context_enabled_flag && trans_skip_or_bypass) { -++ ctx_idx_map_p = ctx_idx_maps[0][3]; -++ scf_offset = 40 + c_idx_nz; -+ } else { -+- if (c_idx != 0) -++ if (c_idx_nz != 0) -+ scf_offset = 27; -++ -+ if (log2_trafo_size == 2) { -+- ctx_idx_map_p = (uint8_t*) &ctx_idx_map[0]; -++ ctx_idx_map_p = ctx_idx_maps_ts2[scan_idx]; -+ } else { -+- ctx_idx_map_p = (uint8_t*) &ctx_idx_map[(prev_sig + 1) << 4]; -+- if (c_idx == 0) { -+- if ((x_cg > 0 || y_cg > 0)) -++ ctx_idx_map_p = ctx_idx_maps[scan_idx][prev_sig]; -++ if (!c_idx_nz) { -++ if (i != 0) -+ scf_offset += 3; -++ -+ if (log2_trafo_size == 3) { -+ scf_offset += (scan_idx == SCAN_DIAG) ? 9 : 15; -+ } else { -+@@ -1315,34 +1857,30 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ } -+ } -+- for (n = n_end; n > 0; n--) { -+- x_c = scan_x_off[n]; -+- y_c = scan_y_off[n]; -+- if (significant_coeff_flag_decode(s, x_c, y_c, scf_offset, ctx_idx_map_p)) { -+- significant_coeff_flag_idx[nb_significant_coeff_flag] = n; -+- nb_significant_coeff_flag++; -++ -++ if (n_end > 0) { -++ int cnt = get_sig_coeff_flag_idxs(&s->HEVClc->cc, -++ s->HEVClc->cabac_state + elem_offset[SIGNIFICANT_COEFF_FLAG] + scf_offset, -++ n_end, ctx_idx_map_p, -++ significant_coeff_flag_idx + nb_significant_coeff_flag); -++ -++ nb_significant_coeff_flag += cnt; -++ if (cnt != 0) { -+ implicit_non_zero_coeff = 0; -+ } -+ } -++ -+ if (implicit_non_zero_coeff == 0) { -+- if (s->ps.sps->transform_skip_context_enabled_flag && -+- (transform_skip_flag || lc->cu.cu_transquant_bypass_flag)) { -+- if (c_idx == 0) { -+- scf_offset = 42; -+- } else { -+- scf_offset = 16 + 27; -+- } -++ if (s->ps.sps->transform_skip_context_enabled_flag && trans_skip_or_bypass) { -++ scf_offset = 42 + c_idx_nz; -+ } else { -+ if (i == 0) { -+- if (c_idx == 0) -+- scf_offset = 0; -+- else -+- scf_offset = 27; -++ scf_offset = c_idx_nz ? 27 : 0; -+ } else { -+ scf_offset = 2 + scf_offset; -+ } -+ } -+- if (significant_coeff_flag_decode_0(s, c_idx, scf_offset) == 1) { -++ if (significant_coeff_flag_decode_0(s, scf_offset) == 1) { -+ significant_coeff_flag_idx[nb_significant_coeff_flag] = 0; -+ nb_significant_coeff_flag++; -+ } -+@@ -1352,141 +1890,185 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ } -+ } -+ -+- n_end = nb_significant_coeff_flag; -+- -++ if (nb_significant_coeff_flag != 0) { -++ const unsigned int gt1_idx_delta = (c_idx_nz << 2) | -++ ((i != 0 && !c_idx_nz) ? 2 : 0) | -++ prev_subset_coded; -++ const unsigned int idx0_gt1 = elem_offset[COEFF_ABS_LEVEL_GREATER1_FLAG] + -++ (gt1_idx_delta << 2); -++ const unsigned int idx_gt2 = elem_offset[COEFF_ABS_LEVEL_GREATER2_FLAG] + -++ gt1_idx_delta; -++ -++ const unsigned int x_cg = scan_x_cg[i]; -++ const unsigned int y_cg = scan_y_cg[i]; -++ int16_t * const blk_coeffs = coeffs + -++ ((x_cg + (y_cg << log2_trafo_size)) << 2); -++ // This calculation is 'wrong' for log2_traffo_size == 2 -++ // but that doesn't mattor as in this case x_cg & y_cg -++ // are always 0 so result is correct (0) anyway -++ const uint8_t * const blk_scale = scale_matrix + -++ (((x_cg + (y_cg << 3)) << (5 - log2_trafo_size))); -++ -++ // * THe following code block doesn't deal with these flags: -++ // (nor did the one it replaces) -++ // -++ // cabac_bypass_alignment_enabled_flag -++ // This should be easy but I can't find a test case -++ // extended_precision_processing_flag -++ // This can extend the required precision past 16bits -++ // so is probably tricky - also no example found yet -++ -++#if USE_N_END_1 -++ if (nb_significant_coeff_flag == 1) { -++ // There is a small gain to be had from special casing the single -++ // transform coefficient case. The reduction in complexity -++ // makes up for the code duplicatioon. -++ -++ int trans_coeff_level = 1; -++ int coeff_sign_flag; -++ int coded_val = 0; -++ -++ // initialize first elem of coeff_bas_level_greater1_flag -++ prev_subset_coded = 0; -++ -++ if (get_cabac(&s->HEVClc->cc, s->HEVClc->cabac_state + idx0_gt1 + 1)) { -++ trans_coeff_level = 2; -++ prev_subset_coded = 1; -++ coded_val = get_cabac(&s->HEVClc->cc, s->HEVClc->cabac_state + idx_gt2); -++ } -+ -+- if (n_end) { -+- int first_nz_pos_in_cg; -+- int last_nz_pos_in_cg; -+- int c_rice_param = 0; -+- int first_greater1_coeff_idx = -1; -+- uint8_t coeff_abs_level_greater1_flag[8]; -+- uint16_t coeff_sign_flag; -+- int sum_abs = 0; -+- int sign_hidden; -+- int sb_type; -++ // Probably not worth the overhead of starting by22 for just one value -++ coeff_sign_flag = get_cabac_bypass(&s->HEVClc->cc); -+ -++ if (coded_val) -++ { -++ if (!s->ps.sps->persistent_rice_adaptation_enabled_flag) { -++ trans_coeff_level = 3 + coeff_abs_level_remaining_decode(s, 0); -++ } else { -++ uint8_t * const stat_coeff = -++ lc->stat_coeff + trans_skip_or_bypass + 2 - ((c_idx_nz) << 1); -++ const unsigned int c_rice_param = *stat_coeff >> 2; -++ const int last_coeff_abs_level_remaining = coeff_abs_level_remaining_decode(s, c_rice_param); -+ -+- // initialize first elem of coeff_bas_level_greater1_flag -+- int ctx_set = (i > 0 && c_idx == 0) ? 2 : 0; -++ trans_coeff_level = 3 + last_coeff_abs_level_remaining; -++ update_rice(stat_coeff, last_coeff_abs_level_remaining, c_rice_param); -++ } -++ } -+ -+- if (s->ps.sps->persistent_rice_adaptation_enabled_flag) { -+- if (!transform_skip_flag && !lc->cu.cu_transquant_bypass_flag) -+- sb_type = 2 * (c_idx == 0 ? 1 : 0); -+- else -+- sb_type = 2 * (c_idx == 0 ? 1 : 0) + 1; -+- c_rice_param = lc->stat_coeff[sb_type] / 4; -+- } -++ { -++ const xy_off_t * const xy_off = scan_xy_off + significant_coeff_flag_idx[0]; -++ const int k = (int32_t)(coeff_sign_flag << 31) >> 31; -++ const unsigned int scale_m = blk_scale[xy_off->scale]; -+ -+- if (!(i == num_last_subset) && greater1_ctx == 0) -+- ctx_set++; -+- greater1_ctx = 1; -+- last_nz_pos_in_cg = significant_coeff_flag_idx[0]; -+- -+- for (m = 0; m < (n_end > 8 ? 8 : n_end); m++) { -+- int inc = (ctx_set << 2) + greater1_ctx; -+- coeff_abs_level_greater1_flag[m] = -+- coeff_abs_level_greater1_flag_decode(s, c_idx, inc); -+- if (coeff_abs_level_greater1_flag[m]) { -+- greater1_ctx = 0; -+- if (first_greater1_coeff_idx == -1) -+- first_greater1_coeff_idx = m; -+- } else if (greater1_ctx > 0 && greater1_ctx < 3) { -+- greater1_ctx++; -++ blk_coeffs[xy_off->coeff] = trans_scale_sat( -++ (trans_coeff_level ^ k) - k, // Apply sign -++ scale, -++ i == 0 && xy_off->coeff == 0 ? dc_scale : scale_m, -++ shift); -+ } -+ } -+- first_nz_pos_in_cg = significant_coeff_flag_idx[n_end - 1]; -+- -+- if (lc->cu.cu_transquant_bypass_flag || -+- (lc->cu.pred_mode == MODE_INTRA && -+- s->ps.sps->implicit_rdpcm_enabled_flag && transform_skip_flag && -+- (pred_mode_intra == 10 || pred_mode_intra == 26 )) || -+- explicit_rdpcm_flag) -+- sign_hidden = 0; -+ else -+- sign_hidden = (last_nz_pos_in_cg - first_nz_pos_in_cg >= 4); -++#endif -++ { -++ int sign_hidden = may_hide_sign; -++ int levels[16]; // Should be able to get away with int16_t but that fails some tests -++ uint32_t coeff_sign_flags; -++ uint32_t coded_vals = 0; -++ // Sum(abs(level[])) -++ // In fact we only need the bottom bit and in some future -++ // version that may be all we calculate -++ unsigned int sum_abs; -++ -++ coded_vals = get_greaterx_bits(s, nb_significant_coeff_flag, levels, -++ &prev_subset_coded, &sum_abs, idx0_gt1, idx_gt2); -++ -++ if (significant_coeff_flag_idx[0] - significant_coeff_flag_idx[nb_significant_coeff_flag - 1] <= 3) -++ sign_hidden = 0; -++ -++ // -- Start bypass block -++ -++ bypass_start(s); -++ -++ coeff_sign_flags = coeff_sign_flag_decode_bypass(s, nb_significant_coeff_flag - sign_hidden); -++ -++ if (coded_vals != 0) -++ { -++ const int rice_adaptation_enabled = s->ps.sps->persistent_rice_adaptation_enabled_flag; -++ uint8_t * stat_coeff = !rice_adaptation_enabled ? NULL : -++ lc->stat_coeff + trans_skip_or_bypass + 2 - ((c_idx_nz) << 1); -++ int c_rice_param = !rice_adaptation_enabled ? 0 : *stat_coeff >> 2; -++ int * level = levels - 1; -++ -++ do { -++ { -++ const unsigned int z = hevc_clz32(coded_vals) + 1; -++ level += z; -++ coded_vals <<= z; -++ } -+ -+- if (first_greater1_coeff_idx != -1) { -+- coeff_abs_level_greater1_flag[first_greater1_coeff_idx] += coeff_abs_level_greater2_flag_decode(s, c_idx, ctx_set); -+- } -+- if (!s->ps.pps->sign_data_hiding_flag || !sign_hidden ) { -+- coeff_sign_flag = coeff_sign_flag_decode(s, nb_significant_coeff_flag) << (16 - nb_significant_coeff_flag); -+- } else { -+- coeff_sign_flag = coeff_sign_flag_decode(s, nb_significant_coeff_flag - 1) << (16 - (nb_significant_coeff_flag - 1)); -+- } -++ { -++ const int last_coeff_abs_level_remaining = coeff_abs_level_remaining_decode_bypass(s, c_rice_param); -++ const int trans_coeff_level = *level + last_coeff_abs_level_remaining + 1; -++ -++ sum_abs += last_coeff_abs_level_remaining + 1; -++ *level = trans_coeff_level; -+ -+- for (m = 0; m < n_end; m++) { -+- n = significant_coeff_flag_idx[m]; -+- GET_COORD(offset, n); -+- if (m < 8) { -+- trans_coeff_level = 1 + coeff_abs_level_greater1_flag[m]; -+- if (trans_coeff_level == ((m == first_greater1_coeff_idx) ? 3 : 2)) { -+- int last_coeff_abs_level_remaining = coeff_abs_level_remaining_decode(s, c_rice_param); -+- -+- trans_coeff_level += last_coeff_abs_level_remaining; -+- if (trans_coeff_level > (3 << c_rice_param)) -+- c_rice_param = s->ps.sps->persistent_rice_adaptation_enabled_flag ? c_rice_param + 1 : FFMIN(c_rice_param + 1, 4); -+- if (s->ps.sps->persistent_rice_adaptation_enabled_flag && !rice_init) { -+- int c_rice_p_init = lc->stat_coeff[sb_type] / 4; -+- if (last_coeff_abs_level_remaining >= (3 << c_rice_p_init)) -+- lc->stat_coeff[sb_type]++; -+- else if (2 * last_coeff_abs_level_remaining < (1 << c_rice_p_init)) -+- if (lc->stat_coeff[sb_type] > 0) -+- lc->stat_coeff[sb_type]--; -+- rice_init = 1; -++ if (stat_coeff != NULL) -++ update_rice(stat_coeff, last_coeff_abs_level_remaining, c_rice_param); -++ stat_coeff = NULL; -++ -++ if (trans_coeff_level > (3 << c_rice_param) && -++ (c_rice_param < 4 || rice_adaptation_enabled)) -++ ++c_rice_param; -+ } -+- } -+- } else { -+- int last_coeff_abs_level_remaining = coeff_abs_level_remaining_decode(s, c_rice_param); -+- -+- trans_coeff_level = 1 + last_coeff_abs_level_remaining; -+- if (trans_coeff_level > (3 << c_rice_param)) -+- c_rice_param = s->ps.sps->persistent_rice_adaptation_enabled_flag ? c_rice_param + 1 : FFMIN(c_rice_param + 1, 4); -+- if (s->ps.sps->persistent_rice_adaptation_enabled_flag && !rice_init) { -+- int c_rice_p_init = lc->stat_coeff[sb_type] / 4; -+- if (last_coeff_abs_level_remaining >= (3 << c_rice_p_init)) -+- lc->stat_coeff[sb_type]++; -+- else if (2 * last_coeff_abs_level_remaining < (1 << c_rice_p_init)) -+- if (lc->stat_coeff[sb_type] > 0) -+- lc->stat_coeff[sb_type]--; -+- rice_init = 1; -+- } -++ } while (coded_vals != 0); -+ } -+- if (s->ps.pps->sign_data_hiding_flag && sign_hidden) { -+- sum_abs += trans_coeff_level; -+- if (n == first_nz_pos_in_cg && (sum_abs&1)) -+- trans_coeff_level = -trans_coeff_level; -++ -++ // sign_hidden = 0 or 1 so we can combine the tests -++ if ((sign_hidden & sum_abs) != 0) { -++ levels[nb_significant_coeff_flag - 1] = -levels[nb_significant_coeff_flag - 1]; -+ } -+- if (coeff_sign_flag >> 15) -+- trans_coeff_level = -trans_coeff_level; -+- coeff_sign_flag <<= 1; -+- if(!lc->cu.cu_transquant_bypass_flag) { -+- if (s->ps.sps->scaling_list_enable_flag && !(transform_skip_flag && log2_trafo_size > 2)) { -+- if(y_c || x_c || log2_trafo_size < 4) { -+- switch(log2_trafo_size) { -+- case 3: pos = (y_c << 3) + x_c; break; -+- case 4: pos = ((y_c >> 1) << 3) + (x_c >> 1); break; -+- case 5: pos = ((y_c >> 2) << 3) + (x_c >> 2); break; -+- default: pos = (y_c << 2) + x_c; break; -+- } -+- scale_m = scale_matrix[pos]; -+- } else { -+- scale_m = dc_scale; -+- } -++ -++ bypass_finish(s); -++ -++ // -- Finish bypass block -++ -++ // Scale loop -++ { -++ int m = nb_significant_coeff_flag - 1; -++ -++ // Deal with DC component (if any) first -++ if (i == 0 && significant_coeff_flag_idx[m] == 0) -++ { -++ const int k = (int32_t)(coeff_sign_flags << m) >> 31; -++ blk_coeffs[0] = trans_scale_sat( -++ (levels[m] ^ k) - k, scale, dc_scale, shift); -++ --m; -+ } -+- trans_coeff_level = (trans_coeff_level * (int64_t)scale * (int64_t)scale_m + add) >> shift; -+- if(trans_coeff_level < 0) { -+- if((~trans_coeff_level) & 0xFffffffffff8000) -+- trans_coeff_level = -32768; -+- } else { -+- if(trans_coeff_level & 0xffffffffffff8000) -+- trans_coeff_level = 32767; -++ -++#if !USE_N_END_1 -++ // If N_END_! set then m was at least 1 initially -++ if (m >= 0) -++#endif -++ { -++ do { -++ const xy_off_t * const xy_off = scan_xy_off + -++ significant_coeff_flag_idx[m]; -++ const int k = (int32_t)(coeff_sign_flags << m) >> 31; -++ -++ blk_coeffs[xy_off->coeff] = trans_scale_sat( -++ (levels[m] ^ k) - k, -++ scale, -++ blk_scale[xy_off->scale], -++ shift); -++ } while (--m >= 0); -+ } -+ } -+- coeffs[y_c * trafo_size + x_c] = trans_coeff_level; -++ -+ } -+ } -+- } -++ } while ((i = next_subset(s, i, c_idx_nz, -++ significant_coeff_group_flag, scan_x_cg, scan_y_cg, &prev_sig)) >= 0); -+ -+ if (lc->cu.cu_transquant_bypass_flag) { -+ if (explicit_rdpcm_flag || (s->ps.sps->implicit_rdpcm_enabled_flag && -+@@ -1496,7 +2078,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, -+ s->hevcdsp.transform_rdpcm(coeffs, log2_trafo_size, mode); -+ } -+ } else { -+- if (transform_skip_flag) { -++ if (trans_skip_or_bypass) { // Must be trans_skip as we've already dealt with bypass -+ int rot = s->ps.sps->transform_skip_rotation_enabled_flag && -+ log2_trafo_size == 2 && -+ lc->cu.pred_mode == MODE_INTRA; -+-- -+2.7.4 -+ -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index 48f8d56988718dd53294e8291a53e532f0ff338d..337dbaab927919858e44d79f647207ef0513eea1 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -3,7 +3,8 @@ include FFMPEG-VERSION - DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ - 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \ - hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch \ -- pfcd_hevc_optimisations.patch -+ pfcd_hevc_optimisations.patch \ -+ 0001-Squashed-commit-of-the-following.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -71,6 +72,7 @@ ifeq ($(Configuration), Release) - ffmpg_config += --disable-debug - endif - -+ffmpg_config += --extra-cflags="-DRPI=1" - - CLEAN_FILES=$(ARCHIVE) $(PLATFORM) - -@@ -87,6 +89,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - cd $(PLATFORM); patch -p1 < ../pfcd_hevc_optimisations.patch -+ cd $(PLATFORM); patch -p1 < ../0001-Squashed-commit-of-the-following.patch - - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index d6856dbd4fb4957ace700cbc08332223c01938f6..a61357f14cb2139e8125ae04684bed1b29fefb12 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -136,6 +136,7 @@ patch -p1 < ../0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch - patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - patch -p1 < ../pfcd_hevc_optimisations.patch -+patch -p1 < ../0001-Squashed-commit-of-the-following.patch - - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ -@@ -170,6 +171,7 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - --enable-zlib \ - --disable-mipsdsp \ - --disable-mipsdspr2 \ -+ --extra-cflags="-DRPI=1" \ - ${FLAGS} - - make -j ${BUILDTHREADS} - -From ebf9d46351a5f4b6d14b9936a2ff4048062cf219 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 16 Sep 2015 19:05:12 +0100 -Subject: [PATCH 29/61] [3d] Make MVC a valid 3D filename tag - ---- - xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++ - xbmc/settings/AdvancedSettings.cpp | 2 ++ - xbmc/settings/AdvancedSettings.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp -index 299d0ba62f4dbb6bc8d5632e19288f165333cc3c..618e6f4f0d6e792e0d0d60edfad2d59e3805ff7c 100644 ---- a/xbmc/guilib/StereoscopicsManager.cpp -+++ b/xbmc/guilib/StereoscopicsManager.cpp -@@ -198,6 +198,15 @@ std::string CStereoscopicsManager::DetectStereoModeByString(const std::string &n - if (re.RegFind(searchString) > -1) - stereoMode = "top_bottom"; - -+ if (!re.RegComp(g_advancedSettings.m_stereoscopicregex_mvc.c_str())) -+ { -+ CLog::Log(LOGERROR, "%s: Invalid RegExp for matching 3d MVC content:'%s'", __FUNCTION__, g_advancedSettings.m_stereoscopicregex_mvc.c_str()); -+ return stereoMode; -+ } -+ -+ if (re.RegFind(searchString) > -1) -+ stereoMode = "left_right"; -+ - return stereoMode; - } - -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 4ebc890a52995ca761effad6c30d41cb25b5bdb8..c728dd652d323fb5f0882b7dbd2887fd59dfe0e2 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -402,6 +402,7 @@ void CAdvancedSettings::Initialize() - m_stereoscopicregex_3d = "[-. _]3d[-. _]"; - m_stereoscopicregex_sbs = "[-. _]h?sbs[-. _]"; - m_stereoscopicregex_tab = "[-. _]h?tab[-. _]"; -+ m_stereoscopicregex_mvc = "[-. _]h?mvc[-. _]"; - - m_useDisplayControlHWStereo = false; - -@@ -551,6 +552,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) - XMLUtils::GetString(pElement, "stereoscopicregex3d", m_stereoscopicregex_3d); - XMLUtils::GetString(pElement, "stereoscopicregexsbs", m_stereoscopicregex_sbs); - XMLUtils::GetString(pElement, "stereoscopicregextab", m_stereoscopicregex_tab); -+ XMLUtils::GetString(pElement, "stereoscopicregexmvc", m_stereoscopicregex_mvc); - XMLUtils::GetFloat(pElement, "subsdelayrange", m_videoSubsDelayRange, 10, 600); - XMLUtils::GetFloat(pElement, "audiodelayrange", m_videoAudioDelayRange, 10, 600); - XMLUtils::GetString(pElement, "defaultplayer", m_videoDefaultPlayer); -diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 64d42f8bdce59d3c7752657e3fe483733e88eda6..faa91950e9546855d71beef4ee96aa33a1318f24 100644 ---- a/xbmc/settings/AdvancedSettings.h -+++ b/xbmc/settings/AdvancedSettings.h -@@ -373,6 +373,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler - std::string m_stereoscopicregex_3d; - std::string m_stereoscopicregex_sbs; - std::string m_stereoscopicregex_tab; -+ std::string m_stereoscopicregex_mvc; - - bool m_useDisplayControlHWStereo; - - -From 8593504fd9d874850f7423ff8426d125c033daab Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 5 Oct 2015 14:58:05 +0100 -Subject: [PATCH 30/61] [3d] Swap top/bottom sides of GUI - ---- - xbmc/guilib/GraphicContext.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp -index 6b65632fdfcf6278a44e90f61ddb018f2a98763c..80a7809beffa1a03ee41d6ab862ec075c68fed5d 100644 ---- a/xbmc/guilib/GraphicContext.cpp -+++ b/xbmc/guilib/GraphicContext.cpp -@@ -267,7 +267,7 @@ CPoint CGraphicContext::StereoCorrection(const CPoint &point) const - { - const RESOLUTION_INFO info = GetResInfo(); - -- if(m_stereoView == RENDER_STEREO_VIEW_RIGHT) -+ if(m_stereoView == RENDER_STEREO_VIEW_LEFT) - res.y += info.iHeight + info.iBlanking; - } - if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL) - -From 1ca2072e6f1670cb8001027003c2abafc04316cf Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sun, 11 Oct 2015 20:51:37 +0100 -Subject: [PATCH 31/61] Revert "Revert "Disable extra logging by default"" - -This reverts commit a880554325be187b877cd8f0e2b338e7267da636. ---- - system/settings/settings.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 38a772b4e5f59cdd30293850752a761dbe532177..068ca2d519cb7537e0d3ad05c83d47d341a34250 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -2967,12 +2967,12 @@ - - - 1 -- true -+ false - - - - 1 -- 32768 -+ - - loggingcomponents - , - -From 0b331588ffcd3947970db9c180d627d4a3846e50 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 21 Dec 2015 22:17:25 +0000 -Subject: [PATCH 32/61] [omximage] Fall back to arm jpeg encode/decode when gpu - is busy - ---- - xbmc/cores/omxplayer/OMXImage.cpp | 50 ++++++++++++++++++++++++++++++++------- - xbmc/cores/omxplayer/OMXImage.h | 7 ++++++ - 2 files changed, 48 insertions(+), 9 deletions(-) - -diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp -index c16f3d626ac749d17e2896474ee06be7acdded5f..bfc0440998b69f3f998378ea665246a63448fec8 100644 ---- a/xbmc/cores/omxplayer/OMXImage.cpp -+++ b/xbmc/cores/omxplayer/OMXImage.cpp -@@ -56,12 +56,17 @@ static XbmcThreads::ConditionVariable g_count_cond; - static CCriticalSection g_count_lock; - static int g_count_val; - --static void limit_calls_enter() -+static bool limit_calls_enter() - { - CSingleLock lock(g_count_lock); -+ // on Pi2 fall back to arm decode if the queue is getting big -+ if (g_RBP.RasberryPiVersion() > 1 && g_count_val >= 2) -+ return false; -+ - while (g_count_val >= 3) - g_count_cond.wait(lock); - g_count_val++; -+ return true; - } - - static void limit_calls_leave() -@@ -111,6 +116,9 @@ bool COMXImage::CreateThumbnailFromSurface(unsigned char* buffer, unsigned int w - unsigned int format, unsigned int pitch, const std::string& destFile) - { - COMXImageEnc omxImageEnc; -+ if (!omxImageEnc.Gpu()) -+ return false; -+ - bool ret = omxImageEnc.CreateThumbnailFromSurface(buffer, width, height, format, pitch, destFile); - if (!ret) - CLog::Log(LOGNOTICE, "%s: unable to create thumbnail %s %dx%d", __func__, destFile.c_str(), width, height); -@@ -204,6 +212,8 @@ bool COMXImage::CreateThumb(const std::string& srcFile, unsigned int maxHeight, - bool okay = false; - COMXImageFile file; - COMXImageReEnc reenc; -+ if (!reenc.Gpu()) -+ return false; - void *pDestBuffer; - unsigned int nDestSize; - int orientation = additional_info == "flipped" ? 1:0; -@@ -309,6 +319,9 @@ bool COMXImage::DecodeJpegToTexture(COMXImageFile *file, unsigned int width, uns - bool ret = false; - COMXTexture omx_image; - -+ if (!omx_image.Gpu()) -+ return false; -+ - struct textureinfo *tex = new struct textureinfo; - if (!tex) - return NULL; -@@ -923,7 +936,7 @@ bool COMXImageFile::ReadFile(const std::string& inputFile, int orientation) - - COMXImageDec::COMXImageDec() - { -- limit_calls_enter(); -+ m_gpu = limit_calls_enter(); - m_decoded_buffer = NULL; - OMX_INIT_STRUCTURE(m_decoded_format); - m_success = false; -@@ -935,7 +948,8 @@ COMXImageDec::~COMXImageDec() - - OMX_INIT_STRUCTURE(m_decoded_format); - m_decoded_buffer = NULL; -- limit_calls_leave(); -+ if (m_gpu) -+ limit_calls_leave(); - } - - void COMXImageDec::Close() -@@ -1085,6 +1099,9 @@ bool COMXImageDec::HandlePortSettingChange(unsigned int resize_width, unsigned i - - bool COMXImageDec::Decode(const uint8_t *demuxer_content, unsigned demuxer_bytes, unsigned width, unsigned height, unsigned stride, void *pixels) - { -+ if (!m_gpu) -+ return false; -+ - CSingleLock lock(m_OMXSection); - OMX_ERRORTYPE omx_err = OMX_ErrorNone; - OMX_BUFFERHEADERTYPE *omx_buffer = NULL; -@@ -1222,7 +1239,7 @@ bool COMXImageDec::Decode(const uint8_t *demuxer_content, unsigned demuxer_bytes - - COMXImageEnc::COMXImageEnc() - { -- limit_calls_enter(); -+ m_gpu = limit_calls_enter(); - CSingleLock lock(m_OMXSection); - OMX_INIT_STRUCTURE(m_encoded_format); - m_encoded_buffer = NULL; -@@ -1246,11 +1263,15 @@ COMXImageEnc::~COMXImageEnc() - m_omx_encoder.Deinitialize(); - } - } -- limit_calls_leave(); -+ if (m_gpu) -+ limit_calls_leave(); - } - - bool COMXImageEnc::Encode(unsigned char *buffer, int size, unsigned width, unsigned height, unsigned int pitch) - { -+ if (!m_gpu) -+ return false; -+ - CSingleLock lock(m_OMXSection); - - unsigned int demuxer_bytes = 0; -@@ -1431,6 +1452,9 @@ bool COMXImageEnc::Encode(unsigned char *buffer, int size, unsigned width, unsig - bool COMXImageEnc::CreateThumbnailFromSurface(unsigned char* buffer, unsigned int width, unsigned int height, - unsigned int format, unsigned int pitch, const std::string& destFile) - { -+ if (!m_gpu) -+ return false; -+ - if(format != XB_FMT_A8R8G8B8 || !buffer) - { - CLog::Log(LOGDEBUG, "%s::%s : %s failed format=0x%x\n", CLASSNAME, __func__, destFile.c_str(), format); -@@ -1464,7 +1488,7 @@ bool COMXImageEnc::CreateThumbnailFromSurface(unsigned char* buffer, unsigned in - - COMXImageReEnc::COMXImageReEnc() - { -- limit_calls_enter(); -+ m_gpu = limit_calls_enter(); - m_encoded_buffer = NULL; - m_pDestBuffer = NULL; - m_nDestAllocSize = 0; -@@ -1478,7 +1502,8 @@ COMXImageReEnc::~COMXImageReEnc() - free (m_pDestBuffer); - m_pDestBuffer = NULL; - m_nDestAllocSize = 0; -- limit_calls_leave(); -+ if (m_gpu) -+ limit_calls_leave(); - } - - void COMXImageReEnc::Close() -@@ -1770,6 +1795,9 @@ bool COMXImageReEnc::HandlePortSettingChange(unsigned int resize_width, unsigned - - bool COMXImageReEnc::ReEncode(COMXImageFile &srcFile, unsigned int maxWidth, unsigned int maxHeight, void * &pDestBuffer, unsigned int &nDestSize) - { -+ if (!m_gpu) -+ return false; -+ - CSingleLock lock(m_OMXSection); - OMX_ERRORTYPE omx_err = OMX_ErrorNone; - -@@ -1942,14 +1970,15 @@ bool COMXImageReEnc::ReEncode(COMXImageFile &srcFile, unsigned int maxWidth, uns - - COMXTexture::COMXTexture() - { -- limit_calls_enter(); -+ m_gpu = limit_calls_enter(); - m_success = false; - } - - COMXTexture::~COMXTexture() - { - Close(); -- limit_calls_leave(); -+ if (m_gpu) -+ limit_calls_leave(); - } - - void COMXTexture::Close() -@@ -2133,6 +2162,9 @@ bool COMXTexture::HandlePortSettingChange(unsigned int resize_width, unsigned in - - bool COMXTexture::Decode(const uint8_t *demuxer_content, unsigned demuxer_bytes, unsigned int width, unsigned int height, void *egl_image) - { -+ if (!m_gpu) -+ return false; -+ - CSingleLock lock(m_OMXSection); - OMX_ERRORTYPE omx_err = OMX_ErrorNone; - -diff --git a/xbmc/cores/omxplayer/OMXImage.h b/xbmc/cores/omxplayer/OMXImage.h -index e44fb6ef0ba5fd011fdfc6771c946ffcfb8d581c..f1febd69aaa3522d252802ca00b6746022be41c6 100644 ---- a/xbmc/cores/omxplayer/OMXImage.h -+++ b/xbmc/cores/omxplayer/OMXImage.h -@@ -133,6 +133,7 @@ protected: - OMX_PARAM_PORTDEFINITIONTYPE m_decoded_format; - CCriticalSection m_OMXSection; - bool m_success; -+ bool m_gpu; - }; - - class COMXImageEnc -@@ -144,6 +145,7 @@ public: - // Required overrides - bool CreateThumbnailFromSurface(unsigned char* buffer, unsigned int width, unsigned int height, - unsigned int format, unsigned int pitch, const std::string& destFile); -+ bool Gpu() { return m_gpu; } - protected: - bool Encode(unsigned char *buffer, int size, unsigned int width, unsigned int height, unsigned int pitch); - // Components -@@ -152,6 +154,7 @@ protected: - OMX_PARAM_PORTDEFINITIONTYPE m_encoded_format; - CCriticalSection m_OMXSection; - bool m_success; -+ bool m_gpu; - }; - - class COMXImageReEnc -@@ -163,6 +166,7 @@ public: - // Required overrides - void Close(); - bool ReEncode(COMXImageFile &srcFile, unsigned int width, unsigned int height, void * &pDestBuffer, unsigned int &nDestSize); -+ bool Gpu() { return m_gpu; } - protected: - bool HandlePortSettingChange(unsigned int resize_width, unsigned int resize_height, int orientation, bool port_settings_changed); - // Components -@@ -176,6 +180,7 @@ protected: - void *m_pDestBuffer; - unsigned int m_nDestAllocSize; - bool m_success; -+ bool m_gpu; - }; - - class COMXTexture -@@ -187,6 +192,7 @@ public: - // Required overrides - void Close(void); - bool Decode(const uint8_t *data, unsigned size, unsigned int width, unsigned int height, void *egl_image); -+ bool Gpu() { return m_gpu; } - protected: - bool HandlePortSettingChange(unsigned int resize_width, unsigned int resize_height, void *egl_image, bool port_settings_changed); - -@@ -201,6 +207,7 @@ protected: - OMX_BUFFERHEADERTYPE *m_egl_buffer; - CCriticalSection m_OMXSection; - bool m_success; -+ bool m_gpu; - }; - - extern COMXImage g_OMXImage; - -From fa43a0ae5e0b2eb9bdff7c757ffe5b6ab53d9a16 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 9 Dec 2015 13:31:14 +0000 -Subject: [PATCH 33/61] [mmalcodec] Fail to open when width is invalid. Can - happen with mpegts files - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 4f5de0341b344c77a12c936f4f573c2911c0bb7b..4f07113ade696aa4bbefb2dd2a2e17d5f12e9ab9 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -366,6 +366,9 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - if (g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s usemmal:%d software:%d %dx%d renderer:%p", CLASSNAME, __func__, CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL), hints.software, hints.width, hints.height, options.m_opaque_pointer); - -+ // This occurs at start of m2ts files before streams have been fully identified - just ignore -+ if (!hints.width) -+ return false; - // we always qualify even if DVDFactoryCodec does this too. - if (!CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) - return false; - -From bf31243afd0e75b49cf3ceceb9af28bd25bc4742 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 19 Sep 2014 11:54:49 +0100 -Subject: [PATCH 34/61] [videoplayer/rbp] Add pi specific option to maintain - vsync with pll adjustment - -New A/V sync option in settings/video/playback to do "Adjust PLL". -This uses video clock (so perfect video syncing) but avoids having to resample -or drop/dupe audio packets which is normally required. ---- - .../resource.language.en_gb/resources/strings.po | 32 ++++++++++++++++++++++ - system/settings/rbp.xml | 14 ++++++++++ - .../AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 25 +++++++++++------ - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h | 9 +++++- - .../Engines/ActiveAE/ActiveAEStream.cpp | 24 +++++++++++++--- - .../AudioEngine/Engines/ActiveAE/ActiveAEStream.h | 7 +++-- - xbmc/cores/AudioEngine/Interfaces/AEStream.h | 10 ++++++- - xbmc/cores/VideoPlayer/DVDAudio.cpp | 4 +-- - xbmc/cores/VideoPlayer/DVDAudio.h | 2 +- - xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 12 ++++++-- - xbmc/linux/RBP.cpp | 20 ++++++++++++++ - xbmc/linux/RBP.h | 5 ++++ - 12 files changed, 143 insertions(+), 21 deletions(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 2e3f179fcc7aa100e2aaec64d0513145903ccd32..ddc3d4a5127d759d160107e400c7d714a01f440b 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -20467,3 +20467,35 @@ msgstr "" - msgctxt "#38190" - msgid "Extract thumbnails from video files" - msgstr "" -+ -+#. Description of setting "System -> Audio Ouput -> A/V sync method" with label #38200 -+#: system/settings/settings.xml -+msgctxt "#38200" -+msgid "PLL adjustment to maintain audio/video sync" -+msgstr "" -+ -+#. Description of setting "Videos -> Playback -> A/V sync method" with label #38201 -+#: system/settings/settings.xml -+msgctxt "#38201" -+msgid "Allows sync adjustment without resampling. Lower the settings if you get audio/video dropouts." -+msgstr "" -+ -+msgctxt "#38202" -+msgid "Off" -+msgstr "" -+ -+msgctxt "#38203" -+msgid "Low" -+msgstr "" -+ -+msgctxt "#38204" -+msgid "Medium" -+msgstr "" -+ -+msgctxt "#38205" -+msgid "High" -+msgstr "" -+ -+msgctxt "#38206" -+msgid "Max" -+msgstr "" -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index 289dc55ec41aa44848519a05f8ee1ccc72740085..2572e25753712186f69390965ee1448bff3fadd5 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -101,6 +101,20 @@ - - 100 - -+ -+ 3 -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 61787f99f95dbf3d637b62185d1496909d7ee0a6..b77b6098c7138157817567de471ded718b204227 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -364,11 +364,12 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg) - m_sink.m_controlPort.SendOutMessage(CSinkControlProtocol::APPFOCUSED, msg->data, sizeof(bool)); - return; - case CActiveAEControlProtocol::STREAMRESAMPLEMODE: -- MsgStreamParameter *par; -- par = (MsgStreamParameter*)msg->data; -+ MsgStreamResample *par; -+ par = (MsgStreamResample*)msg->data; - if (par->stream) - { -- par->stream->m_resampleMode = par->parameter.int_par; -+ par->stream->m_resampleMode = par->mode; -+ par->stream->m_pllAdjust = par->plladjust; - par->stream->m_resampleIntegral = 0.0; - } - return; -@@ -2457,7 +2458,14 @@ CSampleBuffer* CActiveAE::SyncStream(CActiveAEStream *stream) - { - if (stream->m_processingBuffers) - { -- stream->m_processingBuffers->SetRR(stream->CalcResampleRatio(error), m_settings.atempoThreshold); -+ double pllAdjustRequest = 0.0, pllAdjustActual = 0.0, e = 0.0; -+ if (stream->m_pllAdjust > 0.0) -+ { -+ e = std::max(std::min(error / 50.0, 1.0), - 1.0); -+ pllAdjustRequest = 1.0 + e * stream->m_pllAdjust; -+ } -+ stream->m_processingBuffers->SetRR(stream->CalcResampleRatio(error), m_settings.atempoThreshold, pllAdjustRequest, stream->m_pllAdjust, pllAdjustActual); -+ CLog::Log(LOGDEBUG, "ActiveAE::%s pll:%.5f (act:%.5f lim:%.5f) rr:%.5f threshold:%.3f error:%.6f", __FUNCTION__, pllAdjustRequest, pllAdjustActual, stream->m_pllAdjust, stream->m_processingBuffers->GetRR(), m_settings.atempoThreshold, error ); - } - } - else if (stream->m_processingBuffers) -@@ -3323,13 +3331,14 @@ void CActiveAE::SetStreamResampleRatio(CActiveAEStream *stream, double ratio) - &msg, sizeof(MsgStreamParameter)); - } - --void CActiveAE::SetStreamResampleMode(CActiveAEStream *stream, int mode) -+void CActiveAE::SetStreamResampleMode(CActiveAEStream *stream, int mode, float plladjust) - { -- MsgStreamParameter msg; -+ MsgStreamResample msg; - msg.stream = stream; -- msg.parameter.int_par = mode; -+ msg.mode = mode; -+ msg.plladjust = plladjust; - m_controlPort.SendOutMessage(CActiveAEControlProtocol::STREAMRESAMPLEMODE, -- &msg, sizeof(MsgStreamParameter)); -+ &msg, sizeof(MsgStreamResample)); - } - - void CActiveAE::SetStreamFFmpegInfo(CActiveAEStream *stream, int profile, enum AVMatrixEncoding matrix_encoding, enum AVAudioServiceType audio_service_type) -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -index 77fc01a24e56298348148b501cd47e41d8d5cad5..c46ef0227b70cd6a2e1c8c327f5c0b2f76353260 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h -@@ -177,6 +177,13 @@ struct MsgStreamFFmpegInfo - enum AVAudioServiceType audio_service_type; - }; - -+struct MsgStreamResample -+{ -+ CActiveAEStream *stream; -+ int mode; -+ float plladjust; -+}; -+ - class CEngineStats - { - public: -@@ -293,7 +300,7 @@ protected: - void SetStreamReplaygain(CActiveAEStream *stream, float rgain); - void SetStreamVolume(CActiveAEStream *stream, float volume); - void SetStreamResampleRatio(CActiveAEStream *stream, double ratio); -- void SetStreamResampleMode(CActiveAEStream *stream, int mode); -+ void SetStreamResampleMode(CActiveAEStream *stream, int mode, float plladjust); - void SetStreamFFmpegInfo(CActiveAEStream *stream, int profile, enum AVMatrixEncoding matrix_encoding, enum AVAudioServiceType audio_service_type); - void SetStreamFade(CActiveAEStream *stream, float from, float target, unsigned int millis); - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -index 246d7e6c05242f1d64bbc3983b7342e24423ba8c..6b009dcea60e7431d418286c7602e1c29e793cb5 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -@@ -29,6 +29,10 @@ - #include "ActiveAE.h" - #include "ActiveAEStream.h" - -+#if defined(TARGET_RASPBERRY_PI) -+#include "linux/RBP.h" -+#endif -+ - using namespace ActiveAE; - - /* typecast AE to CActiveAE */ -@@ -71,6 +75,7 @@ CActiveAEStream::CActiveAEStream(AEAudioFormat *format, unsigned int streamid) - m_lastPtsJump = 0; - m_errorInterval = 1000; - m_clockSpeed = 1.0; -+ m_pllAdjust = 0.0f; - } - - CActiveAEStream::~CActiveAEStream() -@@ -509,11 +514,12 @@ void CActiveAEStream::SetResampleRatio(double ratio) - m_streamResampleRatio = ratio; - } - --void CActiveAEStream::SetResampleMode(int mode) -+void CActiveAEStream::SetResampleMode(int mode, float plladjust) - { -- if (mode != m_streamResampleMode) -- AE.SetStreamResampleMode(this, mode); -+ if (mode != m_streamResampleMode || plladjust != m_streamPllAdjust) -+ AE.SetStreamResampleMode(this, mode, plladjust); - m_streamResampleMode = mode; -+ m_streamPllAdjust = plladjust; - } - - void CActiveAEStream::SetFFmpegInfo(int profile, enum AVMatrixEncoding matrix_encoding, enum AVAudioServiceType audio_service_type) -@@ -714,8 +720,18 @@ bool CActiveAEStreamBuffers::IsDrained() - return false; - } - --void CActiveAEStreamBuffers::SetRR(double rr, double atempoThreshold) -+void CActiveAEStreamBuffers::SetRR(double rr, double atempoThreshold, double pllAdjustRequest, double pllThreshold, double &pllAdjustActual) - { -+#if defined(TARGET_RASPBERRY_PI) -+ if (pllAdjustRequest > 0.0f) // pll adjust -+ { -+ pllAdjustActual = g_RBP.AdjustHDMIClock(pllAdjustRequest); -+ rr = 1.0; -+ } -+ else -+ pllAdjustActual = g_RBP.AdjustHDMIClock(1.0); -+#endif -+ - if (fabs(rr - 1.0) < atempoThreshold) - { - m_resampleBuffers->SetRR(rr); -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h -index 531dedc71f8b342d1556518e1fb7cb051f334e88..80ab096a417d53fcdf7703d11437f92df23f6f46 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h -@@ -103,7 +103,8 @@ public: - void Flush(); - void SetDrain(bool drain); - bool IsDrained(); -- void SetRR(double rr, double atempoThreshold); -+ void SetRR(double rr, double atempoThreshold, double pllAdjustRequest, double pllThreshold, double &pllAdjustActual); -+ void SetRR(double rr, double atempoThreshold) { double pllAdjustActual; SetRR(rr, atempoThreshold, 0.0, 0.0, pllAdjustActual); } - double GetRR(); - void FillBuffer(); - bool DoesNormalize(); -@@ -169,7 +170,7 @@ public: - - virtual double GetResampleRatio(); - virtual void SetResampleRatio(double ratio); -- virtual void SetResampleMode(int mode); -+ virtual void SetResampleMode(int mode, float plladjust); - virtual void RegisterAudioCallback(IAudioCallback* pCallback); - virtual void UnRegisterAudioCallback(); - virtual void FadeVolume(float from, float to, unsigned int time); -@@ -186,6 +187,7 @@ protected: - float m_streamAmplify; - double m_streamResampleRatio; - int m_streamResampleMode; -+ float m_streamPllAdjust; - unsigned int m_streamSpace; - bool m_streamDraining; - bool m_streamDrained; -@@ -226,6 +228,7 @@ protected: - int m_fadingTime; - int m_profile; - int m_resampleMode; -+ float m_pllAdjust; - double m_resampleIntegral; - double m_clockSpeed; - enum AVMatrixEncoding m_matrixEncoding; -diff --git a/xbmc/cores/AudioEngine/Interfaces/AEStream.h b/xbmc/cores/AudioEngine/Interfaces/AEStream.h -index dc50f8c82cb6831756e8344784f97e158692c780..02038f09fbcb7e4ac41e32c7c06a936cd16a2175 100644 ---- a/xbmc/cores/AudioEngine/Interfaces/AEStream.h -+++ b/xbmc/cores/AudioEngine/Interfaces/AEStream.h -@@ -41,6 +41,14 @@ public: - class CAESyncInfo - { - public: -+ CAESyncInfo() -+ { -+ delay = 0.0; -+ error = 0.0; -+ rr = 1.0; -+ errortime = 0; -+ state = SYNC_OFF; -+ } - double delay; - double error; - double rr; -@@ -231,7 +239,7 @@ public: - /** - * Sets the resamplling on/ff - */ -- virtual void SetResampleMode(int mode) = 0; -+ virtual void SetResampleMode(int mode, float plladjust) = 0; - - /** - * Registers the audio callback to call with each block of data, this is used by Audio Visualizations -diff --git a/xbmc/cores/VideoPlayer/DVDAudio.cpp b/xbmc/cores/VideoPlayer/DVDAudio.cpp -index de1ad64523c3c9799ca24a86fce0dfec459366db..c3312daaf15ceed0072d640d2d49dc0a47128a9b 100644 ---- a/xbmc/cores/VideoPlayer/DVDAudio.cpp -+++ b/xbmc/cores/VideoPlayer/DVDAudio.cpp -@@ -313,12 +313,12 @@ double CDVDAudio::GetResampleRatio() - return m_resampleRatio; - } - --void CDVDAudio::SetResampleMode(int mode) -+void CDVDAudio::SetResampleMode(int mode, float plladjust) - { - CSingleLock lock (m_critSection); - if(m_pAudioStream) - { -- m_pAudioStream->SetResampleMode(mode); -+ m_pAudioStream->SetResampleMode(mode, plladjust); - } - } - -diff --git a/xbmc/cores/VideoPlayer/DVDAudio.h b/xbmc/cores/VideoPlayer/DVDAudio.h -index 0bbd2968b4e219aee04a31333b17981cd61b7dbc..a400677a782143a085daac0df22756a6cb8bb148 100644 ---- a/xbmc/cores/VideoPlayer/DVDAudio.h -+++ b/xbmc/cores/VideoPlayer/DVDAudio.h -@@ -58,7 +58,7 @@ public: - double GetSyncError(); - void SetSyncErrorCorrection(double correction); - double GetResampleRatio(); -- void SetResampleMode(int mode); -+ void SetResampleMode(int mode, float plladjust); - void Flush(); - void Drain(); - void AbortAddPackets(); -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -index 1f184e78d28a7430bca7d4f39de1f49adf33b56c..3b2ac69ae174d76d83ed55cdc999afaa90f0ee39 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp -@@ -97,6 +97,7 @@ bool CVideoPlayerAudio::OpenStream(CDVDStreamInfo &hints) - bool allowpassthrough = !CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK); - if (hints.realtime) - allowpassthrough = false; -+ allowpassthrough |= CServiceBroker::GetSettings().GetInt("audiooutput.plladjust") > 0; - CDVDAudioCodec* codec = CDVDFactoryCodec::CreateAudioCodec(hints, m_processInfo, allowpassthrough, m_processInfo.AllowDTSHDDecode()); - if(!codec) - { -@@ -218,8 +219,12 @@ void CVideoPlayerAudio::UpdatePlayerInfo() - - //print the inverse of the resample ratio, since that makes more sense - //if the resample ratio is 0.5, then we're playing twice as fast -+#ifdef TARGET_RASPBERRY_PI -+ s << ", rr:" << std::fixed << std::setprecision(5) << 1.0 / m_dvdAudio.GetResampleRatio() << ", pll:" << std::fixed << std::setprecision(5) << g_RBP.GetAdjustHDMIClock() << ", err:" << std::fixed << std::setprecision(1) << m_dvdAudio.GetSyncError() * 1e-3 << "ms"; -+#else - if (m_synctype == SYNC_RESAMPLE) - s << ", rr:" << std::fixed << std::setprecision(5) << 1.0 / m_dvdAudio.GetResampleRatio(); -+#endif - - s << ", att:" << std::fixed << std::setprecision(1) << log(GetCurrentAttenuation()) * 20.0f << " dB"; - -@@ -542,10 +547,12 @@ void CVideoPlayerAudio::SetSyncType(bool passthrough) - int synctype = (m_synctype >= 0 && m_synctype <= 1) ? m_synctype : 2; - CLog::Log(LOGDEBUG, "CVideoPlayerAudio:: synctype set to %i: %s", m_synctype, synctypes[synctype]); - m_prevsynctype = m_synctype; -+ const float plladjusts[] = { 0.0f, 0.00001f, 0.0001f, 0.001f, 0.01f }; -+ float plladjust = plladjusts[CServiceBroker::GetSettings().GetInt("audiooutput.plladjust")]; - if (m_synctype == SYNC_RESAMPLE) -- m_dvdAudio.SetResampleMode(1); -+ m_dvdAudio.SetResampleMode(1, plladjust); - else -- m_dvdAudio.SetResampleMode(0); -+ m_dvdAudio.SetResampleMode(0, plladjust); - } - } - -@@ -603,6 +610,7 @@ bool CVideoPlayerAudio::SwitchCodecIfNeeded() - bool allowpassthrough = !CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK); - if (m_streaminfo.realtime) - allowpassthrough = false; -+ allowpassthrough |= CServiceBroker::GetSettings().GetInt("audiooutput.plladjust") > 0; - CDVDAudioCodec *codec = CDVDFactoryCodec::CreateAudioCodec(m_streaminfo, m_processInfo, allowpassthrough, m_processInfo.AllowDTSHDDecode()); - if (!codec || codec->NeedPassthrough() == m_pAudioCodec->NeedPassthrough()) { - // passthrough state has not changed -diff --git a/xbmc/linux/RBP.cpp b/xbmc/linux/RBP.cpp -index c073dc28db9abc24025909e2d91b7ce49201f4ea..e4bff70c0b8bc934e55fb8e68c6d5e35ce92c66f 100644 ---- a/xbmc/linux/RBP.cpp -+++ b/xbmc/linux/RBP.cpp -@@ -47,6 +47,8 @@ CRBP::CRBP() - m_DllBcmHost = new DllBcmHost(); - m_OMX = new COMXCore(); - m_display = DISPMANX_NO_HANDLE; -+ m_requested_pll_adjust = -1.0; -+ m_actual_pll_adjust = -1.0; - m_mb = mbox_open(); - vcsm_init(); - m_vsync_count = 0; -@@ -154,6 +156,8 @@ void CRBP::CloseDisplay(DISPMANX_DISPLAY_HANDLE_T display) - assert(s == 0); - vc_dispmanx_display_close(m_display); - m_display = DISPMANX_NO_HANDLE; -+ m_requested_pll_adjust = -1.0; -+ m_actual_pll_adjust = -1.0; - } - - void CRBP::GetDisplaySize(int &width, int &height) -@@ -367,4 +371,20 @@ void CGPUMEM::Flush() - vcsm_clean_invalid( &iocache ); - } - -+double CRBP::AdjustHDMIClock(double adjust) -+{ -+ char response[80]; -+ -+ if (adjust == m_requested_pll_adjust) -+ return m_actual_pll_adjust; -+ -+ m_requested_pll_adjust = adjust; -+ vc_gencmd(response, sizeof response, "hdmi_adjust_clock %f", adjust); -+ char *p = strchr(response, '='); -+ if (p) -+ m_actual_pll_adjust = atof(p+1); -+ CLog::Log(LOGDEBUG, "CRBP::%s(%.5f) = %.5f", __func__, adjust, m_actual_pll_adjust); -+ return m_actual_pll_adjust; -+} -+ - #endif -diff --git a/xbmc/linux/RBP.h b/xbmc/linux/RBP.h -index 26a2a4bd74b54288282b534c5de7d59d6ccec7f5..79e676b1dee78f808a359dbee781fa80cf9be82e 100644 ---- a/xbmc/linux/RBP.h -+++ b/xbmc/linux/RBP.h -@@ -81,6 +81,8 @@ public: - uint32_t WaitVsync(uint32_t target = ~0U); - void VSyncCallback(); - int GetMBox() { return m_mb; } -+ double AdjustHDMIClock(double adjust); -+ double GetAdjustHDMIClock() { return m_actual_pll_adjust; } - - private: - DllBcmHost *m_DllBcmHost; -@@ -102,6 +104,9 @@ private: - CCriticalSection m_critSection; - - int m_mb; -+ double m_requested_pll_adjust; -+ double m_actual_pll_adjust; -+ public: - }; - - extern CRBP g_RBP; - -From 352d9255894aa09b87cc624ddc32f165c152a6ec Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 7 May 2015 15:35:43 +0100 -Subject: [PATCH 35/61] rbp: Support zero copy interface with hevc acceleration - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++++++ - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 5 +++-- - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 8b59b1825c4fdee83ec4afc13403126153f8071d..c4eda5a2c78db1f6acc9ed59938ea3f42262d8fe 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -366,6 +366,15 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options - if (tryhw && m_decoderState == STATE_NONE) - { - m_decoderState = STATE_HW_SINGLE; -+#ifdef TARGET_RASPBERRY_PI -+ int num_threads = g_cpuInfo.getCPUCount() * 3 / 2; -+ num_threads = std::max(1, std::min(num_threads, 16)); -+ if (pCodec->id == AV_CODEC_ID_HEVC) -+ num_threads = 8; -+ m_pCodecContext->thread_count = num_threads; -+ m_pCodecContext->thread_safe_callbacks = 0; -+ CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - open frame threaded with %d threads", num_threads); -+#endif - } - else - { -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index 3b6307725d938aae12f093b2691f3b9bf8373fe7..689ed0fddcc05175857e4cc57f23092ab9b81ddc 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -296,8 +296,9 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture - picture->MMALBuffer->mmal_buffer->alloc_size = picture->MMALBuffer->mmal_buffer->length = gmem->m_numbytes; - picture->MMALBuffer->m_stills = m_hints.stills; - -- // need to flush ARM cache so GPU can see it -- gmem->Flush(); -+ // need to flush ARM cache so GPU can see it (HEVC will have already done this) -+ if (avctx->codec_id != AV_CODEC_ID_HEVC) -+ gmem->Flush(); - - if (g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s - mmal:%p dts:%.3f pts:%.3f buf:%p gpu:%p", CLASSNAME, __FUNCTION__, picture->MMALBuffer->mmal_buffer, 1e-6*picture->dts, 1e-6*picture->pts, picture->MMALBuffer, gmem); - -From cfa59e3c4278c382c27b4f19f619cd3cb9e0bbdf Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 16 May 2015 18:26:04 +0100 -Subject: [PATCH 36/61] ffmpeg: use upstream mvc patches - ---- - ...vcodec-add-h264_mvc-codec-id-and-profiles.patch | 68 ++++++++++++ - ...er-add-support-for-parsing-h264-mvc-NALUs.patch | 116 +++++++++++++++++++++ - tools/depends/target/ffmpeg/Makefile | 7 +- - tools/depends/target/ffmpeg/autobuild.sh | 3 + - ...arsing_of_mvc_slices_in_some_corner_cases.patch | 55 ++++++++++ - 5 files changed, 248 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch - create mode 100644 tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch - create mode 100644 tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch - -diff --git a/tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch b/tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..2e7381fe6538089759ebc7288c0a5d908cd0973c ---- /dev/null -+++ b/tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch -@@ -0,0 +1,68 @@ -+From 4060f15e2d29e268110032d4366382e370e088d0 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sun, 26 Jun 2016 20:09:18 +0100 -+Subject: [PATCH] avcodec: add h264_mvc codec id and profiles -+ -+--- -+ libavcodec/avcodec.h | 5 +++++ -+ libavcodec/codec_desc.c | 7 +++++++ -+ libavformat/mpegts.c | 2 +- -+ 3 files changed, 13 insertions(+), 1 deletion(-) -+ -+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -+index a1ba217..abd2e91 100644 -+--- a/libavcodec/avcodec.h -++++ b/libavcodec/avcodec.h -+@@ -410,6 +410,8 @@ enum AVCodecID { -+ AV_CODEC_ID_SHEERVIDEO, -+ AV_CODEC_ID_YLC, -+ -++ AV_CODEC_ID_H264_MVC, -++ -+ /* various PCM "codecs" */ -+ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs -+ AV_CODEC_ID_PCM_S16LE = 0x10000, -+@@ -3195,6 +3197,9 @@ typedef struct AVCodecContext { -+ #define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244 -+ #define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA) -+ #define FF_PROFILE_H264_CAVLC_444 44 -++#define FF_PROFILE_H264_MULTIVIEW_HIGH 118 -++#define FF_PROFILE_H264_STEREO_HIGH 128 -++#define FF_PROFILE_H264_MULTIVIEW_HIGH_DEPTH 138 -+ -+ #define FF_PROFILE_VC1_SIMPLE 0 -+ #define FF_PROFILE_VC1_MAIN 1 -+diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c -+index 9d94b72..535ebf0 100644 -+--- a/libavcodec/codec_desc.c -++++ b/libavcodec/codec_desc.c -+@@ -1563,6 +1563,13 @@ static const AVCodecDescriptor codec_descriptors[] = { -+ .long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"), -+ .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, -+ }, -++ { -++ .id = AV_CODEC_ID_H264_MVC, -++ .type = AVMEDIA_TYPE_VIDEO, -++ .name = "h264_mvc", -++ .long_name = NULL_IF_CONFIG_SMALL("H264 MVC"), -++ .props = AV_CODEC_PROP_LOSSY, -++ }, -+ -+ /* various PCM "codecs" */ -+ { -+diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -+index b31d233..2767306 100644 -+--- a/libavformat/mpegts.c -++++ b/libavformat/mpegts.c -+@@ -701,7 +701,7 @@ static const StreamType ISO_types[] = { -+ #endif -+ { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, -+ { 0x1c, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC }, -+- { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, -++ { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264_MVC }, -+ { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 }, -+ { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, -+ { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, -+-- -+2.7.4 -+ -diff --git a/tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch b/tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..399e8a95984771e4388bfe4785423ff3f664f89b ---- /dev/null -+++ b/tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch -@@ -0,0 +1,116 @@ -+From 23dd20678a05e1764e5d8d30481cb354a51b6c8b Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sun, 26 Jun 2016 20:16:03 +0100 -+Subject: [PATCH] h264_parser: add support for parsing h264 mvc NALUs -+ -+--- -+ libavcodec/allcodecs.c | 1 + -+ libavcodec/h264.h | 2 ++ -+ libavcodec/h264_parser.c | 34 ++++++++++++++++++++++++++++++---- -+ 3 files changed, 33 insertions(+), 4 deletions(-) -+ -+diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c -+index 54efaad..02a89c3 100644 -+--- a/libavcodec/allcodecs.c -++++ b/libavcodec/allcodecs.c -+@@ -667,6 +667,7 @@ void avcodec_register_all(void) -+ REGISTER_PARSER(H261, h261); -+ REGISTER_PARSER(H263, h263); -+ REGISTER_PARSER(H264, h264); -++ REGISTER_PARSER(H264_MVC, h264_mvc); -+ REGISTER_PARSER(HEVC, hevc); -+ REGISTER_PARSER(MJPEG, mjpeg); -+ REGISTER_PARSER(MLP, mlp); -+diff --git a/libavcodec/h264.h b/libavcodec/h264.h -+index efe3555..16358aa 100644 -+--- a/libavcodec/h264.h -++++ b/libavcodec/h264.h -+@@ -126,7 +126,9 @@ enum { -+ NAL_END_STREAM = 11, -+ NAL_FILLER_DATA = 12, -+ NAL_SPS_EXT = 13, -++ NAL_SPS_SUBSET = 15, -+ NAL_AUXILIARY_SLICE = 19, -++ NAL_SLICE_EXT = 20, -+ NAL_FF_IGNORE = 0xff0f001, -+ }; -+ -+diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c -+index ce4bab2..082ac17 100644 -+--- a/libavcodec/h264_parser.c -++++ b/libavcodec/h264_parser.c -+@@ -58,6 +58,7 @@ typedef struct H264ParseContext { -+ uint8_t parse_history[6]; -+ int parse_history_count; -+ int parse_last_mb; -++ int is_mvc; -+ } H264ParseContext; -+ -+ -+@@ -105,14 +106,18 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, -+ } else if (state <= 5) { -+ int nalu_type = buf[i] & 0x1F; -+ if (nalu_type == NAL_SEI || nalu_type == NAL_SPS || -+- nalu_type == NAL_PPS || nalu_type == NAL_AUD) { -++ nalu_type == NAL_PPS || nalu_type == NAL_AUD || -++ nalu_type == NAL_SPS_SUBSET) { -+ if (pc->frame_start_found) { -+ i++; -+ goto found; -+ } -+ } else if (nalu_type == NAL_SLICE || nalu_type == NAL_DPA || -+- nalu_type == NAL_IDR_SLICE) { -++ nalu_type == NAL_IDR_SLICE || (p->is_mvc && nalu_type == NAL_SLICE_EXT)) { -+ state += 8; -++ -++ if (nalu_type == NAL_SLICE_EXT) -++ i += 3; // skip mvc extension -+ continue; -+ } -+ state = 7; -+@@ -585,7 +590,8 @@ static int h264_parse(AVCodecParserContext *s, -+ } -+ } -+ -+- parse_nal_units(s, avctx, buf, buf_size); -++ if (!p->is_mvc) -++ parse_nal_units(s, avctx, buf, buf_size); -+ -+ if (avctx->framerate.num) -+ avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); -+@@ -622,7 +628,7 @@ static int h264_split(AVCodecContext *avctx, -+ if ((state & 0xFFFFFF00) != 0x100) -+ break; -+ nalu_type = state & 0x1F; -+- if (nalu_type == NAL_SPS) { -++ if (nalu_type == NAL_SPS || nalu_type == NAL_SPS_SUBSET) { -+ has_sps = 1; -+ } else if (nalu_type == NAL_PPS) -+ has_pps = 1; -+@@ -672,3 +678,23 @@ AVCodecParser ff_h264_parser = { -+ .parser_close = h264_close, -+ .split = h264_split, -+ }; -++ -++static av_cold int init_mvc(AVCodecParserContext *s) -++{ -++ H264ParseContext *p = s->priv_data; -++ int ret = init(s); -++ if (ret < 0) -++ return ret; -++ -++ p->is_mvc = 1; -++ return 0; -++} -++ -++AVCodecParser ff_h264_mvc_parser = { -++ .codec_ids = { AV_CODEC_ID_H264_MVC }, -++ .priv_data_size = sizeof(H264ParseContext), -++ .parser_init = init_mvc, -++ .parser_parse = h264_parse, -++ .parser_close = h264_close, -++ .split = h264_split, -++}; -+-- -+2.7.4 -+ -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index 337dbaab927919858e44d79f647207ef0513eea1..7e97e4d91a443d46d933df528763422ff5e8f4fa 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -4,7 +4,9 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ - 0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \ - hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch \ - pfcd_hevc_optimisations.patch \ -- 0001-Squashed-commit-of-the-following.patch -+ 0001-Squashed-commit-of-the-following.patch \ -+ 0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch 0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch \ -+ h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -90,6 +92,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - cd $(PLATFORM); patch -p1 < ../pfcd_hevc_optimisations.patch - cd $(PLATFORM); patch -p1 < ../0001-Squashed-commit-of-the-following.patch -+ cd $(PLATFORM); patch -p1 < ../0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch -+ cd $(PLATFORM); patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch -+ cd $(PLATFORM); patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch - - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh -index a61357f14cb2139e8125ae04684bed1b29fefb12..9f6c26c8acd08ed603aadeb4d9d81b07026e7506 100755 ---- a/tools/depends/target/ffmpeg/autobuild.sh -+++ b/tools/depends/target/ffmpeg/autobuild.sh -@@ -137,6 +137,9 @@ patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch - patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch - patch -p1 < ../pfcd_hevc_optimisations.patch - patch -p1 < ../0001-Squashed-commit-of-the-following.patch -+patch -p1 < ../0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch -+patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch -+patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch - - CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ - ./configure --prefix=$FFMPEG_PREFIX \ -diff --git a/tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch b/tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b98686bcc ---- /dev/null -+++ b/tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch -@@ -0,0 +1,55 @@ -+From 12d99a92469e5916de3bc787dce4c13abfdd5e09 Mon Sep 17 00:00:00 2001 -+From: popcornmix -+Date: Sun, 26 Jun 2016 20:20:04 +0100 -+Subject: [PATCH] h264_parser: fix parsing of mvc slices in some corner cases -+ -+--- -+ libavcodec/h264_parser.c | 10 +++++----- -+ 1 file changed, 5 insertions(+), 5 deletions(-) -+ -+diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c -+index 082ac17..b9b0c78 100644 -+--- a/libavcodec/h264_parser.c -++++ b/libavcodec/h264_parser.c -+@@ -59,6 +59,7 @@ typedef struct H264ParseContext { -+ int parse_history_count; -+ int parse_last_mb; -+ int is_mvc; -++ int slice_ext; -+ } H264ParseContext; -+ -+ -+@@ -116,18 +117,17 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, -+ nalu_type == NAL_IDR_SLICE || (p->is_mvc && nalu_type == NAL_SLICE_EXT)) { -+ state += 8; -+ -+- if (nalu_type == NAL_SLICE_EXT) -+- i += 3; // skip mvc extension -++ p->slice_ext = (nalu_type == NAL_SLICE_EXT); -+ continue; -+ } -+ state = 7; -+ } else { -+ p->parse_history[p->parse_history_count++] = buf[i]; -+- if (p->parse_history_count > 5) { -++ if (p->parse_history_count > 8) { -+ unsigned int mb, last_mb = p->parse_last_mb; -+ GetBitContext gb; -+ -+- init_get_bits(&gb, p->parse_history, 8*p->parse_history_count); -++ init_get_bits8(&gb, p->parse_history + 3*p->slice_ext, p->parse_history_count - 3*p->slice_ext); -+ p->parse_history_count = 0; -+ mb= get_ue_golomb_long(&gb); -+ p->parse_last_mb = mb; -+@@ -150,7 +150,7 @@ found: -+ pc->frame_start_found = 0; -+ if (p->is_avc) -+ return next_avc; -+- return i - (state & 5) - 5 * (state > 7); -++ return i - (state & 5) - 8 * (state > 7); -+ } -+ -+ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, -+-- -+2.7.4 -+ - -From 96ed6f043c6cc511daa085ba166329c1abdfca6c Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 29 Jan 2016 17:18:50 +0300 -Subject: [PATCH 37/61] [win32] Settings: Added setting to enable/disable MVC - decoder. - ---- - system/settings/win32.xml | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/system/settings/win32.xml b/system/settings/win32.xml -index a017d30c24232fb01220b87b29398403b8ed9662..2fcee72a64e8b701c8e895143410bbe9fd617356 100644 ---- a/system/settings/win32.xml -+++ b/system/settings/win32.xml -@@ -12,6 +12,17 @@ - false - - -+

-+ -+ -+ -+ 2 -+ true -+ -+ -+ -+ -+
-
- - - -From 032f97775cb10b8401549483110a52a36a147208 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Wed, 20 Jan 2016 17:02:16 +0300 -Subject: [PATCH 38/61] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc - streams. - ---- - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 23 +++++++++++++++++++++- - 1 file changed, 22 insertions(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index b485ad23e6309647db2bc489ed6bfda60cf506a1..50889977723cf3857216d68100fe0b3575253c92 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -25,6 +25,7 @@ - - #include "commons/Exception.h" - #include "cores/FFmpeg.h" -+#include "DVDCodecs/DVDCodecUtils.h" - #include "DVDClock.h" // for DVD_TIME_BASE - #include "DVDDemuxUtils.h" - #include "DVDInputStreams/DVDInputStream.h" -@@ -1356,6 +1357,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - } - case AVMEDIA_TYPE_VIDEO: - { -+ if (pStream->codec->codec_id == AV_CODEC_ID_H264_MVC) -+ { -+ // ignore MVC extension streams, they are handled specially -+ stream = new CDemuxStream(); -+ stream->type = STREAM_DATA; -+ stream->disabled = true; -+ pStream->need_parsing = AVSTREAM_PARSE_NONE; -+ break; -+ } - CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); - stream = st; - if(strcmp(m_pFormatContext->iformat->name, "flv") == 0) -@@ -1364,7 +1374,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - st->bVFR = false; - - // never trust pts in avi files with h264. -- if (m_bAVI && pStream->codec->codec_id == AV_CODEC_ID_H264) -+ if (m_bAVI && (pStream->codec->codec_id == AV_CODEC_ID_H264 || pStream->codec->codec_id == AV_CODEC_ID_H264_MVC)) - st->bPTSInvalid = true; - - #if defined(AVFORMAT_HAS_STREAM_GET_R_FRAME_RATE) -@@ -1436,6 +1446,17 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - if (av_dict_get(pStream->metadata, "title", NULL, 0)) - st->m_description = av_dict_get(pStream->metadata, "title", NULL, 0)->value; - -+ if (pStream->codec->codec_id == AV_CODEC_ID_H264) -+ { -+ if (CDVDCodecUtils::IsH264AnnexB(m_pFormatContext->iformat->name, pStream)) -+ { -+ // TODO -+ } -+ else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) -+ { -+ pStream->codec->codec_tag = MKTAG('M', 'V', 'C', '1'); -+ } -+ } - break; - } - case AVMEDIA_TYPE_DATA: - -From f67e4ff7460847e7e582cb4dfc21ef43be7d94ce Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Thu, 25 Feb 2016 11:21:25 +0300 -Subject: [PATCH 39/61] [Stereo3D] Added block_lr and block_rl to supported - modes. - ---- - xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp | 4 ++-- - xbmc/guilib/StereoscopicsManager.cpp | 8 +++++--- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp -index 24b1b10519467cbbfd96f7048efaf49aab7700cc..49f7f7ca7e144a259f6d06bd11cd97aa0b3242aa 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp -@@ -102,8 +102,8 @@ namespace RenderManager { - convert["right_left"] = CONF_FLAGS_STEREO_MODE_SBS | CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT; - convert["anaglyph_green_magenta"] = 0u; - convert["anaglyph_yellow_blue"] = 0u; -- convert["block_lr"] = 0u; -- convert["block_rl"] = 0u; -+ convert["block_lr"] = CONF_FLAGS_STEREO_CADANCE_LEFT_RIGHT; -+ convert["block_rl"] = CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT; - } - return convert[mode]; - } -diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp -index 618e6f4f0d6e792e0d0d60edfad2d59e3805ff7c..041324c51977ce880ab365a16f1ac366c79e369c 100644 ---- a/xbmc/guilib/StereoscopicsManager.cpp -+++ b/xbmc/guilib/StereoscopicsManager.cpp -@@ -71,8 +71,10 @@ static const struct StereoModeMap VideoModeToGuiModeMap[] = - { "anaglyph_cyan_red", RENDER_STEREO_MODE_ANAGLYPH_RED_CYAN }, - { "anaglyph_green_magenta", RENDER_STEREO_MODE_ANAGLYPH_GREEN_MAGENTA }, - { "anaglyph_yellow_blue", RENDER_STEREO_MODE_ANAGLYPH_YELLOW_BLUE }, -- { "block_lr", RENDER_STEREO_MODE_OFF }, // unsupported -- { "block_rl", RENDER_STEREO_MODE_OFF }, // unsupported -+ { "block_lr", RENDER_STEREO_MODE_HARDWAREBASED }, -+ { "block_rl", RENDER_STEREO_MODE_HARDWAREBASED }, -+ { "block_lr", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback -+ { "block_rl", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback - {} - }; - -@@ -311,7 +313,7 @@ int CStereoscopicsManager::ConvertVideoToGuiStereoMode(const std::string &mode) - size_t i = 0; - while (VideoModeToGuiModeMap[i].name) - { -- if (mode == VideoModeToGuiModeMap[i].name) -+ if (mode == VideoModeToGuiModeMap[i].name && g_Windowing.SupportsStereo(VideoModeToGuiModeMap[i].mode)) - return VideoModeToGuiModeMap[i].mode; - i++; - } - -From 376d61bb1d20f1e1e359e669ca53ac3a46aa2047 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Sat, 23 Jan 2016 10:21:32 +0300 -Subject: [PATCH 40/61] [VideoPlayer] Fix possible wrong aspect. - ---- - xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index d4920ac30216fb295a16b70ddff887e2077ee196..4f0e2cb561b5453217e961921049486dcd0636b3 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -@@ -182,7 +182,7 @@ void CVideoPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec) - } - - // use aspect in stream if available -- if(hint.forced_aspect) -+ if (hint.forced_aspect && !std::isnan(hint.aspect)) - m_fForcedAspectRatio = hint.aspect; - else - m_fForcedAspectRatio = 0.0; - -From 02211eeb217f672058f4936f981231f996c4658e Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 22 Jan 2016 18:18:33 +0300 -Subject: [PATCH 41/61] [VideoPlayer] DemuxFFmpeg: ssif remux - ---- - xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 + - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 47 ++++++- - .../cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h | 2 + - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp | 156 +++++++++++++++++++++ - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h | 49 +++++++ - xbmc/settings/AdvancedSettings.cpp | 2 +- - 6 files changed, 250 insertions(+), 8 deletions(-) - create mode 100644 xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp - create mode 100644 xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -index 63776b1333bb66483303e44d6ebe60f3cd7e14d7..156ec2021002d9d7a355db2f0dcf099aabb1db48 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -@@ -5,6 +5,7 @@ set(SOURCES DemuxMultiSource.cpp - DVDDemuxCDDA.cpp - DVDDemuxClient.cpp - DVDDemuxFFmpeg.cpp -+ DemuxStreamSSIF.cpp - DVDDemuxUtils.cpp - DVDDemuxVobsub.cpp - DVDFactoryDemuxer.cpp) -@@ -16,6 +17,7 @@ set(HEADERS DemuxMultiSource.h - DVDDemuxCDDA.h - DVDDemuxClient.h - DVDDemuxFFmpeg.h -+ DemuxStreamSSIF.h - DVDDemuxPacket.h - DVDDemuxUtils.h - DVDDemuxVobsub.h -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 50889977723cf3857216d68100fe0b3575253c92..bd3bd7490c35c487cca232e28a71ba207be74990 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -167,6 +167,7 @@ CDVDDemuxFFmpeg::CDVDDemuxFFmpeg() : CDVDDemux() - m_currentPts = DVD_NOPTS_VALUE; - m_bMatroska = false; - m_bAVI = false; -+ m_pSSIF = nullptr; - m_speed = DVD_PLAYSPEED_NORMAL; - m_program = UINT_MAX; - m_pkt.result = -1; -@@ -554,6 +555,8 @@ void CDVDDemuxFFmpeg::Dispose() - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); - -+ SAFE_DELETE(m_pSSIF); -+ - if (m_pFormatContext) - { - for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) -@@ -607,6 +610,9 @@ void CDVDDemuxFFmpeg::Flush() - - m_displayTime = 0; - m_dtsAtDisplayTime = DVD_NOPTS_VALUE; -+ -+ if (m_pSSIF) -+ m_pSSIF->Flush(); - } - - void CDVDDemuxFFmpeg::Abort() -@@ -879,7 +885,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - { - Flush(); - } -- else if (IsProgramChange()) -+ // libavformat is confused by the interleaved SSIF. -+ // Disable program management for those -+ else if (!m_pSSIF && IsProgramChange()) - { - // update streams - CreateStreams(m_program); -@@ -907,6 +915,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); -+ -+ if (m_pSSIF) -+ m_pSSIF->Flush(); - } - else - { -@@ -916,7 +927,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - - if (IsVideoReady()) - { -- if (m_program != UINT_MAX) -+ // libavformat is confused by the interleaved SSIF. -+ // Disable program management for those -+ if (!m_pSSIF && m_program != UINT_MAX ) - { - /* check so packet belongs to selected program */ - for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) -@@ -1065,6 +1078,15 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - stream = AddStream(pPacket->iStreamId); - } - } -+ if (stream && m_pSSIF) -+ { -+ if (stream->type == STREAM_VIDEO || -+ stream->type == STREAM_DATA) -+ pPacket = m_pSSIF->AddPacket(pPacket); -+ -+ if (stream->type == STREAM_DATA && stream->codec == AV_CODEC_ID_H264_MVC && pPacket->iSize) -+ stream = GetStream(pPacket->iStreamId); -+ } - if (!stream) - { - CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::AddStream - internal error, stream is null"); -@@ -1094,6 +1116,9 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); - -+ if (m_pSSIF) -+ m_pSSIF->Flush(); -+ - CDVDInputStream::IPosTime* ist = m_pInput->GetIPosTime(); - if (ist) - { -@@ -1174,6 +1199,9 @@ bool CDVDDemuxFFmpeg::SeekByte(int64_t pos) - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); - -+ if (m_pSSIF) -+ m_pSSIF->Flush(); -+ - return (ret >= 0); - } - -@@ -1359,11 +1387,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - { - if (pStream->codec->codec_id == AV_CODEC_ID_H264_MVC) - { -- // ignore MVC extension streams, they are handled specially -+ m_pSSIF = new CDemuxStreamSSIF(); -+ m_pSSIF->SetMVCStreamId(streamIdx); -+ - stream = new CDemuxStream(); - stream->type = STREAM_DATA; -- stream->disabled = true; -- pStream->need_parsing = AVSTREAM_PARSE_NONE; -+ pStream->codec->codec_type = AVMEDIA_TYPE_DATA; - break; - } - CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); -@@ -1450,7 +1479,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - { - if (CDVDCodecUtils::IsH264AnnexB(m_pFormatContext->iformat->name, pStream)) - { -- // TODO -+ if (m_pSSIF) -+ { -+ m_pSSIF->SetH264StreamId(streamIdx); -+ pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); -+ } - } - else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) - { -@@ -1562,7 +1595,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - if (langTag) - strncpy(stream->language, langTag->value, 3); - -- if( stream->type != STREAM_NONE && pStream->codec->extradata && pStream->codec->extradata_size > 0 ) -+ if (stream->type != STREAM_NONE && pStream->codec->extradata && pStream->codec->extradata_size > 0) - { - stream->ExtraSize = pStream->codec->extradata_size; - stream->ExtraData = new uint8_t[pStream->codec->extradata_size]; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h -index 73d536cc06710eab654f05fbc3e011d0c86c6a8b..364675293f73d40d4390b0d64e240df2432e082a 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h -@@ -21,6 +21,7 @@ - */ - - #include "DVDDemux.h" -+#include "DemuxStreamSSIF.h" - #include "threads/CriticalSection.h" - #include "threads/SystemClock.h" - #include -@@ -146,6 +147,7 @@ protected: - double m_currentPts; // used for stream length estimation - bool m_bMatroska; - bool m_bAVI; -+ CDemuxStreamSSIF* m_pSSIF; - int m_speed; - unsigned m_program; - XbmcThreads::EndTime m_timeout; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -new file mode 100644 -index 0000000000000000000000000000000000000000..f75532016a1395782b59dc124676835c7254de56 ---- /dev/null -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -@@ -0,0 +1,156 @@ -+/* -+* Copyright (C) 2005-2013 Team XBMC -+* http://xbmc.org -+* -+* This Program is free software; you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation; either version 2, or (at your option) -+* any later version. -+* -+* This Program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* -+* You should have received a copy of the GNU General Public License -+* along with XBMC; see the file COPYING. If not, see -+* . -+* -+*/ -+ -+#include "DemuxStreamSSIF.h" -+#include "DVDClock.h" -+#include "DVDDemuxUtils.h" -+#include "utils/log.h" -+ -+//#define DEBUG_VERBOSE -+ -+DemuxPacket* CDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) -+{ -+ if (srcPkt->iStreamId != m_h264StreamId && -+ srcPkt->iStreamId != m_mvcStreamId) -+ return srcPkt; -+ -+ if (srcPkt->iStreamId == m_h264StreamId) -+ { -+ m_H264queue.push(srcPkt); -+ } -+ else if (srcPkt->iStreamId == m_mvcStreamId) -+ { -+ m_MVCqueue.push(srcPkt); -+ } -+ -+ return GetMVCPacket(); -+} -+ -+void CDemuxStreamSSIF::Flush() -+{ -+ while (!m_H264queue.empty()) -+ { -+ CDVDDemuxUtils::FreeDemuxPacket(m_H264queue.front()); -+ m_H264queue.pop(); -+ } -+ while (!m_MVCqueue.empty()) -+ { -+ CDVDDemuxUtils::FreeDemuxPacket(m_MVCqueue.front()); -+ m_MVCqueue.pop(); -+ } -+} -+ -+DemuxPacket* CDemuxStreamSSIF::MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt) -+{ -+ DemuxPacket* newpkt = NULL; -+ newpkt = CDVDDemuxUtils::AllocateDemuxPacket(srcPkt->iSize + appendPkt->iSize); -+ newpkt->iSize = srcPkt->iSize + appendPkt->iSize; -+ -+ newpkt->pts = srcPkt->pts; -+ newpkt->dts = srcPkt->dts; -+ newpkt->duration = srcPkt->duration; -+ newpkt->iGroupId = srcPkt->iGroupId; -+ newpkt->iStreamId = srcPkt->iStreamId; -+ memcpy(newpkt->pData, srcPkt->pData, srcPkt->iSize); -+ memcpy(newpkt->pData + srcPkt->iSize, appendPkt->pData, appendPkt->iSize); -+ -+ CDVDDemuxUtils::FreeDemuxPacket(srcPkt); -+ srcPkt = NULL; -+ CDVDDemuxUtils::FreeDemuxPacket(appendPkt); -+ appendPkt = NULL; -+ -+ return newpkt; -+} -+ -+DemuxPacket* CDemuxStreamSSIF::GetMVCPacket() -+{ -+ // Here, we recreate a h264 MVC packet from the base one + buffered MVC NALU's -+ while (!m_H264queue.empty() && !m_MVCqueue.empty()) -+ { -+ DemuxPacket* h264pkt = m_H264queue.front(); -+ double tsH264 = (h264pkt->dts != DVD_NOPTS_VALUE ? h264pkt->dts : h264pkt->pts); -+ DemuxPacket* mvcpkt = m_MVCqueue.front(); -+ double tsMVC = (mvcpkt->dts != DVD_NOPTS_VALUE ? mvcpkt->dts : mvcpkt->pts); -+ -+ if (tsH264 == tsMVC) -+ { -+ m_H264queue.pop(); -+ m_MVCqueue.pop(); -+ -+ while (!m_H264queue.empty()) -+ { -+ DemuxPacket* pkt = m_H264queue.front(); -+ double ts = (pkt->dts != DVD_NOPTS_VALUE ? pkt->dts : pkt->pts); -+ if (ts == DVD_NOPTS_VALUE) -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC merge h264 fragment: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", h264pkt->iSize, pkt->iSize, h264pkt->pts*1e-6, pkt->pts*1e-6, h264pkt->dts*1e-6, pkt->dts*1e-6); -+#endif -+ h264pkt = MergePacket(h264pkt, pkt); -+ m_H264queue.pop(); -+ } -+ else -+ break; -+ } -+ while (!m_MVCqueue.empty()) -+ { -+ DemuxPacket* pkt = m_MVCqueue.front(); -+ double ts = (pkt->dts != DVD_NOPTS_VALUE ? pkt->dts : pkt->pts); -+ if (ts == DVD_NOPTS_VALUE) -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC merge mvc fragment: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", mvcpkt->iSize, pkt->iSize, mvcpkt->pts*1e-6, pkt->pts*1e-6, mvcpkt->dts*1e-6, pkt->dts*1e-6); -+#endif -+ mvcpkt = MergePacket(mvcpkt, pkt); -+ m_MVCqueue.pop(); -+ } -+ else -+ break; -+ } -+ -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC merge packet: %6d+%6d, pts(%.3f/%.3f) dts(%.3f/%.3f)", h264pkt->iSize, mvcpkt->iSize, h264pkt->pts*1e-6, mvcpkt->pts*1e-6, h264pkt->dts*1e-6, mvcpkt->dts*1e-6); -+#endif -+ return MergePacket(h264pkt, mvcpkt); -+ } -+ else if (tsH264 > tsMVC) -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC discard mvc: %6d, pts(%.3f) dts(%.3f)", mvcpkt->iSize, mvcpkt->pts*1e-6, mvcpkt->dts*1e-6); -+#endif -+ CDVDDemuxUtils::FreeDemuxPacket(mvcpkt); -+ m_MVCqueue.pop(); -+ } -+ else -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC discard h264: %6d, pts(%.3f) dts(%.3f)", h264pkt->iSize, h264pkt->pts*1e-6, h264pkt->dts*1e-6); -+#endif -+ CDVDDemuxUtils::FreeDemuxPacket(h264pkt); -+ m_H264queue.pop(); -+ } -+ } -+ -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC waiting. MVC(%d) H264(%d)", m_MVCqueue.size(), m_H264queue.size()); -+#endif -+ -+ return CDVDDemuxUtils::AllocateDemuxPacket(0); -+} -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -new file mode 100644 -index 0000000000000000000000000000000000000000..1dafdc58db3f9cb5eac032c591942439117e13c4 ---- /dev/null -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -@@ -0,0 +1,49 @@ -+#pragma once -+ -+/* -+* Copyright (C) 2005-2013 Team XBMC -+* http://xbmc.org -+* -+* This Program is free software; you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation; either version 2, or (at your option) -+* any later version. -+* -+* This Program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* -+* You should have received a copy of the GNU General Public License -+* along with XBMC; see the file COPYING. If not, see -+* . -+* -+*/ -+ -+#include "DVDDemuxPacket.h" -+#include -+ -+extern "C" { -+#include "libavformat/avformat.h" -+} -+ -+class CDemuxStreamSSIF -+{ -+public: -+ CDemuxStreamSSIF() {}; -+ ~CDemuxStreamSSIF() { Flush(); } -+ -+ DemuxPacket* AddPacket(DemuxPacket* &scrPkt); -+ void Flush(); -+ void SetH264StreamId(int id) { m_h264StreamId = id; }; -+ void SetMVCStreamId(int id) { m_mvcStreamId = id; }; -+ -+private: -+ DemuxPacket* GetMVCPacket(); -+ DemuxPacket* MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt); -+ -+ std::queue m_H264queue; -+ std::queue m_MVCqueue; -+ int m_h264StreamId = 0; -+ int m_mvcStreamId = 0; -+}; -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index c728dd652d323fb5f0882b7dbd2887fd59dfe0e2..aff4a915c7a129772f4d2272fff386067c578bce 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -391,7 +391,7 @@ void CAdvancedSettings::Initialize() - - m_pictureExtensions = ".png|.jpg|.jpeg|.bmp|.gif|.ico|.tif|.tiff|.tga|.pcx|.cbz|.zip|.cbr|.rar|.rss|.webp|.jp2|.apng"; - m_musicExtensions = ".nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.gdm|.imf|.m15|.sfx|.uni|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.rar|.wv|.dsp|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.wtv|.mka|.tak|.opus|.dff|.dsf"; -- m_videoExtensions = ".m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.mpd|.m3u|.m3u8|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.mk3d|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv"; -+ m_videoExtensions = ".m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.mpd|.m3u|.m3u8|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.mk3d|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv|.ssif"; - m_subtitlesExtensions = ".utf|.utf8|.utf-8|.sub|.srt|.smi|.rt|.txt|.ssa|.text|.ssa|.aqt|.jss|.ass|.idx|.ifo|.rar|.zip"; - m_discStubExtensions = ".disc"; - // internal music extensions - -From d79fe987006170fa686a5e03c742dadd6ffd5875 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Tue, 23 Feb 2016 16:02:46 +0300 -Subject: [PATCH 42/61] [3DBD] Added support of 3D-BluRay playback. - ---- - lib/DllLibbluray.h | 8 + - xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 + - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 51 +++- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 266 +++++++++++++++++++++ - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h | 57 +++++ - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp | 40 +++- - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h | 12 +- - .../DVDInputStreams/DVDInputStreamBluray.cpp | 159 ++++++++++-- - .../DVDInputStreams/DVDInputStreamBluray.h | 20 ++ - 9 files changed, 580 insertions(+), 35 deletions(-) - create mode 100644 xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp - create mode 100644 xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h - -diff --git a/lib/DllLibbluray.h b/lib/DllLibbluray.h -index f5a337fe19beff472557c97ff7a203ad30a912b2..03f93391265e164837c2a17a8fe6d7da41c2f13e 100644 ---- a/lib/DllLibbluray.h -+++ b/lib/DllLibbluray.h -@@ -31,6 +31,8 @@ extern "C" - #include - #include - #include -+#include -+#include - } - - class DllLibblurayInterface -@@ -80,6 +82,8 @@ public: - #endif - virtual int bd_menu_call (BLURAY *bd, int64_t pts)=0; - virtual int bd_mouse_select (BLURAY *bd, int64_t pts, uint16_t x, uint16_t y)=0; -+ virtual MPLS_PL* bd_get_title_mpls (BLURAY *bd) = 0; -+ virtual int bd_get_clip_infos (BLURAY *bd, unsigned clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration) = 0; - }; - - class DllLibbluray : public DllDynamic, DllLibblurayInterface -@@ -128,6 +132,8 @@ class DllLibbluray : public DllDynamic, DllLibblurayInterface - #endif - DEFINE_METHOD2(int, bd_menu_call, (BLURAY *p1, int64_t p2)) - DEFINE_METHOD4(int, bd_mouse_select, (BLURAY *p1, int64_t p2, uint16_t p3, uint16_t p4)) -+ DEFINE_METHOD1(MPLS_PL*, bd_get_title_mpls, (BLURAY *p1)) -+ DEFINE_METHOD6(int, bd_get_clip_infos, (BLURAY *p1, unsigned p2, uint64_t *p3, uint64_t *p4, uint64_t *p5, uint64_t *p6)) - - BEGIN_METHOD_RESOLVE() - RESOLVE_METHOD(bd_get_titles) -@@ -172,6 +178,8 @@ class DllLibbluray : public DllDynamic, DllLibblurayInterface - #endif - RESOLVE_METHOD(bd_menu_call) - RESOLVE_METHOD(bd_mouse_select) -+ RESOLVE_METHOD(bd_get_title_mpls) -+ RESOLVE_METHOD(bd_get_clip_infos) - END_METHOD_RESOLVE() - - public: -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -index 156ec2021002d9d7a355db2f0dcf099aabb1db48..87d27b666f703743bb0170252cf1190da5bce261 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt -@@ -6,6 +6,7 @@ set(SOURCES DemuxMultiSource.cpp - DVDDemuxClient.cpp - DVDDemuxFFmpeg.cpp - DemuxStreamSSIF.cpp -+ DemuxMVC.cpp - DVDDemuxUtils.cpp - DVDDemuxVobsub.cpp - DVDFactoryDemuxer.cpp) -@@ -18,6 +19,7 @@ set(HEADERS DemuxMultiSource.h - DVDDemuxClient.h - DVDDemuxFFmpeg.h - DemuxStreamSSIF.h -+ DemuxMVC.h - DVDDemuxPacket.h - DVDDemuxUtils.h - DVDDemuxVobsub.h -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index bd3bd7490c35c487cca232e28a71ba207be74990..b80f44994dfbc9f4cac37f9cad7926c0d32371e2 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -27,6 +27,7 @@ - #include "cores/FFmpeg.h" - #include "DVDCodecs/DVDCodecUtils.h" - #include "DVDClock.h" // for DVD_TIME_BASE -+#include "DemuxMVC.h" - #include "DVDDemuxUtils.h" - #include "DVDInputStreams/DVDInputStream.h" - #include "DVDInputStreams/DVDInputStreamFFmpeg.h" -@@ -504,6 +505,16 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein - - UpdateCurrentPTS(); - -+ if (!fileinfo && m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY)) -+ { -+ CDVDInputStreamBluray *bluRay = static_cast(m_pInput); -+ if (bluRay->HasMVC()) -+ { -+ SAFE_DELETE(m_pSSIF); -+ m_pSSIF = new CDemuxStreamSSIF(); -+ m_pSSIF->SetBluRay(bluRay); -+ } -+ } - // in case of mpegts and we have not seen pat/pmt, defer creation of streams - if (!skipCreateStreams || m_pFormatContext->nb_programs > 0) - { -@@ -885,9 +896,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - { - Flush(); - } -- // libavformat is confused by the interleaved SSIF. -- // Disable program management for those -- else if (!m_pSSIF && IsProgramChange()) -+ else if (IsProgramChange()) - { - // update streams - CreateStreams(m_program); -@@ -928,8 +937,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - if (IsVideoReady()) - { - // libavformat is confused by the interleaved SSIF. -- // Disable program management for those -- if (!m_pSSIF && m_program != UINT_MAX ) -+ if ((!m_pSSIF || m_pSSIF->IsBluRay()) && m_program != UINT_MAX) - { - /* check so packet belongs to selected program */ - for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) -@@ -1080,10 +1088,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() - } - if (stream && m_pSSIF) - { -- if (stream->type == STREAM_VIDEO || -- stream->type == STREAM_DATA) -- pPacket = m_pSSIF->AddPacket(pPacket); -- -+ pPacket = m_pSSIF->AddPacket(pPacket); - if (stream->type == STREAM_DATA && stream->codec == AV_CODEC_ID_H264_MVC && pPacket->iSize) - stream = GetStream(pPacket->iStreamId); - } -@@ -1483,6 +1488,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - { - m_pSSIF->SetH264StreamId(streamIdx); - pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); -+ -+ AVStream* mvcStream = nullptr; -+ if (m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY)) -+ { -+ CDVDInputStreamBluray *bluRay = static_cast(m_pInput); -+ if (bluRay->HasMVC()) -+ { -+ st->stereo_mode = bluRay->AreEyesFlipped() ? "block_rl" : "block_lr"; -+ mvcStream = static_cast(bluRay->GetDemuxMVC())->GetAVStream(); -+ } -+ } -+ else -+ mvcStream = m_pFormatContext->streams[m_pSSIF->GetMVCStreamId()]; -+ -+ if (mvcStream && pStream->codec->extradata_size > 0 && mvcStream->codec->extradata_size > 0) -+ { -+ uint8_t* extr = pStream->codec->extradata; -+ pStream->codec->extradata = (uint8_t*)av_mallocz(pStream->codec->extradata_size + mvcStream->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ memcpy(pStream->codec->extradata, extr, pStream->codec->extradata_size); -+ memcpy(pStream->codec->extradata + pStream->codec->extradata_size, mvcStream->codec->extradata, mvcStream->codec->extradata_size); -+ pStream->codec->extradata_size += mvcStream->codec->extradata_size; -+ av_free(extr); -+ } - } - } - else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) -@@ -1806,6 +1834,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) - - bool CDVDDemuxFFmpeg::IsProgramChange() - { -+ // libavformat is confused by the interleaved SSIF. -+ // disable program management for those -+ if (m_pSSIF && !m_pSSIF->IsBluRay()) -+ return false; -+ - if (m_program == UINT_MAX) - return false; - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -new file mode 100644 -index 0000000000000000000000000000000000000000..ade6a4454fc3915b0c787b1a4f72aedbd74903db ---- /dev/null -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -@@ -0,0 +1,266 @@ -+/* -+* Copyright (C) 2005-2013 Team XBMC -+* http://xbmc.org -+* -+* This Program is free software; you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation; either version 2, or (at your option) -+* any later version. -+* -+* This Program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* -+* You should have received a copy of the GNU General Public License -+* along with XBMC; see the file COPYING. If not, see -+* . -+* -+*/ -+ -+#include "DemuxMVC.h" -+#include "DVDDemuxUtils.h" -+#include "DVDInputStreams/DVDInputStream.h" -+#include "DVDClock.h" -+#include "cores/FFmpeg.h" -+#include "utils/log.h" -+ -+extern "C" { -+#include "libavutil/opt.h" -+}; -+ -+#define MVC_SEEK_TIME_WINDOW 75000 // experimental value depends on seeking accurate -+ -+static int mvc_file_read(void *h, uint8_t* buf, int size) -+{ -+ CDVDInputStream* pInputStream = static_cast(h)->m_pInput; -+ return pInputStream->Read(buf, size); -+} -+ -+static int64_t mvc_file_seek(void *h, int64_t pos, int whence) -+{ -+ CDVDInputStream* pInputStream = static_cast(h)->m_pInput; -+ if (whence == AVSEEK_SIZE) -+ return pInputStream->GetLength(); -+ else -+ return pInputStream->Seek(pos, whence & ~AVSEEK_FORCE); -+} -+ -+CDemuxMVC::CDemuxMVC() -+{ -+ m_ioContext = nullptr; -+ m_pFormatContext = nullptr; -+ m_pInput = nullptr; -+ m_nStreamIndex = -1; -+} -+ -+CDemuxMVC::~CDemuxMVC() -+{ -+ Dispose(); -+} -+ -+bool CDemuxMVC::Open(CDVDInputStream* pInput) -+{ -+ int ret; -+ -+ if (!pInput) -+ return false; -+ m_pInput = pInput; -+ -+ unsigned char* buffer = (unsigned char*)av_malloc(FFMPEG_FILE_BUFFER_SIZE); -+ m_ioContext = avio_alloc_context(buffer, FFMPEG_FILE_BUFFER_SIZE, 0, this, mvc_file_read, NULL, mvc_file_seek); -+ m_ioContext->max_packet_size = m_pInput->GetBlockSize(); -+ if (m_ioContext->max_packet_size) -+ m_ioContext->max_packet_size *= FFMPEG_FILE_BUFFER_SIZE / m_ioContext->max_packet_size; -+ -+ m_pFormatContext = avformat_alloc_context(); -+ m_pFormatContext->pb = m_ioContext; -+ -+ AVInputFormat *format = av_find_input_format("mpegts"); -+ ret = avformat_open_input(&m_pFormatContext, m_pInput->GetFileName().c_str(), format, nullptr); -+ if (ret < 0) -+ { -+ CLog::Log(LOGDEBUG, "%s: Opening MVC demuxing context failed (%d)", __FUNCTION__, ret); -+ Dispose(); -+ return false; -+ } -+ -+ av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0); -+ av_opt_set_int(m_pFormatContext, "correct_ts_overflow", 0, 0); -+ m_pFormatContext->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; -+ -+ // Find the streams -+ ret = avformat_find_stream_info(m_pFormatContext, nullptr); -+ //it always returns -1 so just ignore it -+ //if (ret < 0) -+ //{ -+ // CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::OpenMVCDemuxer(): avformat_find_stream_info failed (%d)", ret); -+ // Dispose(); -+ // return false; -+ //} -+ -+ // print some extra information -+ av_dump_format(m_pFormatContext, 0, m_pInput->GetFileName().c_str(), 0); -+ -+ // Find and select our MVC stream -+ CLog::Log(LOGDEBUG, "%s: MVC m2ts has %d streams", __FUNCTION__, m_pFormatContext->nb_streams); -+ for (unsigned i = 0; i < m_pFormatContext->nb_streams; i++) -+ { -+ if (m_pFormatContext->streams[i]->codec->codec_id == AV_CODEC_ID_H264_MVC -+ && m_pFormatContext->streams[i]->codec->extradata_size > 0) -+ { -+ m_nStreamIndex = i; -+ break; -+ } -+ else -+ m_pFormatContext->streams[i]->discard = AVDISCARD_ALL; -+ } -+ -+ if (m_nStreamIndex < 0) -+ { -+ CLog::Log(LOGDEBUG, "%s: MVC Stream not found", __FUNCTION__); -+ Dispose(); -+ return false; -+ } -+ -+ return true; -+} -+ -+void CDemuxMVC::Reset() -+{ -+ CDVDInputStream* pInput = m_pInput; -+ Dispose(); -+ Open(pInput); -+} -+ -+void CDemuxMVC::Abort() -+{ -+} -+ -+void CDemuxMVC::Flush() -+{ -+ if (m_pFormatContext) -+ { -+ if (m_pFormatContext->pb) -+ avio_flush(m_pFormatContext->pb); -+ avformat_flush(m_pFormatContext); -+ } -+} -+ -+DemuxPacket* CDemuxMVC::Read() -+{ -+ int ret; -+ AVPacket mvcPacket = { 0 }; -+ av_init_packet(&mvcPacket); -+ -+ while (true) -+ { -+ ret = av_read_frame(m_pFormatContext, &mvcPacket); -+ -+ if (ret == AVERROR(EINTR) || ret == AVERROR(EAGAIN)) -+ continue; -+ else if (ret == AVERROR_EOF) -+ break; -+ else if (mvcPacket.size <= 0 || mvcPacket.stream_index != m_nStreamIndex) -+ { -+ av_packet_unref(&mvcPacket); -+ continue; -+ } -+ else -+ { -+ AVStream *stream = m_pFormatContext->streams[mvcPacket.stream_index]; -+ double dts = ConvertTimestamp(mvcPacket.dts, stream->time_base.den, stream->time_base.num); -+ double pts = ConvertTimestamp(mvcPacket.pts, stream->time_base.den, stream->time_base.num); -+ -+ DemuxPacket* newPkt = CDVDDemuxUtils::AllocateDemuxPacket(mvcPacket.size); -+ if (mvcPacket.data) -+ memcpy(newPkt->pData, mvcPacket.data, mvcPacket.size); -+ newPkt->iSize = mvcPacket.size; -+ newPkt->dts = dts; -+ newPkt->pts = pts; -+ newPkt->iStreamId = stream->id; -+ -+ av_packet_unref(&mvcPacket); -+ return newPkt; -+ } -+ } -+ -+ return nullptr; -+} -+ -+bool CDemuxMVC::SeekTime(int time, bool backwords, double* startpts) -+{ -+ if (!m_pInput) -+ return false; -+ -+ AVRational time_base = m_pFormatContext->streams[m_nStreamIndex]->time_base; -+ int64_t seek_pts = av_rescale(DVD_MSEC_TO_TIME(time), time_base.den, (int64_t)time_base.num * AV_TIME_BASE); -+ int64_t starttime = 0; -+ -+ if (m_pFormatContext->start_time != (int64_t)AV_NOPTS_VALUE) -+ starttime = av_rescale(m_pFormatContext->start_time, time_base.den, (int64_t)time_base.num * AV_TIME_BASE); -+ if (starttime != 0) -+ seek_pts += starttime; -+ if (seek_pts < MVC_SEEK_TIME_WINDOW) -+ seek_pts = 0; -+ else -+ seek_pts -= MVC_SEEK_TIME_WINDOW; -+ -+ av_seek_frame(m_pFormatContext, m_nStreamIndex, seek_pts, AVSEEK_FLAG_BACKWARD); -+ return true; -+} -+ -+std::string CDemuxMVC::GetFileName() -+{ -+ return m_pInput->GetFileName(); -+} -+ -+AVStream* CDemuxMVC::GetAVStream() -+{ -+ return m_pFormatContext ? m_pFormatContext->streams[m_nStreamIndex] : nullptr; -+} -+ -+void CDemuxMVC::Dispose() -+{ -+ if (m_pFormatContext) -+ avformat_close_input(&m_pFormatContext); -+ -+ if (m_ioContext) -+ { -+ av_free(m_ioContext->buffer); -+ av_free(m_ioContext); -+ } -+ -+ m_ioContext = nullptr; -+ m_pFormatContext = nullptr; -+ m_pInput = nullptr; -+ m_nStreamIndex = -1; -+} -+ -+double CDemuxMVC::ConvertTimestamp(int64_t pts, int den, int num) -+{ -+ if (pts == (int64_t)AV_NOPTS_VALUE) -+ return DVD_NOPTS_VALUE; -+ -+ // do calculations in floats as they can easily overflow otherwise -+ // we don't care for having a completly exact timestamp anyway -+ double timestamp = (double)pts * num / den; -+ double starttime = 0.0f; -+ -+ /*if (m_MVCFormatContext->start_time != (int64_t)AV_NOPTS_VALUE) -+ starttime = (double)m_MVCFormatContext->start_time / AV_TIME_BASE;*/ -+ -+ if (timestamp > starttime) -+ timestamp -= starttime; -+ // allow for largest possible difference in pts and dts for a single packet -+ else if (timestamp + 0.5f > starttime) -+ timestamp = 0; -+ -+ return timestamp * DVD_TIME_BASE; -+} -+ -+std::vector CDemuxMVC::GetStreams() const -+{ -+ std::vector streams; -+ return streams; -+} -\ No newline at end of file -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -new file mode 100644 -index 0000000000000000000000000000000000000000..bbb836a61344689a83af68c821c05c212a86b097 ---- /dev/null -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -@@ -0,0 +1,57 @@ -+#pragma once -+ -+/* -+* Copyright (C) 2005-2013 Team XBMC -+* http://xbmc.org -+* -+* This Program is free software; you can redistribute it and/or modify -+* it under the terms of the GNU General Public License as published by -+* the Free Software Foundation; either version 2, or (at your option) -+* any later version. -+* -+* This Program is distributed in the hope that it will be useful, -+* but WITHOUT ANY WARRANTY; without even the implied warranty of -+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+* GNU General Public License for more details. -+* -+* You should have received a copy of the GNU General Public License -+* along with XBMC; see the file COPYING. If not, see -+* . -+* -+*/ -+ -+#include "DVDDemux.h" -+ -+extern "C" { -+#include "libavformat/avformat.h" -+} -+ -+class CDemuxMVC : public CDVDDemux -+{ -+public: -+ CDemuxMVC(); -+ virtual ~CDemuxMVC(); -+ bool Open(CDVDInputStream* pInput); -+ virtual void Reset(); -+ virtual void Abort(); -+ virtual void Flush(); -+ virtual DemuxPacket* Read(); -+ virtual bool SeekTime(int time, bool backwords = false, double* startpts = nullptr); -+ virtual void SetSpeed(int iSpeed) { }; -+ virtual int GetStreamLength() { return 0; }; -+ virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; }; -+ virtual std::vector GetStreams() const override; -+ virtual int GetNrOfStreams() const override { return 1; }; -+ virtual std::string GetFileName(); -+ -+ AVStream* GetAVStream(); -+ CDVDInputStream* m_pInput; -+ -+private: -+ void Dispose(); -+ double ConvertTimestamp(int64_t pts, int den, int num); -+ -+ AVIOContext *m_ioContext = nullptr; -+ AVFormatContext *m_pFormatContext = nullptr; -+ int m_nStreamIndex = -1; -+}; -\ No newline at end of file -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -index f75532016a1395782b59dc124676835c7254de56..2c7e66f7ee5683a0fbcde5ad5c65ebfd6853f3d0 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -@@ -19,11 +19,13 @@ - */ - - #include "DemuxStreamSSIF.h" -+#include "DVDDemux.h" - #include "DVDClock.h" - #include "DVDDemuxUtils.h" - #include "utils/log.h" - - //#define DEBUG_VERBOSE -+#define MVC_QUEUE_SIZE 100 - - DemuxPacket* CDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) - { -@@ -37,7 +39,7 @@ DemuxPacket* CDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) - } - else if (srcPkt->iStreamId == m_mvcStreamId) - { -- m_MVCqueue.push(srcPkt); -+ AddMVCExtPacket(srcPkt); - } - - return GetMVCPacket(); -@@ -81,6 +83,10 @@ DemuxPacket* CDemuxStreamSSIF::MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &a - - DemuxPacket* CDemuxStreamSSIF::GetMVCPacket() - { -+ // if input is a bluray fill mvc queue before processing -+ if (m_bluRay && m_MVCqueue.empty() && !m_H264queue.empty()) -+ FillMVCQueue(m_H264queue.front()->dts); -+ - // Here, we recreate a h264 MVC packet from the base one + buffered MVC NALU's - while (!m_H264queue.empty() && !m_MVCqueue.empty()) - { -@@ -151,6 +157,36 @@ DemuxPacket* CDemuxStreamSSIF::GetMVCPacket() - #if defined(DEBUG_VERBOSE) - CLog::Log(LOGDEBUG, ">>> MVC waiting. MVC(%d) H264(%d)", m_MVCqueue.size(), m_H264queue.size()); - #endif -- - return CDVDDemuxUtils::AllocateDemuxPacket(0); - } -+ -+void CDemuxStreamSSIF::AddMVCExtPacket(DemuxPacket* &mvcExtPkt) -+{ -+ m_MVCqueue.push(mvcExtPkt); -+} -+ -+bool CDemuxStreamSSIF::FillMVCQueue(double dtsBase) -+{ -+ if (!m_bluRay) -+ return false; -+ -+ CDVDDemux* demux = m_bluRay->GetDemuxMVC(); -+ DemuxPacket* mvc; -+ while ((m_MVCqueue.size() < MVC_QUEUE_SIZE) && (mvc = demux->Read())) -+ { -+ if (dtsBase == DVD_NOPTS_VALUE || mvc->dts == DVD_NOPTS_VALUE) -+ { -+ // do nothing, can't compare timestamps when they are not set -+ } -+ else if (mvc->dts < dtsBase) -+ { -+#if defined(DEBUG_VERBOSE) -+ CLog::Log(LOGDEBUG, ">>> MVC discard mvc: %6d, pts(%.3f) dts(%.3f)", mvc->iSize, mvc->pts*1e-6, mvc->dts*1e-6); -+#endif -+ CDVDDemuxUtils::FreeDemuxPacket(mvc); -+ continue; -+ } -+ AddMVCExtPacket(mvc); -+ }; -+ return m_MVCqueue.size() == MVC_QUEUE_SIZE; -+} -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -index 1dafdc58db3f9cb5eac032c591942439117e13c4..508e9debd3e6679a1433842a65649fa68ead76ec 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -@@ -21,6 +21,7 @@ - */ - - #include "DVDDemuxPacket.h" -+#include "DVDInputStreams/DVDInputStreamBluray.h" - #include - - extern "C" { -@@ -37,13 +38,20 @@ public: - void Flush(); - void SetH264StreamId(int id) { m_h264StreamId = id; }; - void SetMVCStreamId(int id) { m_mvcStreamId = id; }; -+ int GetH264StreamId() { return m_h264StreamId; }; -+ int GetMVCStreamId() { return m_mvcStreamId; }; -+ void AddMVCExtPacket(DemuxPacket* &scrPkt); -+ void SetBluRay(CDVDInputStreamBluray* &bluRay) { m_bluRay = bluRay; }; -+ bool IsBluRay() { return m_bluRay != nullptr; }; - - private: - DemuxPacket* GetMVCPacket(); - DemuxPacket* MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt); -+ bool FillMVCQueue(double dtsBase); - -+ CDVDInputStreamBluray* m_bluRay = nullptr; - std::queue m_H264queue; - std::queue m_MVCqueue; -- int m_h264StreamId = 0; -- int m_mvcStreamId = 0; -+ int m_h264StreamId = -1; -+ int m_mvcStreamId = -1; - }; -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -index 55bc91384500f64f6cc4242514aa3104393de2cb..a2c59b137ebdb7a44aea4fe1216eb9a2f43c048c 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -@@ -26,6 +26,8 @@ - #include "IVideoPlayer.h" - #include "DVDCodecs/Overlay/DVDOverlay.h" - #include "DVDCodecs/Overlay/DVDOverlayImage.h" -+#include "DVDInputStreamFile.h" -+#include "DVDDemuxers/DemuxMVC.h" - #include "settings/Settings.h" - #include "LangInfo.h" - #include "ServiceBroker.h" -@@ -232,10 +234,8 @@ bool CDVDInputStreamBluray::IsEOF() - - BLURAY_TITLE_INFO* CDVDInputStreamBluray::GetTitleLongest() - { -- int titles = m_dll->bd_get_titles(m_bd, TITLES_RELEVANT, 0); -- - BLURAY_TITLE_INFO *s = NULL; -- for(int i=0; i < titles; i++) -+ for(int i=0; i < m_nTitles; i++) - { - BLURAY_TITLE_INFO *t = m_dll->bd_get_title_info(m_bd, i, 0); - if(!t) -@@ -327,6 +327,7 @@ bool CDVDInputStreamBluray::Open() - return false; - } - -+ m_root = root; - const BLURAY_DISC_INFO *disc_info; - - disc_info = m_dll->bd_get_disc_info(m_bd); -@@ -350,6 +351,7 @@ bool CDVDInputStreamBluray::Open() - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Open - BD+ detected : %d", disc_info->bdplus_detected); - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Open - libbdplus detected : %d", disc_info->libbdplus_detected); - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Open - BD+ handled : %d", disc_info->bdplus_handled); -+ CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::Open - 3D content exist : %d", disc_info->content_exist_3D); - } - else - CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - BluRay not detected"); -@@ -366,6 +368,7 @@ bool CDVDInputStreamBluray::Open() - return false; - } - -+ m_nTitles = m_dll->bd_get_titles(m_bd, TITLES_RELEVANT, 0); - int mode = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_DISC_PLAYBACK); - - if (URIUtils::HasExtension(filename, ".mpls")) -@@ -394,18 +397,17 @@ bool CDVDInputStreamBluray::Open() - m_title = GetTitleLongest(); - } - -- if(m_navmode) -+ SetupPlayerSettings(); -+ m_dll->bd_get_event(m_bd, NULL); -+ -+ if (m_navmode) - { -- SetupPlayerSettings(); - - m_dll->bd_register_overlay_proc (m_bd, this, bluray_overlay_cb); - #ifdef HAVE_LIBBLURAY_BDJ - m_dll->bd_register_argb_overlay_proc (m_bd, this, bluray_overlay_argb_cb, NULL); - #endif - -- m_dll->bd_get_event(m_bd, NULL); -- -- - if(m_dll->bd_play(m_bd) <= 0) - { - CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed play disk %s", strPath.c_str()); -@@ -420,21 +422,25 @@ bool CDVDInputStreamBluray::Open() - CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed to get title info"); - return false; - } -- -- if(m_dll->bd_select_playlist(m_bd, m_title->playlist) == 0 ) -+ if (m_dll->bd_select_playlist(m_bd, m_title->playlist) == 0) - { - CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed to select title %d", m_title->idx); - return false; - } -- m_clip = 0; - } - -+ // Process any events that occured during opening -+ while (m_dll->bd_get_event(m_bd, &m_event)) -+ ProcessEvent(); -+ - return true; - } - - // close file and reset everything - void CDVDInputStreamBluray::Close() - { -+ CloseMVCDemux(); -+ - if (!m_dll) - return; - if(m_title) -@@ -450,7 +456,7 @@ void CDVDInputStreamBluray::Close() - - void CDVDInputStreamBluray::ProcessEvent() { - -- int pid = -1; -+ int pid = -1, ret; - switch (m_event.event) { - - case BD_EVENT_ERROR: -@@ -515,15 +521,17 @@ void CDVDInputStreamBluray::ProcessEvent() { - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - BD_EVENT_PLAYLIST %d", - m_event.param); - m_playlist = m_event.param; -- if(m_title) -- m_dll->bd_free_title_info(m_title); -- m_title = m_dll->bd_get_playlist_info(m_bd, m_playlist, m_angle); -+ ProcessItem(m_playlist); - break; - - case BD_EVENT_PLAYITEM: - CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - BD_EVENT_PLAYITEM %d", - m_event.param); - m_clip = m_event.param; -+ uint64_t clip_start, clip_in, bytepos; -+ ret = m_dll->bd_get_clip_infos(m_bd, m_clip, &clip_start, &clip_in, &bytepos, nullptr); -+ if (ret) -+ m_clipStartTime = clip_start / 90; - break; - - case BD_EVENT_CHAPTER: -@@ -602,14 +610,20 @@ void CDVDInputStreamBluray::ProcessEvent() { - - /* event has been consumed */ - m_event.event = BD_EVENT_NONE; -+ -+ if (m_bMVCPlayback && m_clip >= 0 && m_title && m_clip < m_title->clip_count && m_nMVCClip != m_clip) -+ { -+ CloseMVCDemux(); -+ OpenMVCDemux(m_clip); -+ } - } - - int CDVDInputStreamBluray::Read(uint8_t* buf, int buf_size) - { -+ int result = 0; - m_dispTimeBeforeRead = (int)(m_dll->bd_tell_time(m_bd) / 90); - if(m_navmode) - { -- int result = 0; - do { - - if(m_hold == HOLD_HELD) -@@ -659,10 +673,14 @@ int CDVDInputStreamBluray::Read(uint8_t* buf, int buf_size) - - } while(result == 0); - -- return result; - } - else -- return m_dll->bd_read(m_bd, buf, buf_size); -+ { -+ result = m_dll->bd_read(m_bd, buf, buf_size); -+ while (m_dll->bd_get_event(m_bd, &m_event)) -+ ProcessEvent(); -+ } -+ return result; - } - - static uint8_t clamp(double v) -@@ -910,8 +928,12 @@ bool CDVDInputStreamBluray::PosTime(int ms) - { - if(m_dll->bd_seek_time(m_bd, ms * 90) < 0) - return false; -- else -- return true; -+ -+ while (m_dll->bd_get_event(m_bd, &m_event)) -+ ProcessEvent(); -+ -+ SeekMVCDemux(ms - m_clipStartTime); -+ return true; - } - - int CDVDInputStreamBluray::GetChapterCount() -@@ -934,8 +956,12 @@ bool CDVDInputStreamBluray::SeekChapter(int ch) - { - if(m_title && m_dll->bd_seek_chapter(m_bd, ch-1) < 0) - return false; -- else -- return true; -+ -+ while (m_dll->bd_get_event(m_bd, &m_event)) -+ ProcessEvent(); -+ -+ SeekMVCDemux(GetChapterPos(ch) * 1000 - m_clipStartTime); -+ return true; - } - - int64_t CDVDInputStreamBluray::GetChapterPos(int ch) -@@ -1133,6 +1159,95 @@ bool CDVDInputStreamBluray::HasMenu() - return m_navmode; - } - -+bool CDVDInputStreamBluray::ProcessItem(int playitem) -+{ -+ if (m_title) -+ m_dll->bd_free_title_info(m_title); -+ -+ m_title = m_dll->bd_get_playlist_info(m_bd, playitem, m_angle); -+ -+ if (CSettings::GetInstance().GetBool("videoplayer.supportmvc")) -+ { -+ MPLS_PL * mpls = m_dll->bd_get_title_mpls(m_bd); -+ if (mpls) -+ { -+ for (int i = 0; i < mpls->ext_sub_count; i++) -+ { -+ if (mpls->ext_sub_path[i].type == 8 -+ && mpls->ext_sub_path[i].sub_playitem_count == mpls->list_count) -+ { -+ CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - Enabling BD3D MVC demuxing"); -+ CLog::Log(LOGDEBUG, "CDVDInputStreamBluray - MVC_Base_view_R_flag: %d", m_title->mvc_base_view_r_flag); -+ m_bMVCPlayback = true; -+ m_nMVCSubPathIndex = i; -+ m_bFlipEyes = m_title->mvc_base_view_r_flag != 0; -+ break; -+ } -+ } -+ } -+ } -+ CloseMVCDemux(); -+ return true; -+} -+ -+bool CDVDInputStreamBluray::OpenMVCDemux(int playItem) -+{ -+ MPLS_PL *pl = m_dll->bd_get_title_mpls(m_bd); -+ if (!pl) -+ return false; -+ -+ std::string strFileName; -+ strFileName.append(m_root); -+ strFileName.append("/BDMV/STREAM/"); -+ strFileName.append(pl->ext_sub_path[m_nMVCSubPathIndex].sub_play_item[playItem].clip->clip_id); -+ strFileName.append(".m2ts"); -+ -+ CLog::Log(LOGDEBUG, "CDVDInputStreamBluray::OpenMVCDemuxer(): Opening MVC extension stream at %s", strFileName.c_str()); -+ -+ CFileItem fileitem(CURL(strFileName), false); -+ m_pMVCInput = new CDVDInputStreamFile(fileitem); -+ -+ // Try to open the MVC stream -+ if (!m_pMVCInput->Open()) -+ { -+ CloseMVCDemux(); -+ m_bMVCPlayback = false; -+ return false; -+ } -+ -+ if (m_pMVCDemux) -+ SAFE_DELETE(m_pMVCDemux); -+ -+ CDemuxMVC* pMVCDemux = new CDemuxMVC; -+ m_pMVCDemux = pMVCDemux; -+ -+ if (!pMVCDemux->Open(m_pMVCInput)) -+ { -+ CloseMVCDemux(); -+ m_bMVCPlayback = false; -+ return false; -+ } -+ -+ m_nMVCClip = playItem; -+ return true; -+} -+ -+bool CDVDInputStreamBluray::CloseMVCDemux() -+{ -+ if (m_pMVCDemux) -+ SAFE_DELETE(m_pMVCDemux); -+ -+ SAFE_DELETE(m_pMVCInput); -+ m_nMVCClip = -1; -+ return true; -+} -+ -+void CDVDInputStreamBluray::SeekMVCDemux(int64_t time) -+{ -+ if (m_bMVCPlayback && m_pMVCDemux) -+ m_pMVCDemux->SeekTime(time); -+} -+ - void CDVDInputStreamBluray::SetupPlayerSettings() - { - int region = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_BLURAY_PLAYERREGION); -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d5bc5625f 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -@@ -38,6 +38,7 @@ extern "C" - class CDVDOverlayImage; - class DllLibbluray; - class IVideoPlayer; -+class CDVDDemux; - - class CDVDInputStreamBluray - : public CDVDInputStream -@@ -119,6 +120,9 @@ public: - BLURAY_TITLE_INFO* GetTitleFile(const std::string& name); - - void ProcessEvent(); -+ CDVDDemux* GetDemuxMVC() { return m_pMVCDemux; }; -+ bool HasMVC() { return m_bMVCPlayback; } -+ bool AreEyesFlipped() { return m_bFlipEyes; } - - protected: - struct SPlane; -@@ -127,6 +131,11 @@ protected: - void OverlayClose(); - static void OverlayClear(SPlane& plane, int x, int y, int w, int h); - static void OverlayInit (SPlane& plane, int w, int h); -+ bool ProcessItem(int playitem); -+ -+ bool OpenMVCDemux(int playItem); -+ bool CloseMVCDemux(); -+ void SeekMVCDemux(int64_t time); - - IVideoPlayer* m_player; - DllLibbluray* m_dll; -@@ -138,6 +147,17 @@ protected: - bool m_menu; - bool m_navmode; - int m_dispTimeBeforeRead; -+ int m_nTitles = -1; -+ std::string m_root; -+ -+ // MVC related members -+ CDVDDemux* m_pMVCDemux = nullptr; -+ CDVDInputStream *m_pMVCInput = nullptr; -+ bool m_bMVCPlayback = false; -+ int m_nMVCSubPathIndex = 0; -+ int m_nMVCClip = -1; -+ bool m_bFlipEyes = false; -+ uint64_t m_clipStartTime = 0; - - typedef std::shared_ptr SOverlay; - typedef std::list SOverlays; - -From ce707dd363dec9d577f7d2d508ca2345a2ce6060 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 11 Mar 2016 16:58:53 +0300 -Subject: [PATCH 43/61] [VideoPlayer] HasVideo returns true if video stream - exists. This don't allow start visualization if audio is opened before video. - ---- - xbmc/cores/VideoPlayer/VideoPlayer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index 5945d06dea8af5ea841e58a0268e09ecd8d7d494..6e7edd237c9184bd8e812a72b18f48213c1f797e 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -@@ -3119,7 +3119,7 @@ void CVideoPlayer::Pause() - - bool CVideoPlayer::HasVideo() const - { -- return m_HasVideo; -+ return m_HasVideo || GetVideoStream() >= 0; - } - - bool CVideoPlayer::HasAudio() const - -From 92293afe04eb8e21383fbacfa610615c2082e836 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 44/61] fixup! Revert supporting crappy tab/sbs subtitles. this - fixes regular subtitles. - ---- - .../cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -index 3a080d06c90b0762482816928642e6de7810b539..a8323f419e404037c4e5fb4d78fa1b45409337a7 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -@@ -243,20 +243,20 @@ CDVDOverlay* CDVDOverlayCodecFFmpeg::GetOverlay() - } - } - -- RENDER_STEREO_MODE render_stereo_mode = g_graphicsContext.GetStereoMode(); -+ /*RENDER_STEREO_MODE render_stereo_mode = g_graphicsContext.GetStereoMode(); - if (render_stereo_mode != RENDER_STEREO_MODE_OFF) - { -- if (rect.h > m_height / 2) -+ if ((rect.h - rect.y) > m_height / 2) - { - m_height /= 2; - rect.h /= 2; - } -- else if (rect.w > m_width / 2) -+ else if ((rect.w - rect.x) > m_width / 2) - { - m_width /= 2; - rect.w /= 2; - } -- } -+ }*/ - - CDVDOverlayImage* overlay = new CDVDOverlayImage(); - - -From b2debae5578a4ff05af7d598da137255ecd5b156 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Thu, 7 Apr 2016 17:28:50 +0300 -Subject: [PATCH 45/61] [VideoPlayer] Disable reading extension stream from - input stream if decoder doesn't support it. - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h | 5 +++++ - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 18 +++++++++--------- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp | 4 +++- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h | 6 +++--- - .../cores/VideoPlayer/DVDInputStreams/DVDInputStream.h | 11 +++++++++++ - .../DVDInputStreams/DVDInputStreamBluray.cpp | 9 ++++++++- - .../VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h | 9 ++++++--- - xbmc/cores/VideoPlayer/IVideoPlayer.h | 1 + - xbmc/cores/VideoPlayer/VideoPlayer.cpp | 4 ++++ - xbmc/cores/VideoPlayer/VideoPlayerVideo.h | 1 + - 10 files changed, 51 insertions(+), 17 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h -index a2da9de4375939f3711c594dc854b9a533c755b4..8101b6eeff0341a94736df7ee815dd4c18337a32 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h -@@ -311,6 +311,11 @@ public: - */ - virtual void Reopen() {}; - -+ /** -+ * Indicates that the decoder supports extention streams. -+ */ -+ virtual bool SupportsExtention() { return false; } -+ - protected: - CProcessInfo &m_processInfo; - }; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index b80f44994dfbc9f4cac37f9cad7926c0d32371e2..99ad8f34770b175b0ac9d92c75d7b409d51b5fec 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -505,14 +505,14 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein - - UpdateCurrentPTS(); - -- if (!fileinfo && m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY)) -+ if (!fileinfo) - { -- CDVDInputStreamBluray *bluRay = static_cast(m_pInput); -- if (bluRay->HasMVC()) -+ CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInput); -+ if (pExt && pExt->HasExtention()) - { - SAFE_DELETE(m_pSSIF); - m_pSSIF = new CDemuxStreamSSIF(); -- m_pSSIF->SetBluRay(bluRay); -+ m_pSSIF->SetBluRay(pExt); - } - } - // in case of mpegts and we have not seen pat/pmt, defer creation of streams -@@ -1490,13 +1490,13 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); - - AVStream* mvcStream = nullptr; -- if (m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY)) -+ CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInput); -+ if (pExt) - { -- CDVDInputStreamBluray *bluRay = static_cast(m_pInput); -- if (bluRay->HasMVC()) -+ if (pExt->HasExtention()) - { -- st->stereo_mode = bluRay->AreEyesFlipped() ? "block_rl" : "block_lr"; -- mvcStream = static_cast(bluRay->GetDemuxMVC())->GetAVStream(); -+ st->stereo_mode = pExt->AreEyesFlipped() ? "block_rl" : "block_lr"; -+ mvcStream = static_cast(pExt->GetExtentionDemux())->GetAVStream(); - } - } - else -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -index 2c7e66f7ee5683a0fbcde5ad5c65ebfd6853f3d0..7c8719ce40e725e27b7551250398022a1f1a4fc6 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -@@ -35,6 +35,8 @@ DemuxPacket* CDemuxStreamSSIF::AddPacket(DemuxPacket* &srcPkt) - - if (srcPkt->iStreamId == m_h264StreamId) - { -+ if (m_bluRay && !m_bluRay->HasExtention()) -+ return srcPkt; - m_H264queue.push(srcPkt); - } - else if (srcPkt->iStreamId == m_mvcStreamId) -@@ -170,7 +172,7 @@ bool CDemuxStreamSSIF::FillMVCQueue(double dtsBase) - if (!m_bluRay) - return false; - -- CDVDDemux* demux = m_bluRay->GetDemuxMVC(); -+ CDVDDemux* demux = m_bluRay->GetExtentionDemux(); - DemuxPacket* mvc; - while ((m_MVCqueue.size() < MVC_QUEUE_SIZE) && (mvc = demux->Read())) - { -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -index 508e9debd3e6679a1433842a65649fa68ead76ec..26cd97dddcae208afacfb241e96b4935ad0f81f3 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h -@@ -21,7 +21,7 @@ - */ - - #include "DVDDemuxPacket.h" --#include "DVDInputStreams/DVDInputStreamBluray.h" -+#include "DVDInputStreams/DVDInputStream.h" - #include - - extern "C" { -@@ -41,7 +41,7 @@ public: - int GetH264StreamId() { return m_h264StreamId; }; - int GetMVCStreamId() { return m_mvcStreamId; }; - void AddMVCExtPacket(DemuxPacket* &scrPkt); -- void SetBluRay(CDVDInputStreamBluray* &bluRay) { m_bluRay = bluRay; }; -+ void SetBluRay(CDVDInputStream::IExtentionStream* &bluRay) { m_bluRay = bluRay; }; - bool IsBluRay() { return m_bluRay != nullptr; }; - - private: -@@ -49,7 +49,7 @@ private: - DemuxPacket* MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt); - bool FillMVCQueue(double dtsBase); - -- CDVDInputStreamBluray* m_bluRay = nullptr; -+ CDVDInputStream::IExtentionStream* m_bluRay = nullptr; - std::queue m_H264queue; - std::queue m_MVCqueue; - int m_h264StreamId = -1; -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -index 3377d3f282d4e8cdeb10339e1aded5e3eb1edf1a..8e94436051e7b04ec11560057ecd64c5d08a7bcd 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -@@ -57,6 +57,7 @@ namespace XFILE - - struct DemuxPacket; - class CDemuxStream; -+class CDVDDemux; - - class CDVDInputStream - { -@@ -131,6 +132,16 @@ public: - virtual void SetVideoResolution(int width, int height) {}; - }; - -+ class IExtentionStream -+ { -+ public: -+ virtual ~IExtentionStream() {} -+ virtual bool HasExtention() = 0; -+ virtual bool AreEyesFlipped() = 0; -+ virtual CDVDDemux* GetExtentionDemux() = 0; -+ virtual void DisableExtention() = 0; -+ }; -+ - enum ENextStream - { - NEXTSTREAM_NONE, -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -index a2c59b137ebdb7a44aea4fe1216eb9a2f43c048c..cdc9039729993c5cd7d3af0b8ee8e5fc28a4a158 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -@@ -618,6 +618,13 @@ void CDVDInputStreamBluray::ProcessEvent() { - } - } - -+void CDVDInputStreamBluray::DisableExtention() -+{ -+ CloseMVCDemux(); -+ m_bMVCDisabled = true; -+ m_bMVCPlayback = false; -+} -+ - int CDVDInputStreamBluray::Read(uint8_t* buf, int buf_size) - { - int result = 0; -@@ -1166,7 +1173,7 @@ bool CDVDInputStreamBluray::ProcessItem(int playitem) - - m_title = m_dll->bd_get_playlist_info(m_bd, playitem, m_angle); - -- if (CSettings::GetInstance().GetBool("videoplayer.supportmvc")) -+ if (CSettings::GetInstance().GetBool("videoplayer.supportmvc") && !m_bMVCDisabled) - { - MPLS_PL * mpls = m_dll->bd_get_title_mpls(m_bd); - if (mpls) -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -index 561fb5cd4f971bc9ee4f41218a60bb3d5bc5625f..f70657c9e31fb2460d12910c635dba5163282e74 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -@@ -46,6 +46,7 @@ class CDVDInputStreamBluray - , public CDVDInputStream::IChapter - , public CDVDInputStream::IPosTime - , public CDVDInputStream::IMenus -+ , public CDVDInputStream::IExtentionStream - { - public: - CDVDInputStreamBluray(IVideoPlayer* player, const CFileItem& fileitem); -@@ -120,9 +121,10 @@ public: - BLURAY_TITLE_INFO* GetTitleFile(const std::string& name); - - void ProcessEvent(); -- CDVDDemux* GetDemuxMVC() { return m_pMVCDemux; }; -- bool HasMVC() { return m_bMVCPlayback; } -- bool AreEyesFlipped() { return m_bFlipEyes; } -+ CDVDDemux* GetExtentionDemux() override { return m_pMVCDemux; }; -+ bool HasExtention() override { return m_bMVCPlayback; } -+ bool AreEyesFlipped() override { return m_bFlipEyes; } -+ void DisableExtention() override; - - protected: - struct SPlane; -@@ -157,6 +159,7 @@ protected: - int m_nMVCSubPathIndex = 0; - int m_nMVCClip = -1; - bool m_bFlipEyes = false; -+ bool m_bMVCDisabled = false; - uint64_t m_clipStartTime = 0; - - typedef std::shared_ptr SOverlay; -diff --git a/xbmc/cores/VideoPlayer/IVideoPlayer.h b/xbmc/cores/VideoPlayer/IVideoPlayer.h -index 689798245ca48676af7c34a3e3565ea70ebcf309..d076c118f0877be6e5adb79c75606dce7870487c 100644 ---- a/xbmc/cores/VideoPlayer/IVideoPlayer.h -+++ b/xbmc/cores/VideoPlayer/IVideoPlayer.h -@@ -111,6 +111,7 @@ public: - virtual int GetDecoderBufferSize() { return 0; } - virtual int GetDecoderFreeSpace() = 0; - virtual bool IsEOS() { return false; }; -+ virtual bool SupportsExtention() const = 0; - }; - - class CDVDAudioCodec; -diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index 6e7edd237c9184bd8e812a72b18f48213c1f797e..aca33a7e75c604eb292a669a44bfecbffda9b9b1 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -@@ -3895,6 +3895,10 @@ bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset) - if (!player->OpenStream(hint)) - return false; - -+ CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInputStream); -+ if (pExt && !static_cast(player)->SupportsExtention()) -+ pExt->DisableExtention(); -+ - s.stereo_mode = static_cast(player)->GetStereoMode(); - if (s.stereo_mode == "mono") - s.stereo_mode = ""; -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.h b/xbmc/cores/VideoPlayer/VideoPlayerVideo.h -index 0d4100e58e9db7e5035bcf9ae23b0147f80cec8f..69570153f0810a5840f3780c7a6681a102b85cec 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.h -+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.h -@@ -91,6 +91,7 @@ public: - int GetVideoBitrate(); - std::string GetStereoMode(); - void SetSpeed(int iSpeed); -+ bool SupportsExtention() const override { return m_pVideoCodec && m_pVideoCodec->SupportsExtention(); } - - // classes - CDVDOverlayContainer* m_pOverlayContainer; - -From 6c573a5eb0e2d87486d8a7f220c2b6e681e75ba9 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 16 Sep 2016 11:37:48 +0300 -Subject: [PATCH 46/61] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from - platform settings to common settings. - ---- - system/settings/rbp.xml | 7 ------- - system/settings/settings.xml | 6 ++++++ - system/settings/win32.xml | 11 ----------- - .../VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp | 2 +- - xbmc/settings/SettingConditions.cpp | 3 +++ - 5 files changed, 10 insertions(+), 19 deletions(-) - -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index 2572e25753712186f69390965ee1448bff3fadd5..7098edf32dff8c00e192229c3ffb060be6a42482 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -28,13 +28,6 @@ - - - -- -- -- 2 -- true -- -- -- - -
-
-diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 068ca2d519cb7537e0d3ad05c83d47d341a34250..23b96cbb2463d6b4072b0f9333e0def0aaa446e1 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -343,6 +343,12 @@ - true - - -+ -+ 2 -+ true -+ -+ HAS_MVC -+ - - - -diff --git a/system/settings/win32.xml b/system/settings/win32.xml -index 2fcee72a64e8b701c8e895143410bbe9fd617356..a017d30c24232fb01220b87b29398403b8ed9662 100644 ---- a/system/settings/win32.xml -+++ b/system/settings/win32.xml -@@ -12,17 +12,6 @@ - false - -
--
-- -- -- -- 2 -- true -- -- -- -- --
-
- - -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -index cdc9039729993c5cd7d3af0b8ee8e5fc28a4a158..e1f0240124bf7777b755f5a39cbb32e354dabd50 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -@@ -1173,7 +1173,7 @@ bool CDVDInputStreamBluray::ProcessItem(int playitem) - - m_title = m_dll->bd_get_playlist_info(m_bd, playitem, m_angle); - -- if (CSettings::GetInstance().GetBool("videoplayer.supportmvc") && !m_bMVCDisabled) -+ if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC) && !m_bMVCDisabled) - { - MPLS_PL * mpls = m_dll->bd_get_title_mpls(m_bd); - if (mpls) -diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp -index 6b1f2b6d757354d6065c2862b44dfb47184a1dcc..9163ec85bd0feb48a698a025d9870bf40042c675 100644 ---- a/xbmc/settings/SettingConditions.cpp -+++ b/xbmc/settings/SettingConditions.cpp -@@ -327,6 +327,9 @@ void CSettingConditions::Initialize() - m_simpleConditions.insert("has_dx"); - m_simpleConditions.insert("hasdxva2"); - #endif -+#if defined(HAVE_LIBMFX) || defined(TARGET_RASPBERRY_PI) -+ m_simpleConditions.insert("has_mvc"); -+#endif - #ifdef HAVE_LCMS2 - m_simpleConditions.insert("have_lcms2"); - #endif - -From c4f4531295ce1126d888414ee2116fac7f3ebf39 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Fri, 4 Nov 2016 22:56:56 +0300 -Subject: [PATCH 47/61] [VideoPlayer] SSIF: fix for corner case when mvc stream - is switched before the last packet is read from previous stream. - ---- - .../VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 5 ++- - .../VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp | 7 ++-- - .../VideoPlayer/DVDInputStreams/DVDInputStream.h | 1 + - .../DVDInputStreams/DVDInputStreamBluray.cpp | 39 +++++++++++++++++++--- - .../DVDInputStreams/DVDInputStreamBluray.h | 3 ++ - 5 files changed, 45 insertions(+), 10 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 99ad8f34770b175b0ac9d92c75d7b409d51b5fec..179a287d1cec04686b30fdee1ef8f1770b0f9f8d 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1121,9 +1121,6 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) - m_pkt.result = -1; - av_packet_unref(&m_pkt.pkt); - -- if (m_pSSIF) -- m_pSSIF->Flush(); -- - CDVDInputStream::IPosTime* ist = m_pInput->GetIPosTime(); - if (ist) - { -@@ -1137,6 +1134,8 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) - - return true; - } -+ else if (m_pSSIF) -+ m_pSSIF->Flush(); - - if (!m_pInput->Seek(0, SEEK_POSSIBLE) && - !m_pInput->IsStreamType(DVDSTREAM_TYPE_FFMPEG)) -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -index 7c8719ce40e725e27b7551250398022a1f1a4fc6..c675e31f731bc6afb8aabc37bbb5495aed45f4f6 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.cpp -@@ -183,12 +183,15 @@ bool CDemuxStreamSSIF::FillMVCQueue(double dtsBase) - else if (mvc->dts < dtsBase) - { - #if defined(DEBUG_VERBOSE) -- CLog::Log(LOGDEBUG, ">>> MVC discard mvc: %6d, pts(%.3f) dts(%.3f)", mvc->iSize, mvc->pts*1e-6, mvc->dts*1e-6); -+ CLog::Log(LOGDEBUG, ">>> MVC drop mvc: %6d, pts(%.3f) dts(%.3f)", mvc->iSize, mvc->pts*1e-6, mvc->dts*1e-6); - #endif - CDVDDemuxUtils::FreeDemuxPacket(mvc); - continue; - } - AddMVCExtPacket(mvc); - }; -- return m_MVCqueue.size() == MVC_QUEUE_SIZE; -+ if (m_MVCqueue.size() != MVC_QUEUE_SIZE) -+ m_bluRay->OpenNextStream(); -+ -+ return true; - } -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -index 8e94436051e7b04ec11560057ecd64c5d08a7bcd..1637be9496814b6129c349ffeccd7450a8a62aca 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h -@@ -140,6 +140,7 @@ public: - virtual bool AreEyesFlipped() = 0; - virtual CDVDDemux* GetExtentionDemux() = 0; - virtual void DisableExtention() = 0; -+ virtual bool OpenNextStream() = 0; - }; - - enum ENextStream -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -index e1f0240124bf7777b755f5a39cbb32e354dabd50..aaba0e70c3ac2bf2f93046be5139b15ab3e613c0 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp -@@ -49,6 +49,7 @@ - #endif - - #define LIBBLURAY_BYTESEEK 0 -+#define EMPTY_QUEUE(x) { while(!x.empty()) x.pop(); } - - using namespace XFILE; - -@@ -433,6 +434,8 @@ bool CDVDInputStreamBluray::Open() - while (m_dll->bd_get_event(m_bd, &m_event)) - ProcessEvent(); - -+ OpenNextStream(); -+ - return true; - } - -@@ -611,10 +614,14 @@ void CDVDInputStreamBluray::ProcessEvent() { - /* event has been consumed */ - m_event.event = BD_EVENT_NONE; - -- if (m_bMVCPlayback && m_clip >= 0 && m_title && m_clip < m_title->clip_count && m_nMVCClip != m_clip) -+ if ( m_bMVCPlayback && m_clip >= 0 -+ && m_title -+ && m_clip < m_title->clip_count -+ && m_nMVCClip != m_clip -+ && (m_clipQueue.empty() -+ || m_clip != m_clipQueue.front())) - { -- CloseMVCDemux(); -- OpenMVCDemux(m_clip); -+ m_clipQueue.push(m_clip); - } - } - -@@ -936,10 +943,15 @@ bool CDVDInputStreamBluray::PosTime(int ms) - if(m_dll->bd_seek_time(m_bd, ms * 90) < 0) - return false; - -+ EMPTY_QUEUE(m_clipQueue); - while (m_dll->bd_get_event(m_bd, &m_event)) - ProcessEvent(); - -- SeekMVCDemux(ms - m_clipStartTime); -+ if (m_bMVCPlayback) -+ { -+ OpenNextStream(); -+ SeekMVCDemux(ms - m_clipStartTime); -+ } - return true; - } - -@@ -964,10 +976,15 @@ bool CDVDInputStreamBluray::SeekChapter(int ch) - if(m_title && m_dll->bd_seek_chapter(m_bd, ch-1) < 0) - return false; - -+ EMPTY_QUEUE(m_clipQueue); - while (m_dll->bd_get_event(m_bd, &m_event)) - ProcessEvent(); - -- SeekMVCDemux(GetChapterPos(ch) * 1000 - m_clipStartTime); -+ if (m_bMVCPlayback) -+ { -+ OpenNextStream(); -+ SeekMVCDemux(GetChapterPos(ch) * 1000 - m_clipStartTime); -+ } - return true; - } - -@@ -1197,6 +1214,18 @@ bool CDVDInputStreamBluray::ProcessItem(int playitem) - return true; - } - -+bool CDVDInputStreamBluray::OpenNextStream() -+{ -+ if (m_clipQueue.empty()) -+ return false; -+ -+ int clip = m_clipQueue.front(); -+ m_clipQueue.pop(); -+ -+ CloseMVCDemux(); -+ return OpenMVCDemux(clip); -+} -+ - bool CDVDInputStreamBluray::OpenMVCDemux(int playItem) - { - MPLS_PL *pl = m_dll->bd_get_title_mpls(m_bd); -diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -index f70657c9e31fb2460d12910c635dba5163282e74..a11ec77903d2a9b2c68106a8e2301af93823b0bd 100644 ---- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h -@@ -23,6 +23,7 @@ - #include "DVDInputStream.h" - #include - #include -+#include - - extern "C" - { -@@ -125,6 +126,7 @@ public: - bool HasExtention() override { return m_bMVCPlayback; } - bool AreEyesFlipped() override { return m_bFlipEyes; } - void DisableExtention() override; -+ bool OpenNextStream() override; - - protected: - struct SPlane; -@@ -161,6 +163,7 @@ protected: - bool m_bFlipEyes = false; - bool m_bMVCDisabled = false; - uint64_t m_clipStartTime = 0; -+ std::queue m_clipQueue; - - typedef std::shared_ptr SOverlay; - typedef std::list SOverlays; - -From 21d1d00d630a9c9d02766a48ded2546d14e18d6b Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Tue, 23 Feb 2016 16:01:08 +0300 -Subject: [PATCH 48/61] [libbluray] bump libbluray to 0.9.2-mvc. - ---- - project/BuildDependencies/scripts/0_package.list | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list -index 3f7112408c343b9da967e340ba069c447e91809f..3be6ce2f8362e3f5eb834971936827911abdbebe 100644 ---- a/project/BuildDependencies/scripts/0_package.list -+++ b/project/BuildDependencies/scripts/0_package.list -@@ -17,7 +17,7 @@ freetype-2.6.3-win32-vc140.7z - giflib-5.1.4-win32-vc140.7z - jsonschemabuilder-1.0.0-win32-3.7z - libass-542975a-win32-vc140.7z --libbluray-0.9.3-win32-vc140.7z -+libbluray-0.9.2-mvc-win32-vc120.7z - libcdio-0.9.3-win32-vc140.7z - libcec-4.0.1-win32-vc140-2.7z - libfribidi-0.19.2-win32.7z - -From 8addc2c513e6aa1ea6f50a6865dd00a79a776afa Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 29 Feb 2016 17:00:50 +0000 -Subject: [PATCH 49/61] libbluray: Bump to Nevcairie's v0.9.2 - -This includes 3D support ---- - tools/depends/target/libbluray/Makefile | 1 + - .../libbluray/bump_to_Nevcairie_v0.9.2.patch | 1629 ++++++++++++++++++++ - 2 files changed, 1630 insertions(+) - create mode 100644 tools/depends/target/libbluray/bump_to_Nevcairie_v0.9.2.patch - -diff --git a/tools/depends/target/libbluray/Makefile b/tools/depends/target/libbluray/Makefile -index 09d2a8e04ef4ef694f3d7a6152ab9be0e294ce2f..741a820df47fd8014192f6c0c546abb72d33ab1f 100644 ---- a/tools/depends/target/libbluray/Makefile -+++ b/tools/depends/target/libbluray/Makefile -@@ -24,6 +24,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - # libbluray has borked Makefile.am with respect to CFLAGS, remove the offending line - sed -i -e "s|CFLAGS=|#CFLAGS=|" $(PLATFORM)/Makefile.am -+ cd $(PLATFORM); patch -p1 < ../bump_to_Nevcairie_v0.9.2.patch - cd $(PLATFORM); ./bootstrap - cd $(PLATFORM); $(CONFIGURE) - -diff --git a/tools/depends/target/libbluray/bump_to_Nevcairie_v0.9.2.patch b/tools/depends/target/libbluray/bump_to_Nevcairie_v0.9.2.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220640fb84e ---- /dev/null -+++ b/tools/depends/target/libbluray/bump_to_Nevcairie_v0.9.2.patch -@@ -0,0 +1,1629 @@ -+diff --git a/Makefile.am b/Makefile.am -+index 3a54bfc..035553b 100644 -+--- a/Makefile.am -++++ b/Makefile.am -+@@ -161,6 +161,15 @@ noinst_HEADERS = \ -+ jni/win32/jni_md.h \ -+ jni/darwin/jni_md.h -+ -++ -++bdnavdir=$(pkgincludedir)/bdnav -++bdnav_HEADERS = \ -++ src/libbluray/bdnav/clpi_data.h -++ -++utildir=$(pkgincludedir)/../util -++util_HEADERS = \ -++ src/util/attributes.h -++ -+ pkginclude_HEADERS = \ -+ src/file/filesystem.h \ -+ src/libbluray/bluray.h \ -+@@ -168,6 +177,9 @@ pkginclude_HEADERS = \ -+ src/libbluray/keys.h \ -+ src/libbluray/player_settings.h \ -+ src/libbluray/bdnav/clpi_data.h \ -++ src/libbluray/bdnav/clpi_parse.h \ -++ src/libbluray/bdnav/mpls_parse.h \ -++ src/libbluray/bdnav/uo_mask_table.h \ -+ src/libbluray/bdnav/meta_data.h \ -+ src/libbluray/decoders/overlay.h \ -+ src/util/log_control.h -+diff --git a/config.h b/config.h -+new file mode 100644 -+index 0000000..6764704 -+--- /dev/null -++++ b/config.h -+@@ -0,0 +1,157 @@ -++/* config.h. Generated from config.h.in by configure. */ -++/* config.h.in. Generated from configure.ac by autoheader. */ -++ -++/* Define to 1 if libudfread is to be used for disc image access */ -++/* #undef ENABLE_UDF */ -++ -++/* Define to 1 if using libbluray J2ME stack */ -++/* #undef HAVE_BDJ_J2ME */ -++ -++/* Define to 1 if you have the header file, and it defines `DIR'. -++ */ -++/* #undef HAVE_DIRENT_H */ -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_DLFCN_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_ERRNO_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_FCNTL_H */ -++ -++/* Define this if you have fontconfig library */ -++/* #undef HAVE_FONTCONFIG */ -++ -++/* Define this if you have FreeType2 library */ -++/* #undef HAVE_FT2 */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_INTTYPES_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_JNI_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_LIBGEN_H 1 -++ -++/* Define to 1 if libxml2 is to be used for metadata parsing */ -++/* #undef HAVE_LIBXML2 */ -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_LINUX_CDROM_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_MALLOC_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_MEMORY_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_MNTENT_H */ -++ -++/* Define to 1 if you have the header file, and it defines `DIR'. */ -++/* #undef HAVE_NDIR_H */ -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_PTHREAD_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_STDARG_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_STDINT_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_STDLIB_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_STRINGS_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_STRING_H 1 -++ -++/* Define to 1 if `d_type' is a member of `struct dirent'. */ -++/* #undef HAVE_STRUCT_DIRENT_D_TYPE */ -++ -++/* Define to 1 if you have the header file, and it defines `DIR'. -++ */ -++/* #undef HAVE_SYS_DIR_H */ -++ -++/* Define to 1 if you have the header file, and it defines `DIR'. -++ */ -++/* #undef HAVE_SYS_NDIR_H */ -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_SYS_STAT_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_SYS_TIME_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_SYS_TYPES_H 1 -++ -++/* Define to 1 if you have the header file. */ -++#define HAVE_TIME_H 1 -++ -++/* Define to 1 if you have the header file. */ -++/* #undef HAVE_UNISTD_H */ -++ -++/* "Defines the architecture of the java vm." */ -++/* #undef JAVA_ARCH */ -++ -++/* "" */ -++/* #undef JDK_HOME */ -++ -++/* Define to the sub-directory where libtool stores uninstalled libraries. */ -++#define LT_OBJDIR ".libs/" -++ -++/* Name of package */ -++#define PACKAGE "libbluray" -++ -++/* Define to the address where bug reports for this package should be sent. */ -++#define PACKAGE_BUGREPORT "http://www.videolan.org/developers/libbluray.html" -++ -++/* Define to the full name of this package. */ -++#define PACKAGE_NAME "libbluray" -++ -++/* Define to the full name and version of this package. */ -++#define PACKAGE_STRING "libbluray 0.9.2" -++ -++/* Define to the one symbol short name of this package. */ -++#define PACKAGE_TARNAME "libbluray" -++ -++/* Define to the home page for this package. */ -++#define PACKAGE_URL "" -++ -++/* Define to the version of this package. */ -++#define PACKAGE_VERSION "0.9.2" -++ -++/* Define as the return type of signal handlers (`int' or `void'). */ -++#define RETSIGTYPE void -++ -++/* Define to 1 if you have the ANSI C header files. */ -++#define STDC_HEADERS 1 -++ -++/* "Define to 1 if using BD-Java" */ -++/* #undef USING_BDJAVA */ -++ -++/* Version number of package */ -++#define VERSION "0.9.2" -++ -++/* Enable large inode numbers on Mac OS X 10.5. */ -++#ifndef _DARWIN_USE_64_BIT_INODE -++# define _DARWIN_USE_64_BIT_INODE 1 -++#endif -++ -++/* Number of bits in a file offset, on hosts where this is settable. */ -++#define _FILE_OFFSET_BITS 64 -++ -++/* Define for large files, on AIX-style hosts. */ -++/* #undef _LARGE_FILES */ -++ -++/* Define to '0x0501' for IE 5.01. */ -++#define _WIN32_IE 0x0501 -++ -++/* Define to '0x0502' for Windows XP SP2 APIs. */ -++#define _WIN32_WINNT 0x0502 -+diff --git a/includes/inttypes.h b/includes/inttypes.h -+new file mode 100644 -+index 0000000..ead903f -+--- /dev/null -++++ b/includes/inttypes.h -+@@ -0,0 +1,305 @@ -++// ISO C9x compliant inttypes.h for Microsoft Visual Studio -++// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -++// -++// Copyright (c) 2006 Alexander Chemeris -++// -++// Redistribution and use in source and binary forms, with or without -++// modification, are permitted provided that the following conditions are met: -++// -++// 1. Redistributions of source code must retain the above copyright notice, -++// this list of conditions and the following disclaimer. -++// -++// 2. Redistributions in binary form must reproduce the above copyright -++// notice, this list of conditions and the following disclaimer in the -++// documentation and/or other materials provided with the distribution. -++// -++// 3. The name of the author may be used to endorse or promote products -++// derived from this software without specific prior written permission. -++// -++// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -++// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -++// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -++// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -++// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -++// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -++// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -++// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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 _MSC_VER // [ -++#error "Use this header only with Microsoft Visual C++ compilers!" -++#endif // _MSC_VER ] -++ -++#ifndef _MSC_INTTYPES_H_ // [ -++#define _MSC_INTTYPES_H_ -++ -++#if _MSC_VER > 1000 -++#pragma once -++#endif -++ -++#include "stdint.h" -++ -++// 7.8 Format conversion of integer types -++ -++typedef struct { -++ intmax_t quot; -++ intmax_t rem; -++} imaxdiv_t; -++ -++// 7.8.1 Macros for format specifiers -++ -++#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198 -++ -++// The fprintf macros for signed integers are: -++#define PRId8 "d" -++#define PRIi8 "i" -++#define PRIdLEAST8 "d" -++#define PRIiLEAST8 "i" -++#define PRIdFAST8 "d" -++#define PRIiFAST8 "i" -++ -++#define PRId16 "hd" -++#define PRIi16 "hi" -++#define PRIdLEAST16 "hd" -++#define PRIiLEAST16 "hi" -++#define PRIdFAST16 "hd" -++#define PRIiFAST16 "hi" -++ -++#define PRId32 "I32d" -++#define PRIi32 "I32i" -++#define PRIdLEAST32 "I32d" -++#define PRIiLEAST32 "I32i" -++#define PRIdFAST32 "I32d" -++#define PRIiFAST32 "I32i" -++ -++#define PRId64 "I64d" -++#define PRIi64 "I64i" -++#define PRIdLEAST64 "I64d" -++#define PRIiLEAST64 "I64i" -++#define PRIdFAST64 "I64d" -++#define PRIiFAST64 "I64i" -++ -++#define PRIdMAX "I64d" -++#define PRIiMAX "I64i" -++ -++#define PRIdPTR "Id" -++#define PRIiPTR "Ii" -++ -++// The fprintf macros for unsigned integers are: -++#define PRIo8 "o" -++#define PRIu8 "u" -++#define PRIx8 "x" -++#define PRIX8 "X" -++#define PRIoLEAST8 "o" -++#define PRIuLEAST8 "u" -++#define PRIxLEAST8 "x" -++#define PRIXLEAST8 "X" -++#define PRIoFAST8 "o" -++#define PRIuFAST8 "u" -++#define PRIxFAST8 "x" -++#define PRIXFAST8 "X" -++ -++#define PRIo16 "ho" -++#define PRIu16 "hu" -++#define PRIx16 "hx" -++#define PRIX16 "hX" -++#define PRIoLEAST16 "ho" -++#define PRIuLEAST16 "hu" -++#define PRIxLEAST16 "hx" -++#define PRIXLEAST16 "hX" -++#define PRIoFAST16 "ho" -++#define PRIuFAST16 "hu" -++#define PRIxFAST16 "hx" -++#define PRIXFAST16 "hX" -++ -++#define PRIo32 "I32o" -++#define PRIu32 "I32u" -++#define PRIx32 "I32x" -++#define PRIX32 "I32X" -++#define PRIoLEAST32 "I32o" -++#define PRIuLEAST32 "I32u" -++#define PRIxLEAST32 "I32x" -++#define PRIXLEAST32 "I32X" -++#define PRIoFAST32 "I32o" -++#define PRIuFAST32 "I32u" -++#define PRIxFAST32 "I32x" -++#define PRIXFAST32 "I32X" -++ -++#define PRIo64 "I64o" -++#define PRIu64 "I64u" -++#define PRIx64 "I64x" -++#define PRIX64 "I64X" -++#define PRIoLEAST64 "I64o" -++#define PRIuLEAST64 "I64u" -++#define PRIxLEAST64 "I64x" -++#define PRIXLEAST64 "I64X" -++#define PRIoFAST64 "I64o" -++#define PRIuFAST64 "I64u" -++#define PRIxFAST64 "I64x" -++#define PRIXFAST64 "I64X" -++ -++#define PRIoMAX "I64o" -++#define PRIuMAX "I64u" -++#define PRIxMAX "I64x" -++#define PRIXMAX "I64X" -++ -++#define PRIoPTR "Io" -++#define PRIuPTR "Iu" -++#define PRIxPTR "Ix" -++#define PRIXPTR "IX" -++ -++// The fscanf macros for signed integers are: -++#define SCNd8 "d" -++#define SCNi8 "i" -++#define SCNdLEAST8 "d" -++#define SCNiLEAST8 "i" -++#define SCNdFAST8 "d" -++#define SCNiFAST8 "i" -++ -++#define SCNd16 "hd" -++#define SCNi16 "hi" -++#define SCNdLEAST16 "hd" -++#define SCNiLEAST16 "hi" -++#define SCNdFAST16 "hd" -++#define SCNiFAST16 "hi" -++ -++#define SCNd32 "ld" -++#define SCNi32 "li" -++#define SCNdLEAST32 "ld" -++#define SCNiLEAST32 "li" -++#define SCNdFAST32 "ld" -++#define SCNiFAST32 "li" -++ -++#define SCNd64 "I64d" -++#define SCNi64 "I64i" -++#define SCNdLEAST64 "I64d" -++#define SCNiLEAST64 "I64i" -++#define SCNdFAST64 "I64d" -++#define SCNiFAST64 "I64i" -++ -++#define SCNdMAX "I64d" -++#define SCNiMAX "I64i" -++ -++#ifdef _WIN64 // [ -++# define SCNdPTR "I64d" -++# define SCNiPTR "I64i" -++#else // _WIN64 ][ -++# define SCNdPTR "ld" -++# define SCNiPTR "li" -++#endif // _WIN64 ] -++ -++// The fscanf macros for unsigned integers are: -++#define SCNo8 "o" -++#define SCNu8 "u" -++#define SCNx8 "x" -++#define SCNX8 "X" -++#define SCNoLEAST8 "o" -++#define SCNuLEAST8 "u" -++#define SCNxLEAST8 "x" -++#define SCNXLEAST8 "X" -++#define SCNoFAST8 "o" -++#define SCNuFAST8 "u" -++#define SCNxFAST8 "x" -++#define SCNXFAST8 "X" -++ -++#define SCNo16 "ho" -++#define SCNu16 "hu" -++#define SCNx16 "hx" -++#define SCNX16 "hX" -++#define SCNoLEAST16 "ho" -++#define SCNuLEAST16 "hu" -++#define SCNxLEAST16 "hx" -++#define SCNXLEAST16 "hX" -++#define SCNoFAST16 "ho" -++#define SCNuFAST16 "hu" -++#define SCNxFAST16 "hx" -++#define SCNXFAST16 "hX" -++ -++#define SCNo32 "lo" -++#define SCNu32 "lu" -++#define SCNx32 "lx" -++#define SCNX32 "lX" -++#define SCNoLEAST32 "lo" -++#define SCNuLEAST32 "lu" -++#define SCNxLEAST32 "lx" -++#define SCNXLEAST32 "lX" -++#define SCNoFAST32 "lo" -++#define SCNuFAST32 "lu" -++#define SCNxFAST32 "lx" -++#define SCNXFAST32 "lX" -++ -++#define SCNo64 "I64o" -++#define SCNu64 "I64u" -++#define SCNx64 "I64x" -++#define SCNX64 "I64X" -++#define SCNoLEAST64 "I64o" -++#define SCNuLEAST64 "I64u" -++#define SCNxLEAST64 "I64x" -++#define SCNXLEAST64 "I64X" -++#define SCNoFAST64 "I64o" -++#define SCNuFAST64 "I64u" -++#define SCNxFAST64 "I64x" -++#define SCNXFAST64 "I64X" -++ -++#define SCNoMAX "I64o" -++#define SCNuMAX "I64u" -++#define SCNxMAX "I64x" -++#define SCNXMAX "I64X" -++ -++#ifdef _WIN64 // [ -++# define SCNoPTR "I64o" -++# define SCNuPTR "I64u" -++# define SCNxPTR "I64x" -++# define SCNXPTR "I64X" -++#else // _WIN64 ][ -++# define SCNoPTR "lo" -++# define SCNuPTR "lu" -++# define SCNxPTR "lx" -++# define SCNXPTR "lX" -++#endif // _WIN64 ] -++ -++#endif // __STDC_FORMAT_MACROS ] -++ -++// 7.8.2 Functions for greatest-width integer types -++ -++// 7.8.2.1 The imaxabs function -++#define imaxabs _abs64 -++ -++// 7.8.2.2 The imaxdiv function -++ -++// This is modified version of div() function from Microsoft's div.c found -++// in %MSVC.NET%\crt\src\div.c -++#ifdef STATIC_IMAXDIV // [ -++static -++#else // STATIC_IMAXDIV ][ -++_inline -++#endif // STATIC_IMAXDIV ] -++imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) -++{ -++ imaxdiv_t result; -++ -++ result.quot = numer / denom; -++ result.rem = numer % denom; -++ -++ if (numer < 0 && result.rem > 0) { -++ // did division wrong; must fix up -++ ++result.quot; -++ result.rem -= denom; -++ } -++ -++ return result; -++} -++ -++// 7.8.2.3 The strtoimax and strtoumax functions -++#define strtoimax _strtoi64 -++#define strtoumax _strtoui64 -++ -++// 7.8.2.4 The wcstoimax and wcstoumax functions -++#define wcstoimax _wcstoi64 -++#define wcstoumax _wcstoui64 -++ -++ -++#endif // _MSC_INTTYPES_H_ ] -+diff --git a/libbluray.def b/libbluray.def -+new file mode 100644 -+index 0000000..d4c93cb -+--- /dev/null -++++ b/libbluray.def -+@@ -0,0 +1,63 @@ -++; libbluray.def ; declares the exports -++ -++LIBRARY "libbluray.dll" -++ -++EXPORTS -++ ; bluray.h -++ bd_get_version -++ bd_get_titles -++ bd_get_title_info -++ bd_get_playlist_info -++ bd_free_title_info -++ bd_open -++ bd_close -++ bd_seek -++ bd_seek_time -++ bd_find_seek_point -++ bd_read -++ bd_read_skip_still -++ bd_seek_chapter -++ bd_chapter_pos -++ bd_get_current_chapter -++ bd_seek_mark -++ bd_seek_playitem -++ bd_select_playlist -++ bd_select_title -++ bd_select_angle -++ bd_seamless_angle_change -++ bd_get_title_size -++ bd_get_current_title -++ bd_get_current_angle -++ bd_tell -++ bd_tell_time -++ bd_get_disc_info -++ bd_set_player_setting -++ bd_set_player_setting_str -++ bd_start_bdj -++ bd_stop_bdj -++ bd_get_event -++ bd_play -++ bd_read_ext -++ bd_play_title -++ bd_menu_call -++ bd_register_overlay_proc -++ bd_register_argb_overlay_proc -++ bd_set_scr -++ bd_user_input -++ bd_mouse_select -++ bd_get_sound_effect -++ bd_get_meta -++ bd_get_clpi -++ bd_read_clpi -++ bd_free_clpi -++ bd_read_mpls -++ bd_free_mpls -++ bd_read_mobj -++ bd_free_mobj -++ bd_get_clip_infos -++ bd_get_title_mpls -++ -++ ; additional functions -++ bd_set_debug_handler -++ bd_set_debug_mask -++ bd_get_debug_mask -+diff --git a/libbluray.vcxproj b/libbluray.vcxproj -+new file mode 100644 -+index 0000000..c778955 -+--- /dev/null -++++ b/libbluray.vcxproj -+@@ -0,0 +1,231 @@ -++ -++ -++ -++ -++ DebugRelease -++ Win32 -++ -++ -++ DebugRelease -++ x64 -++ -++ -++ Debug -++ Win32 -++ -++ -++ Debug -++ x64 -++ -++ -++ Release -++ Win32 -++ -++ -++ Release -++ x64 -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ {E1DA1B95-71F1-4C21-A271-121176925062} -++ Win32Proj -++ libbluray -++ -++ -++ -++ v110_xp -++ -++ -++ v120_xp -++ -++ -++ v140_xp -++ -++ -++ DynamicLibrary -++ true -++ Unicode -++ -++ -++ DynamicLibrary -++ false -++ true -++ Unicode -++ -++ -++ -++ -++ -++ -++ -++ -++ -++ true -++ $(SolutionDir)bin_$(PlatformName)d\ -++ $(SolutionDir)bin_$(PlatformName)d\$(ProjectName)\ -++ -++ -++ false -++ $(SolutionDir)bin_$(PlatformName)\$(ProjectName)\ -++ $(SolutionDir)bin_$(PlatformName)\$(ProjectName)\ -++ -++ -++ -++ -++ -++ Level3 -++ Disabled -++ HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBBLURAY_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) -++ __STDC_FORMAT_MACROS;%(PreprocessorDefinitions) -++ $(ProjectDir);$(ProjectDir)includes;$(ProjectDir)src;$(ProjectDir)src\libbluray;%(AdditionalIncludeDirectories) -++ MultiThreadedDebugDLL -++ CompileAsCpp -++ -++ -++ Windows -++ true -++ libbluray.def -++ -++ -++ xcopy /I /Y "$(OutDir)$(TargetName).lib" "$(OutDir)lib\" -++ Copy .lib into library path -++ -++ -++ -++ -++ MultiThreadedDebug -++ -++ -++ -++ -++ Level3 -++ MaxSpeed -++ true -++ true -++ HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBBLURAY_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) -++ __STDC_FORMAT_MACROS;%(PreprocessorDefinitions) -++ $(ProjectDir);$(ProjectDir)includes;$(ProjectDir)src;$(ProjectDir)src\libbluray;%(AdditionalIncludeDirectories) -++ MultiThreaded -++ StreamingSIMDExtensions -++ CompileAsCpp -++ -++ -++ Windows -++ true -++ true -++ true -++ libbluray.def -++ true -++ -++ -++ xcopy /I /Y "$(TargetDir)$(TargetName)$(TargetExt)" "$(OutDir)..\" -++xcopy /I /Y "$(TargetDir)$(TargetName).lib" "$(OutDir)..\lib\" -++ Copy .dll/.lib into library path -++ -++ -++ -++ -++ -++ -+\ No newline at end of file -+diff --git a/libbluray.vcxproj.filters b/libbluray.vcxproj.filters -+new file mode 100644 -+index 0000000..57ff16c -+--- /dev/null -++++ b/libbluray.vcxproj.filters -+@@ -0,0 +1,353 @@ -++ -++ -++ -++ -++ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} -++ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx -++ -++ -++ {93995380-89BD-4b04-88EB-625FBE52EBFB} -++ h;hpp;hxx;hm;inl;inc;xsd -++ -++ -++ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} -++ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms -++ -++ -++ {1ab0e905-7c04-4090-b385-6363dd1c961c} -++ -++ -++ {b8fa3348-a089-461f-9ef5-3d9df997b8e5} -++ -++ -++ {125333e9-0b5e-45f9-a444-f0aaaf547d9b} -++ -++ -++ {a743058f-f07a-4d0f-bab6-02dc57defda9} -++ -++ -++ {7dacc7c4-ef59-452b-9e5b-392c9df07c98} -++ -++ -++ {c7895c81-c186-4d5e-a8ff-645c6d55a731} -++ -++ -++ {c8619466-211b-4c85-9d30-d1b1a822d32e} -++ -++ -++ {8afb6919-994f-4d1f-9638-ce4a06d0b473} -++ -++ -++ {0e9086a7-eebf-4b8e-a4fe-b1724d148877} -++ -++ -++ {fc5e776b-0f32-493a-b823-240288288502} -++ -++ -++ {96d2d786-cd45-4856-937d-9e6f85ced241} -++ -++ -++ {9f4ea4ae-217a-4d97-a5f3-e561ce1e49cd} -++ -++ -++ {09e1b1b8-3aa3-4918-b157-3dfc0554ccbb} -++ -++ -++ {1e02e503-752e-4765-9dfb-8cc67a7b79f8} -++ -++ -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\file -++ -++ -++ Header Files\file -++ -++ -++ Header Files\file -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\hdmv -++ -++ -++ Header Files\libbluray\hdmv -++ -++ -++ Header Files\libbluray\hdmv -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\bdnav -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\util -++ -++ -++ Header Files\util -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\libbluray\decoders -++ -++ -++ Header Files\file -++ -++ -++ Header Files\libbluray -++ -++ -++ Header Files\util -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\libbluray\disc -++ -++ -++ Header Files\file -++ -++ -++ -++ -++ Source Files\util -++ -++ -++ Source Files\util -++ -++ -++ Source Files\file -++ -++ -++ Source Files\libbluray -++ -++ -++ Source Files\libbluray -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\hdmv -++ -++ -++ Source Files\libbluray\hdmv -++ -++ -++ Source Files\libbluray\hdmv -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\libbluray\bdnav -++ -++ -++ Source Files\util -++ -++ -++ Source Files\file -++ -++ -++ Source Files\file -++ -++ -++ Source Files\file -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\util -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\libbluray\decoders -++ -++ -++ Source Files\file -++ -++ -++ Source Files\file -++ -++ -++ Source Files\util -++ -++ -++ Source Files\util -++ -++ -++ Source Files\libbluray\disc -++ -++ -++ Source Files\libbluray\disc -++ -++ -++ Source Files\libbluray\disc -++ -++ -++ Source Files\libbluray\disc -++ -++ -++ Source Files\util -++ -++ -++ Source Files\file -++ -++ -++ -++ -++ Source Files -++ -++ -++ -+\ No newline at end of file -+diff --git a/src/file/dir_win32.c b/src/file/dir_win32.c -+index 2690658..f42114d 100644 -+--- a/src/file/dir_win32.c -++++ b/src/file/dir_win32.c -+@@ -86,8 +86,8 @@ static BD_DIR_H *_dir_open_win32(const char* dirname) -+ -+ dir->internal = priv; -+ -+- wchar_t wfilespec[MAX_PATH]; -+- if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, MAX_PATH)) -++ wchar_t wfilespec[4096 + 1] = {0}; -++ if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, 4096)) -+ priv->handle = _wfindfirst(wfilespec, &priv->info); -+ else -+ priv->handle = -1; -+diff --git a/src/file/dirs_win32.c b/src/file/dirs_win32.c -+index e165fea..3d07251 100644 -+--- a/src/file/dirs_win32.c -++++ b/src/file/dirs_win32.c -+@@ -36,7 +36,7 @@ -+ -+ char *win32_get_font_dir(const char *font_file) -+ { -+- wchar_t wdir[MAX_PATH]; -++ wchar_t wdir[MAX_PATH+1] = {0}; -+ if (S_OK != SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT, wdir)) { -+ int lenght = GetWindowsDirectoryW(wdir, MAX_PATH); -+ if (lenght == 0 || lenght > (MAX_PATH - 8)) { -+@@ -67,7 +67,7 @@ char *file_get_config_home(void) -+ -+ char *file_get_data_home(void) -+ { -+- wchar_t wdir[MAX_PATH]; -++ wchar_t wdir[MAX_PATH+1] = {0}; -+ -+ /* Get the "Application Data" folder for the user */ -+ if (S_OK == SHGetFolderPathW(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, -+@@ -92,7 +92,7 @@ char *file_get_cache_home(void) -+ const char *file_get_config_system(const char *dir) -+ { -+ static char *appdir = NULL; -+- wchar_t wdir[MAX_PATH]; -++ wchar_t wdir[MAX_PATH+1] = {0}; -+ -+ if (!dir) { -+ // first call -+diff --git a/src/file/dl_win32.c b/src/file/dl_win32.c -+index e4492e1..7f6ae73 100644 -+--- a/src/file/dl_win32.c -++++ b/src/file/dl_win32.c -+@@ -57,7 +57,7 @@ void *dl_dlopen(const char *path, const char *version) -+ { -+ (void)version; -+ -+- wchar_t wname[MAX_PATH]; -++ wchar_t wname[MAX_PATH+1] = {0}; -+ char *name; -+ void *result; -+ -+@@ -109,7 +109,7 @@ const char *dl_get_path(void) -+ if (!initialized) { -+ initialized = 1; -+ -+- static char path[MAX_PATH]; -++ static char path[MAX_PATH + 1]; -+ HMODULE hModule; -+ wchar_t wpath[MAX_PATH]; -+ -+diff --git a/src/file/file_win32.c b/src/file/file_win32.c -+index d9845fb..b4fb7ad 100644 -+--- a/src/file/file_win32.c -++++ b/src/file/file_win32.c -+@@ -107,9 +107,9 @@ static BD_FILE_H *_file_open(const char* filename, const char *mode) -+ { -+ BD_FILE_H *file; -+ FILE *fp; -+- wchar_t wfilename[MAX_PATH], wmode[8]; -++ wchar_t wfilename[4096 + 1] = {0}, wmode[8] = {0}; -+ -+- if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, wfilename, MAX_PATH) || -++ if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, wfilename, 4096) || -+ !MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mode, -1, wmode, 8)) { -+ -+ BD_DEBUG(DBG_FILE, "Error opening file %s\n", filename); -+@@ -122,6 +122,9 @@ static BD_FILE_H *_file_open(const char* filename, const char *mode) -+ return NULL; -+ } -+ -++ // Set file buffer -++ setvbuf(fp, NULL, _IOFBF, 6144 * 10); -++ -+ file = calloc(1, sizeof(BD_FILE_H)); -+ if (!file) { -+ BD_DEBUG(DBG_FILE | DBG_CRIT, "Error opening file %s (out of memory)\n", filename); -+diff --git a/src/libbluray/bdnav/clpi_parse.c b/src/libbluray/bdnav/clpi_parse.c -+index 394347e..39bbcef 100644 -+--- a/src/libbluray/bdnav/clpi_parse.c -++++ b/src/libbluray/bdnav/clpi_parse.c -+@@ -39,6 +39,7 @@ -+ #define CLPI_SIG1 ('H' << 24 | 'D' << 16 | 'M' << 8 | 'V') -+ #define CLPI_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0') -+ #define CLPI_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0') -++#define CLPI_SIG2C ('0' << 24 | '2' << 16 | '4' << 8 | '0') -+ -+ static void -+ _human_readable_sig(char *sig, uint32_t s1, uint32_t s2) -+@@ -129,7 +130,8 @@ _parse_header(BITSTREAM *bits, CLPI_CL *cl) -+ cl->type_indicator2 = bs_read(bits, 32); -+ if (cl->type_indicator != CLPI_SIG1 || -+ (cl->type_indicator2 != CLPI_SIG2A && -+- cl->type_indicator2 != CLPI_SIG2B)) { -++ cl->type_indicator2 != CLPI_SIG2B && -++ cl->type_indicator2 != CLPI_SIG2C)) { -+ -+ char sig[9]; -+ char expect[9]; -+diff --git a/src/libbluray/bdnav/mpls_parse.c b/src/libbluray/bdnav/mpls_parse.c -+index e196118..87b240a 100644 -+--- a/src/libbluray/bdnav/mpls_parse.c -++++ b/src/libbluray/bdnav/mpls_parse.c -+@@ -39,6 +39,7 @@ -+ #define MPLS_SIG1 ('M' << 24 | 'P' << 16 | 'L' << 8 | 'S') -+ #define MPLS_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0') -+ #define MPLS_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0') -++#define MPLS_SIG2C ('0' << 24 | '2' << 16 | '4' << 8 | '0') -+ -+ static void -+ _human_readable_sig(char *sig, uint32_t s1, uint32_t s2) -+@@ -137,8 +138,9 @@ _parse_appinfo(BITSTREAM *bits, MPLS_AI *ai) -+ ai->random_access_flag = bs_read(bits, 1); -+ ai->audio_mix_flag = bs_read(bits, 1); -+ ai->lossless_bypass_flag = bs_read(bits, 1); -++ ai->mvc_base_view_r_flag = bs_read(bits, 1); -+ // Reserved -+- bs_skip(bits, 13); -++ bs_skip(bits, 12); -+ bs_seek_byte(bits, pos + len); -+ return 1; -+ } -+@@ -155,7 +157,8 @@ _parse_header(BITSTREAM *bits, MPLS_PL *pl) -+ pl->type_indicator2 = bs_read(bits, 32); -+ if (pl->type_indicator != MPLS_SIG1 || -+ (pl->type_indicator2 != MPLS_SIG2A && -+- pl->type_indicator2 != MPLS_SIG2B)) { -++ pl->type_indicator2 != MPLS_SIG2B && -++ pl->type_indicator2 != MPLS_SIG2C)) { -+ -+ char sig[9]; -+ char expect[9]; -+@@ -259,6 +262,7 @@ _parse_stream(BITSTREAM *bits, MPLS_STREAM *s) -+ break; -+ }; -+ s->lang[3] = '\0'; -++ s->ss_offset_sequence_id = 0xFF; -+ -+ bs_seek_byte(bits, pos + len); -+ return 1; -+@@ -882,6 +886,99 @@ _parse_subpath_extension(BITSTREAM *bits, MPLS_PL *pl) -+ } -+ -+ static int -++_parse_stn_ss_extension(BITSTREAM *bits, MPLS_PL *pl) -++{ -++ int ii, s; -++ int64_t pos; -++ -++ for (ii = 0; ii < pl->list_count; ii++) { -++ uint32_t len = bs_read(bits, 16); -++ pos = bs_pos(bits) >> 3; -++ int Fixed_offset_during_PopUp_flag = bs_read(bits, 1); -++ bs_skip(bits, 15); // reserved -++ -++ for (s = 0; s < pl->play_item[ii].stn.num_video; s++) { -++ // stream_entry -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ // stream_attributes_ss -++ slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 10); // reserved -++ bs_skip(bits, 6); // number_of_offset_sequences -++ } -++ -++ for (s = 0; s < pl->play_item[ii].stn.num_pg; s++) { -++ pl->play_item[ii].stn.pg[s].ss_offset_sequence_id = bs_read(bits, 8); -++ -++ bs_skip(bits, 4); // reserved -++ bs_skip(bits, 1); // dialog_region_offset_valid_flag -++ int is_SS_PG = bs_read(bits, 1); -++ int is_top_AS_PG_textST = bs_read(bits, 1); -++ int is_bottom_AS_PG_textST = bs_read(bits, 1); -++ if (is_SS_PG) { -++ // stream_entry left eye -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ // stream_entry right eye -++ slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 8); // reserved -++ bs_skip(bits, 8); // PG offset -++ } -++ if (is_top_AS_PG_textST) { -++ // stream_entry -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 8); // reserved -++ bs_skip(bits, 8); // PG offset -++ } -++ if (is_bottom_AS_PG_textST) { -++ // stream_entry -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 8); // reserved -++ bs_skip(bits, 8); // PG offset -++ } -++ } -++ -++ for (s = 0; s < pl->play_item[ii].stn.num_ig; s++) { -++ if (Fixed_offset_during_PopUp_flag) -++ bs_skip(bits, 8); -++ else -++ pl->play_item[ii].stn.ig[s].ss_offset_sequence_id = bs_read(bits, 8); -++ -++ bs_skip(bits, 16); // IG_Plane_offset_during_BB_video -++ bs_skip(bits, 7); // reserved -++ int is_SS_IG = bs_read(bits, 1); -++ if (is_SS_IG) { -++ // stream_entry left eye -++ uint32_t slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ // stream_entry right eye -++ slen = bs_read(bits, 8); -++ bs_skip(bits, slen * 8); -++ -++ bs_skip(bits, 8); // reserved -++ bs_skip(bits, 8); // PG offset -++ } -++ } -++ -++ // Skip to next play item -++ bs_seek_byte(bits, pos + len); -++ } -++ -++ return 0; -++} -++ -++static int -+ _parse_mpls_extension(BITSTREAM *bits, int id1, int id2, void *handle) -+ { -+ MPLS_PL *pl = (MPLS_PL*)handle; -+@@ -895,7 +992,7 @@ _parse_mpls_extension(BITSTREAM *bits, int id1, int id2, void *handle) -+ -+ if (id1 == 2) { -+ if (id2 == 1) { -+- return 0; -++ return _parse_stn_ss_extension(bits, pl); -+ } -+ if (id2 == 2) { -+ // SubPath entries extension -+diff --git a/src/libbluray/bdnav/mpls_parse.h b/src/libbluray/bdnav/mpls_parse.h -+index 94bfa67..c1b2c31 100644 -+--- a/src/libbluray/bdnav/mpls_parse.h -++++ b/src/libbluray/bdnav/mpls_parse.h -+@@ -49,6 +49,7 @@ typedef struct -+ uint8_t sv_num_pip_pg_ref; -+ uint8_t *sv_secondary_audio_ref; -+ uint8_t *sv_pip_pg_ref; -++ uint8_t ss_offset_sequence_id; -+ } MPLS_STREAM; -+ -+ typedef struct -+@@ -109,6 +110,7 @@ typedef struct -+ uint8_t random_access_flag; -+ uint8_t audio_mix_flag; -+ uint8_t lossless_bypass_flag; -++ uint8_t mvc_base_view_r_flag; -+ } MPLS_AI; -+ -+ typedef struct -+diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c -+index 0e60b68..f633d7a 100644 -+--- a/src/libbluray/bluray.c -++++ b/src/libbluray/bluray.c -+@@ -1626,6 +1626,25 @@ int64_t bd_seek_time(BLURAY *bd, uint64_t tick) -+ return bd->s_pos; -+ } -+ -++int64_t bd_find_seek_point(BLURAY *bd, uint64_t tick) -++{ -++ uint32_t clip_pkt, out_pkt; -++ NAV_CLIP *clip; -++ -++ tick /= 2; -++ -++ if (bd->title && -++ tick < bd->title->duration) { -++ -++ // Find the closest access unit to the requested position -++ clip = nav_time_search(bd->title, (uint32_t)tick, &clip_pkt, &out_pkt); -++ -++ return (int64_t)out_pkt * 192; -++ } -++ -++ return bd->s_pos; -++} -++ -+ uint64_t bd_tell_time(BLURAY *bd) -+ { -+ uint32_t clip_pkt = 0, out_pkt = 0, out_time = 0; -+@@ -2602,6 +2621,7 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx, -+ BLURAY_CLIP_INFO *ci = &title_info->clips[ii]; -+ NAV_CLIP *nc = &title->clip_list.clip[ii]; -+ -++ ci->idx = nc->clip_id; -+ ci->pkt_count = nc->end_pkt - nc->start_pkt; -+ ci->start_time = (uint64_t)nc->title_time * 2; -+ ci->in_time = (uint64_t)pi->in_time * 2; -+@@ -2628,6 +2648,8 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx, -+ _copy_streams(nc, ci->sec_audio_streams, pi->stn.secondary_audio, ci->sec_audio_stream_count); -+ } -+ -++ title_info->mvc_base_view_r_flag = title->pl->app_info.mvc_base_view_r_flag; -++ -+ return title_info; -+ } -+ -+@@ -3746,3 +3768,28 @@ void bd_free_bdjo(struct bdjo_data *obj) -+ (void)obj; -+ #endif -+ } -++ -++int bd_get_clip_infos(BLURAY *bd, unsigned clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration) -++{ -++ if (bd && bd->title && bd->title->clip_list.count > clip) { -++ if (clip_start_time) -++ *clip_start_time = (uint64_t)bd->title->clip_list.clip[clip].title_time << 1; -++ if (stream_start_time) -++ *stream_start_time = (uint64_t)bd->title->clip_list.clip[clip].in_time << 1; -++ if (pos) -++ *pos = (uint64_t)bd->title->clip_list.clip[clip].title_pkt * 192; -++ if (duration) -++ *duration = (uint64_t)bd->title->clip_list.clip[clip].duration << 1; -++ -++ return 1; -++ } -++ return 0; -++} -++ -++struct mpls_pl* bd_get_title_mpls(BLURAY * bd) -++{ -++ if (bd && bd->title) { -++ return bd->title->pl; -++ } -++ return NULL; -++} -+diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h -+index cbf16fc..97dc1a3 100644 -+--- a/src/libbluray/bluray.h -++++ b/src/libbluray/bluray.h -+@@ -32,6 +32,7 @@ extern "C" { -+ */ -+ -+ #include -++#include "bdnav/clpi_data.h" -+ -+ #define TITLES_ALL 0 /**< all titles. */ -+ #define TITLES_FILTER_DUP_TITLE 0x01 /**< remove duplicate titles. */ -+@@ -225,6 +226,7 @@ typedef struct bd_stream_info { -+ } BLURAY_STREAM_INFO; -+ -+ typedef struct bd_clip { -++ uint32_t idx; -+ uint32_t pkt_count; -+ uint8_t still_mode; -+ uint16_t still_time; /* seconds */ -+@@ -275,6 +277,8 @@ typedef struct bd_title_info { -+ -+ uint32_t mark_count; -+ BLURAY_TITLE_MARK *marks; -++ -++ uint8_t mvc_base_view_r_flag; -+ } BLURAY_TITLE_INFO; -+ -+ /* -+@@ -483,6 +487,16 @@ uint32_t bd_get_current_title(BLURAY *bd); -+ -+ /** -+ * -++ * Find the byte position to specific time in 90Khz ticks -++ * -++ * @param bd BLURAY ojbect -++ * @param tick tick count -++ * @return byte position -++ */ -++int64_t bd_find_seek_point(BLURAY *bd, uint64_t tick); -++ -++/** -++ * -+ * Read from currently selected title file, decrypt if possible -+ * -+ * @param bd BLURAY object -+@@ -1007,7 +1021,6 @@ int bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y); -+ -+ /* access to internal information */ -+ -+-struct clpi_cl; -+ /** -+ * -+ * Get copy of clip information for requested playitem. -+@@ -1060,6 +1073,28 @@ void bd_stop_bdj(BLURAY *bd); // shutdown BD-J and clean up resources -+ */ -+ int bd_read_file(BLURAY *, const char *path, void **data, int64_t *size); -+ -++/** -++ * -++ * Get information about the clip -++ * -++ * @param bd BLURAY object -++ * @param clip clip index -++ * @param clip_start_time start of the clip (in the total title) (in 90khz) -++ * @param stream_start_time first pts in the clip (in 90khz) -++ * @param byte position of the clip (absolute) -++ * @param duration duration of the clip (in 90khz) -++ */ -++int bd_get_clip_infos(BLURAY *bd, unsigned clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration); -++ -++/** -++ * Get the MPLS struct of the current title -++ * -++ * @param bd BLURAY object -++ * @return the MPLS struct -++ * -++ * Lifetime of the MPLS pointer is limited to the lifetime of the BD title -++ */ -++struct mpls_pl* bd_get_title_mpls(BLURAY * bd); -+ -+ #ifdef __cplusplus -+ } -+diff --git a/src/libbluray/disc/disc.c b/src/libbluray/disc/disc.c -+index defa084..375e6c3 100644 -+--- a/src/libbluray/disc/disc.c -++++ b/src/libbluray/disc/disc.c -+@@ -69,7 +69,7 @@ static BD_FILE_H *_bdrom_open_path(void *p, const char *rel_path) -+ return NULL; -+ } -+ -+- fp = file_open(abs_path, "rb"); -++ fp = file_open(abs_path, "rbS"); -+ X_FREE(abs_path); -+ -+ return fp; - -From f647a2efa4794fb9c42fc3f52e3c4dc28414e5fd Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sun, 6 Mar 2016 12:54:59 +0000 -Subject: [PATCH 50/61] mvc: Automatically enable stereo mode - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++++- - xbmc/cores/omxplayer/OMXVideo.cpp | 6 +++++- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 4f07113ade696aa4bbefb2dd2a2e17d5f12e9ab9..ce4a849a71468ab89c16cd6e5207a88ee22567c4 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -401,13 +401,17 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - switch (hints.codec) - { - case AV_CODEC_ID_H264: -+ case AV_CODEC_ID_H264_MVC: - // H.264 - m_codingType = MMAL_ENCODING_H264; - m_pFormatName = "mmal-h264"; -- if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) -+ if ((hints.codec_tag == MKTAG('M', 'V', 'C', '1') || hints.codec_tag == MKTAG('A', 'M', 'V', 'C')) && -+ CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) - { - m_codingType = MMAL_ENCODING_MVC; - m_pFormatName= "mmal-mvc"; -+ if (hints.stereo_mode == "mono") -+ hints.stereo_mode = "mvc_lr"; - } - break; - case AV_CODEC_ID_H263: -diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp -index 2e26a6eef7335a5d0baf39313434ac786c66631b..c6aceaadd0a73d170b4024ea5ab54442197bbc5a 100644 ---- a/xbmc/cores/omxplayer/OMXVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXVideo.cpp -@@ -397,6 +397,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool hdmi_clock_syn - switch (hints.codec) - { - case AV_CODEC_ID_H264: -+ case AV_CODEC_ID_H264_MVC: - { - switch(hints.profile) - { -@@ -433,10 +434,13 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool hdmi_clock_syn - break; - } - } -- if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) -+ if ((hints.codec_tag == MKTAG('M', 'V', 'C', '1') || hints.codec_tag == MKTAG('A', 'M', 'V', 'C')) && -+ CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) - { - m_codingType = OMX_VIDEO_CodingMVC; - m_video_codec_name = "omx-mvc"; -+ if (hints.stereo_mode == "mono") -+ hints.stereo_mode = "mvc_lr"; - } - break; - case AV_CODEC_ID_MPEG4: - -From 0801c32f76c1306d1ea3cc1dcb7fb872f912ed78 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 24 Mar 2016 13:02:58 +0000 -Subject: [PATCH 51/61] ffmpeg: mvc: fix for pixelation from packets with no - pts/dts - ---- - .../73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch | 24 ++++++++++++++++++++++ - tools/depends/target/ffmpeg/Makefile | 4 +++- - 2 files changed, 27 insertions(+), 1 deletion(-) - create mode 100644 tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch - -diff --git a/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch b/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch -new file mode 100644 -index 0000000000000000000000000000000000000000..5240cf58ce40c28d12354db63b7e29143ba46978 ---- /dev/null -+++ b/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch -@@ -0,0 +1,24 @@ -+From 73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105 Mon Sep 17 00:00:00 2001 -+From: Hendrik Leppkes -+Date: Mon, 1 Sep 2014 11:39:09 +0200 -+Subject: [PATCH] h264_parser: force grabing a new timestamp until a frame -+ start was found -+ -+--- -+ libavcodec/h264_parser.c | 3 +++ -+ 1 file changed, 3 insertions(+) -+ -+diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c -+index 2fd3f2b..7165652 100644 -+--- a/libavcodec/h264_parser.c -++++ b/libavcodec/h264_parser.c -+@@ -525,6 +525,9 @@ static int h264_parse(AVCodecParserContext *s, -+ } else { -+ next = h264_find_frame_end(p, buf, buf_size); -+ -++ if (next == END_NOT_FOUND && pc->frame_start_found == 0) -++ s->fetch_timestamp = 1; -++ -+ if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { -+ *poutbuf = NULL; -+ *poutbuf_size = 0; -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index 7e97e4d91a443d46d933df528763422ff5e8f4fa..d4f279fd4f2ceb260698cd6fedb124bae61018d0 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -6,7 +6,8 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ - pfcd_hevc_optimisations.patch \ - 0001-Squashed-commit-of-the-following.patch \ - 0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch 0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch \ -- h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch -+ h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch \ -+ 73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch - - # set to "yes" to enable patching - # we don't apply patches until we move to a vanilla ffmpeg tarball -@@ -95,6 +96,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - cd $(PLATFORM); patch -p1 < ../0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch - cd $(PLATFORM); patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch - cd $(PLATFORM); patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch -+ cd $(PLATFORM); patch -p1 < ../73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch - - cd $(PLATFORM);\ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ - -From cb41bffdba7b2a1b32c7cc5a8318336795b63c8d Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 11 Nov 2016 15:53:53 +0000 -Subject: [PATCH 52/61] stereoscopicmanager: fixups for rbp - ---- - xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp | 61 ++++++++++++++++++++++ - xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h | 4 ++ - .../VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 9 +++- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h | 1 + - xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 5 ++ - xbmc/cores/omxplayer/OMXPlayerVideo.h | 1 + - xbmc/cores/omxplayer/OMXVideo.cpp | 2 +- - xbmc/guilib/StereoscopicsManager.cpp | 3 ++ - 8 files changed, 83 insertions(+), 3 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp -index 02fb028daace723fca008a19c1160113b958103f..10e05249cde619a9f5d229fe0ac45b6561236c72 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp -@@ -24,9 +24,11 @@ - #include "utils/log.h" - #include "cores/FFmpeg.h" - #include "Util.h" -+#include - - extern "C" { - #include "libswscale/swscale.h" -+#include "libavutil/intreadwrite.h" - } - - // allocate a new picture (AV_PIX_FMT_YUV420P) -@@ -392,6 +394,65 @@ double CDVDCodecUtils::NormalizeFrameduration(double frameduration, bool *match) - } - } - -+bool CDVDCodecUtils::IsH264AnnexB(std::string format, AVStream *avstream) -+{ -+ assert(avstream->codec->codec_id == AV_CODEC_ID_H264 || avstream->codec->codec_id == AV_CODEC_ID_H264_MVC); -+ if (avstream->codec->extradata_size < 4) -+ return true; -+ if (avstream->codec->extradata[0] == 1) -+ return false; -+ if (format == "avi") -+ { -+ BYTE *src = avstream->codec->extradata; -+ unsigned startcode = AV_RB32(src); -+ if (startcode == 0x00000001 || (startcode & 0xffffff00) == 0x00000100) -+ return true; -+ if (avstream->codec->codec_tag == MKTAG('A', 'V', 'C', '1') || avstream->codec->codec_tag == MKTAG('a', 'v', 'c', '1')) -+ return false; -+ } -+ return true; -+} -+ -+bool CDVDCodecUtils::ProcessH264MVCExtradata(uint8_t *data, int data_size, uint8_t **mvc_data, int *mvc_data_size) -+{ -+ uint8_t* extradata = data; -+ int extradata_size = data_size; -+ -+ if (extradata_size > 4 && *(char *)extradata == 1) -+ { -+ // Find "mvcC" atom -+ uint32_t state = -1; -+ int i = 0; -+ for (; i < extradata_size; i++) -+ { -+ state = (state << 8) | extradata[i]; -+ if (state == MKBETAG('m', 'v', 'c', 'C')) -+ break; -+ } -+ if (i >= 8 && i < extradata_size) -+ { -+ // Update pointers to the start of the mvcC atom -+ extradata = extradata + i - 7; -+ extradata_size = extradata_size - i + 7; -+ // verify size atom and actual size -+ if (extradata_size >= 14 && (AV_RB32(extradata) + 4) <= extradata_size) -+ { -+ extradata += 8; -+ extradata_size -= 8; -+ if (*(char *)extradata == 1) -+ { -+ if (mvc_data) -+ *mvc_data = extradata; -+ if (mvc_data_size) -+ *mvc_data_size = extradata_size; -+ return true; -+ } -+ } -+ } -+ } -+ return false; -+} -+ - struct EFormatMap { - AVPixelFormat pix_fmt; - ERenderFormat format; -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h -index 361c96623660305fc393273b1eaea4db096c417d..8ec50bbf79e9e163ccae25e30f3a40bfbb0d3450 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h -@@ -28,6 +28,7 @@ extern "C" { - } - - struct YV12Image; -+class AVStream; - - class CDVDCodecUtils - { -@@ -46,6 +47,9 @@ public: - - static double NormalizeFrameduration(double frameduration, bool *match = NULL); - -+ static bool IsH264AnnexB(std::string format, AVStream *avstream); -+ static bool ProcessH264MVCExtradata(uint8_t *extradata, int extradata_size, uint8_t **mvc_extradata = nullptr, int *mvc_extradata_size = nullptr); -+ - static ERenderFormat EFormatFromPixfmt(int fmt); - static AVPixelFormat PixfmtFromEFormat(ERenderFormat format); - }; -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index ce4a849a71468ab89c16cd6e5207a88ee22567c4..4ad4c169034c492f67c5efe68212ad1a772a8d7c 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -360,6 +360,11 @@ bool CMMALVideo::SendCodecConfigData() - return true; - } - -+bool CMMALVideo::SupportsExtention() -+{ -+ return CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC); -+} -+ - bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - { - CSingleLock lock(m_sharedSection); -@@ -406,12 +411,12 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) - m_codingType = MMAL_ENCODING_H264; - m_pFormatName = "mmal-h264"; - if ((hints.codec_tag == MKTAG('M', 'V', 'C', '1') || hints.codec_tag == MKTAG('A', 'M', 'V', 'C')) && -- CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC)) -+ SupportsExtention()) - { - m_codingType = MMAL_ENCODING_MVC; - m_pFormatName= "mmal-mvc"; - if (hints.stereo_mode == "mono") -- hints.stereo_mode = "mvc_lr"; -+ hints.stereo_mode = "block_lr"; - } - break; - case AV_CODEC_ID_H263: -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h -index baff1f031149da5d669536711cc0057b2db078e3..1e49f09574c2a93b938d5eb405ebcb06543dec01 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h -@@ -104,6 +104,7 @@ public: - virtual bool GetCodecStats(double &pts, int &droppedPics); - virtual void SetCodecControl(int flags); - virtual void SetSpeed(int iSpeed); -+ virtual bool SupportsExtention(); - - // MMAL decoder callback routines. - void dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer); -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -index d308e44e26baae1a56127b55b987c28c384a9b63..57f0076714ec0c3a2b66d21870bd9644cbfe6ff6 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -@@ -110,6 +110,11 @@ OMXPlayerVideo::~OMXPlayerVideo() - CloseStream(false); - } - -+bool OMXPlayerVideo::SupportsExtention() const -+{ -+ return CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC); -+} -+ - bool OMXPlayerVideo::OpenStream(CDVDStreamInfo &hints) - { - m_hints = hints; -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h -index b5050081c360d29b1b478c27e6b88291e20ecdac..c880fa6bbb128b99f8a5393056586821143d99ff 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.h -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.h -@@ -96,6 +96,7 @@ public: - void WaitForBuffers() { m_messageQueue.WaitUntilEmpty(); } - int GetLevel() const { return m_messageQueue.GetLevel(); } - bool IsStalled() const { return m_stalled; } -+ bool SupportsExtention() const; - bool IsEOS(); - void CloseStream(bool bWaitForBuffers); - void Output(double pts, bool bDropPacket); -diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp -index c6aceaadd0a73d170b4024ea5ab54442197bbc5a..ea11757bfc7ab3ebfbd5b46176c4a91097b765c4 100644 ---- a/xbmc/cores/omxplayer/OMXVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXVideo.cpp -@@ -440,7 +440,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool hdmi_clock_syn - m_codingType = OMX_VIDEO_CodingMVC; - m_video_codec_name = "omx-mvc"; - if (hints.stereo_mode == "mono") -- hints.stereo_mode = "mvc_lr"; -+ hints.stereo_mode = "block_lr"; - } - break; - case AV_CODEC_ID_MPEG4: -diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp -index 041324c51977ce880ab365a16f1ac366c79e369c..7d5999245939c0d9e27a110008e0f2747ca3b696 100644 ---- a/xbmc/guilib/StereoscopicsManager.cpp -+++ b/xbmc/guilib/StereoscopicsManager.cpp -@@ -71,10 +71,13 @@ static const struct StereoModeMap VideoModeToGuiModeMap[] = - { "anaglyph_cyan_red", RENDER_STEREO_MODE_ANAGLYPH_RED_CYAN }, - { "anaglyph_green_magenta", RENDER_STEREO_MODE_ANAGLYPH_GREEN_MAGENTA }, - { "anaglyph_yellow_blue", RENDER_STEREO_MODE_ANAGLYPH_YELLOW_BLUE }, -+#ifndef TARGET_RASPBERRY_PI - { "block_lr", RENDER_STEREO_MODE_HARDWAREBASED }, - { "block_rl", RENDER_STEREO_MODE_HARDWAREBASED }, -+#else - { "block_lr", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback - { "block_rl", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback -+#endif - {} - }; - - -From e311d263f3fe5a2e03c986b3b4806a188db901d1 Mon Sep 17 00:00:00 2001 -From: Anton Fedchin -Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 53/61] fixup! Revert supporting crappy tab/sbs subtitles. this - fixes regular subtitles. - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -index a8323f419e404037c4e5fb4d78fa1b45409337a7..7c0b70777556ac7694e7fc511cd4bb189fc42e08 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp -@@ -290,6 +290,7 @@ CDVDOverlay* CDVDOverlayCodecFFmpeg::GetOverlay() - - m_SubtitleIndex++; - -+ CLog::Log(LOGDEBUG, "Overlay: x:%d y:%d w:%d h:%d", overlay->x, overlay->y, overlay->width, overlay->height); - return overlay; - } - - -From a2c2c116c6d60388321645998f96f8609c86408f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 26 Nov 2016 18:24:18 +0000 -Subject: [PATCH 54/61] DemuxMVC: fixup after SeekTime API change - ---- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 2 +- - xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -index ade6a4454fc3915b0c787b1a4f72aedbd74903db..baefe44ca932ee98e482f1bed70d8949be71cfac 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp -@@ -188,7 +188,7 @@ DemuxPacket* CDemuxMVC::Read() - return nullptr; - } - --bool CDemuxMVC::SeekTime(int time, bool backwords, double* startpts) -+bool CDemuxMVC::SeekTime(double time, bool backwords, double* startpts) - { - if (!m_pInput) - return false; -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -index bbb836a61344689a83af68c821c05c212a86b097..54f91a02391368fbfbb4d669c003f42568347f62 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.h -@@ -36,7 +36,7 @@ public: - virtual void Abort(); - virtual void Flush(); - virtual DemuxPacket* Read(); -- virtual bool SeekTime(int time, bool backwords = false, double* startpts = nullptr); -+ virtual bool SeekTime(double time, bool backwords = false, double* startpts = nullptr); - virtual void SetSpeed(int iSpeed) { }; - virtual int GetStreamLength() { return 0; }; - virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; }; - -From 0de7f9bdd25e091c98663f733bb4208b5b1274aa Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Tue, 22 Mar 2016 09:51:52 +0100 -Subject: [PATCH 55/61] python: use kodi provided cert if available - ---- - xbmc/interfaces/python/XBPython.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp -index cd6033a9f16233aeec3fcb2c4d3144c3b31f1ac5..e55e336fd9e434a3840fd99c99cc5a3381f818fd 100644 ---- a/xbmc/interfaces/python/XBPython.cpp -+++ b/xbmc/interfaces/python/XBPython.cpp -@@ -591,6 +591,12 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker *invoker) - CEnvironment::putenv(buf); - #endif - -+#if !defined(TARGET_WINDOWS) -+ // use Kodi provided cert if available -+ if (XFILE::CFile::Exists("special://xbmc/system/certs/cacert.pem")) -+ setenv("SSL_CERT_FILE", CSpecialProtocol::TranslatePath("special://xbmc/system/certs/cacert.pem").c_str(), 1); -+#endif -+ - if (PyEval_ThreadsInitialized()) - PyEval_AcquireLock(); - else - -From a53538fd73f6d58433d06aa73c66500376d0ef9e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Wed, 25 May 2016 18:31:17 +0100 -Subject: [PATCH 56/61] rbp: Hard code the number of buffers to improve audio - sync - ---- - system/settings/rbp.xml | 6 ++++++ - xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml -index 7098edf32dff8c00e192229c3ffb060be6a42482..0ce6735e11fabd1d07a4860b9d985a4e1fd5f35a 100644 ---- a/system/settings/rbp.xml -+++ b/system/settings/rbp.xml -@@ -85,6 +85,12 @@ - - - -+ -+ -+ false -+ 2 -+ -+ - - - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index 5feee388bb3a433ea6a35b29e587ab6447c089a5..5d2071ee724fb2f7ba04f96832c89de52d9354f2 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -@@ -1070,7 +1070,11 @@ void CRenderManager::UpdateDisplayLatency() - refresh = 0; // No idea about refresh rate when windowed, just get the default latency - m_displayLatency = (double) g_advancedSettings.GetDisplayLatency(refresh); - -+#ifdef TARGET_RASPBERRY_PI -+ int buffers = CServiceBroker::GetSettings().GetBool("videoplayer.usedisplayasclock") ? 1:2; -+#else - int buffers = g_Windowing.NoOfBuffers(); -+#endif - m_displayLatency += (buffers - 1) / fps; - - } - -From b8180512a426878bc5cc38337f4214487efebe29 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 4 Jul 2016 18:30:03 +0100 -Subject: [PATCH 57/61] rbp: Update the GL libs to new naming scheme - -As the opensource mesa GL library is getting more usable, the name collision wih the firmware GL driver is causing issues. -As such we are renaming the firmware GL driver to avoid this. - -The new names are libbrcmEGL.so and libbrcmGLESv2.so. Both will be supported for some time, but the original name -will be dropped at some point ---- - cmake/modules/FindOpenGLES.cmake | 6 +++--- - tools/depends/configure.ac | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake -index ab06f968b3e314fca1ae001139f687dce9a5098b..87f1faa248b91a2e50758b23c0b9e5b09e4a69ff 100644 ---- a/cmake/modules/FindOpenGLES.cmake -+++ b/cmake/modules/FindOpenGLES.cmake -@@ -13,7 +13,7 @@ - find_package(EMBEDDED) - - if(PKG_CONFIG_FOUND AND NOT PLATFORM STREQUAL "raspberry-pi") -- pkg_check_modules(PC_OPENGLES glesv2 QUIET) -+ pkg_check_modules(PC_OPENGLES brcmglesv2 QUIET) - if(NOT OPENGLES_FOUND AND EMBEDDED_FOUND) - set(CMAKE_PREFIX_PATH ${EMBEDDED_FOUND} ${CMAKE_PREFIX_PATH}) - endif() -@@ -22,9 +22,9 @@ endif() - if(NOT CORE_SYSTEM_NAME STREQUAL ios) - find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h - PATHS ${PC_OPENGLES_INCLUDEDIR}) -- find_library(OPENGLES_gl_LIBRARY NAMES GLESv2 -+ find_library(OPENGLES_gl_LIBRARY NAMES brcmGLESv2 - PATHS ${PC_OPENGLES_LIBDIR}) -- find_library(OPENGLES_egl_LIBRARY NAMES EGL -+ find_library(OPENGLES_egl_LIBRARY NAMES brcmEGL - PATHS ${PC_OPENGLES_LIBDIR}) - else() - find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES -diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac -index ac2ac3cf689ec0eb68877d4149c9d3f856e9145c..1c8fd284c2d59170003f274d2c0cec04dd4c2118 100644 ---- a/tools/depends/configure.ac -+++ b/tools/depends/configure.ac -@@ -433,7 +433,7 @@ if test "$target_platform" = "raspberry-pi" ; then - -isystem${use_firmware}/opt/vc/include \ - -isystem${use_firmware}/opt/vc/include/interface/vcos/pthreads \ - -isystem${use_firmware}/opt/vc/include/interface/vmcs_host/linux" -- platform_ldflags+=" -L${use_firmware}/opt/vc/lib -lEGL -lGLESv2 -lbcm_host -lvcos \ -+ platform_ldflags+=" -L${use_firmware}/opt/vc/lib -lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvcos \ - -lvchiq_arm" - fi - - -From 894b620985c0b8fef4e6117cc594b7493e6816e1 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 28 Jun 2016 14:46:01 +0100 -Subject: [PATCH 58/61] ffmpeg: hacky fix for files with GMC - ---- - xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 179a287d1cec04686b30fdee1ef8f1770b0f9f8d..1453fb7f281609598e57afdc5e162f5ebfbbecd3 100644 ---- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1460,8 +1460,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) - stereoMode = GetStereoModeFromMetadata(m_pFormatContext->metadata); - if (!stereoMode.empty()) - st->stereo_mode = stereoMode; -- -- st->workaround_bugs = pStream->codec->workaround_bugs; -+ AVCodecContext *c = (AVCodecContext *)(((uint32_t *)pStream->internal)[4]); /* Eek! */ -+ st->workaround_bugs = c->workaround_bugs; - if ( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) ) - { - if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) - -From 541a9cdf189e47985dd4616f72ea888a29ccbe1e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 19 Jul 2016 20:39:18 +0100 -Subject: [PATCH 59/61] mmalrender: Add sharpness control - ---- - addons/resource.language.en_gb/resources/strings.po | 2 +- - .../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 13 ++++++++++++- - .../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h | 1 + - 3 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index ddc3d4a5127d759d160107e400c7d714a01f440b..dc48b283ebb511501dd3675ed6b24861c2203195 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -8739,7 +8739,7 @@ msgstr "" - - #: xbmc/video/dialogs/GUIDialogVideoSettings.cpp - msgctxt "#16313" --msgid "VDPAU - Sharpness" -+msgid "Sharpness" - msgstr "" - - #empty string with id 16314 -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -index 213c46345d5eebc4046619821526f6684db131dd..a234de11322599e042febd9a4945dd150dac3921 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -@@ -411,6 +411,7 @@ CMMALRenderer::CMMALRenderer() : CThread("MMALRenderer"), m_processThread(this, - m_frameInterval = 0.0; - m_frameIntervalDiff = 1e5; - m_vsync_count = ~0U; -+ m_sharpness = -2.0f; - m_vout_width = 0; - m_vout_height = 0; - m_vout_aligned_width = 0; -@@ -847,6 +848,15 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha) - goto exit; - } - -+ // if sharpness setting has changed, we should update it -+ if (m_sharpness != CMediaSettings::GetInstance().GetCurrentVideoSettings().m_Sharpness) -+ { -+ m_sharpness = CMediaSettings::GetInstance().GetCurrentVideoSettings().m_Sharpness; -+ char command[80], response[80]; -+ sprintf(command, "scaling_sharpness %d", ((int)(50.0f * (m_sharpness + 1.0f) + 0.5f))); -+ vc_gencmd(response, sizeof response, command); -+ } -+ - if (m_format != RENDER_FMT_MMAL) - { - if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -@@ -1023,7 +1033,8 @@ bool CMMALRenderer::Supports(ERENDERFEATURE feature) - feature == RENDERFEATURE_ZOOM || - feature == RENDERFEATURE_ROTATION || - feature == RENDERFEATURE_VERTICAL_SHIFT || -- feature == RENDERFEATURE_PIXEL_RATIO) -+ feature == RENDERFEATURE_PIXEL_RATIO || -+ feature == RENDERFEATURE_SHARPNESS) - return true; - - return false; -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h -index e0e6f7c0e0546013ca74265aef54704fd332f8e4..69eae6cbef0131d20dc979dcb35915cd73967592 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h -@@ -140,6 +140,7 @@ protected: - RENDER_STEREO_MODE m_video_stereo_mode; - RENDER_STEREO_MODE m_display_stereo_mode; - bool m_StereoInvert; -+ float m_sharpness; - - CCriticalSection m_sharedSection; - MMAL_COMPONENT_T *m_vout; - -From 3a409eb31f7317a9c3cc48a6dd28ffd513b8d2e4 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 14 Oct 2016 15:37:53 +0100 -Subject: [PATCH 60/61] MMALFFMpeg: Report as SW decode in codec overlay info - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index c4eda5a2c78db1f6acc9ed59938ea3f42262d8fe..a5e14e6ec5ff9a78e7342b30109e68ed8d81a54b 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -577,7 +577,7 @@ void CDVDVideoCodecFFmpeg::UpdateName() - if(m_pHardware) - m_name += "-" + m_pHardware->Name(); - -- m_processInfo.SetVideoDecoderName(m_name, m_pHardware ? true : false); -+ m_processInfo.SetVideoDecoderName(m_name, m_pHardware && m_pHardware->Name() != "mmal" ? true : false); - - CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - Updated codec: %s", m_name.c_str()); - } - -From 466da8e66acf9a60b424759f946b3c2bb2db6eed Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 1 Dec 2016 17:06:01 +0000 -Subject: [PATCH 61/61] MMALRender: Allow advanced deinterlace with software - decode - -Uses YUV420 directly which improves performance. -Requires updated firmware ---- - xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -index a234de11322599e042febd9a4945dd150dac3921..6d71b09c4badb5c3e2ef8f57b94014f43a285e32 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -@@ -1370,7 +1370,7 @@ bool CMMALRenderer::CheckConfigurationDeint(uint32_t width, uint32_t height, uin - m_deint_output->format->es->video.crop.height = height; - m_deint_output->format->es->video.width = ALIGN_UP(width, 32); - m_deint_output->format->es->video.height = ALIGN_UP(height, 16); -- m_deint_output->format->encoding = advanced_deinterlace ? MMAL_ENCODING_YUVUV128 : MMAL_ENCODING_I420; -+ m_deint_output->format->encoding = advanced_deinterlace && encoding == MMAL_ENCODING_OPAQUE ? MMAL_ENCODING_YUVUV128 : MMAL_ENCODING_I420; - - status = mmal_port_format_commit(m_deint_output); - if (status != MMAL_SUCCESS) From eccfad7df0b2fbd5c87cb3cd851adb5f786dfd75 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 10 Feb 2017 15:06:44 -0800 Subject: [PATCH 4/7] kodi: drop WeTek_Core patches --- ...ackets-completely-when-resampling-to.patch | 29 ---- ...Ugly-workaround-to-show-DTS-AC3-caps.patch | 30 ----- ...3-aml-Add-support-for-4k-resolutions.patch | 124 ------------------ ...Perform-suspend-instead-of-powerdown.patch | 34 ----- 4 files changed, 217 deletions(-) delete mode 100644 projects/WeTek_Core/patches/kodi/0001-aml-Fill-audio-packets-completely-when-resampling-to.patch delete mode 100644 projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch delete mode 100644 projects/WeTek_Core/patches/kodi/0003-aml-Add-support-for-4k-resolutions.patch delete mode 100644 projects/WeTek_Core/patches/kodi/0004-powermanagement-Perform-suspend-instead-of-powerdown.patch diff --git a/projects/WeTek_Core/patches/kodi/0001-aml-Fill-audio-packets-completely-when-resampling-to.patch b/projects/WeTek_Core/patches/kodi/0001-aml-Fill-audio-packets-completely-when-resampling-to.patch deleted file mode 100644 index a829e77600..0000000000 --- a/projects/WeTek_Core/patches/kodi/0001-aml-Fill-audio-packets-completely-when-resampling-to.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 58415a1c26a1d0f41bc45ff66471c2a41b705edf Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Sat, 20 Sep 2014 04:43:52 +0300 -Subject: [PATCH 1/5] [aml] Fill audio packets completely when resampling to - prevent 'audio data unaligned' kernel warnings - ---- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -index 3ca667c..304cff8 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -@@ -162,7 +162,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm - m_inputFormat.m_channelLayout += AE_CH_FC; - } - m_resampler = NULL; -+#ifdef HAS_LIBAMCODEC -+ m_fillPackets = true; -+#else - m_fillPackets = false; -+#endif - m_drain = false; - m_empty = true; - m_procSample = NULL; --- -1.7.10.4 - diff --git a/projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch b/projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch deleted file mode 100644 index dbea3feb33..0000000000 --- a/projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4b3958857f85df99dece4faffd42b15a9445e5cb Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Tue, 30 Jun 2015 11:19:57 +0200 -Subject: [PATCH 2/5] [aml] Ugly workaround to show DTS/AC3 caps - -... but don't run into multi channel issues as we can only open 2 pcm channels ---- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 6a9066b..7abf119 100644 ---- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -1301,6 +1301,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) - - AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name) - { -+#ifdef HAS_LIBAMCODEC -+ // ugly workaround to show DTS / AC3 caps -+ // but don't run into multi channel issues -+ // as we can only open 2 pcm channels -+ return AE_DEVTYPE_IEC958; -+#endif - if (name.substr(0, 4) == "hdmi") - return AE_DEVTYPE_HDMI; - else if (name.substr(0, 6) == "iec958" || name.substr(0, 5) == "spdif") --- -1.7.10.4 - diff --git a/projects/WeTek_Core/patches/kodi/0003-aml-Add-support-for-4k-resolutions.patch b/projects/WeTek_Core/patches/kodi/0003-aml-Add-support-for-4k-resolutions.patch deleted file mode 100644 index 535c377f8b..0000000000 --- a/projects/WeTek_Core/patches/kodi/0003-aml-Add-support-for-4k-resolutions.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 46aab0b0856eeaa855c430ddd36ac97203afa43b Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Wed, 1 Jul 2015 23:37:11 +0200 -Subject: [PATCH 3/5] [aml] Add support for 4k resolutions - ---- - xbmc/utils/AMLUtils.cpp | 16 ++++++++-------- - xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp | 23 +++++++++++++++++++---- - xbmc/windowing/egl/EGLNativeTypeAmlogic.h | 2 ++ - 3 files changed, 29 insertions(+), 12 deletions(-) - -diff --git a/xbmc/utils/AMLUtils.cpp b/xbmc/utils/AMLUtils.cpp -index 80fb453..65286de 100644 ---- a/xbmc/utils/AMLUtils.cpp -+++ b/xbmc/utils/AMLUtils.cpp -@@ -463,8 +463,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) - } - else if (StringUtils::EqualsNoCase(fromMode, "4k2ksmpte") || StringUtils::EqualsNoCase(fromMode, "smpte24hz")) - { -- res->iWidth = 1920; -- res->iHeight= 1080; -+ res->iWidth = 4096; -+ res->iHeight= 2160; - res->iScreenWidth = 4096; - res->iScreenHeight= 2160; - res->fRefreshRate = 24; -@@ -481,8 +481,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) - } - else if (StringUtils::EqualsNoCase(fromMode, "4k2k24hz") || StringUtils::EqualsNoCase(fromMode, "2160p24hz")) - { -- res->iWidth = 1920; -- res->iHeight= 1080; -+ res->iWidth = 3840; -+ res->iHeight= 2160; - res->iScreenWidth = 3840; - res->iScreenHeight= 2160; - res->fRefreshRate = 24; -@@ -490,8 +490,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) - } - else if (StringUtils::EqualsNoCase(fromMode, "4k2k25hz") || StringUtils::EqualsNoCase(fromMode, "2160p25hz")) - { -- res->iWidth = 1920; -- res->iHeight= 1080; -+ res->iWidth = 3840; -+ res->iHeight= 2160; - res->iScreenWidth = 3840; - res->iScreenHeight= 2160; - res->fRefreshRate = 25; -@@ -508,8 +508,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) - } - else if (StringUtils::EqualsNoCase(fromMode, "4k2k30hz") || StringUtils::EqualsNoCase(fromMode, "2160p30hz")) - { -- res->iWidth = 1920; -- res->iHeight= 1080; -+ res->iWidth = 3840; -+ res->iHeight= 2160; - res->iScreenWidth = 3840; - res->iScreenHeight= 2160; - res->fRefreshRate = 30; -diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp -index 88cd385..3bfb0c6 100644 ---- a/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp -+++ b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp -@@ -64,7 +64,22 @@ void CEGLNativeTypeAmlogic::Initialize() - { - aml_permissions(); - DisableFreeScale(); -+ GetMaxResolution(m_maxResolution); - } -+ -+void CEGLNativeTypeAmlogic::GetMaxResolution(RESOLUTION_INFO &maxResolution) -+{ -+ std::vector resolutions; -+ ProbeResolutions(resolutions); -+ -+ maxResolution = {0}; -+ for (size_t i = 0; i < resolutions.size(); i++) -+ { -+ if (resolutions[i].iScreenWidth > maxResolution.iScreenWidth || resolutions[i].iScreenHeight > maxResolution.iScreenHeight) -+ maxResolution = resolutions[i]; -+ } -+} -+ - void CEGLNativeTypeAmlogic::Destroy() - { - return; -@@ -83,8 +98,8 @@ bool CEGLNativeTypeAmlogic::CreateNativeWindow() - if (!nativeWindow) - return false; - -- nativeWindow->width = 1920; -- nativeWindow->height = 1080; -+ nativeWindow->width = m_maxResolution.iScreenWidth; -+ nativeWindow->height = m_maxResolution.iScreenHeight; - m_nativeWindow = nativeWindow; - - SetFramebufferResolution(nativeWindow->width, nativeWindow->height); -@@ -244,8 +259,8 @@ void CEGLNativeTypeAmlogic::SetFramebufferResolution(int width, int height) cons - { - vinfo.xres = width; - vinfo.yres = height; -- vinfo.xres_virtual = 1920; -- vinfo.yres_virtual = 2160; -+ vinfo.xres_virtual = m_maxResolution.iScreenWidth; -+ vinfo.yres_virtual = m_maxResolution.iScreenHeight * 2; - vinfo.bits_per_pixel = 32; - vinfo.activate = FB_ACTIVATE_ALL; - ioctl(fd0, FBIOPUT_VSCREENINFO, &vinfo); -diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlogic.h b/xbmc/windowing/egl/EGLNativeTypeAmlogic.h -index cfb33ca..cf60134 100644 ---- a/xbmc/windowing/egl/EGLNativeTypeAmlogic.h -+++ b/xbmc/windowing/egl/EGLNativeTypeAmlogic.h -@@ -58,6 +58,8 @@ protected: - private: - void SetFramebufferResolution(const RESOLUTION_INFO &res) const; - void SetFramebufferResolution(int width, int height) const; -+ void GetMaxResolution(RESOLUTION_INFO &maxResolution); - - std::string m_framebuffer_name; -+ RESOLUTION_INFO m_maxResolution; - }; --- -1.7.10.4 - diff --git a/projects/WeTek_Core/patches/kodi/0004-powermanagement-Perform-suspend-instead-of-powerdown.patch b/projects/WeTek_Core/patches/kodi/0004-powermanagement-Perform-suspend-instead-of-powerdown.patch deleted file mode 100644 index a2154837c7..0000000000 --- a/projects/WeTek_Core/patches/kodi/0004-powermanagement-Perform-suspend-instead-of-powerdown.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5095bcfcb4bf235855f2474ff229a95c8f20fc2d Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Tue, 14 Jul 2015 16:02:35 +0300 -Subject: [PATCH 4/5] [powermanagement] Perform suspend instead of powerdown - ---- - xbmc/powermanagement/linux/LogindUPowerSyscall.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -index 4e5bcc6..ad5847d 100644 ---- a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -+++ b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -@@ -53,7 +53,7 @@ CLogindUPowerSyscall::CLogindUPowerSyscall() - m_canPowerdown = LogindCheckCapability("CanPowerOff"); - m_canReboot = LogindCheckCapability("CanReboot"); - m_canHibernate = LogindCheckCapability("CanHibernate"); -- m_canSuspend = LogindCheckCapability("CanSuspend"); -+ m_canSuspend = false; - - InhibitDelayLock(); - -@@ -98,7 +98,7 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall() - - bool CLogindUPowerSyscall::Powerdown() - { -- return LogindSetPowerState("PowerOff"); -+ return Suspend(); - } - - bool CLogindUPowerSyscall::Reboot() --- -1.7.10.4 - From 622041914c24330d93a67e1d9bdf6349296bbeed Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 10 Feb 2017 15:06:54 -0800 Subject: [PATCH 5/7] kodi: drop WeTek_Play patches --- ...und-output-for-Amlogic-based-devices.patch | 55 ------------------ ...aries-in-configure-script-to-prevent.patch | 30 ---------- ...ample-rates-that-are-supported-by-AL.patch | 45 -------------- ...ackets-completely-when-resampling-to.patch | 29 ---------- ...ly-if-they-were-modified-after-the-l.patch | 58 ------------------- ...terlacing-for-HD-content-while-video.patch | 30 ---------- ...Ugly-workaround-to-show-DTS-AC3-caps.patch | 30 ---------- ...apping-for-Browser-Home-key-on-Linux.patch | 24 -------- ...Perform-suspend-instead-of-powerdown.patch | 48 --------------- 9 files changed, 349 deletions(-) delete mode 100644 projects/WeTek_Play/patches/kodi/0001-aml-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch delete mode 100644 projects/WeTek_Play/patches/kodi/0002-aml-Reorder-libraries-in-configure-script-to-prevent.patch delete mode 100644 projects/WeTek_Play/patches/kodi/0003-aml-Change-the-sample-rates-that-are-supported-by-AL.patch delete mode 100644 projects/WeTek_Play/patches/kodi/0004-aml-Fill-audio-packets-completely-when-resampling-to.patch delete mode 100644 projects/WeTek_Play/patches/kodi/0005-Save-settings-only-if-they-were-modified-after-the-l.patch delete mode 100644 projects/WeTek_Play/patches/kodi/0006-aml-Disable-deinterlacing-for-HD-content-while-video.patch delete mode 100644 projects/WeTek_Play/patches/kodi/0007-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch delete mode 100644 projects/WeTek_Play/patches/kodi/0008-Add-mapping-for-Browser-Home-key-on-Linux.patch delete mode 100644 projects/WeTek_Play/patches/kodi/0009-powermanagement-Perform-suspend-instead-of-powerdown.patch diff --git a/projects/WeTek_Play/patches/kodi/0001-aml-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch b/projects/WeTek_Play/patches/kodi/0001-aml-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch deleted file mode 100644 index 0293fc38ae..0000000000 --- a/projects/WeTek_Play/patches/kodi/0001-aml-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d692d81a72f47fa8fcc57063b0e54336399af811 Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Wed, 16 Apr 2014 22:02:01 +0300 -Subject: [PATCH 01/10] [aml] Fix ALSA sound output for Amlogic-based devices. - ---- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 6a9066b..75f2cf0 100644 ---- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -88,6 +88,17 @@ static unsigned int ALSASampleRateList[] = - 0 - }; - -+static int CheckNP2(unsigned x) -+{ -+ --x; -+ x |= x >> 1; -+ x |= x >> 2; -+ x |= x >> 4; -+ x |= x >> 8; -+ x |= x >> 16; -+ return ++x; -+} -+ - CAESinkALSA::CAESinkALSA() : - m_bufferSize(0), - m_formatSampleRateMul(0.0), -@@ -752,12 +763,20 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig - */ - periodSize = std::min(periodSize, (snd_pcm_uframes_t) sampleRate / 20); - bufferSize = std::min(bufferSize, (snd_pcm_uframes_t) sampleRate / 5); -+#if defined(HAS_LIBAMCODEC) -+ // must be pot for pivos. -+ bufferSize = CheckNP2(bufferSize); -+#endif - - /* - According to upstream we should set buffer size first - so make sure it is always at least - 4x period size to not get underruns (some systems seem to have issues with only 2 periods) - */ - periodSize = std::min(periodSize, bufferSize / 4); -+#if defined(HAS_LIBAMCODEC) -+ // must be pot for pivos. -+ periodSize = CheckNP2(periodSize); -+#endif - - CLog::Log(LOGDEBUG, "CAESinkALSA::InitializeHW - Request: periodSize %lu, bufferSize %lu", periodSize, bufferSize); - --- -1.7.10.4 - diff --git a/projects/WeTek_Play/patches/kodi/0002-aml-Reorder-libraries-in-configure-script-to-prevent.patch b/projects/WeTek_Play/patches/kodi/0002-aml-Reorder-libraries-in-configure-script-to-prevent.patch deleted file mode 100644 index 7961307046..0000000000 --- a/projects/WeTek_Play/patches/kodi/0002-aml-Reorder-libraries-in-configure-script-to-prevent.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a1f4a5a74bb8e9fd48ec3d45bc908861dddb0296 Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Mon, 8 Sep 2014 23:29:40 +0300 -Subject: [PATCH 02/10] [aml] Reorder libraries in configure script to prevent - linker errors when linking with libsmbclient - -Place libsmbclient before all other libraries to prevent linker errors when linking -with libsmbclient if the libc that is currently used doesn't contain some functions -such as dn_expand (which are often included in libc), but are actually included in -libresolv. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 5b8c04b..7869041 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1305,7 +1305,7 @@ fi - # samba - if test "x$use_samba" != "xno"; then - PKG_CHECK_MODULES([SAMBA], [smbclient], -- [INCLUDES="$INCLUDES $SAMBA_CFLAGS"; LIBS="$LIBS $SAMBA_LIBS"], -+ [INCLUDES="$INCLUDES $SAMBA_CFLAGS"; LIBS="$SAMBA_LIBS $LIBS"], - [AC_CHECK_LIB([smbclient], [main],, - use_samba=no;AC_MSG_ERROR($missing_library)) - USE_LIBSMBCLIENT=0 --- -1.7.10.4 - diff --git a/projects/WeTek_Play/patches/kodi/0003-aml-Change-the-sample-rates-that-are-supported-by-AL.patch b/projects/WeTek_Play/patches/kodi/0003-aml-Change-the-sample-rates-that-are-supported-by-AL.patch deleted file mode 100644 index 74a111a4ac..0000000000 --- a/projects/WeTek_Play/patches/kodi/0003-aml-Change-the-sample-rates-that-are-supported-by-AL.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 044271ec20fb82025c59fed81baddf766e28c28d Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Fri, 19 Sep 2014 01:55:12 +0300 -Subject: [PATCH 03/10] [aml] Change the sample rates that are supported by - ALSA but unsupported by HDMI to the closest supported - value - ---- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 75f2cf0..08777aa 100644 ---- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -677,6 +677,26 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig - snd_pcm_hw_params_set_access(m_pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); - - unsigned int sampleRate = inconfig.sampleRate; -+#ifdef HAS_LIBAMCODEC -+ // Change the sample rates that are supported by ALSA but unsupported by HDMI to the closest supported value -+ switch (sampleRate) -+ { -+ case 5512: -+ case 8000: -+ case 11025: -+ case 16000: -+ case 22050: -+ sampleRate = 44100; -+ break; -+ case 64000: -+ sampleRate = 88200; -+ break; -+ case 384000: -+ sampleRate = 192000; -+ break; -+ } -+#endif -+ - snd_pcm_hw_params_set_rate_near (m_pcm, hw_params, &sampleRate, NULL); - - unsigned int channelCount = inconfig.channels; --- -1.7.10.4 - diff --git a/projects/WeTek_Play/patches/kodi/0004-aml-Fill-audio-packets-completely-when-resampling-to.patch b/projects/WeTek_Play/patches/kodi/0004-aml-Fill-audio-packets-completely-when-resampling-to.patch deleted file mode 100644 index f684b960a4..0000000000 --- a/projects/WeTek_Play/patches/kodi/0004-aml-Fill-audio-packets-completely-when-resampling-to.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a9be548866b1f01e5f467a6f92b731fa07f9ba9e Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Sat, 20 Sep 2014 04:43:52 +0300 -Subject: [PATCH 04/10] [aml] Fill audio packets completely when resampling to - prevent 'audio data unaligned' kernel warnings - ---- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -index 3ca667c..304cff8 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -@@ -162,7 +162,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm - m_inputFormat.m_channelLayout += AE_CH_FC; - } - m_resampler = NULL; -+#ifdef HAS_LIBAMCODEC -+ m_fillPackets = true; -+#else - m_fillPackets = false; -+#endif - m_drain = false; - m_empty = true; - m_procSample = NULL; --- -1.7.10.4 - diff --git a/projects/WeTek_Play/patches/kodi/0005-Save-settings-only-if-they-were-modified-after-the-l.patch b/projects/WeTek_Play/patches/kodi/0005-Save-settings-only-if-they-were-modified-after-the-l.patch deleted file mode 100644 index a9372ebf55..0000000000 --- a/projects/WeTek_Play/patches/kodi/0005-Save-settings-only-if-they-were-modified-after-the-l.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9936eb795dc53b7681540c57263d175907ae45ac Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Sun, 19 Oct 2014 16:20:33 +0300 -Subject: [PATCH 05/10] Save settings only if they were modified after the - last save - -This prevents from multiple saving the same settings and helps to resolve -the issue on Amlogic G18REF TV-boxes when setiings may be lost after a poweroff. - -On G18REF When you press the red button on the remote the system receives a signal that power -is about to off. XBMC always writes guisettings.xml before exit, and the same settings -may be written several times from different places in code. But the power gets turned off -before the system completes all shutdown procedures. There may be the case that guisettings.xml -is written half-way and couldn't be read upon next boot, so the XBMC creates a new one with -default settings. - -With this fix the settings will be written at exit only once, minimizing the risk of being lost. - -note by seo: - added utils/md5.h after kodi includes cleanup. - however, this patch should not be needed at all. TODO remove ---- - xbmc/settings/Settings.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index a8114aa..e629e97 100644 ---- a/xbmc/settings/Settings.cpp -+++ b/xbmc/settings/Settings.cpp -@@ -75,6 +75,7 @@ - #include "threads/SingleLock.h" - #include "utils/CharsetConverter.h" - #include "utils/log.h" -+#include "utils/md5.h" - #include "utils/RssManager.h" - #include "utils/StringUtils.h" - #include "utils/SystemInfo.h" -@@ -537,6 +538,17 @@ bool CSettings::Save(const std::string &file) - if (!m_settingsManager->Save(root)) - return false; - -+ // Avoid saving if the settings saved earlier are indetical to the current ones -+ if (CFile::Exists(file)) -+ { -+ std::string fileMD5 = CUtil::GetFileMD5(file); -+ TiXmlPrinter xmlPrinter; -+ xmlDoc.Accept(&xmlPrinter); -+ std::string settingsMD5 = XBMC::XBMC_MD5::GetMD5(xmlPrinter.CStr()); -+ if (fileMD5 == settingsMD5) -+ return true; -+ } -+ - return xmlDoc.SaveFile(file); - } - --- -1.7.10.4 - diff --git a/projects/WeTek_Play/patches/kodi/0006-aml-Disable-deinterlacing-for-HD-content-while-video.patch b/projects/WeTek_Play/patches/kodi/0006-aml-Disable-deinterlacing-for-HD-content-while-video.patch deleted file mode 100644 index caee12516e..0000000000 --- a/projects/WeTek_Play/patches/kodi/0006-aml-Disable-deinterlacing-for-HD-content-while-video.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 50833b2af0c7c9aab3593ec8abf8e237851fff61 Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Tue, 3 Feb 2015 17:58:19 +0100 -Subject: [PATCH 06/10] [aml] Disable deinterlacing for HD content while video - is being played in a window - -... to prevent screen blinking in 1080p50/60hz display modes ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp -index aa30474..1fb5e3e 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp -@@ -2289,6 +2289,11 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect) - CLog::Log(LOGDEBUG, "CAMLCodec::SetVideoRect:m_stereo_view(%d)", m_stereo_view); - #endif - -+ if (dst_rect.Width() < display.Width() || dst_rect.Height() < display.Height()) -+ SysfsUtils::SetInt("/sys/module/di/parameters/bypass_hd", 1); -+ else -+ SysfsUtils::SetInt("/sys/module/di/parameters/bypass_hd", 0); -+ - // goofy 0/1 based difference in aml axis coordinates. - // fix them. - dst_rect.x2--; --- -1.7.10.4 - diff --git a/projects/WeTek_Play/patches/kodi/0007-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch b/projects/WeTek_Play/patches/kodi/0007-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch deleted file mode 100644 index 590ac2144e..0000000000 --- a/projects/WeTek_Play/patches/kodi/0007-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bd6b4809c2fac4ef7393e96c3c8b72a7faea2f85 Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Tue, 30 Jun 2015 11:19:57 +0200 -Subject: [PATCH 07/10] [aml] Ugly workaround to show DTS/AC3 caps - -... but don't run into multi channel issues as we can only open 2 pcm channels ---- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 08777aa..c3f5fce 100644 ---- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -1340,6 +1340,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) - - AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name) - { -+#ifdef HAS_LIBAMCODEC -+ // ugly workaround to show DTS / AC3 caps -+ // but don't run into multi channel issues -+ // as we can only open 2 pcm channels -+ return AE_DEVTYPE_IEC958; -+#endif - if (name.substr(0, 4) == "hdmi") - return AE_DEVTYPE_HDMI; - else if (name.substr(0, 6) == "iec958" || name.substr(0, 5) == "spdif") --- -1.7.10.4 - diff --git a/projects/WeTek_Play/patches/kodi/0008-Add-mapping-for-Browser-Home-key-on-Linux.patch b/projects/WeTek_Play/patches/kodi/0008-Add-mapping-for-Browser-Home-key-on-Linux.patch deleted file mode 100644 index b36cf9246a..0000000000 --- a/projects/WeTek_Play/patches/kodi/0008-Add-mapping-for-Browser-Home-key-on-Linux.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 56dac3c356e8419205eae251e76982be9a0da688 Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Tue, 14 Jul 2015 15:55:20 +0300 -Subject: [PATCH 08/10] Add mapping for Browser Home key on Linux - ---- - xbmc/input/linux/LinuxInputDevices.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp -index 3875138..3643a96 100644 ---- a/xbmc/input/linux/LinuxInputDevices.cpp -+++ b/xbmc/input/linux/LinuxInputDevices.cpp -@@ -247,6 +247,7 @@ KeyMap keyMap[] = { - { KEY_RECORD , XBMCK_RECORD }, - { KEY_REWIND , XBMCK_REWIND }, - { KEY_PHONE , XBMCK_PHONE }, -+ { KEY_HOMEPAGE , XBMCK_BROWSER_HOME}, - { KEY_REFRESH , XBMCK_SHUFFLE }, - { KEY_SCROLLUP , XBMCK_PAGEUP }, - { KEY_SCROLLDOWN , XBMCK_PAGEDOWN }, --- -1.7.10.4 - diff --git a/projects/WeTek_Play/patches/kodi/0009-powermanagement-Perform-suspend-instead-of-powerdown.patch b/projects/WeTek_Play/patches/kodi/0009-powermanagement-Perform-suspend-instead-of-powerdown.patch deleted file mode 100644 index c69c201ffa..0000000000 --- a/projects/WeTek_Play/patches/kodi/0009-powermanagement-Perform-suspend-instead-of-powerdown.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 72497ca4d29af8ac224b826a3993bfdb76a7f9f6 Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Tue, 14 Jul 2015 16:02:35 +0300 -Subject: [PATCH 09/10] [powermanagement] Perform suspend instead of powerdown - ---- - system/keymaps/keyboard.xml | 2 +- - xbmc/powermanagement/linux/LogindUPowerSyscall.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml -index 90517af..62cc847 100644 ---- a/system/keymaps/keyboard.xml -+++ b/system/keymaps/keyboard.xml -@@ -94,7 +94,7 @@ - ToggleFullScreen - FirstPage - LastPage -- ActivateWindow(ShutdownMenu) -+ XBMC.Powerdown() - ActivateWindow(ShutdownMenu) - - ActivateWindow(TVGuide) -diff --git a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -index 4e5bcc6..ad5847d 100644 ---- a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -+++ b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -@@ -53,7 +53,7 @@ CLogindUPowerSyscall::CLogindUPowerSyscall() - m_canPowerdown = LogindCheckCapability("CanPowerOff"); - m_canReboot = LogindCheckCapability("CanReboot"); - m_canHibernate = LogindCheckCapability("CanHibernate"); -- m_canSuspend = LogindCheckCapability("CanSuspend"); -+ m_canSuspend = false; - - InhibitDelayLock(); - -@@ -98,7 +98,7 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall() - - bool CLogindUPowerSyscall::Powerdown() - { -- return LogindSetPowerState("PowerOff"); -+ return Suspend(); - } - - bool CLogindUPowerSyscall::Reboot() --- -1.7.10.4 - From c5c8e1b721020ac95b42b66a63bfe91ee5dab466 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 10 Feb 2017 15:07:12 -0800 Subject: [PATCH 6/7] kodi: drop imx6 patches --- .../kodi/kodi-050-from-openbricks.patch | 1820 ----------------- .../kodi/kodi-100-libreelec-extras.patch | 43 - 2 files changed, 1863 deletions(-) delete mode 100644 projects/imx6/patches/kodi/kodi-050-from-openbricks.patch delete mode 100644 projects/imx6/patches/kodi/kodi-100-libreelec-extras.patch diff --git a/projects/imx6/patches/kodi/kodi-050-from-openbricks.patch b/projects/imx6/patches/kodi/kodi-050-from-openbricks.patch deleted file mode 100644 index 40985bf360..0000000000 --- a/projects/imx6/patches/kodi/kodi-050-from-openbricks.patch +++ /dev/null @@ -1,1820 +0,0 @@ -https://github.com/OpenBricks/openbricks/tree/krypton-glibc -https://github.com/OpenBricks/openbricks/tree/krypton-glibc/packages/multimedia/kodi/patches -https://github.com/OpenBricks/openbricks/tree//packages/multimedia/kodi/patches - -============================================================== -file 0027-stop-resume-streams-on-OnLostDisplay-OnResetDisplay.patch -============================================================== - -From ef590549752c0b7daccb12c28d34feb5e7ed2171 Mon Sep 17 00:00:00 2001 -From: Matus Kral -Date: Mon, 18 Jul 2016 23:34:51 +0200 -Subject: [PATCH] stop/resume streams on OnLostDisplay/OnResetDisplay - ---- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 4f55b37..4aad146 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -2843,6 +2843,11 @@ AEAudioFormat CActiveAE::GetCurrentSinkFormat() - void CActiveAE::OnLostDisplay() - { - Message *reply; -+ for(auto &&stream : m_streams) -+ m_controlPort.SendOutMessageSync(CActiveAEControlProtocol::PAUSESTREAM, -+ &reply, 1000, -+ &stream, sizeof(CActiveAEStream*)); -+ - if (m_controlPort.SendOutMessageSync(CActiveAEControlProtocol::DISPLAYLOST, - &reply, - 5000)) -@@ -2862,7 +2867,12 @@ void CActiveAE::OnLostDisplay() - - void CActiveAE::OnResetDisplay() - { -- m_controlPort.SendOutMessage(CActiveAEControlProtocol::DISPLAYRESET); -+ Message *reply; -+ m_controlPort.SendOutMessageSync(CActiveAEControlProtocol::DISPLAYRESET, &reply, 1000); -+ for(auto &&stream : m_streams) -+ m_controlPort.SendOutMessageSync(CActiveAEControlProtocol::RESUMESTREAM, -+ &reply, 1000, -+ &stream, sizeof(CActiveAEStream*)); - } - - void CActiveAE::OnAppFocusChange(bool focus) --- -1.9.1 - - -============================================================== -file 0034-IMXCODEC-Use-uint32_t-for-physical-addresses.patch -============================================================== - -From 2dc612adfcc74c6439e5df47aba2cf63573f93f1 Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Sat, 24 Sep 2016 15:36:23 +0200 -Subject: [PATCH] IMXCODEC: Use uint32_t for physical addresses - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 2 +- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h | 2 +- - xbmc/linux/imx/IMX.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index b1147d2..705b4a9 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -1198,7 +1198,7 @@ CDVDVideoCodecIMXBuffer::CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, - iHeight = (((frameInfo->pExtInfo->nFrmHeight) + 15) & ~15); - - pVirtAddr = m_frameBuffer->pbufVirtY; -- pPhysAddr = (int)m_frameBuffer->pbufY; -+ pPhysAddr = (uint32_t)m_frameBuffer->pbufY; - - #ifdef IMX_INPUT_FORMAT_I420 - iFormat = _4CC('I', '4', '2', '0'); -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -index 32e3a6c..fdac8ec 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -@@ -187,7 +187,7 @@ private: - int m_fbLineLength; - int m_fbPageSize; - int m_fbPhysSize; -- int m_fbPhysAddr; -+ uint32_t m_fbPhysAddr; - uint8_t *m_fbVirtAddr; - struct fb_var_screeninfo m_fbVar; - int m_ipuHandle; -diff --git a/xbmc/linux/imx/IMX.h b/xbmc/linux/imx/IMX.h -index a269af0..2bc6761 100644 ---- a/xbmc/linux/imx/IMX.h -+++ b/xbmc/linux/imx/IMX.h -@@ -182,7 +182,7 @@ public: - public: - uint32_t iWidth; - uint32_t iHeight; -- int pPhysAddr; -+ uint32_t pPhysAddr; - uint8_t *pVirtAddr; - int iFormat; - double m_fps; --- -1.9.1 - - -============================================================== -file 0035-IMXCODEC-Fix-page-counting-avoid-compiler-warning.patch -============================================================== - -From 527cc00d7b56f01277be9abce0de48a63f388dd7 Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Sat, 24 Sep 2016 15:39:38 +0200 -Subject: [PATCH] IMXCODEC: Fix page counting, avoid compiler warning - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index 705b4a9..9b7a9ea 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -1562,15 +1562,15 @@ void CIMXContext::SetIPUMotion(EINTERLACEMETHOD imethod) - void CIMXContext::Blit(CIMXBuffer *source_p, CIMXBuffer *source, const CRect &srcRect, - const CRect &dstRect, uint8_t fieldFmt, int page) - { -- static unsigned char pg; -+ static int pg = 0; - - if (page == RENDER_TASK_AUTOPAGE) - page = pg; -- else if (page < 0 && page >= m_fbPages) -+ else if (page < 0 || page >= m_fbPages) - return; - - IPUTaskPtr ipu(new IPUTask(source_p, source, page)); -- pg = ++pg % m_fbPages; -+ pg = (page + 1) % m_fbPages; - - #ifdef IMX_PROFILE_BUFFERS - unsigned long long before = XbmcThreads::SystemClockMillis(); --- -1.9.1 - - -============================================================== -file 0036-IMXCODEC-Honour-forced-aspect-ratio-hint.patch -============================================================== - -From eab2f97c91ec724f1c30af5b6d570d73e76689c8 Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Mon, 3 Oct 2016 18:08:34 +0200 -Subject: [PATCH] IMXCODEC: Honour forced aspect ratio hint - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 6 +++++- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index 9b7a9ea..ac2ad8d 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -546,6 +546,8 @@ bool CIMXCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options, std::stri - #endif - - m_warnOnce = true; -+ m_forcedWidthHeightRatio = m_hints.forced_aspect ? (65536 * m_hints.aspect) : 0; -+ - switch(m_hints.codec) - { - case AV_CODEC_ID_MPEG1VIDEO: -@@ -1160,7 +1162,9 @@ bool CIMXCodec::GetPicture(DVDVideoPicture* pDvdVideoPicture) - pDvdVideoPicture->iWidth = pDvdVideoPicture->IMXBuffer->m_pctWidth; - pDvdVideoPicture->iHeight = pDvdVideoPicture->IMXBuffer->m_pctHeight; - -- pDvdVideoPicture->iDisplayWidth = ((pDvdVideoPicture->iWidth * m_frameInfo.pExtInfo->nQ16ShiftWidthDivHeightRatio) + 32767) >> 16; -+ int ratio = m_forcedWidthHeightRatio ? m_forcedWidthHeightRatio : m_frameInfo.pExtInfo->nQ16ShiftWidthDivHeightRatio; -+ -+ pDvdVideoPicture->iDisplayWidth = ((pDvdVideoPicture->iWidth * ratio) + 32767) >> 16; - pDvdVideoPicture->iDisplayHeight = pDvdVideoPicture->iHeight; - - pDvdVideoPicture->pts = pDvdVideoPicture->IMXBuffer->GetPts(); -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -index fdac8ec..3d26a50 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -@@ -380,6 +380,7 @@ protected: - int m_codecControlFlags; - CCriticalSection m_signalLock; - CCriticalSection m_queuesLock; -+ int m_forcedWidthHeightRatio; - #ifdef DUMP_STREAM - FILE *m_dump; - #endif --- -1.9.1 - - -============================================================== -file 0037-IMXCODEC-Cleanup-mediainfo-logging.patch -============================================================== - -From 2ca3bdccc4f4723297a51abb1dbe09b97d7115d0 Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Mon, 3 Oct 2016 18:11:31 +0200 -Subject: [PATCH] IMXCODEC: Cleanup mediainfo logging - ---- - .../DVDCodecs/Video/DVDVideoCodecIMX.cpp | 52 +++++++++++----------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index ac2ad8d..810537f 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -506,8 +506,6 @@ bool CIMXCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options, std::stri - } - - m_hints = hints; -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -- CLog::Log(LOGDEBUG, "Let's decode with iMX VPU\n"); - - int param = 0; - SetVPUParams(VPU_DEC_CONF_INPUTTYPE, ¶m); -@@ -516,32 +514,31 @@ bool CIMXCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options, std::stri - #ifdef MEDIAINFO - if (g_advancedSettings.CanLogComponent(LOGVIDEO)) - { -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: fpsrate %d / fpsscale %d\n", m_hints.fpsrate, m_hints.fpsscale); -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: CodecID %d \n", m_hints.codec); -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: StreamType %d \n", m_hints.type); -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: Level %d \n", m_hints.level); -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: Profile %d \n", m_hints.profile); -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: PTS_invalid %d \n", m_hints.ptsinvalid); -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: Tag %d \n", m_hints.codec_tag); -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: %dx%d \n", m_hints.width, m_hints.height); -- } -- { char str_tag[128]; av_get_codec_tag_string(str_tag, sizeof(str_tag), m_hints.codec_tag); -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: Tag fourcc %s\n", str_tag); -- } -- if (m_hints.extrasize) -- { -- char buf[4096]; -+ CLog::Log(LOGNOTICE, "MEDIAINFO: fpsrate %d / fpsscale %d\n", m_hints.fpsrate, m_hints.fpsscale); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: CodecID %d\n", m_hints.codec); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: StreamType %d\n", m_hints.type); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: Level %d\n", m_hints.level); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: Profile %d\n", m_hints.profile); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: PTS_invalid %d\n", m_hints.ptsinvalid); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: Tag %d\n", m_hints.codec_tag); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: %dx%d\n", m_hints.width, m_hints.height); - -- for (unsigned int i=0; i < m_hints.extrasize; i++) -- sprintf(buf+i*2, "%02x", ((uint8_t*)m_hints.extradata)[i]); -+ char str_tag[128]; -+ av_get_codec_tag_string(str_tag, sizeof(str_tag), m_hints.codec_tag); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: Tag fourcc %s\n", str_tag); - -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: %s extradata %d %s\n", *(char*)m_hints.extradata == 1 ? "AnnexB" : "avcC", m_hints.extrasize, buf); -- } -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -- { -- CLog::Log(LOGDEBUG, "Decode: MEDIAINFO: %d / %d \n", m_hints.width, m_hints.height); -- CLog::Log(LOGDEBUG, "Decode: aspect %f - forced aspect %d\n", m_hints.aspect, m_hints.forced_aspect); -+ if (m_hints.extrasize) -+ { -+ char buf[4096]; -+ -+ for (unsigned int i=0; i < m_hints.extrasize; i++) -+ sprintf(buf+i*2, "%02x", ((uint8_t*)m_hints.extradata)[i]); -+ -+ CLog::Log(LOGNOTICE, "MEDIAINFO: %s extradata %d %s\n", *(char*)m_hints.extradata == 1 ? "AnnexB" : "avcC", m_hints.extrasize, buf); -+ } -+ -+ CLog::Log(LOGNOTICE, "MEDIAINFO: %d / %d\n", m_hints.width, m_hints.height); -+ CLog::Log(LOGNOTICE, "MEDIAINFO: aspect %f - forced_aspect %d\n", m_hints.aspect, m_hints.forced_aspect); - } - #endif - -@@ -634,6 +631,9 @@ bool CIMXCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options, std::stri - return false; - } - -+ if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ CLog::Log(LOGNOTICE, "Let's decode with iMX VPU\n"); -+ - std::list deintMethods({ EINTERLACEMETHOD::VS_INTERLACEMETHOD_AUTO, - EINTERLACEMETHOD::VS_INTERLACEMETHOD_RENDER_BOB }); - --- -1.9.1 - - -============================================================== -file 0038-IMXCODEC-Remove-m_frameInfo-member-variable-from-CIM.patch -============================================================== - -From 9a21a0256d49f2f9d44a08d077ef2dbc393161f6 Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Sun, 1 Jan 2017 11:15:09 +0100 -Subject: [PATCH] IMXCODEC: Remove m_frameInfo member variable from CIMXCodec - class - ---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 10 ++++++---- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h | 2 +- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index 810537f..ee7178a 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -855,6 +855,7 @@ void CIMXCodec::AddExtraData(VpuBufferNode *bn, bool force) - void CIMXCodec::Process() - { - VpuDecFrameLengthInfo frameLengthInfo; -+ VpuDecOutFrameInfo frameInfo; - VpuBufferNode inData; - VpuBufferNode dummy; - VpuDecRetCode ret; -@@ -1002,16 +1003,16 @@ void CIMXCodec::Process() - if (!VPU_DecGetConsumedFrameInfo(m_vpuHandle, &frameLengthInfo) && frameLengthInfo.pFrame) - m_pts[frameLengthInfo.pFrame] = task->demux.pts; - -- if (m_decRet & CLASS_PICTURE && getOutputFrame(&m_frameInfo)) -+ if (m_decRet & CLASS_PICTURE && getOutputFrame(&frameInfo)) - { - ++m_nrOut; -- CDVDVideoCodecIMXBuffer *buffer = new CDVDVideoCodecIMXBuffer(&m_frameInfo, m_fps, m_decOpenParam.nMapType); -+ CDVDVideoCodecIMXBuffer *buffer = new CDVDVideoCodecIMXBuffer(&frameInfo, m_fps, m_decOpenParam.nMapType); - - /* quick & dirty fix to get proper timestamping for VP8 codec */ - if (m_decOpenParam.CodecFormat == VPU_V_VP8) - buffer->SetPts(task->demux.pts); - else -- buffer->SetPts(m_pts[m_frameInfo.pDisplayFrameBuf]); -+ buffer->SetPts(m_pts[frameInfo.pDisplayFrameBuf]); - - buffer->SetDts(task->demux.dts); - -@@ -1162,7 +1163,7 @@ bool CIMXCodec::GetPicture(DVDVideoPicture* pDvdVideoPicture) - pDvdVideoPicture->iWidth = pDvdVideoPicture->IMXBuffer->m_pctWidth; - pDvdVideoPicture->iHeight = pDvdVideoPicture->IMXBuffer->m_pctHeight; - -- int ratio = m_forcedWidthHeightRatio ? m_forcedWidthHeightRatio : m_frameInfo.pExtInfo->nQ16ShiftWidthDivHeightRatio; -+ int ratio = m_forcedWidthHeightRatio ? m_forcedWidthHeightRatio : pDvdVideoPicture->IMXBuffer->m_widthHeightRatio; - - pDvdVideoPicture->iDisplayWidth = ((pDvdVideoPicture->iWidth * ratio) + 32767) >> 16; - pDvdVideoPicture->iDisplayHeight = pDvdVideoPicture->iHeight; -@@ -1196,6 +1197,7 @@ CDVDVideoCodecIMXBuffer::CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, - { - m_pctWidth = frameInfo->pExtInfo->FrmCropRect.nRight - frameInfo->pExtInfo->FrmCropRect.nLeft; - m_pctHeight = frameInfo->pExtInfo->FrmCropRect.nBottom - frameInfo->pExtInfo->FrmCropRect.nTop; -+ m_widthHeightRatio = frameInfo->pExtInfo->nQ16ShiftWidthDivHeightRatio; - - // Some codecs (VC1?) lie about their frame size (mod 16). Adjust... - iWidth = (((frameInfo->pExtInfo->nFrmWidth) + 15) & ~15); -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -index 3d26a50..aeb1692 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -@@ -268,6 +268,7 @@ public: - protected: - unsigned int m_pctWidth; - unsigned int m_pctHeight; -+ int m_widthHeightRatio; - - private: - double m_pts; -@@ -374,7 +375,6 @@ protected: - std::unordered_map - m_pts; - double m_lastPTS; -- VpuDecOutFrameInfo m_frameInfo; // Store last VPU output frame info - CBitstreamConverter *m_converter; // H264 annex B converter - bool m_warnOnce; // Track warning messages to only warn once - int m_codecControlFlags; --- -1.9.1 - - -============================================================== -file 0039-IMXCODEC-Add-enum-VPU_MAPTYPE.patch -============================================================== - -From 951095cdf14af35d0d2aefcd4122da1699075616 Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Sun, 1 Jan 2017 11:32:11 +0100 -Subject: [PATCH] IMXCODEC: Add enum VPU_MAPTYPE - ---- - .../cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 14 +++++++------- - xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h | 9 ++++++++- - 2 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index ee7178a..3e77132 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -780,7 +780,7 @@ int CIMXCodec::Decode(BYTE *pData, int iSize, double dts, double pts) - else - m_fps = 60; - -- m_decOpenParam.nMapType = 1; -+ m_decOpenParam.nMapType = MAPTYPE_TILED_FRAME; - - ptrn.Flush(); - g_IMXCodec->Create(); -@@ -968,9 +968,9 @@ void CIMXCodec::Process() - if (!VpuFreeBuffers(false) || !VpuAllocFrameBuffers()) - ExitError("VPU error while registering frame buffers"); - -- if (m_initInfo.nInterlace && m_fps >= 49 && m_decOpenParam.nMapType == 1) -+ if (m_initInfo.nInterlace && m_fps >= 49 && m_decOpenParam.nMapType == MAPTYPE_TILED_FRAME) - { -- m_decOpenParam.nMapType = 0; -+ m_decOpenParam.nMapType = MAPTYPE_LINEAR_FRAME; - Dispose(); - VpuOpen(); - continue; -@@ -1188,7 +1188,7 @@ bool CIMXCodec::IsCurrentThread() const - } - - /*******************************************/ --CDVDVideoCodecIMXBuffer::CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, double fps, int map) -+CDVDVideoCodecIMXBuffer::CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, double fps, int mapType) - : m_dts(DVD_NOPTS_VALUE) - , m_fieldType(frameInfo->eFieldType) - , m_frameBuffer(frameInfo->pDisplayFrameBuf) -@@ -1209,9 +1209,9 @@ CDVDVideoCodecIMXBuffer::CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, - #ifdef IMX_INPUT_FORMAT_I420 - iFormat = _4CC('I', '4', '2', '0'); - #else -- iFormat = map == 1 ? _4CC('T', 'N', 'V', 'P'): -- map == 0 ? _4CC('N', 'V', '1', '2'): -- _4CC('T', 'N', 'V', 'F'); -+ iFormat = mapType == MAPTYPE_TILED_FRAME ? _4CC('T', 'N', 'V', 'P'): -+ mapType == MAPTYPE_LINEAR_FRAME ? _4CC('N', 'V', '1', '2'): -+ _4CC('T', 'N', 'V', 'F'); - #endif - m_fps = fps; - #if defined(IMX_PROFILE) || defined(IMX_PROFILE_BUFFERS) || defined(TRACE_FRAMES) -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -index aeb1692..22da54d 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -@@ -84,6 +84,13 @@ enum RENDER_TASK - RENDER_TASK_CAPTURE = -2, - }; - -+enum VPU_MAPTYPE -+{ -+ MAPTYPE_LINEAR_FRAME = 0, -+ MAPTYPE_TILED_FRAME = 1, -+ MAPTYPE_TILED_FIELD = 2, -+}; -+ - #define CLASS_PICTURE (VPU_DEC_OUTPUT_DIS | VPU_DEC_OUTPUT_MOSAIC_DIS) - #define CLASS_NOBUF (VPU_DEC_OUTPUT_NODIS | VPU_DEC_NO_ENOUGH_BUF | VPU_DEC_OUTPUT_REPEAT) - #define CLASS_FORCEBUF (VPU_DEC_OUTPUT_EOS | VPU_DEC_NO_ENOUGH_INBUF) -@@ -244,7 +251,7 @@ class CDVDVideoCodecIMXBuffer : public CIMXBuffer - friend class CIMXCodec; - friend class CIMXContext; - public: -- CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, double fps, int map); -+ CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, double fps, int mapType); - virtual ~CDVDVideoCodecIMXBuffer(); - - // reference counting --- -1.9.1 - - -============================================================== -file 0040-IMXCODEC-Prevent-lkFIFO-from-returning-uninitialized.patch -============================================================== - -From c458ee2820562d7f7e6d015a6ff25c7ef126bb88 Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Sun, 1 Jan 2017 11:47:08 +0100 -Subject: [PATCH] IMXCODEC: Prevent lkFIFO from returning uninitialized data - ---- - .../VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 15 +++++++++++---- - xbmc/linux/imx/IMX.h | 16 ++++++++-------- - 2 files changed, 19 insertions(+), 12 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index 3e77132..773c878 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -889,7 +889,7 @@ void CIMXCodec::Process() - { - RecycleFrameBuffers(); - SAFE_DELETE(task); -- if (!(task = m_decInput.pop())) -+ if (!m_decInput.pop(task)) - task = new VPUTask(); - - #if defined(IMX_PROFILE) || defined(IMX_PROFILE_BUFFERS) -@@ -1048,7 +1048,11 @@ void CIMXCodec::Process() - - if (m_decRet & VPU_DEC_NO_ENOUGH_BUF && m_decOutput.size()) - { -- m_decOutput.pop()->Release(); -+ CDVDVideoCodecIMXBuffer *buffer; -+ -+ if (m_decOutput.pop(buffer)) -+ buffer->Release(); -+ - FlushVPU(); - continue; - } -@@ -1124,8 +1128,11 @@ void CIMXCodec::ExitError(const char *msg, ...) - - bool CIMXCodec::GetPicture(DVDVideoPicture* pDvdVideoPicture) - { -- pDvdVideoPicture->IMXBuffer = m_decOutput.pop(); -- assert(pDvdVideoPicture->IMXBuffer); -+ if (!m_decOutput.pop(pDvdVideoPicture->IMXBuffer)) -+ { -+ memset(pDvdVideoPicture, 0, sizeof(*pDvdVideoPicture)); -+ return false; -+ } - - #ifdef IMX_PROFILE - static unsigned int previous = 0; -diff --git a/xbmc/linux/imx/IMX.h b/xbmc/linux/imx/IMX.h -index 2bc6761..201c1e9 100644 ---- a/xbmc/linux/imx/IMX.h -+++ b/xbmc/linux/imx/IMX.h -@@ -79,23 +79,22 @@ public: - lkFIFO() { m_size = queue.max_size(); queue.clear(); m_abort = false; } - - public: -- T pop() -+ bool pop(T &item) - { - std::unique_lock m_lock(lkqueue); - m_abort = false; - while (!queue.size() && !m_abort) - read.wait(m_lock); - -- T val; -- if (!queue.empty()) -- { -- val = queue.front(); -- queue.pop_front(); -- } -+ if (queue.empty()) -+ return false; -+ -+ item = queue.front(); -+ queue.pop_front(); - - m_lock.unlock(); - write.notify_one(); -- return val; -+ return true; - } - - bool push(const T& item) -@@ -109,6 +108,7 @@ public: - return false; - - queue.push_back(item); -+ - m_lock.unlock(); - read.notify_one(); - return true; --- -1.9.1 - - -============================================================== -file 0041-IMXCODEC-Cleanup-IMXBuffer-classes.patch -============================================================== - -From abe53ea7362fe251b9cfc7e814dd78b7b06089b9 Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Sun, 1 Jan 2017 17:23:23 +0100 -Subject: [PATCH] IMXCODEC: Cleanup IMXBuffer classes - ---- - .../DVDCodecs/Video/DVDVideoCodecIMX.cpp | 38 +++++++++++++--------- - .../VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h | 13 ++++---- - xbmc/linux/imx/IMX.h | 2 -- - 3 files changed, 29 insertions(+), 24 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index 773c878..d498b45 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -1128,7 +1128,9 @@ void CIMXCodec::ExitError(const char *msg, ...) - - bool CIMXCodec::GetPicture(DVDVideoPicture* pDvdVideoPicture) - { -- if (!m_decOutput.pop(pDvdVideoPicture->IMXBuffer)) -+ CDVDVideoCodecIMXBuffer *pBuffer; -+ -+ if (!m_decOutput.pop(pBuffer)) - { - memset(pDvdVideoPicture, 0, sizeof(*pDvdVideoPicture)); - return false; -@@ -1139,9 +1141,9 @@ bool CIMXCodec::GetPicture(DVDVideoPicture* pDvdVideoPicture) - unsigned int current; - - current = XbmcThreads::SystemClockMillis(); -- CLog::Log(LOGDEBUG, "+G 0x%x %f/%f tm:%03d : Interlaced 0x%x\n", pDvdVideoPicture->IMXBuffer->GetIdx(), -- recalcPts(pDvdVideoPicture->IMXBuffer->GetDts()), recalcPts(pDvdVideoPicture->IMXBuffer->GetPts()), current - previous, -- m_initInfo.nInterlace ? pDvdVideoPicture->IMXBuffer->GetFieldType() : 0); -+ CLog::Log(LOGDEBUG, "+G 0x%x %f/%f tm:%03d : Interlaced 0x%x\n", pBuffer->GetIdx(), -+ recalcPts(pBuffer->GetDts()), recalcPts(pBuffer->GetPts()), current - previous, -+ m_initInfo.nInterlace ? pBuffer->GetFieldType() : 0); - previous = current; - #endif - -@@ -1151,35 +1153,37 @@ bool CIMXCodec::GetPicture(DVDVideoPicture* pDvdVideoPicture) - ++m_dropped; - } - else -- pDvdVideoPicture->iFlags = pDvdVideoPicture->IMXBuffer->GetFlags(); -+ pDvdVideoPicture->iFlags = pBuffer->GetFlags(); - - if (m_initInfo.nInterlace) - { -- if (pDvdVideoPicture->IMXBuffer->GetFieldType() == VPU_FIELD_NONE && m_warnOnce) -+ if (pBuffer->GetFieldType() == VPU_FIELD_NONE && m_warnOnce) - { - m_warnOnce = false; - CLog::Log(LOGWARNING, "Interlaced content reported by VPU, but full frames detected - Please turn off deinterlacing manually."); - } -- else if (pDvdVideoPicture->IMXBuffer->GetFieldType() == VPU_FIELD_TB || pDvdVideoPicture->IMXBuffer->GetFieldType() == VPU_FIELD_TOP) -+ else if (pBuffer->GetFieldType() == VPU_FIELD_TB || pBuffer->GetFieldType() == VPU_FIELD_TOP) - pDvdVideoPicture->iFlags |= DVP_FLAG_TOP_FIELD_FIRST; - - pDvdVideoPicture->iFlags |= DVP_FLAG_INTERLACED; - } - - pDvdVideoPicture->format = RENDER_FMT_IMXMAP; -- pDvdVideoPicture->iWidth = pDvdVideoPicture->IMXBuffer->m_pctWidth; -- pDvdVideoPicture->iHeight = pDvdVideoPicture->IMXBuffer->m_pctHeight; -+ pDvdVideoPicture->iWidth = pBuffer->GetPictureWidth(); -+ pDvdVideoPicture->iHeight = pBuffer->GetPictureHeight(); - -- int ratio = m_forcedWidthHeightRatio ? m_forcedWidthHeightRatio : pDvdVideoPicture->IMXBuffer->m_widthHeightRatio; -+ int ratio = m_forcedWidthHeightRatio ? m_forcedWidthHeightRatio : pBuffer->GetWidthHeightRatio(); - - pDvdVideoPicture->iDisplayWidth = ((pDvdVideoPicture->iWidth * ratio) + 32767) >> 16; - pDvdVideoPicture->iDisplayHeight = pDvdVideoPicture->iHeight; - -- pDvdVideoPicture->pts = pDvdVideoPicture->IMXBuffer->GetPts(); -- pDvdVideoPicture->dts = pDvdVideoPicture->IMXBuffer->GetDts(); -+ pDvdVideoPicture->pts = pBuffer->GetPts(); -+ pDvdVideoPicture->dts = pBuffer->GetDts(); - - if (pDvdVideoPicture->iFlags & DVP_FLAG_DROPPED) -- SAFE_RELEASE(pDvdVideoPicture->IMXBuffer); -+ SAFE_RELEASE(pBuffer); -+ -+ pDvdVideoPicture->IMXBuffer = pBuffer; - - return true; - } -@@ -1229,15 +1233,17 @@ CDVDVideoCodecIMXBuffer::CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, - - void CDVDVideoCodecIMXBuffer::Lock() - { -- long count = ++m_iRefs; - #ifdef TRACE_FRAMES -- CLog::Log(LOGDEBUG, "R+ 0x%x - ref : %ld (VPU)\n", m_idx, count); -+ CLog::Log(LOGDEBUG, "R+ 0x%x - ref : %ld (VPU)\n", m_idx, ++m_iRefs); -+#else -+ ++m_iRefs; - #endif - } - - long CDVDVideoCodecIMXBuffer::Release() - { - long count = --m_iRefs; -+ - #ifdef TRACE_FRAMES - CLog::Log(LOGDEBUG, "R- 0x%x - ref : %ld (VPU)\n", m_idx, count); - #endif -@@ -1803,7 +1809,7 @@ bool CIMXContext::TileTask(IPUTaskPtr &ipu) - return false; - } - -- ((CDVDVideoCodecIMXBuffer*)ipu->current)->m_convBuffer = conv; -+ ((CDVDVideoCodecIMXBuffer*)ipu->current)->SetConvBuffer(conv); - vdoa.output.paddr = conv->buf_paddr; - } - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -index 22da54d..91f9b8c 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -@@ -248,8 +248,6 @@ public: - // Base class of IMXVPU and IMXIPU buffer - class CDVDVideoCodecIMXBuffer : public CIMXBuffer - { --friend class CIMXCodec; --friend class CIMXContext; - public: - CDVDVideoCodecIMXBuffer(VpuDecOutFrameInfo *frameInfo, double fps, int mapType); - virtual ~CDVDVideoCodecIMXBuffer(); -@@ -272,12 +270,16 @@ public: - #endif - VpuFieldType GetFieldType() const { return m_fieldType; } - --protected: -+ unsigned int GetPictureWidth() { return m_pctWidth; } -+ unsigned int GetPictureHeight() { return m_pctHeight; } -+ int GetWidthHeightRatio() { return m_widthHeightRatio; } -+ -+ void SetConvBuffer(struct g2d_buf *b) { m_convBuffer = b; } -+ -+private: - unsigned int m_pctWidth; - unsigned int m_pctHeight; - int m_widthHeightRatio; -- --private: - double m_pts; - double m_dts; - VpuFieldType m_fieldType; -@@ -288,7 +290,6 @@ private: - static unsigned char i; - #endif - --public: - struct g2d_buf *m_convBuffer; - }; - -diff --git a/xbmc/linux/imx/IMX.h b/xbmc/linux/imx/IMX.h -index 201c1e9..50c1cdb 100644 ---- a/xbmc/linux/imx/IMX.h -+++ b/xbmc/linux/imx/IMX.h -@@ -177,8 +177,6 @@ public: - virtual void Lock() = 0; - virtual long Release() = 0; - -- int GetFormat() { return iFormat; } -- - public: - uint32_t iWidth; - uint32_t iHeight; --- -1.9.1 - - -============================================================== -file 0042-IMXRender-Refactor-to-improve-readability-and-perfor.patch -============================================================== - -From bc3d7cdaaeb4e6c532672f65d27509f312eff21e Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Sun, 1 Jan 2017 17:56:17 +0100 -Subject: [PATCH] IMXRender: Refactor to improve readability and performance - ---- - .../VideoRenderers/HwDecRender/RendererIMX.cpp | 29 ++++++++++------------ - .../VideoRenderers/HwDecRender/RendererIMX.h | 5 ++-- - 2 files changed, 15 insertions(+), 19 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp -index b5c7095..5167bd2 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp -@@ -34,13 +34,14 @@ - - CRendererIMX::CRendererIMX() - { -- m_bufHistory.clear(); -+ m_bufHistory[0] = m_bufHistory[1] = nullptr; - } - - CRendererIMX::~CRendererIMX() - { - UnInit(); -- std::for_each(m_bufHistory.begin(), m_bufHistory.end(), Release); -+ SAFE_RELEASE(m_bufHistory[1]); -+ SAFE_RELEASE(m_bufHistory[0]); - g_IMX.Deinitialize(); - } - -@@ -139,12 +140,7 @@ bool CRendererIMX::RenderUpdateVideoHook(bool clear, DWORD flags, DWORD alpha) - CDVDVideoCodecIMXBuffer *buffer = static_cast(m_buffers[m_iYV12RenderBuffer].hwDec); - if (buffer) - { -- if (!m_bufHistory.empty() && m_bufHistory.back() != buffer || m_bufHistory.empty()) -- { -- buffer->Lock(); -- m_bufHistory.push_back(buffer); -- } -- else if (!m_bufHistory.empty() && m_bufHistory.back() == buffer && flagsPrev == flags) -+ if (buffer == m_bufHistory[0] && flagsPrev == flags) - { - g_IMX.WaitVsync(); - return true; -@@ -152,12 +148,14 @@ bool CRendererIMX::RenderUpdateVideoHook(bool clear, DWORD flags, DWORD alpha) - - flagsPrev = flags; - -- int size = flags & RENDER_FLAG_FIELDMASK ? 2 : 1; -- while (m_bufHistory.size() > size) -- { -- m_bufHistory.front()->Release(); -- m_bufHistory.pop_front(); -- } -+ buffer->Lock(); -+ -+ SAFE_RELEASE(m_bufHistory[1]); -+ m_bufHistory[1] = m_bufHistory[0]; -+ m_bufHistory[0] = buffer; -+ -+ if (!(flags & RENDER_FLAG_FIELDMASK)) -+ SAFE_RELEASE(m_bufHistory[1]); - - // this hack is needed to get the 2D mode of a 3D movie going - RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); -@@ -206,8 +204,7 @@ bool CRendererIMX::RenderUpdateVideoHook(bool clear, DWORD flags, DWORD alpha) - } - } - -- CDVDVideoCodecIMXBuffer *buffer_p = m_bufHistory.front(); -- g_IMXContext.Blit(buffer_p == buffer ? nullptr : buffer_p, buffer, srcRect, dstRect, fieldFmt); -+ g_IMXContext.Blit(m_bufHistory[1], m_bufHistory[0], srcRect, dstRect, fieldFmt); - } - - #if 0 -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.h -index fc71e89..1a1ee2c 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.h -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.h -@@ -30,6 +30,8 @@ - - class CRendererIMX : public CLinuxRendererGLES - { -+ CDVDVideoCodecIMXBuffer *m_bufHistory[2]; -+ - public: - CRendererIMX(); - virtual ~CRendererIMX(); -@@ -61,9 +63,6 @@ protected: - virtual bool RenderHook(int index); - virtual int GetImageHook(YV12Image *image, int source = AUTOSOURCE, bool readonly = false); - virtual bool RenderUpdateVideoHook(bool clear, DWORD flags = 0, DWORD alpha = 255); -- -- std::deque m_bufHistory; -- static void Release(CDVDVideoCodecIMXBuffer *&t) { if (t) t->Release(); } - }; - - #endif --- -1.9.1 - - -============================================================== -file 0043-IMXCODEC-Refactor-IPUTask-for-better-readability-and.patch -============================================================== - -From 4228f95268bf1c9b1f4dec483914ee32f2f0b621 Mon Sep 17 00:00:00 2001 -From: warped-rudi -Date: Mon, 2 Jan 2017 09:20:05 +0100 -Subject: [PATCH] IMXCODEC: Refactor IPUTask for better readability and - performance - ---- - .../DVDCodecs/Video/DVDVideoCodecIMX.cpp | 168 ++++++++++----------- - .../VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h | 28 ++-- - 2 files changed, 95 insertions(+), 101 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index d498b45..6b0e2ee 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -1588,23 +1588,23 @@ void CIMXContext::Blit(CIMXBuffer *source_p, CIMXBuffer *source, const CRect &sr - else if (page < 0 || page >= m_fbPages) - return; - -- IPUTaskPtr ipu(new IPUTask(source_p, source, page)); -+ IPUTask task(source_p, source, page); - pg = (page + 1) % m_fbPages; - - #ifdef IMX_PROFILE_BUFFERS - unsigned long long before = XbmcThreads::SystemClockMillis(); - #endif - SetFieldData(fieldFmt, source->m_fps); -- PrepareTask(ipu, srcRect, dstRect); -+ PrepareTask(task, srcRect, dstRect); - -- if (DoTask(ipu)) -- m_fbCurrentPage = ipu->page | checkIPUStrideOffset(&ipu->task.input.deinterlace, IsDoubleRate()) << 4; -+ if (DoTask(task)) -+ m_fbCurrentPage = task.targetPage | checkIPUStrideOffset(&task.input.deinterlace, IsDoubleRate()) << 4; - - m_pingFlip.Set(); - - #ifdef IMX_PROFILE_BUFFERS - unsigned long long after = XbmcThreads::SystemClockMillis(); -- CLog::Log(LOGDEBUG, "+P 0x%x@%d %d\n", ((CDVDVideoCodecIMXBuffer*)ipu->current)->GetIdx(), ipu->page, (int)(after-before)); -+ CLog::Log(LOGDEBUG, "+P 0x%x@%d %d\n", ((CDVDVideoCodecIMXBuffer*)task.currBuf)->GetIdx(), task.targetPage, (int)(after-before)); - #endif - } - -@@ -1676,7 +1676,7 @@ void CIMXContext::Clear(int page) - SetProcessInfo(m_processInfo); - } - --void CIMXContext::PrepareTask(IPUTaskPtr &ipu, CRect srcRect, CRect dstRect) -+void CIMXContext::PrepareTask(IPUTask &task, CRect srcRect, CRect dstRect) - { - CRectInt iSrcRect, iDstRect; - -@@ -1721,95 +1721,95 @@ void CIMXContext::PrepareTask(IPUTaskPtr &ipu, CRect srcRect, CRect dstRect) - iDstRect.x2 = Align2((int)dstRect.x2,8); - iDstRect.y2 = Align2((int)dstRect.y2,8); - -- ipu->task.input.crop.pos.x = iSrcRect.x1; -- ipu->task.input.crop.pos.y = iSrcRect.y1; -- ipu->task.input.crop.w = iSrcRect.Width(); -- ipu->task.input.crop.h = iSrcRect.Height(); -+ task.input.crop.pos.x = iSrcRect.x1; -+ task.input.crop.pos.y = iSrcRect.y1; -+ task.input.crop.w = iSrcRect.Width(); -+ task.input.crop.h = iSrcRect.Height(); - -- ipu->task.output.crop.pos.x = iDstRect.x1; -- ipu->task.output.crop.pos.y = iDstRect.y1; -- ipu->task.output.crop.w = iDstRect.Width(); -- ipu->task.output.crop.h = iDstRect.Height(); -+ task.output.crop.pos.x = iDstRect.x1; -+ task.output.crop.pos.y = iDstRect.y1; -+ task.output.crop.w = iDstRect.Width(); -+ task.output.crop.h = iDstRect.Height(); - - // Setup deinterlacing if enabled - if (m_currentFieldFmt) - { -- ipu->task.input.deinterlace.enable = 1; -- ipu->task.input.deinterlace.motion = ipu->previous ? m_motion : HIGH_MOTION; -- ipu->task.input.deinterlace.field_fmt = m_currentFieldFmt; -+ task.input.deinterlace.enable = 1; -+ task.input.deinterlace.motion = task.prevBuf ? m_motion : HIGH_MOTION; -+ task.input.deinterlace.field_fmt = m_currentFieldFmt; - } - } - --bool CIMXContext::TileTask(IPUTaskPtr &ipu) -+bool CIMXContext::TileTask(IPUTask &task) - { - m_zoomAllowed = true; - - // on double rate deinterlacing this is reusing previous already rasterised frame -- if (ipu->current->iFormat != _4CC('T', 'N', 'V', 'F') && ipu->current->iFormat != _4CC('T', 'N', 'V', 'P')) -+ if (task.currBuf->iFormat != _4CC('T', 'N', 'V', 'F') && task.currBuf->iFormat != _4CC('T', 'N', 'V', 'P')) - { -- if (ipu->task.input.deinterlace.enable && ipu->task.input.deinterlace.motion != HIGH_MOTION) -+ if (task.input.deinterlace.enable && task.input.deinterlace.motion != HIGH_MOTION) - { -- ipu->task.input.paddr_n = ipu->task.input.paddr; -- ipu->task.input.paddr = ipu->previous->pPhysAddr; -+ task.input.paddr_n = task.input.paddr; -+ task.input.paddr = task.prevBuf->pPhysAddr; - } - return true; - } - - // Use band mode directly to FB, as no transformations needed (eg cropping) -- if (m_fps >= 49 && m_fbWidth == 1920 && ipu->task.input.width == 1920 && !ipu->task.input.deinterlace.enable) -+ if (m_fps >= 49 && m_fbWidth == 1920 && task.input.width == 1920 && !task.input.deinterlace.enable) - { - m_zoomAllowed = false; -- ipu->task.output.crop.pos.x = ipu->task.input.crop.pos.x = 0; -- ipu->task.output.crop.pos.y = ipu->task.input.crop.pos.y = 0; -- ipu->task.output.crop.h = ipu->task.input.height = ipu->task.input.crop.h = ipu->current->iHeight; -- ipu->task.output.crop.w = ipu->task.input.width = ipu->task.input.crop.w = ipu->current->iWidth; -- if (ipu->task.input.crop.h < m_fbHeight) -- ipu->task.output.paddr += m_fbLineLength * (m_fbHeight - ipu->task.input.crop.h)/2; -+ task.output.crop.pos.x = task.input.crop.pos.x = 0; -+ task.output.crop.pos.y = task.input.crop.pos.y = 0; -+ task.output.crop.h = task.input.height = task.input.crop.h = task.currBuf->iHeight; -+ task.output.crop.w = task.input.width = task.input.crop.w = task.currBuf->iWidth; -+ if (task.input.crop.h < m_fbHeight) -+ task.output.paddr += m_fbLineLength * (m_fbHeight - task.input.crop.h)/2; - return true; - } - - // check for 3-field deinterlace (no HIGH_MOTION allowed) from tile field format -- if (ipu->previous && ipu->current->iFormat == _4CC('T', 'N', 'V', 'F')) -+ if (task.prevBuf && task.currBuf->iFormat == _4CC('T', 'N', 'V', 'F')) - { -- ipu->task.input.paddr = ipu->previous->pPhysAddr; -- ipu->task.input.paddr_n = ipu->current->pPhysAddr; -- ipu->task.input.deinterlace.field_fmt = IPU_DEINTERLACE_FIELD_TOP; -- ipu->task.input.deinterlace.enable = true; -+ task.input.paddr = task.prevBuf->pPhysAddr; -+ task.input.paddr_n = task.currBuf->pPhysAddr; -+ task.input.deinterlace.field_fmt = IPU_DEINTERLACE_FIELD_TOP; -+ task.input.deinterlace.enable = true; - -- ipu->task.output.crop.pos.x = ipu->task.input.crop.pos.x = 0; -- ipu->task.output.crop.pos.y = ipu->task.input.crop.pos.y = 0; -- ipu->task.output.crop.h = ipu->task.input.height = ipu->task.input.crop.h = ipu->current->iHeight; -- ipu->task.output.crop.w = ipu->task.input.width = ipu->task.input.crop.w = ipu->current->iWidth; -+ task.output.crop.pos.x = task.input.crop.pos.x = 0; -+ task.output.crop.pos.y = task.input.crop.pos.y = 0; -+ task.output.crop.h = task.input.height = task.input.crop.h = task.currBuf->iHeight; -+ task.output.crop.w = task.input.width = task.input.crop.w = task.currBuf->iWidth; - -- return CheckTask(ipu) == 0; -+ return CheckTask(task) == 0; - } - - // rasterize from tile (frame) - struct ipu_task vdoa; - -- memset(&vdoa, 0, sizeof(ipu->task)); -- vdoa.input.width = vdoa.output.width = ipu->current->iWidth; -- vdoa.input.height = vdoa.output.height = ipu->current->iHeight; -- vdoa.input.format = ipu->current->iFormat; -+ memset(&vdoa, 0, sizeof(vdoa)); -+ vdoa.input.width = vdoa.output.width = task.currBuf->iWidth; -+ vdoa.input.height = vdoa.output.height = task.currBuf->iHeight; -+ vdoa.input.format = task.currBuf->iFormat; - -- vdoa.input.paddr = vdoa.input.paddr_n ? ipu->previous->pPhysAddr : ipu->current->pPhysAddr; -- vdoa.output.format = ipu->task.input.format = m_fbVar.bits_per_pixel == 16 ? _4CC('Y', 'U', 'Y', 'V') : _4CC('N', 'V', '1', '2'); -+ vdoa.input.paddr = vdoa.input.paddr_n ? task.prevBuf->pPhysAddr : task.currBuf->pPhysAddr; -+ vdoa.output.format = task.input.format = m_fbVar.bits_per_pixel == 16 ? _4CC('Y', 'U', 'Y', 'V') : _4CC('N', 'V', '1', '2'); - -- int check = CheckTask(ipu); -+ int check = CheckTask(task); - if (check == IPU_CHECK_ERR_PROC_NO_NEED) - { -- vdoa.output.paddr = ipu->task.output.paddr; -+ vdoa.output.paddr = task.output.paddr; - } - else - { -- struct g2d_buf *conv = g2d_alloc(ipu->current->iWidth *ipu->current->iHeight * 3, 0); -+ struct g2d_buf *conv = g2d_alloc(task.currBuf->iWidth *task.currBuf->iHeight * 3, 0); - if (!conv) - { - CLog::Log(LOGERROR, "iMX: can't allocate crop buffer"); - return false; - } - -- ((CDVDVideoCodecIMXBuffer*)ipu->current)->SetConvBuffer(conv); -+ ((CDVDVideoCodecIMXBuffer*)task.currBuf)->SetConvBuffer(conv); - vdoa.output.paddr = conv->buf_paddr; - } - -@@ -1820,50 +1820,50 @@ bool CIMXContext::TileTask(IPUTaskPtr &ipu) - return false; - } - -- ipu->task.input.paddr = vdoa.output.paddr; -+ task.input.paddr = vdoa.output.paddr; - -- if (ipu->current->iFormat == _4CC('T', 'N', 'V', 'F')) -+ if (task.currBuf->iFormat == _4CC('T', 'N', 'V', 'F')) - return true; - - // output of VDOA task was sent directly to FB. no more processing needed. - if (check == IPU_CHECK_ERR_PROC_NO_NEED) - return true; - -- if (ipu->task.input.deinterlace.enable && ipu->task.input.deinterlace.motion != HIGH_MOTION) -+ if (task.input.deinterlace.enable && task.input.deinterlace.motion != HIGH_MOTION) - { -- ipu->task.input.paddr_n = ipu->task.input.paddr; -- ipu->task.input.paddr = ipu->previous->pPhysAddr; -+ task.input.paddr_n = task.input.paddr; -+ task.input.paddr = task.prevBuf->pPhysAddr; - } -- ipu->current->iFormat = vdoa.output.format; -- ipu->current->pPhysAddr = vdoa.output.paddr; -+ task.currBuf->iFormat = vdoa.output.format; -+ task.currBuf->pPhysAddr = vdoa.output.paddr; - - return true; - } - --int CIMXContext::CheckTask(IPUTaskPtr &ipu) -+int CIMXContext::CheckTask(IPUTask &task) - { - //We really use IPU only if we have to deinterlace (using VDIC) - int ret = IPU_CHECK_ERR_INPUT_CROP; - while (ret > IPU_CHECK_ERR_MIN) - { -- ret = ioctl(m_ipuHandle, IPU_CHECK_TASK, &ipu->task); -+ ret = ioctl(m_ipuHandle, IPU_CHECK_TASK, &task); - switch (ret) - { - case IPU_CHECK_OK: - break; - case IPU_CHECK_ERR_SPLIT_INPUTW_OVER: -- ipu->task.input.crop.w -= 8; -+ task.input.crop.w -= 8; - break; - case IPU_CHECK_ERR_SPLIT_INPUTH_OVER: -- ipu->task.input.crop.h -= 8; -+ task.input.crop.h -= 8; - break; - case IPU_CHECK_ERR_SPLIT_OUTPUTW_OVER: -- ipu->task.output.width -= 8; -- ipu->task.output.crop.w = ipu->task.output.width; -+ task.output.width -= 8; -+ task.output.crop.w = task.output.width; - break; - case IPU_CHECK_ERR_SPLIT_OUTPUTH_OVER: -- ipu->task.output.height -= 8; -- ipu->task.output.crop.h = ipu->task.output.height; -+ task.output.height -= 8; -+ task.output.crop.h = task.output.height; - break; - // deinterlacing setup changing, m_ipuHandle is closed - case -1: -@@ -1879,41 +1879,41 @@ int CIMXContext::CheckTask(IPUTaskPtr &ipu) - return 0; - } - --bool CIMXContext::DoTask(IPUTaskPtr &ipu, CRect *dest) -+bool CIMXContext::DoTask(IPUTask &task, CRect *dest) - { - // Clear page if cropping changes -- CRectInt dstRect(ipu->task.output.crop.pos.x, ipu->task.output.crop.pos.y, -- ipu->task.output.crop.pos.x + ipu->task.output.crop.w, -- ipu->task.output.crop.pos.y + ipu->task.output.crop.h); -+ CRectInt dstRect(task.output.crop.pos.x, task.output.crop.pos.y, -+ task.output.crop.pos.x + task.output.crop.w, -+ task.output.crop.pos.y + task.output.crop.h); - - // Populate input block -- ipu->task.input.width = ipu->current->iWidth; -- ipu->task.input.height = ipu->current->iHeight; -- ipu->task.input.format = ipu->current->iFormat; -- ipu->task.input.paddr = ipu->current->pPhysAddr; -+ task.input.width = task.currBuf->iWidth; -+ task.input.height = task.currBuf->iHeight; -+ task.input.format = task.currBuf->iFormat; -+ task.input.paddr = task.currBuf->pPhysAddr; - -- ipu->task.output.width = m_fbWidth; -- ipu->task.output.height = m_fbHeight; -- ipu->task.output.format = m_fbVar.nonstd; -- ipu->task.output.paddr = m_fbPhysAddr + ipu->page*m_fbPageSize; -+ task.output.width = m_fbWidth; -+ task.output.height = m_fbHeight; -+ task.output.format = m_fbVar.nonstd; -+ task.output.paddr = m_fbPhysAddr + task.targetPage*m_fbPageSize; - -- if (m_pageCrops[ipu->page] != dstRect) -+ if (m_pageCrops[task.targetPage] != dstRect) - { -- m_pageCrops[ipu->page] = dstRect; -- Clear(ipu->page); -+ m_pageCrops[task.targetPage] = dstRect; -+ Clear(task.targetPage); - } - -- if ((ipu->task.input.crop.w <= 0) || (ipu->task.input.crop.h <= 0) -- || (ipu->task.output.crop.w <= 0) || (ipu->task.output.crop.h <= 0)) -+ if ((task.input.crop.w <= 0) || (task.input.crop.h <= 0) -+ || (task.output.crop.w <= 0) || (task.output.crop.h <= 0)) - return false; - -- if (!TileTask(ipu)) -+ if (!TileTask(task)) - return false; - -- if (CheckTask(ipu) == IPU_CHECK_ERR_PROC_NO_NEED) -+ if (CheckTask(task) == IPU_CHECK_ERR_PROC_NO_NEED) - return true; - -- int ret = ioctl(m_ipuHandle, IPU_QUEUE_TASK, &ipu->task); -+ int ret = ioctl(m_ipuHandle, IPU_QUEUE_TASK, &task); - if (ret < 0) - CLog::Log(LOGERROR, "IPU task failed: %s at #%d (ret %d)\n", strerror(errno), __LINE__, ret); - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -index 91f9b8c..5b56293 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.h -@@ -149,33 +149,27 @@ public: - static const int m_fbPages; - - private: -- struct IPUTask -+ struct IPUTask : public ipu_task - { -- IPUTask(CIMXBuffer *buffer_p, CIMXBuffer *buffer, int p = 0) -- : previous(buffer_p), current(buffer), page(p) -+ IPUTask(CIMXBuffer *buffer_p, CIMXBuffer *buffer, int page) -+ : prevBuf(buffer_p), currBuf(buffer), targetPage(page) - { -- memset(&task, 0, sizeof(task)); -+ memset(this, 0, sizeof(ipu_task)); - } - - // Kept for reference -- CIMXBuffer *previous; -- CIMXBuffer *current; -+ CIMXBuffer *prevBuf; -+ CIMXBuffer *currBuf; - -- // The actual task -- struct ipu_task task; -- -- unsigned int page; -- int shift = true; -+ unsigned int targetPage; - }; - -- typedef std::shared_ptr IPUTaskPtr; -- - bool GetFBInfo(const std::string &fbdev, struct fb_var_screeninfo *fbVar); - -- void PrepareTask(IPUTaskPtr &ipu, CRect srcRect, CRect dstRect); -- bool DoTask(IPUTaskPtr &ipu, CRect *dest = nullptr); -- bool TileTask(IPUTaskPtr &ipu); -- int CheckTask(IPUTaskPtr &ipu); -+ void PrepareTask(IPUTask &task, CRect srcRect, CRect dstRect); -+ bool DoTask(IPUTask &task, CRect *dest = nullptr); -+ bool TileTask(IPUTask &task); -+ int CheckTask(IPUTask &task); - - void SetFieldData(uint8_t fieldFmt, double fps); - --- -1.9.1 - - -============================================================== -file 0044-IMXCODEC-Fix-hang-on-exit-and-invalid-file-descripto.patch -============================================================== - -From 89ab2c4de60034d81df3c91a19f7e0e7522d1b5e Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Mon, 2 Jan 2017 22:23:24 +0100 -Subject: [PATCH] IMXCODEC: Fix hang on exit and invalid file descriptor - handling - ---- - .../DVDCodecs/Video/DVDVideoCodecIMX.cpp | 28 +++++++++++++--------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -index 6b0e2ee..9436d4e 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp -@@ -1268,11 +1268,11 @@ CDVDVideoCodecIMXBuffer::~CDVDVideoCodecIMXBuffer() - - CIMXContext::CIMXContext() - : CThread("iMX IPU") -- , m_fbHandle(0) -+ , m_fbHandle(-1) - , m_fbCurrentPage(0) - , m_fbPhysAddr(0) - , m_fbVirtAddr(NULL) -- , m_ipuHandle(0) -+ , m_ipuHandle(-1) - , m_vsync(true) - , m_pageCrops(NULL) - , m_bFbIsConfigured(false) -@@ -1281,13 +1281,17 @@ CIMXContext::CIMXContext() - , m_deviceName("/dev/fb1") - { - m_pageCrops = new CRectInt[m_fbPages]; -+ m_processInfo = 0; - OpenDevices(); - } - - CIMXContext::~CIMXContext() - { -- Stop(false); -+ Stop(); - Dispose(); -+ -+ m_processInfo = 0; -+ Clear(-1); - CloseDevices(); - } - -@@ -1439,7 +1443,7 @@ bool CIMXContext::OpenDevices() - m_fbHandle = open(m_deviceName.c_str(), O_RDWR, 0); - OpenIPU(); - -- bool opened = m_fbHandle > 0 && m_ipuHandle > 0; -+ bool opened = m_fbHandle != -1 && m_ipuHandle != -1; - if (!opened) - CLog::Log(LOGWARNING, "iMX : Failed to open framebuffer: %s\n", m_deviceName.c_str()); - -@@ -1448,10 +1452,10 @@ bool CIMXContext::OpenDevices() - - void CIMXContext::CloseIPU() - { -- if (m_ipuHandle) -+ if (m_ipuHandle != -1) - { - close(m_ipuHandle); -- m_ipuHandle = 0; -+ m_ipuHandle = -1; - } - } - -@@ -1459,10 +1463,10 @@ void CIMXContext::CloseDevices() - { - CLog::Log(LOGINFO, "iMX : Closing devices\n"); - -- if (m_fbHandle) -+ if (m_fbHandle != -1) - { - close(m_fbHandle); -- m_fbHandle = 0; -+ m_fbHandle = -1; - } - - CloseIPU(); -@@ -1470,7 +1474,7 @@ void CIMXContext::CloseDevices() - - bool CIMXContext::Blank() - { -- if (!m_fbHandle) return false; -+ if (m_fbHandle == -1) return false; - - m_bFbIsConfigured = false; - return ioctl(m_fbHandle, FBIOBLANK, 1) == 0; -@@ -1478,7 +1482,7 @@ bool CIMXContext::Blank() - - bool CIMXContext::Unblank() - { -- if (!m_fbHandle) return false; -+ if (m_fbHandle == -1) return false; - - int ret = ioctl(m_fbHandle, FBIOBLANK, FB_BLANK_UNBLANK); - m_bFbIsConfigured = true; -@@ -1620,7 +1624,7 @@ bool CIMXContext::ShowPage() - - { - CSingleLock lk(m_pageSwapLock); -- if (!m_bFbIsConfigured) -+ if (!m_bFbIsConfigured || m_fbHandle == -1 ) - return false; - } - -@@ -1632,6 +1636,8 @@ bool CIMXContext::ShowPage() - - if (ioctl(m_fbHandle, MXCFB_WAIT_FOR_VSYNC, nullptr) < 0 && !CIMX::IsBlank()) - CLog::Log(LOGWARNING, "Vsync failed: %s\n", strerror(errno)); -+ -+ return true; - } - - void CIMXContext::SetProcessInfo(CProcessInfo *m_pProcessInfo) --- -1.9.1 - - -============================================================== -file 0045-IMXRender-Fix-deinterlace-broken-by-refactor-patch.patch -============================================================== - -From 710564e27cc8fd7b83d0913ac72c311fa6fece3c Mon Sep 17 00:00:00 2001 -From: Rudi -Date: Sun, 8 Jan 2017 16:32:13 +0100 -Subject: [PATCH] IMXRender: Fix deinterlace broken by refactor patch - ---- - .../VideoRenderers/HwDecRender/RendererIMX.cpp | 20 +++++++++----------- - 1 file changed, 9 insertions(+), 11 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp -index 5167bd2..bd15091 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp -@@ -140,7 +140,14 @@ bool CRendererIMX::RenderUpdateVideoHook(bool clear, DWORD flags, DWORD alpha) - CDVDVideoCodecIMXBuffer *buffer = static_cast(m_buffers[m_iYV12RenderBuffer].hwDec); - if (buffer) - { -- if (buffer == m_bufHistory[0] && flagsPrev == flags) -+ if (m_bufHistory[0] != buffer) -+ { -+ buffer->Lock(); -+ SAFE_RELEASE(m_bufHistory[1]); -+ m_bufHistory[1] = m_bufHistory[0]; -+ m_bufHistory[0] = buffer; -+ } -+ else if (flagsPrev == flags) - { - g_IMX.WaitVsync(); - return true; -@@ -148,15 +155,6 @@ bool CRendererIMX::RenderUpdateVideoHook(bool clear, DWORD flags, DWORD alpha) - - flagsPrev = flags; - -- buffer->Lock(); -- -- SAFE_RELEASE(m_bufHistory[1]); -- m_bufHistory[1] = m_bufHistory[0]; -- m_bufHistory[0] = buffer; -- -- if (!(flags & RENDER_FLAG_FIELDMASK)) -- SAFE_RELEASE(m_bufHistory[1]); -- - // this hack is needed to get the 2D mode of a 3D movie going - RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); - if (stereo_mode) -@@ -204,7 +202,7 @@ bool CRendererIMX::RenderUpdateVideoHook(bool clear, DWORD flags, DWORD alpha) - } - } - -- g_IMXContext.Blit(m_bufHistory[1], m_bufHistory[0], srcRect, dstRect, fieldFmt); -+ g_IMXContext.Blit(m_bufHistory[1], buffer, srcRect, dstRect, fieldFmt); - } - - #if 0 --- -2.7.4 - - -============================================================== -file 400-Boost-Center-Audio-Channel-on-Downmixing.patch -============================================================== - -commit a509bdf1ed001423cad530c2f230937825ff2254 -Author: WRXTASY -Date: Tue Aug 18 09:40:19 2015 +0800 - - Boost Center Audio Channel on Downmixing - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index faf423c..cf123fe 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -18893,6 +18893,21 @@ msgstr "" - - #empty strings from id 37046 to 38009 - -+#: system/settings/settings.xml -+msgctxt "#38007" -+msgid "Boost centre channel when downmixing" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#38008" -+msgid "Increase this value to make the dialogue louder compared to background sounds when downmixing multichannel audio" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#38009" -+msgid "%i dB" -+msgstr "" -+ - #: system/settings/rbp.xml - msgctxt "#38010" - msgid "GPU accelerated" -diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 3ef33e0..44a9036 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -2040,6 +2040,18 @@ - - - -+ -+ 2 -+ 0 -+ -+ 0 -+ 1 -+ 30 -+ -+ -+ 38009 -+ -+ - - HAS_AE_QUALITY_LEVELS - 2 -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -index e4ddf9e..34d0152 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp -@@ -20,6 +20,8 @@ - - #include "cores/AudioEngine/Utils/AEUtil.h" - #include "ActiveAEResampleFFMPEG.h" -+#include "ServiceBroker.h" -+#include "settings/Settings.h" - #include "utils/log.h" - - extern "C" { -@@ -104,6 +105,12 @@ bool CActiveAEResampleFFMPEG::Init(uint64_t dst_chan_layout, int dst_channels, i - { - av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); - } -+ int boost_center = CServiceBroker::GetSettings().GetInt("audiooutput.boostcenter"); -+ if (boost_center) -+ { -+ float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f); -+ av_opt_set_double(m_pContext, "center_mix_level", gain, 0); -+ } - - if (remapLayout) - { - -============================================================== -file 53-imx-fix-edid-readout.patch -============================================================== - ---- a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 2016-09-25 15:18:47.780677140 +0200 -+++ b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 2016-09-25 15:18:47.808677141 +0200 -@@ -336,67 +336,55 @@ - float CEGLNativeTypeIMX::GetMonitorSAR() - { - FILE *f_edid; -- char *str = NULL; -- unsigned char p; -- size_t n; -- int done = 0; -+ int len; - - // kernels <= 3.18 use ./soc0/soc.1 in official imx kernel - // kernels > 3.18 use ./soc0/soc - f_edid = fopen("/sys/devices/soc0/soc/20e0000.hdmi_video/edid", "r"); - if(!f_edid) - f_edid = fopen("/sys/devices/soc0/soc.1/20e0000.hdmi_video/edid", "r"); -+ if(!f_edid) -+ f_edid = fopen("/sys/devices/soc0/soc.0/20e0000.hdmi_video/edid", "r"); - - if(!f_edid) - return 0; - -+ len = fread(m_edid, 1, EDID_MAXSIZE, f_edid); -+ if (len < 128) -+ { -+ fclose(f_edid); -+ return 0; -+ } -+ - // first check if EDID is in binary format by reading 512bytes, compare 1st 8bytes - // against EDID 1.4 identificator [0x0,0xff,0xff,0xff,0xff,0xff,0xff,0x0] - // if no match, seek to 0 input file and continue with previous method. -- if (((done = fread(m_edid, 1, EDID_MAXSIZE, f_edid)) % 128) == 0 && done) -- if (!memcmp(m_edid, EDID_HEADER, EDID_HEADERSIZE)) -- { -- fclose(f_edid); -- return true; -- } -- -- done = 0; -- memset(m_edid, 0, EDID_MAXSIZE); -- fseek(f_edid, 0L, SEEK_SET); -- // we need to convert mxc_hdmi output format to binary array -- // mxc_hdmi provides the EDID as space delimited 1bytes blocks -- // exported as text with format specifier %x eg: -- // 0x00 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0x00 0x4C 0x2D 0x7A 0x0A 0x00 0x00 0x00 0x00 -- // -- // this translates into the inner cycle where we move pointer first -- // with +2 to skip '0x', -- // we sscanf actual data (eg FF) into a byte, -- // we move over the FF and delimiting space with +3 -- // -- // this parses whole 512 byte long info into internal binary array for future -- // reference and use. current use is only to grab screen's physical params -- // at EGL init. -- while(getline(&str, &n, f_edid) > 0) -+ if (memcmp(m_edid, EDID_HEADER, EDID_HEADERSIZE) != 0) - { -- char *c = str; -- while(*c != '\n' && done < EDID_MAXSIZE) -- { -- c += 2; -- sscanf(c, "%hhx", &p); -- m_edid[done++] = p; -- c += 3; -- } -- if (str) -- free(str); -- str = NULL; -+ // we need to convert mxc_hdmi output format to binary array -+ // mxc_hdmi provides the EDID as space delimited 1bytes blocks -+ // exported as text with format specifier %x eg: -+ // 0x00 0xFF 0xFF 0xFF 0xFF 0xFF 0xFF 0x00 0x4C 0x2D 0x7A 0x0A 0x00 0x00 0x00 0x00 -+ // -+ // this parses whole 512 byte long info into internal binary array for future -+ // reference and use. current use is only to grab screen's physical params -+ // at EGL init. -+ len = 0; -+ fseek(f_edid, 0, SEEK_SET); -+ while (len < EDID_MAXSIZE && fscanf(f_edid, " 0x%2hhx", m_edid + len) == 1) -+ len++; - } -+ -+ if (len < EDID_MAXSIZE) -+ memset(m_edid + len, 0, EDID_MAXSIZE - len); -+ - fclose(f_edid); - - // info related to 'Basic display parameters.' is at offset 0x14-0x18. - // where W is 2nd byte, H 3rd. -- int cmWidth = (int)*(m_edid +EDID_STRUCT_DISPLAY +1); -- int cmHeight = (int)*(m_edid +EDID_STRUCT_DISPLAY +2); -- if (cmHeight > 0) -+ int cmWidth = m_edid[EDID_STRUCT_DISPLAY + 1]; -+ int cmHeight = m_edid[EDID_STRUCT_DISPLAY + 2]; -+ if (cmHeight > 0 && cmWidth > 0) - { - float t_sar = (float) cmWidth / cmHeight; - if (t_sar >= 0.33 && t_sar <= 3.0) - -============================================================== -file 55-cec-power-button.diff -============================================================== - ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-10-17 10:00:03.704969969 +0200 -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-10-17 10:00:03.724969970 +0200 -@@ -935,8 +935,14 @@ - case CEC_USER_CONTROL_CODE_POWER: - case CEC_USER_CONTROL_CODE_POWER_TOGGLE_FUNCTION: - case CEC_USER_CONTROL_CODE_POWER_OFF_FUNCTION: -- xbmcKey.iButton = XINPUT_IR_REMOTE_POWER; -- PushCecKeypress(xbmcKey); -+ // Instead of translating to XINPUT_IR_REMOTE_POWER key, we simulate -+ // CEC_OPCODE_STANDBY to avoid unconditional shutdown with some TVs. -+ { -+ cec_command command; -+ command.opcode = CEC_OPCODE_STANDBY; -+ command.initiator = CECDEVICE_TV; -+ CecCommand(this, &command); -+ } - break; - case CEC_USER_CONTROL_CODE_VOLUME_UP: - xbmcKey.iButton = XINPUT_IR_REMOTE_VOLUME_PLUS; - -============================================================== -file 58-kodi-fractional-rates.diff -============================================================== - ---- a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 2015-12-21 17:45:47.575690959 +0100 -+++ b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 2015-12-21 17:45:47.615712478 +0100 -@@ -434,7 +434,12 @@ - res->iHeight= h; - res->iScreenWidth = w; - res->iScreenHeight= h; -- res->fRefreshRate = r; -+ -+ if(r == 23 || (r % 10) == 9) -+ res->fRefreshRate = (float)((r + 1) * 1000) / 1001; -+ else -+ res->fRefreshRate = r; -+ - res->dwFlags = p[0] == 'p' ? D3DPRESENTFLAG_PROGRESSIVE : D3DPRESENTFLAG_INTERLACED; - - res->iScreen = 0; - -============================================================== -file 59-kodi-cache-embedded-thumbnails.diff -============================================================== - ---- a/xbmc/music/MusicThumbLoader.cpp 2016-01-31 15:03:34.251330287 +0100 -+++ b/xbmc/music/MusicThumbLoader.cpp 2016-01-31 15:03:34.275330288 +0100 -@@ -153,8 +153,11 @@ - - if (!pItem->HasArt("thumb")) - { -+ EmbeddedArt ea; -+ - // Look for embedded art -- if (pItem->HasMusicInfoTag() && !pItem->GetMusicInfoTag()->GetCoverArtInfo().empty()) -+ if (pItem->HasMusicInfoTag() && -+ (!pItem->GetMusicInfoTag()->GetCoverArtInfo().empty() || GetEmbeddedThumb(pItem->GetPath(), ea))) - { - // The item has got embedded art but user thumbs overrule, so check for those first - if (!FillThumb(*pItem, false)) // Check for user thumbs but ignore folder thumbs -@@ -162,6 +165,7 @@ - // No user thumb, use embedded art - std::string thumb = CTextureUtils::GetWrappedImageURL(pItem->GetPath(), "music"); - pItem->SetArt("thumb", thumb); -+ SetCachedImage(*pItem, "thumb", thumb); - } - } - else - -============================================================== -file 60-kodi-accumulate-data-for-visualisation.diff -============================================================== - ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp 2015-10-19 08:31:15.000000000 +0200 -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp 2016-02-07 18:32:00.431735589 +0100 -@@ -1315,15 +1315,19 @@ - if (!m_vizBuffers && !m_audioCallback.empty()) - { - AEAudioFormat vizFormat = m_internalFormat; -- vizFormat.m_channelLayout = AE_CH_LAYOUT_2_0; -- vizFormat.m_dataFormat = AE_FMT_FLOAT; -- vizFormat.m_sampleRate = 44100; -+ -+ // accumulate samples for the visualization addon -+ if (vizFormat.m_frames < 1536) -+ vizFormat.m_frames = 1536; - - // input buffers -- m_vizBuffersInput = new CActiveAEBufferPool(m_internalFormat); -+ m_vizBuffersInput = new CActiveAEBufferPool(vizFormat); - m_vizBuffersInput->Create(2000); - - // resample buffers -+ vizFormat.m_channelLayout = AE_CH_LAYOUT_2_0; -+ vizFormat.m_dataFormat = AE_FMT_FLOAT; -+ vizFormat.m_sampleRate = 44100; - m_vizBuffers = new CActiveAEBufferPoolResample(m_internalFormat, vizFormat, m_settings.resampleQuality); - //! @todo use cache of sync + water level - m_vizBuffers->Create(2000, false, false); -@@ -2147,18 +2151,33 @@ - m_vizInitialized = true; - } - -+ const int vizNumSamples = 512; // !!! Hack: This should be AUDIO_BUFFER_SIZE (addons/Visualization.h) - if (!m_vizBuffersInput->m_freeSamples.empty()) - { -- // copy the samples into the viz input buffer -- CSampleBuffer *viz = m_vizBuffersInput->GetFreeBuffer(); -- int samples = out->pkt->nb_samples; -- int bytes = samples * out->pkt->config.channels / out->pkt->planes * out->pkt->bytes_per_sample; -- for(int i= 0; i < out->pkt->planes; i++) -+ // copy the samples into the viz input buffer -+ CSampleBuffer *viz = m_vizBuffersInput->m_freeSamples.front(); -+ int samples = std::min(vizNumSamples - viz->pkt->nb_samples, out->pkt->nb_samples); -+ -+ // don't copy more than vizNumSamples -+ if (samples > 0) - { -- memcpy(viz->pkt->data[i], out->pkt->data[i], bytes); -+ int bytes = samples * out->pkt->config.channels / out->pkt->planes * out->pkt->bytes_per_sample; -+ int offset = viz->pkt->nb_samples * out->pkt->config.channels / out->pkt->planes * out->pkt->bytes_per_sample; -+ for(int i = 0; i < out->pkt->planes; i++) -+ memcpy(viz->pkt->data[i] + offset, out->pkt->data[i], bytes); -+ } -+ -+ // consume complete source packet -+ viz->pkt->nb_samples += out->pkt->nb_samples; -+ if (viz->pkt->nb_samples >= viz->pkt->max_nb_samples) -+ { -+ // set valid sample count -+ viz->pkt->nb_samples = vizNumSamples; -+ -+ m_vizBuffersInput->m_freeSamples.pop_front(); -+ viz->refCount = 1; -+ m_vizBuffers->m_inputSamples.push_back(viz); - } -- viz->pkt->nb_samples = samples; -- m_vizBuffers->m_inputSamples.push_back(viz); - } - else - CLog::Log(LOGWARNING,"ActiveAE::%s - viz ran out of free buffers", __FUNCTION__); -@@ -2183,7 +2202,12 @@ - } - } - else if (m_vizBuffers) -+ { -+ if (!m_vizBuffersInput->m_freeSamples.empty()) -+ m_vizBuffersInput->m_freeSamples.front()->pkt->nb_samples = 0; -+ - m_vizBuffers->Flush(); -+ } - } - - // mix gui sounds - -============================================================== -file 65-fix-cec-dialog-text.diff -============================================================== - ---- a/addons/resource.language.en_gb/resources/strings.po 2016-08-06 13:03:04.169879835 +0200 -+++ b/addons/resource.language.en_gb/resources/strings.po 2016-08-06 13:03:04.197879836 +0200 -@@ -16416,7 +16416,7 @@ - - #: system/peripherals.xml - msgctxt "#36026" --msgid "Devices to also put in standby mode" -+msgid "Switch off the TV when the PC goes to standby" - msgstr "" - - #: xbmc/peripherals/devices/PeripheralCecAdapter.cpp - -============================================================== -file 66-fix-buffering-indicator.diff -============================================================== - ---- a/xbmc/video/windows/GUIWindowFullScreen.cpp 2016-10-01 14:30:58.000000000 +0200 -+++ b/xbmc/video/windows/GUIWindowFullScreen.cpp 2016-10-01 20:02:57.037598834 +0200 -@@ -485,14 +485,16 @@ - - void CGUIWindowFullScreen::Process(unsigned int currentTime, CDirtyRegionList &dirtyregion) - { -- if (g_application.m_pPlayer->IsRenderingGuiLayer()) -- MarkDirtyRegion(); -+ unsigned int oldDirty = dirtyregion.size(); - - CGUIWindow::Process(currentTime, dirtyregion); - - //! @todo This isn't quite optimal - ideally we'd only be dirtying up the actual video render rect - //! which is probably the job of the renderer as it can more easily track resizing etc. - m_renderRegion.SetRect(0, 0, (float)g_graphicsContext.GetWidth(), (float)g_graphicsContext.GetHeight()); -+ -+ if (dirtyregion.size() != oldDirty || g_application.m_pPlayer->IsRenderingGuiLayer()) -+ dirtyregion.push_back(m_renderRegion); - } - - void CGUIWindowFullScreen::Render() diff --git a/projects/imx6/patches/kodi/kodi-100-libreelec-extras.patch b/projects/imx6/patches/kodi/kodi-100-libreelec-extras.patch deleted file mode 100644 index 15368aa6f7..0000000000 --- a/projects/imx6/patches/kodi/kodi-100-libreelec-extras.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6a535e23bef1d08f20e332d3caa5f080660a7596 Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Sun, 1 Jan 2017 18:00:29 +0100 -Subject: [PATCH] disable suspend and hibernate - ---- - xbmc/powermanagement/linux/LogindUPowerSyscall.cpp | 4 ++-- - xbmc/powermanagement/linux/UPowerSyscall.cpp | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -index 4e5bcc6..8dc4fb1 100644 ---- a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -+++ b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -@@ -52,8 +52,8 @@ CLogindUPowerSyscall::CLogindUPowerSyscall() - - m_canPowerdown = LogindCheckCapability("CanPowerOff"); - m_canReboot = LogindCheckCapability("CanReboot"); -- m_canHibernate = LogindCheckCapability("CanHibernate"); -- m_canSuspend = LogindCheckCapability("CanSuspend"); -+ m_canHibernate = false; -+ m_canSuspend = false; - - InhibitDelayLock(); - -diff --git a/xbmc/powermanagement/linux/UPowerSyscall.cpp b/xbmc/powermanagement/linux/UPowerSyscall.cpp -index e3b4725..bddb7c6 100644 ---- a/xbmc/powermanagement/linux/UPowerSyscall.cpp -+++ b/xbmc/powermanagement/linux/UPowerSyscall.cpp -@@ -262,8 +262,8 @@ bool CUPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback) - - void CUPowerSyscall::UpdateCapabilities() - { -- m_CanSuspend = CDBusUtil::GetVariant("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "CanSuspend").asBoolean(false); -- m_CanHibernate = CDBusUtil::GetVariant("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "CanHibernate").asBoolean(false); -+ m_CanSuspend = false; -+ m_CanHibernate = false; - } - - #endif --- -2.7.1 - From 0ce2327adc4b765522476420f35e01b5c32719fd Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 11 Feb 2017 13:01:50 -0800 Subject: [PATCH 7/7] kodi: drop unneeded patch --- ...-PYTHONOPTIMIZE-with-external-Python.patch | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 packages/mediacenter/kodi/patches/kodi-100.01-enable-PYTHONOPTIMIZE-with-external-Python.patch diff --git a/packages/mediacenter/kodi/patches/kodi-100.01-enable-PYTHONOPTIMIZE-with-external-Python.patch b/packages/mediacenter/kodi/patches/kodi-100.01-enable-PYTHONOPTIMIZE-with-external-Python.patch deleted file mode 100644 index 6fbbdf343b..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-100.01-enable-PYTHONOPTIMIZE-with-external-Python.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 26d1905c371dd7e0e23bb589ccf29f2bfec5b8af Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sat, 18 Apr 2015 15:12:49 +0300 -Subject: [PATCH 01/13] enable PYTHONOPTIMIZE with external Python - ---- - xbmc/interfaces/python/XBPython.cpp | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp -index af8d608..6213dbe 100644 ---- a/xbmc/interfaces/python/XBPython.cpp -+++ b/xbmc/interfaces/python/XBPython.cpp -@@ -568,10 +568,9 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker *invoker) - // at http://docs.python.org/using/cmdline.html#environment-variables - - #if !defined(TARGET_WINDOWS) && !defined(TARGET_ANDROID) -- /* PYTHONOPTIMIZE is set off intentionally when using external Python. -- Reason for this is because we cannot be sure what version of Python -- was used to compile the various Python object files (i.e. .pyo, -- .pyc, etc.). */ -+ // Required for python to find optimized code (pyo) files -+ setenv("PYTHONOPTIMIZE", "1", 1); -+ - // check if we are running as real xbmc.app or just binary - if (!CUtil::GetFrameworksPath(true).empty()) - { --- -2.5.0 -