summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* IAudioFlinger::openRecord now suggests notificationFramesGlenn Kasten2014-07-031-0/+1
| | | | Change-Id: I08885cc381d03c522a23289e74f0e1ed46563863
* Add new API AudioRecord::notificationFrames()Glenn Kasten2014-07-031-0/+5
| | | | Change-Id: I27fb888f01ed547242ffaa8d4626d38c7999ad53
* Support for audio attributes on audio output of media playerJean-Michel Trivi2014-07-012-4/+10
| | | | Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
* Merge "Add HEVC encoder support to ACodec"Rachad2014-06-271-0/+1
|\
| * Add HEVC encoder support to ACodecRachad2014-06-261-0/+1
| | | | | | | | | | Bug: 14571712 Change-Id: Idaec2394d569541f3963befe722f46f6b0007937
* | AudioTrack: add support for compressed audioEric Laurent2014-06-192-0/+10
| | | | | | | | | | | | | | | | | | Add support for compressed audio playback by use of an AudioTrack attached to a direct output thread. Bug: 9428304. Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
* | Merge changes I0fef0584,I322b91faJean-Michel Trivi2014-06-183-2/+22
|\ \ | | | | | | | | | | | | | | | * changes: AudioPolicyManager: return output for audio attributes AudioTrack construction with audio attributes
| * | AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-182-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AudioPolicyManager, support querying an output or playback strategy for audio attributes, instead of a stream type, In AudioTrack creation, use the output returned for the track's attributes. Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
| * | AudioTrack construction with audio attributesJean-Michel Trivi2014-06-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store audio attributes in AudioTrack class. When an AudioTrack is "set" with non null audio attributes, derive a stream type that reflects the attributes. When an AudioTrack is "set" without attributes, and only has a stream type, derive default audio attributes. Change-Id: I322b91fa9a7e193118960c5e78cdddd85d66f9ad
* | | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-141-0/+1
|\ \ \
| * | | support for CEA-608 closed captionChong Zhang2014-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 15470448 Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
* | | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-121-0/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | refactor getTrackInfo()Chong Zhang2014-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (this is in preparation for supporting other cc source) - split into two methods: getTrackCount() and getTrackInfo() - move track info parcelling to NuPlayer - parcel in the mime type of the subtitle format Bug: 15470448 Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
* | | Merge "AudioSystem: remove unused stream type"Jean-Michel Trivi2014-06-121-2/+0
|\ \ \
| * | | AudioSystem: remove unused stream typeJean-Michel Trivi2014-06-111-2/+0
| |/ / | | | | | | | | | | | | | | | | | | The audio stream type is not used in the getSampleRate() and getFrameCount() methods. Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d
* | | am 6bf02664: am ccaffa8d: Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * commit '6bf02664bbe4955d4818fe308b00ce0d97f38c8f': Use char x[] rather than char x[0].
| * \ \ am ccaffa8d: Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-131-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'ccaffa8df0e201da6bfabb6d616e62904cfb5534': Use char x[] rather than char x[0].
| | * \ \ Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-121-1/+1
| | |\ \ \
| | | * | | Use char x[] rather than char x[0].Elliott Hughes2014-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15514223 Change-Id: I895ea8ef7e391fd14cdf8976e048385e01c90f8f
| * | | | | resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-132-3/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
| | * | | | Update OMX messages for 64 bitAndy Hung2014-06-122-3/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-123-3/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
| * | | | am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-123-3/+28
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f': Offer a type-safe album art interface.
| | * | | Offer a type-safe album art interface.Elliott Hughes2014-06-113-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | | | | MediaProfiles: Add 4K video related constantsZhijun He2014-06-101-2/+4
| |_|/ / |/| | | | | | | | | | | | | | | Bug: 15287656 Change-Id: I4c49640a349afb336f52db1636902fc216bff6ad
* | | | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-062-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed QuerySupportedProfileLevels in SoftVideoDecoderOMXComponent.cpp Bug: 14571712 Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777
* | | | audio policy: add routing update client interfaceEric Laurent2014-05-293-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added IAudioPolicyServiceClient client binder interface for client process to receive notifications from AudioPolicyService when audio ports are added/removed or audio patches created/released. The audio patches owned by a given client are automatically released when this client binder dies. Bug: 14815883. Change-Id: I6013f6aec03b50565cffb1ad2cd1f0f8852032c5
* | | | DO NOT MERGE - IAudioPolicyService interface extension for patch panelEric Laurent2014-05-282-0/+50
| | | | | | | | | | | | | | | | Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1
* | | | DO NOT MERGE - IAudioFlinger interface extension for patch panelEric Laurent2014-05-281-0/+21
| |_|/ |/| | | | | | | | Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330
* | | Merge "Add HEVC decoder support to ACodec bug: 14571712"Rachad2014-05-191-0/+1
|\ \ \
| * | | Add HEVC decoder support to ACodecRachad2014-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | bug: 14571712 Change-Id: I221625a42e143cb1c581059694f6730211e251ae
* | | | Update OMX messages for 64 bitAndy Hung2014-05-142-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | 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-1/+6
| | | | | | | | | | | | Change-Id: I2f6b68089ecfe85cd975d29ad0d0afd13c487002
* | | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-091-3/+0
| | | | | | | | | | | | Change-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf
* | | IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | MediaCodec: add renderAndReleaseOutputBuffer() method with timestampLajos Molnar2014-05-081-0/+1
| | | | | | | | | | | | | | | Bug: 11784827 Change-Id: Ia1dcbd6c1d1a4380db04b750c0eb3fa0bd58d7b4
* | | Merge "Add client side support for more AUDIO_FORMAT_PCM_*"Glenn Kasten2014-05-081-2/+3
|\ \ \
| * | | Add client side support for more AUDIO_FORMAT_PCM_*Glenn Kasten2014-05-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Remove legacy omx_message variablesAndy Hung2014-05-061-2/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ↵Lajos Molnar2014-05-021-0/+110
|\ \ \ | |/ / | | | | | | | | | | | | | | | ClockEstimator API and WindowedLinearFitEstimator" * commit 'edf6131d1eca1fdff3b151805d241a1cc81b52ca': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| * | am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and ↵Lajos Molnar2014-05-021-0/+110
| |\ \ | | |/ | | | | | | | | | | | | | | | WindowedLinearFitEstimator" * commit '075c8f6e174e824b6bc95809cc25f1430e9d4e62': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| | * am a69d6f52: Merge "stagefright: add ClockEstimator API and ↵Lajos Molnar2014-05-021-0/+110
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | WindowedLinearFitEstimator" * commit 'a69d6f529239950a8bdf5e4253ea13bb029375cb': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| | | * stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-011-0/+110
| | | | | | | | | | | | | | | | Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
| | * | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-293-0/+9
| | |\ \ | | | |/ | | |/|
| | | * am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'b635b0e66b257ab442e230bca96afd5105cf6829': mediaplayer: keep more buffers with the BufferQueue
| | | * \ am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" ↵Chong Zhang2014-03-132-0/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec': Cap pts gap between adjacent frames to specified value
| | | * \ \ am 6db20dcb: Merge "AudioTrack: When paused, return cached playback ↵Eric Laurent2014-03-081-0/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" into klp-dev * commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4': AudioTrack: When paused, return cached playback position
| | | * \ \ \ am 2613347d: Merge "Added support to query ACodec whether adaptive playback ↵Lajos Molnar2014-03-071-0/+3
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is enabled." into klp-dev * commit '2613347d74c3f35bc6fda5df1c29c1119c22d432': Added support to query ACodec whether adaptive playback is enabled.
| | | * \ \ \ \ am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-072-4/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01': Make frameworks/av 64-bit compatible