summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-1023-118/+198
| | | | | | | | Change replyID-s from uint32_t to an object Move reply handling into the loopers (to reuse a common mutex) Bug: 19607784 Change-Id: Iaa035b846c424c5687ed17ce1079b325e86c54be
* 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
| | | | | | | | | | | | | | | | | | | | | | | | Fix mismatch between track flags on client and server side when HW A/V sync is requested. The audio track was connected to a direct output by the audio policy manager but the client failed to set the direct flag when creating the track resulting in the direct flag not being set in audio flinger. Bug: 19665934. Change-Id: I0a5257b20bf76c9c4d89bc2ad9b44777b81f13bf
* | 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
| | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I86865e594226419bbbbee217098f96434e43afbe
* | | 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
| | | | | | | | | | | | | | | | | | bug: 19656539 Change-Id: I0ab9baad31e8953224a37d5aaf816e44780191c0
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ie35184f99c51e7bd94d7c826ffb8e89040a81905
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19656539 Change-Id: I41a36a48274616c3a65a79bf8446eeadb5595915
* | | | | | SoftAAC2: reset EOS status after a flushChong Zhang2015-03-091-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | bug:19656539 Change-Id: I27f41d885f4fd5bb5a0e29510f808fb84a0f75f3
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8fa20c26f076567b38210af4a680fe1cb2eacee4
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f61d7e3d057c3254babe456b4aa0f6a1809da55
* | | | | | Merge "AudioTrack::releaseBuffer parameter is const *"Glenn Kasten2015-03-092-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioTrack::releaseBuffer parameter is const *Glenn Kasten2015-03-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31ac20863107de05b83cd7f8cd7dd61bed98e456
* | | | | | Merge "AudioTrack obtain/release buffer comments"Glenn Kasten2015-03-092-12/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioTrack obtain/release buffer commentsGlenn Kasten2015-03-092-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0eb178d1ab4eea7f72f4c55852c19b216ca55f5f
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also mBufferSize was already being displayed as part of dumpBase Change-Id: I17f3062fcc076c594b5fd6b8fca286b27067e07c
* | | | | | | Merge "Display more fields in thread dumpBase"Glenn Kasten2015-03-091-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Display more fields in thread dumpBaseGlenn Kasten2015-03-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice15e999dda2f6cf9d23685ade4a87f74180322d
* | | | | | | Merge "drm: fix clang warning"Ronghua Wu2015-03-091-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | drm: fix clang warningRonghua Wu2015-03-091-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ic22368d1bed5d4226f6be4011a377b57787ac322
* | | | | | Merge "Defensively check for batterystats service instead of blocking to get ↵Warren Rehman2015-03-091-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | it."
| * | | | | Defensively check for batterystats service instead of blocking to get it.Warren Rehman2015-03-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19189826 Change-Id: I656e863eb68edf22812eb380ec6cd4105f4000aa On branch checkbattstats Changes to be committed: modified: MediaPlayerService.cpp
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13e375e67f20203c542b5350a55f42e925205b11
* | | | | | | libmediaplayerservice: fix make file for 64bit build.Ronghua Wu2015-03-061-9/+2
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: I5fa9ca39909b8ae2d6c2da8ac9fd3c4f9863b1f3
* | | | | | Merge "Add DRM session manager."Ronghua Wu2015-03-067-0/+657
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add DRM session manager.Ronghua Wu2015-03-067-0/+657
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19265536 Change-Id: Ia9f2c94c64ed6c1fe99d54de81d71c8973994865
* | | | | | Rename mName to mThreadName and kNameLength to kThreadNameLengthGlenn Kasten2015-03-062-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0adfcdcab7923a07a840ec0e04528cb8bfc41f10
* | | | | | WhitespaceGlenn Kasten2015-03-062-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch indent Change-Id: I652c798dd37a80634d247c4d881fb1cce92c4bd6
* | | | | | Rename tee sink file name and add prefix to macrosGlenn Kasten2015-03-061-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If316b9e32963d9baef8f4382fcc73dc6c4ff684d
* | | | | | Rename formal parameter to match type nameGlenn Kasten2015-03-061-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0761005b751f5c4a4b28729b1820961ff3077afd
* | | | | | Add devicesToString, inputFlagsToString, and sourceToStringGlenn Kasten2015-03-062-1/+106
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c09d76c204ffc5579f62d2ed1faef07922a5962
* | | | | | Merge "Fix typo in string table"Glenn Kasten2015-03-061-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in string tableGlenn Kasten2015-03-051-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: Iaf3d3c77129c62cf3dcad21fc754f390eb43b28e
* | | | | | stagefright: remove AMessage methods using id()Lajos Molnar2015-03-054-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I4b2ca396fb50cde5e7dc9801add69037febe698d
* | | | | | media: switch to new AMessage handlingLajos Molnar2015-03-0540-324/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I94cddcb81f671422ad4982a23dc4acfe57a9f1aa
* | | | | | stagefright: use handler instead of handler-id in AMessageLajos Molnar2015-03-058-105/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids locking gLooperRoster mutex on post() and deliver(). Bug: 19607784 Change-Id: If6d9d7884dbb08fc390983bda896d223803476ba
* | | | | | Merge "Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format ↵Robert Shih2015-03-061-3/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | change""
| * | | | | Revert "Fix NuPlayer::Decoder input buffer loss upon seamless format change"Robert Shih2015-03-041-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c5eef08195a6f81c2ae8fe7d4c346f12b15944e5. Change-Id: I49d817ed367aaa29a93e22135e9adf1e2ad253f1
* | | | | | Merge "mediaplayer: call setPlaybackRate after Renderer has looper set up."Wei Jia2015-03-041-4/+3
|\ \ \ \ \ \
| * | | | | | mediaplayer: call setPlaybackRate after Renderer has looper set up.Wei Jia2015-03-041-4/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: Iaac34a4a9e095799eb60e7d7a9bc228f0c7212b6
* | | | | | Merge "SoftAAC2: calculate timestamp from aacSampleRate"Chong Zhang2015-03-041-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
generated by cgit v1.1 at 2024-09-06 09:31:17 +0000