diff options
| author | Marco Paniconi <marpan@google.com> | 2015-11-03 22:40:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-03 22:40:53 +0000 |
| commit | 17534d2918dd48e0568a06582120d4030f1ec168 (patch) | |
| tree | 92cffcc302bf66f0da688bf63d6d6d14e4f9608d /vp9/encoder | |
| parent | 5ff1008ed942a85c445f47f4b661d52756549719 (diff) | |
| parent | 9a7785b9d6ec67026980c1a17d8639f08a8231fe (diff) | |
| download | libvpx-17534d2918dd48e0568a06582120d4030f1ec168.tar libvpx-17534d2918dd48e0568a06582120d4030f1ec168.tar.gz libvpx-17534d2918dd48e0568a06582120d4030f1ec168.tar.bz2 libvpx-17534d2918dd48e0568a06582120d4030f1ec168.zip | |
Merge "Update to encoder_breakout_test, for non-rd mode."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 867b435bd..a692c2909 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -779,14 +779,20 @@ static void encode_breakout_test(VP9_COMP *cpi, MACROBLOCK *x, struct buf_2d yv12_mb[][MAX_MB_PLANE], int *rate, int64_t *dist) { MACROBLOCKD *xd = &x->e_mbd; - + MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi; const BLOCK_SIZE uv_size = get_plane_block_size(bsize, &xd->plane[1]); unsigned int var = var_y, sse = sse_y; // Skipping threshold for ac. unsigned int thresh_ac; // Skipping threshold for dc. unsigned int thresh_dc; - if (x->encode_breakout > 0) { + int motion_low = 1; + if (mbmi->mv[0].as_mv.row > 64 || + mbmi->mv[0].as_mv.row < -64 || + mbmi->mv[0].as_mv.col > 64 || + mbmi->mv[0].as_mv.col < -64) + motion_low = 0; + if (x->encode_breakout > 0 && motion_low == 1) { // Set a maximum for threshold to avoid big PSNR loss in low bit rate // case. Use extreme low threshold for static frames to limit // skipping. |