diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-12-06 07:37:39 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2011-12-07 10:56:39 -0800 |
| commit | b1823a7dd290b233739fa437673d9ff385d5f273 (patch) | |
| tree | 13d77ca48e9c3fe33b164898d68f55744c6855b7 /vp8/encoder/onyx_if.c | |
| parent | d0e3acf98cc24db8bbb75119d7384e4b673c5ecf (diff) | |
| download | libvpx-b1823a7dd290b233739fa437673d9ff385d5f273.tar libvpx-b1823a7dd290b233739fa437673d9ff385d5f273.tar.gz libvpx-b1823a7dd290b233739fa437673d9ff385d5f273.tar.bz2 libvpx-b1823a7dd290b233739fa437673d9ff385d5f273.zip | |
fixed a crash when MODE_STATS is enabled
The MODE_STATS macro was used to #ifdef around code for mode entropy
stats collection, this commit fixed a crash when MODE_STATS is on.
The commit also changed a number of array definitions to use defined
macros instead of hard-coded numbers.
Change-Id: I114592f53a1e44e31e455f5725f036ae6168735a
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 7b9f08fe6..cc3a17579 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -148,10 +148,10 @@ extern int y_modes[VP8_YMODES] ; extern int i8x8_modes[VP8_I8X8_MODES]; extern int uv_modes[VP8_UV_MODES] ; extern int uv_modes_y[VP8_YMODES][VP8_UV_MODES]; -extern int b_modes[10] ; -extern int inter_y_modes[10] ; -extern int inter_uv_modes[4] ; -extern unsigned int inter_b_modes[15]; +extern int b_modes[B_MODE_COUNT]; +extern int inter_y_modes[MB_MODE_COUNT] ; +extern int inter_uv_modes[VP8_UV_MODES] ; +extern unsigned int inter_b_modes[B_MODE_COUNT]; #endif extern void (*vp8_short_fdct4x4)(short *input, short *output, int pitch); @@ -2748,10 +2748,14 @@ void vp8_remove_compressor(VP8_PTR *ptr) } fprintf(f, "Modes in Inter Frames:\n"); - fprintf(f, "Y: %8d, %8d, %8d, %8d, %8d, %8d, %8d, %8d, %8d, %8d\n", - inter_y_modes[0], inter_y_modes[1], inter_y_modes[2], inter_y_modes[3], inter_y_modes[4], - inter_y_modes[5], inter_y_modes[6], inter_y_modes[7], inter_y_modes[8], inter_y_modes[9]); - fprintf(f, "UV:%8d, %8d, %8d, %8d\n", inter_uv_modes[0], inter_uv_modes[1], inter_uv_modes[2], inter_uv_modes[3]); + fprintf(f, + "Y: %8d, %8d, %8d, %8d, %8d, %8d, %8d, %8d, %8d, %8d, %8d\n", + inter_y_modes[0], inter_y_modes[1], inter_y_modes[2], + inter_y_modes[3], inter_y_modes[4], inter_y_modes[5], + inter_y_modes[6], inter_y_modes[7], inter_y_modes[8], + inter_y_modes[9], inter_y_modes[10]); + fprintf(f, "UV:%8d, %8d, %8d, %8d\n", inter_uv_modes[0], + inter_uv_modes[1], inter_uv_modes[2], inter_uv_modes[3]); fprintf(f, "B: "); { int i; |