mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-24 17:37:30 +09:00
Update aom to slightly newer commit ID
This commit is contained in:
parent
1c8af26369
commit
76f1e6edca
311 changed files with 55292 additions and 33790 deletions
5
third_party/aom/aom_util/aom_util.cmake
vendored
5
third_party/aom/aom_util/aom_util.cmake
vendored
|
|
@ -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_UTIL_AOM_UTIL_CMAKE_)
|
||||
set(AOM_AOM_UTIL_AOM_UTIL_CMAKE_ 1)
|
||||
|
||||
set(AOM_UTIL_SOURCES
|
||||
"${AOM_ROOT}/aom_util/aom_thread.c"
|
||||
"${AOM_ROOT}/aom_util/aom_thread.h"
|
||||
|
|
@ -27,3 +30,5 @@ function (setup_aom_util_targets)
|
|||
set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_util PARENT_SCOPE)
|
||||
target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_util>)
|
||||
endfunction ()
|
||||
|
||||
endif () # AOM_AOM_UTIL_AOM_UTIL_CMAKE_
|
||||
|
|
|
|||
26
third_party/aom/aom_util/debug_util.c
vendored
26
third_party/aom/aom_util/debug_util.c
vendored
|
|
@ -16,12 +16,8 @@
|
|||
|
||||
#define QUEUE_MAX_SIZE 2000000
|
||||
static int result_queue[QUEUE_MAX_SIZE];
|
||||
#if CONFIG_DAALA_EC
|
||||
static int nsymbs_queue[QUEUE_MAX_SIZE];
|
||||
static aom_cdf_prob cdf_queue[QUEUE_MAX_SIZE][16];
|
||||
#else
|
||||
static int prob_queue[QUEUE_MAX_SIZE];
|
||||
#endif
|
||||
|
||||
static int queue_r = 0;
|
||||
static int queue_w = 0;
|
||||
|
|
@ -53,42 +49,24 @@ int bitstream_queue_get_write(void) { return queue_w; }
|
|||
|
||||
int bitstream_queue_get_read(void) { return queue_r; }
|
||||
|
||||
void bitstream_queue_pop(int *result,
|
||||
#if CONFIG_DAALA_EC
|
||||
aom_cdf_prob *cdf, int *nsymbs) {
|
||||
#else
|
||||
int *prob) {
|
||||
#endif // CONFIG_DAALA_EC
|
||||
void bitstream_queue_pop(int *result, aom_cdf_prob *cdf, int *nsymbs) {
|
||||
if (!skip_r) {
|
||||
if (queue_w == queue_r) {
|
||||
printf("buffer underflow queue_w %d queue_r %d\n", queue_w, queue_r);
|
||||
assert(0);
|
||||
}
|
||||
*result = result_queue[queue_r];
|
||||
#if CONFIG_DAALA_EC
|
||||
*nsymbs = nsymbs_queue[queue_r];
|
||||
memcpy(cdf, cdf_queue[queue_r], *nsymbs * sizeof(*cdf));
|
||||
#else
|
||||
*prob = prob_queue[queue_r];
|
||||
#endif // CONFIG_DAALA_EC
|
||||
queue_r = (queue_r + 1) % QUEUE_MAX_SIZE;
|
||||
}
|
||||
}
|
||||
|
||||
void bitstream_queue_push(int result,
|
||||
#if CONFIG_DAALA_EC
|
||||
const aom_cdf_prob *cdf, int nsymbs) {
|
||||
#else
|
||||
int prob) {
|
||||
#endif // CONFIG_DAALA_EC
|
||||
void bitstream_queue_push(int result, const aom_cdf_prob *cdf, int nsymbs) {
|
||||
if (!skip_w) {
|
||||
result_queue[queue_w] = result;
|
||||
#if CONFIG_DAALA_EC
|
||||
nsymbs_queue[queue_w] = nsymbs;
|
||||
memcpy(cdf_queue[queue_w], cdf, nsymbs * sizeof(*cdf));
|
||||
#else
|
||||
prob_queue[queue_w] = prob;
|
||||
#endif // CONFIG_DAALA_EC
|
||||
queue_w = (queue_w + 1) % QUEUE_MAX_SIZE;
|
||||
if (queue_w == queue_r) {
|
||||
printf("buffer overflow queue_w %d queue_r %d\n", queue_w, queue_r);
|
||||
|
|
|
|||
7
third_party/aom/aom_util/debug_util.h
vendored
7
third_party/aom/aom_util/debug_util.h
vendored
|
|
@ -13,9 +13,7 @@
|
|||
#define AOM_UTIL_DEBUG_UTIL_H_
|
||||
|
||||
#include "./aom_config.h"
|
||||
#if CONFIG_DAALA_EC
|
||||
#include "aom_dsp/prob.h"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
@ -33,13 +31,8 @@ int bitstream_queue_get_write(void);
|
|||
int bitstream_queue_get_read(void);
|
||||
void bitstream_queue_record_write(void);
|
||||
void bitstream_queue_reset_write(void);
|
||||
#if CONFIG_DAALA_EC
|
||||
void bitstream_queue_pop(int *result, aom_cdf_prob *cdf, int *nsymbs);
|
||||
void bitstream_queue_push(int result, const aom_cdf_prob *cdf, int nsymbs);
|
||||
#else
|
||||
void bitstream_queue_pop(int *result, int *prob);
|
||||
void bitstream_queue_push(int result, int prob);
|
||||
#endif
|
||||
void bitstream_queue_set_skip_write(int skip);
|
||||
void bitstream_queue_set_skip_read(int skip);
|
||||
void bitstream_queue_set_frame_write(int frame_idx);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue