aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/master'Martin Storsjo2018-11-061-6/+7
|\
| * Merge "Fix huffman decoder escape sequence length limitation."Treehugger Robot2018-11-051-5/+7
| |\
| | * Fix huffman decoder escape sequence length limitation.Fraunhofer IIS FDK2018-11-051-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 112661753 Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601 Merged-In: 62623d8d797a3d7314834c59ebc785e738965635
| * | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Iccc6a8552f6ae249487f8fc9dcee8b193327c6f3
| | * \ Snap for 4807121 from f19e863cce96cc1e5f4ad7ce512810d5a2843ea6 to pi-releaseandroid-build-team Robot2018-05-272-10/+12
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I8797944fb72a1182a059e75425a8b54b4e8abf51
| | * \ \ Snap for 4801384 from a4d1f0ad52e2cf6f168d2193216602f52033fc27 to pi-releaseandroid-build-team Robot2018-05-2416-126/+150
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Iab0959417db83cdeb3af7ce59ef4d8584a96b8be
| | * \ \ \ Snap for 4773106 from 44ac411683e7cfbfdb1f58e02d54377d709c8dd4 to pi-releaseandroid-build-team Robot2018-05-108-26/+28
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a98f52a42445a8a9cbd9e582612a57d1e277f5d
| | * \ \ \ \ Snap for 4765094 from 9ab67882eca7454dc001e158bc1e6e2219d6650b to pi-releaseandroid-build-team Robot2018-05-0610-31/+55
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iecf0e5905c400a1b43555619b5bf7e1823f15f48
| | * \ \ \ \ \ Snap for 4754571 from 6cfabd35363c3ef5e3b209b867169a500b3ccc3c to pi-releaseandroid-build-team Robot2018-05-01450-84882/+165724
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I130760e1e9a6c00340ae89ffd327f340c236716e
| | * \ \ \ \ \ \ Snap for 4585119 from 6288a1e34c4dede4c2806beb1736ece6580558c7 to pi-releaseandroid-build-team Robot2018-02-050-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id4fc531cb7dc898e8ebe483c5f201bd8f3c86788
| | * \ \ \ \ \ \ \ Snap for 4579913 from 5c37b577ee5af800f8d4cc0cff08549f156fcbff to pi-releaseandroid-build-team Robot2018-02-010-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iddd2f4c623cd958a2e239c22f23196e2407691ac
| | * \ \ \ \ \ \ \ \ Snap for 4545621 from 82e17d87f061014b3c07140fafe78eaaf2fbe39d to pi-releaseandroid-build-team Robot2018-01-141-4/+19
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2910df2b1395c73d6a693199ae38aea499630a7
| | * \ \ \ \ \ \ \ \ \ Snap for 4496165 from 204565877157d578ae6632dd54065a4e9cfcab94 to pi-releaseandroid-build-team Robot2017-12-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93144804d393601719fcc7b3e2c3fc647942a89f
| | * \ \ \ \ \ \ \ \ \ \ Snap for 4434599 from bb75c081ed53b4f01ef202da3799a92705acfde0 to pi-releaseandroid-build-team Robot2017-11-051-3/+7
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie027781ff119fe215f492bacc830febaf156d523
| | * \ \ \ \ \ \ \ \ \ \ \ Snap for 4383207 from 15759ceb7bd56575776cd4f789c1c2597d265f5b to pi-releaseandroid-build-team Robot2017-10-071-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c9541a967456c23dd621965cd7e8b9edd39ff85
| | * \ \ \ \ \ \ \ \ \ \ \ \ release-request-0b474cbb-ff20-424d-a570-a0a7b83a7705-for-git_pi-release-4262 ↵android-build-team Robot2017-08-101-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 110 snap-temp-L42700000091449286 Change-Id: I7156dd934b8ce12dc00e2ef192617a0025264117
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect ↵Jean-Michel Trivi2018-10-121-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function type." am: fb65c0c24b Change-Id: I0fcbaf9d5b03272b1a8c4872e6ac02f7c6dc2c3a
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Signed Integer Overflow in DuckerCalcEnergy()"Jean-Michel Trivi2018-10-041-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 78f80da872 Change-Id: If4010115866eeb52033fa361aafdb6665c824471
| * | | | | | | | | | | | | | | | Merge "Suppress -Wimplicit-fallthrough."Chih-hung Hsieh2018-09-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8704782ffd Change-Id: I4712438bc10c81df6fef4d3a8ea6efeae483a6fe
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Merge Android Pie into master" am: 7027cd8748Xin Li2018-08-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6acb615429 Change-Id: I1e133a180eccad7a726a4f37ebbf378a5f15c7a4
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Merge Android Pie into master"Xin Li2018-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7027cd8748 Change-Id: I8af7f0e7c9e5527c66d4f2d75a3e70f620a5ccee
| * | | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6a79fb47e4 Change-Id: Ib9c8ca0370bee684b8b6ae903325ea8f1f1b34d3
* | | | | | | | | | | | | | | | | | | | Saturate additions in FDKaacEnc_IntensityStereoProcessingMartin Storsjo2018-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash when encoding a sample from github issue #98.
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2018-10-163-9/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect ↵Jean-Michel Trivi2018-10-121-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function type."
| | * | | | | | | | | | | | | | | | | | Fix call to function sbrDecoder_Header() through pointer to incorrect ↵Fraunhofer IIS FDK2018-10-121-1/+18
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | Merge "Signed Integer Overflow in DuckerCalcEnergy()"Jean-Michel Trivi2018-10-041-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Signed Integer Overflow in DuckerCalcEnergy()Fraunhofer IIS FDK2018-10-041-8/+10
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112122038 Bug: 112891546 Test: see b/112122038 for repro stream Change-Id: I7542e2a9033c2e97bf32e0be3bbc6f48746d28f0
| * | | | | | | | | | | | | | | | | Merge "Suppress -Wimplicit-fallthrough."Chih-hung Hsieh2018-09-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Suppress -Wimplicit-fallthrough.Chih-Hung Hsieh2018-09-041-0/+1
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wimplicit-fallthrough will be enabled globally. Test: build with global -Wimplicit-fallthrough. Change-Id: I13b4402d9df23a888bdc80be4ce39cd5cd4cff7f
* | | | | | | | | | | | | | | | | Reapply: Avoid reading out of bounds due to too large aaIidIndexMappedMartin Storsjo2018-10-161-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 10726/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5167035365982208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
* | | | | | | | | | | | | | | | | Reapply: Avoid reading out of bounds due to negative aaIccIndexMappedMartin Storsjo2018-09-261-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 10325/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5740113355603968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
* | | | | | | | | | | | | | | | | Remove a duplicate definition of fMax/fMin for x86_64 mingwMartin Storsjo2018-09-031-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIXP_SGL is a typedef for SHORT, so these extra definitions (which only were enabled on x86_64 mingw) were duplicates with the fMin/fMax functions defined for FIXP_SGL right above.
* | | | | | | | | | | | | | | | | Add tighter sanity checks in CBlock_GetEscapeMartin Storsjo2018-09-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't read 31 bits of value here, since that would place the topmost bit in the sign bit. Fixes: 3480/clusterfuzz-testcase-4573445423628288 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
* | | | | | | | | | | | | | | | | Initialize the transport decoder library with TPDEC_PARAM_IGNORE_BUFFERFULLNESSMartin Storsjo2018-09-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to FDKv2, this was what the library used to do. This makes sure that the decoder actually decodes ADTS frames directly if feeding full ADTS frames to the decoder. Previously after FDKv2, the decoder would only start decoding ADTS frames after feeding a few frames.
* | | | | | | | | | | | | | | | | Make sure there are enough bits when reading ADTS header.Doug Benedict2018-09-031-0/+3
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Recognize the MSVC ARM64 compiler arch identificationMartin Storsjo2018-09-021-2/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Replace __attribute__((always_inline)) with FDK_FORCEINLINEMartin Storsjo2018-09-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes compilation for ARM with MSVC.
* | | | | | | | | | | | | | | | | Update Makefile.vc for the new upstream versionMartin Storsjo2018-09-021-53/+126
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Adjust the aac-enc.c encoding example to fix flushing the encoder with FDKv2Martin Storsjo2018-09-021-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even with numInSamples == -1, all the buffer pointers need to be non-null.
* | | | | | | | | | | | | | | | | Bump the version for the project to 2.0.0Martin Storsjo2018-09-022-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump the major version all the way to 2, skipping 1, to sync the major version with what the upstream seems to be using (commit logs talk about "FDKv2").
* | | | | | | | | | | | | | | | | Add an fdk_ prefix to t_qua_gain7bMartin Storsjo2018-09-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes symbol collisions, if libfdk-aac and libopencore-amr are statically linked into the same binary.
* | | | | | | | | | | | | | | | | Reorder source file lists in Makefile.am into alphabetical orderMartin Storsjo2018-09-021-58/+58
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Update Makefile.am after the upstream source updateMartin Storsjo2018-09-021-15/+89
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2018-09-02453-85220/+165810
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-07450-84893/+165806
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Merge Android Pie into masterXin Li2018-08-06450-84893/+165806
| |/| | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112104996 Change-Id: I110b508de124016501bc62120163c58633857438
| | * | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-08450-84893/+165806
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 79597307 Change-Id: Ia98e005208999b395595ef647902768a1199eaa4
| | | * | | | | | | | | | | | | | Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()Fraunhofer IIS FDK2018-05-252-10/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f19e863cce Change-Id: I0e8a97a690f959840fbb3a249e41b260ac87d922
| | | | * | | | | | | | | | | | | Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()Fraunhofer IIS FDK2018-05-252-10/+12
| | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 80314771 Test: play AAC content over 2GB Change-Id: If791305bf95680b945971f9dc5f58495cbf6c8cd
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 01:05:16 +0000