Commit graph

517 commits

Author SHA1 Message Date
Android Build Merger (Role)
8a72f8f4c7 Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev
am: 7ddccbc4ee

Change-Id: I2f91ce93450811bb2cb1fa6ef4b340effaf381ca
2018-01-31 21:22:22 +00:00
TreeHugger Robot
3834932cb0 Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr1.5-dev
* changes:
  [automerger] Decoder: Fixed reset values in parse sps. am: 9c32ad7126 am: 731580450e am: 2b842fb541
  [automerger] Decoder: Fixed reset values in parse sps. am: 9c32ad7126 am: 731580450e
  [automerger] Decoder: Fixed reset values in parse sps. am: 9c32ad7126
  Decoder: Fixed reset values in parse sps.
2018-01-31 21:10:18 +00:00
TreeHugger Robot
7ddccbc4ee Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev
* changes:
  [automerger] Decoder: Fixed reset values in parse sps. am: 9c32ad7126 am: 731580450e
  [automerger] Decoder: Fixed reset values in parse sps. am: 9c32ad7126
  Decoder: Fixed reset values in parse sps.
2018-01-31 21:10:18 +00:00
Android Build Merger (Role)
0f9ee33f0a [automerger] Decoder: Set prev slice type for I slice. am: aecdfd1aff am: 65db3cc9a3 am: 93e93983e1
Change-Id: Iec34f9bb48ef2b1f44254989e8316f721afc587c
2018-01-29 23:19:12 +00:00
Android Build Merger (Role)
93e93983e1 [automerger] Decoder: Set prev slice type for I slice. am: aecdfd1aff am: 65db3cc9a3
Change-Id: I6fd7a970da38a2a8022ce87a5fa978ab85d85ef6
2018-01-29 23:19:11 +00:00
Android Build Merger (Role)
65db3cc9a3 [automerger] Decoder: Set prev slice type for I slice. am: aecdfd1aff
Change-Id: I5397b5635a304040fa8bcbd2999be4b07fcbdc0d
2018-01-29 23:19:09 +00:00
Ritu Baldwa
aecdfd1aff Decoder: Set prev slice type for I slice.
Fixed initialization of u1_pr_sl_type for I slice.

Bug: 70897454
Test: ran PoC before/after patch
Change-Id: I0c37317513b72236be98c2b25482a67bf2b56052
2018-01-29 15:17:19 -08:00
Android Build Merger (Role)
d9a7fe1268 [automerger] Decoder: Fixed reset values in parse sps. am: 9c32ad7126 am: 731580450e am: 2b842fb541
Change-Id: Id319b088ab099d9a8f5afb878c432f42c3575a51
2018-01-18 18:44:20 +00:00
Android Build Merger (Role)
2b842fb541 [automerger] Decoder: Fixed reset values in parse sps. am: 9c32ad7126 am: 731580450e
Change-Id: I12cd5fd84371397b739d20c5cda5155db6933da8
2018-01-18 18:44:19 +00:00
Android Build Merger (Role)
731580450e [automerger] Decoder: Fixed reset values in parse sps. am: 9c32ad7126
Change-Id: Ia8766fd9f4b9a2cb5f7bb13e221d8c0f9b366d66
2018-01-18 18:44:16 +00:00
Ritu Baldwa
9c32ad7126 Decoder: Fixed reset values in parse sps.
Memset to zero whenever new sps occurs.

Bug: 70897394
Test: manual
Change-Id: I5936fd55265ff8ad2b275a72b175cdb540bb7933
2018-01-18 10:43:26 -08:00
Ray Essick
33675f68d6 Merge "Decoder: Adding Error Check for Output Buffer Size in Shared Display Mode." into mnc-dev am: afc729db25 am: 1fb89d8488
am: 56f836a29c

Change-Id: I0a63588b48d7089ec2f2b24357bd36c6f42c2b3e
2018-01-08 22:36:51 +00:00
Ray Essick
56f836a29c Merge "Decoder: Adding Error Check for Output Buffer Size in Shared Display Mode." into mnc-dev am: afc729db25
am: 1fb89d8488

Change-Id: Idf649d14813a04f25267cd68a149ffc79d7b244c
2018-01-08 22:34:54 +00:00
Ray Essick
1fb89d8488 Merge "Decoder: Adding Error Check for Output Buffer Size in Shared Display Mode." into mnc-dev
am: afc729db25

Change-Id: Ic57cdca65a505c45bec9c6ff8dd9b5d9dab5fec7
2018-01-08 22:27:38 +00:00
Ray Essick
afc729db25 Merge "Decoder: Adding Error Check for Output Buffer Size in Shared Display Mode." into mnc-dev 2018-01-08 22:16:23 +00:00
Ritu Baldwa
64df5835a4 Decoder: Fixed memory overflow in shared display mode. am: c3b026a87d am: 0183e8df10
am: 53b26e4caa

Change-Id: I067deb23590912121dc5c5389284a5966b7c4aad
2018-01-08 20:00:37 +00:00
Ritu Baldwa
53b26e4caa Decoder: Fixed memory overflow in shared display mode. am: c3b026a87d
am: 0183e8df10

Change-Id: I2718f4005544d656db108891d8cf01d2a465408f
2018-01-08 19:58:06 +00:00
Ritu Baldwa
0183e8df10 Decoder: Fixed memory overflow in shared display mode.
am: c3b026a87d

Change-Id: I2b1d09b719db6dc4e5ee32be6653b4a64e89ebd5
2018-01-08 19:56:05 +00:00
Ritu Baldwa
c3b026a87d Decoder: Fixed memory overflow in shared display mode.
The factor multiplication should happen only at the source,
not at the destination.

Bug: 71375536
Test: manual
Change-Id: Ib5f00b87150a0533880346fac5464b0b1a802c36
2018-01-05 11:09:27 -08:00
Ritu Baldwa
3692aceb1b Decoder: Adding Error Check for Output Buffer Size in Shared Display Mode.
The output buffer size given by the application, needs to be checked
in every process call. This is required in the case of resolution
change in shared display mode.

Bug: 70294343
Bug: 70350193
Bug: 70526411
Bug: 70526485
Test: manual
Change-Id: I2c1e59425e84ac62a874e5ee180e1b98f0a4058f
2018-01-02 14:25:27 -08:00
Ritu Baldwa
65da9e8e53 Decoder: Modified loop condition while parsing ref_list_reordering. am: 7ea47d575d am: 8d081b93a8
am: ae0dcda477

Change-Id: Ief0c78041bc4f3b81c140332cc8eebea27619e59
2017-12-01 21:05:31 +00:00
Ritu Baldwa
ae0dcda477 Decoder: Modified loop condition while parsing ref_list_reordering. am: 7ea47d575d
am: 8d081b93a8

Change-Id: Ideee6811b41224149d3f0d8bdfbd01d2e35ae0cc
2017-12-01 21:03:27 +00:00
Ritu Baldwa
8d081b93a8 Decoder: Modified loop condition while parsing ref_list_reordering.
am: 7ea47d575d

Change-Id: Icb916758da995402e81f4570e1325a761041cd14
2017-12-01 21:01:58 +00:00
Ritu Baldwa
7ea47d575d Decoder: Modified loop condition while parsing ref_list_reordering.
When ref_pic_list_reordering_flag_l1 is equal to 1, the number of times
that reordering_of_pic_nums_idc is not equal to 3 following
ref_pic_list_reordering_flag_l1 should not exceed
num_ref_idx_l1_active_minus1 + 1.

Bug: 69478425
Change-Id: I031bb744869ac8a57f85bb97574832efd0eefc25
2017-11-30 18:15:06 +00:00
Harish Mahendrakar
5448bcea3e Merge "Decoder: Handle dec_hdl memory allocation failure gracefully" into mnc-dr-dev am: ac0d9cecb5
am: f63836fed1

Change-Id: I33c8f851d29112089254f21c13ef630f530ec0bc
2017-11-03 19:03:33 +00:00
Harish Mahendrakar
f63836fed1 Merge "Decoder: Handle dec_hdl memory allocation failure gracefully" into mnc-dr-dev
am: ac0d9cecb5

Change-Id: Ic77edca3f0f9a8dceb0c14cfa7f6c56ca0983581
2017-11-03 19:01:03 +00:00
TreeHugger Robot
ac0d9cecb5 Merge "Decoder: Handle dec_hdl memory allocation failure gracefully" into mnc-dr-dev 2017-11-03 18:57:47 +00:00
Ritu Baldwa
be207cd092 Merge "Decoder: Fixed incorrect use of mmco parameters." into mnc-dev am: 4d0407c0bb am: 3bde3e435c
am: 9247bdc4e7

Change-Id: Iad9be20b5ba3e1bbe09c00678552f85bc764e14f
2017-11-02 23:41:01 +00:00
Ritu Baldwa
9247bdc4e7 Merge "Decoder: Fixed incorrect use of mmco parameters." into mnc-dev am: 4d0407c0bb
am: 3bde3e435c

Change-Id: I2d3a4abf01043e0ff769822e3c401d3e2f6e5667
2017-11-02 23:38:54 +00:00
Ritu Baldwa
3bde3e435c Merge "Decoder: Fixed incorrect use of mmco parameters." into mnc-dev
am: 4d0407c0bb

Change-Id: Iad247fb8d10d2610fe5f8d6bb064fc52b20952ba
2017-11-02 23:36:53 +00:00
TreeHugger Robot
4d0407c0bb Merge "Decoder: Fixed incorrect use of mmco parameters." into mnc-dev 2017-11-02 23:27:42 +00:00
Harish Mahendrakar
7720b3fe3d Decoder: Handle dec_hdl memory allocation failure gracefully
If memory allocation for dec_hdl fails, return gracefully
with an error code. All other allocation failures are
handled correctly.

Bug: 68300072
Test: ran poc before/after
Change-Id: I118ae71f4aded658441f1932bd4ede3536f5028b
2017-11-01 09:57:48 -07:00
Ray Essick
ebb5c8ce01 Merge "DO NOT MERGE Decoder: Increased allocation and added checks in sei parsing." into mnc-dev am: 23e7899124 -s ours am: 235cb0137f -s ours
am: 7fb19b8cd4  -s ours

Change-Id: If94904894bea1c2b744f6df7dea260274eb5270c
2017-10-31 18:58:52 +00:00
Ray Essick
7fb19b8cd4 Merge "DO NOT MERGE Decoder: Increased allocation and added checks in sei parsing." into mnc-dev am: 23e7899124 -s ours
am: 235cb0137f  -s ours

Change-Id: If5597054fa57dd36ac072665039c20ac0a5e7e48
2017-10-31 18:56:53 +00:00
Ray Essick
235cb0137f Merge "DO NOT MERGE Decoder: Increased allocation and added checks in sei parsing." into mnc-dev
am: 23e7899124  -s ours

Change-Id: I6cfb805bdb9378464ca37518b8743ce044584854
2017-10-31 18:54:52 +00:00
Ray Essick
23e7899124 Merge "DO NOT MERGE Decoder: Increased allocation and added checks in sei parsing." into mnc-dev 2017-10-31 18:45:31 +00:00
Hamsalekha S
7a94552676 Decoder: Detect change of mbaff flag in SPS am: d524ba0310 am: c30baf4986
am: 16388ca052

Change-Id: I89d322ef140026da5c7fa997b320e9052f3a114b
2017-10-31 18:06:53 +00:00
Hamsalekha S
a0827a3bb1 Decoder: Increased allocation and added checks in sei parsing. am: f2b70d3537
am: 8d32a711ac

Change-Id: Icfca7e25144ea8e4c6ac7a60da1f84332e3031f7
2017-10-31 18:04:47 +00:00
Hamsalekha S
16388ca052 Decoder: Detect change of mbaff flag in SPS am: d524ba0310
am: c30baf4986

Change-Id: I11dc25d1094e2f7e7e716496e20f5cd4b9f14636
2017-10-31 18:04:46 +00:00
Hamsalekha S
c30baf4986 Decoder: Detect change of mbaff flag in SPS
am: d524ba0310

Change-Id: I818230d7fb1763b54d4920f9000663ec72286b6d
2017-10-31 18:02:16 +00:00
Hamsalekha S
8d32a711ac Decoder: Increased allocation and added checks in sei parsing.
am: f2b70d3537

Change-Id: I4536d51baa6dd0ea8cf679ee591f20f2afd34b07
2017-10-31 18:02:16 +00:00
Hamsalekha S
d524ba0310 Decoder: Detect change of mbaff flag in SPS
Change in Mbaff flag needs re-initialization of NMB group
and other variables in decoder context.

Bug: 64380237
Test: ran poc on ASAN before/after
Change-Id: I0fc65e4dfc3cc2c15528ec52da1782ecec61feab
2017-10-30 14:19:41 -07:00
Ray Essick
27e6efc8ec DO NOT MERGE Decoder: Increased allocation and added checks in sei parsing.
This prevents heap overflow while parsing sei_message.

Bug: 63122634
Test: ran PoC on unpatched/patched
Change-Id: I4785927b68cb17a3ca51e23aeaf96aacacf116d3
Merged-In: I61c1ff4ac053a060be8c24da4671db985cac628c
2017-10-17 15:09:06 -07:00
Hamsalekha S
f2b70d3537 Decoder: Increased allocation and added checks in sei parsing.
This prevents heap overflow while parsing sei_message.

Bug: 63122634
Test: ran PoC on unpatched/patched
Change-Id: I61c1ff4ac053a060be8c24da4671db985cac628c
2017-10-17 15:03:19 -07:00
Ritu Baldwa
3c70b9a190 Decoder: Fixed incorrect use of mmco parameters.
Added extra structure to read mmco values and copied only once per
picture.

Bug: 65735716

Change-Id: I25b08a37bc78342042c52957774b089abce1a54b
2017-10-12 13:41:43 -07:00
Ritu Baldwa
e8235bbcea Merge "DO NOT MERGE Decoder: Modified setting of error code in set flush api." into mnc-dev am: 6a09a35355 -s ours am: b288f51729 -s ours
am: 458c4a866c  -s ours

Change-Id: I4f89fbfa370e568457a436607b93e690083a6f85
2017-10-03 23:05:58 +00:00
Ritu Baldwa
458c4a866c Merge "DO NOT MERGE Decoder: Modified setting of error code in set flush api." into mnc-dev am: 6a09a35355 -s ours
am: b288f51729  -s ours

Change-Id: I673972e25b586ceb6f7c162ef1385dbb47fa3c29
2017-10-03 23:03:19 +00:00
Ritu Baldwa
b288f51729 Merge "DO NOT MERGE Decoder: Modified setting of error code in set flush api." into mnc-dev
am: 6a09a35355  -s ours

Change-Id: I01c0bfe70914107bee7763ec1beec9bd7abbf175
2017-10-03 23:00:59 +00:00
TreeHugger Robot
6a09a35355 Merge "DO NOT MERGE Decoder: Modified setting of error code in set flush api." into mnc-dev 2017-10-03 22:51:37 +00:00
Ritu Baldwa
1541dcc79c DO NOT MERGE Decoder: Modified setting of error code in set flush api.
Fixed incorrect use of ps_dec->pv_dec_out to set error code.

Bug: 66372937
Test: at vendor
Merged-In: Ib04e0b15573b2482c9d5b43c8bc7dd30d8f8efdd
Change-Id: I7b66ee010089399c050a75d6d67feb03da0b8b3e
2017-10-03 14:57:06 -07:00