summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
|\ | | | | | | | | * commit '686a0c4db5e90b811b1fbe1dba3638522ef4b7a1': MTP Device: Parse USB3 descriptor for MTP initor;
| * Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
| |\
| | * MTP Device: Parse USB3 descriptor for MTP initor;Bo Huang2014-09-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | MTP initor in Android only support MTP responder based on USB2. Add support for MTP device based on USB3. Change-Id: I52b7a5ddff8ae3f8c2ce8a802c2cb2865f4e162a Signed-off-by: Bo Huang <bo.b.huang@intel.com>
* | | am d5923409: mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-212-1/+43
|\ \ \ | | | | | | | | | | | | | | | | * commit 'd5923409bbcbb22954a92c2b497ef4492d7cb6a5': mediaplayer: limit scheduling video frames into the future
| * | | mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-202-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses when video timestamps jumps before an audio timestamp, but still works on slideshow video clips (<=1fps). This, however, will not skip time-changes on video-only live video streams, as we cannot distinguish live slideshow video clips from non-slideshow ones. Bug: 18032127 Change-Id: I959a714edfe1c8cf3b84704c693dcd1b3e5b7855
* | | | am eecb7805: NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-212-36/+48
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eecb7805bbbb712925d4372c505f8c7f5c4fb5ed': NuPlayer: set anchor time for each audio buffer.
| * | | NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-202-36/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use anchor time to compute current position Bug: 17999949 Bug: 18008307 Bug: 18032127 Change-Id: Ie493c9a1d45d7b788aef65d863f710da6326fcc1
* | | | am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring ↵Andy Hung2014-10-171-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | tracks" into lmp-dev * commit 'e9234f17dfbb192c96b122b9e0ce8cd9015d1589': Fix AudioTrack retrograde getPosition when restoring tracks
| * | | Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-devAndy Hung2014-10-171-1/+4
| |\ \ \
| | * | | Fix AudioTrack retrograde getPosition when restoring tracksAndy Hung2014-10-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mReleased represents the number of frames written to the track, but was cleared on start() causing a mismatch if the client wrote to the track before starting. Moved the clearing to entering the STATE_STOPPED or STATE_FLUSHED state. Bug: 18017947 Bug: 18022276 Change-Id: I3788c98c4c3c4d9cc004378432797b3f3138e22e
* | | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 0ebf65b * commit '0ebf65be6642774c26e6fddd44b030ddd3eae492': move audio sink open/close to NuPlayerRenderer
| * | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
| |\ \ \ \
| | * | | | move audio sink open/close to NuPlayerRendererChong Zhang2014-10-164-123/+223
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 17675112 Change-Id: I7eb3d02380658f848baedafe2aea287586ccf016
* | | | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2': Add -no-integrated-as at local level.
| * \ \ \ \ am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '589a89f5a2a9aa08bdd9b78727f608f2f178f107': Add -no-integrated-as at local level.
| | * | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I5d95ef260c097961cb2bf2f15155572c2b24cb0e
* | | | | | am c40da54b: Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit 'c40da54b34138856446e79245ac45600191962b5': Fix freed memory references
| * | | | | Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix freed memory referencesMarco Nelissen2014-10-161-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Source references memory owned by MPEG4Extractor, and therefore an MPEG4Extractor needs to be kept around as long as the MPEG4Sources obtained from it exist. Bug: 17890354 Change-Id: I399e18ec78517559ccc0914ffc7e099687c0ba51
* | | | | | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '447898bca790fae2fdae304073162e980d816b79': ACodec: only check crop rect on output port
| * | | | | Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ \ \ \
| | * | | | | ACodec: only check crop rect on output portLajos Molnar2014-10-071-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17789956 Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a
* | | | | | | am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." ↵Lajos Molnar2014-10-146-225/+194
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '1375ac6d029b74ac392db411907b3c0ea57f08a7': NuPlayer: query current position from NuPlayerRenderer.
| * | | | | | Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-devLajos Molnar2014-10-146-225/+194
| |\ \ \ \ \ \
| | * | | | | | NuPlayer: query current position from NuPlayerRenderer.Ronghua Wu2014-10-136-225/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17653702 Change-Id: Ie0b1f92420b071a0cfcd389f5e7917a54d332541
* | | | | | | | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-1410-362/+454
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: I760286b72fe1ebda3e8b058ca2138cb97fbdb7e1
| * | | | | | | stagefright: fix surface input handling of software encodersLajos Molnar2014-10-1310-349/+456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added SoftVideoEncoder for common color conversion and extension handling logic - fix YUV420 SemiPlanar handling that should be NV12 not NV21 Bug: 17935149 Change-Id: I9b8d05678b1862dd37bf349ea83d67bdf1bb5560
* | | | | | | | am 512e9792: stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-144-21/+75
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '512e979284de984427e5b2f73b9054ae1b5e2b0a': stagefright: support passing GraphicBuffer in metadata buffer
| * | | | | | | stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-134-21/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935149 Change-Id: I6bb5dd654e498a7153410afc052c2c8f7f35e44d
* | | | | | | | am e760de61: Merge "NuPlayerDriver: request seek notification when ↵Wei Jia2014-10-131-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepare*() is called in STOPPED state." into lmp-dev * commit 'e760de61d9a662b1fbfda96ac34aaa246c2711bb': NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
| * | | | | | | Merge "NuPlayerDriver: request seek notification when prepare*() is called ↵Wei Jia2014-10-131-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | in STOPPED state." into lmp-dev
| | * | | | | | | NuPlayerDriver: request seek notification when prepare*() is called in ↵Wei Jia2014-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STOPPED state. Bug: 17596535 Change-Id: Ib43f91f9b0d0a52112aa1fa8352adac15aaf80f8
* | | | | | | | | am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-132-1/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit '801a3ff80c36aa9b55dc9b360d0e59f863011a39': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * | | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-132-1/+34
| |\ \ \ \ \ \ \ \
| | * | | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-132-1/+34
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: Id09190ae813aa9e00a3c1ef6fb8a1bd3021deb6e
* | | | | | | | | am 7225187b: Merge "ACodec: process deferred messages when entering Loaded ↵Wei Jia2014-10-131-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state." into lmp-dev * commit '7225187b5126b921e40f0221db158a16c366344e': ACodec: process deferred messages when entering Loaded state.
| * | | | | | | | Merge "ACodec: process deferred messages when entering Loaded state." into ↵Wei Jia2014-10-131-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | lmp-dev
| | * | | | | | | ACodec: process deferred messages when entering Loaded state.Wei Jia2014-10-101-0/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17792260 Change-Id: Ie8154cf41be5672fc8a9f3a2a82b7ede0a8b828f
* | | | | | | | am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ↵Guang Zhu2014-10-131-21/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat"" into lmp-dev * commit '380757ba5c927015d403e3b97cc418413330453e': Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
| * | | | | | | Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" ↵Guang Zhu2014-10-131-21/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | * | | | | | | Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"Guang Zhu2014-10-131-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 fix 64-bit builds This reverts commit 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b. Change-Id: Ifbc499342fb47fd67cae02a79cb900e701caed68
* | | | | | | | | am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-101-0/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit 'aec1dbfd10150da3f28b64471b4dc249a58a104e': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * | | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-101-0/+21
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | |
| | * | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-091-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: I8eab0acf55df6934e05947b0dbdd1fd456130088
* | | | | | | | am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ↵Lajos Molnar2014-10-101-9/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'a4c3d8f0f9aab53b106d95e6139e0465908909f4': MediaCodec: fix onError and onInputBufferAvailable
| * | | | | | | Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-devLajos Molnar2014-10-101-9/+15
| |\ \ \ \ \ \ \
| | * | | | | | | MediaCodec: fix onError and onInputBufferAvailableLajos Molnar2014-10-091-9/+15
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't call onInputBufferAvailable if we created an input surface - keep component name alive if an error occurs Bug: 17934966 Change-Id: I396c6e6cfd9fa589a1a95c6169492089255e6993
* | | | | | | | am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video ↵Wei Jia2014-10-102-1/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only case." into lmp-dev * commit '185a295d4518878d5e2bca7b7c3e51df44492df1': NuPlayerRenderer: adjust anchor time correctly for video only case.
| * | | | | | | Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." ↵Wei Jia2014-10-102-1/+19
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into lmp-dev
| | * | | | | | NuPlayerRenderer: adjust anchor time correctly for video only case.Wei Jia2014-10-092-1/+19
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17922171 Change-Id: I4c7e9e7f5ab96d3675d012ae30f78ef945394103
generated by cgit v1.1 at 2024-05-31 11:06:44 +0000