generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bitstream_debug: build related cleanup

Browse Source 
Move experimental config from debug_util.c/h to aom_util.mk to avoid
empty object.

Change-Id: Id7978ed6a342262bddaa4df8b53115e750fa1c2c
This commit is contained in:
Angie Chiang
2016-09-21 16:01:04 -07:00
parent 7a9ad9c83f
commit 6062a8bfee
7 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aom_dsp/dkboolreader.h
View File

@@ -19,13 +19,13 @@
#if CONFIG_BITSTREAM_DEBUG #if CONFIG_BITSTREAM_DEBUG
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include "aom_util/debug_util.h"
#endif // CONFIG_BITSTREAM_DEBUG #endif // CONFIG_BITSTREAM_DEBUG
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
#include "aom/aomdx.h" #include "aom/aomdx.h"
#include "aom/aom_integer.h" #include "aom/aom_integer.h"
#include "aom_dsp/prob.h" #include "aom_dsp/prob.h"
#include "aom_util/debug_util.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
aom_dsp/dkboolwriter.h
View File

@@ -16,11 +16,11 @@
#if CONFIG_BITSTREAM_DEBUG #if CONFIG_BITSTREAM_DEBUG
#include <stdio.h> #include <stdio.h>
#endif #include "aom_util/debug_util.h"
#endif // CONFIG_BITSTREAM_DEBUG
#include "aom_dsp/prob.h" #include "aom_dsp/prob.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
#include "aom_util/debug_util.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
aom_util/aom_util.mk
View File

@@ -12,6 +12,6 @@
UTIL_SRCS-yes += aom_util.mk UTIL_SRCS-yes += aom_util.mk
UTIL_SRCS-yes += aom_thread.c UTIL_SRCS-yes += aom_thread.c
UTIL_SRCS-yes += aom_thread.h UTIL_SRCS-yes += aom_thread.h
UTIL_SRCS-yes += debug_util.c UTIL_SRCS-$(CONFIG_BITSTREAM_DEBUG) += debug_util.c
UTIL_SRCS-yes += debug_util.h UTIL_SRCS-$(CONFIG_BITSTREAM_DEBUG) += debug_util.h
UTIL_SRCS-yes += endian_inl.h UTIL_SRCS-yes += endian_inl.h

9
aom_util/debug_util.c
View File

@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "aom_util/debug_util.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#if CONFIG_BITSTREAM_DEBUG #include "aom_util/debug_util.h"
#define QUEUE_MAX_SIZE 2000000 #define QUEUE_MAX_SIZE 2000000
static int result_queue[QUEUE_MAX_SIZE]; static int result_queue[QUEUE_MAX_SIZE];
static int prob_queue[QUEUE_MAX_SIZE]; static int prob_queue[QUEUE_MAX_SIZE];
@@ -27,11 +27,11 @@ static int frame_idx_r = 0;
void bitstream_queue_set_frame_write(int frame_idx) { frame_idx_w = frame_idx; } void bitstream_queue_set_frame_write(int frame_idx) { frame_idx_w = frame_idx; }
int bitstream_queue_get_frame_write() { return frame_idx_w; } int bitstream_queue_get_frame_write(void) { return frame_idx_w; }
void bitstream_queue_set_frame_read(int frame_idx) { frame_idx_r = frame_idx; } void bitstream_queue_set_frame_read(int frame_idx) { frame_idx_r = frame_idx; }
int bitstream_queue_get_frame_read() { return frame_idx_r; } int bitstream_queue_get_frame_read(void) { return frame_idx_r; }
void bitstream_queue_set_skip_write(int skip) { skip_w = skip; } void bitstream_queue_set_skip_write(int skip) { skip_w = skip; }
@@ -68,4 +68,3 @@ void bitstream_queue_push(int result, int prob) {
} }
} }
} }
#endif // CONFIG_BITSTREAM_DEBUG

6
aom_util/debug_util.h
View File

@@ -17,7 +17,6 @@
extern "C" { extern "C" {
#endif #endif
#if CONFIG_BITSTREAM_DEBUG
/* This is a debug tool used to detect bitstream error. On encoder side, it /* This is a debug tool used to detect bitstream error. On encoder side, it
* pushes each bit and probability into a queue before the bit is written into * pushes each bit and probability into a queue before the bit is written into
* the Arithmetic coder. On decoder side, whenever a bit is read out from the * the Arithmetic coder. On decoder side, whenever a bit is read out from the
@@ -35,10 +34,9 @@ void bitstream_queue_push(int result, int prob);
void bitstream_queue_set_skip_write(int skip); void bitstream_queue_set_skip_write(int skip);
void bitstream_queue_set_skip_read(int skip); void bitstream_queue_set_skip_read(int skip);
void bitstream_queue_set_frame_write(int frame_idx); void bitstream_queue_set_frame_write(int frame_idx);
int bitstream_queue_get_frame_write(); int bitstream_queue_get_frame_write(void);
void bitstream_queue_set_frame_read(int frame_idx); void bitstream_queue_set_frame_read(int frame_idx);
int bitstream_queue_get_frame_read(); int bitstream_queue_get_frame_read(void);
#endif // CONFIG_BITSTREAM_DEBUG
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

2
av1/encoder/bitstream.c
View File

@@ -19,7 +19,9 @@
#include "aom_mem/aom_mem.h" #include "aom_mem/aom_mem.h"
#include "aom_ports/mem_ops.h" #include "aom_ports/mem_ops.h"
#include "aom_ports/system_state.h" #include "aom_ports/system_state.h"
#if CONFIG_BITSTREAM_DEBUG
#include "aom_util/debug_util.h" #include "aom_util/debug_util.h"
#endif // CONFIG_BITSTREAM_DEBUG
#if CONFIG_CLPF #if CONFIG_CLPF
#include "av1/common/clpf.h" #include "av1/common/clpf.h"

2
av1/encoder/encoder.c
View File

@@ -65,7 +65,9 @@
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
#include "aom_ports/system_state.h" #include "aom_ports/system_state.h"
#include "aom_scale/aom_scale.h" #include "aom_scale/aom_scale.h"
#if CONFIG_BITSTREAM_DEBUG
#include "aom_util/debug_util.h" #include "aom_util/debug_util.h"
#endif // CONFIG_BITSTREAM_DEBUG
#define AM_SEGMENT_ID_INACTIVE 7 #define AM_SEGMENT_ID_INACTIVE 7
#define AM_SEGMENT_ID_ACTIVE 0 #define AM_SEGMENT_ID_ACTIVE 0