summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseWonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am: 965f099ecf -s ours am: 242ff48709 -s ours am: d145276a80 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: I7c6424f8948f801eb23878b62e5f4a8ddef36646
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am: d87172fdae -s ours am: 3da9c86d46 -s ours am: decf98abef -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: If7075a27ccf916849f3d22944b768f6440427d66
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am: 965f099ecf -s ours am: 242ff48709 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: I170d458b4221f41cdb734e8f1d8837eac83f68f9
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am: d87172fdae -s ours am: 3da9c86d46 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: Ia34b85c89c2e7a83ca00ac83054b01fb43fb1dca
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am: 965f099ecf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: I7235df93f09ac1e9133dea1e2d69084ff380485a
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am: d87172fdae -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: Ied27aaaa2ef90bc24c320d9ad555539cf083381e
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: Ibbdd0842946fe703428df8fc34efe5c98bd254a1
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: I57cf99c8e91b37fea753de02308201a178e6a5ad
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: I6d305c7e3b3ed4c43bf1ab25f175ce6a2c3d400f
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: I7b21586af0b20a2c87f3669177026278a4c51fe4
2021-10-05[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output ↵Wonsik Kim
buffer am: c3e2eb5966 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: I2f7716319013a50dec20aa1c114c11261393f557
2021-09-27DO NOT MERGE C2SoftMp3Dec: fix OOB write in output bufferWonsik Kim
outputFrameSize, calOutSize and outSize are calculated at 8bit level However, the library expects outputFrameSize in int16 samples. One of the initialization of outputFrameSize was in bytes. This is now corrected. Test: clusterfuzz generated poc in bug Test: atest android.mediav2.cts.CodecDecoderTest Test: atest VtsHalMediaC2V1_0TargetAudioDecTest Bug: 193363621 Change-Id: Iac62c4e9d77e7f95f2c692f5ea236e7a5c536dcb
2021-06-24EAF, Enable EAF on 1080P resolution(Codec side) am: a20206ab1cCharles Chiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/14440519 Change-Id: I2bfeabf06f1883bdb5fee4d4fb8cecdd54e463f1
2021-05-19EAF, Enable EAF on 1080P resolution(Codec side)android12-devCharles Chiu
Investigation purpose, For ECO service 1.0 spec, the support input frame size of ECO is limited <= 720P https://source.corp.google.com/aosp-android11/hardware/google/av/media/eco/ECOSession.cpp;l=59?q=createECOSession We could remove limitation here and do the some evaluation. Test: GCA Bug: 187359844 Change-Id: I97a1c96def7a800ce0b079029af5d3314a43961f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9e7f664d88 -s ↵Xin Li
ours am: 53c8ca1059 -s ours am skip reason: Change-Id I4678f1784771d6ead08c13d662fd43f1fda48ef2 with SHA-1 56d045b052 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I731c4710c9c478d628c6e3ca497d86cde8d4a68f
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/av am: a172cfd55a am: ↵Bob Badour
2ec36f033a am: cc3e9f4010 Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1588478 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62d9a6fe9169e592f73c0825b26bf79663d10c1e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9e7f664d88 -s oursXin Li
am skip reason: Change-Id I4678f1784771d6ead08c13d662fd43f1fda48ef2 with SHA-1 56d045b052 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id2ae6aaadbbd87c21881b18b4474ae40b724659e
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I4678f1784771d6ead08c13d662fd43f1fda48ef2 Change-Id: Ib103e1467adaffd5c411e7fe885815d8be179ca2
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/av am: a172cfd55a am: ↵Bob Badour
2ec36f033a Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1588478 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0930ff1b69927edeac18532e7d8620631b900412
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/av am: a172cfd55aBob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1588478 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5f66d6a1276f0face32177bc30e4477503e8b291
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/avBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp media/eco/Android.bp media/eco/tests/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic2d7e496cad847b0004206d2fe0820e2e1421f59
2020-12-08ECOService: Support C2Config parameters convert to ECOServiceConstantswenchangliu
Bug: 158313935 Test: atest VideoEncoderTest#testH264Surf720p30fps4Mbps Change-Id: Ief093071587e1a9062ae0002e317d3c07ecb38cd
2020-12-08ECOService: Implement Stats Providerwenchangliu
Bug: 158313935 Test: atest VideoEncoderTest#testH264Surf720p30fps4Mbps Change-Id: Icd2ae595320fee436deb91c79290593b17ba2e49
2020-11-25Mark ab/6881855 as merged am: df0020cf1e am: 56d045b052Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/13112997 Change-Id: Ica333c748d6dc32ced337410cb9c5d9f9a008118
2020-11-25Mark ab/6881855 as merged am: df0020cf1eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/13112997 Change-Id: I4678f1784771d6ead08c13d662fd43f1fda48ef2
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: If9a6748f7aefb5b0b03be2cc58bf902f7de8ab5e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 90113012c2 -s ours am: ↵Xin Li
f7220acd73 -s ours am: d56061794e -s ours am skip reason: Change-Id I73aeaa05bee765e29d9ee32b083a7f0df8a089c4 with SHA-1 229df8f6c9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/12796869 Change-Id: I78f636a939cde7e2710104249ec17c48dcddb08d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 90113012c2 -s ours am: ↵Xin Li
f7220acd73 -s ours am skip reason: Change-Id I73aeaa05bee765e29d9ee32b083a7f0df8a089c4 with SHA-1 229df8f6c9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/12796869 Change-Id: Ic240be51aba53cff9a502afb8df730eaafc97eaa
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 90113012c2 -s oursXin Li
am skip reason: Change-Id I73aeaa05bee765e29d9ee32b083a7f0df8a089c4 with SHA-1 229df8f6c9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/12796869 Change-Id: I29603752b618a040c05b9f3eb12da2258e4d5283
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I73aeaa05bee765e29d9ee32b083a7f0df8a089c4 Change-Id: I2fba4ac6d54802bd069c385c5392e877218fc4ca
2020-09-11[automerger skipped] Merge Android R am: 8db3722fae -s ours am: 353bff4fbb ↵Xin Li
-s ours am: 12b8fada9f -s ours am: deb24443c5 -s ours am: 5ddaea9dbc -s ours am skip reason: Change-Id Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a with SHA-1 9370cdfe57 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1421762 Change-Id: Iae1996d6e6bfd7f6416507d801e00382074d6ca9
2020-09-11[automerger skipped] Merge Android R am: 8db3722fae -s ours am: 353bff4fbb ↵Xin Li
-s ours am: 12b8fada9f -s ours am: deb24443c5 -s ours am skip reason: Change-Id Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a with SHA-1 9370cdfe57 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1421762 Change-Id: I8e2570df708a7099f28442495499cb85b5a216cf
2020-09-11[automerger skipped] Merge Android R am: 8db3722fae -s ours am: 353bff4fbb ↵Xin Li
-s ours am: 12b8fada9f -s ours am skip reason: Change-Id Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a with SHA-1 9370cdfe57 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1421762 Change-Id: Ic8b6883604e94e109d50affa6703e5e317df84f3
2020-09-11[automerger skipped] Merge Android R am: 8db3722fae -s ours am: 353bff4fbb ↵Xin Li
-s ours am skip reason: Change-Id Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a with SHA-1 9370cdfe57 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1421762 Change-Id: I7a4f16b15ea2187741ab1d73c09a833b2511d575
2020-09-11[automerger skipped] Merge Android R am: 8db3722fae -s oursXin Li
am skip reason: Change-Id Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a with SHA-1 9370cdfe57 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1421762 Change-Id: I3d80a6f77d20f58792c7ae56d89c8af83c62e7d7
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a Change-Id: I469b04b384b08d932931b74fdc929f7603eb6fcb
2020-08-28[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9370cdfe57 -s ours am: 4eeeeafe04 -s ours am: ad3a98db5e -s ours am: 33a3b0ce16 -s ours am skip reason: Change-Id I2e9b4ce52f32fb7e6f244007eb55ecb1c6e5a05d with SHA-1 de70c68078 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/12482636 Change-Id: I0dcfffb3e201477f771f7e070c60668d6eae3bf6
2020-08-28[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9370cdfe57 -s ours am: 4eeeeafe04 -s ours am: ad3a98db5e -s ours am skip reason: Change-Id I2e9b4ce52f32fb7e6f244007eb55ecb1c6e5a05d with SHA-1 de70c68078 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/12482636 Change-Id: I9582e817960bba3b5b26afda260e7a7c9f0d106c
2020-08-28[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9370cdfe57 -s ours am: 4eeeeafe04 -s ours am skip reason: Change-Id I2e9b4ce52f32fb7e6f244007eb55ecb1c6e5a05d with SHA-1 de70c68078 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/12482636 Change-Id: I10c95e08d03cfe0f0bae572299bfb3cb42bd6457
2020-08-28[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9370cdfe57 -s ours am skip reason: Change-Id I2e9b4ce52f32fb7e6f244007eb55ecb1c6e5a05d with SHA-1 de70c68078 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/12482636 Change-Id: I883c2f6e09491535268347c5bb88560c89881bfc
2020-08-28Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I2e9b4ce52f32fb7e6f244007eb55ecb1c6e5a05d Change-Id: Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a
2020-08-27[automerger skipped] Initialize an uninitialized enum. am: df55a29ab0 am: ↵Stephen Hines
85860333e3 -s ours am: 520e4b344e -s ours am: e624960e07 -s ours am: 03d73a84ef -s ours am skip reason: Change-Id Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb with SHA-1 469bd61ba3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1412032 Change-Id: I392c4a6c781f73baff8e2d4750960b5a075d1efe
2020-08-27[automerger skipped] Initialize an uninitialized enum. am: df55a29ab0 am: ↵Stephen Hines
85860333e3 -s ours am: 520e4b344e -s ours am: e624960e07 -s ours am skip reason: Change-Id Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb with SHA-1 469bd61ba3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1412032 Change-Id: I4675daaea17689ebcca26f79ef10de75e874e7c0
2020-08-27[automerger skipped] Initialize an uninitialized enum. am: df55a29ab0 am: ↵Stephen Hines
85860333e3 -s ours am: 520e4b344e -s ours am skip reason: Change-Id Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb with SHA-1 469bd61ba3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1412032 Change-Id: Idfd61a89ee37c6b0f0a1d90ac0fc51cfe13b0d30
2020-08-26[automerger skipped] Initialize an uninitialized enum. am: df55a29ab0 am: ↵Stephen Hines
85860333e3 -s ours am skip reason: Change-Id Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb with SHA-1 469bd61ba3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1412032 Change-Id: I91c8c3e6158e39764286a05516efd81c692c374c
2020-08-26Initialize an uninitialized enum. am: df55a29ab0Stephen Hines
Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1412032 Change-Id: Ibd3f9fde7dd8598f4681be28e0654dbbdc3e10ee
2020-08-26Initialize an uninitialized enum.Stephen Hines
hardware/google/av/codec2/tests/C2UtilTest.cpp:82:39: error: variable 'e3' is uninitialized when passed as a const reference argument here [-Werror,-Wuninitialized-const-reference] C2FieldDescriptor::namedValuesFor(e3); ^~ Bug: http://b/155835175 Test: mm in hardware/google/av/codec2/tests Change-Id: Icfc703a3c86c6db95bf2a2178b8ae37d7e19fee2 Merged-In: Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb
2020-07-21[automerger skipped] DO NOT MERGE Disable example codec2-service by default ↵Yo Chiang
am: fdebb8f14e am: 09de0bd819 -s ours am: 8290367cb4 am: 229df8f6c9 am: 607c3c4639 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1353433 Change-Id: I517eb6b0abaa93e65d00751cc2c56b20315e623a
2020-07-21[automerger skipped] DO NOT MERGE Disable example codec2-service by default ↵Yo Chiang
am: fdebb8f14e am: 09de0bd819 -s ours am: 8290367cb4 am: 229df8f6c9 Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1353433 Change-Id: Iae0bc5f4c7db256027aebcd4049d2c6f7a326702
2020-07-21[automerger skipped] DO NOT MERGE Disable example codec2-service by default ↵Yo Chiang
am: fdebb8f14e am: 09de0bd819 -s ours am: 8290367cb4 Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1353433 Change-Id: I73aeaa05bee765e29d9ee32b083a7f0df8a089c4