Dmitry Kovalev
710ca1fe36
Merge changes I1868fb75,I9ff504c6
...
* changes:
Renaming INTERPOLATIONFILTERTYPE to INTERPOLATION_TYPE.
Adding VP9_FRAME_MARKER constant.
2013-10-24 10:08:19 -07:00
Dmitry Kovalev
153d70ca9b
Merge "Cleaning up {above, left}_block_mode functions."
2013-10-24 10:07:51 -07:00
Yunqing Wang
93ec31dff6
Merge "Improve scale_factors struct"
2013-10-24 09:13:41 -07:00
James Zern
eec622d178
Merge "vp9/extend_for_intra: avoid crossing tile boundary"
2013-10-24 06:04:10 -07:00
James Zern
3c038b6c40
vp9/extend_for_intra: avoid crossing tile boundary
...
Change-Id: I0d8a71778aa3c73b8b1673e14053074bb866548b
2013-10-24 14:21:24 +02:00
Dmitry Kovalev
5d28b63687
Cleaning up {above, left}_block_mode functions.
...
Making {above, left}_block_mode more clear and symmetric.
Change-Id: Ie348a950fb9a5cf52861d0cba838a58010ff56ad
2013-10-23 17:54:13 -07:00
Dmitry Kovalev
ad867fe237
Renaming INTERPOLATIONFILTERTYPE to INTERPOLATION_TYPE.
...
Change-Id: I1868fb75ed88bfa65c1c2ca24677d65f2894d713
2013-10-23 17:45:52 -07:00
Dmitry Kovalev
a53075f7c5
Adding VP9_FRAME_MARKER constant.
...
Also renaming SYNC_CODE_* to VP9_SYNC_CODE_*.
Change-Id: I9ff504c6ebce6cd6673d7df2085d597b818f5960
2013-10-23 17:24:17 -07:00
Dmitry Kovalev
dea22b4bda
Merge "Renaming vp9_short_fdct32x32 to vp9_fdct32x32."
2013-10-23 14:18:57 -07:00
Jingning Han
ae0e747d6a
Merge "Use inter mode flag in super_block_yrd"
2013-10-23 13:52:05 -07:00
Dmitry Kovalev
a018988ce8
Renaming vp9_short_fdct32x32 to vp9_fdct32x32.
...
For consistency with idct function names.
Change-Id: Ie77b7178e0894c57cd5cb9243c949eb9224ece18
2013-10-23 13:41:40 -07:00
Dmitry Kovalev
5bdd4d9ccf
Merge "Renaming vp9_short_fdct16x16 to vp9_fdct16x16."
2013-10-23 13:37:09 -07:00
Dmitry Kovalev
a9c8251b9d
Merge "Renaming vp9_short_fdct8x8 to vp9_fdct8x8."
2013-10-23 11:38:55 -07:00
Jingning Han
f3b31380fa
Use inter mode flag in super_block_yrd
...
Use a flag variable to determine if coded in inter mode, thus avoiding
multiple inter mode checks in super_block_yrd.
Change-Id: I0ef998b2811c38e185a2e0583f0f636cee45d2cf
2013-10-23 11:18:23 -07:00
Jingning Han
9cc4935d7b
Merge "Make decode modules independent of tile index"
2013-10-23 11:08:12 -07:00
Dmitry Kovalev
02feb63684
Renaming vp9_short_fdct16x16 to vp9_fdct16x16.
...
For consistency with idct function names.
Change-Id: I5ca355ba99fdba04f09254be95cf79808b534f71
2013-10-23 10:57:12 -07:00
Dmitry Kovalev
fa143dbc8e
Renaming vp9_short_fdct8x8 to vp9_fdct8x8.
...
For consistency with idct function names.
Change-Id: I7b6af2f92c66eff56f84ed29edc3a66af8dc421f
2013-10-23 10:52:33 -07:00
Dmitry Kovalev
73fe696c91
Merge "Reordering probability tables for consistency."
2013-10-23 10:10:24 -07:00
Dmitry Kovalev
789a6c1bd2
Merge "Removing quantize_b_4x4 function pointer."
2013-10-23 10:09:53 -07:00
Adrian Grange
2f58b813bb
Remove right_available member from VP9_COMP
...
This member of VP9_COMP is no longer used, so I removed it.
Change-Id: I3509f52756da4768a3e4581cec5ed5d2a70d5fb8
2013-10-22 16:53:37 -07:00
Jingning Han
bd23e084eb
Make decode modules independent of tile index
...
Assign the pointer to mode_info stream per tile. Remove the use of
tile_col in the decoding modules.
Change-Id: I7df87086708a3d92c5e20e86bcfb04e458ff47a6
2013-10-22 15:22:59 -07:00
Dmitry Kovalev
34d6077c93
Merge "Moving functions from vp9_decodemv.c to vp9_decodframe.c."
2013-10-22 14:00:48 -07:00
Dmitry Kovalev
9d3f27f3da
Moving functions from vp9_decodemv.c to vp9_decodframe.c.
...
This move is done to have all compressed header reading functions in one
place. Moved functions:
read_switchable_interp_probs
read_inter_mode_probs
read_comp_pred_mode
read_comp_pred
update_mv
read_mv_probs
Change-Id: I2aebb57d2826d03d11bf2f8fbbfc3a9978c4f9fb
2013-10-22 13:19:23 -07:00
Yunqing Wang
175c313a12
Improve scale_factors struct
...
The ref's scale_factors are set at frame level, and then copied for
each partition block. Since the struct members are mostly constant,
this patch separated the constant and non-constant members, and
reduced struct copying. This gave 0.5% ~ 1.4% decoder speed gain.
Change-Id: I94043bf5a6995c8042da52e5c661818dfa6f6d4c
2013-10-22 13:10:22 -07:00
Dmitry Kovalev
ec414372e8
Removing quantize_b_4x4 function pointer.
...
The pointer was asigned only once with vp9_regular_quantize_b_4x4, calling
this function directly now. Also removing unused declarations:
prototype_quantize_block
prototype_quantize_block_pair
prototype_quantize_mb
vp9_regular_quantize_b_4x4_pair
vp9_regular_quantize_b_8x8
Change-Id: I14325bc2f082336820671eafbc06126651b79f73
2013-10-22 13:09:36 -07:00
James Zern
5645b2d89b
Merge "vp9 dec/com: only update frame counts when necessary (2)"
2013-10-22 13:08:44 -07:00
Dmitry Kovalev
9f09618bd4
Merge "Using stride (# of elements) instead of pitch (bytes) in fdct4x4."
2013-10-22 13:05:24 -07:00
James Zern
c9af3de155
Merge changes I305fd55f,I13fe92b1
...
* changes:
vp9/dec: use loop filter worker for all inline cases
vp9_thread: add vp9_worker_execute()
2013-10-22 13:00:33 -07:00
James Zern
64d94b4aa6
Merge "Revert "Merge "SVC improvements"""
2013-10-22 12:47:22 -07:00
Dmitry Kovalev
68c02593df
Reordering probability tables for consistency.
...
Putting vp9_kf_y_mode_prob[] before vp9_kf_uv_mode_prob[].
Change-Id: I2404910e35de1ee24ce46337e00c07eb1446e50f
2013-10-22 12:21:37 -07:00
Dmitry Kovalev
fa57135b2c
Merge "Removing NUM_ prefix from constant names."
2013-10-22 11:34:28 -07:00
Dmitry Kovalev
a767d10fa5
Merge "Using stride (# of elements) instead of pitch (bytes) in fdct8x8."
2013-10-22 11:34:17 -07:00
Dmitry Kovalev
0c10a94581
Merge "Using INTER_MODES constant instead of MB_MODE_COUNT - NEARESTMV."
2013-10-22 11:34:09 -07:00
Jingning Han
7b54556008
Merge "Prevent left_block_mode stepping into left tile"
2013-10-22 09:37:17 -07:00
Jingning Han
c807949408
Prevent left_block_mode stepping into left tile
...
This commit uses left_available flag to decide if the left mode_info
struct is available for left_block_mode. As discussed with James
Zern (jzern@), this prevents the codec from fetching mode_info from
blocks in the left tile, which although effectively not used might
present concerns for multi-threaded tile decoding.
This is NOT a bit-stream change.
Change-Id: I1dc8cf1bcbf056688eee27c7bc5706ac4b4e0125
2013-10-22 09:02:41 -07:00
James Zern
cd74a901a7
Revert "Merge "SVC improvements""
...
This reverts commit a82001b1cf
, reversing
changes made to f6d870f7ae
.
This commit breaks windows builds and needs some work to fix those and
some additional comments.
Change-Id: Ic0b0228e36704b127e5e399ce59db26182cfffe7
2013-10-22 11:09:22 +02:00
Ivan Maltz
a82001b1cf
Merge "SVC improvements"
2013-10-21 16:28:31 -07:00
Dmitry Kovalev
190c2b4591
Using stride (# of elements) instead of pitch (bytes) in fdct4x4.
...
Just making fdct consistent with iht/idct/fht functions which all use
stride (# of elements) as input argument.
Change-Id: I0ba3c52513a5fdd194f1e7e2901092671398985b
2013-10-21 15:27:35 -07:00
Dmitry Kovalev
f6d870f7ae
Merge "Inlining set_partition_seg_context function."
2013-10-21 14:43:37 -07:00
Ivan Maltz
663916cea7
SVC improvements
...
These changes were originally made in the Stratacaster team-review repository
commit e114bffcd82ad74c3696ec58e13c0ac895d6c82d
Author: Charles 'Buck' Krasic <ckrasic@google.com>
Date: Mon Oct 14 16:52:13 2013 -0700
Make dummy frame handling a bit more explicit, fixing bug
with single layer encodes.
Squashed commit of the following:
commit 1ebbfd976c0fadb02bf1ea562a2d0e3f0206daad
Merge: ac468dd
54e88b7
Author: Ivan Maltz <ivanmaltz@google.com>
Date: Fri Oct 11 17:29:58 2013 -0700
Move SVC code from vp9_spatial_scalable_encoder to libvpx module accessible from ffmpeg
commit 54e88b78b160becc9569fc3c6cb6b0a8c95dc357
Author: Ivan Maltz <ivanmaltz@google.com>
Date: Tue Oct 8 09:08:40 2013 -0700
common svc encoding code for sample app and ffmpeg
added svc_encodeframe.c, svc_context.h, svc_test.cc
vp9_spatial_scalable_encoder uses vpx_svc_encode
commit 5616ec8e2e3d3e8d277333d8a9242f6c70151162
Merge: 4528014 e29137d
Author: Ivan Maltz <ivanmaltz@google.com>
Date: Tue Oct 8 08:47:58 2013 -0700
Merge branch 'master' into stratacaster
commit 45280148450b1f3d61e390df8aadedf85cd5bce1
Merge: bb2b675 1ab60f7
Author: Sujeevan Rajayogam <sujee@google.com>
Date: Fri Oct 4 10:22:31 2013 -0700
Merge branch 'master' into stratacaster
commit bb2b675e595dc9bfc8551e963edf56800c3aea61
Author: Sujeevan Rajayogam <sujee@google.com>
Date: Wed Oct 2 12:37:26 2013 -0700
Track individual frame sizes and psnrs instead of averages.
commit c6d303b714795c81e7ceb4173967115c9f8ff5b7
Merge: fa87df9 3583087
Author: Sujeevan Rajayogam <sujee@google.com>
Date: Fri Sep 27 10:05:35 2013 -0700
Merge branch 'master' into stratacaster
commit fa87df94fba923d9f7aeb8ae20c6e15f777e00b5
Merge: bf22d71 3c465af
Author: Sujeevan Rajayogam <sujee@google.com>
Date: Thu Sep 26 16:10:31 2013 -0700
Merge branch 'master' into stratacaster
commit bf22d7144895a82e0c348ac177c8a261b9e2b88e
Author: Sujeevan Rajayogam <sujee@google.com>
Date: Thu Sep 26 11:10:34 2013 -0700
Parameterized quantizer, 16th scalefactors, more logging, enabled single layer encodes to generate baseline.
commit ceffd7e6025b765f9886b5ea0f324248aa37e327
Author: Sujeevan Rajayogam <sujee@google.com>
Date: Thu Sep 19 10:04:49 2013 -0700
- Include new mode for 3 layer I frame with 5 total layers.
- Refactor svc api.
Change-Id: Ie4d775e21e006fa597d884c59488dc999478e9b5
2013-10-21 14:34:37 -07:00
Dmitry Kovalev
1e05c9a7e6
Merge "Cleanup: using cm variable instead of cpi->common."
2013-10-21 14:30:01 -07:00
Dmitry Kovalev
a0be71c703
Inlining set_partition_seg_context function.
...
We used set_partition_seg_context() only before calls to:
1. update_partition_context()
2. partition_plane_context()
Moving these functions from vp9_blockd.h to vp9_onyxc_int.h and
inlining set_partition_seg_context into them. After that it is not
necessary to have {above, left}_seg_context fields in MACROBLOCKD struture,
so removing them also.
Change-Id: I4723f59e1c8f3788432b7f51185d8d747b3a97f9
2013-10-21 12:02:19 -07:00
Jingning Han
deb10ac6f9
Merge "Make memory alloc in pick_mode_context bsize aware"
2013-10-21 11:45:59 -07:00
Dmitry Kovalev
a698e52926
Cleanup: using cm variable instead of cpi->common.
...
Change-Id: Iab334b5fd51dfa7e7f29963f8bdc62fd7355e56d
2013-10-21 11:10:11 -07:00
Dmitry Kovalev
33a29f3c35
Merge "Moving allow_high_precision_mv from MACROBLOCKD to VP9_COMMON."
2013-10-21 10:55:02 -07:00
James Zern
2d1ab9a850
vp9 dec/com: only update frame counts when necessary (2)
...
missed one in vp9_detokenize.c in the last
+ add some asserts in vp9_decode_frame() to catch regressions
Change-Id: Ide67505114ee17efdafb13694aed0c09039e5a16
2013-10-21 19:51:36 +02:00
Yunqing Wang
4afc3a6542
Merge "Fix d207 intra prediction SSSE3 functions"
2013-10-21 10:45:20 -07:00
Paul Wilkins
282157f1e7
Merge "Modified no memory rate control."
2013-10-21 10:32:47 -07:00
Paul Wilkins
28985bb274
Merge "Reduced delta for kf/gf/arf when at maxq."
2013-10-21 10:32:35 -07:00
Dmitry Kovalev
d1b65c6bda
Moving allow_high_precision_mv from MACROBLOCKD to VP9_COMMON.
...
This value is a global frame-level flag, not a macroblock-level.
Change-Id: Ie8c5790a931150741c2167c00c3e3dd2cf26744d
2013-10-21 10:12:14 -07:00