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

vp8/onyx_if.c: rework #if's to avoid dangling else's

Browse Source 
Change-Id: Ieda8958a3da1000424fcff91a1315d0049612202
This commit is contained in:
James Zern 2016-07-19 23:03:45 -07:00
parent 77a31eb3c5
commit b19f8b1607
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vp8/encoder/onyx_if.c
View File

@ -3273,12 +3273,12 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size,
cpi->force_next_frame_intra = 0; cpi->force_next_frame_intra = 0;
} }
/* For an alt ref frame in 2 pass we skip the call to the second pass /* For an alt ref frame in 2 pass we skip the call to the second pass
* function that sets the target bandwidth * function that sets the target bandwidth
*/ */
switch (cpi->pass) {
#if !CONFIG_REALTIME_ONLY #if !CONFIG_REALTIME_ONLY
case 2:
if (cpi->pass == 2) {
if (cpi->common.refresh_alt_ref_frame) { if (cpi->common.refresh_alt_ref_frame) {
/* Per frame bit target for the alt ref frame */ /* Per frame bit target for the alt ref frame */
cpi->per_frame_bandwidth = cpi->twopass.gf_bits; cpi->per_frame_bandwidth = cpi->twopass.gf_bits;
@ -3286,10 +3286,13 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size,
cpi->target_bandwidth = cpi->target_bandwidth =
(int)(cpi->twopass.gf_bits * cpi->output_framerate); (int)(cpi->twopass.gf_bits * cpi->output_framerate);
} }
} else break;
#endif #endif // !CONFIG_REALTIME_ONLY
default:
cpi->per_frame_bandwidth = cpi->per_frame_bandwidth =
(int)(cpi->target_bandwidth / cpi->output_framerate); (int)(cpi->target_bandwidth / cpi->output_framerate);
break;
}
/* Default turn off buffer to buffer copying */ /* Default turn off buffer to buffer copying */
cm->copy_buffer_to_gf = 0; cm->copy_buffer_to_gf = 0;
@ -4057,7 +4060,9 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size,
active_worst_qchanged = 0; active_worst_qchanged = 0;
} }
#if !CONFIG_REALTIME_ONLY #if CONFIG_REALTIME_ONLY
Loop = 0;
#else
/* Special case handling for forced key frames */ /* Special case handling for forced key frames */
if ((cm->frame_type == KEY_FRAME) && cpi->this_key_frame_forced) { if ((cm->frame_type == KEY_FRAME) && cpi->this_key_frame_forced) {
int last_q = Q; int last_q = Q;
@ -4232,9 +4237,10 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size,
: cpi->mb.zbin_over_quant; : cpi->mb.zbin_over_quant;
Loop = Q != last_q; Loop = Q != last_q;
} else } else {
#endif
Loop = 0; Loop = 0;
}
#endif // CONFIG_REALTIME_ONLY
if (cpi->is_src_frame_alt_ref) Loop = 0; if (cpi->is_src_frame_alt_ref) Loop = 0;
@ -5066,15 +5072,15 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags,
assert(i < NUM_YV12_BUFFERS); assert(i < NUM_YV12_BUFFERS);
} }
switch (cpi->pass) {
#if !CONFIG_REALTIME_ONLY #if !CONFIG_REALTIME_ONLY
case 1: Pass1Encode(cpi, size, dest, frame_flags); break;
if (cpi->pass == 1) { case 2: Pass2Encode(cpi, size, dest, dest_end, frame_flags); break;
Pass1Encode(cpi, size, dest, frame_flags); #endif // !CONFIG_REALTIME_ONLY
} else if (cpi->pass == 2) { default:
Pass2Encode(cpi, size, dest, dest_end, frame_flags);
} else
#endif
encode_frame_to_data_rate(cpi, size, dest, dest_end, frame_flags); encode_frame_to_data_rate(cpi, size, dest, dest_end, frame_flags);
break;
}
if (cpi->compressor_speed == 2) { if (cpi->compressor_speed == 2) {
unsigned int duration, duration2; unsigned int duration, duration2;