summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* avc_util: fix aspect_ratio_idc 14~16Chong Zhang2015-03-131-9/+24
| | | | | bug: 19702519 Change-Id: I00772fe70be27f6a6a051fc0d18ebca64bbac43e
* Merge "nuplayer: remove prefill cache code"Chong Zhang2015-03-122-104/+27
|\
| * nuplayer: remove prefill cache codeChong Zhang2015-03-122-104/+27
| | | | | | | | | | | | | | | | | | | | it's only needed if we post Reset to GenericSource's looper, but we now do reset outside NuPlayer or GenericSource's looper. also don't allow buffering percentage to go backward unless there's seek or pause. Change-Id: I1a39df4bc0a685f76d8558c368db1bac92b490c2
* | 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
| | | | | | | | | | | | | | | | | | bug: 19567254 Change-Id: Iff689e1eea54283095068d68bcdff4c2674af554
* | | Fix print format error.Chih-Hung Hsieh2015-03-121-1/+1
| |/ |/| | | | | Change-Id: Ie3b754e22a4f858a35159abc8eaf00aa4949ab24
* | Merge "libmediaplayerservice: fix deadlock in dump()"Vineeta Srivastava2015-03-111-0/+5
|\ \
| * | libmediaplayerservice: fix deadlock in dump()Ravi Kumar Alamanda2015-03-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: Calling dump function while the media clients (sessions) are created and destroyed will result in a deadlock. Description: MediaPlayerService::dump() takes Mutex while calling client::dump() and right after that the strong reference to client is cleared. If there are no references to client object at this moment (which is the case if multiple audio sessions are created and destroyed) then the client destructor gets called which tries to take the same Mutex resulting in a deadlock. Fix: Take a strong reference to client objects and release them only after releasing the Mutex. Bug: 18700631 Author: Sidipotu Ashok<sashok@codeaurora.org> Change-Id: I82c89771de352d2f0d914eb0a3b9fc7bfb6116b0
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix the max duration for anchor time. Bug: 19196501 Change-Id: I9b8e0775105e31d47d919afaf49ca1e3d608a2f6
* | | | Merge "ATSParser: handle PID change"Chong Zhang2015-03-111-47/+96
|\ \ \ \
| * | | | ATSParser: handle PID changeChong Zhang2015-03-091-47/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also use original 33bit PTS on first frame, only do wrap around starting from second frame. bug: 19656539 Change-Id: I3733e0f60fe4b9275bef4aef819777852c112710
* | | | | 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
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unnecessary time discontinuity move fetcher to separate looper so that download won't block LiveSession poll buffering at 1 sec interval in LiveSession, and switch bandwidth if necessary use fixed 100ms threshold for resumeUntil bug: 19567254 Change-Id: I911e5041364f0858b43f2312756e173db5870a1e
* | | | | stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-1017-91/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-81/+3
|\ \ \ \
| * | | | mediaplayer: move MediaClock from NuPlayer to libstagefright.Wei Jia2015-03-095-81/+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 "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-091-1/+3
|\ \ \ \ \
| * | | | | Allow TRANSFER_OBTAIN to be used for fast tracksGlenn Kasten2015-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8fa20c26f076567b38210af4a680fe1cb2eacee4
* | | | | | Merge "AudioTrack::obtainBuffer() now returns number of non-contiguous frames"Glenn Kasten2015-03-091-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioTrack::obtainBuffer() now returns number of non-contiguous framesGlenn Kasten2015-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f61d7e3d057c3254babe456b4aa0f6a1809da55
* | | | | | Merge "AudioTrack::releaseBuffer parameter is const *"Glenn Kasten2015-03-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioTrack::releaseBuffer parameter is const *Glenn Kasten2015-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31ac20863107de05b83cd7f8cd7dd61bed98e456
* | | | | | Merge "AudioTrack obtain/release buffer comments"Glenn Kasten2015-03-091-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioTrack obtain/release buffer commentsGlenn Kasten2015-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0eb178d1ab4eea7f72f4c55852c19b216ca55f5f
* | | | | | 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
* | | | | 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
* | | | | stagefright: remove AMessage methods using id()Lajos Molnar2015-03-052-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I4b2ca396fb50cde5e7dc9801add69037febe698d
* | | | | media: switch to new AMessage handlingLajos Molnar2015-03-0538-311/+308
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I94cddcb81f671422ad4982a23dc4acfe57a9f1aa
* | | | | stagefright: use handler instead of handler-id in AMessageLajos Molnar2015-03-054-93/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \
| * | | | | | SoftAAC2: calculate timestamp from aacSampleRateChong Zhang2015-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19602975 Change-Id: Ie2e5a61d627980762080c4a8701b578143d123fa
generated by cgit v1.1 at 2024-05-02 16:30:46 +0000