summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Report key request message type for unprefixed EMEJeff Tinker2015-03-169-16/+40
* Merge "libstagefright: handle MediaFormat "priority" key."Ronghua Wu2015-03-162-0/+23
|\
| * libstagefright: handle MediaFormat "priority" key.Ronghua Wu2015-03-122-0/+23
* | Merge "libcameraservice: Stop using IGBC::BufferItem"Dan Stoza2015-03-169-16/+15
|\ \
| * | libcameraservice: Stop using IGBC::BufferItemDan Stoza2015-03-129-16/+15
* | | Merge "libstagefright: Stop using IGBC::BufferItem"Dan Stoza2015-03-166-21/+25
|\ \ \
| * | | libstagefright: Stop using IGBC::BufferItemDan Stoza2015-03-126-21/+25
| |/ /
* | | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-160-0/+0
|\ \ \
| * \ \ am faefd08b: (-s ours) Revert "DO NOT MERGE: stagefright: add support for Int...Lajos Molnar2015-02-110-0/+0
| |\ \ \
| * \ \ \ am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" ...Lajos Molnar2015-02-105-2/+190
| |\ \ \ \
| * \ \ \ \ am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl so...Lajos Molnar2015-02-09290-332/+4575
| |\ \ \ \ \
| * \ \ \ \ \ am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-091-0/+108
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 35395ea6: (-s ours) DO NOT MERGE: stagefright: add support for Intel\'s YU...Lajos Molnar2015-02-060-0/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge "avc_util: fix aspect_ratio_idc 14~16"Chong Zhang2015-03-141-9/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | avc_util: fix aspect_ratio_idc 14~16Chong Zhang2015-03-131-9/+24
* | | | | | | | | | | Merge "Fix warning while building mediaserver"Glenn Kasten2015-03-132-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix warning while building mediaserverGlenn Kasten2015-03-092-0/+4
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /