fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
443 Commits 10 Branches 11 Tags 11 MiB
Commit Graph

443 Commits

Author SHA1 Message Date
Xin Li b857efbb10 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master 
Bug: 120502534
Change-Id: I4c81feb609ac0590877ce923099d3ae63577857d
 2018-12-11 20:26:37 +00:00
Bill Rassieur 33acbd97b6 Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG: 120448245 
Change-Id: I1d3ce7e7d198f3256d3ecbd932f8d6f9977ba16d
 2018-12-04 16:59:15 +00:00
Fraunhofer IIS FDK 6e4fe2e06b Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" 
am: d2be744af2

Change-Id: I780b6c3791bd9bc70fa11a6990cb95a2e5d5ae7c
 2018-11-29 10:56:23 -08:00
Treehugger Robot d2be744af2 Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" 2018-11-29 18:43:33 +00:00
Bill Yi a342c8b68c Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release 
Change-Id: If3ff263d4f628f2c6d4ad3c28d0571284ca1f56d
 2018-11-28 18:34:17 -08:00
Fraunhofer IIS FDK 24648cbd4f Integer overflow fix in InvMdctTransformLowDelay_fdk() 
Bug: 112892194
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I47fdb5b51afd8c588607bf206d4ae3ef4ba1cdb3
 2018-11-28 18:09:43 -05:00
Fraunhofer IIS FDK 9cfaf0cd45 Merge "Add sanity check for allowed LPD sampling rate." 
am: b8a384b0cd

Change-Id: Iedcbbbee9ffc6b27cbc2f114b110974320f9044b
 2018-11-28 13:35:05 -08:00
Treehugger Robot b8a384b0cd Merge "Add sanity check for allowed LPD sampling rate." 2018-11-28 21:21:41 +00:00
Fraunhofer IIS FDK c6b4af4a6c Add sanity check for allowed LPD sampling rate. 
Bug: 112662981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I0702024adc07ed463db795dd48f4efd3de1d7896
Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
 2018-11-28 19:15:09 +00:00
Fraunhofer IIS FDK 36b3869e2c Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." 
am: 0695cff3dd

Change-Id: I053e082c034f33ef79aa42afc0e7bf04f6454cc2
 2018-11-27 12:38:58 -08:00
Treehugger Robot 0695cff3dd Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." 2018-11-27 20:26:33 +00:00
Fraunhofer IIS FDK c580437d7c Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." 
am: 0a1e3b6ef9

Change-Id: I2469e802965d3d974ca09a8c911d0d26f09e6700
 2018-11-27 11:04:20 -08:00
Treehugger Robot 0a1e3b6ef9 Merge "Unsigned Integer Overflow in aacDecoder_DecodeFrame()." 2018-11-27 18:44:28 +00:00
Fraunhofer IIS FDK 692cb872b3 Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()." 
am: 652432830a

Change-Id: Ic2c58ee86f479f406d519418f52800618a6e80ff
 2018-11-27 10:10:05 -08:00
Treehugger Robot 652432830a Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()." 2018-11-27 17:55:22 +00:00
Fraunhofer IIS FDK b325367b33 Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader(). 
Bug: 112661893
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I5994a55f993835fa511ff61a337726b3e51aed5d
 2018-11-27 12:34:42 -05:00
Fraunhofer IIS FDK eb0711921b Unsigned Integer Overflow in aacDecoder_DecodeFrame(). 
Bug: 112661742
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I617dd545f9ea0aca5a5e7d214bbc35f089bc355d
 2018-11-27 12:30:10 -05:00
Fraunhofer IIS FDK ac56cddd1f Merge "Fix huffman decoder escape sequence length limitation." 
am: a4d6ca7b07

Change-Id: I6cac7c525c4b5c5afca58ac6ab3d2c8925fc343e
 2018-11-05 15:09:12 -08:00
Treehugger Robot a4d6ca7b07 Merge "Fix huffman decoder escape sequence length limitation." 2018-11-05 22:58:33 +00:00
Fraunhofer IIS FDK 1ac4293f0b Prevent overflow in MPEG-D DRC _setSelectionDataInfo(). 
Bug: 112661687
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I3b90ef7a5168e20766a2574d57d81bb39d2a5fb9
 2018-11-05 15:07:27 -05:00
Fraunhofer IIS FDK f90be06503 Fix huffman decoder escape sequence length limitation. 
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Bug: 112661753

Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601
Merged-In: 62623d8d79
 2018-11-05 14:43:14 -05:00
Bill Yi add26c57de [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE 
am: a1c3f92674  -s ours

Change-Id: Ife9cf8d52e066a5575618b2e00eb7ed3c14c65ff
 2018-10-24 16:51:52 -07:00
Bill Yi a1c3f92674 Merge pie-platform-release to aosp-master - DO NOT MERGE 
Change-Id: Iccc6a8552f6ae249487f8fc9dcee8b193327c6f3
 2018-10-24 14:45:34 -07:00
Bill Yi b0cb6303be Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
Change-Id: I040acde299d9f3e7556a2dd9393080aabfa20936
 2018-10-24 09:05:20 -07:00
android-build-team Robot 9ea938f950 Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, 5318499, 5317874, 5317875, 5317876, 5318243, 5318244, 5318537, 5318538, 5318539, 5318540, 5318541, 5318542, 5318543, 5318544, 5318545, 5318546, 5315210, 5317756, 5318557, 5318558, 5318559, 5318560, 5318561, 5318339, 5318547, 5318548, 5318549, 5318562, 5318563, 5318564, 5318565, 5318566, 5318172, 5318173, 5318174, 5318550, 5318401, 5318196, 5317889, 5318175, 5318176, 5318577, 5318578, 5318579, 5318580, 5318581, 5318503, 5318390, 5318505, 5318341, 5318551] into pi-qpr1-release 
Change-Id: Icee0cd3d40cc7982201e0afe5ba0307a936a8796
 2018-10-20 00:20:48 +00:00
Fraunhofer IIS FDK 5e57019525 Prevent out of bounds accesses in lppTransposer() and lppTransposerHBE() 
Bug: 112160868
Test: see poc in bug
Change-Id: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
(cherry picked from commit 4dad829df0)
 2018-10-20 00:17:02 +00:00
Fraunhofer IIS FDK 0e5db9fee9 Unify audio element loop abort criterion in ER syntax 
Bug: 112891548
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Iea56cf804cfb9d396810124c718fc91bdff68392
(cherry picked from commit f2bc07da2e)
 2018-10-20 00:17:00 +00:00
Fraunhofer IIS FDK ce97e7d55e Always check whether given channel config is supported. 
Bug: 112660981
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba
Merged-In: I169161dd31bc624f2cab6be2b4c6518946ed32ba
(cherry picked from commit 25b209f229)
 2018-10-20 00:16:57 +00:00
Jean-Michel Trivi 40676e7cba Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." 
am: fb65c0c24b

Change-Id: I0fcbaf9d5b03272b1a8c4872e6ac02f7c6dc2c3a
 2018-10-12 11:57:26 -07:00
Jean-Michel Trivi fb65c0c24b Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." 2018-10-12 18:33:22 +00:00
Fraunhofer IIS FDK 9db742a7d3 Fix call to function sbrDecoder_Header() through pointer to incorrect function type. 
While testing FDK in Android P DP3 x86 64bit emulator we observed a runtime error.
The function parameter of the callback didn't use a typeless pointer.
Following patch contains a revised sbr decoder callback function with explicit data type cast to be inline with all other callbacks in FDK.

Bug: 112662306
Bug: 116075869
Test: on x86: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Id224de22beaf2eb9631babd838c4c3ceae0a801e
Merged-In: Idc9c44a9755b8151d5c7d8107696f43ac592413b
 2018-10-12 12:02:30 -04:00
Jean-Michel Trivi efe7d49245 Merge "Signed Integer Overflow in DuckerCalcEnergy()" 
am: 78f80da872

Change-Id: If4010115866eeb52033fa361aafdb6665c824471
 2018-10-04 17:15:49 -07:00
Jean-Michel Trivi 78f80da872 Merge "Signed Integer Overflow in DuckerCalcEnergy()" 2018-10-04 23:59:49 +00:00
Fraunhofer IIS FDK b4e3109937 Signed Integer Overflow in DuckerCalcEnergy() 
Bug: 112122038
Bug: 112891546
Test: see b/112122038 for repro stream
Change-Id: I7542e2a9033c2e97bf32e0be3bbc6f48746d28f0
 2018-10-04 14:50:18 -07:00
android-build-team Robot b97c2a93f2 Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-release 
Change-Id: Ib805bf06d51e2a7e6f0d9bf2676dc1f21b6cbb9e
 2018-09-10 23:21:17 +00:00
Fraunhofer IIS FDK 9744e41c40 Prevent bit buffer counter overflow. 
While long-term test we discovered a bit counter overflow in the bit buffer.
The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call.
The following patch completely removes the bit counter and all its obsolete functions.

Bug: 112662184
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7
(cherry picked from commit 15292f7e96)
 2018-09-10 23:19:19 +00:00
Fraunhofer IIS FDK 61381bd0f4 Break audio element loop in case element_count becomes too large. 
Bug: 112891564
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I35f02d23c0cfd620088291a52d9996a0d5a17199
(cherry picked from commit 3347cfb91a)
 2018-09-10 23:19:16 +00:00
Fraunhofer IIS FDK c2208f2a30 Add sampling rate sanity check 
Bug: 112661641
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I8e416fb1501dabda20babd4a28a99ab06950b221
(cherry picked from commit ba00378577)
 2018-09-10 23:19:14 +00: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 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
android-build-team Robot f76ceebf7a Snap for 4807121 from f19e863cce to pi-release 
Change-Id: I8797944fb72a1182a059e75425a8b54b4e8abf51
 2018-05-27 07:25:24 +00: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