summaryrefslogtreecommitdiffstats
path: root/include/ndk
Commit message (Collapse)AuthorAgeFilesLines
* am 51281663: am 69897ae4: am 75afcc1f: Merge "Use define for drm property ↵Marco Nelissen2015-01-051-5/+5
|\ | | | | | | | | | | | | keys instead of defining as char pointers" * commit '51281663443ea39db9b4c6e2415343e26a6b3fb8': Use define for drm property keys instead of defining as char pointers
| * Use define for drm property keys instead of defining as char pointersMartin Storsjo2014-12-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When defined as char pointers, every compilation unit that includes the NdkMediaDrm.h header defines a new copy of the same global variables - leading to linker errors due to multiple definitions if more than one file includes it. By using a define, they don't generate any symbols. The NdkMediaFormat.h header uses extern const char* for a similar set of keys, but that can't be added after the actual platform has shipped. The other alternative would be to declare them as static const char*, which wouldn't generate global symbols, but which could trigger warnings about unused static symbols instead. Change-Id: I14ca81d94309b7f437b3bc144920c48a8b3f0261
* | Line length 100Glenn Kasten2014-12-302-3/+6
|/ | | | Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
* getSampletime -> getSampleTimeMarco Nelissen2014-05-291-1/+1
| | | | Change-Id: I87aaa87be068d414903a0e1e22bfe4183cf45ab0
* Remove codec callback for now.Marco Nelissen2014-05-231-11/+0
| | | | Change-Id: I7ef3c1fc7aa1bfec958e6ea58bf95ae35a575e91
* Remove the last of the references.Marco Nelissen2014-05-211-1/+1
| | | | Change-Id: Id68cdab7e972e3e78e2065e56b8a095c3d496df2
* Fix includeMarco Nelissen2014-05-201-1/+1
| | | | Change-Id: I2c1e6b0e85ff608f942e54edf9bc5dd6f8716518
* Use pointers instead of references because CMarco Nelissen2014-05-201-22/+22
| | | | Change-Id: I5c84469e5ff977bf8bb91be2cc6c38a0c7f08609
* Add docs, releaseOutputBufferAtTime, seekTo.Marco Nelissen2014-05-194-8/+107
| | | | Change-Id: Iadd231b63e75b7937c13d2ebfef47aedeaeef5a1
* Fix build.Marco Nelissen2014-05-151-1/+1
| | | | Change-Id: I2b0a3049c81b99ba233d5945e16dcddd975aa4f9
* Merge "Unify error/status codes"Marco Nelissen2014-05-156-73/+78
|\
| * Unify error/status codesMarco Nelissen2014-05-156-73/+78
| | | | | | | | Change-Id: Ib90cc2f2adc07ff146256931c92c0ec4becb86f5
* | Hook up event handling in NDK MediaDrm APIJeff Tinker2014-05-151-1/+1
|/ | | | Change-Id: I48ac1d3ca5405c5909454c7a553917b31b9a50e5
* Merge "Fix typos and pointer math."Marco Nelissen2014-05-142-2/+2
|\
| * Fix typos and pointer math.Marco Nelissen2014-05-142-2/+2
| | | | | | | | Change-Id: I07f33a57454d013844b56bc3e57fe0a271e8b38c
* | WIP: MediaDrm NDK APIsJeff Tinker2014-05-131-0/+470
|/ | | | | Change-Id: I3ac08a3b027135c3fd2a9e95c5e8b3fd722df019 TODO: hooking up event handler, testing
* Some crypto stuff, error codesMarco Nelissen2014-05-134-3/+176
| | | | | | | Add crypto/drm related functions, define some media errors instead of using magic numbers in the code. Change-Id: I5924cba0bfcdb3623073c9182a646b70f4ead5a5
* Add AMediaCodec callbackMarco Nelissen2014-05-091-1/+11
| | | | Change-Id: I33b7ff3bcdcff6d3a5e1db385b900ae18b7e0f03
* Make AMediaCodec_create* APIs more like their Java counterpartsMarco Nelissen2014-05-081-5/+9
| | | | | | and add configure flags. Change-Id: Ibfb7f8cad724fa1db2320966828104d40b5e6590
* Expand AMediaFormatMarco Nelissen2014-05-071-2/+20
| | | | | | | | | Remove getDouble and getSize methods, since these are not used and/or not present in the corresponding Java MediaFormat API. Add setBuffer/getBuffer, needed for making formats for encoding, and add other setters. Change-Id: I528d51b4ed571d852b949637f7ae3a95d31da7c1
* Add NDK version of MediaMuxerMarco Nelissen2014-05-072-1/+76
| | | | | | and add some constness here and there. Change-Id: Ib3caa8310691e8f27aaa1afcfaec0b384513d4f1
* MediaFormat owns its stringsMarco Nelissen2014-05-061-2/+4
| | | | | | | Have MediaFormat own the strings it returns from toString and getString, reducing the chance of memory leaks. Change-Id: I0ddd593874c8b3af0b7714f2d8a106edf8121108
* WIP: MediaCodec and friends NDK APIs, plain C versionMarco Nelissen2014-05-053-0/+357
Change-Id: I9ed6b9c5afb026a1b5fe8b652e75635bbcc223df
generated by cgit v1.1 at 2025-01-07 05:44:16 +0000