From 68569dee1416593955c1570d638b3d9250b33012 Mon Sep 17 00:00:00 2001 From: trav90 Date: Mon, 15 Oct 2018 21:45:30 -0500 Subject: Import aom library This is the reference implementation for the Alliance for Open Media's av1 video code. The commit used was 4d668d7feb1f8abd809d1bca0418570a7f142a36. --- third_party/aom/aom_scale/aom_scale.cmake | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 third_party/aom/aom_scale/aom_scale.cmake (limited to 'third_party/aom/aom_scale/aom_scale.cmake') diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/third_party/aom/aom_scale/aom_scale.cmake new file mode 100644 index 000000000..a6aa31afc --- /dev/null +++ b/third_party/aom/aom_scale/aom_scale.cmake @@ -0,0 +1,34 @@ +## +## Copyright (c) 2017, Alliance for Open Media. All rights reserved +## +## This source code is subject to the terms of the BSD 2 Clause License and +## the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License +## was not distributed with this source code in the LICENSE file, you can +## obtain it at www.aomedia.org/license/software. If the Alliance for Open +## Media Patent License 1.0 was not distributed with this source code in the +## PATENTS file, you can obtain it at www.aomedia.org/license/patent. +## +set(AOM_SCALE_SOURCES + "${AOM_ROOT}/aom_scale/aom_scale.h" + "${AOM_ROOT}/aom_scale/generic/aom_scale.c" + "${AOM_ROOT}/aom_scale/generic/gen_scalers.c" + "${AOM_ROOT}/aom_scale/generic/yv12config.c" + "${AOM_ROOT}/aom_scale/generic/yv12extend.c" + "${AOM_ROOT}/aom_scale/yv12config.h") + +set(AOM_SCALE_INTRIN_DSPR2 + "${AOM_ROOT}/aom_scale/mips/dspr2/yv12extend_dspr2.c") + +# Creates the aom_scale build target and makes libaom depend on it. The libaom +# target must exist before this function is called. +function (setup_aom_scale_targets) + add_library(aom_scale OBJECT ${AOM_SCALE_SOURCES}) + target_sources(aom PUBLIC $) + + if (HAVE_DSPR2) + add_intrinsics_object_library("" "dspr2" "aom_scale" + "AOM_SCALE_INTRIN_DSPR2") + endif () + + set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) +endfunction () -- cgit v1.2.3 From df9477dfa60ebb5d31bc142e58ce46535c17abce Mon Sep 17 00:00:00 2001 From: trav90 Date: Wed, 17 Oct 2018 05:59:08 -0500 Subject: Update aom to slightly newer commit ID --- third_party/aom/aom_scale/aom_scale.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'third_party/aom/aom_scale/aom_scale.cmake') diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/third_party/aom/aom_scale/aom_scale.cmake index a6aa31afc..e1e3f6cfb 100644 --- a/third_party/aom/aom_scale/aom_scale.cmake +++ b/third_party/aom/aom_scale/aom_scale.cmake @@ -8,6 +8,9 @@ ## Media Patent License 1.0 was not distributed with this source code in the ## PATENTS file, you can obtain it at www.aomedia.org/license/patent. ## +if (NOT AOM_AOM_SCALE_AOM_SCALE_CMAKE_) +set(AOM_AOM_SCALE_AOM_SCALE_CMAKE_ 1) + set(AOM_SCALE_SOURCES "${AOM_ROOT}/aom_scale/aom_scale.h" "${AOM_ROOT}/aom_scale/generic/aom_scale.c" @@ -32,3 +35,5 @@ function (setup_aom_scale_targets) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) endfunction () + +endif () # AOM_AOM_SCALE_AOM_SCALE_CMAKE_ -- cgit v1.2.3 From 7369c7d7a5eed32963d8af37658286617919f91c Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 06:04:57 -0500 Subject: Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918 --- third_party/aom/aom_scale/aom_scale.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/aom/aom_scale/aom_scale.cmake') diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/third_party/aom/aom_scale/aom_scale.cmake index e1e3f6cfb..b52fd83dc 100644 --- a/third_party/aom/aom_scale/aom_scale.cmake +++ b/third_party/aom/aom_scale/aom_scale.cmake @@ -26,11 +26,11 @@ set(AOM_SCALE_INTRIN_DSPR2 # target must exist before this function is called. function (setup_aom_scale_targets) add_library(aom_scale OBJECT ${AOM_SCALE_SOURCES}) - target_sources(aom PUBLIC $) + target_sources(aom PRIVATE $) if (HAVE_DSPR2) add_intrinsics_object_library("" "dspr2" "aom_scale" - "AOM_SCALE_INTRIN_DSPR2") + "AOM_SCALE_INTRIN_DSPR2" "aom_scale") endif () set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) -- cgit v1.2.3 From ec910d81405c736a4490383a250299a7837c2e64 Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 21:53:44 -0500 Subject: Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614 --- third_party/aom/aom_scale/aom_scale.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/aom/aom_scale/aom_scale.cmake') diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/third_party/aom/aom_scale/aom_scale.cmake index b52fd83dc..1c00b590e 100644 --- a/third_party/aom/aom_scale/aom_scale.cmake +++ b/third_party/aom/aom_scale/aom_scale.cmake @@ -30,7 +30,7 @@ function (setup_aom_scale_targets) if (HAVE_DSPR2) add_intrinsics_object_library("" "dspr2" "aom_scale" - "AOM_SCALE_INTRIN_DSPR2" "aom_scale") + "AOM_SCALE_INTRIN_DSPR2" "aom") endif () set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) -- cgit v1.2.3 From bbcc64772580c8a979288791afa02d30bc476d2e Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 21:52:15 -0500 Subject: Update aom to v1.0.0 Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0. --- third_party/aom/aom_scale/aom_scale.cmake | 51 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 26 deletions(-) (limited to 'third_party/aom/aom_scale/aom_scale.cmake') diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/third_party/aom/aom_scale/aom_scale.cmake index 1c00b590e..197dea6bd 100644 --- a/third_party/aom/aom_scale/aom_scale.cmake +++ b/third_party/aom/aom_scale/aom_scale.cmake @@ -1,39 +1,38 @@ -## -## Copyright (c) 2017, Alliance for Open Media. All rights reserved -## -## This source code is subject to the terms of the BSD 2 Clause License and -## the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License -## was not distributed with this source code in the LICENSE file, you can -## obtain it at www.aomedia.org/license/software. If the Alliance for Open -## Media Patent License 1.0 was not distributed with this source code in the -## PATENTS file, you can obtain it at www.aomedia.org/license/patent. -## -if (NOT AOM_AOM_SCALE_AOM_SCALE_CMAKE_) +# +# Copyright (c) 2017, Alliance for Open Media. All rights reserved +# +# This source code is subject to the terms of the BSD 2 Clause License and the +# Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License was +# not distributed with this source code in the LICENSE file, you can obtain it +# at www.aomedia.org/license/software. If the Alliance for Open Media Patent +# License 1.0 was not distributed with this source code in the PATENTS file, you +# can obtain it at www.aomedia.org/license/patent. +# +if(AOM_AOM_SCALE_AOM_SCALE_CMAKE_) + return() +endif() # AOM_AOM_SCALE_AOM_SCALE_CMAKE_ set(AOM_AOM_SCALE_AOM_SCALE_CMAKE_ 1) -set(AOM_SCALE_SOURCES - "${AOM_ROOT}/aom_scale/aom_scale.h" - "${AOM_ROOT}/aom_scale/generic/aom_scale.c" - "${AOM_ROOT}/aom_scale/generic/gen_scalers.c" - "${AOM_ROOT}/aom_scale/generic/yv12config.c" - "${AOM_ROOT}/aom_scale/generic/yv12extend.c" - "${AOM_ROOT}/aom_scale/yv12config.h") +list(APPEND AOM_SCALE_SOURCES "${AOM_ROOT}/aom_scale/aom_scale.h" + "${AOM_ROOT}/aom_scale/generic/aom_scale.c" + "${AOM_ROOT}/aom_scale/generic/gen_scalers.c" + "${AOM_ROOT}/aom_scale/generic/yv12config.c" + "${AOM_ROOT}/aom_scale/generic/yv12extend.c" + "${AOM_ROOT}/aom_scale/yv12config.h") -set(AOM_SCALE_INTRIN_DSPR2 - "${AOM_ROOT}/aom_scale/mips/dspr2/yv12extend_dspr2.c") +list(APPEND AOM_SCALE_INTRIN_DSPR2 + "${AOM_ROOT}/aom_scale/mips/dspr2/yv12extend_dspr2.c") # Creates the aom_scale build target and makes libaom depend on it. The libaom # target must exist before this function is called. -function (setup_aom_scale_targets) +function(setup_aom_scale_targets) add_library(aom_scale OBJECT ${AOM_SCALE_SOURCES}) target_sources(aom PRIVATE $) - if (HAVE_DSPR2) + if(HAVE_DSPR2) add_intrinsics_object_library("" "dspr2" "aom_scale" "AOM_SCALE_INTRIN_DSPR2" "aom") - endif () + endif() set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) -endfunction () - -endif () # AOM_AOM_SCALE_AOM_SCALE_CMAKE_ +endfunction() -- cgit v1.2.3