summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "LiveSession: added onSwitchDown" into lmp-devRobert Shih2014-09-124-4/+128
|\
| * LiveSession: added onSwitchDownRobert Shih2014-09-114-4/+128
* | Merge "LiveSession: raise upwards adaptation constraint" into lmp-devRobert Shih2014-09-122-16/+21
|\ \
| * | LiveSession: raise upwards adaptation constraintRobert Shih2014-09-102-16/+21
* | | Merge "StagefrightRecorder: default to codec and fps from camcorder low profi...Chong Zhang2014-09-112-6/+33
|\ \ \
| * | | StagefrightRecorder: default to codec and fps from camcorder low profileChong Zhang2014-09-112-6/+33
* | | | Merge "PlaylistFetcher: avoid repeated fetch when we run off the edge of live...Robert Shih2014-09-111-6/+0
|\ \ \ \
| * | | | PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlistsRobert Shih2014-09-071-6/+0
* | | | | avoid kWhatReadBuffer message spam in GenericSourceLajos Molnar2014-09-112-4/+19
* | | | | Merge "Clean up AudioTrack position and timestamp handling" into lmp-devGlenn Kasten2014-09-111-18/+73
|\ \ \ \ \
| * | | | | Clean up AudioTrack position and timestamp handlingGlenn Kasten2014-09-111-18/+73
* | | | | | Merge "stagefright: add adaptive playback support to SoftAVC decoder." into l...Ronghua Wu2014-09-115-107/+130
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | stagefright: add adaptive playback support to SoftAVC decoder.Ronghua Wu2014-09-105-107/+130
* | | | | | Merge "stagefright: don't use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-111-30/+93
|\ \ \ \ \ \
| * | | | | | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-101-30/+93
* | | | | | | mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-101-0/+11
| |_|_|/ / / |/| | | | |
* | | | | | Merge "NuPlayerDriver: do not set to paused state when receiving playback com...Wei Jia2014-09-101-5/+8
|\ \ \ \ \ \
| * | | | | | NuPlayerDriver: do not set to paused state when receiving playback complete a...Wei Jia2014-09-101-5/+8
* | | | | | | Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" ...Marco Nelissen2014-09-102-194/+128
|\ \ \ \ \ \ \
| * | | | | | | Revert "Fix AAC timestamps for multiple aac frames per input buffer"Marco Nelissen2014-09-102-194/+128
* | | | | | | | Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix failure in MediaCodecTest#testExceptionChong Zhang2014-09-101-1/+14
* | | | | | | | Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-devLajos Molnar2014-09-101-6/+7
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | mediaplayer: limit number of outstanding buffer requestsLajos Molnar2014-09-091-6/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-101-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-091-0/+1
* | | | | | | Merge "NuPlayer: make previous decoders obsolete when reset is done." into lm...Wei Jia2014-09-091-0/+3
|\ \ \ \ \ \ \
| * | | | | | | NuPlayer: make previous decoders obsolete when reset is done.Wei Jia2014-09-091-0/+3
| |/ / / / / /
* | | | | | | Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-devPhil Burk2014-09-091-1/+0
|\ \ \ \ \ \ \
| * | | | | | | [media][nuplayer] Remove debug message EWOULDBLOCKPhil Burk2014-09-091-1/+0
| |/ / / / / /
* | | | | | | Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warnin...Rachad2014-09-091-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.Rachad2014-09-091-2/+4
* | | | | | | Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-devMarco Nelissen2014-09-092-128/+194
|\ \ \ \ \ \ \
| * | | | | | | Fix AAC timestamps for multiple aac frames per input bufferMarco Nelissen2014-09-072-128/+194
* | | | | | | | Merge "NuPlayer: check mSource before deferencing it." into lmp-devWei Jia2014-09-091-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | NuPlayer: check mSource before deferencing it.Wei Jia2014-09-091-1/+2
* | | | | | | | Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-devPhil Burk2014-09-082-4/+94
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | [audio][nuplayer] Aggregate buffers to reduce power.Phil Burk2014-09-082-4/+94
* | | | | | | | Merge "Fix potential deadlock between AudioPolicyService and AudioSystem" int...Andy Hung2014-09-081-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix potential deadlock between AudioPolicyService and AudioSystemAndy Hung2014-09-081-1/+5
* | | | | | | | | Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lm...Wei Jia2014-09-081-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | NuPlayerDriver: put player in paused state when reaching EOS.Wei Jia2014-09-051-2/+2
* | | | | | | | | Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-devGlenn Kasten2014-09-081-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-051-2/+2
* | | | | | | | | Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-devAndy Hung2014-09-082-12/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Revert "Revert "disable AwesomePlayer for Ogg vorbis""Andy Hung2014-09-032-12/+14
* | | | | | | | | Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malform...Robert Shih2014-09-061-3/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csdRobert Shih2014-09-061-3/+23
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "Cache audio attributes when player not available" into lmp-devJean-Michel Trivi2014-09-051-2/+19
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Cache audio attributes when player not availableJean-Michel Trivi2014-09-051-2/+19