diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2016-10-25 09:00:58 -0700 |
|---|---|---|
| committer | Yunqing Wang <yunqingwang@google.com> | 2016-10-25 10:12:41 -0700 |
| commit | c192def8f3433d6713824fd31e76e9fa58cfd7f9 (patch) | |
| tree | ffc1f0161267861f1a1712b6a287c7293fa3ad04 /vp9/encoder/vp9_encoder.c | |
| parent | 2e6a1976a0fd9bc1cfbae137876b397b1148037e (diff) | |
| download | libvpx-c192def8f3433d6713824fd31e76e9fa58cfd7f9.tar libvpx-c192def8f3433d6713824fd31e76e9fa58cfd7f9.tar.gz libvpx-c192def8f3433d6713824fd31e76e9fa58cfd7f9.tar.bz2 libvpx-c192def8f3433d6713824fd31e76e9fa58cfd7f9.zip | |
Change 2 motion search counts to be tile data
This patch modified the motion search counts used in:
https://chromium-review.googlesource.com/#/c/305640/
These 2 counts were originally added as thread data, and used to
make decisions in motion search. The tile encoding order can be
inconsistent while using different number of threads, which can
cause bitstream mismatch. Here moved them to tile data to solve
the issue.
BUG=webm:1322
Change-Id: Iedc4477aef1746aa0a4f84d88a1156296fd3ba87
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 43b708be8..4aa24b4e4 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2805,11 +2805,9 @@ static void output_frame_level_debug_stats(VP9_COMP *cpi) { "%7.2lf %7.2lf %7.2lf %7.2lf %7.2lf" "%6d %6d %5d %5d %5d " "%10"PRId64" %10.3lf" - "%10lf %8u %10"PRId64" %10d %10d %10d %10d %10d\n", + "%10lf %8u %10"PRId64" %10d %10d %10d\n", cpi->common.current_video_frame, cm->width, cm->height, - cpi->td.rd_counts.m_search_count, - cpi->td.rd_counts.ex_search_count, cpi->rc.source_alt_ref_pending, cpi->rc.source_alt_ref_active, cpi->rc.this_frame_target, |