Dongwon Kang
81be7d85ab
Merge "Add MediaBufferBase and use it in MediaSource and MediaBufferGroup."
6 years ago
TreeHugger Robot
46b5c79e2f
Merge "Remove unused code DataSource::getVector() again."
6 years ago
Dongwon Kang
1d93634705
Remove unused code DataSource::getVector() again.
...
This was removed by Ief477906 but resurected when introducing
DataSourceBase. Seems that git didn't do a good job on rebase.
Test: build.
Change-Id: If3f0102b3fcf06cdf99b34471e87258eba9d1018
6 years ago
Marco Nelissen
8ff8cab83d
Remove dead code
...
Remove code that was unreachable or never called.
Test: build
Change-Id: I82da1a3a046a7fe66bf012aa749d5a2de669d807
6 years ago
Marco Nelissen
cd5efc0eb1
Make some methods static
...
To make it more obvious that these are only used by APacketSource
Test: build
Change-Id: I8f585cfb4bb4123eb7da4aedade5510d736fa597
6 years ago
Marco Nelissen
fca6559a72
Consolidate two MakeAACCodecSpecificData functions
...
One was only used by the other, so integrate the two.
Test: build, play AAC file
Change-Id: I77fcb6092b2083c3aab4a27773258645f68b17eb
6 years ago
TreeHugger Robot
248c4892bc
Merge "codec2: fix C2Buffer"
6 years ago
Wonsik Kim
5b59b4461a
codec2: fix C2Buffer
...
Test: setprop debug.stagefright.ccodec yes
Test: screenrecord --codec-name c2.google.avc.encoder /sdcard/record.mp4
Change-Id: I5045c1a65822818e5df5227034da626c40e23c35
6 years ago
TreeHugger Robot
acdc3e6774
Merge "Make MetaData::findXXX methods const"
6 years ago
Marco Nelissen
22e668af6c
Make MetaData::findXXX methods const
...
Test: build
Change-Id: Ica9f9772bfea11e11dc6b2a3e9a5a3a2bd8f8fdb
6 years ago
Adam Stone
fb679e38bb
Add logging support for FW metrics
...
Adds proto serialization and logging support for media drm framework metrics.
Bug: 64001676
Test: Ran CTS tests, unit tests and Google Play.
Change-Id: Ie350ac93caa6b35610eb63e4acc860c8e8a5cf5b
6 years ago
Adam Stone
8cc97b178b
Merge changes from topic "media-drm-fix-list-metrics"
...
* changes:
Fix Metrics with PersistableBundle support
Fix DrmHal implementation to return all metrics
6 years ago
Dongwon Kang
031b695b8e
Merge "Initialize mDataSource in MidiIoWrapper c-tors."
6 years ago
Dongwon Kang
04ce77ffc7
Initialize mDataSource in MidiIoWrapper c-tors.
...
Test: App in question works well.
Bug: 73105500
Change-Id: I6ffd52bf10e23c8ee144bbc74e157a6a7b26168c
6 years ago
TreeHugger Robot
6d48602417
Merge "JAudioTrack: Add offload mode support"
6 years ago
Dongwon Kang
1889c3edad
Add MediaBufferBase and use it in MediaSource and MediaBufferGroup.
...
MediaBuffer class exposes internal classes, ABuffer and IMemory, which
we don't want to expose to plugins. This change introduces
MediaBufferBase which does not expose any classes from system library.
Test: build and post-submit media cts tests
Bug: 67908556
Change-Id: Ic9ee239caf9b84b2b3740e2d533257afa25c8784
6 years ago
Wonsik Kim
5f23b9982b
codec2: fix build
...
Test: make -j checkbuild
Change-Id: I4e6ecd5e2262c2a2b801e889f1abe227ec4342b2
6 years ago
TreeHugger Robot
e65b694a10
Merge "Hide classes from system library in MediaBufferGroup.h"
6 years ago
TreeHugger Robot
57c91e1e52
Merge "Remove String8 and AMessage from extractor plugin interface."
6 years ago
TreeHugger Robot
6c17751f5f
Merge changes I7ea9f150,Idd98a522
...
* changes:
CCodec: Episode VI --- Set Persistent Surface
CCodec: isolate input surface buffer passing from CCodec
6 years ago
TreeHugger Robot
c91ac47d24
Merge "Ndk wrapper: wrap new Ndk datasource/extractor APIs"
6 years ago
Dongwon Kang
4d0c0a8942
Hide classes from system library in MediaBufferGroup.h
...
Test: build.
Bug: 67908542
Change-Id: Icf0e3d634c3ab4e1350c9960655eaaca37029b34
6 years ago
Adam Stone
568b3c45d4
Fix Metrics with PersistableBundle support
...
Some metrics required a conversion to using PersistableBundle to support
slightly richer structure (lists, and nested PBs).
BUG: 64001676
Test: Ran updated CTS test and verified Google Play works.
Change-Id: I8f8d67ba04b234f2ac5ac348a8945e20837f98d6
6 years ago
Wei Jia
be3708cf04
Merge "MediaPlayer2: seekTo does not change state."
6 years ago
Robert Shih
d4faf9e7ce
Ndk wrapper: wrap new Ndk datasource/extractor APIs
...
Bug: 63934228
Change-Id: Id6200b5b5be3c7fa22cfb0233f749fc0e8ef2bc4
6 years ago
Wei Jia
083e9098e6
MediaPlayer2: seekTo does not change state.
...
Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: I13ec7225277b2f53535274828eb9d06ccd77db0c
6 years ago
TreeHugger Robot
e54461ae13
Merge changes from topic "fix_set_security_level"
...
* changes:
Fix build error in topic fix_set_security_level
Revert "Revert "Update drm hal to find drm@1.1 factories""
Revert "Revert "Fix MediaDrm security level APIs""
6 years ago
Jeff Tinker
c84dc0762e
Fix build error in topic fix_set_security_level
...
Change-Id: I199713a577422e23c922aa31860daa93bec6a3c1
related-to-bug:3565352
6 years ago
TreeHugger Robot
dc5cb6a1a8
Merge "SoftVPX related perf tuning"
6 years ago
Jeff Tinker
e307dc4e7b
Revert "Revert "Update drm hal to find drm@1.1 factories""
...
This reverts commit d3eece8aa3
.
Change-Id: I15ca1dba1a384ccc026406f0a9a02c2598873456
6 years ago
Jeff Tinker
41d279a7f3
Revert "Revert "Fix MediaDrm security level APIs""
...
This reverts commit 5f5e43fa83
.
Change-Id: I72d585fd3768730eef6ad9effdbda81b32418dea
6 years ago
Chong Zhang
9cf12df166
SoftVPX related perf tuning
...
- Boost decoding thread priority to match ACodec's for video
- Bump up SoftVPX input/output buffer count to 16
- Set buffer count in native window when SoftwareRenderer is used
- Set native window usage to READ_NEVER | WRITE_RARELY to avoid
unnecessary cache invalidation upon lock/unlock
bug: 72841545
Change-Id: Ib7ac3f881fd0612884ecee68ffc79d6fa8f8ca37
6 years ago
TreeHugger Robot
c23849a8ea
Merge "Revert "Fix MediaDrm security level APIs""
6 years ago
TreeHugger Robot
4afda1eaee
Merge "Revert "Update drm hal to find drm@1.1 factories""
6 years ago
Tobias Thierer
d3eece8aa3
Revert "Update drm hal to find drm@1.1 factories"
...
This reverts commit a3c77911df
.
Reason for revert: build cop here. The original CL broke build git_master / walleye_asan, hence I'm reverting.
https://android-build.googleplex.com/builds/submitted/4597721/walleye_asan-userdebug/latest/view/logs/build_error.log
In file included from vendor/google/tools/security/fuzzers/libFuzzer/ICrypto_fuzzer/ICrypto_fuzzer.cpp:24:
frameworks/av/include/media/CryptoHal.h:23:10: fatal error: 'android/hardware/drm/1.1/ICryptoFactory.h' file not found
Change-Id: I185d5310cadb9990b864d71e42bba94f4740160c
6 years ago
Tobias Thierer
5f5e43fa83
Revert "Fix MediaDrm security level APIs"
...
This reverts commit 56134cc9e7
.
Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.
https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log
Change-Id: I0de7738748ab793249df68bcbf18232d6a2d120a
6 years ago
TreeHugger Robot
fa84ada543
Merge "Fix MediaDrm security level APIs"
7 years ago
TreeHugger Robot
d0e0b1a126
Merge "MediaPlayer2: hook up srcId."
7 years ago
TreeHugger Robot
913f986aec
Merge changes I55e18e2e,Id3687d2a,I9fb550a9
...
* changes:
fix audio port ID generation for new AudioTrack and AudioRecord
Revert "Revert "audio flinger: move record permission checks to audio policy service""
Revert "Revert "audio policy: refactor audio record APIs""
7 years ago
TreeHugger Robot
51fbf99c72
Merge "Update drm hal to find drm@1.1 factories"
7 years ago
Adam Stone
637b785582
Fix DrmHal implementation to return all metrics
...
This change in DrmHal allows us to transfer a PersistableBundle containing
previously unavailable metrics.
Bug: 64001676
Test: CTS test for metrics and GPlay test
Change-Id: I1fa87c76dd980a3f91b4e2d02b37329f6c0a88ec
7 years ago
Eric Laurent
fee1976a28
Revert "Revert "audio policy: refactor audio record APIs""
...
This reverts commit e9ebcdbb05
.
Bug: 72628781
Test: manual camcorder tests
Change-Id: I9fb550a9f62d2d15cafbd7534e5e7eaa155a7213
7 years ago
Robert Shih
ceeee83aaf
[automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f
am: 4b29913d94
am: a6bd71fcb8
am: 1816776c89
am: 86eb461699
am: e31e750544
am: 67835c7025
am: 9f344e0b9c
am: 6e2df031fa
am: 8d6c333529
am: 69ae15f2b5
am: 07fc61f790
am: 9d1cb8082d
...
am: 2f3c3ecd7d
Change-Id: I503fe66a3a5b362521acf7123a1da5bf826a0f91
7 years ago
Robert Shih
2f3c3ecd7d
[automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f
am: 4b29913d94
am: a6bd71fcb8
am: 1816776c89
am: 86eb461699
am: e31e750544
am: 67835c7025
am: 9f344e0b9c
am: 6e2df031fa
am: 8d6c333529
am: 69ae15f2b5
am: 07fc61f790
...
am: 9d1cb8082d
Change-Id: I2d86f93d3bad0dc56d4252efe39c63d90b0f4360
7 years ago
Robert Shih
9d1cb8082d
[automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f
am: 4b29913d94
am: a6bd71fcb8
am: 1816776c89
am: 86eb461699
am: e31e750544
am: 67835c7025
am: 9f344e0b9c
am: 6e2df031fa
am: 8d6c333529
am: 69ae15f2b5
...
am: 07fc61f790
Change-Id: Ia9e336417bbc0dafe4b39c3ac47c96bc34e5f575
7 years ago
Robert Shih
07fc61f790
[automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f
am: 4b29913d94
am: a6bd71fcb8
am: 1816776c89
am: 86eb461699
am: e31e750544
am: 67835c7025
am: 9f344e0b9c
am: 6e2df031fa
am: 8d6c333529
...
am: 69ae15f2b5
Change-Id: I7e4f6d0b844b1736d9ffb92a31c61765772a6140
7 years ago
Wei Jia
d2bb1bd1fb
MediaPlayer2: hook up srcId.
...
Test: MediaPlayer2 plays.
Bug: 63934228
Change-Id: I0dd8b345d89034600e1c0fb3f58e4d92990c0054
7 years ago
Android Build Merger (Role)
69ae15f2b5
[automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f
am: 4b29913d94
am: a6bd71fcb8
am: 1816776c89
am: 86eb461699
am: e31e750544
am: 67835c7025
am: 9f344e0b9c
am: 6e2df031fa
am: 8d6c333529
...
Change-Id: I992da5131a99270d4bf008318d10ce6c2e6a64ca
7 years ago
Android Build Merger (Role)
8d6c333529
[automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f
am: 4b29913d94
am: a6bd71fcb8
am: 1816776c89
am: 86eb461699
am: e31e750544
am: 67835c7025
am: 9f344e0b9c
am: 6e2df031fa
...
Change-Id: Ie2a6d6bb505134e2d07b196379246ea4544cb0a5
7 years ago
Android Build Merger (Role)
6e2df031fa
[automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f
am: 4b29913d94
am: a6bd71fcb8
am: 1816776c89
am: 86eb461699
am: e31e750544
am: 67835c7025
am: 9f344e0b9c
...
Change-Id: I0c5683b92cf84e09633cb1634c2aed0aee5e1c42
7 years ago