aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/master'Martin Storsjo2018-03-063-1/+6
|\
| * Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li2017-12-061-0/+1
| |\
| | * DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-061-0/+1
| |/| | | | | | | | | | | | | Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I66dea07398b42d99d5d1373dbbc6d28752c04193
| | * Merge "Use -Werror in external/aac" am: f38aee2252 am: 82440fab16Chih-Hung Hsieh2017-10-071-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | am: 5a1868a64f Change-Id: I4beb4b05f00077e1c7cbcc5ae197001c6251af09
| | | * Merge "Use -Werror in external/aac" am: f38aee2252Chih-Hung Hsieh2017-10-071-0/+2
| | | |\ | | |_|/ | |/| | | | | | | | | | | | | | am: 82440fab16 Change-Id: I3cee76ab540b54b4ef6d6bdb891fc53fd0ec562d
| * | | Merge "Use -Werror in external/aac"Chih-Hung Hsieh2017-10-071-0/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | am: f38aee2252 Change-Id: I65c18c6eb45de16da43e862068929e9a9695caf7
| | * | Merge "Use -Werror in external/aac"Treehugger Robot2017-10-071-0/+2
| | |\ \
| | | * | Use -Werror in external/aacChih-Hung Hsieh2017-10-061-0/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 66996870 Test: build with WITH_TIDY=1 Exempt-From-Owner-Approval: Colin +2 should be the owner approval Change-Id: I167f73ee9dc5e977fd6976f48732ae1e1fe13c8b
| | | * Make software codecs as VNDKJiyong Park2017-08-101-0/+1
| | |/| | |/| | | | | | | | | | | | | | | | | | am: a4aa860efb Change-Id: I662a0675e67bd421b2b3c02391c25cf38f39d84f
| | | * Make software codecs as VNDKJiyong Park2017-08-071-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Software codecs and their dependencies are marked as VNDK (or just vendor_available:true for static/header libs). Bug: 37343418 Test: build the software codecs with BOARD_VNDK_VERSION=current Change-Id: I9ecedb5a95abc9978ff7ed3538bd2dedec750c7d
| * | Merge "Add OWNERS in external/aac" am: db59691026 am: 6f8a59ff40 am: e10e3d33cfChih-Hung Hsieh2017-06-051-0/+2
| |\| | | | | | | | | | | | | | | | am: 32b8bd3dc9 Change-Id: Icbfbce61951a55c3cfa106bdf0bb7f84da2ca453
| | * Merge "Add OWNERS in external/aac" am: db59691026 am: 6f8a59ff40Chih-Hung Hsieh2017-06-051-0/+2
| |/| | | | | | | | | | | | | | | | am: e10e3d33cf Change-Id: I3b51a11cc119ebc35aab051c21133a1476db5a0a
| | * Merge "Add OWNERS in external/aac" am: db59691026Chih-Hung Hsieh2017-06-051-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | am: 6f8a59ff40 Change-Id: I236f2028ad5ae6e14ee0655456d4d42b785bdc45
| | | * Merge "Add OWNERS in external/aac"Chih-Hung Hsieh2017-06-051-0/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: db59691026 Change-Id: Id365d26e05abceec99ddac2e727483d4b294d63d
| | | | * Merge "Add OWNERS in external/aac"Treehugger Robot2017-06-051-0/+2
| | | |/|
| | | | * Add OWNERS in external/aacChih-Hung Hsieh2017-06-051-0/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: Iacb2e068189b39030a218b6496ca41a0bd4ce7d2
| * | | Merge "Fix not properly handled NULL-pointer access before check in aac lib" ↵liuchao2017-02-232-19/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b0af861f5a am: b0f6b2906e am: ef9be61680 Change-Id: Ibfe81134a2089946800580538775faaa1bbe00ef
| | * | Merge "Fix not properly handled NULL-pointer access before check in aac lib" ↵liuchao2017-02-232-19/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b0af861f5a am: b0f6b2906e Change-Id: I06232a0b0126349e7d4cffff0d9c1eac90eddbb2
| | | * Merge "Fix not properly handled NULL-pointer access before check in aac lib"liuchao2017-02-232-19/+10
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: b0af861f5a Change-Id: Id59fd9de48f99c572fa964d7e60b57312edadece
| * | | | Merge "Linux compilation fix" am: b82c85d0b1 am: 7c8dd3bb93Jakub Pawlowski2017-02-211-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f4bd5f6bd4 Change-Id: I4f054be1c1342296c69748c2e616b07c7bd9401c
| | * | | Merge "Linux compilation fix" am: b82c85d0b1Jakub Pawlowski2017-02-211-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7c8dd3bb93 Change-Id: Ifba0bf717a42c3889ea686d1f46cd0758e61851e
| | | * | Merge "Linux compilation fix"Jakub Pawlowski2017-02-211-0/+4
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | am: b82c85d0b1 Change-Id: I934d6c1b7011453b71c28c9ec64da3f3af865782
| * | | | Merge "Change build config of aac from Android.mk to Android.bp" am: ↵Pavlin Radoslavov2017-01-202-59/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8334e4b410 am: 2eba55c5a8 am: 1679274c9c am: 4910e5a352 Change-Id: I06e73ca6768323110b658548a189a1f69695cc08
| | * | | Merge "Change build config of aac from Android.mk to Android.bp" am: ↵Pavlin Radoslavov2017-01-202-59/+32
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8334e4b410 am: 2eba55c5a8 am: 1679274c9c Change-Id: I17c2d7f5c558e17fc4b579d879160f4d6a6ce587
| | | * \ \ Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410Pavlin Radoslavov2017-01-202-59/+32
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eba55c5a8 Change-Id: I16c8e041daad6f21dd80ec50db52ae488f1b91c5
| | | | * \ \ Merge "Change build config of aac from Android.mk to Android.bp"Pavlin Radoslavov2017-01-202-59/+32
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8334e4b410 Change-Id: I770984561bf97b52e50c83844f4037fccabfdedc
| * | | | | | | Merge "Remove redundant register storage class specifiers" am: ed91226cec ↵Martin Storsjo2016-10-282-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 664e5f2794 am: bfba552d9e am: de03facdb2 Change-Id: Iaeb5b599896e4c640b8902c26cc6e3f7405a1256
| | * | | | | | Merge "Remove redundant register storage class specifiers" am: ed91226cec ↵Martin Storsjo2016-10-282-9/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 664e5f2794 am: bfba552d9e Change-Id: I02d87c067cdcea95ce7ee207da15bf85d5a21e89
| | | * | | | | Merge "Remove redundant register storage class specifiers" am: ed91226cecMartin Storsjo2016-10-282-9/+9
| | |/| | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 664e5f2794 Change-Id: I9d17d79e37bac378e853d6102b26a8c354790957
| * | | | | | Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8 am: 515fb25ef7Martin Storsjo2016-10-184-30/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8124c22bb7 Change-Id: I49295c5d3cba3a7f97c9d9494df59f460c2c195a
| | * | | | | Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8Martin Storsjo2016-10-184-30/+28
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 515fb25ef7 Change-Id: Ic97d0e64efee960f87b2cb7581666b2af05873cd
| * | | | | | | Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: ↵Jean-Michel Trivi2016-09-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 899335d310 am: 79c3cd8b1a am: ca6ae4ffe4 Change-Id: Ia6bbf7532c0058ae716f6243fadf66b032fd7e7b
| * | | | | | | Fix build warningGlenn Kasten2016-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 28026175 Change-Id: Ie8d84f694fcb788e5fb8780b11fa07bb98097ce0
| * | | | | | | Remove redundant parentheses around == comparison operatorGlenn Kasten2016-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 28026175 Change-Id: I61be1ab98d7279d09250ea4b810c5f31886da048
| * | | | | | | Merge "Disable warnings that are not easily fixable" am: 8192b1a am: 2a923c9 ↵Glenn Kasten2016-04-201-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 00fc1c6 am: fb66dce * commit 'fb66dceae5e856648073138305ea59cc4eabf26e': Disable warnings that are not easily fixable Change-Id: I357fd4fd9aa8400c982959a8041d5c243eb3c430
| * \ \ \ \ \ \ \ Merge "Add default case for undefined pointer initialization" am: 9d0179c ↵Glenn Kasten2016-04-201-0/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 27625f2 am: c3f7cf7 am: 0d9ca2d * commit '0d9ca2d051526199e875bcddeb8e8008872188a0': Add default case for undefined pointer initialization Change-Id: If945c473d032adaf2ea548978424b466c7dbed7c
| * \ \ \ \ \ \ \ \ Merge "Left shift of negative int is undefined" am: 6ae5480 am: 2b2e97b am: ↵Glenn Kasten2016-04-201-25/+25
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e34e2b9 am: e95a3bd * commit 'e95a3bd58f2a6e7a67cd22d5dcea44c36024bea2': Left shift of negative int is undefined Change-Id: I6cbd95e96a9ad60273d4b48a6db425c636c33b77
| * \ \ \ \ \ \ \ \ \ resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp am: 2809968Glenn Kasten2016-04-204-7/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 18a9bb8 * commit '18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc': Remove redundant parentheses around == comparison operator Change-Id: If91ecced946588a7d6f48aab5a90e0e8503793b1
| * \ \ \ \ \ \ \ \ \ \ Merge "Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: ↵Jean-Michel Trivi2016-04-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 am: 9000e05228" into nyc-mr1-dev-plus-aosp am: 268c63c4a5 * commit '268c63c4a5c0152e35a76d1f18a9a80978e7b7c4': Change-Id: I30af010261c093ffc9ca92e15df725394de301ba
| * \ \ \ \ \ \ \ \ \ \ \ Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: ↵Jean-Michel Trivi2016-04-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 am: be845a7fc2 am: e0700da0dd * commit 'e0700da0ddb21b339806da80824afef5612f5aec': Fix aacDecoder_drcExtractAndMap() Change-Id: I9a5b538dd148a6958bb294e9bc24755758aea8ab
| * \ \ \ \ \ \ \ \ \ \ \ \ AAC/SBR decoder improvements and bugfixes am: 203e3f2Jean-Michel Trivi2016-04-0926-142/+1237
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3fbcee8 * commit '3fbcee802021fc12db8fd6e9e346a2111fe333a9': AAC/SBR decoder improvements and bugfixes Change-Id: Ic370a51ba08eb6079ab1b74413385e35bf29ecba
| * \ \ \ \ \ \ \ \ \ \ \ \ \ AAC/SBR encoder improvements am: 46ba367Jean-Michel Trivi2016-04-0935-327/+1206
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 125815b * commit '125815b0ed558c72bb019a2d36c662e5e7f7c030': AAC/SBR encoder improvements Change-Id: I4ef0a1959666e21ace6086f184302aed640043f6
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Fix aacDecoder_drcExtractAndMap() am: 4834f01Jean-Michel Trivi2016-04-051-9/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d75233c * commit 'd75233c2da4b49259d2e2de701f326d1a8d897b1': Fix aacDecoder_drcExtractAndMap() Change-Id: Ib64d28f680ed52b98fdaf75e124981abb95ba956
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ SBR/AAC encoder updates, code clean up am: e1c78edJean-Michel Trivi2016-04-0525-215/+227
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 65750ea * commit '65750eae6583754ea9d84fed41dc12d1fc3d73d0': SBR/AAC encoder updates, code clean up Change-Id: Ife18fb3ee2fe76fab1e5ab8256addf5d39834c2f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Remove compiler warnings, revised ARM QMF encoder am: ef30836Jean-Michel Trivi2016-04-0515-328/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0713b4a * commit '0713b4acff1a489e7d49725dc7c5e3dad370b5c8': Remove compiler warnings, revised ARM QMF encoder Change-Id: Ic3e76f0f1f37ff49b46efe5958e19499289db751
* | | | | | | | | | | | | | | | | | | Fix SBR multichannel noiseezicomezigo2017-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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;
* | | | | | | | | | | | | | | | | | | Fix an assertion failure when encoding a particular input at specific bitratesMartin Storsjo2017-12-201-0/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Avoid reading out of bounds due to too large aaIidIndexMappedMartin Storsjo2017-11-201-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 4151/clusterfuzz-testcase-4854089193095168 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
* | | | | | | | | | | | | | | | | | | Fix an assertion failure (avoid division by zero) when encoding a particular ↵Martin Storsjo2017-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input
* | | | | | | | | | | | | | | | | | | Avoid reading out of bounds due to negative aaIccIndexMappedMartin Storsjo2017-10-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 3452/clusterfuzz-testcase-4898065225875456 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 17:12:04 +0000