1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-07 15:18:48 +01:00

425 Commits

Author SHA1 Message Date
Jean-Michel Trivi
378e6c244a Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev
* changes:
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38 skipped: 490995c3c4
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945
  [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e
  DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
2018-02-01 17:27:43 +00:00
android-build-team Robot
58bb6a7b0e Snap for 4579913 from 5c37b577ee5af800f8d4cc0cff08549f156fcbff to pi-release
Change-Id: Iddd2f4c623cd958a2e239c22f23196e2407691ac
2018-02-01 08:52:43 +00:00
Jean-Michel Trivi
5c37b577ee DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381 am: 8765ef76ef am: e9b6807818
am: 78d566fc19  -s ours

Change-Id: Iebff381e12ca0f86c9cb22c856b4c7be3c3a5581
2018-02-01 00:49:21 +00:00
Jean-Michel Trivi
78d566fc19 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381 am: 8765ef76ef
am: e9b6807818

Change-Id: If9c985a1886178b22407791196dee0f8dd8ceafe
2018-01-31 23:05:00 +00:00
Jean-Michel Trivi
e9b6807818 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381
am: 8765ef76ef

Change-Id: Iec8df9cd119dc386d71f38fed7c91c980c596596
2018-01-31 22:38:47 +00:00
Jean-Michel Trivi
8765ef76ef DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
am: 8415da3381

Change-Id: I376dd3bfb42dce66ea2de637277c341aa04a4b14
2018-01-31 21:50:42 +00:00
Jean-Michel Trivi
d9d9c95b48 MPEG-4 AAC Decoder: check against invalid height info am: 772c7f5542
am: b75592cd1a

Change-Id: I0c302d058a8a8a83a53a83a6456fa328d0d6ff91
2018-01-31 21:41:35 +00:00
Jean-Michel Trivi
b75592cd1a MPEG-4 AAC Decoder: check against invalid height info
am: 772c7f5542

Change-Id: Iba7581d349f0ac7cf6a1686347de5993ebaa0c10
2018-01-31 21:29:55 +00:00
Android Build Merger (Role)
6cad71f03e [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38 skipped: 490995c3c4
Change-Id: Ia2560855c28b283d7491e75de27944e4cd6d27f7
2018-01-31 19:48:45 +00:00
Android Build Merger (Role)
490995c3c4 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c am: 5e8b2b0a38
Change-Id: I54012703d606d0a5eb113ee109fc5ec87204bb6a
2018-01-31 19:48:44 +00:00
Android Build Merger (Role)
5e8b2b0a38 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454 am: e94aa9aa3c
Change-Id: I528d8dccae1e59c965dc4fcfae65ace1181886c6
2018-01-31 19:48:39 +00:00
Android Build Merger (Role)
e94aa9aa3c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3 am: 1296b91454
Change-Id: I22ec8d38c1303f98be7f21e6ecce3bcb42ee7e61
2018-01-31 19:48:37 +00:00
Android Build Merger (Role)
1296b91454 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05 am: 14728790d3
Change-Id: I7899630b98b1a7a1c8de7559aaaf9bc44a250c66
2018-01-31 19:48:36 +00:00
Android Build Merger (Role)
14728790d3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489 skipped: b2d0afac05
Change-Id: Ie400d21f7fefabed6c91b4b04880bd80e6153b20
2018-01-31 19:48:35 +00:00
Android Build Merger (Role)
b2d0afac05 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489
Change-Id: I14943f95747e93f1e85cf560fe63fa11b168c9e3
2018-01-31 19:48:34 +00:00
Android Build Merger (Role)
4523eae489 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768
Change-Id: I41f5e9a24af3c7a979c628df1be114185e02a8f7
2018-01-31 19:48:33 +00:00
Android Build Merger (Role)
6dd431c768 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945
Change-Id: I9d3b87e62af0f54c01ced2e3aac41fa8e96cb056
2018-01-31 19:48:31 +00:00
Android Build Merger (Role)
adc8026945 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e
Change-Id: If7874381cdfce6cced128082b35cbd6ab21f709d
2018-01-31 19:48:30 +00:00
android-build-team Robot
626d5345e2 Snap for 4545621 from 82e17d87f061014b3c07140fafe78eaaf2fbe39d to pi-release
Change-Id: Ia2910df2b1395c73d6a693199ae38aea499630a7
2018-01-14 08:44:34 +00:00
Jean-Michel Trivi
772c7f5542 MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-01-13 01:30:08 +00:00
Jean-Michel Trivi
8415da3381 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-01-13 01:29:19 +00:00
Jean-Michel Trivi
4a54666f3e DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-01-13 00:53:27 +00:00
Jean-Michel Trivi
82e17d87f0 MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-01-12 10:08:32 -08:00
android-build-team Robot
38167553d6 Snap for 4496165 from 204565877157d578ae6632dd54065a4e9cfcab94 to pi-release
Change-Id: I93144804d393601719fcc7b3e2c3fc647942a89f
2017-12-11 12:11:19 +00:00
Xin Li
2045658771 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: a3e0aa5f25 -s ours am: b9fc83e0e9
am: 9864473fde  -s ours

Change-Id: I4b949aca22cc3af4afae998a4d1845d113dd62a2
2017-12-08 01:18:01 +00:00
Stephen Li
97ff123fac Manually merge changes from giant AOSP topic
Change-Id: I758f8cd61341d5dfb394245fb38bb9a6332fdc91
2017-12-07 23:52:54 +00:00
Xin Li
9864473fde Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: a3e0aa5f25 -s ours
am: b9fc83e0e9

Change-Id: I62a6e9ad1994e416489ca103a972796c24e1418f
2017-12-07 09:05:16 +00:00
Xin Li
b9fc83e0e9 Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: a3e0aa5f25  -s ours

Change-Id: Ic4b4c468787b5a680e40d8bd915865cc4571ad92
2017-12-07 07:36:49 +00:00
Xin Li
c99b2f0a46 DO NOT MERGE: Merge Oreo MR1 into master am: ea031590ac -s ours
am: 990c02cb29

Change-Id: I64bb1cc03599ca1799afaa35d4c99c1e3411c0ba
2017-12-07 06:18:33 +00:00
Xin Li
990c02cb29 DO NOT MERGE: Merge Oreo MR1 into master
am: ea031590ac  -s ours

Change-Id: Iff2c9429b44a8a7d7455b08018d44b3753964c63
2017-12-07 03:54:02 +00:00
Xin Li
a3e0aa5f25 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:28 +00:00
Xin Li
ea031590ac DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I66dea07398b42d99d5d1373dbbc6d28752c04193
2017-12-06 14:24:45 -08:00
android-build-team Robot
589008f512 Snap for 4434599 from bb75c081ed53b4f01ef202da3799a92705acfde0 to pi-release
Change-Id: Ie027781ff119fe215f492bacc830febaf156d523
2017-11-05 07:32:27 +00:00
Jean-Michel Trivi
bb75c081ed Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993 am: ad2e179de6 am: fb4d8cc62f am: c9026ad89b am: ee5b524516 -s ours am: 47a6f5a741 am: 211208b7a2 am: 433f0352e6
am: eb68748f5e  -s ours

Change-Id: I620c5d963f94a29decd4524f2756182c18bfea03
2017-11-03 19:48:14 +00:00
Jean-Michel Trivi
80fad5a6c1 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380 am: 902decfc99 am: 77aac03fb6 am: 5a2ae5cc27 am: 117691fe59 am: 60c9a6e4c7 am: 565a2fba56
am: 3c6799a870

Change-Id: I5c065e48a043c697c801f84a26bf9dedde9750da
2017-11-03 19:48:03 +00:00
Jean-Michel Trivi
4ccdac99fe DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce am: 67a321cd17 am: 0c25940e1c am: a9a123b2fb am: 083f093d1b -s ours am: 7517e7cd48 am: 0a9273a678 am: 7ae7912813
am: 199e87aa21  -s ours

Change-Id: Ia6ea408b01d32741c3058fa08d1b75e656dda5cd
2017-11-03 19:47:51 +00:00
Jean-Michel Trivi
8efd5242e2 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 am: c7048181c0 am: 849c9b161a am: e8c8539070 -s ours am: 6f71724cd7 am: cb0e7b4d19 am: 412279fc7d
am: a63c4de6a2  -s ours

Change-Id: Ia282631f5457630f0e931ad181b1ef3b58851e3c
2017-11-03 19:47:38 +00:00
Jean-Michel Trivi
eb68748f5e Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993 am: ad2e179de6 am: fb4d8cc62f am: c9026ad89b am: ee5b524516 -s ours am: 47a6f5a741 am: 211208b7a2
am: 433f0352e6

Change-Id: I0828b798bd6203f58bc8fe961a767204d0b6b9db
2017-11-03 19:45:56 +00:00
Jean-Michel Trivi
3c6799a870 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380 am: 902decfc99 am: 77aac03fb6 am: 5a2ae5cc27 am: 117691fe59 am: 60c9a6e4c7
am: 565a2fba56

Change-Id: Ic783461700022ebe1e09db5a9f0f20c08a392e52
2017-11-03 19:45:43 +00:00
Jean-Michel Trivi
199e87aa21 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce am: 67a321cd17 am: 0c25940e1c am: a9a123b2fb am: 083f093d1b -s ours am: 7517e7cd48 am: 0a9273a678
am: 7ae7912813

Change-Id: I6f643d9c75eab8c0556e927179aefa4d95513da4
2017-11-03 19:45:28 +00:00
Jean-Michel Trivi
a63c4de6a2 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 am: c7048181c0 am: 849c9b161a am: e8c8539070 -s ours am: 6f71724cd7 am: cb0e7b4d19
am: 412279fc7d

Change-Id: If717a6498b27732306cba3d09e3bbad25ba30a3e
2017-11-03 19:45:08 +00:00
Jean-Michel Trivi
433f0352e6 Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993 am: ad2e179de6 am: fb4d8cc62f am: c9026ad89b am: ee5b524516 -s ours am: 47a6f5a741
am: 211208b7a2

Change-Id: I8bbb0a392051d2966ac3fd587c6b5236f938b1ab
2017-11-03 19:43:13 +00:00
Jean-Michel Trivi
565a2fba56 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380 am: 902decfc99 am: 77aac03fb6 am: 5a2ae5cc27 am: 117691fe59
am: 60c9a6e4c7

Change-Id: I6551d0525de65b975ccae8abd0569597d9a39c9b
2017-11-03 19:43:02 +00:00
Jean-Michel Trivi
7ae7912813 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce am: 67a321cd17 am: 0c25940e1c am: a9a123b2fb am: 083f093d1b -s ours am: 7517e7cd48
am: 0a9273a678

Change-Id: Icdba42495f11c2dfe96ff97de77c7190f1602a71
2017-11-03 19:42:50 +00:00
Jean-Michel Trivi
412279fc7d DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 am: c7048181c0 am: 849c9b161a am: e8c8539070 -s ours am: 6f71724cd7
am: cb0e7b4d19

Change-Id: Id3307baa195e53b541da87736fcc72888de44bc1
2017-11-03 19:42:37 +00:00
Jean-Michel Trivi
211208b7a2 Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993 am: ad2e179de6 am: fb4d8cc62f am: c9026ad89b am: ee5b524516 -s ours
am: 47a6f5a741

Change-Id: Ia601448b406aaba329133b87b91108fe4cc9c045
2017-11-03 19:39:47 +00:00
Jean-Michel Trivi
60c9a6e4c7 Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380 am: 902decfc99 am: 77aac03fb6 am: 5a2ae5cc27
am: 117691fe59

Change-Id: I28274f0fce7de6992f0c60c000bbecb0f21a3535
2017-11-03 19:39:35 +00:00
Jean-Michel Trivi
0a9273a678 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce am: 67a321cd17 am: 0c25940e1c am: a9a123b2fb am: 083f093d1b -s ours
am: 7517e7cd48

Change-Id: I50823ae367196b85d815b3ed1c6ac1b4c80cdae5
2017-11-03 19:39:22 +00:00
Jean-Michel Trivi
cb0e7b4d19 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 am: c7048181c0 am: 849c9b161a am: e8c8539070 -s ours
am: 6f71724cd7

Change-Id: I02e875f665ed4f7464b59000a4fdee096f71ddf7
2017-11-03 19:39:07 +00:00
Jean-Michel Trivi
47a6f5a741 Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993 am: ad2e179de6 am: fb4d8cc62f am: c9026ad89b
am: ee5b524516  -s ours

Change-Id: Ied7799fd88769b44cbe09b5e12df20f2f9670d50
2017-11-03 19:36:12 +00:00