Commit graph

55 commits

Author SHA1 Message Date
Ray Essick
60db7fead3 Merge "Set current slice ctb x and y to fill prev incomplete slice" into lmp-dev am: bfcdbd6a5b am: 88133ef0a3
am: 6249eafc05

Change-Id: I2766292140004cf757db19ebf114b8ff14b96953
2017-04-10 23:05:10 +00:00
Ray Essick
88133ef0a3 Merge "Set current slice ctb x and y to fill prev incomplete slice" into lmp-dev
am: bfcdbd6a5b

Change-Id: Id1b2bb473c7b9a9bbd2228a5cb56f243e0b99776
2017-04-10 22:55:39 +00:00
Ray Essick
bfcdbd6a5b Merge "Set current slice ctb x and y to fill prev incomplete slice" into lmp-dev 2017-04-10 22:46:39 +00:00
Harish Mahendrakar
ad43c8d810 Fixed an out of bound read in accessing inverse scan table am: fed1a3d8d8 am: eb8657808f
am: f4dc209cc7

Change-Id: I22b7ab3c3cd28e746895cf064719469963cf72bd
2017-04-10 20:37:00 +00:00
Harish Mahendrakar
eb8657808f Fixed an out of bound read in accessing inverse scan table
am: fed1a3d8d8

Change-Id: I822440a1ca11f6d99e941acd4034074df2d220dd
2017-04-10 20:27:29 +00:00
Naveen Kumar P
830858436b Set current slice ctb x and y to fill prev incomplete slice
If previous slice is not completed, update the current slice
ctb_x and ctb_y so that while filling the previous slice,
the parse slice code can break properly.

Bug: 32322258
Test: boot, ran POC supplied with bug
Change-Id: Ie9090694514a018268851560a3f056194ff6fc91
2017-04-07 20:00:54 +00:00
Harish Mahendrakar
fed1a3d8d8 Fixed an out of bound read in accessing inverse scan table
Bug: 34819017
Change-Id: Ib25db1da92eee390a3847df06c0c0675ebcfb1a4
2017-03-22 10:06:35 -07:00
Marco Nelissen
d93f4fc0f4 Merge "Handle error return from ref list in slice hdr parsing" into lmp-dev
am: fd5656fe76

Change-Id: Ibb21d3c950af705da0ed1897ec124a7188d6bfb7
2017-03-13 23:59:29 +00:00
Marco Nelissen
fd5656fe76 Merge "Handle error return from ref list in slice hdr parsing" into lmp-dev 2017-03-13 23:53:33 +00:00
Marco Nelissen
8883b3e2a3 Merge "Handle error return from ref list in slice hdr parsing" into mnc-dev 2017-03-13 22:52:41 +00:00
Naveen Kumar Ponnusamy
de6bd99214 Merge "Return error from cabac init if offset is greater than range" into lmp-dev am: 09ff5c6298 am: eef834a4d0
am: 49e9836a16

Change-Id: Ia6594900b169d3f3dfe4e767558a5f76fb77e3fd
2017-03-13 22:49:08 +00:00
Naveen Kumar Ponnusamy
eef834a4d0 Merge "Return error from cabac init if offset is greater than range" into lmp-dev
am: 09ff5c6298

Change-Id: I16f27f1643a3556273a3c5729301596b9b12e452
2017-03-13 22:40:10 +00:00
Naveen Kumar Ponnusamy
766f97657f Handle error return from ref list in slice hdr parsing
The error returned by ref_list function was not handled by the
caller parse_slice_header.

Bug: 34672748
Change-Id: I55f6cb0e651746e77f7ff3375115894ec3964203
2017-03-13 15:37:19 -07:00
TreeHugger Robot
09ff5c6298 Merge "Return error from cabac init if offset is greater than range" into lmp-dev 2017-03-13 22:31:34 +00:00
Harish Mahendrakar
cac2f841ae Return error if SPS parsing reads more bytes than the nal length am: 232bbe1908 am: 2f206ceb72
am: c7ddfff98c

Change-Id: I26b7a8bc565dd186f551ec1dd615c812c199fb3a
2017-03-11 00:20:02 +00:00
Harish Mahendrakar
2f206ceb72 Return error if SPS parsing reads more bytes than the nal length
am: 232bbe1908

Change-Id: I4ab8199f06050125d48e4c335fe83dbab2885dbb
2017-03-11 00:13:01 +00:00
Naveen Kumar Ponnusamy
b92314c860 Return error from cabac init if offset is greater than range
When the offset was greater than range, the bitstream was read
more than the valid range in leaf-level cabac parsing modules.
Error check was added to cabac init to fix this issue. Additionally
end of slice and slice error were signalled to suppress further
parsing of current slice.

Bug: 34897036
Change-Id: I1263f1d1219684ffa6e952c76e5a08e9a933c9d2
(cherry picked from commit 3b175da88a1807d19cdd248b74bce60e57f05c6a)
2017-03-10 14:56:09 -08:00
Naveen Kumar Ponnusamy
25206ffa6e Handle error return from ref list in slice hdr parsing
The error returned by ref_list function was not handled by the
caller parse_slice_header.

Bug: 34672748
Change-Id: I55f6cb0e651746e77f7ff3375115894ec3964203
2017-03-10 19:01:38 +00:00
Harish Mahendrakar
232bbe1908 Return error if SPS parsing reads more bytes than the nal length
Bug: 35039946

Change-Id: Ia97fa8711f313d0029d2b13e6d150d5e46b2bb99
(cherry picked from commit a6c58e18a49a1ea4929f8345b3c59f900d5813f5)
2017-03-03 11:22:24 -08:00
Marco Nelissen
59b232588b Merge "Fix in handling wrong cu_qp_delta" into lmp-dev am: 98f9e26d24 am: 10f2b105f5
am: b4ddce56d1

Change-Id: I2280a7fcbd5b71ca3d6f8c0a747f4805e96caea8
2017-02-14 22:59:01 +00:00
Marco Nelissen
10f2b105f5 Merge "Fix in handling wrong cu_qp_delta" into lmp-dev
am: 98f9e26d24

Change-Id: I75f4e069f89bff32ce17e7500d308e3fc9421c0c
2017-02-14 22:54:32 +00:00
Marco Nelissen
98f9e26d24 Merge "Fix in handling wrong cu_qp_delta" into lmp-dev 2017-02-14 22:47:49 +00:00
Harish Mahendrakar
b3169d93df Handle invalid num_reorder_pics & max_dec_pic_buffering in SPS am: 1ab5ce7e42 am: cb6fa6a0d4
am: f5674af080

Change-Id: Ie8e9156ead63e23579db23873a8bba10b939e144
2017-02-14 21:41:26 +00:00
Harish Mahendrakar
cb6fa6a0d4 Handle invalid num_reorder_pics & max_dec_pic_buffering in SPS
am: 1ab5ce7e42

Change-Id: I85672c5c53a450c4aa4a62577eefe0350adfefd3
2017-02-14 21:36:55 +00:00
Harish Mahendrakar
1ab5ce7e42 Handle invalid num_reorder_pics & max_dec_pic_buffering in SPS
Bug: 33864300
Change-Id: I920e45c3420a1a41a366ad45bd4186c5f6af6d6b
2017-02-13 20:21:01 +00:00
Harish Mahendrakar
01ca88bb6c Fix in handling wrong cu_qp_delta
cu_qp_delta is now checked for the range as specified in the spec
Bug: 33966031

Change-Id: I00420bf68081af92e9f2be9af7ce58d0683094ca
2017-02-13 20:18:51 +00:00
Harish Mahendrakar
b5cae8181e Added check for invalid log2_max_transform_block_size in SPS
Bug: 33918236
Bug: 33964497
Bug: 33965905
Bug: 33862021
Change-Id: If121221d0f6e983c05d95d123af9bed378d1961f
2017-01-17 15:38:38 -08:00
Marco Nelissen
ac029cfa04 Merge changes I662212eb,Ib07e2ed1 into mnc-dev
* changes:
  Fixed handling invalid chroma tu size for error clips
  Fixed out of bound reads in stack variables
2016-12-07 00:28:52 +00:00
Harish Mahendrakar
a76773ab74 Fixed handling invalid chroma tu size for error clips
Limit func_idx to valid range to ensure invalid functions are not
called when wrong TU size is signalled for chroma due to error in
parsing

Bug: 32915871
Change-Id: I662212eb2e9b8994e7e85780e667f14df73b5905
2016-12-07 00:28:46 +00:00
Harish Mahendrakar
4def2dfabf Fixed out of bound reads in stack variables
Out of bound reads in the following variables are fixed

scaling_mat_offset in ihevcd_iquant_itrans_recon_ctb()
ai1_offset_y, ai1_offset_cb and ai1_offset_cr in ihevcd_sao_shift_ctb()

These values were read but not used

b/32915871

Change-Id: Ib07e2ed1bdcc600700d4e9e5d970f6cc2164ab1b
2016-12-06 23:55:42 +00:00
Harish Mahendrakar
f4f3556e04 Handle invalid slice_address in slice header
If an invalid slice_address was parsed, it was resulting in an incomplete
slice header during decode stage. Fix this by not incrementing slice_idx
for ignore slice error

Bug: 32322258
Change-Id: I8638d7094d65f4409faa9b9e337ef7e7b64505de
2016-11-10 14:59:41 -08:00
Ricardo Cerqueira
063ce60457 Fix the frame size alignments am: 50ad42cf93 am: 4917993a7e
am: 30491833ff

* commit '30491833ff':
  Fix the frame size alignments
2015-12-17 10:12:35 -08:00
Ricardo Cerqueira
30491833ff Fix the frame size alignments am: 50ad42cf93
am: 4917993a7e

* commit '4917993a7e':
  Fix the frame size alignments
2015-12-17 18:09:50 +00:00
Ricardo Cerqueira
4917993a7e Fix the frame size alignments
am: 50ad42cf93

* commit '50ad42cf93':
  Fix the frame size alignments
2015-12-17 18:02:24 +00:00
Ricardo Cerqueira
50ad42cf93 Fix the frame size alignments
Change I59c996161053e313c873381c5bf6f8c36488483f aligned the number
of luma samples to 64byte boundaries when calculating and creating
the buffers. Unfortunately, it doesn't change all instances of that
calculation, leading to mismatches between creation/allocation/destruction.

Fixes android.media.cts.DecoderTest#testEOSBehaviorHEVC and
android.media.cts.DecoderTest#testCodecEarlyEOSHEVC

Bug: 24686670
Bug: 25070493
Bug: 25995793
Bug: 26217939
Bug: 26239053

Change-Id: I5b9dd682e08cfb03d2bc54829c4908976251dee7
2015-12-17 16:27:54 +00:00
Harish Mahendrakar
2060081d2b DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips
Also aligned few allocations to 4 byte boundary

Bug: 25070493
Bug: 24686670
Change-Id: Ic6284c6136ba8a72eed6f3bb7b953fb36a19dc22
2015-11-06 12:35:49 -08:00
Marco Nelissen
516528ee1c Revert "Added few memsets to avoid uninitialized reads for error clips" am: 552578a757
am: 675c41434a

* commit '675c41434a':
  Revert "Added few memsets to avoid uninitialized reads for error clips"
2015-11-06 20:12:53 +00:00
Harish Mahendrakar
b9f7c2c45c DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips
Also aligned few allocations to 4 byte boundary

Bug: 25070493
Bug: 24686670
Change-Id: I59c996161053e313c873381c5bf6f8c36488483f
2015-11-06 12:12:01 -08:00
Marco Nelissen
675c41434a Revert "Added few memsets to avoid uninitialized reads for error clips"
am: 552578a757

* commit '552578a757':
  Revert "Added few memsets to avoid uninitialized reads for error clips"
2015-11-06 20:09:53 +00:00
Marco Nelissen
552578a757 Revert "Added few memsets to avoid uninitialized reads for error clips"
This reverts commit d71abc6924.

Change-Id: I24ea5da7d00f9cd52ce8f64a0a5bce47df67216e
2015-11-06 19:22:31 +00:00
Harish Mahendrakar
9043fefe92 Added few memsets to avoid uninitialized reads for error clips am: d71abc6924
am: d488586974

* commit 'd488586974':
  Added few memsets to avoid uninitialized reads for error clips
2015-11-06 15:39:38 +00:00
Harish Mahendrakar
d488586974 Added few memsets to avoid uninitialized reads for error clips
am: d71abc6924

* commit 'd71abc6924':
  Added few memsets to avoid uninitialized reads for error clips
2015-11-06 15:36:42 +00:00
Harish Mahendrakar
d71abc6924 Added few memsets to avoid uninitialized reads for error clips
Also aligned few allocations to 4 byte boundary

Bug: 25070493
Bug: 24686670

Change-Id: I430b18fce2fe2940f4fb0ff95e5eadc7fdd705d4
2015-10-27 08:18:04 -07:00
Marco Nelissen
b3a53cebdb resolve merge conflicts of 7899c8cffa to mnc-dev.
Change-Id: Ic515e6ca749bbd4b11a715f1ea7e5dd9a54b2cd0
2015-10-22 14:43:11 -07:00
Harish Mahendrakar
7899c8cffa Aligned ps_pic_pu to 4 bytes
am: e8bfec1fa4

* commit 'e8bfec1fa4':
  Aligned ps_pic_pu to 4 bytes
2015-10-21 21:39:20 +00:00
Harish Mahendrakar
e8bfec1fa4 Aligned ps_pic_pu to 4 bytes
stmia was resulting in SEGV_MAPERR when ps_pic_pu is not aligned to 4 bytes
Bugfix: 24686670, 21468583

Change-Id: I07672d4a790f73cf27964983350181e66edc4d57
2015-10-21 07:50:33 -07:00
Harish Mahendrakar
b4475ae318 am 2b67e532: Align pic_width_in_luma_samples and pic_width_in_luma_samples to 8
* commit '2b67e53265':
  Align pic_width_in_luma_samples and pic_width_in_luma_samples to 8
2015-08-17 23:58:45 +00:00
Harish Mahendrakar
2b67e53265 Align pic_width_in_luma_samples and pic_width_in_luma_samples to 8
Spec mandates these to be multiples of min_cb_size.
Bug fix: 22278703

Change-Id: I17f0c2242519a9277598b8fb5b05717e1ce7469b
(cherry picked from commit dde3d8a3c7)
2015-08-14 23:48:15 +00:00
Harish Mahendrakar
dde3d8a3c7 Align pic_width_in_luma_samples and pic_width_in_luma_samples to 8
Spec mandates these to be multiples of min_cb_size.
Bug fix: 22278703

Change-Id: I17f0c2242519a9277598b8fb5b05717e1ce7469b
2015-07-31 12:25:43 -07:00
Naveen Kumar Ponnusamy
221aaccb7a Few bug fixes in loop filter
Removed few unused functions
Fixed an issue in 420P output in shared mdoe
Few bug fixes in handling loop filter corner cases in multi-tile multi-slice clips
Renamed few elements in mv_buf_t for consistency

Bug: 22860270

Change-Id: I8d179b9ad3c7ee3ad27972ee02ea2658fd2c3c25
2015-07-31 01:59:55 +00:00