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
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
ezicomezigo
89aeea5f29
Fix SBR multichannel noise
...
for 5.1 ch, the channel elements are as follows: SCE - CPE - CPE - LFE
and the channel-mapping table for 5.1 ch is :
{ 2, 0, 1, 4, 5, 3,255,255}, /* 5.1ch */
For the last LFE channel, sbr decoder returns error, SBRDEC_UNSUPPORTED_CONFIG;
2017-12-20 18:25:56 +09:00
Martin Storsjo
1b0cec288c
Fix an assertion failure when encoding a particular input at specific bitrates
2017-12-20 10:21:34 +02:00
Xin Li
2045658771
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: a3e0aa5f25 -s ours am: b9fc83e0e9
...
am: 9864473fde
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
2017-12-07 09:05:16 +00:00
Xin Li
b9fc83e0e9
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: a3e0aa5f25
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
2017-12-07 06:18:33 +00:00
Xin Li
990c02cb29
DO NOT MERGE: Merge Oreo MR1 into master
...
am: ea031590ac
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
Martin Storsjo
56c717e223
Avoid reading out of bounds due to too large aaIidIndexMapped
...
Fixes: 4151/clusterfuzz-testcase-4854089193095168
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
2017-11-20 12:36:46 +02: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2017-11-03 19:36:12 +00:00
Jean-Michel Trivi
117691fe59
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
2017-11-03 19:36:01 +00:00
Jean-Michel Trivi
7517e7cd48
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
2017-11-03 19:35:48 +00:00
Jean-Michel Trivi
6f71724cd7
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
2017-11-03 19:35:36 +00:00
Jean-Michel Trivi
ee5b524516
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
2017-11-03 19:33:14 +00:00
Jean-Michel Trivi
5a2ae5cc27
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
2017-11-03 19:33:03 +00:00
Jean-Michel Trivi
083f093d1b
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
2017-11-03 19:32:52 +00:00
Jean-Michel Trivi
e8c8539070
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
2017-11-03 19:32:37 +00:00
Jean-Michel Trivi
840dcf824a
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 51f38b3a6d am: 5285345743 am: 3e28ad2039 am: d948041971 am: 73d49a121c -s ours am: b9d122614f am: 0f6d9ce9fc am: 1ccab9ab52
...
am: 7dd1ec29d4
2017-11-03 19:32:10 +00:00
Jean-Michel Trivi
288f5156d9
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 3b6a14a1e0 am: a1deac7b1a am: bceba8dd97 -s ours am: 7f986a4b77 am: c4c35bf021 am: a855a490fc
...
am: 28ee25cb80
2017-11-03 19:31:58 +00:00
Jean-Michel Trivi
7dd1ec29d4
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 51f38b3a6d am: 5285345743 am: 3e28ad2039 am: d948041971 am: 73d49a121c -s ours am: b9d122614f am: 0f6d9ce9fc
...
am: 1ccab9ab52
2017-11-03 19:29:47 +00:00
Jean-Michel Trivi
28ee25cb80
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 3b6a14a1e0 am: a1deac7b1a am: bceba8dd97 -s ours am: 7f986a4b77 am: c4c35bf021
...
am: a855a490fc
2017-11-03 19:29:36 +00:00
Jean-Michel Trivi
c9026ad89b
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
2017-11-03 19:28:52 +00:00
Jean-Michel Trivi
77aac03fb6
Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb am: e6b649a380
...
am: 902decfc99
2017-11-03 19:28:41 +00:00
Jean-Michel Trivi
a9a123b2fb
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
2017-11-03 19:28:29 +00:00
