From a8285de7a8d53ca07ceb62335448f02be76798cf Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Wed, 29 Jan 2014 14:15:34 -0800 Subject: [PATCH] Removing SECTIONBITS_OUTPUT. This code seems to be unmaintaned for a long time (e.g. because of __int64 type usage). Change-Id: I35fd60d985032fe824f6fd6266910378adcca519 --- vp9/encoder/vp9_bitstream.c | 5 ----- vp9/encoder/vp9_onyx_if.c | 19 ------------------- vp9/encoder/vp9_writer.c | 5 ----- vp9/encoder/vp9_writer.h | 11 ----------- 4 files changed, 40 deletions(-) diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 8db517a9a..bd2bf84cb 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -33,11 +33,6 @@ #include "vp9/encoder/vp9_tokenize.h" #include "vp9/encoder/vp9_write_bit_buffer.h" - -#if defined(SECTIONBITS_OUTPUT) -unsigned __int64 Sectionbits[500]; -#endif - #ifdef ENTROPY_STATS vp9_coeff_stats tree_update_hist[TX_SIZES][PLANE_TYPES]; extern unsigned int active_section; diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index c28d01ceb..da3fe9816 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -98,10 +98,6 @@ unsigned int frames_at_speed[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; #endif -#if defined(SECTIONBITS_OUTPUT) -extern unsigned __int64 Sectionbits[500]; -#endif - extern void vp9_init_quantizer(VP9_COMP *cpi); static const double in_frame_q_adj_ratio[MAX_SEGMENTS] = @@ -1956,21 +1952,6 @@ void vp9_remove_compressor(VP9_PTR *ptr) { } #endif -#if defined(SECTIONBITS_OUTPUT) - - if (0) { - int i; - FILE *f = fopen("tokenbits.stt", "a"); - - for (i = 0; i < 28; i++) - fprintf(f, "%8d", (int)(Sectionbits[i] / 256)); - - fprintf(f, "\n"); - fclose(f); - } - -#endif - #if 0 { printf("\n_pick_loop_filter_level:%d\n", cpi->time_pick_lpf / 1000); diff --git a/vp9/encoder/vp9_writer.c b/vp9/encoder/vp9_writer.c index 3d13d07b6..fda1b390e 100644 --- a/vp9/encoder/vp9_writer.c +++ b/vp9/encoder/vp9_writer.c @@ -12,11 +12,6 @@ #include "vp9/encoder/vp9_writer.h" #include "vp9/common/vp9_entropy.h" -#if defined(SECTIONBITS_OUTPUT) -unsigned __int64 Sectionbits[500]; - -#endif - #ifdef ENTROPY_STATS unsigned int active_section = 0; #endif diff --git a/vp9/encoder/vp9_writer.h b/vp9/encoder/vp9_writer.h index 62f555c99..defeec377 100644 --- a/vp9/encoder/vp9_writer.h +++ b/vp9/encoder/vp9_writer.h @@ -44,17 +44,6 @@ static void vp9_write(vp9_writer *br, int bit, int probability) { unsigned int lowvalue = br->lowvalue; register unsigned int shift; -#ifdef ENTROPY_STATS -#if defined(SECTIONBITS_OUTPUT) - - if (bit) - Sectionbits[active_section] += vp9_prob_cost[255 - probability]; - else - Sectionbits[active_section] += vp9_prob_cost[probability]; - -#endif -#endif - split = 1 + (((range - 1) * probability) >> 8); range = split;