Skip to content

Commit

Permalink
SVT-AV1-1.7.0 (WIP)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fd00
fd00 committed Dec 3, 2023
1 parent e980e57 commit afa65fa
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 64 deletions.
50 changes: 25 additions & 25 deletions SVT-AV1/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,48 +7,45 @@ encoding / transcoding video applications. The SVT-AV1 decoder implementation
is targeting future codec research activities.

Runtime requirements:
cygwin-3.3.5-1
cygwin-devel-3.3.5-1
libSvtAv1-devel-1.1.0-1bl1
libSvtAv1_1-1.1.0-1bl1
libgcc1-11.3.0-1
libgtest0-1.11.0-1bl1
libstdc++6-11.3.0-1
pkg-config-1.8.0-1
cygwin-3.5.0-0.494.gcb21f8bc56c2
libSvtAv1-devel-1.7.0-1bl1
libSvtAv1_1-1.7.0-1bl1
libgcc1-11.4.0-1
libgtest0-1.14.0-1bl1
libstdc++6-11.4.0-1
pkg-config-2.1.0-1

Build requirements:
(besides corresponding -devel packages)
autoconf-15-1
automake-11-1
binutils-2.38-1
cmake-3.20.0-1
cygport-0.35.1-1
gcc-core-11.3.0-1
gcc-g++-11.3.0-1
libgtest-devel-1.11.0-1bl1
ninja-1.11.0-1
binutils-2.41-3
cmake-3.25.3-1
cygport-0.36.7-1
gcc-core-11.4.0-1
gcc-g++-11.4.0-1
libgtest-devel-1.14.0-1bl1
ninja-1.11.1-1
yasm-1.3.0-2

Canonical website:
https://github.com/AOMediaCodec/SVT-AV1
https://gitlab.com/AOMediaCodec/SVT-AV1

Canonical download:
https://github.com/AOMediaCodec/SVT-AV1/archive/refs/tags/v1.1.0.tar.gz
https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v1.7.0/SVT-AV1-v1.7.0.tar.bz2

-------------------------------------------

Build instructions:
1. unpack SVT-AV1-1.1.0-X-src.tar.xz
1. unpack SVT-AV1-1.7.0-X-src.tar.xz
2. if you use setup to install this src package,
it will be unpacked under /usr/src automatically
% cd /usr/src
% cygport ./SVT-AV1-1.1.0-X.cygport all
% cygport ./SVT-AV1-1.7.0-X.cygport all

This will create:
/usr/src/SVT-AV1-1.1.0-X-src.tar.xz
/usr/src/SVT-AV1-1.1.0-X.tar.xz
/usr/src/libSvtAv1_1-1.1.0-X.tar.xz
/usr/src/libSvtAv1-devel-1.1.0-X.tar.xz
/usr/src/SVT-AV1-1.7.0-X-src.tar.xz
/usr/src/SVT-AV1-1.7.0-X.tar.xz
/usr/src/libSvtAv1_1-1.7.0-X.tar.xz
/usr/src/libSvtAv1-devel-1.7.0-X.tar.xz

-------------------------------------------

Expand Down Expand Up @@ -90,6 +87,9 @@ Files included in the binary package:

Port Notes:

----- version 1.7.0-1bl1 -----
Version bump.

----- version 1.1.0-1bl1 -----
Version bump.

Expand Down
9 changes: 7 additions & 2 deletions SVT-AV1/SVT-AV1-1.1.0-1bl1.cygport → SVT-AV1/SVT-AV1-1.7.0-1bl1.cygport
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
HOMEPAGE="https://github.com/AOMediaCodec/${PN}"
SRC_URI="https://github.com/AOMediaCodec/${PN}/archive/refs/tags/v${PV}.tar.gz"
HOMEPAGE="https://gitlab.com/AOMediaCodec/${PN}"
SRC_URI="https://gitlab.com/AOMediaCodec/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
SRC_DIR="${PN}-v${PV}"

CATEGORY="Libs"
SUMMARY="Scalable Video Technology for AV1"
Expand All @@ -9,6 +10,10 @@ a work-in-progress targeting performance levels applicable to both VOD and
Live encoding / transcoding video applications. The SVT-AV1 decoder
implementation is targeting future codec research activities."

LICENSE="BSD-3-Clause"
LICENSE_SPDX="SPDX-License-Identifier: BSD-3-Clause"
LICENSE_URI="LICENSE.md"

BUILD_REQUIRES="libgtest-devel yasm"

inherit cmake
Expand Down
76 changes: 39 additions & 37 deletions SVT-AV1/SVT-AV1-1.1.0-1bl1.src.patch → SVT-AV1/SVT-AV1-1.7.0-1bl1.src.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
--- origsrc/SVT-AV1-1.1.0/CMakeLists.txt 2022-05-18 13:05:11.000000000 +0900
+++ src/SVT-AV1-1.1.0/CMakeLists.txt 2022-06-17 13:47:04.101435400 +0900
@@ -207,7 +207,7 @@ if(UNIX)
set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
--- origsrc/SVT-AV1-v1.7.0/CMakeLists.txt 2023-08-24 05:15:16.000000000 +0900
+++ src/SVT-AV1-v1.7.0/CMakeLists.txt 2023-12-03 14:50:58.703466700 +0900
@@ -209,7 +209,7 @@ if(UNIX)
set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
endif()
- else()
+ elseif(NOT CYGWIN)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie -z noexecstack -z relro -z now")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z noexecstack -z relro -z now")
endif()
endif()
@@ -533,8 +533,11 @@ endif()
@@ -584,8 +584,11 @@ endif()
if(BUILD_TESTING)
include(CTest)
message(STATUS "Building UnitTests")
Expand All @@ -22,9 +22,9 @@
endif()

add_subdirectory(third_party/fastfeat)
--- origsrc/SVT-AV1-1.1.0/Source/App/EncApp/EbAppConfig.c 2022-05-18 13:05:11.000000000 +0900
+++ src/SVT-AV1-1.1.0/Source/App/EncApp/EbAppConfig.c 2022-06-17 13:47:04.108623700 +0900
@@ -23,8 +23,15 @@
--- origsrc/SVT-AV1-v1.7.0/Source/App/EncApp/EbAppConfig.c 2023-08-24 05:15:16.000000000 +0900
+++ src/SVT-AV1-v1.7.0/Source/App/EncApp/EbAppConfig.c 2023-12-03 15:05:56.131257100 +0900
@@ -25,8 +25,15 @@
#include <io.h>
#else
#include <unistd.h>
Expand All @@ -38,33 +38,33 @@
#endif
+#endif

#if !defined(_WIN32) || !defined(HAVE_STRNLEN_S)
#include "third_party/safestringlib/safe_str_lib.h"
--- origsrc/SVT-AV1-1.1.0/Source/Lib/Common/Codec/EbUtility.c 2022-05-18 13:05:11.000000000 +0900
+++ src/SVT-AV1-1.1.0/Source/Lib/Common/Codec/EbUtility.c 2022-06-17 13:47:04.118462100 +0900
@@ -231,17 +231,17 @@ const CodedBlockStats* get_coded_blk_sta
#include "EbAppOutputivf.h"

--- origsrc/SVT-AV1-v1.7.0/Source/Lib/Common/Codec/EbUtility.c 2023-08-24 05:15:16.000000000 +0900
+++ src/SVT-AV1-v1.7.0/Source/Lib/Common/Codec/EbUtility.c 2023-12-03 14:52:14.663399000 +0900
@@ -229,17 +229,17 @@ const CodedBlockStats* svt_aom_get_coded
* the log2f of a 32-bit number
*****************************************/
uint32_t log2f_32(uint32_t x) {
uint32_t svt_aom_log2f_32(uint32_t x) {
- uint32_t log = 0;
+ uint32_t log_ = 0;
+ uint32_t _log = 0;
int32_t i;
for (i = 4; i >= 0; --i) {
const uint32_t shift = (1 << i);
const uint32_t n = x >> shift;
if (n != 0) {
x = n;
- log += shift;
+ log_ += shift;
+ _log += shift;
}
}
- return log;
+ return log_;
+ return _log;
}
// concatenate two linked list, and return the pointer to the new concatenated list
EbLinkedListNode* concat_eb_linked_list(EbLinkedListNode* a, EbLinkedListNode* b) {
--- origsrc/SVT-AV1-1.1.0/Source/Lib/Decoder/CMakeLists.txt 2022-05-18 13:05:11.000000000 +0900
+++ src/SVT-AV1-1.1.0/Source/Lib/Decoder/CMakeLists.txt 2022-06-17 13:48:22.629859700 +0900
EbLinkedListNode* svt_aom_concat_eb_linked_list(EbLinkedListNode* a, EbLinkedListNode* b) {
--- origsrc/SVT-AV1-v1.7.0/Source/Lib/Decoder/CMakeLists.txt 2023-08-24 05:15:16.000000000 +0900
+++ src/SVT-AV1-v1.7.0/Source/Lib/Decoder/CMakeLists.txt 2023-12-03 14:52:49.417479300 +0900
@@ -11,9 +11,9 @@
# Decoder Library directory CMakeLists.txt

Expand All @@ -73,13 +73,13 @@
-set(DEC_VERSION_MINOR 8)
-set(DEC_VERSION_PATCH 7)
+set(DEC_VERSION_MAJOR 1)
+set(DEC_VERSION_MINOR 1)
+set(DEC_VERSION_MINOR 7)
+set(DEC_VERSION_PATCH 0)
set(DEC_VERSION ${DEC_VERSION_MAJOR}.${DEC_VERSION_MINOR}.${DEC_VERSION_PATCH})

if(UNIX)
--- origsrc/SVT-AV1-1.1.0/test/CMakeLists.txt 2022-05-18 13:05:11.000000000 +0900
+++ src/SVT-AV1-1.1.0/test/CMakeLists.txt 2022-06-17 13:47:04.146450100 +0900
--- origsrc/SVT-AV1-v1.7.0/test/CMakeLists.txt 2023-08-24 05:15:16.000000000 +0900
+++ src/SVT-AV1-v1.7.0/test/CMakeLists.txt 2023-12-03 14:54:28.287341000 +0900
@@ -14,7 +14,6 @@
# Include Subdirectories
include_directories(${PROJECT_SOURCE_DIR}/test/
Expand All @@ -99,10 +99,10 @@
# Define helper functions and macros used by Google Test.
include(../third_party/googletest/cmake/internal_utils.cmake)

@@ -85,8 +88,14 @@ set(lib_list
$<TARGET_OBJECTS:ENCODER_ASM_AVX2>
@@ -152,8 +155,14 @@ set(lib_list
$<TARGET_OBJECTS:ENCODER_ASM_AVX512>
$<TARGET_OBJECTS:ENCODER_GLOBALS>
$<TARGET_OBJECTS:ENCODER_CODEC>
- cpuinfo_public
- gtest_all)
+ cpuinfo_public)
Expand All @@ -116,16 +116,16 @@
if(UNIX)
# App Source Files
add_executable(SvtAv1UnitTests
@@ -110,4 +119,6 @@ install(TARGETS SvtAv1UnitTests RUNTIME
@@ -177,4 +186,6 @@ install(TARGETS SvtAv1UnitTests RUNTIME
add_test(SvtAv1UnitTests ${CMAKE_OUTPUT_DIRECTORY}/SvtAv1UnitTests)

add_subdirectory(api_test)
-add_subdirectory(e2e_test)
+if (NOT CYGWIN)
+ add_subdirectory(e2e_test)
+endif()
--- origsrc/SVT-AV1-1.1.0/test/PaletteModeUtilTest.cc 2022-05-18 13:05:11.000000000 +0900
+++ src/SVT-AV1-1.1.0/test/PaletteModeUtilTest.cc 2022-06-17 13:47:04.153454600 +0900
--- origsrc/SVT-AV1-v1.7.0/test/PaletteModeUtilTest.cc 2023-08-24 05:15:16.000000000 +0900
+++ src/SVT-AV1-v1.7.0/test/PaletteModeUtilTest.cc 2023-12-03 14:55:00.555393500 +0900
@@ -22,6 +22,7 @@
* @author Cidana-Edmond
*
Expand All @@ -134,9 +134,9 @@
#include <vector>
#include "gtest/gtest.h"
// workaround to eliminate the compiling warning on linux
--- origsrc/SVT-AV1-1.1.0/test/api_test/CMakeLists.txt 2022-05-18 13:05:11.000000000 +0900
+++ src/SVT-AV1-1.1.0/test/api_test/CMakeLists.txt 2022-06-17 13:47:04.158518700 +0900
@@ -14,17 +14,26 @@
--- origsrc/SVT-AV1-v1.7.0/test/api_test/CMakeLists.txt 2023-08-24 05:15:16.000000000 +0900
+++ src/SVT-AV1-v1.7.0/test/api_test/CMakeLists.txt 2023-12-03 14:55:48.454454800 +0900
@@ -14,10 +14,14 @@

# Include Subdirectories
include_directories(${PROJECT_SOURCE_DIR}/test/
Expand All @@ -150,9 +150,11 @@
+ ${PROJECT_SOURCE_DIR}/third_party/googletest/src)
+endif()
+
file(GLOB all_files
"*.h"
"*.cc")
set(all_files
SvtAv1EncApiTest.cc
SvtAv1EncApiTest.h
@@ -26,8 +30,13 @@ set(all_files
)

set(lib_list
- SvtAv1Enc
Expand Down

0 comments on commit afa65fa

Please sign in to comment.