summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-22Snap for 9789005 from 8430ef055e35ce485c3c570abec291f16bc3d0be to udc-d1-releaseandroid-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseAndroid Build Coastguard Worker
Change-Id: Icdb4b5a5c6d05eca26b018bc84fd27152bc0f3d3
2023-03-21Merge remote-tracking branch 'aosp/upstream-main' into aosp/master am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseJames Zern
0cab833d4d am: 46eabefe95 am: 95dcdd9f25 am: a8750e6620 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2499175 Change-Id: I15d0c4427fb0b6dc7a10f56e8a396da3e33f2f47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Merge remote-tracking branch 'aosp/upstream-main' into aosp/master am: ↵android14-devJames Zern
0cab833d4d am: 46eabefe95 am: 95dcdd9f25 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2499175 Change-Id: I14e1144e020645d8f1219820297e6c1486d64e43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Merge remote-tracking branch 'aosp/upstream-main' into aosp/master am: ↵James Zern
0cab833d4d am: 46eabefe95 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2499175 Change-Id: I93ab85a5abfe55ddb07324e75c82a02f25c5020a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Merge remote-tracking branch 'aosp/upstream-main' into aosp/master am: ↵James Zern
0cab833d4d Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2499175 Change-Id: I6dce082bd26e75347fc98da17d6c4185bf1d63d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge remote-tracking branch 'aosp/upstream-main' into aosp/masterandroid-u-beta-1-gplJames Zern
* aosp/upstream-main: cosmetics,fix a typo: compresion -> compression vp9_level_stats,Vp9LevelRow: fix -Wc++20-compat warnings Vp9LevelTable: fix initializer order Mark static const class/struct members as constexpr. CuePoint::TrackPosition::Parse: validate m_block added Seek() function to FileReader Android.mk: add a check for NDK_ROOT Change-Id: I4c487400ff330d5126d0efb49c1e09bfeec529ae Test: atest ExtractorUnitTest -- --enable-module-dynamic-download=true
2023-03-13Merge changes I15c2d52e,I32fbee85,I491d9003 into mainJames Zern
* changes: cosmetics,fix a typo: compresion -> compression vp9_level_stats,Vp9LevelRow: fix -Wc++20-compat warnings Vp9LevelTable: fix initializer order
2023-03-10cosmetics,fix a typo: compresion -> compressionJames Zern
Change-Id: I15c2d52e7410a597520243ef0b367416bd463f69
2023-03-10vp9_level_stats,Vp9LevelRow: fix -Wc++20-compat warningsJames Zern
This makes the struct an aggregate in C++20 terms [1], by removing the default constructor. Another option would be to provide an explicit constructor taking all of the members as arguments. fixes: common/vp9_level_stats.cc:20:5: warning: aggregate initialization of type 'const vp9_parser::Vp9LevelRow' with user-declared constructors is incompatible with C++20 [-Wc++20-compat] [1] https://en.cppreference.com/w/cpp/language/aggregate_initialization C++11: no user-provided, inherited, or explicit constructors C++20: no user-declared or inherited constructors Change-Id: I32fbee85016ea711a7425317493d5cf3c0a3b93d
2023-03-10Vp9LevelTable: fix initializer orderJames Zern
max_luma_picture_breadth was added after max_luma_picture_size (index 2) in: 9e37f34 Update VP9 level definition, but the values were added to the end of the table rather than at index 3. Change-Id: I491d9003bb8870cfd723dc5d73afc11786df00a9
2023-03-10Mark static const class/struct members as constexpr.James Zern
This change fixes declarations that have initial values but are technically not definitions by marking them constexpr (which counts as a definition). This enables, among other things, the modified constants to be passed into functions and function templates that accept arguments by reference. Without this change, such functions would cause linker errors. Change-Id: Id8798c69270f053ae29b02bef4c9fee616e2b17c PiperOrigin-RevId: 307129442
2023-03-10Merge "CuePoint::TrackPosition::Parse: validate m_block" into mainJames Zern
2023-03-06CuePoint::TrackPosition::Parse: validate m_blockJames Zern
m_block is a long long, but later treated as a long in Cluster::GetEntry() after being checked whether it's > 0. A value larger than LONG_MAX may result in a negative value being used as an index into m_entries[] when sizeof(long) < sizeof(long long). Bug: webm:1792 Change-Id: Idf15fc4d7e6fd1fa74a022bca63217aad26ff962
2023-03-01added Seek() function to FileReaderElijah Cirioli
Adds a new function to the FileReader implementation of the Reader interface for seeking within a file. It additionally adds a new Status code to represent that a request to use the Seek() function has failed, which will happen when the file is stdin or something similar. Change-Id: Iae299a3b36a8440da941b182c8865429ee3515d4
2023-01-18Android.mk: add a check for NDK_ROOTJames Zern
This simplifies integration with the Android platform and avoids the files from being used when a non-NDK build is performed. In that case Android.bp is preferred. Change-Id: I027ded298ae518db5388a7e514f2ef7b1d940b4b
2022-11-02Snap for 9245572 from 9aa0fe0eb56e8eee13f191a5d2aa393d9291f6ca to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I94f8d223f8a7cf6d3858dbfc1a771cc0b7704e1c
2022-10-27Snap for 9222000 from 02181d9a902edd01b4c68b77b297387f8a1b9422 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: If0c8742dd7d6d08f521d70a5c1e31d565e7afd2c
2022-10-26Snap for 9218031 from 02181d9a902edd01b4c68b77b297387f8a1b9422 to udc-releaseAndroid Build Coastguard Worker
Change-Id: Ib9890fa81598adaa3c5c37edd32087901916b2e8
2022-10-25Merge tag 'libwebm-1.0.0.29' into master am: 37e04ec372 am: fee037c163 am: ↵Harish Mahendrakar
eae978ff4f Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2269627 Change-Id: I632c1e3c61595592707b49f496c8718244ca0004 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25Merge tag 'libwebm-1.0.0.29' into master am: 37e04ec372 am: fee037c163Harish Mahendrakar
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2269627 Change-Id: Ib4485ce9b331f3b7e13ba093fbbdfb4098907907 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25Merge tag 'libwebm-1.0.0.29' into master am: 37e04ec372main-16k-with-phonesHarish Mahendrakar
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2269627 Change-Id: Ia5085a5a2293bde91c95291304bfa65e69b9e432 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge tag 'libwebm-1.0.0.29' into masterHarish Mahendrakar
Bug: 253960496 Test: Builds Change-Id: I2598bb2b790c276f468a91359c1587e3d695115f
2022-10-21bump version for tagJames Zern
Bug: b/253960496 Change-Id: If69d7397a1f286580c17d96c4533708f5fc247ed
2022-10-21vp9_level_stats_tests: add some missing assertsJames Zern
avoids a segfault if CreateAndLoadSegment() fails Change-Id: Ie9066e6d5de99d0ee7ee0ab0298cf50a10f71f6c
2022-10-21clear implicit conversion warningsJames Zern
reported by clang-11 -fsanitize=integer mkvparser/mkvparser.cc:301:31: runtime error: implicit conversion from type 'signed char' of value -128 (8-bit, signed) to type 'unsigned long long' changed the value to 18446744073709551488 (64-bit, unsigned) m2ts/webm2pes.cc:71:13: runtime error: implicit conversion from type 'unsigned int' of value 1260 (32-bit, unsigned) to type 'std::uint8_t' (aka 'unsigned char') changed the value to 236 (8-bit, unsigned) Change-Id: If3d6f17edb7a0d79a944a4dd0919878cf524460b
2022-10-20Snap for 9196024 from 58a4e31e3b4b1e099c1f794d0757160b030cc19a to udc-releaseAndroid Build Coastguard Worker
Change-Id: I42e80b686e99bc100ddc3f388ae6fd39de4842bb
2022-10-20Snap for 9196333 from 58a4e31e3b4b1e099c1f794d0757160b030cc19a to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I86d7fb6f88362d8c3a2900de8c89c86f2448adca
2022-10-19Merge upstream-main (ee0bab576c3) into master am: 128aa0bbfa am: be8d92c284 ↵Harish Mahendrakar
am: b8c8f0128c Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2258486 Change-Id: I1d115f507632044bb9a776e9bebe2b422c85008b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19Merge upstream-main (ee0bab576c3) into master am: 128aa0bbfa am: be8d92c284Harish Mahendrakar
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2258486 Change-Id: Ieae04c96137f8f50518f15c25325c87d97ebd87e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19Merge upstream-main (ee0bab576c3) into master am: 128aa0bbfaHarish Mahendrakar
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2258486 Change-Id: I3bf6692e2383cd7b5c580276080d9d7430c3f4ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19Merge upstream-main (ee0bab576c3) into masterHarish Mahendrakar
This merges commit ee0bab576c338c9807249b99588e352b7268cb62 from upstream-main to master. Bug: 253960496 Test: atest CtsMediaExtractorTestCases CtsMediaMuxerTestCases \ CtsMediaV2TestCases:ExtractorTest \ CtsMediaV2TestCases:ExtractorUniTest \ CtsMediaV2TestCases:MuxerTest \ CtsMediaV2TestCases:MuxerUnitTest Change-Id: I9ddcbba3ff0efefa4e8d2a8a1e8214470e1b253e
2022-10-12Snap for 9164037 from 7cea8b85c4f65894f30e167d82e000e927eccfc9 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I7075ae77a9230fa96965875db99e0681f408f451
2022-10-11Snap for 9159364 from 7cea8b85c4f65894f30e167d82e000e927eccfc9 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I7fdc5d6aca503f6a07fa21e07c8da152b88ccfcf
2022-10-10Add support to build libwebm_mkvparser am: 9b9d173255 am: e6290beaea am: ↵Harish Mahendrakar
5095d46fd3 Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2242951 Change-Id: I426d186efd2e1796f1e261d6e2a68c7f74c65f24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10Add support to build libwebm_mkvparser am: 9b9d173255 am: e6290beaeaHarish Mahendrakar
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2242951 Change-Id: I137af59e1491973f76174f987809cdadb23ccbf6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10Add support to build libwebm_mkvparser am: 9b9d173255Harish Mahendrakar
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2242951 Change-Id: I3351883f78cbdff442bd899ae33083598dd389c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-08Add support to build libwebm_mkvparserHarish Mahendrakar
Added a new library "libwebm_mkvparser" to be used in extractors. In subsequent CLs, extractors will use "libwebm_mkvparser" instead of "libwebm" that is currently built from source in external/libvpx/libwebm. Bug: 251887564 Test: Builds Change-Id: I1cb373a582a463c4b4bc6c9a3ac6325656e57cee
2022-01-25Revert "mkvmuxer,Cluster::Size: make uint64 conversion explicit"James Zern
This reverts commit 46b20057cfc24437fbe8987e0b70e0c4c8ecac75. The conversion results in a warning with Xcode. The original code was correct given mkvmuxer::uint64 is defined as unsigned long long Change-Id: I0e5a45c1df85ca59267ab444b386e44442a099ef
2022-01-12add mkvparser_fuzzer.ccJames Zern
this isn't hooked up to cmake, but can be built similarly to webm_parser webm_fuzzer.cc PiperOrigin-RevId: 415639383 PiperOrigin-RevId: 416349966 Change-Id: I89b744e129442321a15b623ebc04811ca629d5b6
2021-12-16Fix shellcheck issues in infra/*.shRoberto Alanis
There is an update of shellcheck v0.8.0 which adds more issues. Change-Id: I1a8008bb9f6346cf49566bafe4692534548408bd Bug: b:185520494
2021-12-16Merge "Fix asan_symbolize execution by adding pipe" into mainRoberto Alanis Baez
2021-12-16Fix asan_symbolize execution by adding pipeRoberto Alanis
Change-Id: I5845819286a587670c64e4e9314390d0f52da0e5 Bug: b:185520494
2021-12-16Jenkins Port: support clang-i686 compilationRoberto Alanis
Change-Id: Iec2f82990b94e29364e8e0e7cc4e39bf898860e6 Bug: b:185520494
2021-12-08patch-check: remove duplicated words in subject length checkRoberto Alanis
Change-Id: I8c35facb077b7c7b80784699580f93cb58ae0903 Bug: b:185520494
2021-12-07patch-check: commit subject length checkRoberto Alanis
Change-Id: I745f819cdf7736ac315ddab059d9ddba30f35f1f Bug: b:185520494
2021-11-04mkvparser: fix int64 -> unsigned conversion warningsJames Zern
in 32-bit builds: mkvparser\mkvparser.cc(1536,42): warning C4244: 'initializing': conversion from '__int64' to 'unsigned int', possible loss of data the counts have previously been range checked since: 566a1e0 Add checks for overflow during parsing Change-Id: Ib185df3f95869fba3a26ab09a1a555e5b550ebf1
2021-10-14Android.mk: import LICENSE indicators from AOSPJames Zern
https://android-review.googlesource.com/c/platform/external/libvpx/+/1858286 https://android.googlesource.com/platform/external/libvpx/+/b35704ee444f6e2533fcbc2efdcb4bd47f5eb912 Change-Id: Ia884434083f85abc291262796c9ff1cd0dcea45a
2021-10-12presubmit: Add pylint-2.7 and .pylintrcRoberto Alanis
Added files to skip to prevent lint over generated code. Bug: b:185520494 Change-Id: I7c812d6fc00f401abcc4af5127f7e00410d9924b
2021-10-12patch-check: shfmtRoberto Alanis
shfmt is expected to be installed along with go. GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@latest Change-Id: Iad569d20ef7452f579f50bfed7f1b22c6e99a227 Bug: b:185520494
2021-10-04patch-check: Add shellcheckRoberto Alanis
Shellcheck is expected to be installed because depot_tools does not provide the tool. Change-Id: I4d09538359cdaf404d97f24782c4e5307225d0cc Bug: b:185520494