Commit graph

247 commits

Author SHA1 Message Date
Ray Essick
0fbfecd7ce Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev am: d61abc5195
am: 16306f7347

Change-Id: I8cc48a17cfd4d1c2d1f4234c36e88bc17d0b8daf
2017-02-13 19:23:27 +00:00
Harish Mahendrakar
f23ebcfab1 Fix in returning end of bitstream error for MBAFF am: 7950bf47b6
am: 73f74a84e1

Change-Id: Iac07d54ca71b79f6380c3f5c3d4106838bb76642
2017-02-13 19:23:18 +00:00
Ray Essick
16306f7347 Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev
am: d61abc5195

Change-Id: Ieb21ecb1c3152bde97adc7cfcfc4d49afcafd93b
2017-02-13 19:20:57 +00:00
Harish Mahendrakar
73f74a84e1 Fix in returning end of bitstream error for MBAFF
am: 7950bf47b6

Change-Id: If45518b6d58c393313dbcb425f7aa2e7bec02056
2017-02-13 19:20:47 +00:00
Ray Essick
d61abc5195 Merge "Decoder: Initialize default reference buffers for all pictures" into mnc-dev 2017-02-13 19:15:31 +00:00
Harish Mahendrakar
f634481e94 Decoder: Initialize default reference buffers for all pictures
Reference buffer is now initialized to default value for
each pic before decoding the first slice in the pic

Bug: 34097866
Change-Id: Id64b123af2188217ce833f11db0e6c0681d41dfd
2017-02-13 19:14:50 +00:00
Harish Mahendrakar
7950bf47b6 Fix in returning end of bitstream error for MBAFF
In case of MBAFF streams, slices should terminate on
even MB boundary. If bytes are exhausted with odd number
of MBs decoded for MBAff, then treat that as error.

Bug: 33933140

Change-Id: Ifc26b66ff8ebdb3aec5c0d6c512e4cac3f54c5b7
2017-02-13 19:14:18 +00:00
Harish Mahendrakar
0aab4958fb Decoder: Fixes an out of bound write in bitstream buffer
am: 33ef7de9dd

Change-Id: If2ca8f044536549a32df1400c12099fa6bc562f1
2017-02-13 18:44:45 +00:00
Harish Mahendrakar
33ef7de9dd Decoder: Fixes an out of bound write in bitstream buffer
[for mnc-dr-dev and later;  mnc-dev gets a different patch]

After emulation prevention, data is written as an int,
so at least 3 additional bytes should be available.
And since bitstream functions read 8 bytes ahead, 8 extra bytes
should be available in the bitstream buffer.

Bug: 33934721

Change-Id: I444ec6f85d01b0bade9f827e15c4b476779d6c69
2017-01-19 09:17:00 -08:00
Ray Essick
ecfc52702b Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev am: 43a184ad48
am: ab0e425406

Change-Id: I1174c079ff971a216438395ee42338a3fa151716
2017-01-18 21:13:19 +00:00
Harish Mahendrakar
18a58ec2b6 Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases am: 1d5640f2f9
am: 5a26569fa3

Change-Id: Idd2a9b5a617326d2ee38908ba768085dad257f04
2017-01-18 21:13:12 +00:00
Ray Essick
ab0e425406 Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev
am: 43a184ad48

Change-Id: I8886826d4c30c0dbfe0ace25ca87cca3fa015c7e
2017-01-18 21:11:12 +00:00
Harish Mahendrakar
5a26569fa3 Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases
am: 1d5640f2f9

Change-Id: I32e960c752ccbc991f8ce04455618a534f1f52c7
2017-01-18 21:11:11 +00:00
Ray Essick
43a184ad48 Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev 2017-01-18 21:00:19 +00:00
Marco Nelissen
7d4a72d887 Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev am: d5424f66e3
am: ce26193738

Change-Id: I10906db63e6b8a747a2b5d3400132492b59d0e67
2017-01-18 18:54:04 +00:00
Harish Mahendrakar
d6086cb6ed DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips am: 74f03b639e -s ours
am: 4aa4a30de2

Change-Id: I2a9fda1380d536f4a0353e6abe69d84519be0efe
2017-01-18 18:53:56 +00:00
Marco Nelissen
ce26193738 Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev
am: d5424f66e3

Change-Id: Id752d251dda25afb5bd70f1d21b1e6b1bb14b631
2017-01-18 18:51:57 +00:00
Harish Mahendrakar
4aa4a30de2 DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips
am: 74f03b639e  -s ours

Change-Id: If7fe4b318a65a452068b79ee1bc6577ea701ebe5
2017-01-18 18:51:57 +00:00
Marco Nelissen
d5424f66e3 Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev 2017-01-18 18:42:47 +00:00
Marco Nelissen
de511dec6e Merge "Decoder: Fix in checking first_mb_in_slice" into mnc-dev am: 78523d557a
am: 11e48510ee

Change-Id: Ied98c92a625d59b7f96cd0a8cc6fc0877aed8cbc
2017-01-18 18:20:31 +00:00
Harish Mahendrakar
3c332522de Decoder: Fix in checking first_mb_in_slice am: ef27433ca8
am: 274529d8aa

Change-Id: I2a495130b4fe30f917a8490a96577f526e9e5b8f
2017-01-18 18:20:24 +00:00
Marco Nelissen
11e48510ee Merge "Decoder: Fix in checking first_mb_in_slice" into mnc-dev
am: 78523d557a

Change-Id: Ic0f4f9f01614c91acb3892cf398cd3f58827970c
2017-01-18 18:18:25 +00:00
Harish Mahendrakar
274529d8aa Decoder: Fix in checking first_mb_in_slice
am: ef27433ca8

Change-Id: Ic27ccbbcad3d991862b7e680595ab0ae4fd23eb0
2017-01-18 18:18:24 +00:00
Marco Nelissen
78523d557a Merge "Decoder: Fix in checking first_mb_in_slice" into mnc-dev 2017-01-18 18:07:51 +00:00
Marco Nelissen
8a4bb00e14 Merge "Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read" into mnc-dev am: 4e0cdd450e
am: 2bdef88e48

Change-Id: Ib02027ca423fbb09b93ac2243759105666c1b02c
2017-01-18 17:39:26 +00:00
Harish Mahendrakar
5508b75095 Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read am: b88f59d835
am: bb4b279eb1

Change-Id: I6ecf9de69fca276c6d1e3526e43d8eab84ad2a29
2017-01-18 17:39:18 +00:00
Marco Nelissen
2bdef88e48 Merge "Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read" into mnc-dev
am: 4e0cdd450e

Change-Id: I0c3dae5ca61ddac6b129ccb6c73d72aec224d440
2017-01-18 17:32:48 +00:00
Harish Mahendrakar
bb4b279eb1 Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read
am: b88f59d835

Change-Id: If2e3c4258f8e64918e0ab066c9cc75cf8887c797
2017-01-18 17:32:47 +00:00
Marco Nelissen
4e0cdd450e Merge "Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read" into mnc-dev 2017-01-18 17:25:17 +00:00
Marco Nelissen
b4eb922142 Merge "Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dr-dev
am: 696b6f666c

Change-Id: I189be36f6cefa684e60780d8a9fb8ea56b14440f
2017-01-18 16:41:14 +00:00
Harish Mahendrakar
bfc735cf17 Decoder: Increase memory allocation for weights & offsets for interlaced clips
am: bee9b9a54b

Change-Id: I8c0bd3d77b87e6fb3f982ef70854b8ec73298636
2017-01-18 16:41:13 +00:00
Marco Nelissen
696b6f666c Merge "Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dr-dev 2017-01-18 16:27:26 +00:00
Harish Mahendrakar
001ba00c41 Merge "Decoder: Fixed DoS in header decode when no PPS is present" into mnc-dev am: e74ab7dba4
am: 9c99d74842

Change-Id: I93993f3ab67bcf3bc39feaeef01cf8d6d7b56c14
2017-01-18 00:28:53 +00:00
Harish Mahendrakar
031a3fdbba Decoder: Fixed DoS in header decode when no PPS is present am: 2cd2f7a335
am: cec6503a20

Change-Id: I4cd503fce00a79db877b739a3b8db82e92f37329
2017-01-18 00:28:44 +00:00
Harish Mahendrakar
9c99d74842 Merge "Decoder: Fixed DoS in header decode when no PPS is present" into mnc-dev
am: e74ab7dba4

Change-Id: I430b2a280792584e0c82d85584a13cb43383b67f
2017-01-18 00:26:16 +00:00
Harish Mahendrakar
cec6503a20 Decoder: Fixed DoS in header decode when no PPS is present
am: 2cd2f7a335

Change-Id: If8a7c11ef215a84a350cd0a734bca9c69b91f1c6
2017-01-18 00:26:14 +00:00
TreeHugger Robot
e74ab7dba4 Merge "Decoder: Fixed DoS in header decode when no PPS is present" into mnc-dev 2017-01-18 00:23:33 +00:00
Harish Mahendrakar
b88f59d835 Decoder: Padded gau1_ih264d_top_left_mb_part_indx_mod to avoid an out of bound read
Change-Id: Ie8761de856ed8c7d08f3da61631c1bef446448e6
2017-01-17 16:12:12 -08:00
Harish Mahendrakar
ef27433ca8 Decoder: Fix in checking first_mb_in_slice
Also, increment slice header only if previous slice had atleast one MB
This is to ensure there is no out of bound read for streams with 1 MB, and
due to error 2 slices were being accessed.

Bug: 33982658
Change-Id: I5f1918c09e922ca39f495f6059dfea3fa1d49448
2017-01-17 16:02:35 -08:00
Harish Mahendrakar
bee9b9a54b Decoder: Increase memory allocation for weights & offsets for interlaced clips
Bug: 33816782
Change-Id: I65a5376f46902139f9fc49a2fff54b53b518d703
2017-01-17 15:25:56 -08:00
Harish Mahendrakar
2cd2f7a335 Decoder: Fixed DoS in header decode when no PPS is present
When the input does not contain PPS and decoder is in header decode
mode, decoder was entering an infinite loop.

Bug: 33621215
(cherry picked from commit 33e1b190d6db09bd72a9f0f51acef4b14eabd6ff)
2017-01-17 15:25:13 -08:00
Harish Mahendrakar
74f03b639e DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips
Bug: 33816782
Change-Id: I10f8b2a7691aeb55365901c166e765ab22ec6106
2017-01-17 23:25:11 +00:00
Marco Nelissen
57345397eb Merge "Decoder: Fixed number of MB calculation for interlaced error streams" into mnc-dev am: c4f317b873
am: f353a610f3

Change-Id: I1bae300154cd3fff6abf3e94437c9953259afd4a
2017-01-17 20:37:04 +00:00
Harish Mahendrakar
ba9af1da5d Decoder: Fixed number of MB calculation for interlaced error streams am: e1cf7ea8ae
am: 4e7779e0ef

Change-Id: Id863990ebc1984eb726aa8d004febf235fdcc582
2017-01-17 20:36:57 +00:00
Marco Nelissen
f353a610f3 Merge "Decoder: Fixed number of MB calculation for interlaced error streams" into mnc-dev
am: c4f317b873

Change-Id: I1b82e26ba6272edc8c58faf4d543bebd001169d1
2017-01-17 20:34:29 +00:00
Harish Mahendrakar
4e7779e0ef Decoder: Fixed number of MB calculation for interlaced error streams
am: e1cf7ea8ae

Change-Id: If723b1da6adf7a816c095f327023853bcaccd0c5
2017-01-17 20:34:28 +00:00
Marco Nelissen
c4f317b873 Merge "Decoder: Fixed number of MB calculation for interlaced error streams" into mnc-dev 2017-01-17 20:27:24 +00:00
Harish Mahendrakar
1d5640f2f9 Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases
Bug: 34097213
Bug: 33641588
Change-Id: I40a6c5af7f1e46e1623ae1b399db3073123390fe
2017-01-17 09:39:50 -08:00
Harish Mahendrakar
9f0eec950d Decoder: Fixed an out of bound access while parsing SEI am: 99a85bb469
am: 1a77185504

Change-Id: I8044c1d6b8b966e1d95015aeeacf4cee45d7a4c3
2017-01-14 00:29:41 +00:00
Harish Mahendrakar
1a77185504 Decoder: Fixed an out of bound access while parsing SEI
am: 99a85bb469

Change-Id: I81440daff1ec1ff71dedb40e231e0b596de9a6fd
2017-01-14 00:27:40 +00:00