1.13.1
This commit is contained in:
Tom Callaway
parent
2c52bf4afa
commit
4f48750b46
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@ libvpx-0.9.1.tar.bz2
|
||||
/v1.11.0.tar.gz
|
||||
/v1.12.0.tar.gz
|
||||
/v1.13.0.tar.gz
|
||||
/v1.13.1.tar.gz
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 4b07ef193504671e989463d190410ea9f3b5a810 Mon Sep 17 00:00:00 2001
|
||||
From: James Zern <jzern@google.com>
|
||||
Date: Mon, 25 Sep 2023 18:55:59 -0700
|
||||
Subject: [PATCH] VP8: disallow thread count changes
|
||||
|
||||
Currently allocations are done at encoder creation time. Going from
|
||||
threaded to non-threaded would cause a crash.
|
||||
|
||||
Bug: chromium:1486441
|
||||
Change-Id: Ie301c2a70847dff2f0daae408fbef1e4d42e73d4
|
||||
---
|
||||
vp8/encoder/onyx_if.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
|
||||
index 4bbeadef0..148a16cc4 100644
|
||||
--- a/vp8/encoder/onyx_if.c
|
||||
+++ b/vp8/encoder/onyx_if.c
|
||||
@@ -1443,6 +1443,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) {
|
||||
last_h = cpi->oxcf.Height;
|
||||
prev_number_of_layers = cpi->oxcf.number_of_layers;
|
||||
|
||||
+ if (cpi->initial_width) {
|
||||
+ // TODO(https://crbug.com/1486441): Allow changing thread counts; the
|
||||
+ // allocation is done once in vp8_create_compressor().
|
||||
+ oxcf->multi_threaded = cpi->oxcf.multi_threaded;
|
||||
+ }
|
||||
cpi->oxcf = *oxcf;
|
||||
|
||||
switch (cpi->oxcf.Mode) {
|
||||
--
|
||||
2.41.0
|
||||
|
||||
20
libvpx.spec
20
libvpx.spec
@ -5,8 +5,8 @@
|
||||
|
||||
Name: libvpx
|
||||
Summary: VP8/VP9 Video Codec SDK
|
||||
Version: 1.13.0
|
||||
Release: 5%{?dist}
|
||||
Version: 1.13.1
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
URL: http://www.webmproject.org/code/
|
||||
Source0: https://github.com/webmproject/libvpx/archive/v%{version}.tar.gz
|
||||
@ -15,8 +15,6 @@ Source1: vpx_config.h
|
||||
Source2: libvpx.ver
|
||||
# Do not disable FORTIFY_SOURCE=2
|
||||
Patch0: libvpx-1.7.0-leave-fortify-source-on.patch
|
||||
Patch1: update-thread-counts.patch
|
||||
Patch2: VP8-disallow-thread-count-changes.patch
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: make
|
||||
@ -26,16 +24,16 @@ BuildRequires: yasm
|
||||
BuildRequires: doxygen, php-cli, perl(Getopt::Long)
|
||||
|
||||
%description
|
||||
libvpx provides the VP8/VP9 SDK, which allows you to integrate your applications
|
||||
with the VP8 and VP9 video codecs, high quality, royalty free, open source codecs
|
||||
deployed on millions of computers and devices worldwide.
|
||||
libvpx provides the VP8/VP9 SDK, which allows you to integrate your applications
|
||||
with the VP8 and VP9 video codecs, high quality, royalty free, open source codecs
|
||||
deployed on millions of computers and devices worldwide.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for libvpx
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Development libraries and headers for developing software against
|
||||
Development libraries and headers for developing software against
|
||||
libvpx.
|
||||
|
||||
%package utils
|
||||
@ -47,7 +45,8 @@ A selection of utilities and tools for VP8, including a sample encoder
|
||||
and decoder.
|
||||
|
||||
%prep
|
||||
%autosetup -n libvpx-%{version} -p1
|
||||
%setup -q -n libvpx-%{version}
|
||||
%patch -P0 -p1 -b .fortify-source-on
|
||||
|
||||
%build
|
||||
|
||||
@ -200,6 +199,9 @@ rm -rf %{buildroot}%{_prefix}/src
|
||||
%{_bindir}/*
|
||||
|
||||
%changelog
|
||||
* Sun Oct 1 2023 Tom Callaway <spot@fedoraproject.org> - 1.13.1-1
|
||||
- update to 1.13.1
|
||||
|
||||
* Fri Sep 29 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.13.0-5
|
||||
- Minor spec cleanups
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (v1.13.0.tar.gz) = 686cb526b46d5a054d35263b24f54e977149a244e97c95bcdd9aba2d75e045b2d51be2b7f9754302826b4c5450ee2f177f440b41c04c83b8b1661f1c14301c60
|
||||
SHA512 (v1.13.1.tar.gz) = 49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897
|
||||
|
||||
@ -1,90 +0,0 @@
|
||||
From af6dedd715f4307669366944cca6e0417b290282 Mon Sep 17 00:00:00 2001
|
||||
From: James Zern <jzern@google.com>
|
||||
Date: Mon, 25 Sep 2023 18:53:41 -0700
|
||||
Subject: [PATCH] encode_api_test: add ConfigResizeChangeThreadCount
|
||||
|
||||
Update thread counts and resolution to ensure allocations are updated
|
||||
correctly. VP8 is disabled to avoid a crash.
|
||||
|
||||
Bug: chromium:1486441
|
||||
Change-Id: Ie89776d9818d27dc351eff298a44c699e850761b
|
||||
---
|
||||
test/encode_api_test.cc | 50 ++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 49 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc
|
||||
index ecdf92834..02aedc057 100644
|
||||
--- a/test/encode_api_test.cc
|
||||
+++ b/test/encode_api_test.cc
|
||||
@@ -304,7 +304,6 @@ TEST(EncodeAPI, SetRoi) {
|
||||
|
||||
void InitCodec(const vpx_codec_iface_t &iface, int width, int height,
|
||||
vpx_codec_ctx_t *enc, vpx_codec_enc_cfg_t *cfg) {
|
||||
- ASSERT_EQ(vpx_codec_enc_config_default(&iface, cfg, 0), VPX_CODEC_OK);
|
||||
cfg->g_w = width;
|
||||
cfg->g_h = height;
|
||||
cfg->g_lag_in_frames = 0;
|
||||
@@ -342,6 +341,7 @@ TEST(EncodeAPI, ConfigChangeThreadCount) {
|
||||
vpx_codec_ctx_t ctx = {};
|
||||
} enc;
|
||||
|
||||
+ ASSERT_EQ(vpx_codec_enc_config_default(iface, &cfg, 0), VPX_CODEC_OK);
|
||||
EXPECT_NO_FATAL_FAILURE(
|
||||
InitCodec(*iface, kWidth, kHeight, &enc.ctx, &cfg));
|
||||
if (IsVP9(iface)) {
|
||||
@@ -360,4 +360,52 @@ TEST(EncodeAPI, ConfigChangeThreadCount) {
|
||||
}
|
||||
}
|
||||
|
||||
+TEST(EncodeAPI, ConfigResizeChangeThreadCount) {
|
||||
+ constexpr int kInitWidth = 1024;
|
||||
+ constexpr int kInitHeight = 1024;
|
||||
+
|
||||
+ for (const auto *iface : kCodecIfaces) {
|
||||
+ SCOPED_TRACE(vpx_codec_iface_name(iface));
|
||||
+ if (!IsVP9(iface)) {
|
||||
+ GTEST_SKIP() << "TODO(https://crbug.com/1486441) remove this condition "
|
||||
+ "after VP8 is fixed.";
|
||||
+ }
|
||||
+ for (int i = 0; i < (IsVP9(iface) ? 2 : 1); ++i) {
|
||||
+ vpx_codec_enc_cfg_t cfg = {};
|
||||
+ struct Encoder {
|
||||
+ ~Encoder() { EXPECT_EQ(vpx_codec_destroy(&ctx), VPX_CODEC_OK); }
|
||||
+ vpx_codec_ctx_t ctx = {};
|
||||
+ } enc;
|
||||
+
|
||||
+ ASSERT_EQ(vpx_codec_enc_config_default(iface, &cfg, 0), VPX_CODEC_OK);
|
||||
+ // Start in threaded mode to ensure resolution and thread related
|
||||
+ // allocations are updated correctly across changes in resolution and
|
||||
+ // thread counts. See https://crbug.com/1486441.
|
||||
+ cfg.g_threads = 4;
|
||||
+ EXPECT_NO_FATAL_FAILURE(
|
||||
+ InitCodec(*iface, kInitWidth, kInitHeight, &enc.ctx, &cfg));
|
||||
+ if (IsVP9(iface)) {
|
||||
+ EXPECT_EQ(vpx_codec_control_(&enc.ctx, VP9E_SET_TILE_COLUMNS, 6),
|
||||
+ VPX_CODEC_OK);
|
||||
+ EXPECT_EQ(vpx_codec_control_(&enc.ctx, VP9E_SET_ROW_MT, i),
|
||||
+ VPX_CODEC_OK);
|
||||
+ }
|
||||
+
|
||||
+ cfg.g_w = 1000;
|
||||
+ cfg.g_h = 608;
|
||||
+ EXPECT_EQ(vpx_codec_enc_config_set(&enc.ctx, &cfg), VPX_CODEC_OK)
|
||||
+ << vpx_codec_error_detail(&enc.ctx);
|
||||
+
|
||||
+ cfg.g_w = 16;
|
||||
+ cfg.g_h = 720;
|
||||
+
|
||||
+ for (const auto threads : { 1, 4, 8, 6, 2, 1 }) {
|
||||
+ cfg.g_threads = threads;
|
||||
+ EXPECT_NO_FATAL_FAILURE(EncodeWithConfig(cfg, &enc.ctx))
|
||||
+ << "iteration: " << i << " threads: " << threads;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
} // namespace
|
||||
--
|
||||
2.41.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user