summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* avc_util: fix aspect_ratio_idc 14~16Chong Zhang2015-03-131-9/+24
* Merge "nuplayer: remove prefill cache code"Chong Zhang2015-03-122-104/+27
|\
| * nuplayer: remove prefill cache codeChong Zhang2015-03-122-104/+27
* | Merge "NuPlayer: play out pending frames on discontinuity"Chong Zhang2015-03-126-59/+102
|\ \
| * | NuPlayer: play out pending frames on discontinuityChong Zhang2015-03-106-59/+102
* | | Fix print format error.Chih-Hung Hsieh2015-03-121-1/+1
| |/ |/|
* | Merge "libmediaplayerservice: fix deadlock in dump()"Vineeta Srivastava2015-03-111-0/+5
|\ \
| * | libmediaplayerservice: fix deadlock in dump()Ravi Kumar Alamanda2015-03-111-0/+5
* | | Merge "mediaplayer: update mAnchorNumFramesWritten when anchor time is updated."Wei Jia2015-03-111-0/+1
|\ \ \
| * | | mediaplayer: update mAnchorNumFramesWritten when anchor time is updated.Wei Jia2015-03-111-0/+1
* | | | Merge "ATSParser: handle PID change"Chong Zhang2015-03-111-47/+96
|\ \ \ \
| * | | | ATSParser: handle PID changeChong Zhang2015-03-091-47/+96
* | | | | Merge "HLS: misc changes in LiveSession buffering logic"Chong Zhang2015-03-104-264/+181
|\ \ \ \ \
| * | | | | HLS: misc changes in LiveSession buffering logicChong Zhang2015-03-104-264/+181
| | |_|_|/ | |/| | |
* | | | | stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-1023-118/+198
* | | | | Merge "fix flush on HW A/V sync tracks"Eric Laurent2015-03-101-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix flush on HW A/V sync tracksEric Laurent2015-03-091-0/+3
| |/ / /
* | | | Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."Wei Jia2015-03-105-4/+3
|\ \ \ \
| * | | | mediaplayer: move MediaClock from NuPlayer to libstagefright.Wei Jia2015-03-095-4/+3
* | | | | Merge "do not do bandwidth estimation if total data downloaded is too small"Chong Zhang2015-03-101-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | do not do bandwidth estimation if total data downloaded is too smallChong Zhang2015-03-091-1/+5
| | |/ / | |/| |
* | | | Merge "Camera: Wire up dataSpace, clean up ICameraDeviceUser"Eino-Ville Talvala2015-03-0925-67/+95
|\ \ \ \
| * | | | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-0625-67/+95
* | | | | Merge "drm: use DrmSessionManager for session resource managing."Ronghua Wu2015-03-096-23/+135
|\ \ \ \ \
| * | | | | drm: use DrmSessionManager for session resource managing.Ronghua Wu2015-03-066-23/+135
* | | | | | Merge "AnotherPacketSource: return format of first non-discontinuity packet"Chong Zhang2015-03-091-7/+5
|\ \ \ \ \ \
| * | | | | | AnotherPacketSource: return format of first non-discontinuity packetChong Zhang2015-03-091-7/+5
* | | | | | | SoftAAC2: reset EOS status after a flushChong Zhang2015-03-091-0/+2
|/ / / / / /
* | | | | | Merge "Allow TRANSFER_OBTAIN to be used for fast tracks"Glenn Kasten2015-03-092-3/+6
|\ \ \ \ \ \
| * | | | | | Allow TRANSFER_OBTAIN to be used for fast tracksGlenn Kasten2015-03-092-3/+6
* | | | | | | Merge "AudioTrack::obtainBuffer() now returns number of non-contiguous frames"Glenn Kasten2015-03-092-5/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioTrack::obtainBuffer() now returns number of non-contiguous framesGlenn Kasten2015-03-092-5/+15
* | | | | | | Merge "AudioTrack::releaseBuffer parameter is const *"Glenn Kasten2015-03-092-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioTrack::releaseBuffer parameter is const *Glenn Kasten2015-03-092-2/+2
* | | | | | | Merge "AudioTrack obtain/release buffer comments"Glenn Kasten2015-03-092-12/+29
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioTrack obtain/release buffer commentsGlenn Kasten2015-03-092-12/+29
* | | | | | | Merge "Dump generic information first for each thread"Glenn Kasten2015-03-091-7/+6
|\ \ \ \ \ \ \
| * | | | | | | Dump generic information first for each threadGlenn Kasten2015-03-061-7/+6
* | | | | | | | Merge "Display more fields in thread dumpBase"Glenn Kasten2015-03-091-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Display more fields in thread dumpBaseGlenn Kasten2015-03-061-0/+4
* | | | | | | | Merge "drm: fix clang warning"Ronghua Wu2015-03-091-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | drm: fix clang warningRonghua Wu2015-03-091-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Defensively check for batterystats service instead of blocking to get ...Warren Rehman2015-03-091-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Defensively check for batterystats service instead of blocking to get it.Warren Rehman2015-03-051-1/+2
* | | | | | | Merge "Include ABase.h to get definition of DISALLOW_EVIL_CONSTRUCTORS."Chih-Hung Hsieh2015-03-061-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Include ABase.h to get definition of DISALLOW_EVIL_CONSTRUCTORS.Chih-Hung Hsieh2015-03-061-0/+1
* | | | | | | | libmediaplayerservice: fix make file for 64bit build.Ronghua Wu2015-03-061-9/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge "Add DRM session manager."Ronghua Wu2015-03-067-0/+657
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add DRM session manager.Ronghua Wu2015-03-067-0/+657
* | | | | | | Rename mName to mThreadName and kNameLength to kThreadNameLengthGlenn Kasten2015-03-062-14/+15