Commit graph

1346 commits

Author SHA1 Message Date
Ritu Baldwa
e43612817e Merge "Decoder: Fixed incorrect use of mmco parameters." into mnc-dev am: 4d0407c0bb am: 3bde3e435c am: 9247bdc4e7 am: be207cd092 am: 79cc418c53
am: 4b46ed02da

Change-Id: Ic17c86d3d2b35aea75ce38b69197ab44c5a858ec
2017-11-02 23:48:25 +00:00
Ritu Baldwa
4b46ed02da Merge "Decoder: Fixed incorrect use of mmco parameters." into mnc-dev am: 4d0407c0bb am: 3bde3e435c am: 9247bdc4e7 am: be207cd092
am: 79cc418c53

Change-Id: If8de16da446d535e558f93b1a45e1c9ba369cb7e
2017-11-02 23:46:24 +00:00
Ritu Baldwa
79cc418c53 Merge "Decoder: Fixed incorrect use of mmco parameters." into mnc-dev am: 4d0407c0bb am: 3bde3e435c am: 9247bdc4e7
am: be207cd092

Change-Id: I019dd2f426db294f086280df774b580d4d527c47
2017-11-02 23:43:54 +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
Ray Essick
2207401ca1 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 am: ebb5c8ce01 -s ours am: fd87d6685b -s ours
am: b18ce49706  -s ours

Change-Id: If585e7c569c97ccae0ad87ea7561ef9900742eb3
2017-10-31 19:18:25 +00:00
Ray Essick
b18ce49706 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 am: ebb5c8ce01 -s ours
am: fd87d6685b  -s ours

Change-Id: If3b0558c0c60b2396572b20dff767b7638a15ea6
2017-10-31 19:07:56 +00:00
Ray Essick
fd87d6685b 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
am: ebb5c8ce01  -s ours

Change-Id: I4145a1cd0931eb8ac554dda6dc9321328bcc8392
2017-10-31 19:01:20 +00: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
8ffbcc3c8c Decoder: Detect change of mbaff flag in SPS am: d524ba0310 am: c30baf4986 am: 16388ca052 am: 7a94552676 am: e6d5d77d9a
am: 2e965b33b3

Change-Id: I958630a63c2ad84230de2aa73636cb70c7954c89
2017-10-31 18:13:29 +00:00
Hamsalekha S
013d98b763 Decoder: Increased allocation and added checks in sei parsing. am: f2b70d3537 am: 8d32a711ac am: a0827a3bb1 am: cd831159ce
am: 2a3efcfcde

Change-Id: Ifd227cbbeef9e14069dd5c48f1b30bdb6856030c
2017-10-31 18:13:17 +00:00
Hamsalekha S
2e965b33b3 Decoder: Detect change of mbaff flag in SPS am: d524ba0310 am: c30baf4986 am: 16388ca052 am: 7a94552676
am: e6d5d77d9a

Change-Id: I6048ae548b5ad5fe272df8e1853fce6e05215555
2017-10-31 18:11:00 +00:00
Hamsalekha S
2a3efcfcde Decoder: Increased allocation and added checks in sei parsing. am: f2b70d3537 am: 8d32a711ac am: a0827a3bb1
am: cd831159ce

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

Change-Id: I470bd0b4ea2640f18f1957a41dd285f964aaa1ee
2017-10-31 18:07:59 +00:00
Hamsalekha S
cd831159ce Decoder: Increased allocation and added checks in sei parsing. am: f2b70d3537 am: 8d32a711ac
am: a0827a3bb1

Change-Id: I7a686f0252fa8de0bed2f58991ee4351caff8632
2017-10-31 18:07:47 +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
82e6cbe7e2 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 am: e8235bbcea -s ours am: 23d505806b -s ours
am: d570b32872  -s ours

Change-Id: Ib46ed8947b0b5199c5c9a1db120b68016dbe9cac
2017-10-03 23:11:38 +00:00
Ritu Baldwa
d570b32872 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 am: e8235bbcea -s ours
am: 23d505806b  -s ours

Change-Id: Ia9d7fe958960e3d7918e3b61c42c3980c50dcfa1
2017-10-03 23:09:59 +00:00
Ritu Baldwa
23d505806b 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
am: e8235bbcea  -s ours

Change-Id: I34c5addff3c61db5367d7b5017b7d91cebfed4d5
2017-10-03 23:07:54 +00: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
Hamsalekha S
2411d507d4 Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945b1 am: 1b1e6d3ec9 am: 8ec4061310 am: 40d1b833d8 am: 73763b165e
am: e9ec948685

Change-Id: I02529daa59d105732e09d0e7cae38794e9041b3d
2017-10-03 17:46:12 +00:00
Hamsalekha S
e9ec948685 Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945b1 am: 1b1e6d3ec9 am: 8ec4061310 am: 40d1b833d8
am: 73763b165e

Change-Id: Ia96b46ff5c254047eeff4dad62a0429a6d75ddf9
2017-10-03 17:43:45 +00:00
Hamsalekha S
73763b165e Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945b1 am: 1b1e6d3ec9 am: 8ec4061310
am: 40d1b833d8

Change-Id: Id2268e35f95084f7c742587166c84404b979ac7a
2017-10-03 17:41:12 +00:00
Hamsalekha S
40d1b833d8 Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945b1 am: 1b1e6d3ec9
am: 8ec4061310

Change-Id: Ibe841cc94763771c315c3e084b68b5f60045053e
2017-10-03 17:39:11 +00:00
Hamsalekha S
8ec4061310 Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945b1
am: 1b1e6d3ec9

Change-Id: I816a115c239a41b0008eb599fc6ff43b925f15f2
2017-10-03 17:37:11 +00:00
Hamsalekha S
1b1e6d3ec9 Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev
am: 2f1ca945b1

Change-Id: I203d518ad9dc60ea41dfdc88c1903b47398246ba
2017-10-03 17:34:44 +00:00
TreeHugger Robot
2f1ca945b1 Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev 2017-10-03 17:29:09 +00:00
Ritu Baldwa
586344f327 DO NOT MERGE Decoder: Increased memory allocation. am: ed7a63fbcc -s ours am: 848428bb84 am: a838b2f7f8 am: 3a8511dfaa -s ours am: 6d33435d4f
am: 85615c3618

Change-Id: I0755e6ccac2225ca2a292fc25c3c8c985e7993b7
2017-10-03 02:23:49 +00:00
Ritu Baldwa
85615c3618 DO NOT MERGE Decoder: Increased memory allocation. am: ed7a63fbcc -s ours am: 848428bb84 am: a838b2f7f8 am: 3a8511dfaa -s ours
am: 6d33435d4f

Change-Id: I3e3486c795fa2aa28f2dfe2c3b9603c22a931306
2017-10-03 02:21:41 +00:00
Ritu Baldwa
6d33435d4f DO NOT MERGE Decoder: Increased memory allocation. am: ed7a63fbcc -s ours am: 848428bb84 am: a838b2f7f8
am: 3a8511dfaa  -s ours

Change-Id: I4b9ffe70e909cbe045fe915dbaab2fd40e53e437
2017-10-03 02:20:10 +00:00
Ritu Baldwa
3a8511dfaa DO NOT MERGE Decoder: Increased memory allocation. am: ed7a63fbcc -s ours am: 848428bb84
am: a838b2f7f8

Change-Id: I124a6ccba8d2c493bd5b687c104571017c762123
2017-10-03 02:18:11 +00:00
Ritu Baldwa
a838b2f7f8 DO NOT MERGE Decoder: Increased memory allocation. am: ed7a63fbcc -s ours
am: 848428bb84

Change-Id: I9a1f2786dd95521f72ada206b3b6919bee35defd
2017-10-03 02:15:41 +00:00
Ritu Baldwa
848428bb84 DO NOT MERGE Decoder: Increased memory allocation.
am: ed7a63fbcc  -s ours

Change-Id: If11a724e3eeffc4183106f6e4c1ae6b45b0e8ac7
2017-10-03 02:13:56 +00:00