summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Use new channel count functions for audio masksAndy Hung2014-05-167-12/+17
| | | | | Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3 Signed-off-by: Andy Hung <hunga@google.com>
* Fix build.Marco Nelissen2014-05-151-3/+3
| | | | Change-Id: I2b0a3049c81b99ba233d5945e16dcddd975aa4f9
* Merge "Unify error/status codes"Marco Nelissen2014-05-156-145/+155
|\
| * Unify error/status codesMarco Nelissen2014-05-156-145/+155
| | | | | | | | Change-Id: Ib90cc2f2adc07ff146256931c92c0ec4becb86f5
* | Merge "Hook up event handling in NDK MediaDrm API"Jeff Tinker2014-05-151-5/+68
|\ \
| * | Hook up event handling in NDK MediaDrm APIJeff Tinker2014-05-151-5/+68
| |/ | | | | | | Change-Id: I48ac1d3ca5405c5909454c7a553917b31b9a50e5
* | ACodec: remove PTS log spamLajos Molnar2014-05-152-4/+2
| | | | | | | | | | | | Bug: 14976517 Bug: 11784827 Change-Id: Ibc1bbd80e7aac30b0f8f1e9ca2be1bb3e5e2ebbb
* | Merge "Send 64 bit OMX codec handling to 32 bit MediaServer"Andy Hung2014-05-153-0/+22
|\ \
| * | Send 64 bit OMX codec handling to 32 bit MediaServerAndy Hung2014-05-143-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary fix for 64 bit OMX handling until 64 bit codecs are more robust. Bug: 13938273 Change-Id: Ifc79e360f9606f6c909b859d322b7dd5d416b26b Signed-off-by: Andy Hung <hunga@google.com>
* | | Merge "Update OMX messages for 64 bit"Andy Hung2014-05-159-149/+235
|\ \ \ | |/ / | | / | |/ |/|
| * Update OMX messages for 64 bitAndy Hung2014-05-149-149/+235
| | | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | Only export necessary symbolsMarco Nelissen2014-05-147-25/+114
| | | | | | | | Change-Id: I869d7124c8cc555f4b09801a898f4dd3ecb072ec
* | Merge "Fix typos and pointer math."Marco Nelissen2014-05-142-8/+6
|\ \
| * | Fix typos and pointer math.Marco Nelissen2014-05-142-8/+6
| | | | | | | | | | | | Change-Id: I07f33a57454d013844b56bc3e57fe0a271e8b38c
* | | WIP: MediaDrm NDK APIsJeff Tinker2014-05-132-0/+607
|/ / | | | | | | | | Change-Id: I3ac08a3b027135c3fd2a9e95c5e8b3fd722df019 TODO: hooking up event handler, testing
* | Some crypto stuff, error codesMarco Nelissen2014-05-135-9/+436
|/ | | | | | | Add crypto/drm related functions, define some media errors instead of using magic numbers in the code. Change-Id: I5924cba0bfcdb3623073c9182a646b70f4ead5a5
* Merge "Add AMediaCodec callback"Marco Nelissen2014-05-131-13/+106
|\
| * Add AMediaCodec callbackMarco Nelissen2014-05-091-13/+106
| | | | | | | | Change-Id: I33b7ff3bcdcff6d3a5e1db385b900ae18b7e0f03
* | Fix bit rot in AudioStreamInSourceGlenn Kasten2014-05-091-1/+1
| | | | | | | | | | | | It obviously had not been compiled in a while. Change-Id: If514f474808e557a67a671c3b833572ad4a88338
* | Allow placement of Pipe buffer to be specifiedGlenn Kasten2014-05-091-4/+7
| | | | | | | | Change-Id: I2f6b68089ecfe85cd975d29ad0d0afd13c487002
* | Cache mCblk in local variable cblkGlenn Kasten2014-05-091-5/+7
| | | | | | | | | | | | This is the style used throughout the rest of AudioTrackShared. Change-Id: I959a6be3064e087bb19eba41173fd130dfcb4a9a
* | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-091-21/+1
| | | | | | | | Change-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf
* | Merge "IAudioFlinger::openRecord returns IMemory(s)"Glenn Kasten2014-05-092-12/+54
|\ \
| * | IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-092-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | openRecord() now explicitly returns the control block and data buffer as separate IMemory references. If the IMemory for data buffer is 0, this means it immediately follows the control block. Change-Id: Ic098f88f0e037f8fbe30006689e18cacacf09d06
* | | Merge "Expose sample duration in MPEG4Extractor."Robert Shih2014-05-095-8/+27
|\ \ \
| * | | Expose sample duration in MPEG4Extractor.Robert Shih2014-04-255-8/+27
| | | | | | | | | | | | | | | | | | | | Bug: 12782113 Change-Id: I75ee361243c5382d9288349c554deb7bed952782
* | | | Merge "PlaylistFetcher: start queueing AUs after the 1st IDR nalu"Robert Shih2014-05-092-0/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | PlaylistFetcher: start queueing AUs after the 1st IDR naluRobert Shih2014-04-252-0/+21
| |/ / | | | | | | | | | | | | Bug: 14159556 Change-Id: I4fc16dda9357e1251d2909571a79215d13d0104b
* | | Merge "stagefright: set PTS for SoftwareRenderer"Lajos Molnar2014-05-093-5/+13
|\ \ \
| * | | stagefright: set PTS for SoftwareRendererLajos Molnar2014-05-073-5/+13
| | | | | | | | | | | | | | | | Change-Id: I08661a9eae09f919149aa5a58aa514d848de50a1
* | | | MediaCodec: add renderAndReleaseOutputBuffer() method with timestampLajos Molnar2014-05-082-1/+49
| | | | | | | | | | | | | | | | | | | | Bug: 11784827 Change-Id: Ia1dcbd6c1d1a4380db04b750c0eb3fa0bd58d7b4
* | | | Merge "Allow BOM and space in WebVTT files"Lajos Molnar2014-05-092-1/+28
|\ \ \ \
| * | | | Allow BOM and space in WebVTT filesLajos Molnar2014-05-082-1/+28
| |/ / / | | | | | | | | | | | | | | | | Bug: 10900755 Change-Id: I47a7a33f749ea2470ce7d9d36d33c7484637d61c
* | | | resolved conflicts for merge of cf79c7a5 to masterYing Wang2014-05-082-11/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Ic4e75541193f733f477cfa4a2a87cce4c9e64f45
* \ \ \ \ Merge "Add client side support for more AUDIO_FORMAT_PCM_*"Glenn Kasten2014-05-081-7/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add client side support for more AUDIO_FORMAT_PCM_*Glenn Kasten2014-05-071-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As much as possible, the checks for specific formats are done on server side. The only exception is 8-bit, which needs a client side workaround. Change-Id: I52fe086c039460c8dac009de03b67eb54c56a836
* | | | | Make AMediaCodec_create* APIs more like their Java counterpartsMarco Nelissen2014-05-081-6/+7
| |_|/ / |/| | | | | | | | | | | | | | | | | | | and add configure flags. Change-Id: Ibfb7f8cad724fa1db2320966828104d40b5e6590
* | | | Merge "Expand AMediaFormat"Marco Nelissen2014-05-071-10/+44
|\ \ \ \
| * | | | Expand AMediaFormatMarco Nelissen2014-05-071-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Add NDK version of MediaMuxer"Marco Nelissen2014-05-075-4/+104
|\ \ \ \ \ | |/ / / /
| * | | | Add NDK version of MediaMuxerMarco Nelissen2014-05-075-4/+104
| |/ / / | | | | | | | | | | | | | | | | | | | | and add some constness here and there. Change-Id: Ib3caa8310691e8f27aaa1afcfaec0b384513d4f1
* | | | Merge "Fix a couple of fast capture typo bugs"Glenn Kasten2014-05-071-2/+2
|\ \ \ \
| * | | | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-071-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | AudioRecord constructor was not passing flags through to set(). Server-side check was using wrong kind of channel mask. Change-Id: Ifaa880ec323771e9fd168262be05f3e539f53390
* | | | Merge "Remove legacy omx_message variables"Andy Hung2014-05-073-50/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Remove legacy omx_message variablesAndy Hung2014-05-063-50/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove platform_private and data_ptr from omx_message. These were used for legacy deferred buffer creation. See OMXCodec quirks: kDefersOutputBufferAllocation and kRequiresAllocateBufferOnOutputPorts. Change-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf Signed-off-by: Andy Hung <hunga@google.com>
* | | | MediaFormat owns its stringsMarco Nelissen2014-05-061-2/+15
|/ / / | | | | | | | | | | | | | | | | | | Have MediaFormat own the strings it returns from toString and getString, reducing the chance of memory leaks. Change-Id: I0ddd593874c8b3af0b7714f2d8a106edf8121108
* | | Don't build libmediandk for PDKMarco Nelissen2014-05-051-1/+5
| | | | | | | | | | | | Change-Id: I9b2e5f5c8cc0fad59d4a4268c8767f540d536d10
* | | WIP: MediaCodec and friends NDK APIs, plain C versionMarco Nelissen2014-05-055-0/+709
| | | | | | | | | | | | Change-Id: I9ed6b9c5afb026a1b5fe8b652e75635bbcc223df
* | | Merge "Fix bug for direct track with PCM != 16-bit"Glenn Kasten2014-05-021-1/+2
|\ \ \
| * | | Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AUDIO_FORMAT_PCM_8_BIT format was being converted to AUDIO_FORMAT_PCM_16_BIT on client side even for direct tracks. That conversion was incorrect; it should only be done for mixed tracks. Also remove checks for specific PCM formats in the generic part of server side of createTrack. Those format checks should only be done by the thread. This will allow direct tracks for PCM 8-bit, PCM 24-bit, etc. Change-Id: If5b9fd79f8642ed93e2aeabcaf4809b2ed798978
generated by cgit v1.1 at 2024-04-28 09:50:03 +0000