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

Clean up unused function warnings in vp8 onyx_if.c

Browse Source 
Remove really unused segmentation_test_function

Hide decide_key_frame and recode_loop_test under non-realtime check.

Change-Id: Ie0113945ffbd096dbb89a553548f526b2a0ee0c6
This commit is contained in:
Johann 2015-08-25 16:45:09 -07:00
parent 5c055cc4cf
commit 821f02947e
1 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
vp8/encoder/onyx_if.c
View File

@ -516,41 +516,6 @@ static void set_segment_data(VP8_COMP *cpi, signed char *feature_data, unsigned
}
static void segmentation_test_function(VP8_COMP *cpi)
{
unsigned char *seg_map;
signed char feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS];
// Create a temporary map for segmentation data.
CHECK_MEM_ERROR(seg_map, vpx_calloc(cpi->common.mb_rows * cpi->common.mb_cols, 1));
// Set the segmentation Map
set_segmentation_map(cpi, seg_map);
// Activate segmentation.
enable_segmentation(cpi);
// Set up the quant segment data
feature_data[MB_LVL_ALT_Q][0] = 0;
feature_data[MB_LVL_ALT_Q][1] = 4;
feature_data[MB_LVL_ALT_Q][2] = 0;
feature_data[MB_LVL_ALT_Q][3] = 0;
// Set up the loop segment data
feature_data[MB_LVL_ALT_LF][0] = 0;
feature_data[MB_LVL_ALT_LF][1] = 0;
feature_data[MB_LVL_ALT_LF][2] = 0;
feature_data[MB_LVL_ALT_LF][3] = 0;
// Initialise the feature data structure
// SEGMENT_DELTADATA 0, SEGMENT_ABSDATA 1
set_segment_data(cpi, &feature_data[0][0], SEGMENT_DELTADATA);
// Delete sementation map
vpx_free(seg_map);
seg_map = 0;
}
/* A simple function to cyclically refresh the background at a lower Q */
static void cyclic_background_refresh(VP8_COMP *cpi, int Q, int lf_adjustment)
{
@ -913,7 +878,7 @@ void vp8_set_speed_features(VP8_COMP *cpi)
Speed = cpi->Speed;
switch (Mode)
{
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
case 0: /* best quality mode */
sf->first_step = 0;
sf->max_step_search_steps = MAX_MVSEARCH_STEPS;
@ -2065,7 +2030,7 @@ struct VP8_COMP* vp8_create_compressor(VP8_CONFIG *oxcf)
cpi->output_pkt_list = oxcf->output_pkt_list;
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
if (cpi->pass == 1)
{
@ -2227,7 +2192,7 @@ void vp8_remove_compressor(VP8_COMP **ptr)
if (cpi && (cpi->common.current_video_frame > 0))
{
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
if (cpi->pass == 2)
{
@ -3018,6 +2983,7 @@ static void update_rd_ref_frame_probs(VP8_COMP *cpi)
}
#if !CONFIG_REALTIME_ONLY
/* 1 = key, 0 = inter */
static int decide_key_frame(VP8_COMP *cpi)
{
@ -3085,7 +3051,6 @@ static int decide_key_frame(VP8_COMP *cpi)
}
#if !(CONFIG_REALTIME_ONLY)
static void Pass1Encode(VP8_COMP *cpi, unsigned long *size, unsigned char *dest, unsigned int *frame_flags)
{
(void) size;
@ -3131,6 +3096,7 @@ void write_cx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame)
#endif
/* return of 0 means drop frame */
#if !CONFIG_REALTIME_ONLY
/* Function to test for conditions that indeicate we should loop
* back and recode a frame.
*/
@ -3180,6 +3146,7 @@ static int recode_loop_test( VP8_COMP *cpi,
return force_recode;
}
#endif // !CONFIG_REALTIME_ONLY
static void update_reference_frames(VP8_COMP *cpi)
{
@ -3601,7 +3568,7 @@ static void encode_frame_to_data_rate
VP8_COMMON *cm = &cpi->common;
int active_worst_qchanged = 0;
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
int q_low;
int q_high;
int zbin_oq_high;
@ -3640,7 +3607,7 @@ static void encode_frame_to_data_rate
/* For an alt ref frame in 2 pass we skip the call to the second pass
* function that sets the target bandwidth
*/
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
if (cpi->pass == 2)
{
@ -4149,7 +4116,7 @@ static void encode_frame_to_data_rate
/* Determine initial Q to try */
Q = vp8_regulate_q(cpi, cpi->this_frame_target);
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
/* Set highest allowed value for Zbin over quant */
if (cm->frame_type == KEY_FRAME)
@ -4179,7 +4146,7 @@ static void encode_frame_to_data_rate
vp8_compute_frame_size_bounds(cpi, &frame_under_shoot_limit, &frame_over_shoot_limit);
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
/* Limit Q range for the adaptive loop. */
bottom_index = cpi->active_best_quality;
top_index = cpi->active_worst_quality;
@ -4410,7 +4377,7 @@ static void encode_frame_to_data_rate
if (cpi->pass != 2 && cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME
&& cpi->compressor_speed != 2)
{
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
if (decide_key_frame(cpi))
{
/* Reset all our sizing numbers and recode */
@ -4466,9 +4433,9 @@ static void encode_frame_to_data_rate
/* Assume 1 qstep = about 4% on frame size. */
over_size_percent = (int)(over_size_percent * 0.96);
}
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
top_index = cpi->active_worst_quality;
#endif
#endif // !CONFIG_REALTIME_ONLY
/* If we have updated the active max Q do not call
* vp8_update_rate_correction_factors() this loop.
*/
@ -4477,7 +4444,7 @@ static void encode_frame_to_data_rate
else
active_worst_qchanged = 0;
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
/* Special case handling for forced key frames */
if ( (cm->frame_type == KEY_FRAME) && cpi->this_key_frame_forced )
{
@ -5215,7 +5182,7 @@ static void encode_frame_to_data_rate
}
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
static void Pass2Encode(VP8_COMP *cpi, unsigned long *size, unsigned char *dest, unsigned char * dest_end, unsigned int *frame_flags)
{
@ -5299,7 +5266,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l
cpi->source = NULL;
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
/* Should we code an alternate reference frame */
if (cpi->oxcf.error_resilient_mode == 0 &&
cpi->oxcf.play_alternate &&
@ -5367,7 +5334,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l
else
{
*size = 0;
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
if (flush && cpi->pass == 1 && !cpi->twopass.first_pass_done)
{
@ -5560,7 +5527,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l
assert(i < NUM_YV12_BUFFERS );
}
#if !(CONFIG_REALTIME_ONLY)
#if !CONFIG_REALTIME_ONLY
if (cpi->pass == 1)
{