Commit Graph

1859 Commits

Author SHA1 Message Date
Johann
eca59cad0b Use intrinsics for sse2 regular quantize
Remove dependency of this function on asm_offsets. ssse3/sse4 next.

Change quant_shift calculation so it be done using SIMD. Pre-calculate
as much as possible to simplify EOB selection.

Take advantage of qcoeff being zero'd by tying the if statements
together.

Speed parity with previous implementation with gcc x86_64 linux

Change-Id: Ife97556a1eca3a74b09def1a3d04084974dff1fb
2013-02-28 18:06:15 -08:00
James Zern
a07bed2b2b firstpass.c: correct casting around gf_group_bits
gf_group_bits is int64_t remove casts to int.

Change-Id: I3b4225905041fac9af9fdfcbcb6f1c357ea4b593
2013-02-28 15:45:29 -08:00
Johann
67978d1380 Merge "vp8 fast quantizer with intrinsics" 2013-02-28 11:32:03 -08:00
James Zern
3b79000122 Merge "vp8/encoder/mcomp.c: remove an unused variable" 2013-02-27 11:33:18 -08:00
Jan Kratochvil
82ed3f9a41 Fix --as=nasm compatibility for new asm code.
s/movd/movq/

Change-Id: Id1a56de91551f8dc796f14f1056c565dfc1ba626
2013-02-27 09:55:38 -08:00
Johann
ef887974aa vp8 fast quantizer with intrinsics
Reduce dependency on offsets file by using intrinsics. Disassembly shows
improvements over previous assembly specifically in register management,
preloading, and {pro,epi}log. Speed change is within margin of error.

Change-Id: I8131b4b4d62bc092407fe847bfaa8f2c0e1384ff
2013-02-26 10:48:24 -08:00
James Zern
ca64f6c14f vp8/encoder/mcomp.c: remove an unused variable
Change-Id: I980da3c70f7cee1b723ede0ed2ae527ac7cd6a51
2013-02-22 15:38:45 -08:00
James Zern
c21226b638 Merge "vp8: make gf_group_bits 64-bit" 2013-02-22 15:31:28 -08:00
James Zern
4e00060d29 vp8: make gf_group_bits 64-bit
avoids signed integer overflow; matches kf_group_bits

Change-Id: I193145cdc4fa53e70fba0a1731a03eb1a574931d
2013-02-22 12:45:28 -08:00
James Zern
fba9772dd2 vp8_first_pass(): avoid floating point div by 0
Change-Id: Id1e6a12db6b0c1d3f64ead8fd8834aadc30fbed2
2013-02-22 12:41:59 -08:00
John Koleszar
226c57e4fa Merge "Add support for x64 and win64 yasm flags." 2013-01-31 17:05:33 -08:00
Frank Galligan
f67d740b34 Add support for x64 and win64 yasm flags.
Some projects must define only win64 for Windows 64bit builds using
yasm.

Change-Id: I1d09590d66a7bfc8b4412e1cc8685978ac60b748
2013-01-31 16:25:37 -08:00
Marco Paniconi
ec6cf493ff Fix for divide by zero in vp8_adjust_key_frame.
Change-Id: I3bf9bdd95abfd287fbcb644f4fb85fb9204be95a
2013-01-31 10:53:06 -08:00
Scott LaVarnway
0c2919c3d5 Bug fix: error-concealment enabled changed postproc output
When error concealment is enabled, it swaps the mi and prev_mi ptrs after
each frame is decoded.  The postproc uses the mi ptr for the mode info context.
Now the postproc will use the correct mode info context.

Change-Id: I537ae5450f319c624999b44525bb52bb30047b7b
2013-01-25 17:06:32 -08:00
John Koleszar
de5546c372 Merge branch 'experimental' of review:webm/libvpx
Change-Id: Ib2c2236349c2ae8ee81bd01c5067dddcbac713ca
2013-01-14 18:34:04 -08:00
Marco Paniconi
07ce775189 Reduce loop filter in cyclic refresh.
Reduce the delta loop filter for blocks that are cyclicly refreshed.
This helps to reduce the dot artifacts that may happen
when zero_mv blocks are repeatedly loop-filtered.

This change, along with the fix in:
https://gerrit.chromium.org/gerrit/#/c/40409/
helps to reduce this artifact, but cannot remove the dot artifacts completely.

Change-Id: I44675e7a0f59295b648a3b7d4956fb301231a97f
2013-01-11 16:46:09 -08:00
Frank Galligan
bc45f23192 Upstream changes from Chromium Android Clang build.
See https://codereview.chromium.org/11875006/

Change-Id: Ied2a17df2b3222635f84aef120eaa9feb53750d2
2013-01-11 15:37:23 -08:00
John Koleszar
879cb7d962 Merge vp9-preview changes into experimental branch
Incorportate vp9-preview changes by merging master branch into experimental.

Conflicts:
	test/test.mk
	vp9/common/vp9_filter.c
	vp9/common/vp9_idctllm.c
	vp9/common/vp9_invtrans.h
	vp9/common/vp9_mbpitch.c
	vp9/common/vp9_rtcd_defs.sh
	vp9/common/vp9_systemdependent.h
	vp9/common/vp9_type_aliases.h
	vp9/common/x86/vp9_asm_stubs.c
	vp9/common/x86/vp9_subpixel_mmx.asm
	vp9/decoder/vp9_decodframe.c
	vp9/decoder/vp9_dequantize.c
	vp9/decoder/vp9_dequantize.h
	vp9/decoder/vp9_onyxd_int.h
	vp9/encoder/vp9_bitstream.c
	vp9/encoder/vp9_encodeframe.c
	vp9/encoder/vp9_rdopt.c

Change-Id: I17f51c3666d1b59cf1a699f87607cbc5d30a87c5
2013-01-08 10:19:59 -08:00
Scott LaVarnway
27825e9e3a Merge "Remove cpi parameter from update_mvcount()" 2013-01-08 10:04:21 -08:00
John Koleszar
16810c10c1 Merge branch 'vp9-preview' of review:webm/libvpx
Merge the vp9-preview branch into master.

Change-Id: If700b9054676f24bed9deb59050af546c1ca5296
2012-12-27 09:37:19 -08:00
James Zern
9dab3ce624 add emmintrin_compat.h for builds with gcc < 4
Change-Id: If7822e6fcd0d3568b934032322b19ba3e401df26
2012-12-20 14:56:13 -08:00
Yaowu Xu
28765690fe Changed MAX_PSNR to 100
The MAX_PSNR was used to assign a "psnr" number when the mse is close
to zero. The direct assignment is used to prevent divide by zero in
computation. Changing it from 60 to 100 to be consistent against what
is being done in VP9

Change-Id: I4854ffc4961e59d372ec8005a0d52ca46e3c4c1a
2012-12-18 14:36:20 -08:00
Scott LaVarnway
fd671152bc Merge "Bug fix: use correct count_mb_ref_frame_usage" 2012-12-11 11:00:53 -08:00
Scott LaVarnway
57e12be283 Bug fix: use correct count_mb_ref_frame_usage
Change-Id: I9702f3e9ed664c2537e7874698c944620b07fff8
2012-12-10 17:38:55 -08:00
Scott LaVarnway
a0ad16e203 Moved error_bins to macroblock struct
Change-Id: Ic9956ddf1c2ddffcf7be7fdfc23ad9a2426fc47a
WIP: Fixing unsafe threading in VP8 encoder.
2012-12-10 17:32:58 -08:00
Scott LaVarnway
2cd48bdc92 Merge "Moved zbin_mode_boost to macroblock struct" 2012-12-10 16:22:57 -08:00
Scott LaVarnway
cc91d655e4 Update correct macroblock quantize_b function ptrs
WIP: Fixing unsafe threading in VP8 encoder.
Use the passed in macroblock instead of the macroblock located in
cpi.

Change-Id: I1bfa07de6ea463f2baeaae1bae5d950691bc4afc
2012-12-10 15:23:11 -08:00
Scott LaVarnway
74efda4bd6 Moved zbin_mode_boost to macroblock struct
Fixing unsafe threading in VP8 encoder.

Change-Id: Ibf4c89a2043654834747811bc11eb283de0bb830
2012-12-10 12:42:24 -08:00
Scott LaVarnway
3a19eebe4d Moved zbin_over_quant to macroblock struct
Change-Id: I76fe20ade099573997404b8733cf7f79e82fb21e
WIP: Fixing unsafe threading in VP8 encoder.
2012-12-10 10:51:42 -08:00
Scott LaVarnway
000c8414b5 Moved denoiser frame copy/updates out of loopfilter thread
The loopfilter thread from the previous frame can be running while
starting the current frame.  cpi->Source will change during this time causing
the wrong data to be copied.  The refresh_x_frame flags also change, which
will cause incorrect updates of the denoised buffers.

Change-Id: I7d982b4fcb40a0610801332aa85f3b792c64e4c3
2012-12-07 12:19:52 -08:00
Scott LaVarnway
bc10eab41b Merge "added work buffer for denoiser" 2012-12-06 15:27:54 -08:00
Scott LaVarnway
ef2248a2a3 added work buffer for denoiser
The denoiser was writing to LAST_FRAME buffer.   If LAST_FRAME isn't being
updated,  the reference frame buffers were out of sync between the encoder and the
denoised raw buffers. This patch resolves the discrepancy by always writing to a work
buffer (INTRA_FRAME) and then copying from that buffer to any buffers that needs to
be updated.

Change-Id: I6dd855b9749978b542bc3d515914d5f16faf25df
2012-12-05 19:09:05 -08:00
Johann
a36d9a4a15 Move vp8_scale_frame to vpx namespace
Change-Id: I92d613e89c8f1174eca0789116120bfa20c25c28
2012-12-05 16:05:46 -08:00
Johann
1009f76566 Use 'vpx_scale' consistently
Change-Id: I178352813d2b8702d081caf405de9dbad9af2cc3
2012-12-05 16:05:44 -08:00
Adrian Grange
9a3de881c0 Disable background update on non-base layer frames
Multi-threaded code was not updated to disable background
refresh for non base-layer frames at the time it was
disabled in the main C-code.

Change-Id: Id6cc376130b7def046942121cfd0526b4f0a71d4
2012-12-05 13:24:52 -08:00
Scott LaVarnway
f2b36a4de7 Removed check_gf_quality()
and various unused members in VP8_COMP along with other
code cleanups.

Change-Id: I56c6c0a77a51f5ac5cbd6071017bcbfd2623b7df
2012-12-05 08:56:42 -08:00
Scott LaVarnway
bfca084fcd Moving mbs_tested_so_far, mode_test_hit_counts to macroblock struct
Change-Id: Ifa78c0a953fab3e5dd7af0446924846c7022cd09
2012-12-04 16:52:47 -08:00
Scott LaVarnway
358b0efec5 Remove cpi parameter from update_mvcount()
cpi is no longer used .

Change-Id: Ie86b994059e506cc1944212e12d4f75c041c1d15
2012-12-04 15:43:25 -08:00
Scott LaVarnway
9961ad479a Merge "Moving rd_thresh_mult, rd_threshes to macroblock struct" 2012-12-03 12:05:48 -08:00
Scott LaVarnway
7891fb5eda Merge "Moving count_mb_ref_frame_usage to macroblock struct" 2012-12-03 11:55:46 -08:00
Marco Paniconi
464b1df6d4 Updates to qp-regulate and rate correction factor.
Don't use the switch to gf_rate_correction factor when
temporal layers is used (i.e., cpi->oxcf.number_of_layers > 1).

In temporal layers, we prefer to avoid this as any frame
(e.g., base layer frame at anchor of pattern) may update
both last and golden (and possibly alt-ref), and so we would get
different rate correction factors within the same layer.

This change will make sure one rate correction factor exists for each layer.

Also, made some other code in qp-regulate that depends on
alt/golden update specific to the 1 layer case.

Change-Id: I41a6d085bd477f9307ef3b3c311695214273892c
2012-11-26 16:29:43 -08:00
John Koleszar
a9c7597adc support building vp8 and vp9 into a single lib
Change-Id: Ib8f8a66c9fd31e508cdc9caa662192f38433aa3d
2012-11-15 10:46:17 -08:00
John Koleszar
7b8dfcb5a2 Rough merge of master into experimental
Creates a merge between the master and experimental branches. Fixes a
number of conflicts in the build system to allow *either* VP8 or VP9
to be built. Specifically either:

  $ configure --disable-vp9 $ configure --disable-vp8
  --disable-unit-tests

VP9 still exports its symbols and files as VP8, so that will be
resolved in the next commit.

Unit tests are broken in VP9, but this isn't a new issue. They are
fixed upstream on origin/experimental as of this writing, but rebasing
this merge proved difficult, so will tackle that in a second merge
commit.

Change-Id: I2b7d852c18efd58d1ebc621b8041fe0260442c21
2012-11-07 11:30:16 -08:00
Scott LaVarnway
4d9791e2b1 Incorrect parameter passed into vp8_stuff_mb
Should be MACROBLOCK, not MACROBLOCKD

Change-Id: I0353bbdf085a181ae2ac1f0b96849b38566e9f6a
2012-11-06 17:35:02 -08:00
Scott LaVarnway
69d074841d Moving count_mb_ref_frame_usage to macroblock struct
Change-Id: I44e4e3869f231ae270cca98c9565f23c512e3ddf
2012-11-06 16:58:28 -08:00
Scott LaVarnway
80fe4723d2 Merge "Removed mb_norm_activity_map" 2012-11-06 16:28:54 -08:00
Scott LaVarnway
fe91e47bc7 Moving rd_thresh_mult, rd_threshes to macroblock struct
Change-Id: I650a593162280ab40e71e527ec6518303e2d5723
2012-11-06 16:27:00 -08:00
Scott LaVarnway
78bf8284cf Removed mb_norm_activity_map
Not used.

Change-Id: I07ba929e3ff82b4b0c86f731769cdf5434c7a816
2012-11-06 09:47:45 -08:00
Scott LaVarnway
ee28bb87b4 Moving _error counts to macroblock struct
Change-Id: I28ac1519d1594801fef9a623cb64598d3d751eb0
2012-11-06 09:21:54 -08:00
Scott LaVarnway
01824d1848 Moving MVcount to macroblock struct
Change-Id: Ie22841d096f3c86694b95bd06fc3a8ce1f032a10
2012-11-06 08:51:11 -08:00
Scott LaVarnway
95390b2b20 Moving ymode_count, uv_mode_count to macroblock struct
Change-Id: Ib73c7b2bee4cb2eb2528fa6b381fffe9503079a0
2012-11-05 12:25:18 -08:00
Scott LaVarnway
03c0af8747 Moved skip_true_count to macroblock struct
Change-Id: Ie9a26be7c9baa54a0e43a63ed6c77f2746477a9c
2012-11-05 11:02:35 -08:00
Scott LaVarnway
7ee44eef13 Moving coef_counts to macroblock struct
Change-Id: I289564a5a27f0d03ddc6f19c7838542ff22719be
2012-11-05 11:00:49 -08:00
Scott LaVarnway
9016fa22e0 Removed unnecessary VP8_COMP *cpi parameters
Code cleanup

Change-Id: I82f9d787a2f511d39895fd8dfd5347a1676d9dbc
2012-11-02 12:10:07 -07:00
Ronald S. Bultje
4b2c2b9aa4 Rename vp8/ codec directory to vp9/.
Change-Id: Ic084c475844b24092a433ab88138cf58af3abbe4
2012-11-01 16:31:22 -07:00
Ronald S. Bultje
6c280c2299 Adjust style to match Google Coding Style a little more closely.
Most of these were picked up by jenkins in the commit that changed
the vp8 namespace to vp9 in common/.

Change-Id: I5cbd56ffc753b92ef805133cda6acc1713a13878
2012-11-01 10:03:48 -07:00
Ronald S. Bultje
6a4b1e5958 Remove vp8 in local symbols.
For non-static functions, change the prefix to vp9_. For static functions,
remove the prefix. Also fix some comments, remove unused code or unused
function prototypes.

Change-Id: I1f8be05362f66060fe421c3d4c9a906fdf835de5
2012-11-01 10:03:43 -07:00
Ronald S. Bultje
982deebb5e Change name of common top-level structures from VP8 to VP9.
This change encompasses VP8_PTR, VP8_COMP, VP8D_COMP, VP8_COMMON,
VP8Decompressor and VP8Common.

Change-Id: I514ef4ad4e682370f36d656af1c09ee20da216ad
2012-10-31 10:15:08 -07:00
Ronald S. Bultje
43da8f147c Change non-function symbol vp8_ prefixes to vp9_.
For local symbols, make them static instead.

Change-Id: I13d60947a46f711bc8991e16100cea2a13e3a22e
2012-10-31 10:15:08 -07:00
Ronald S. Bultje
fbbd3e1832 Merge "Change common vp8_ public symbol prefixes to vp9_." into experimental 2012-10-31 10:04:03 -07:00
Ronald S. Bultje
9bc5f3e3af Change common vp8_ public symbol prefixes to vp9_.
Change-Id: Ic5a5f60e1ff9d9ccae4174160d36529466eeb509
2012-10-31 09:47:32 -07:00
Yunqing Wang
b8e9617ee8 Add forward transform function to rtcd
Added vp8_fht to rtcd_defs.sh

Change-Id: I929b0bf878185a2f0e031dc8c70a418286d509aa
2012-10-31 09:42:51 -07:00
Ronald S. Bultje
d115dbc24c Adjust style to match Google Coding Style a little more closely.
Most of these were picked up in the previous commit (prefix change from
vp8_ to vp9_), but I'm pushing this separately so that it's easier to
review.

Change-Id: I91e959895778b8632d7d33375523df8a7568a490
2012-10-30 22:07:13 -07:00
Ronald S. Bultje
f88558fb1d Change encoder vp8_ and vp8cx_ public symbol prefixes to vp9_.
Change-Id: Ie2e3652591b010ded10c216501ce24fd95d0aec5
2012-10-30 22:07:07 -07:00
Yunqing Wang
fe1788500c Fixed style warnings
Fixed some style warnings.

Change-Id: I9eb77c3bf6d63628feef1b0c936e905bf4f2089d
2012-10-30 17:54:22 -07:00
Yunqing Wang
8a9e4e8a61 Convert the transforms to integer forms.
Converted the forward and inverse transforms to integer forms.

Modify #define TEST_INT 1/0
in the code to call integer/float version of transforms.

The tests showed that average OVERALL PSNR loss was less than 0.1%.

Change-Id: I1dfa4eeab6412597e3b970ce299cf0e116a917e6
2012-10-30 15:56:20 -07:00
Scott LaVarnway
fc6fdf984b Merge "dequant invoke macro removal" into experimental 2012-10-30 12:49:40 -07:00
Scott LaVarnway
df1b8f2f23 dequant invoke macro removal
Change-Id: Ifa17e698149adc063476e7d16eb727f01e88b447
2012-10-30 12:09:49 -07:00
Paul Wilkins
e05e6e107e Remove old experiment.
Delete code relating to featureupdates experiment.

Change-Id: If218762c658bb8cbb3007cf2069123b3e05adcbc
2012-10-30 17:36:09 +00:00
Paul Wilkins
747fbd1b7b Merge "seg_common: give all exported symbols a vp9_ prefix." into experimental 2012-10-30 08:54:00 -07:00
Paul Wilkins
655eb16627 Merge "boolhuff/dboolhuff: give exported symbols a vp9_ prefix." into experimental 2012-10-30 08:53:03 -07:00
Paul Wilkins
a4d308a468 Merge "segmentation: make local symbols static." into experimental 2012-10-30 08:52:59 -07:00
Paul Wilkins
dd2e43c32b Merge "encodeframe: make local symbols static." into experimental 2012-10-30 08:52:52 -07:00
Paul Wilkins
5f0ea6cc5b Merge changes I5898f64d,Ie80d13ce into experimental
* changes:
  ssim: remove unused function dssim().
  detokenize: make local symbols static.
2012-10-30 08:52:28 -07:00
Paul Wilkins
5acb622f42 Merge "firstpass: make local symbols static." into experimental 2012-10-30 08:18:39 -07:00
Paul Wilkins
42d5e31ef3 Merge "bitstream: give exported symbols a vp9_ prefix; make local symbols static." into experimental 2012-10-30 08:18:28 -07:00
Paul Wilkins
976d0450ac Merge "alloccommon: give exported symbols a vp9_ prefix." into experimental 2012-10-30 08:18:16 -07:00
Paul Wilkins
5091302722 Merge changes I23aa5547,I8341a19c into experimental
* changes:
  tokenize: make local symbols static; give exported symbols a vp9_ prefix.
  encodemb: make locally used functions static.
2012-10-30 07:24:53 -07:00
Paul Wilkins
c87bf0df91 Merge "onyx_if: remove unused function, and make locally used functions static." into experimental 2012-10-30 07:24:11 -07:00
Paul Wilkins
4247de33fa Merge "rdopt: make locally used symbols static." into experimental 2012-10-30 07:24:00 -07:00
Paul Wilkins
bbc6057687 Merge "ratectrl: make locally used symbol static." into experimental 2012-10-30 07:23:41 -07:00
Paul Wilkins
ac220b8d22 Merge "mbgraph: remove unused function, and make local function static." into experimental 2012-10-30 07:23:33 -07:00
Paul Wilkins
fe6eff7c55 Merge "Fix superblock experiment." into experimental 2012-10-30 06:52:50 -07:00
Paul Wilkins
50f1eae5be Merge "Improves subpixel reference mv evaluation" into experimental 2012-10-30 03:48:48 -07:00
Ronald S. Bultje
b066bb4306 seg_common: give all exported symbols a vp9_ prefix.
Change-Id: Ie8ba934a757acec1c80ac37ab9307c9a2783254e
2012-10-29 22:15:27 -07:00
Ronald S. Bultje
d36cc98ee3 boolhuff/dboolhuff: give exported symbols a vp9_ prefix.
Change-Id: I2f1781c70b14bf1d7b6da75d1501718445552af0
2012-10-29 21:42:10 -07:00
Ronald S. Bultje
7f6f07035e segmentation: make local symbols static.
Change-Id: Ia30924dc095663b04794902522308d822c1a5ad0
2012-10-29 21:39:44 -07:00
Ronald S. Bultje
68d07ba116 encodeframe: make local symbols static.
Change-Id: I77bc38b53428ff3e6456b5bc3516418892a58c1e
2012-10-29 21:38:07 -07:00
Ronald S. Bultje
f0dfdfe30d ssim: remove unused function dssim().
Change-Id: I5898f64da77e43a3860a77f3bc49d64b725c278c
2012-10-29 21:30:09 -07:00
Ronald S. Bultje
4c6a2d2221 firstpass: make local symbols static.
Change-Id: Iee0f707abbfe427b10058f6cf3be21b89d6a6e65
2012-10-29 21:26:53 -07:00
Ronald S. Bultje
8ce9fb8d21 bitstream: give exported symbols a vp9_ prefix; make local symbols static.
Change-Id: I3aa5b515c1eae19ae40ba9808d133590c95f7d13
2012-10-29 21:25:22 -07:00
Ronald S. Bultje
7228a38aef alloccommon: give exported symbols a vp9_ prefix.
Also include the correct header in ratectrl.c so it picks up these
function prototypes.

Change-Id: Ic51b13119f1625f0691917f2713b23d0249dece7
2012-10-29 21:24:12 -07:00
Ronald S. Bultje
adb8a160f9 tokenize: make local symbols static; give exported symbols a vp9_ prefix.
Change-Id: I23aa5547b1e74f31327258dda0e330aae7ca1d35
2012-10-29 21:07:40 -07:00
Ronald S. Bultje
1e596da848 encodemb: make locally used functions static.
Change-Id: I8341a19cb4f2234841a40fcbf560315f079b0108
2012-10-29 21:02:36 -07:00
Ronald S. Bultje
8044c6a44b onyx_if: remove unused function, and make locally used functions static.
Change-Id: Ica08c2c9cda9623389dde3f276dfed77c36e3a11
2012-10-29 18:20:32 -07:00
Ronald S. Bultje
7bf461666a rdopt: make locally used symbols static.
Change-Id: Id33c448084ca5c1c0525a05c3c4f35d6b0805fbe
2012-10-29 18:04:33 -07:00
Ronald S. Bultje
1a02ea98af ratectrl: make locally used symbol static.
Change-Id: I4f317f413fbbcc59f84ff77899ea208fb0dccb2a
2012-10-29 18:02:04 -07:00
Ronald S. Bultje
07b8707532 mbgraph: remove unused function, and make local function static.
Change-Id: I295c7bcf13b630cb9395585ede7311d85d785f25
2012-10-29 17:59:45 -07:00
Ronald S. Bultje
7944b4f239 Fix superblock experiment.
Also merge some duplicate code related to the superblock experiment
in the RD loop.

Change-Id: Ic93f1d4d1ed81220fd7ecf6e65da2821a215b2de
2012-10-29 17:58:18 -07:00
Ronald S. Bultje
1758dc03d4 Merge "Name space clean up." into experimental 2012-10-29 14:41:47 -07:00