Jean-Michel Trivi
a083f27afb
Merge "Break audio element loop in case element_count becomes too large." into pi-dev
...
am: 4d801e44ba
Change-Id: I292c02e17ccea89968214f59f3a8dcfd7af4fbb2
2018-09-06 14:34:34 -07:00
Jean-Michel Trivi
4d801e44ba
Merge "Break audio element loop in case element_count becomes too large." into pi-dev
2018-09-06 21:15:30 +00:00
Fraunhofer IIS FDK
646ead1a65
Merge "Prevent overflow in concealment clipping check" into pi-dev
...
am: b3ea08e059
Change-Id: I70d38eed9d6d6e52bcf00752c482ce92eddf6497
2018-09-06 13:22:37 -07:00
Fraunhofer IIS FDK
4d1f3e3cfb
Add sampling rate sanity check
...
am: ba00378577
Change-Id: I9173c64ea2386a987aa563fc89bdaa7652f649b0
2018-09-06 13:21:58 -07:00
TreeHugger Robot
b3ea08e059
Merge "Prevent overflow in concealment clipping check" into pi-dev
2018-09-06 20:17:07 +00:00
Fraunhofer IIS FDK
f44b50b835
Prevent overflow in concealment clipping check
...
Bug: 112890225
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ie386e4b6fe5cdb38180f673edde8f84c36c7b522
2018-09-05 15:03:18 -07:00
Fraunhofer IIS FDK
3347cfb91a
Break audio element loop in case element_count becomes too large.
...
Bug: 112891564
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
2018-09-05 14:54:44 -07:00
Fraunhofer IIS FDK
ba00378577
Add sampling rate sanity check
...
Bug: 112661641
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221
2018-09-05 14:05:32 -07:00
Chih-hung Hsieh
5caf4ae2e9
Merge "Suppress -Wimplicit-fallthrough." am: 8704782ffd
...
am: fa1ce53961
Change-Id: I17099cda4a919b28aab856fffbb843609bf56cf9
2018-09-05 09:50:56 -07:00
Chih-hung Hsieh
fa1ce53961
Merge "Suppress -Wimplicit-fallthrough."
...
am: 8704782ffd
Change-Id: I4712438bc10c81df6fef4d3a8ea6efeae483a6fe
2018-09-05 09:42:47 -07:00
Chih-hung Hsieh
8704782ffd
Merge "Suppress -Wimplicit-fallthrough."
2018-09-05 16:30:42 +00:00
Chih-Hung Hsieh
96ed252649
Suppress -Wimplicit-fallthrough.
...
-Wimplicit-fallthrough will be enabled globally.
Test: build with global -Wimplicit-fallthrough.
Change-Id: I13b4402d9df23a888bdc80be4ce39cd5cd4cff7f
2018-09-04 14:20:04 -07:00
Xin Li
fa9b252972
Merge "Merge Android Pie into master" am: 7027cd8748
am: 6acb615429
...
am: c382b2dd60
Change-Id: If019fd3b379287c9beb8e4e1419e5a2ec530c160
2018-08-07 20:45:13 -07:00
Xin Li
c382b2dd60
Merge "Merge Android Pie into master" am: 7027cd8748
...
am: 6acb615429
Change-Id: I1e133a180eccad7a726a4f37ebbf378a5f15c7a4
2018-08-07 17:03:12 -07:00
Xin Li
6acb615429
Merge "Merge Android Pie into master"
...
am: 7027cd8748
Change-Id: I8af7f0e7c9e5527c66d4f2d75a3e70f620a5ccee
2018-08-07 13:25:27 -07:00
Xin Li
7027cd8748
Merge "Merge Android Pie into master"
2018-08-07 16:51:25 +00:00
Xin Li
0757f38b01
Merge Android Pie into master
...
Bug: 112104996
Change-Id: I110b508de124016501bc62120163c58633857438
2018-08-06 16:50:14 -07:00
Xin Li
506b9834d6
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
am: 6a79fb47e4
Change-Id: Ib9c8ca0370bee684b8b6ae903325ea8f1f1b34d3
2018-06-09 01:50:13 -07:00
Xin Li
6a79fb47e4
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
Bug: 79597307
Change-Id: Ia98e005208999b395595ef647902768a1199eaa4
2018-06-08 11:06:57 -07:00
Fraunhofer IIS FDK
1f93990cfc
Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()
...
am: f19e863cce
Change-Id: I0e8a97a690f959840fbb3a249e41b260ac87d922
2018-05-25 19:06:33 -07:00
Fraunhofer IIS FDK
f19e863cce
Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()
...
Bug: 80314771
Test: play AAC content over 2GB
Change-Id: If791305bf95680b945971f9dc5f58495cbf6c8cd
2018-05-25 15:38:52 -07:00
Fraunhofer IIS FDK
634d4f789c
FDKv2 ubsan patches
...
am: a4d1f0ad52
Change-Id: Ic489768836aae6a9b9cab9e866ecc8b21d819368
2018-05-24 07:24:02 -07:00
Fraunhofer IIS FDK
a4d1f0ad52
FDKv2 ubsan patches
...
Bug: 80053205
Test: see bug for repro with FB "wow"
atest DecoderTestAacDrc
Fix signed integer overflows in CLpc_SynthesisLattice()
Change-Id: Icbddfcc8c5fc73382ae5bf8c2a7703802c688e06
Fix signed integer overflows in imlt
Change-Id: I687834fca2f1aab6210ed9862576b4f38fcdeb24
Fix overflow in addLowbandEnergies()
Change-Id: Iaa9fdf9deb49c33ec6ca7ed3081c4ddaa920e9aa
Concealment fix for audio frames containing acelp components
Change-Id: Ibe5e83a6efa75a48f729984a161a76b826878f4e
Fix out-of-bounds access in PS concealment
Change-Id: I08809a03a40d1feaf00e41278db314d67e1efe88
Fix potential memory leak in setup of qmf domain
Change-Id: Id9fc2448354dc7f1b439469128407305efa3def2
Reject channel config 13
Change-Id: Idf5236f6cd054df994e69c9c972c97f6768cf9e5
Fix unsigned integer overflow in configExtension()
Change-Id: I8a1668810b85e6237c3892891444ff08f04b019b
Fix unsigned integer overflow in CAacDecoder_DecodeFrame()
Change-Id: I79678c571690178e6c37680f70a9b94dd3cbc439
Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()
Change-Id: I3bff959da9f53fabb18cd0ae6c260e6256194526
Fix unsigned integer overflow in transportDec_readStream()
Change-Id: I6a6f9f4acaa32fae0b5de9641f8787bbc7f8286b
2018-05-23 12:19:40 -07:00
Fraunhofer IIS FDK
57d474b424
FDK patches: fix overflows in decoder out-of-band config
...
am: 44ac411683
Change-Id: I8b82f2a074eac9906d6e7badaf1cbb449ad13bdf
2018-05-09 17:14:10 -07:00
Fraunhofer IIS FDK
44ac411683
FDK patches: fix overflows in decoder out-of-band config
...
Bug: 71430241
Bug: 79220129
Test: cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases -t android.media.cts.DecoderTestXheAac
cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases -t android.media.cts.DecoderTestAacDrc
Unsigned Integer Overflows in CDataStreamElement_Read()
Change-Id: Ic2f5b3ae111bf984d4d0db664823798957b0a979
Unsigned Integer Overflow in CProgramConfig_ReadHeightExt()
Change-Id: Iaebc458bb59504203e604a28ed6d5cecaa875c42
Unsigned Integer Overflow in transportDec_OutOfBandConfig()
Change-Id: I24a4b32d736f28c55147f0e2ca06fe5537da19c2
Unsigned Integer Overflows in CDKcrcEndReg() & crcCalc()
Change-Id: I6ebbe541a4d3b6bacbd5ace17264972951de7ca8
Unsigned Integer Overflows in ReadPsData()
Change-Id: Id36576fe545236860a06f17971494ecd4484c494
Unsigned Integer Overflow in SpatialDecParseSpecificConfig()
Change-Id: Ib468f129a951c69776b88468407f008ab4cfd2c7
Unsigned Integer Overflows in _readUniDrcConfigExtension() & _readLoudnessInfoSetExtension()
Change-Id: Ibcf7c6a23af49239206ea9301c58adac36e3ceba
2018-05-09 15:15:28 -07:00
Fraunhofer IIS FDK
259a3c5bd5
FDKv2 additional fixes
...
am: 9ab67882ec
Change-Id: Ia2ecfc503d1c2a429ad1c7dd5103263c02691a56
2018-05-04 17:25:53 -07:00
Fraunhofer IIS FDK
9ab67882ec
FDKv2 additional fixes
...
Bug: 71430241
Bug: 79220129
Test: cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases -t android.media.cts.DecoderTestXheAac
cts-tradefed run commandAndExit cts-dev -m CtsMediaTestCases -t android.media.cts.DecoderTestAacDrc
Add restriction to call intensity stereo tool only for applicable configurations
Change-Id: I30ec6640bd484c56cc9d5b8b35186fc1c875e021
Fix high band energy calculation in sbr encoder
Change-Id: I964dd46fab2ed797c440a983512bbab7e1aff98a
Fix out-of-bounds read access in noiseless coder
Change-Id: I9a669435dbdca421ff9e4affec57811002d75b3b
Use temporary buffer for dummy parsing to check presence of audioPreroll data
Change-Id: I2d42c5c8deddde34351c3d2858b9fe196b3a0906
Set applyAsc to 1 in case that the ASC parsing fails
Change-Id: I552a8b960270bc18cae459ad28a3ba241035668e
Parametric stereo together with mps not supported
Change-Id: Icde14a2774a4303bb0c41046861a59d04b624365
Align ssc callback error path for drm
Change-Id: Ie8ecbfa42c702e6df81c1aec532a9ff1e653dac9
Ensure that the bit counter starts at a multiple of TPDEC_SYNCSKIP
Change-Id: I08d69ec361b2e2ed800282e333fd248b4b3ca245
Allow flushing only when audioPreroll is enabled in current and new config
Change-Id: I52e95d75de4bbed692be922a59a23bda58870625
Omit reverse channel mapping in pass through mode
Change-Id: I335e209c29a700cc091be069f1d08e4288b40793
2018-05-04 11:05:58 -07:00
Fraunhofer IIS FDK
df390e3492
Upgrade to FDKv2
...
am: 6cfabd3536
Change-Id: I5abc38a4b00222ae983a057f006b0af9bd61ffb3
2018-04-30 17:22:06 -07:00
Fraunhofer IIS FDK
6cfabd3536
Upgrade to FDKv2
...
Bug: 71430241
Test: CTS DecoderTest and DecoderTestAacDrc
original-Change-Id: Iaa20f749b8a04d553b20247cfe1a8930ebbabe30
Apply clang-format also on header files.
original-Change-Id: I14de1ef16bbc79ec0283e745f98356a10efeb2e4
Fixes for MPEG-D DRC
original-Change-Id: If1de2d74bbbac84b3f67de3b88b83f6a23b8a15c
Catch unsupported tw_mdct at an early stage
original-Change-Id: Ied9dd00d754162a0e3ca1ae3e6b854315d818afe
Fixing PVC transition frames
original-Change-Id: Ib75725abe39252806c32d71176308f2c03547a4e
Move qmf bands sanity check
original-Change-Id: Iab540c3013c174d9490d2ae100a4576f51d8dbc4
Initialize scaling variable
original-Change-Id: I3c4087101b70e998c71c1689b122b0d7762e0f9e
Add 16 qmf band configuration to getSlotNrgHQ()
original-Change-Id: I49a5d30f703a1b126ff163df9656db2540df21f1
Always apply byte alignment at the end of the AudioMuxElement
original-Change-Id: I42d560287506d65d4c3de8bfe3eb9a4ebeb4efc7
Setup SBR element only if no parse error exists
original-Change-Id: I1915b73704bc80ab882b9173d6bec59cbd073676
Additional array index check in HCR
original-Change-Id: I18cc6e501ea683b5009f1bbee26de8ddd04d8267
Fix fade-in index selection in concealment module
original-Change-Id: Ibf802ed6ed8c05e9257e1f3b6d0ac1162e9b81c1
Enable explicit backward compatible parser for AAC_LD
original-Change-Id: I27e9c678dcb5d40ed760a6d1e06609563d02482d
Skip spatial specific config in explicit backward compatible ASC
original-Change-Id: Iff7cc365561319e886090cedf30533f562ea4d6e
Update flags description in decoder API
original-Change-Id: I9a5b4f8da76bb652f5580cbd3ba9760425c43830
Add QMF domain reset function
original-Change-Id: I4f89a8a2c0277d18103380134e4ed86996e9d8d6
DRC upgrade v2.1.0
original-Change-Id: I5731c0540139dab220094cd978ef42099fc45b74
Fix integer overflow in sqrtFixp_lookup()
original-Change-Id: I429a6f0d19aa2cc957e0f181066f0ca73968c914
Fix integer overflow in invSqrtNorm2()
original-Change-Id: I84de5cbf9fb3adeb611db203fe492fabf4eb6155
Fix integer overflow in GenerateRandomVector()
original-Change-Id: I3118a641008bd9484d479e5b0b1ee2b5d7d44d74
Fix integer overflow in adjustTimeSlot_EldGrid()
original-Change-Id: I29d503c247c5c8282349b79df940416a512fb9d5
Fix integer overflow in FDKsbrEnc_codeEnvelope()
original-Change-Id: I6b34b61ebb9d525b0c651ed08de2befc1f801449
Follow-up on: Fix integer overflow in adjustTimeSlot_EldGrid()
original-Change-Id: I6f8f578cc7089e5eb7c7b93e580b72ca35ad689a
Fix integer overflow in get_pk_v2()
original-Change-Id: I63375bed40d45867f6eeaa72b20b1f33e815938c
Fix integer overflow in Syn_filt_zero()
original-Change-Id: Ie0c02fdfbe03988f9d3b20d10cd9fe4c002d1279
Fix integer overflow in CFac_CalcFacSignal()
original-Change-Id: Id2d767c40066c591b51768e978eb8af3b803f0c5
Fix integer overflow in FDKaacEnc_FDKaacEnc_calcPeNoAH()
original-Change-Id: Idcbd0f4a51ae2550ed106aa6f3d678d1f9724841
Fix integer overflow in sbrDecoder_calculateGainVec()
original-Change-Id: I7081bcbe29c5cede9821b38d93de07c7add2d507
Fix integer overflow in CLpc_SynthesisLattice()
original-Change-Id: I4a95ddc18de150102352d4a1845f06094764c881
Fix integer overflow in Pred_Lt4()
original-Change-Id: I4dbd012b2de7d07c3e70a47b92e3bfae8dbc750a
Fix integer overflow in FDKsbrEnc_InitSbrFastTransientDetector()
original-Change-Id: I788cbec1a4a00f44c2f3a72ad7a4afa219807d04
Fix unsigned integer overflow in FDKaacEnc_WriteBitstream()
original-Change-Id: I68fc75166e7d2cd5cd45b18dbe3d8c2a92f1822a
Fix unsigned integer overflow in FDK_MetadataEnc_Init()
original-Change-Id: Ie8d025f9bcdb2442c704bd196e61065c03c10af4
Fix overflow in pseudo random number generators
original-Change-Id: I3e2551ee01356297ca14e3788436ede80bd5513c
Fix unsigned integer overflow in sbrDecoder_Parse()
original-Change-Id: I3f231b2f437e9c37db4d5b964164686710eee971
Fix unsigned integer overflow in longsub()
original-Change-Id: I73c2bc50415cac26f1f5a29e125bbe75f9180a6e
Fix unsigned integer overflow in CAacDecoder_DecodeFrame()
original-Change-Id: Ifce2db4b1454b46fa5f887e9d383f1cc43b291e4
Fix overflow at CLpdChannelStream_Read()
original-Change-Id: Idb9d822ce3a4272e4794b643644f5434e2d4bf3f
Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD()
original-Change-Id: I1ccf77c0015684b85534c5eb97162740a870b71c
Fix unsigned integer overflow in UsacConfig_Parse()
original-Change-Id: Ie6d27f84b6ae7eef092ecbff4447941c77864d9f
Fix unsigned integer overflow in aacDecoder_drcParse()
original-Change-Id: I713f28e883eea3d70b6fa56a7b8f8c22bcf66ca0
Fix unsigned integer overflow in aacDecoder_drcReadCompression()
original-Change-Id: Ia34dfeb88c4705c558bce34314f584965cafcf7a
Fix unsigned integer overflow in CDataStreamElement_Read()
original-Change-Id: Iae896cc1d11f0a893d21be6aa90bd3e60a2c25f0
Fix unsigned integer overflow in transportDec_AdjustEndOfAccessUnit()
original-Change-Id: I64cf29a153ee784bb4a16fdc088baabebc0007dc
Fix unsigned integer overflow in transportDec_GetAuBitsRemaining()
original-Change-Id: I975b3420faa9c16a041874ba0db82e92035962e4
Fix unsigned integer overflow in extractExtendedData()
original-Change-Id: I2a59eb09e2053cfb58dfb75fcecfad6b85a80a8f
Fix signed integer overflow in CAacDecoder_ExtPayloadParse()
original-Change-Id: I4ad5ca4e3b83b5d964f1c2f8c5e7b17c477c7929
Fix unsigned integer overflow in CAacDecoder_DecodeFrame()
original-Change-Id: I29a39df77d45c52a0c9c5c83c1ba81f8d0f25090
Follow-up on: Fix integer overflow in CLpc_SynthesisLattice()
original-Change-Id: I8fb194ffc073a3432a380845be71036a272d388f
Fix signed integer overflow in _interpolateDrcGain()
original-Change-Id: I879ec9ab14005069a7c47faf80e8bc6e03d22e60
Fix unsigned integer overflow in FDKreadBits()
original-Change-Id: I1f47a6a8037ff70375aa8844947d5681bb4287ad
Fix unsigned integer overflow in FDKbyteAlign()
original-Change-Id: Id5f3a11a0c9e50fc6f76ed6c572dbd4e9f2af766
Fix unsigned integer overflow in FDK_get32()
original-Change-Id: I9d33b8e97e3d38cbb80629cb859266ca0acdce96
Fix unsigned integer overflow in FDK_pushBack()
original-Change-Id: Ic87f899bc8c6acf7a377a8ca7f3ba74c3a1e1c19
Fix unsigned integer overflow in FDK_pushForward()
original-Change-Id: I3b754382f6776a34be1602e66694ede8e0b8effc
Fix unsigned integer overflow in ReadPsData()
original-Change-Id: I25361664ba8139e32bbbef2ca8c106a606ce9c37
Fix signed integer overflow in E_UTIL_residu()
original-Change-Id: I8c3abd1f437ee869caa8fb5903ce7d3d641b6aad
REVERT: Follow-up on: Integer overflow in CLpc_SynthesisLattice().
original-Change-Id: I3d340099acb0414795c8dfbe6362bc0a8f045f9b
Follow-up on: Fix integer overflow in CLpc_SynthesisLattice()
original-Change-Id: I4aedb8b3a187064e9f4d985175aa55bb99cc7590
Follow-up on: Fix unsigned integer overflow in aacDecoder_drcParse()
original-Change-Id: I2aa2e13916213bf52a67e8b0518e7bf7e57fb37d
Fix integer overflow in acelp
original-Change-Id: Ie6390c136d84055f8b728aefbe4ebef6e029dc77
Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()
original-Change-Id: I391ffd97ddb0b2c184cba76139bfb356a3b4d2e2
Adjust concealment default settings
original-Change-Id: I6a95db935a327c47df348030bcceafcb29f54b21
Saturate estimatedStartPos
original-Change-Id: I27be2085e0ae83ec9501409f65e003f6bcba1ab6
Negative shift exponent in _interpolateDrcGain()
original-Change-Id: I18edb26b26d002aafd5e633d4914960f7a359c29
Negative shift exponent in calculateICC()
original-Change-Id: I3dcd2ae98d2eb70ee0d59750863cbb2a6f4f8aba
Too large shift exponent in FDK_put()
original-Change-Id: Ib7d9aaa434d2d8de4a13b720ca0464b31ca9b671
Too large shift exponent in CalcInvLdData()
original-Change-Id: I43e6e78d4cd12daeb1dcd5d82d1798bdc2550262
Member access within null pointer of type SBR_CHANNEL
original-Change-Id: Idc5e4ea8997810376d2f36bbdf628923b135b097
Member access within null pointer of type CpePersistentData
original-Change-Id: Ib6c91cb0d37882768e5baf63324e429589de0d9d
Member access within null pointer FDKaacEnc_psyMain()
original-Change-Id: I7729b7f4479970531d9dc823abff63ca52e01997
Member access within null pointer FDKaacEnc_GetPnsParam()
original-Change-Id: I9aa3b9f3456ae2e0f7483dbd5b3dde95fc62da39
Member access within null pointer FDKsbrEnc_EnvEncodeFrame()
original-Change-Id: I67936f90ea714e90b3e81bc0dd1472cc713eb23a
Add HCR sanity check
original-Change-Id: I6c1d9732ebcf6af12f50b7641400752f74be39f7
Fix memory issue for HBE edge case with 8:3 SBR
original-Change-Id: I11ea58a61e69fbe8bf75034b640baee3011e63e9
Additional SBR parametrization sanity check for ELD
original-Change-Id: Ie26026fbfe174c2c7b3691f6218b5ce63e322140
Add MPEG-D DRC channel layout check
original-Change-Id: Iea70a74f171b227cce636a9eac4ba662777a2f72
Additional out-of-bounds checks in MPEG-D DRC
original-Change-Id: Ife4a8c3452c6fde8a0a09e941154a39a769777d4
Change-Id: Ic63cb2f628720f54fe9b572b0cb528e2599c624e
2018-04-19 11:21:15 -07:00
Android Build Merger (Role)
6288a1e34c
[automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0
am: fed4ae1115
am: 45ca1d7199
am: 31fac02b0e
...
am: 29870460c6
-s ours
Change-Id: Ifb2b9cb8ef0a7311d11c22aa9e3eab9b7511705c
2018-02-02 14:56:03 +00:00
Android Build Merger (Role)
bdea4742b7
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6
am: 4b684c6690
skipped: 000fe3d02d
am: dcbb54a6ec
am: 67e9a995ce
am: fec52a666d
...
am: 88d43f631a
-s ours
Change-Id: Idf901fae7d4b3a6ebfdf43c4a078ea81635b44de
2018-02-02 14:55:56 +00:00
Android Build Merger (Role)
d8828f3450
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe
am: fce9663d6f
am: 658a02f977
am: 243be669b3
skipped: c2fe4b944b
am: c54946e671
am: f1a2354a3a
am: d6b29883ff
...
am: 1ce9a79b52
-s ours
Change-Id: I1ef94896496b3ebe14a7befed9d80de95de636aa
2018-02-02 14:55:49 +00:00
Android Build Merger (Role)
315bfca5c1
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0
am: 64b670e10a
skipped: 43323dd03f
am: e78aa83b8f
am: 5944cdf5b0
am: 0a9ef8a138
am: 601d27b59d
skipped: 2494f9fa12
am: bae005cba3
am: b81d554ba6
am: fa62928801
...
am: 53daa4e90c
-s ours
Change-Id: I216f295d4fc0ef52f763e1fd8b93da2080c8f572
2018-02-02 14:55:41 +00:00
Android Build Merger (Role)
3be49fd8fe
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12
am: 99f3e5ce05
am: c48482d937
skipped: 81ea4ba91d
am: 46ead43c76
am: 0bbb81398c
am: bd4b66c1a9
am: 464c4336ad
skipped: 233344c45c
am: bb38f901b4
am: e12ed0c4fb
am: 27e0af2ad1
...
am: 9ab6f29ae0
-s ours
Change-Id: I79afffd974b455d192aa1259514ac8c0d8f48202
2018-02-02 14:55:34 +00:00
Jean-Michel Trivi
9f487b9566
Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a
am: 991036b9f8
am: 78b29903f9
...
am: a6034001a4
Change-Id: I7902e224bb04f044c52323c55054503d15069610
2018-02-02 14:55:25 +00:00
Android Build Merger (Role)
29870460c6
[automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0
am: fed4ae1115
am: 45ca1d7199
...
am: 31fac02b0e
Change-Id: Id4466d91efbbbea558c16463fa42c77ff157c519
2018-02-02 06:59:34 +00:00
Android Build Merger (Role)
88d43f631a
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6
am: 4b684c6690
skipped: 000fe3d02d
am: dcbb54a6ec
am: 67e9a995ce
...
am: fec52a666d
Change-Id: I86182e0f6471b424c5ff47d109986a2c27834f89
2018-02-02 06:59:24 +00:00
Android Build Merger (Role)
1ce9a79b52
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe
am: fce9663d6f
am: 658a02f977
am: 243be669b3
skipped: c2fe4b944b
am: c54946e671
am: f1a2354a3a
...
am: d6b29883ff
Change-Id: I1432c9e013fae8ec830ea44d094d63174dde4785
2018-02-02 06:59:12 +00:00
Android Build Merger (Role)
53daa4e90c
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0
am: 64b670e10a
skipped: 43323dd03f
am: e78aa83b8f
am: 5944cdf5b0
am: 0a9ef8a138
am: 601d27b59d
skipped: 2494f9fa12
am: bae005cba3
am: b81d554ba6
...
am: fa62928801
Change-Id: Idc3d03203794c4307c0fcfdd20e052540eaa9a34
2018-02-02 06:59:02 +00:00
Android Build Merger (Role)
9ab6f29ae0
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12
am: 99f3e5ce05
am: c48482d937
skipped: 81ea4ba91d
am: 46ead43c76
am: 0bbb81398c
am: bd4b66c1a9
am: 464c4336ad
skipped: 233344c45c
am: bb38f901b4
am: e12ed0c4fb
...
am: 27e0af2ad1
Change-Id: I9f2226babdca9c21003e743e920fe994483e3b40
2018-02-02 06:58:49 +00:00
Jean-Michel Trivi
a6034001a4
Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a
am: 991036b9f8
...
am: 78b29903f9
Change-Id: I264187a911014bbb8d0a4420ac4a25f4057f78dc
2018-02-02 06:58:37 +00:00
Android Build Merger (Role)
31fac02b0e
[automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0
am: fed4ae1115
...
am: 45ca1d7199
Change-Id: Ic4a9ac130a9410a7f2bc6a094aba0c0d0085b7b8
2018-02-02 03:42:36 +00:00
Android Build Merger (Role)
fec52a666d
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6
am: 4b684c6690
skipped: 000fe3d02d
am: dcbb54a6ec
...
am: 67e9a995ce
Change-Id: I43b81c7a7f8e1fbe4143b0262eaad72d3286f8da
2018-02-02 03:42:12 +00:00
Android Build Merger (Role)
d6b29883ff
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe
am: fce9663d6f
am: 658a02f977
am: 243be669b3
skipped: c2fe4b944b
am: c54946e671
...
am: f1a2354a3a
Change-Id: I744d3ea898571c5d58329b495f8fc1e9e9cfb730
2018-02-02 03:41:44 +00:00
Android Build Merger (Role)
fa62928801
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0
am: 64b670e10a
skipped: 43323dd03f
am: e78aa83b8f
am: 5944cdf5b0
am: 0a9ef8a138
am: 601d27b59d
skipped: 2494f9fa12
am: bae005cba3
...
am: b81d554ba6
Change-Id: I580587d87c826a2abbc8284fcb787c1f5ce57e4b
2018-02-02 03:41:20 +00:00
Android Build Merger (Role)
27e0af2ad1
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12
am: 99f3e5ce05
am: c48482d937
skipped: 81ea4ba91d
am: 46ead43c76
am: 0bbb81398c
am: bd4b66c1a9
am: 464c4336ad
skipped: 233344c45c
am: bb38f901b4
...
am: e12ed0c4fb
Change-Id: I0b14be2ff82aa5a67bd43398f96c1bc5699ca376
2018-02-02 03:41:01 +00:00
Jean-Michel Trivi
78b29903f9
Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a
...
am: 991036b9f8
Change-Id: I7254dbe5cb685ea86b632dcbf670dea8a0671bf9
2018-02-02 03:40:35 +00:00
Android Build Merger (Role)
45ca1d7199
[automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0
...
am: fed4ae1115
Change-Id: I3bb2c6e954a5d5212c976a1f6e1549a62352423a
2018-02-01 23:40:17 +00:00
Android Build Merger (Role)
67e9a995ce
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6
am: 4b684c6690
skipped: 000fe3d02d
...
am: dcbb54a6ec
Change-Id: I86083377cbd5c4c982d5686e22f620ff288abed2
2018-02-01 23:40:09 +00:00
Android Build Merger (Role)
f1a2354a3a
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe
am: fce9663d6f
am: 658a02f977
am: 243be669b3
skipped: c2fe4b944b
...
am: c54946e671
Change-Id: I888519abe97d8fa1cfdd754b0aa7f74d91b07c54
2018-02-01 23:40:00 +00:00