Commit graph

66 commits

Author SHA1 Message Date
Naveen Kumar P
faa26fa3d7 Fix reallocation for new sps
Bug: 34779227
Bug: 62815506
Change-Id: I345f149eee46ae4ff4261526abca10d7ebc05ac5
2017-09-19 17:14:36 -07:00
Harish Mahendrakar
3bf1fc3edf Merge "Ensure CTB size > 16 for clips with tiles and width/height >= 4096" into lmp-dev am: db15dd7102 am: 419fd4b745 am: 8e6cf47bf1 am: 61f3fbfe13 am: 107cdf1c41 am: 334f59340c am: 9b2d0a5137
am: a309f6605a

Change-Id: I784e97dec42587cac275d2e0d12ce56f6ed79774
2017-08-03 19:22:10 +00:00
Harish Mahendrakar
a309f6605a Merge "Ensure CTB size > 16 for clips with tiles and width/height >= 4096" into lmp-dev am: db15dd7102 am: 419fd4b745 am: 8e6cf47bf1 am: 61f3fbfe13 am: 107cdf1c41 am: 334f59340c
am: 9b2d0a5137

Change-Id: I40a53847609bf84fae00792a101ad751d9312a26
2017-08-03 19:15:10 +00:00
Harish Mahendrakar
107cdf1c41 Merge "Ensure CTB size > 16 for clips with tiles and width/height >= 4096" into lmp-dev am: db15dd7102 am: 419fd4b745 am: 8e6cf47bf1
am: 61f3fbfe13

Change-Id: I640c619d9c69774e716ce43cb77b1bc1bb8869e7
2017-08-03 18:59:37 +00:00
Harish Mahendrakar
61f3fbfe13 Merge "Ensure CTB size > 16 for clips with tiles and width/height >= 4096" into lmp-dev am: db15dd7102 am: 419fd4b745
am: 8e6cf47bf1

Change-Id: I893a9a91df23625bf2cbd6ce2d226b682c773130
2017-08-03 18:53:37 +00:00
Harish Mahendrakar
419fd4b745 Merge "Ensure CTB size > 16 for clips with tiles and width/height >= 4096" into lmp-dev
am: db15dd7102

Change-Id: Ie3b65dfa829d06fbdeb6590cf1458dc886ab6126
2017-08-03 18:40:37 +00:00
Harish Mahendrakar
248e72c7a8 Ensure CTB size > 16 for clips with tiles and width/height >= 4096
For clips with tiles and dimensions >= 4096,
CTB size of 16 can result in tile position > 255.
This is not supported by the decoder

Bug: 37930177
Test: ran poc w/o crashing
Change-Id: I2f223a124c4ea9bfd98343343fd010d80a5dd8bd
2017-07-24 12:33:29 -07:00
Naveen Kumar P
b34985456f Return error for invalid crop parameters am: e8c26c16d7 am: 870c70383d am: 6850014493 am: fc0890497a am: 78e98c5480 am: 04276b9d82 am: 030250ff1b
am: d3cf23089c

Change-Id: I57ea3525c3df59d0fa14bbcd9507d26a5f3876b6
2017-06-16 19:12:42 +00:00
Naveen Kumar P
d3cf23089c Return error for invalid crop parameters am: e8c26c16d7 am: 870c70383d am: 6850014493 am: fc0890497a am: 78e98c5480 am: 04276b9d82
am: 030250ff1b

Change-Id: I6ba9c4f80aad7ce1562aa7f5338042d60c4babc9
2017-06-16 19:06:42 +00:00
Naveen Kumar P
78e98c5480 Return error for invalid crop parameters am: e8c26c16d7 am: 870c70383d am: 6850014493
am: fc0890497a

Change-Id: Ieab583dcfdd14b70b99e51dd3b7c9a7ba9fbc7ae
2017-06-16 18:48:12 +00:00
Naveen Kumar P
fc0890497a Return error for invalid crop parameters am: e8c26c16d7 am: 870c70383d
am: 6850014493

Change-Id: I9df5bb8d14a56469ecb534061404d0da41dee8c2
2017-06-16 18:41:10 +00:00
Naveen Kumar P
870c70383d Return error for invalid crop parameters
am: e8c26c16d7

Change-Id: I7e8ae1eeccfc75b175485e47136b16d27a0b23c6
2017-06-16 18:28:38 +00:00
Naveen Kumar P
e8c26c16d7 Return error for invalid crop parameters
Test: run poc with and without the patch
Bug: 62214264
Change-Id: If627ee9a8f0dbd65963897966e1c2d39f5fbd428
2017-06-15 20:19:16 +00:00
Harish Mahendrakar
d272cd6369 DO NOT MERGE Added check for invalid log2_max_transform_block_size in SPS
Bug: 33918236
Bug: 33964497
Bug: 33965905
Bug: 33862021
Change-Id: If121221d0f6e983c05d95d123af9bed378d1961f
2017-06-05 14:36:00 -07:00
Naveen Kumar P
81f389ea8c Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev am: 1853d3871a am: f7635dd278 am: 17caa64f8b am: 0b13008b9a am: 76c466f238 am: 94f311a6f2 am: d33b4bb164
am: 22dfbd2def

Change-Id: I8a18c0e8649d25ac409b5904683cf89c67a310c2
2017-05-16 22:39:51 +00:00
Harish Mahendrakar
4a3432e190 Merge "memset SPS to zero" into lmp-dev am: 31e21c5134 am: c1c11822d6 am: bb4f42afa0 am: 356364edaa am: 5dbf371a33 am: 1309c741ea am: 8dad755531
am: e36fc2b9a6

Change-Id: Iaa57baab1a84816679402548746c9d02cdf1967a
2017-05-16 22:39:44 +00:00
Naveen Kumar P
22dfbd2def Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev am: 1853d3871a am: f7635dd278 am: 17caa64f8b am: 0b13008b9a am: 76c466f238 am: 94f311a6f2
am: d33b4bb164

Change-Id: I025d8772de4da0a0d28c116d58f25b8bedad907d
2017-05-16 22:38:26 +00:00
Harish Mahendrakar
e36fc2b9a6 Merge "memset SPS to zero" into lmp-dev am: 31e21c5134 am: c1c11822d6 am: bb4f42afa0 am: 356364edaa am: 5dbf371a33 am: 1309c741ea
am: 8dad755531

Change-Id: I50907c24c90543f4b1e08fa10c42b6805467dd74
2017-05-16 22:38:15 +00:00
Naveen Kumar P
76c466f238 Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev am: 1853d3871a am: f7635dd278 am: 17caa64f8b
am: 0b13008b9a

Change-Id: Iff756412d3aae6cebffffde91c2577872e35813a
2017-05-16 22:33:32 +00:00
Harish Mahendrakar
5dbf371a33 Merge "memset SPS to zero" into lmp-dev am: 31e21c5134 am: c1c11822d6 am: bb4f42afa0
am: 356364edaa

Change-Id: I19018bea987903cf7cd194f543dd603e20368a8f
2017-05-16 22:33:14 +00:00
Naveen Kumar P
0b13008b9a Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev am: 1853d3871a am: f7635dd278
am: 17caa64f8b

Change-Id: Ibdf47e9ea494abfb70d387b48ff8b4f02b68e45c
2017-05-16 22:29:43 +00:00
Harish Mahendrakar
356364edaa Merge "memset SPS to zero" into lmp-dev am: 31e21c5134 am: c1c11822d6
am: bb4f42afa0

Change-Id: Ie84e14343f217221c46e64c389ae14c75993f9b8
2017-05-16 22:29:22 +00:00
Naveen Kumar P
f7635dd278 Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev
am: 1853d3871a

Change-Id: Iba174494476450fbbf283e16c3f15d37783d9544
2017-05-16 22:24:02 +00:00
Harish Mahendrakar
c1c11822d6 Merge "memset SPS to zero" into lmp-dev
am: 31e21c5134

Change-Id: Iddca06711b6801b6b7fa45a8e2201dcc0c8c3974
2017-05-16 22:23:52 +00:00
TreeHugger Robot
1853d3871a Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev 2017-05-16 22:20:33 +00:00
TreeHugger Robot
31e21c5134 Merge "memset SPS to zero" into lmp-dev 2017-05-16 22:18:29 +00:00
Naveen Kumar P
d61d5e5f6a Check for buffer overflow in pps/slice header parsing
Bug: 36215950
Bug: 36215953
Bug: 36216719
Change-Id: Ibdc05e1d5aa21d060d7c683fd9af4bed8537053f
2017-05-15 15:45:50 -07:00
Harish Mahendrakar
2e0e75aede memset SPS to zero
SPS structure is memset to zero in parse_sps()
Bug: 33966031
Bug: 37458993

Change-Id: I7d4c04d2d25d7e9c8f581bd470260fc4394a564b
2017-05-12 16:21:21 -07:00
Ray Essick
50272c7a39 Merge changes from topic 'b34779227-mnc-dr' into mnc-dr-dev
* changes:
  Fix reallocation for new sps
  DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames without resolution change
2017-05-12 23:15:16 +00:00
Harish Mahendrakar
135d508cba Merge "DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames without resolution change" into nyc-dev
am: 71c0aeaaff

Change-Id: Icf0a40fb7aed68964f6bef3b437582376ed9532d
2017-05-12 20:48:11 +00:00
TreeHugger Robot
71c0aeaaff Merge "DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames without resolution change" into nyc-dev 2017-05-12 20:38:18 +00:00
Wonsik Kim
b8ea9ac092 Merge "Check for cpb cnt in hrd parsing" into nyc-dev
am: 8f4b305eb1

Change-Id: I84f24db650112df919cb226a568f3054cad3f6aa
2017-05-11 15:49:59 +00:00
Wonsik Kim
8f4b305eb1 Merge "Check for cpb cnt in hrd parsing" into nyc-dev 2017-05-11 15:39:40 +00:00
Mark Salyzyn
5e17a2046b resolve merge conflicts of 8dc7b42 to mnc-dr-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: 34896431
Change-Id: I670a2d2025f52b0197651bd4bb2acbc4887e0447
2017-05-11 15:23:00 +00:00
Wonsik Kim
4490398c88 Merge "DO NOT MERGE Check for cpb cnt in hrd parsing" into lmp-dev 2017-05-10 23:48:22 +00:00
Wonsik Kim
8dc7b42e65 Merge "DO NOT MERGE Check for cpb cnt in hrd parsing" into mnc-dev 2017-05-10 23:48:16 +00:00
Harish Mahendrakar
27ad0d7bff DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames
without resolution change

backported from master as part of fixing a security issue on
nyc-*.

Bug: 34779227
Test: successful re-run of POC after patch
Change-Id: I404099ac24439b5f6eddc9265dc571929433b3ee
2017-05-05 10:16:22 -07:00
Naveen Kumar P
99df61bb9a Fix reallocation for new sps
This works for mnc-dr-dev and later.

Bug: 34779227
Test: re-ran POC before/after patch to verify behavior
Change-Id: Ida0bf6bcc236494c3c89b228039501e287839fbe
2017-05-05 09:50:11 -07:00
Harish Mahendrakar
b62479887e DO NOT MERGE Handle streams with change in max_dec_buffering/num_reorder_frames
without resolution change

backported from master as part of fixing a security issue on mnc-dr.

Bug: 34779227
Test: before/after execution of PIC
Change-Id: I404099ac24439b5f6eddc9265dc571929433b3ee
2017-05-05 09:46:46 -07:00
Hangyu Kuang
da794ae209 Merge "Correct Tiles rows and cols check" into lmp-dev am: 7e3858b313 am: a78650de6d am: 2bd3c9cd07 am: 576f2fd4ef am: af6ce4991f am: 98c1c3e1c1 am: 16db19a2f9
am: bfb52f7f70

Change-Id: Id5f85eecc80ae3232d76c0a50abc71c6b4e20583
2017-04-12 20:48:34 +00:00
Hangyu Kuang
af6ce4991f Merge "Correct Tiles rows and cols check" into lmp-dev am: 7e3858b313 am: a78650de6d am: 2bd3c9cd07
am: 576f2fd4ef

Change-Id: I1044bc5326db71f545299e3845148e09d1d0934f
2017-04-12 20:26:32 +00:00
Hangyu Kuang
576f2fd4ef Merge "Correct Tiles rows and cols check" into lmp-dev am: 7e3858b313 am: a78650de6d
am: 2bd3c9cd07

Change-Id: I2118b213dd4568f23db79a80bebaf483a96efa5e
2017-04-12 20:21:31 +00:00
Naveen Kumar P
07ef4e7138 Correct Tiles rows and cols check
Bug: 36231493
Bug: 34064500
Change-Id: Ib17b2c68360685c5a2c019e1497612a130f9f76a
2017-04-11 14:12:29 -07:00
Naveen Kumar P
4040554b37 DO NOT MERGE Check for cpb cnt in hrd parsing
Bug: 34896431

The arrays in hrd are of size MAX_CPB_CNT. If cpb cnt is more
than MAX_CPB_CNT, more data is parsed and the subsequent buffer
is corrupted.

Change-Id: I74c01b8c7142b67a358eb5e36b160a7fbf2b69e4
2017-04-10 10:22:17 -07:00
Naveen Kumar P
f9aea65f69 DO NOT MERGE Check for cpb cnt in hrd parsing
Bug: 34896431

The arrays in hrd are of size MAX_CPB_CNT. If cpb cnt is more
than MAX_CPB_CNT, more data is parsed and the subsequent buffer
is corrupted.

Change-Id: I74c01b8c7142b67a358eb5e36b160a7fbf2b69e4
2017-04-10 10:20:11 -07:00
Naveen Kumar P
3e194e0edd Check for cpb cnt in hrd parsing
Bug: 34896431

The arrays in hrd are of size MAX_CPB_CNT. If cpb cnt is more
than MAX_CPB_CNT, more data is parsed and the subsequent buffer
is corrupted.

Change-Id: I74c01b8c7142b67a358eb5e36b160a7fbf2b69e4
2017-04-10 08:58:24 -07:00
Harish Mahendrakar
ed6770a725 Return error if SPS parsing reads more bytes than the nal length am: 232bbe1908 am: 2f206ceb72 am: c7ddfff98c am: cac2f841ae am: c30ceb1eea am: 81d057f43b am: ad7cfee8f0
am: ae08a88344

Change-Id: I74bd99870abd3700a8e652bf729fdb8f3a4cb4be
2017-03-11 00:38:33 +00:00
Harish Mahendrakar
c30ceb1eea Return error if SPS parsing reads more bytes than the nal length am: 232bbe1908 am: 2f206ceb72 am: c7ddfff98c
am: cac2f841ae

Change-Id: Ia64c6417947483e25847c147e33cc1ee7d6fa6b9
2017-03-11 00:23:32 +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
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