
This commit bring all up-to-date changes from master that are applicable to nextgenv2. Due to the remove VP10 code in master, we had to cherry pick the following commits to get those changes: Add default flags for arm64/armv8 builds Allows building simple targets with sane default flags. For example, using the Android arm64 toolchain from the NDK: https://developer.android.com/ndk/guides/standalone_toolchain.html ./build/tools/make-standalone-toolchain.sh --arch=arm64 \ --platform=android-24 --install-dir=/tmp/arm64 CROSS=/tmp/arm64/bin/aarch64-linux-android- \ ~/libvpx/configure --target=arm64-linux-gcc --disable-multithread BUG=webm:1143 vpx_lpf_horizontal_4_sse2: Remove dead load. Change-Id: I51026c52baa1f0881fcd5b68e1fdf08a2dc0916e Fail early when android target does not include --sdk-path Change-Id: I07e7e63476a2e32e3aae123abdee8b7bbbdc6a8c configure: clean up var style and set_all usage Use quotes whenever possible and {} always for variables. Replace multiple set_all calls with *able_feature(). Conflicts: build/make/configure.sh vp9-svc: Remove some unneeded code/comment. datarate_test,DatarateTestLarge: normalize bits type quiets a msvc warning: conversion from 'const int64_t' to 'size_t', possible loss of data mips added p6600 cpu support Removed -funroll-loops psnr.c: use int64_t for sum of differences Since the values can be negative. *.asm: normalize label format add a trailing ':', though it's optional with the tools we support, it's more common to use it to mark a label. this also quiets the orphan-labels warning with nasm/yasm. BUG=b/29583530 Prevent negative variance Due to rounding, hbd variance may become negative. This commit put in check and clamp of negative values to 0. configure: remove old visual studio support (<2010) BUG=b/29583530 Conflicts: configure configure: restore vs_version variable inadvertently lost in the final patchset of: 078dff7 configure: remove old visual studio support (<2010) this prevents an empty CONFIG_VS_VERSION and avoids make failure Require x86inc.asm Force enable x86inc.asm when building for x86. Previously there were compatibility issues so a flag was added to simplify disabling this code. The known issues have been resolved and x86inc.asm is the preferred abstraction layer (over x86_abi_support.asm). BUG=b:29583530 convolve_test: fix byte offsets in hbd build CONVERT_TO_BYTEPTR(x) was corrected in: 003a9d2 Port metric computation changes from nextgenv2 to use the more common (x) within the expansion. offsets should occur after converting the pointer to the desired type. + factorized some common expressions Conflicts: test/convolve_test.cc vpx_dsp: remove x86inc.asm distinction BUG=b:29583530 Conflicts: vpx_dsp/vpx_dsp.mk vpx_dsp/vpx_dsp_rtcd_defs.pl vpx_dsp/x86/highbd_variance_sse2.c vpx_dsp/x86/variance_sse2.c test: remove x86inc.asm distinction BUG=b:29583530 Conflicts: test/vp9_subtract_test.cc configure: remove x86inc.asm distinction BUG=b:29583530 Change-Id: I59a1192142e89a6a36b906f65a491a734e603617 Update vpx subpixel 1d filter ssse3 asm Speed test shows the new vertical filters have degradation on Celeron Chromebook. Added "X86_SUBPIX_VFILTER_PREFER_SLOW_CELERON" to control the vertical filters activated code. Now just simply active the code without degradation on Celeron. Later there should be 2 set of vertical filters ssse3 functions, and let jump table to choose based on CPU type. improve vpx_filter_block1d* based on replace paddsw+psrlw to pmulhrsw Make set_reference control API work in VP9 Moved the API patch from NextGenv2. An example was included. To try it, for example, run the following command: $ examples/vpx_cx_set_ref vp9 352 288 in.yuv out.ivf 4 30 Conflicts: examples.mk examples/vpx_cx_set_ref.c test/cx_set_ref.sh vp9/decoder/vp9_decoder.c deblock filter : moved from vp8 code branch The deblocking filters used in vp8 have been moved to vpx_dsp for use by both vp8 and vp9. vpx_thread.[hc]: update webp source reference + drop the blob hash, the updated reference will be updated in the commit message BUG=b/29583578 vpx_thread: use native windows cond var if available BUG=b/29583578 original webp change: commit 110ad5835ecd66995d0e7f66dca1b90dea595f5a Author: James Zern <jzern@google.com> Date: Mon Nov 23 19:49:58 2015 -0800 thread: use native windows cond var if available Vista / Server 2008 and up. no speed difference observed. 100644 blob 4fc372b7bc6980a9ed3618c8cce5b67ed7b0f412 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use InitializeCriticalSectionEx if available BUG=b/29583578 original webp change: commit 63fadc9ffacc77d4617526a50c696d21d558a70b Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:38:46 2015 -0800 thread: use InitializeCriticalSectionEx if available Windows Vista / Server 2008 and up 100644 blob f84207d89b3a6bb98bfe8f3fa55cad72dfd061ff src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use WaitForSingleObjectEx if available BUG=b/29583578 original webp change: commit 0fd0e12bfe83f16ce4f1c038b251ccbc13c62ac2 Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:40:26 2015 -0800 thread: use WaitForSingleObjectEx if available Windows XP and up 100644 blob d58f74e5523dbc985fc531cf5f0833f1e9157cf0 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use CreateThread for windows phone BUG=b/29583578 original webp change: commit d2afe974f9d751de144ef09d31255aea13b442c0 Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:41:26 2015 -0800 thread: use CreateThread for windows phone _beginthreadex is unavailable for winrt/uwp Change-Id: Ie7412a568278ac67f0047f1764e2521193d74d4d 100644 blob 93f7622797f05f6acc1126e8296c481d276e4047 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vp9_postproc.c missing extern. BUG=webm:1256 deblock: missing const on extern const. postproc - move filling of noise buffer to vpx_dsp. Fix encoder crashes for odd size input clean-up vp9_intrapred_test remove tuple and overkill VP9IntraPredBase class. postproc: noise style fixes. gtest-all.cc: quiet an unused variable warning under windows / mingw builds vp9_intrapred_test: follow-up cleanup address few comments from ce050afaf3e288895c3bee4160336e2d2133b6ea Change-Id: I3eece7efa9335f4210303993ef6c1857ad5c29c8
184 lines
5.3 KiB
C
184 lines
5.3 KiB
C
// Copyright 2013 Google Inc. All Rights Reserved.
|
|
//
|
|
// Use of this source code is governed by a BSD-style license
|
|
// that can be found in the COPYING file in the root of the source
|
|
// tree. An additional intellectual property rights grant can be found
|
|
// in the file PATENTS. All contributing project authors may
|
|
// be found in the AUTHORS file in the root of the source tree.
|
|
// -----------------------------------------------------------------------------
|
|
//
|
|
// Multi-threaded worker
|
|
//
|
|
// Original source:
|
|
// https://chromium.googlesource.com/webm/libwebp
|
|
|
|
#include <assert.h>
|
|
#include <string.h> // for memset()
|
|
#include "./vpx_thread.h"
|
|
#include "vpx_mem/vpx_mem.h"
|
|
|
|
#if CONFIG_MULTITHREAD
|
|
|
|
struct VPxWorkerImpl {
|
|
pthread_mutex_t mutex_;
|
|
pthread_cond_t condition_;
|
|
pthread_t thread_;
|
|
};
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
static void execute(VPxWorker *const worker); // Forward declaration.
|
|
|
|
static THREADFN thread_loop(void *ptr) {
|
|
VPxWorker *const worker = (VPxWorker*)ptr;
|
|
int done = 0;
|
|
while (!done) {
|
|
pthread_mutex_lock(&worker->impl_->mutex_);
|
|
while (worker->status_ == OK) { // wait in idling mode
|
|
pthread_cond_wait(&worker->impl_->condition_, &worker->impl_->mutex_);
|
|
}
|
|
if (worker->status_ == WORK) {
|
|
execute(worker);
|
|
worker->status_ = OK;
|
|
} else if (worker->status_ == NOT_OK) { // finish the worker
|
|
done = 1;
|
|
}
|
|
// signal to the main thread that we're done (for sync())
|
|
pthread_cond_signal(&worker->impl_->condition_);
|
|
pthread_mutex_unlock(&worker->impl_->mutex_);
|
|
}
|
|
return THREAD_RETURN(NULL); // Thread is finished
|
|
}
|
|
|
|
// main thread state control
|
|
static void change_state(VPxWorker *const worker,
|
|
VPxWorkerStatus new_status) {
|
|
// No-op when attempting to change state on a thread that didn't come up.
|
|
// Checking status_ without acquiring the lock first would result in a data
|
|
// race.
|
|
if (worker->impl_ == NULL) return;
|
|
|
|
pthread_mutex_lock(&worker->impl_->mutex_);
|
|
if (worker->status_ >= OK) {
|
|
// wait for the worker to finish
|
|
while (worker->status_ != OK) {
|
|
pthread_cond_wait(&worker->impl_->condition_, &worker->impl_->mutex_);
|
|
}
|
|
// assign new status and release the working thread if needed
|
|
if (new_status != OK) {
|
|
worker->status_ = new_status;
|
|
pthread_cond_signal(&worker->impl_->condition_);
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&worker->impl_->mutex_);
|
|
}
|
|
|
|
#endif // CONFIG_MULTITHREAD
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
static void init(VPxWorker *const worker) {
|
|
memset(worker, 0, sizeof(*worker));
|
|
worker->status_ = NOT_OK;
|
|
}
|
|
|
|
static int sync(VPxWorker *const worker) {
|
|
#if CONFIG_MULTITHREAD
|
|
change_state(worker, OK);
|
|
#endif
|
|
assert(worker->status_ <= OK);
|
|
return !worker->had_error;
|
|
}
|
|
|
|
static int reset(VPxWorker *const worker) {
|
|
int ok = 1;
|
|
worker->had_error = 0;
|
|
if (worker->status_ < OK) {
|
|
#if CONFIG_MULTITHREAD
|
|
worker->impl_ = (VPxWorkerImpl*)vpx_calloc(1, sizeof(*worker->impl_));
|
|
if (worker->impl_ == NULL) {
|
|
return 0;
|
|
}
|
|
if (pthread_mutex_init(&worker->impl_->mutex_, NULL)) {
|
|
goto Error;
|
|
}
|
|
if (pthread_cond_init(&worker->impl_->condition_, NULL)) {
|
|
pthread_mutex_destroy(&worker->impl_->mutex_);
|
|
goto Error;
|
|
}
|
|
pthread_mutex_lock(&worker->impl_->mutex_);
|
|
ok = !pthread_create(&worker->impl_->thread_, NULL, thread_loop, worker);
|
|
if (ok) worker->status_ = OK;
|
|
pthread_mutex_unlock(&worker->impl_->mutex_);
|
|
if (!ok) {
|
|
pthread_mutex_destroy(&worker->impl_->mutex_);
|
|
pthread_cond_destroy(&worker->impl_->condition_);
|
|
Error:
|
|
vpx_free(worker->impl_);
|
|
worker->impl_ = NULL;
|
|
return 0;
|
|
}
|
|
#else
|
|
worker->status_ = OK;
|
|
#endif
|
|
} else if (worker->status_ > OK) {
|
|
ok = sync(worker);
|
|
}
|
|
assert(!ok || (worker->status_ == OK));
|
|
return ok;
|
|
}
|
|
|
|
static void execute(VPxWorker *const worker) {
|
|
if (worker->hook != NULL) {
|
|
worker->had_error |= !worker->hook(worker->data1, worker->data2);
|
|
}
|
|
}
|
|
|
|
static void launch(VPxWorker *const worker) {
|
|
#if CONFIG_MULTITHREAD
|
|
change_state(worker, WORK);
|
|
#else
|
|
execute(worker);
|
|
#endif
|
|
}
|
|
|
|
static void end(VPxWorker *const worker) {
|
|
#if CONFIG_MULTITHREAD
|
|
if (worker->impl_ != NULL) {
|
|
change_state(worker, NOT_OK);
|
|
pthread_join(worker->impl_->thread_, NULL);
|
|
pthread_mutex_destroy(&worker->impl_->mutex_);
|
|
pthread_cond_destroy(&worker->impl_->condition_);
|
|
vpx_free(worker->impl_);
|
|
worker->impl_ = NULL;
|
|
}
|
|
#else
|
|
worker->status_ = NOT_OK;
|
|
assert(worker->impl_ == NULL);
|
|
#endif
|
|
assert(worker->status_ == NOT_OK);
|
|
}
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
|
static VPxWorkerInterface g_worker_interface = {
|
|
init, reset, sync, launch, execute, end
|
|
};
|
|
|
|
int vpx_set_worker_interface(const VPxWorkerInterface* const winterface) {
|
|
if (winterface == NULL ||
|
|
winterface->init == NULL || winterface->reset == NULL ||
|
|
winterface->sync == NULL || winterface->launch == NULL ||
|
|
winterface->execute == NULL || winterface->end == NULL) {
|
|
return 0;
|
|
}
|
|
g_worker_interface = *winterface;
|
|
return 1;
|
|
}
|
|
|
|
const VPxWorkerInterface *vpx_get_worker_interface(void) {
|
|
return &g_worker_interface;
|
|
}
|
|
|
|
//------------------------------------------------------------------------------
|