]>
granicus.if.org Git - libvpx/log
Yunqing Wang [Thu, 18 Oct 2012 23:31:59 +0000 (16:31 -0700)]
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
Scott LaVarnway [Tue, 30 Oct 2012 19:49:40 +0000 (12:49 -0700)]
Merge "dequant invoke macro removal" into experimental
Scott LaVarnway [Tue, 30 Oct 2012 19:09:49 +0000 (12:09 -0700)]
dequant invoke macro removal
Change-Id: Ifa17e698149adc063476e7d16eb727f01e88b447
Paul Wilkins [Tue, 30 Oct 2012 18:00:30 +0000 (11:00 -0700)]
Merge "Separated experiment for subpel refmv selection" into experimental
Paul Wilkins [Tue, 30 Oct 2012 17:36:09 +0000 (17:36 +0000)]
Remove old experiment.
Delete code relating to featureupdates experiment.
Change-Id: If218762c658bb8cbb3007cf2069123b3e05adcbc
Yaowu Xu [Tue, 30 Oct 2012 16:43:24 +0000 (09:43 -0700)]
Separated experiment for subpel refmv selection
As suggested by Paul, this commit separate the subpel refmv selection
into a separate experiment. It also changed a couple variable names
to better reflect the nature of the variables.
Change-Id: Id951c3cadc61a982dd15afe641000f60213b8995
Paul Wilkins [Tue, 30 Oct 2012 16:51:37 +0000 (09:51 -0700)]
Merge "Remove "switchable_interp" from experiment list" into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:54:00 +0000 (08:54 -0700)]
Merge "seg_common: give all exported symbols a vp9_ prefix." into experimental
Yaowu Xu [Tue, 30 Oct 2012 15:53:47 +0000 (08:53 -0700)]
Remove "switchable_interp" from experiment list
Now this experiment has been merged.
Change-Id: I6c93784df89434c52a4eb8f977cd3745e269abf9
Paul Wilkins [Tue, 30 Oct 2012 15:53:03 +0000 (08:53 -0700)]
Merge "boolhuff/dboolhuff: give exported symbols a vp9_ prefix." into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:52:59 +0000 (08:52 -0700)]
Merge "segmentation: make local symbols static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:52:52 +0000 (08:52 -0700)]
Merge "encodeframe: make local symbols static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:52:40 +0000 (08:52 -0700)]
Merge "entropymode: put print_mode_contexts under #ifdef MODE_STATS." into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:52:28 +0000 (08:52 -0700)]
Merge changes I5898f64d,Ie80d13ce into experimental
* changes:
ssim: remove unused function dssim().
detokenize: make local symbols static.
Paul Wilkins [Tue, 30 Oct 2012 15:18:39 +0000 (08:18 -0700)]
Merge "firstpass: make local symbols static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:18:28 +0000 (08:18 -0700)]
Merge "bitstream: give exported symbols a vp9_ prefix; make local symbols static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:18:16 +0000 (08:18 -0700)]
Merge "alloccommon: give exported symbols a vp9_ prefix." into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:18:10 +0000 (08:18 -0700)]
Merge "Make implicit_segmentation-related code an experiment." into experimental
Paul Wilkins [Tue, 30 Oct 2012 15:18:01 +0000 (08:18 -0700)]
Merge "decodframe: make local symbol static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 14:24:53 +0000 (07:24 -0700)]
Merge changes I23aa5547,I8341a19c into experimental
* changes:
tokenize: make local symbols static; give exported symbols a vp9_ prefix.
encodemb: make locally used functions static.
Paul Wilkins [Tue, 30 Oct 2012 14:24:11 +0000 (07:24 -0700)]
Merge "onyx_if: remove unused function, and make locally used functions static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 14:24:06 +0000 (07:24 -0700)]
Merge "reconintra: make locally used symbols static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 14:24:00 +0000 (07:24 -0700)]
Merge "rdopt: make locally used symbols static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 14:23:41 +0000 (07:23 -0700)]
Merge "ratectrl: make locally used symbol static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 14:23:33 +0000 (07:23 -0700)]
Merge "mbgraph: remove unused function, and make local function static." into experimental
Paul Wilkins [Tue, 30 Oct 2012 13:52:50 +0000 (06:52 -0700)]
Merge "Fix superblock experiment." into experimental
Paul Wilkins [Tue, 30 Oct 2012 12:31:12 +0000 (05:31 -0700)]
Merge "More MSVC build fixes" into experimental
Paul Wilkins [Tue, 30 Oct 2012 10:48:48 +0000 (03:48 -0700)]
Merge "Improves subpixel reference mv evaluation" into experimental
Ronald S. Bultje [Tue, 30 Oct 2012 05:15:27 +0000 (22:15 -0700)]
seg_common: give all exported symbols a vp9_ prefix.
Change-Id: Ie8ba934a757acec1c80ac37ab9307c9a2783254e
Ronald S. Bultje [Tue, 30 Oct 2012 04:42:10 +0000 (21:42 -0700)]
boolhuff/dboolhuff: give exported symbols a vp9_ prefix.
Change-Id: I2f1781c70b14bf1d7b6da75d1501718445552af0
Ronald S. Bultje [Tue, 30 Oct 2012 04:39:44 +0000 (21:39 -0700)]
segmentation: make local symbols static.
Change-Id: Ia30924dc095663b04794902522308d822c1a5ad0
Ronald S. Bultje [Tue, 30 Oct 2012 04:38:07 +0000 (21:38 -0700)]
encodeframe: make local symbols static.
Change-Id: I77bc38b53428ff3e6456b5bc3516418892a58c1e
Ronald S. Bultje [Tue, 30 Oct 2012 04:35:35 +0000 (21:35 -0700)]
entropymode: put print_mode_contexts under #ifdef MODE_STATS.
This is the condition under which it is called in onyx_if.c. Also remove
the unused function print_mv_ref_cts().
Change-Id: I51ea3720d46f86d136e2215e01cf9d6c7dfc41ea
Ronald S. Bultje [Tue, 30 Oct 2012 04:30:09 +0000 (21:30 -0700)]
ssim: remove unused function dssim().
Change-Id: I5898f64da77e43a3860a77f3bc49d64b725c278c
Ronald S. Bultje [Tue, 30 Oct 2012 04:28:08 +0000 (21:28 -0700)]
detokenize: make local symbols static.
Change-Id: Ie80d13ce095faa8bca21bcdca3ca8249d9abc398
Ronald S. Bultje [Tue, 30 Oct 2012 04:26:53 +0000 (21:26 -0700)]
firstpass: make local symbols static.
Change-Id: Iee0f707abbfe427b10058f6cf3be21b89d6a6e65
Ronald S. Bultje [Tue, 30 Oct 2012 04:25:22 +0000 (21:25 -0700)]
bitstream: give exported symbols a vp9_ prefix; make local symbols static.
Change-Id: I3aa5b515c1eae19ae40ba9808d133590c95f7d13
Ronald S. Bultje [Tue, 30 Oct 2012 04:24:12 +0000 (21:24 -0700)]
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
Ronald S. Bultje [Tue, 30 Oct 2012 04:15:42 +0000 (21:15 -0700)]
Make implicit_segmentation-related code an experiment.
This way, the code is not compiled in by default, thus decreasing
overall binary size.
Change-Id: I85cac8f5a22a51a7d99c820ef6d6ed179d4106a0
Ronald S. Bultje [Tue, 30 Oct 2012 04:08:59 +0000 (21:08 -0700)]
decodframe: make local symbol static.
Change-Id: Id55f3cd3c2f5857dbfd78703452740dfd63cdf41
Ronald S. Bultje [Tue, 30 Oct 2012 04:07:40 +0000 (21:07 -0700)]
tokenize: make local symbols static; give exported symbols a vp9_ prefix.
Change-Id: I23aa5547b1e74f31327258dda0e330aae7ca1d35
Ronald S. Bultje [Tue, 30 Oct 2012 04:02:36 +0000 (21:02 -0700)]
encodemb: make locally used functions static.
Change-Id: I8341a19cb4f2234841a40fcbf560315f079b0108
Ronald S. Bultje [Tue, 30 Oct 2012 01:20:32 +0000 (18:20 -0700)]
onyx_if: remove unused function, and make locally used functions static.
Change-Id: Ica08c2c9cda9623389dde3f276dfed77c36e3a11
Ronald S. Bultje [Tue, 30 Oct 2012 01:15:04 +0000 (18:15 -0700)]
reconintra: make locally used symbols static.
Also remove them from the header file.
Change-Id: I38182f70268fd47985fb1d8d87cdeb207f67e475
Ronald S. Bultje [Tue, 30 Oct 2012 01:04:33 +0000 (18:04 -0700)]
rdopt: make locally used symbols static.
Change-Id: Id33c448084ca5c1c0525a05c3c4f35d6b0805fbe
Ronald S. Bultje [Tue, 30 Oct 2012 01:02:04 +0000 (18:02 -0700)]
ratectrl: make locally used symbol static.
Change-Id: I4f317f413fbbcc59f84ff77899ea208fb0dccb2a
Ronald S. Bultje [Tue, 30 Oct 2012 00:59:45 +0000 (17:59 -0700)]
mbgraph: remove unused function, and make local function static.
Change-Id: I295c7bcf13b630cb9395585ede7311d85d785f25
Ronald S. Bultje [Tue, 30 Oct 2012 00:58:18 +0000 (17:58 -0700)]
Fix superblock experiment.
Also merge some duplicate code related to the superblock experiment
in the RD loop.
Change-Id: Ic93f1d4d1ed81220fd7ecf6e65da2821a215b2de
Yaowu Xu [Tue, 30 Oct 2012 00:26:05 +0000 (17:26 -0700)]
More MSVC build fixes
Change-Id: I3b7bae440bba7ffb401c94fc7e338dbe75daa980
Yaowu Xu [Mon, 29 Oct 2012 23:54:13 +0000 (16:54 -0700)]
fixed a build issue
Two head files dct.h and dct_x86.h were removed in a previous commit,
this commit removed the build's dependency on the two files.
Change-Id: Idd33712470912d39d42f133dc30b710cab6fa832
Ronald S. Bultje [Mon, 29 Oct 2012 21:41:47 +0000 (14:41 -0700)]
Merge "Name space clean up." into experimental
Ronald S. Bultje [Mon, 29 Oct 2012 21:41:39 +0000 (14:41 -0700)]
Merge "A clean up of the down_copy function" into experimental
Jim Bankoski [Mon, 29 Oct 2012 18:25:56 +0000 (11:25 -0700)]
remove fdct invoke macros
Remove the fdct invoke macro calls
Change-Id: Ica2431c655819fa012133ee7abc75a16761e5fd6
Jim Bankoski [Mon, 29 Oct 2012 15:58:05 +0000 (08:58 -0700)]
Fixes invoke macro commit...
Change-Id: Ic186269b51ffb3c344635bfa9825bed25be2c5ae
Paul Wilkins [Mon, 29 Oct 2012 13:44:18 +0000 (13:44 +0000)]
Name space clean up.
Preparation for project restructuring.
Added vp9_ prefix on some function names that have global scope.
Added static declaration on some that dont.
Change-Id: If072f78b4300e8c17cfeed82c5d17b59946dcc5e
Yaowu Xu [Fri, 26 Oct 2012 16:14:15 +0000 (09:14 -0700)]
Improves subpixel reference mv evaluation
Previously, in evaluating reference motion vectors, MVs are always
rounded to integer pixel position and SADs are calculated. This
commit takes into account the subpixel portion of the mvs, and uses
bilinear interpolation to produce reference pixel values in subpixel
postions. In addition, SSE is used in place of SAD. Pixels used are
16x2 above and 2x16 to the left.
This commmit intends to test the potential of this line of work in
term of compression improvement, obviously, the change would increase
decoder complexity significantly.
Test results
std-hd: 1.738%(avg) 1.779%(glb), 1.663%(ssim)
derf: 0.472%(avg) 0.477%(glb), 0.418%(ssim)
Change-Id: I3ae1b098f6289df78891134d9a5e4bb2fde87a0b
Paul Wilkins [Mon, 29 Oct 2012 10:36:11 +0000 (10:36 +0000)]
Inconsistent reference to MacroblockD data structure.
Cleaned up some inconsistent references using both xd-> and
x->e_mbd. to access the same data structure in the same function.
Change-Id: Ieb496fa22bf1feec6aa7bc70b941ea4f16e0f8b5
Paul Wilkins [Mon, 29 Oct 2012 12:42:58 +0000 (05:42 -0700)]
Merge "invoke macro removal encodemb" into experimental
Jim Bankoski [Sun, 28 Oct 2012 17:38:23 +0000 (10:38 -0700)]
invoke macro removal encodemb
Change-Id: I321280abcf48f3dc16e194d29bde2bd3baec6006
Deb Mukherjee [Fri, 26 Oct 2012 22:54:37 +0000 (15:54 -0700)]
A clean up of the down_copy function
Change-Id: I0c689fb44e9e91539c450d26672d7a1d92e92900
Scott LaVarnway [Fri, 26 Oct 2012 21:53:50 +0000 (14:53 -0700)]
Merge "Faster 8t filtering" into experimental
Ronald S. Bultje [Fri, 26 Oct 2012 18:05:51 +0000 (11:05 -0700)]
Merge "Extend edges correctly during actual frame encoding also." into experimental
Paul Wilkins [Fri, 26 Oct 2012 16:42:37 +0000 (09:42 -0700)]
Merge "Explicit MV reference experiment." into experimental
Paul Wilkins [Thu, 25 Oct 2012 12:58:21 +0000 (13:58 +0100)]
Explicit MV reference experiment.
Coding and costing of mv reference signal.
Issues in updating MV ref with COMPANDED_MVREF_THRESH
to be resolved. Ideally the MV precision should be defined based
on absolute MV magnitude not as now the MV ref magnitude.
Update to mv counts moved into bitstream.c because otherwise
if the motion reference is changed at the last minute the encoder
and decoder get out of step in terms of the counts used to update
entropy probs.
Code working on a few test clips but no results yet re benefit vs
signaling cost and no tuning of red loop to test lower cost alternatives
based on the available reference values.
Patch 3. Added check to make sure we don't pick a reference
that would give rise to an uncodeable / out of range residual.
Patch 6-7: Attempt to rebase. OK to submit but best to leave flag off for now.
Patch 9. Remove print no longer needed.
Change-Id: I1938c2ffe41afe6d3cf6ccc0cb2c5d404809a712
Ronald S. Bultje [Fri, 26 Oct 2012 01:09:02 +0000 (18:09 -0700)]
Extend edges correctly during actual frame encoding also.
Should fix B_PRED-related encoder/decoder mismatches.
Change-Id: I16f808dffd19094e02e8562ba58cc1016155ce93
Scott LaVarnway [Fri, 26 Oct 2012 00:24:50 +0000 (17:24 -0700)]
Faster 8t filtering
Quickly modified the ssse3 sixtap filters to support eight taps. For the test
clip used, a 23+% boost in decoder performance was seen. We can
revisit later and improve further.
Change-Id: I5f59860459e80d6fa23e6cc0fd91296a969f5240
Debargha Mukherjee [Thu, 25 Oct 2012 20:52:29 +0000 (13:52 -0700)]
Merge "Always extend macroblock edges in the decoder." into experimental
Ronald S. Bultje [Thu, 25 Oct 2012 19:46:26 +0000 (12:46 -0700)]
Always extend macroblock edges in the decoder.
This fixes edge extension if SB [0,1] doesn't use B_PRED but [1,1] does.
Change-Id: I48354a9dba0de16472938824f5e6db87ce61979f
Scott LaVarnway [Mon, 22 Oct 2012 23:38:58 +0000 (16:38 -0700)]
Added sse2 instrinsic version of vp8_sad3x16
1.6% boost in decoder performance for the clip used.
Change-Id: I91f3c4573fd3d10afbf18930f279af7ae2223e3a
Scott LaVarnway [Thu, 25 Oct 2012 19:19:26 +0000 (12:19 -0700)]
Merge "Added sse2 instrinsic version of vp8_sad16x3" into experimental
Scott LaVarnway [Mon, 22 Oct 2012 23:16:04 +0000 (16:16 -0700)]
Added sse2 instrinsic version of vp8_sad16x3
3.7% boost in decoder performance for the clip used.
Change-Id: I74f28486a9352b472b36e21b5eaf30eff35e9199
Ronald S. Bultje [Thu, 25 Oct 2012 19:05:37 +0000 (12:05 -0700)]
Fix 4x4 intra prediction on the edge of SB rows.
Change-Id: I87d571008c73f0a8514e0a864405aadb82fd1bc0
Ronald S. Bultje [Thu, 25 Oct 2012 16:17:47 +0000 (09:17 -0700)]
Fix yet another typo in splitmv/tx_select code.
Change-Id: I6a28cc87af275fc267b3cc8d90d642dcc870c249
Ronald S. Bultje [Thu, 25 Oct 2012 16:14:21 +0000 (09:14 -0700)]
Generalize coefficient tokenizing.
Change-Id: Ie33f7d0f90d0e5862be975d676a700d06f79eec6
Ronald S. Bultje [Wed, 24 Oct 2012 23:59:00 +0000 (16:59 -0700)]
Generalize EOB token stuffing.
Change-Id: Ibb51f3f8c3575d4621890220b20887a13a46a04e
Ronald S. Bultje [Wed, 24 Oct 2012 22:21:05 +0000 (15:21 -0700)]
Merge "Fix typo in splitmv/tx_select code." into experimental
Ronald S. Bultje [Wed, 24 Oct 2012 20:03:51 +0000 (13:03 -0700)]
Fix typo in splitmv/tx_select code.
Change-Id: I2823043634b0fa617c2715d63ff18595b7209287
John Koleszar [Wed, 24 Oct 2012 19:59:22 +0000 (12:59 -0700)]
Fix bad merge of coef_probs update
Stray CONFIG_HYBRIDTRANSFORM caused decode mismatch.
Change-Id: I1d77bad9b366f7a6ceb3cb45269ed5badb5c4c53
John Koleszar [Fri, 19 Oct 2012 22:35:36 +0000 (15:35 -0700)]
coef_probs: remove duplicate read/update code
Refactor per-transform copy & paste into a common function
update_coef_probs_common() and read_coef_probs_common(). The dry-run and
bit-writing loops in the encoder are still obvious candidates to be made
common, but they start to diverge a bit in the next commit, so are left
as-is for now.
Change-Id: I896bd3f4a073a6296eab7e92463fef79d8c6c08c
John Koleszar [Wed, 24 Oct 2012 16:36:40 +0000 (09:36 -0700)]
Merge "Fix "_FORTIFY_SOURCE" redefined warning" into experimental
Yunqing Wang [Wed, 24 Oct 2012 16:14:36 +0000 (09:14 -0700)]
Fix "_FORTIFY_SOURCE" redefined warning
On Ubuntu 12.04, we got the following warning message:
<command-line>:0:0: warning: "_FORTIFY_SOURCE" redefined
[enabled by default]
<built-in>:0:0: note: this is the location of the previous definition
This was already fixed in VP8 configure file. Did the same change in
experimental branch to stop this warning.
Change-Id: Id162e5fd8841585ae806df6560b2f7536ea307c0
Yaowu Xu [Tue, 23 Oct 2012 21:31:38 +0000 (14:31 -0700)]
Merge "Fixed the MSVC compiling error with correct cast" into experimental
Scott LaVarnway [Tue, 23 Oct 2012 20:35:13 +0000 (13:35 -0700)]
Fixed the MSVC compiling error with correct cast
Change-Id: Ia904f4ec72500d29f1361ce305d8f3231e592f47
pascal massimino [Tue, 23 Oct 2012 21:00:01 +0000 (14:00 -0700)]
Merge "Change eob[] array type in splitmv RD loop to a regular integer." into experimental
Yaowu Xu [Tue, 23 Oct 2012 20:00:23 +0000 (13:00 -0700)]
Revert "make the instrinsic code build with MS compilers"
This reverts commit
b0e3ca126189123ddec27ebba6aa62290e64adb6 .
Change-Id: I9c5aa463461b187160ad01fbc1795ae4f5263b2c
Yaowu Xu [Tue, 23 Oct 2012 18:54:25 +0000 (11:54 -0700)]
Merge "changed to avoid code confusion" into experimental
Yaowu Xu [Tue, 23 Oct 2012 18:54:07 +0000 (11:54 -0700)]
Merge "make the instrinsic code build with MS compilers" into experimental
Scott LaVarnway [Tue, 23 Oct 2012 16:39:22 +0000 (09:39 -0700)]
make the instrinsic code build with MS compilers
to enable build under windows/MSVC
Change-Id: Ida41cc5b3c8d0fec9512c2f5c5feb64e07b44805
Ronald S. Bultje [Tue, 23 Oct 2012 16:23:23 +0000 (09:23 -0700)]
Change eob[] array type in splitmv RD loop to a regular integer.
Change-Id: I240d6b50069fd3f35cc4fed2f4507796f0ef25e9
Deb Mukherjee [Mon, 22 Oct 2012 21:43:01 +0000 (14:43 -0700)]
Merging in the Switchable interp experiment
There is a macro DEFAULT_INTERP_FILTER defined in encoder/onyx_if.c that
is set as EIGHTTAP for now - so SWITCHABLE is not really used. Ideally,
this should be SWITCHABLE but that would make the encoder quite a bit slower.
We will change the default filter to SWITCHABLE once we find a faster way to
search for switchable filters.
Change-Id: Iee91832cdc07e6e14108d9b543130fdd12fc9874
Ronald S. Bultje [Tue, 23 Oct 2012 05:04:28 +0000 (22:04 -0700)]
Merge "Change entropy context assignment style from *(x + y) = z to x[y] = z." into experimental
Deb Mukherjee [Mon, 22 Oct 2012 23:52:28 +0000 (16:52 -0700)]
Merging in the TX_SELECT experiment
Change-Id: I0d306b0062be59bc785b65882691c956c8b5e7c8
Deb Mukherjee [Mon, 22 Oct 2012 19:19:00 +0000 (12:19 -0700)]
Merge of the newmventropy experiment
Removes the old mv encoding code.
Change-Id: I1026d48cc5ac15ccb776f98463e929254c3dc7da
Ronald S. Bultje [Mon, 22 Oct 2012 21:06:52 +0000 (14:06 -0700)]
Change entropy context assignment style from *(x + y) = z to x[y] = z.
Change-Id: Ibc4425bb6e01606751021e57c93106c365a2da21
Yaowu Xu [Mon, 22 Oct 2012 20:58:26 +0000 (13:58 -0700)]
changed to avoid code confusion
The previous double if and else code snippets were rather confusing.
Change-Id: Id1b6152fa0e471beb9b20407aa406e109c1471e3
Scott LaVarnway [Mon, 22 Oct 2012 20:57:03 +0000 (13:57 -0700)]
Merge "Added rtcd support vp8_sad16x3 and vp8_sad3x16" into experimental
Scott LaVarnway [Mon, 22 Oct 2012 20:45:42 +0000 (13:45 -0700)]
Added rtcd support vp8_sad16x3 and vp8_sad3x16
Change-Id: I5bca7b7a4b230082d36ac6fb84db84137ad177d7
Ronald S. Bultje [Mon, 22 Oct 2012 19:54:39 +0000 (12:54 -0700)]
Merge changes I02e7f64a,Ide954b00,Idc8b5977 into experimental
* changes:
Fix another typo in 4x4-transform-for-i8x8-intra-pred coeff contexts.
8x8 transform support in splitmv.
Use SPLITMV_PARTITIONING instead of a plain integer type.
Deb Mukherjee [Mon, 22 Oct 2012 19:18:46 +0000 (12:18 -0700)]
Merge "Merging the hybrid transform experiments" into experimental
Deb Mukherjee [Mon, 22 Oct 2012 18:55:29 +0000 (11:55 -0700)]
Merging the hybrid transform experiments
Change-Id: I99f1982b30a630a9a070a8326d83b34a33cba14c