diff options
| author | Fritz Koenig <frkoenig@google.com> | 2010-10-26 13:26:17 -0700 |
|---|---|---|
| committer | Fritz Koenig <frkoenig@google.com> | 2010-10-27 09:53:37 -0700 |
| commit | cf127474d8115c15a9dc92a8a287105fbec4705e (patch) | |
| tree | 9ea1a6dc5b5497251517b981e65ce7af22f896b9 | |
| parent | 36ff6a6743323c3a1d93b3cff5eaa06a782071fb (diff) | |
| download | libvpx-cf127474d8115c15a9dc92a8a287105fbec4705e.tar.gz | |
vpxdec : Change --pp-debug-info to be a bit field.
This allows multiple post processor debug levels to be overlayed.
i.e. can show colored reference blocks and visual motion vectors.
Change-Id: Ic4a1df438445b9f5780fe73adb3126e803472e53
| -rw-r--r-- | vp8/common/postproc.c | 17 | ||||
| -rw-r--r-- | vpxdec.c | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c index 9c0ab75a7..21e08638d 100644 --- a/vp8/common/postproc.c +++ b/vp8/common/postproc.c @@ -618,7 +618,8 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, int deblock_l oci->mb_cols, oci->mb_rows); vp8_blit_text(message, oci->post_proc_buffer.y_buffer, oci->post_proc_buffer.y_stride); } - else if (flags & VP8D_DEBUG_LEVEL2) + + if (flags & VP8D_DEBUG_LEVEL2) { int i, j; unsigned char *y_ptr; @@ -649,7 +650,8 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, int deblock_l } } - else if (flags & VP8D_DEBUG_LEVEL3) + + if (flags & VP8D_DEBUG_LEVEL3) { int i, j; unsigned char *y_ptr; @@ -683,7 +685,8 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, int deblock_l } } - else if (flags & VP8D_DEBUG_LEVEL4) + + if (flags & VP8D_DEBUG_LEVEL4) { sprintf(message, "Bitrate: %10.2f frame_rate: %10.2f ", oci->bitrate, oci->framerate); vp8_blit_text(message, oci->post_proc_buffer.y_buffer, oci->post_proc_buffer.y_stride); @@ -719,7 +722,9 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, int deblock_l #endif } - else if (flags & VP8D_DEBUG_LEVEL5) + + // Draw motion vectors + if (flags & VP8D_DEBUG_LEVEL5) { YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer; int width = post->y_width; @@ -752,7 +757,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, int deblock_l } // Color in block modes - else if (flags & VP8D_DEBUG_LEVEL6) + if (flags & VP8D_DEBUG_LEVEL6) { int i, j; YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer; @@ -787,7 +792,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, int deblock_l } // Color in frame reference blocks - else if (flags & VP8D_DEBUG_LEVEL7) + if (flags & VP8D_DEBUG_LEVEL7) { int i, j; YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer; @@ -783,7 +783,7 @@ int main(int argc, const char **argv_) vp8_pp_cfg.post_proc_flag &= ~0x7; if (level) - vp8_pp_cfg.post_proc_flag |= 8 << (level - 1); + vp8_pp_cfg.post_proc_flag |= level; } #endif |