]>
granicus.if.org Git - libvpx/log
Marco [Thu, 12 Nov 2015 17:06:12 +0000 (09:06 -0800)]
Update to noise estimation.
Add frame level global check and adjust some parameters.
Change-Id: I42103394f2d329781195d94ce6cbb5b3383eea17
Marco Paniconi [Thu, 12 Nov 2015 06:08:38 +0000 (06:08 +0000)]
Merge "Non-rd partition: reduce variance threshold low resolutions."
Marco Paniconi [Thu, 12 Nov 2015 06:06:51 +0000 (06:06 +0000)]
Merge "Adjust varianace threshold for high noise condition."
Marco [Thu, 12 Nov 2015 02:21:20 +0000 (18:21 -0800)]
Adjust motion threshold to limit cyclic refresh.
Change-Id: Icfca27a567eb8929c312c6315856ee130d982a04
Marco [Thu, 12 Nov 2015 02:05:11 +0000 (18:05 -0800)]
Adjust varianace threshold for high noise condition.
Change-Id: I91c722e480328ff95b8c57614d8176ccaceb2539
Marco Paniconi [Wed, 11 Nov 2015 20:40:29 +0000 (20:40 +0000)]
Merge "vp9 denoiser: Add another noise level to denoising."
James Zern [Wed, 11 Nov 2015 20:39:12 +0000 (20:39 +0000)]
Merge "Revert "VPX: x86 asm version of vpx_idct32x32_34_add()""
Marco [Wed, 11 Nov 2015 18:09:40 +0000 (10:09 -0800)]
vp9 denoiser: Add another noise level to denoising.
Change-Id: Idc755ab54e4f78bb7d75bc97634c451804edad99
James Zern [Wed, 11 Nov 2015 19:11:37 +0000 (11:11 -0800)]
Revert "VPX: x86 asm version of vpx_idct32x32_34_add()"
This reverts commit
9aeaa2016e7470c4e316d90da33d883098eed6f4 .
This causes some test vectors to fail.
Change-Id: I3659a2068404ec5a0591fba5c88b1bec0c9059a4
James Zern [Wed, 11 Nov 2015 19:09:42 +0000 (11:09 -0800)]
Revert "VP9: Only zero counts when !frame_parallel_decoding_mode"
This reverts commit
380a5519cca999f54b17f37b709996a11f3204ea .
This causes an assertion failure in debug_check_frame_counts() which
probably isn't valid with this change; leaving the investigation for
later now.
Change-Id: Ieda5ca811ed2fa50a0cc6935919a8d10dca996e0
Marco [Tue, 10 Nov 2015 23:41:39 +0000 (15:41 -0800)]
Non-rd partition: reduce variance threshold low resolutions.
Change-Id: I06306905d187948a92f839357df5d21413823808
Marco Paniconi [Tue, 10 Nov 2015 23:10:31 +0000 (23:10 +0000)]
Merge "Add bias to zero/small motion for noisy source."
James Zern [Tue, 10 Nov 2015 22:35:12 +0000 (22:35 +0000)]
Merge "convolve_copy_sse2: replace SSE w/SSE2 code"
Scott LaVarnway [Tue, 10 Nov 2015 21:40:11 +0000 (21:40 +0000)]
Merge "VPX: x86 asm version of vpx_idct32x32_34_add()"
Scott LaVarnway [Tue, 10 Nov 2015 19:54:56 +0000 (11:54 -0800)]
VPX: x86 asm version of vpx_idct32x32_34_add()
Change-Id: I8a933c63b7fbf3c65e2c06dbdca9646cadd0b7cb
Marco [Mon, 9 Nov 2015 21:36:56 +0000 (13:36 -0800)]
Add bias to zero/small motion for noisy source.
Change is only for real-time mode, speed >= 5, and non-screen content mode.
Add bias to zero/low motion for big blocks, if noise estimation
is enabled and noise level is above threshold.
Change-Id: I3a0a4608ede6aa535bda6eca528d20f8aba738e7
James Zern [Thu, 5 Nov 2015 04:01:34 +0000 (20:01 -0800)]
convolve_copy_sse2: replace SSE w/SSE2 code
this should be neutral or slightly faster on modern (P4+) architectures
Change-Id: Iec4c080275941eb8c9e05a66a2daf0405d86a69b
JackyChen [Tue, 10 Nov 2015 03:18:29 +0000 (19:18 -0800)]
VP9 noise estimate: no noise estimate if frame size change.
Change-Id: I521f7b53c143d562a88fe7de330aa3f0ef09f414
Jacky Chen [Tue, 10 Nov 2015 03:05:30 +0000 (03:05 +0000)]
Merge "VP9: add unit test for realtime external resize."
Johann [Tue, 10 Nov 2015 01:00:37 +0000 (17:00 -0800)]
Merge branch 'javanwhistlingduck'
Change-Id: Ib63fde31ae7b3f71e608830f7433113733b2a275
jackychen [Mon, 9 Nov 2015 22:58:14 +0000 (14:58 -0800)]
VP9: add unit test for realtime external resize.
Change-Id: I9bfa80de73847d9be88b6ce9865d7bb5fafaaa57
Jacky Chen [Mon, 9 Nov 2015 22:54:53 +0000 (22:54 +0000)]
Merge "VP9 dynamic resize: enable resize unit test(DownUp)."
James Zern [Mon, 9 Nov 2015 22:23:34 +0000 (22:23 +0000)]
Merge "VP9: Only zero counts when !frame_parallel_decoding_mode"
Johann [Wed, 28 Oct 2015 23:03:55 +0000 (16:03 -0700)]
Release v1.5.0
Javan Whistling Duck release.
Change-Id: If44c9ca16a8188b68759325fbacc771365cb4af8
jackychen [Mon, 9 Nov 2015 22:04:58 +0000 (14:04 -0800)]
VP9 dynamic resize: enable resize unit test(DownUp).
The unit test requires a longer clip which is already in the repo.
Change-Id: Ic42e8d83e636fafd20d485a7f5f8422835319245
Marco Paniconi [Mon, 9 Nov 2015 21:11:51 +0000 (21:11 +0000)]
Merge "VP9 dynamic resize: increase waiting time after key frame."
jackychen [Mon, 9 Nov 2015 19:47:26 +0000 (11:47 -0800)]
VP9 dynamic resize: increase waiting time after key frame.
For 1 pass CBR mode: increase waiting time after key frame
before we start sampling rate control behavior for determining
resize. This change need to disable one internal resize(DownUp)
temporally since it requires a longer clip to do so.
Change-Id: If21beda1be23f169ee541ab4dd642f718347887a
Marco Paniconi [Mon, 9 Nov 2015 19:29:35 +0000 (19:29 +0000)]
Merge "Use same bias (against non-zero mv for big blocks) for speed 5."
Alex Converse [Mon, 9 Nov 2015 18:27:40 +0000 (18:27 +0000)]
Merge "Expand unconstrained nodes in pack_mb_tokens and loop on zeros."
Scott LaVarnway [Mon, 9 Nov 2015 18:14:13 +0000 (10:14 -0800)]
VP9: Only zero counts when !frame_parallel_decoding_mode
The counts are never used when frame_parallel_decoding_mode
is set.
Change-Id: Ic7a566a048297f7373c9ffbb48929ea09eff674f
Marco [Mon, 9 Nov 2015 18:03:27 +0000 (10:03 -0800)]
Use same bias (against non-zero mv for big blocks) for speed 5.
Use same setting for speed 5 (as it is for speed > 5).
Change is only for real-time (non-rd) mode.
Change-Id: I830250eac654328373cb318baa89d4f0e63942e1
James Zern [Sat, 7 Nov 2015 00:57:06 +0000 (00:57 +0000)]
Merge changes I8c83b86d,Ic53b2ed5,I4acc8a84
* changes:
variance_test: create fn pointers w/'&' ref
sixtap_predict_test: create fn pointers w/'&' ref
sad_test: create fn pointers w/'&' ref
Hui Su [Sat, 7 Nov 2015 00:22:50 +0000 (00:22 +0000)]
Merge "Use accurate bit cost for uv_mode in UV intra mode RD selection"
Alex Converse [Tue, 3 Nov 2015 00:28:10 +0000 (16:28 -0800)]
Expand unconstrained nodes in pack_mb_tokens and loop on zeros.
Reduces Linux perf estimated cycle count for pack_mb_tokens on a
lossless encode on my desktop from
61858501855 to
48154040219 or from
26% of the overall profile to 21%.
Change-Id: I9ca3426d7e3272bc7f7030abda4f0d0cec87fb4a
hui su [Fri, 6 Nov 2015 21:56:51 +0000 (13:56 -0800)]
Use accurate bit cost for uv_mode in UV intra mode RD selection
On derflr, +0.1% for VP10; however, -0.03% on VP9.
Change-Id: I09c724232ede74254043d61d3cadc506256af0af
James Zern [Fri, 6 Nov 2015 22:37:20 +0000 (22:37 +0000)]
Merge "Revert "Add AVX vectorized vp9_diamond_search_sad""
James Zern [Fri, 6 Nov 2015 21:03:13 +0000 (13:03 -0800)]
Revert "Add AVX vectorized vp9_diamond_search_sad"
This reverts commit
f1342a7b070ef61b9fbdf03e899ac2107cfcb6bd .
This breaks 32-bit builds:
runtime error: load of misaligned address 0xf72fdd48 for type 'const
__m128i' (vector of 2 'long long' values), which requires 16 byte
alignment
+ _mm_set1_epi64x is incompatible with some versions of visual studio
Change-Id: I6f6fc3c11403344cef78d1c432cdc9147e5c1673
James Zern [Fri, 6 Nov 2015 03:00:45 +0000 (19:00 -0800)]
variance_test: create fn pointers w/'&' ref
this helps some toolchains (vs9) resolve the type of the parameter
Change-Id: I8c83b86da53b1783cd18c0f765b67ba33da91d72
James Zern [Fri, 6 Nov 2015 03:00:45 +0000 (19:00 -0800)]
sixtap_predict_test: create fn pointers w/'&' ref
this helps some toolchains (vs9) resolve the type of the parameter
Change-Id: Ic53b2ed5fbce05c5b5e633b4a4ef9ea75c55360a
Marco [Fri, 6 Nov 2015 16:33:41 +0000 (08:33 -0800)]
vp9: Disable noise estimate on resize trigger frame.
Change-Id: I35767a6320943582ee11d737b5f240cea2d01b25
James Zern [Fri, 6 Nov 2015 03:00:45 +0000 (19:00 -0800)]
sad_test: create fn pointers w/'&' ref
this helps some toolchains (vs9) resolve the type of the parameter
Change-Id: I4acc8a844d1e55b766f66482bd6d32998174d70f
Marco Paniconi [Fri, 6 Nov 2015 06:51:11 +0000 (06:51 +0000)]
Merge "vp9: Updates to noise estimation."
Marco [Fri, 6 Nov 2015 00:00:15 +0000 (16:00 -0800)]
vp9: Updates to noise estimation.
Add threshold/condition on spatial_variance and brightness level.
Modification to normalization of block variance.
Change resolution limit below which we disable noise estimation.
Change-Id: If5be08a26ceda351242d8a58d2f0bc88c0a918f0
James Zern [Thu, 5 Nov 2015 23:22:39 +0000 (15:22 -0800)]
vp9_spatial_svc_encoder.sh: fix command line param
-l -> -sl, renamed in:
be3b08d [svc] Temporal svc with two pass rate control
Change-Id: I5a7b179b33d94e20e54825090659156dece928c0
Yunqing Wang [Thu, 5 Nov 2015 20:17:13 +0000 (20:17 +0000)]
Merge "Add AVX vectorized vp9_diamond_search_sad"
Geza Lore [Wed, 28 Oct 2015 14:35:04 +0000 (14:35 +0000)]
Add AVX vectorized vp9_diamond_search_sad
This function now has an AVX intrinsics version which is about 80%
faster compared to the C implementation. This provides a 2-4% total
speed-up for encode, depending on encoding parameters. The function
utilizes 3 properties of the cost function lookup table, constructed
in 'cal_nmvjointsadcost' and 'cal_nmvsadcosts'.
For the joint cost:
- mvjointsadcost[1] == mvjointsadcost[2] == mvjointsadcost[3]
For the component costs:
- For all i: mvsadcost[0][i] == mvsadcost[1][i]
(equal per component cost)
- For all i: mvsadcost[0][i] == mvsadcost[0][-i]
(Cost function is even)
These must hold, otherwise the AVX version of the function cannot be used.
Change-Id: I184055b864c5a2dc37b2d8c5c9012eb801e9daf6
Marco Paniconi [Wed, 4 Nov 2015 00:01:23 +0000 (00:01 +0000)]
Merge "Bias against non-zero mv for large blocks."
Marco [Fri, 30 Oct 2015 18:51:06 +0000 (11:51 -0700)]
Bias against non-zero mv for large blocks.
Change is only for real-time mode, speed > 5, and non-screen content mode.
Bias is based on block size and motion vector level (motion above some threshold).
Helps to improves stability in background from lightning changes.
PSNR/SSIM metrics on RTC set almost no change/neutral (within +/- 0.1).
Change-Id: I7eac13c1ae10be4ab1f40acc7f9f1df5653ece9d
Marco Paniconi [Tue, 3 Nov 2015 22:40:53 +0000 (22:40 +0000)]
Merge "Update to encoder_breakout_test, for non-rd mode."
Yaowu Xu [Tue, 3 Nov 2015 21:56:25 +0000 (21:56 +0000)]
Merge "Fix a msvc warning"
Hui Su [Tue, 3 Nov 2015 20:55:14 +0000 (20:55 +0000)]
Merge "Generate intra prediction reference values only when necessary"
Marco Paniconi [Tue, 3 Nov 2015 19:54:52 +0000 (19:54 +0000)]
Merge "Adjust threshold for datarate frame drop test."
Marco [Tue, 3 Nov 2015 19:47:23 +0000 (11:47 -0800)]
Update to encoder_breakout_test, for non-rd mode.
Only use non-zero threshold(s) for breakout if
the motion level of the current tested mode is low.
Change-Id: I22aae961cc42371b49d3f648560181cc54708502
Yaowu Xu [Tue, 3 Nov 2015 19:22:58 +0000 (11:22 -0800)]
Fix a msvc warning
Change-Id: Id5b8f597fb275395232559fea7bfeb56912b88a1
Alex Converse [Tue, 3 Nov 2015 17:52:34 +0000 (17:52 +0000)]
Merge "misc fixes: Remove a wasted value."
Alex Converse [Tue, 3 Nov 2015 17:50:34 +0000 (17:50 +0000)]
Merge "Add target for Mac OS X 10.11 'El Capitan'"
Marco [Tue, 3 Nov 2015 16:15:04 +0000 (08:15 -0800)]
Adjust threshold for datarate frame drop test.
Current threshold is little too strict.
Change-Id: I99ec1409d095e0c2fd3b7ab398742cabcc05700b
Jacky Chen [Mon, 2 Nov 2015 23:37:23 +0000 (23:37 +0000)]
Merge "vpx_scale: fix the issue in msan test."
Alex Converse [Mon, 2 Nov 2015 22:05:37 +0000 (14:05 -0800)]
Add target for Mac OS X 10.11 'El Capitan'
Change-Id: I174f5b41be384894e41b8e2926cbf8fd0f8e21b2
Marco Paniconi [Mon, 2 Nov 2015 22:08:01 +0000 (22:08 +0000)]
Merge "Move noise level estimate outside denoiser."
jackychen [Fri, 30 Oct 2015 18:08:23 +0000 (11:08 -0700)]
vpx_scale: fix the issue in msan test.
Do memset to fix msan issue due to the access of uninitialized
memory.
BUG=https://code.google.com/p/chromium/issues/detail?id=549155
Change-Id: I02f995ede79e3574e72587cc078df1a0d11af002
Marco [Sun, 1 Nov 2015 22:40:05 +0000 (14:40 -0800)]
Move noise level estimate outside denoiser.
Source noise level estimate is also useful for
setting variance encoder parameters (variance thresholds,
qp-delta, mode selection, etc), so allow it to be used also
if denoising is not on.
Change-Id: I4fe23d47607b4e17a35287057f489c29114beed1
hui su [Mon, 2 Nov 2015 19:11:25 +0000 (11:11 -0800)]
Move palette-based intra prediction out of misc-fixes
Change-Id: Ia59724413c4a4831390119a33d40a7d713b4b69f
hui su [Sat, 31 Oct 2015 00:15:49 +0000 (17:15 -0700)]
Generate intra prediction reference values only when necessary
This can help increase encoding speed substantially.
Change-Id: Id0c009146e6e74d9365add71c7b10b9a57a84676
Marco [Mon, 2 Nov 2015 17:10:01 +0000 (09:10 -0800)]
vp9 denoiser: Don't estimate noise on resized trigger frame.
Change-Id: I60461f011d1aba0b1eb6584c6940f745221915f4
James Zern [Thu, 29 Oct 2015 23:42:26 +0000 (16:42 -0700)]
vp9_dx_iface: move struct defs to separate header
this avoids redefining vpx_codec_vp9_dx, vpx_codec_vp9_dx_algo in
vp9_encoder_parms_get_to_decoder.cc
Change-Id: I3b89e7a62497227ee32419f1a7d30e4c10a13c05
(cherry picked from commit
ca163b85bb13fc07df3e1be60d4e4b71c8e83090 )
James Zern [Thu, 29 Oct 2015 23:41:25 +0000 (16:41 -0700)]
vp9_decodeframe.h: add missing include
Change-Id: I8ef772a016a79cab88bee8e9739530aa030baaa9
(cherry picked from commit
68ecfc1e62408800611ed96c37949d65b7f25cf7 )
Debargha Mukherjee [Fri, 30 Oct 2015 20:57:10 +0000 (20:57 +0000)]
Merge "Convert motion search config from AoS to SoA"
James Zern [Fri, 30 Oct 2015 05:50:58 +0000 (05:50 +0000)]
Merge changes I3b89e7a6,I8ef772a0
* changes:
vp9_dx_iface: move struct defs to separate header
vp9_decodeframe.h: add missing include
James Zern [Thu, 29 Oct 2015 23:42:26 +0000 (16:42 -0700)]
vp9_dx_iface: move struct defs to separate header
this avoids redefining vpx_codec_vp9_dx, vpx_codec_vp9_dx_algo in
vp9_encoder_parms_get_to_decoder.cc
Change-Id: I3b89e7a62497227ee32419f1a7d30e4c10a13c05
Alex Converse [Fri, 30 Oct 2015 00:37:33 +0000 (00:37 +0000)]
Merge "Make the zero handling in extend_to_full_distribution more explicit."
James Zern [Thu, 29 Oct 2015 23:41:25 +0000 (16:41 -0700)]
vp9_decodeframe.h: add missing include
Change-Id: I8ef772a016a79cab88bee8e9739530aa030baaa9
hui su [Thu, 29 Oct 2015 22:53:20 +0000 (15:53 -0700)]
Specify feasible parameter values for lossless mode
Change-Id: I53d9719dcb81fa83fe3c920a552db5a0f1cacefa
Alex Converse [Thu, 8 Oct 2015 23:01:42 +0000 (16:01 -0700)]
Make the zero handling in extend_to_full_distribution more explicit.
The old workaround "p = 0 ? 0 : p -1" is misleading.
?: happens before =
assigning back to p truncates to one byte.
Therefore it is equivalent to (p - 1) & 0xFF, but the check just exists
to work around a first pass bug, so let's make the work around more
clear.
https://bugs.chromium.org/p/webm/issues/detail?id=1089
Change-Id: I587c44dd61c1f3767543c0126376f881889935af
Jacky Chen [Thu, 29 Oct 2015 21:00:36 +0000 (21:00 +0000)]
Merge "VP9_resizing: add limitation to the downsacling resolution."
Alex Converse [Thu, 29 Oct 2015 19:58:24 +0000 (19:58 +0000)]
Merge "Shrink probability remap tables."
jackychen [Wed, 28 Oct 2015 19:30:45 +0000 (12:30 -0700)]
VP9_resizing: add limitation to the downsacling resolution.
Width and height of downscaling resolution should not be lower
than min_width and min_height which can be set as needed, both
are 180 for now.
Change-Id: I34d06704ea51affbdd814246e22ee8d41d991f00
Jacky Chen [Thu, 29 Oct 2015 16:00:15 +0000 (16:00 +0000)]
Merge "VP9 decoder: Add more test vectors for resizing."
Marco [Thu, 29 Oct 2015 01:16:24 +0000 (18:16 -0700)]
Update to vp9_spatial_svc_encoder.
Some fixes for rate control stats and bypass mode.
Change-Id: I28bed5467a681b8867cca55852d5d3a25d850f39
jackychen [Thu, 15 Oct 2015 21:02:46 +0000 (14:02 -0700)]
VP9 decoder: Add more test vectors for resizing.
Refer to doc "vp9-test-vectors".
BUG=https://code.google.com/p/webm/issues/detail?id=1086
Change-Id: I523d1f39141a3a86f113604cbdb9cd41cc2d6470
Marco Paniconi [Wed, 28 Oct 2015 21:59:17 +0000 (21:59 +0000)]
Merge "VP9-SVC: Allow frame dropping due to overshoot for spatial layers."
Alex Converse [Wed, 28 Oct 2015 20:48:52 +0000 (20:48 +0000)]
Merge "Revert "Replace the zero handling in extend_to_full_distribution.""
Johann Koenig [Wed, 28 Oct 2015 19:18:49 +0000 (19:18 +0000)]
Merge "Skip AS detection when using --enable-external-build"
Johann Koenig [Wed, 28 Oct 2015 19:16:42 +0000 (19:16 +0000)]
Merge "Only set sysroot when alt_libc finds a directory"
Alex Converse [Wed, 28 Oct 2015 18:48:44 +0000 (11:48 -0700)]
Revert "Replace the zero handling in extend_to_full_distribution."
This reverts commit
7f56cb29787b187c8cb1b778918ca3b80184c804 .
It causes uninitialized reads in the first pass setting up later cost tables.
Change-Id: I2df498df3f5c03eff359f79edf045aed0c618dc9
Hangyu Kuang [Mon, 26 Oct 2015 23:02:23 +0000 (16:02 -0700)]
Add more resize test videos that with larger resolution change intervals.
These videos change resolution every 10 frames versus every 3 frames in current
test sets.
Change-Id: Ic33f449fc9b6d2f480825d4715b8f63e70801232
Geza Lore [Mon, 26 Oct 2015 09:39:38 +0000 (09:39 +0000)]
Convert motion search config from AoS to SoA
This is a prerequisite for vectorizing vp9_diamond_search_sad_c.
Change-Id: I49cd9148782410ca8b16e8a468ca9e7c6d088410
Hangyu Kuang [Wed, 28 Oct 2015 15:04:25 +0000 (15:04 +0000)]
Merge "Add several new test vectors with small resolution."
Hangyu Kuang [Thu, 22 Oct 2015 23:31:13 +0000 (16:31 -0700)]
Add several new test vectors with small resolution.
Change-Id: I70b1b8162a0c9b8501358ba7d32fecd1dc020ab5
Marco [Tue, 27 Oct 2015 22:50:06 +0000 (15:50 -0700)]
Update to vp9-denoising.
Set increase_denoising parameter for temporal filter.
Change-Id: Id98bf160db98dfa9aedf76e20b43e6f7c783fb1c
Johann [Tue, 27 Oct 2015 22:38:47 +0000 (15:38 -0700)]
Only set sysroot when alt_libc finds a directory
Change-Id: Idc0a9adb4fb371272d6c8c98737f66c6cf209e37
Marco [Tue, 27 Oct 2015 20:02:02 +0000 (13:02 -0700)]
VP9-SVC: Allow frame dropping due to overshoot for spatial layers.
For 1 pass CBR mode.
Change-Id: I8bceb489a850ec26f05382eecb5c0c32a1bb8883
Alex Converse [Tue, 27 Oct 2015 17:02:31 +0000 (10:02 -0700)]
misc fixes: Remove a wasted value.
Remove delta index 254 from probability remapping and subexp coding.
Saves 1-bit when the delta index is 129.
Change-Id: I88aba565fc766b1769165be458d2efd3ce45817e
Marco Paniconi [Tue, 27 Oct 2015 19:10:01 +0000 (19:10 +0000)]
Merge "Adjustments to vp9-denoising."
Alex Converse [Tue, 27 Oct 2015 17:25:30 +0000 (10:25 -0700)]
Shrink probability remap tables.
Saves 2288 bytes in vp8+vp9 libvpx.a.
Change-Id: Iaa5712e59a9693ed58cea63de63781a96827e44e
Marco [Mon, 26 Oct 2015 21:56:46 +0000 (14:56 -0700)]
Adjustments to vp9-denoising.
Adjust variance threshold, delta-qp, and intra penalty cost,
based on estimated noise level in source.
Replace denoising_on with a level value=L/M/H.
Change-Id: I0c017dae75a5d897367d2c42dec26f2f37e447c1
Yaowu Xu [Tue, 27 Oct 2015 17:07:50 +0000 (17:07 +0000)]
Merge "Reorder code to be consistent accross branches"
Alex Converse [Tue, 27 Oct 2015 16:54:49 +0000 (16:54 +0000)]
Merge "Replace the zero handling in extend_to_full_distribution."
Yaowu Xu [Tue, 27 Oct 2015 16:04:40 +0000 (09:04 -0700)]
Reorder code to be consistent accross branches
This is to make future merge a bit easier.
Change-Id: I1039de381d8fe7b9988b57c23d15d0cb5f2fcd32
Alex Converse [Tue, 27 Oct 2015 06:13:03 +0000 (23:13 -0700)]
Fix VS build.
Add a cast on a double to unsigned assignment.
Change-Id: I4abce7cfa13e145ed0c71469844ac9b274aa1411