Marco Nelissen
8429516eed
Merge "Move AudioPlayer to test commands" am: 4426ce8d95
...
am: 4520fef512
Change-Id: Icc49f11520e54b73ea55e628af0a7f79ac2f402c
5 years ago
Marco Nelissen
4520fef512
Merge "Move AudioPlayer to test commands"
...
am: 4426ce8d95
Change-Id: I570df166245cecace59955fac8b667d99167d591
5 years ago
Marco Nelissen
4426ce8d95
Merge "Move AudioPlayer to test commands"
5 years ago
George Burgess IV
544847bc34
Merge "libmediadrm: fix a use of an uninit value" am: 3ba521f0ba
...
am: 87e6db673a
Change-Id: I55f5f2c99602e4972238acade28ab7c07199c0c9
5 years ago
George Burgess IV
87e6db673a
Merge "libmediadrm: fix a use of an uninit value"
...
am: 3ba521f0ba
Change-Id: I9953ae4bd47932c85cc088cbe25fad3844c9e893
5 years ago
Treehugger Robot
3ba521f0ba
Merge "libmediadrm: fix a use of an uninit value"
5 years ago
Marco Nelissen
1edb68c384
Move AudioPlayer to test commands
...
AudioPlayer was only used by the commandline utilities, so move it
out of libstagefright.
Test: build, run
Change-Id: I561cccd323206de7415bd235b72711194080aaea
5 years ago
George Burgess IV
c42403d3ef
libmediadrm: fix a use of an uninit value
...
INIT_CHECK() expands to `if (foo) return bar;`, and `EventTimer`'s
destructor uses a value that's only set if `SetAttribute` is called.
This CL flips the INIT_CHECK/EventTimer lines to match getKeyRequest.
Caught by clang's static analyzer:
frameworks/av/include/media/EventMetric.h:155:7: warning: 2nd function
call argument is an uninitialized value
[clang-analyzer-core.CallAndMessage]
Bug: None
Test: TreeHugger
Change-Id: Ie0c4fb8c99a56082e234475e539c2ec4bc8fd948
5 years ago
Ray Essick
172e15dd36
Merge "Benchmark: Add SDK Decoder" am: 03379fb2cc
...
am: 42e055cd58
Change-Id: I562238f5857feb073cd32c723369e8cbfe53d4b6
5 years ago
Ray Essick
a208f2f5b7
Merge "Benchmark : Add flac vectors for DecoderTest and EncoderTest" am: 90157191c2
...
am: 2f2030e041
Change-Id: Icdf492a62787485e70a1ab7abce8c6198549fc07
5 years ago
Ray Essick
42e055cd58
Merge "Benchmark: Add SDK Decoder"
...
am: 03379fb2cc
Change-Id: If22edda6bb74029491f031a212d83a66774a16f2
5 years ago
Ray Essick
2f2030e041
Merge "Benchmark : Add flac vectors for DecoderTest and EncoderTest"
...
am: 90157191c2
Change-Id: I4f82e628bba0f45c2775ca4e7b8e663de6d612fa
5 years ago
Ray Essick
03379fb2cc
Merge "Benchmark: Add SDK Decoder"
5 years ago
Ray Essick
90157191c2
Merge "Benchmark : Add flac vectors for DecoderTest and EncoderTest"
5 years ago
Marco Nelissen
bab95e0b6f
Merge "Move JetPlayer to JNI" am: 77185b7f00
...
am: 23986da952
Change-Id: Ife6695461a31c7e80eb191d7d037b57fe1d7fcc7
5 years ago
Marco Nelissen
23986da952
Merge "Move JetPlayer to JNI"
...
am: 77185b7f00
Change-Id: I9b30d0356bf1bdb0033f209b5d71f1c6cefa1eaa
5 years ago
Marco Nelissen
77185b7f00
Merge "Move JetPlayer to JNI"
5 years ago
Marco Nelissen
1e7d2e99ed
Move JetPlayer to JNI
...
JetPlayer.cpp was only used by the JetPlayer JNI code, so move
it to the same library.
Test: atest JetPlayerTest
Change-Id: I14b8241c5eb6c789ebc5d6725db716b9b0f8f31f
Merged-In: I14b8241c5eb6c789ebc5d6725db716b9b0f8f31f
5 years ago
Marco Nelissen
086ccfd4ac
Merge "libstagefright doesn't need libFLAC" am: a870fb0afa
...
am: 625149dd57
Change-Id: I56073163e643515f490f7274df530b3538d31f21
5 years ago
Marco Nelissen
625149dd57
Merge "libstagefright doesn't need libFLAC"
...
am: a870fb0afa
Change-Id: I73b01b8906a4bf766987e997ea71ada8d5d5d815
5 years ago
Marco Nelissen
a870fb0afa
Merge "libstagefright doesn't need libFLAC"
5 years ago
Shivaansh Agrawal
fcf3a3c834
Benchmark: Add SDK Decoder
...
Test: adb shell am instrument -w -r -e class\
'com.android.media.benchmark.tests.DecoderTest'\
com.android.media.benchmark/androidx.test.runner.AndroidJUnitRunner
Bug: 140051680
Change-Id: Iba07810fa36a4ad378a7a91bfa8b1bca0f615108
5 years ago
Jooyung Han
5e42ca0676
Merge "Revert "adapt ld.config.txt for vndk apex"" am: 055ded38f4
...
am: 36f40f8dd5
Change-Id: Id1fa1e7818361b9c680b593f8f1c5ec32708396c
5 years ago
Jooyung Han
36f40f8dd5
Merge "Revert "adapt ld.config.txt for vndk apex""
...
am: 055ded38f4
Change-Id: Ib9974bdc1576d3b51b020fca148a85fc0d6bf353
5 years ago
Treehugger Robot
055ded38f4
Merge "Revert "adapt ld.config.txt for vndk apex""
5 years ago
Jooyung Han
e23a29999f
Revert "adapt ld.config.txt for vndk apex"
...
This reverts commit 99457ff3c2
.
Reason for revert: some targets are broken
Bug: 142773030
Change-Id: I5bccf2658d2b7963d2260235da8ec76976475f30
5 years ago
Marco Nelissen
26dfad2497
libstagefright doesn't need libFLAC
...
Removing it doesn't have any effect on binary size, but makes it easier
to track dependencies.
Test: build
Change-Id: I0a792e48e781a73b920cb68c0daaa7920f08b8bf
5 years ago
Dongwon Kang
d8a53c75a4
Merge "Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx." am: 0ce3a03b74
...
am: 7a40942219
Change-Id: I58a88bbd6521bb4ba26f08dfaf40f2dd18f50653
5 years ago
Dongwon Kang
7a40942219
Merge "Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx."
...
am: 0ce3a03b74
Change-Id: Ief8a95994efae3677c5fba5fc8d612ad875f605e
5 years ago
Treehugger Robot
0ce3a03b74
Merge "Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx."
5 years ago
Dongwon Kang
e61ecaca0b
Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx.
...
Now it only lives in libmedia_codeclist.
Test: build
Change-Id: I4b5d446b3906168c1aff7e906b4ec97a457b06be
5 years ago
Marco Nelissen
32411334fb
Merge "Remove unnecessary inheritance" am: e2a67de73c
...
am: 91a62afc5b
Change-Id: I008fea77860eba2b89b0cb67ba50b9e20c883833
5 years ago
Marco Nelissen
91a62afc5b
Merge "Remove unnecessary inheritance"
...
am: e2a67de73c
Change-Id: I0625bd1416d77bb8bebcafea8b33fe8cbd72054b
5 years ago
Marco Nelissen
e2a67de73c
Merge "Remove unnecessary inheritance"
5 years ago
Dongwon Kang
81d1403fb3
Merge "libmedia: separate codeclist from libmedia" am: 1f72838954
...
am: 8b470dc956
Change-Id: I20146b027c63be852a237dfdda2865bd41fc8957
5 years ago
Marco Nelissen
95b2cf6dc4
Remove unnecessary inheritance
...
MidiIoWrapper's DataSourceUnwrapper doesn't need to inherit from
DataSourceBase, and removing that inheritance saves a little bit
of space too.
Test: build
Change-Id: I9f560ef57b76b624cf323d75872395a39f65ed1f
5 years ago
Jooyung Han
d9f7389afa
Merge "adapt ld.config.txt for vndk apex" am: 5b388b5905
...
am: 07bd8e7740
Change-Id: I14959ba0e2c76e83bb69d4bf64bc05494fef3540
5 years ago
Dongwon Kang
8b470dc956
Merge "libmedia: separate codeclist from libmedia"
...
am: 1f72838954
Change-Id: I7ceb439ed034386635399982392b6b842e08c105
5 years ago
Xin Li
b370033f30
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
...
am: 69ec1691d7
Change-Id: I6e5500cd834d4ebe5ca78cc8fe3b2964f5d16932
5 years ago
Treehugger Robot
1f72838954
Merge "libmedia: separate codeclist from libmedia"
5 years ago
Jooyung Han
07bd8e7740
Merge "adapt ld.config.txt for vndk apex"
...
am: 5b388b5905
Change-Id: Id644648e8092bb1027f24ad4a0bfa29210f2078b
5 years ago
Jooyung Han
5b388b5905
Merge "adapt ld.config.txt for vndk apex"
5 years ago
Xin Li
69ec1691d7
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
...
Bug: 141248619
Change-Id: I60647ef0b9e6a625f46d332ae61f95efdaa7fe93
5 years ago
Dongwon Kang
a42a62d863
libmedia: separate codeclist from libmedia
...
Test: build.
Bug: 139201422
Change-Id: I150c3bd04cc68a3b96a8762ba193fc1595ee6da3
Merged-In: I150c3bd04cc68a3b96a8762ba193fc1595ee6da3
5 years ago
Eric Laurent
b4af14c2d2
[automerger skipped] Merge "audio policy: fix capture policy for accessibility" am: 342d7bcf44
-s ours
...
am: 465966dc65
-s ours
am skip reason: change_id I864be785752f27201d45ce24f95013de6391dbd6 with SHA1 589171c80a
is in history
Change-Id: I86fcf370d9997fb937fd39927046e0b336e59681
5 years ago
Eric Laurent
465966dc65
[automerger skipped] Merge "audio policy: fix capture policy for accessibility"
...
am: 342d7bcf44
-s ours
am skip reason: change_id I864be785752f27201d45ce24f95013de6391dbd6 with SHA1 589171c80a
is in history
Change-Id: I04b143297a43c04be46e736ee28d6778be097782
5 years ago
Treehugger Robot
342d7bcf44
Merge "audio policy: fix capture policy for accessibility"
5 years ago
Marco Nelissen
5ca04b9703
Merge "Remove unnecessary includes" am: 1ab2344f6d
...
am: 111bdeeb16
Change-Id: I28728701f8d734dea9e66c79bde3d092600fd182
5 years ago
Marco Nelissen
111bdeeb16
Merge "Remove unnecessary includes"
...
am: 1ab2344f6d
Change-Id: I5a656c5878ad419e8373ae6711d55015de26e84b
5 years ago
Marco Nelissen
1ab2344f6d
Merge "Remove unnecessary includes"
5 years ago