summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Explicit routing in AudioRecordPaul McLean2015-04-283-7/+30
| | | | Change-Id: I9cc5d54883a3e5c75d553fabb619fc8e49f4f9e5
* Merge "HDCP: buffer over flow check" into mnc-devChong Zhang2015-04-281-2/+24
|\
| * HDCP: buffer over flow checkChong Zhang2015-04-271-2/+24
| | | | | | | | | | bug: 20222489 Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3
* | Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate ↵Ronghua Wu2015-04-278-0/+62
|\ \ | | | | | | | | | for the codec used by nuplayer." into mnc-dev
| * | DO NOT MERGE libmediaplayerservice: set priority and operating rate for the ↵Ronghua Wu2015-04-278-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | codec used by nuplayer. Bug: 20481562 Change-Id: I9806414962352fbcda726f8274f1cd348c961de0 (cherry picked from commit f19f5d716b39a5d9dc1abdcd5a16a7aaf1b1ab8b)
* | | DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.Ronghua Wu2015-04-272-7/+18
|/ / | | | | | | | | | | Bug: 20559813 Change-Id: If231cb44337ca7dc74c39fc3cd73e2b6f3cb85b8 (cherry picked from commit d4c1f6b4ecfef7323422359fc38bd1edb1abf205)
* | Merge "Lock drm plugin API calls globally, not per MediaDrm instance"Jeff Tinker2015-04-252-1/+2
|\ \
| * | Lock drm plugin API calls globally, not per MediaDrm instanceJeff Tinker2015-04-222-1/+2
| | | | | | | | | | | | | | | | | | Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc related-to-bug: 18394494 related-to-bug: 19664283
* | | MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-241-1/+4
| | | | | | | | | | | | | | | Bug: 18872598 Change-Id: I0cdb2ffae202fc06b068c57dafae7523981b6000
* | | Merge "mediaresourcemanager: add dumpsys support."Ronghua Wu2015-04-242-0/+35
|\ \ \ | |_|/ |/| |
| * | mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-232-0/+35
| | | | | | | | | | | | | | | Bug: 20233206 Change-Id: Ic253985e408b05b488e87cd5c50c0d619ac568ef
* | | Merge "MediaCodec: ignore error when linkToDeath to batterystats"Chong Zhang2015-04-241-8/+5
|\ \ \
| * | | MediaCodec: ignore error when linkToDeath to batterystatsChong Zhang2015-04-241-8/+5
| | |/ | |/| | | | | | | | | | bug: 20071299 Change-Id: I932b40e46312db467fe88f8ff6cea028b63785cd
* | | Merge "HLS: make disconnect faster to prevent ANR"Chong Zhang2015-04-248-330/+510
|\ \ \
| * | | HLS: make disconnect faster to prevent ANRChong Zhang2015-04-238-330/+510
| |/ / | | | | | | | | | | | | | | | | | | disconnect HTTP connection when we absolutely won't resume bug: 19890444 Change-Id: Idee36b48741f6f8eb1d65bca32156e9e18349c67
* | | Merge "Copy sei offset/size during ABuffer/MediaBuffer conversion"Robert Shih2015-04-242-0/+13
|\ \ \
| * | | Copy sei offset/size during ABuffer/MediaBuffer conversionRobert Shih2015-04-232-0/+13
| | | | | | | | | | | | | | | | | | | | Bug: 20537676 Change-Id: I0bd11527ccd022c39d94b7877df81de4da1b14a6
* | | | MediaSync: allow users to query play time for pending audio frames.Wei Jia2015-04-231-0/+36
| |_|/ |/| | | | | | | | | | | Bug: 19666434 Change-Id: I5cfd3e1a9b4f56aaa6482facd55a22ed1e7ed3e6
* | | Merge "MediaSync: fix the optimization code path to reduce messages posted ↵Wei Jia2015-04-231-13/+29
|\ \ \ | |/ / |/| | | | | to drain video."
| * | MediaSync: fix the optimization code path to reduce messages posted to drain ↵Wei Jia2015-04-221-13/+29
| | | | | | | | | | | | | | | | | | | | | video. Bug: 19666434 Change-Id: I195a896033855ab3bfa43791b3c99f66776b007a
* | | Merge "libmediaplayerservice: set priority and operating rate for the codec ↵Ronghua Wu2015-04-221-0/+6
|\ \ \ | |_|/ |/| | | | | used by recorder."
| * | libmediaplayerservice: set priority and operating rate for the codec used by ↵Ronghua Wu2015-04-221-0/+6
| | | | | | | | | | | | | | | | | | | | | recorder. Bug: 20481562 Change-Id: Ibff54395e00809500d98e3759f9677f8168c98ae
* | | Merge "Use AudioPlaybackRate to hold TimestretchBufferProvider parameters"Ricardo Garcia2015-04-222-30/+35
|\ \ \
| * | | Use AudioPlaybackRate to hold TimestretchBufferProvider parametersRicardo Garcia2015-04-222-30/+35
| | |/ | |/| | | | | | | | | | | | | | | | | | | Use this struct to handle the parameters for TimestretchBufferProvider all across the system. Add stretch mode and fallback mode to TimestretchBuffer Provider. Change-Id: I19099924a7003c62e48bb6ead56c785cb129fba2
* | | Merge "audio policy: fix AudioTrack output device selection"Eric Laurent2015-04-221-3/+2
|\ \ \
| * | | audio policy: fix AudioTrack output device selectionEric Laurent2015-04-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have AudioTrack::setOutputDevice() set CBLK_INVALID flag instead of calling restoreTrack_l(). This allows restoreTrack_l() to be called in a safe context. Allow device change while the AudioTrack is active by forcing a new device selection in startOutput() if the output route for this session was changed. Remove some warnings. Change-Id: I2d921a63c9bfa0e122233645e2d6d39f95f5f17d
* | | | AnotherPacketSource: make getBufferedDurationUs more discontinuity-awareRobert Shih2015-04-213-105/+102
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The new getBufferedDurationUs implementation obsoletes the purpose of getEstimatedDurationUs; remove getEstimatedDurationUs and its associated member variables. Finally replace calls to getEstimatedDurationUs with getBufferedDurationUs. Change-Id: I38f20df8e177ffbfe299b203d99076fc98dcd274
* | | Merge "HLS: remove no more than 10% of bandwidth history at a time"Chong Zhang2015-04-213-12/+53
|\ \ \
| * | | HLS: remove no more than 10% of bandwidth history at a timeChong Zhang2015-04-213-12/+53
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix a 'possible video time jump' after seek, don't update renderer anchor time for 0-sized audio buffers - fix another 'possible video time jump' caused by some states not reset in mStreams - bandwidth estimator changes to not remove more than 10% of total transfer duration at a time to avoid jumping up too quickly bug: 20267388 related-to-bug: 19864613 related-to-bug: 20138395 Change-Id: I8812332cd1e26bf562acfaf086fd679a3549debc
* | | Merge "Fix mips build."Ying Wang2015-04-212-2/+2
|\ \ \ | |/ / |/| |
| * | Fix mips build.Ying Wang2015-04-202-2/+2
| | | | | | | | | | | | Change-Id: I49aa83e38e90ebd20793885de9420de96062aa37
* | | Merge "media: ignore the result of linkToDeath, which can fail if called ↵Ronghua Wu2015-04-201-5/+1
|\ \ \ | |/ / |/| | | | | from same process."
| * | media: ignore the result of linkToDeath, which can fail if called from same ↵Ronghua Wu2015-04-201-5/+1
| |/ | | | | | | | | | | | | process. Bug: 19620911 Change-Id: I6a25ed1ef1b2790d0976943ec129f31972e27714
* | Merge "stagefright: add a 2kb cache for CallbackDataSource."Chris Watkins2015-04-203-4/+80
|\ \
| * | stagefright: add a 2kb cache for CallbackDataSource.Chris Watkins2015-04-203-4/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without a cache the mediaserver does a lot of small reads which result in round trips through binder and jni to the app MediaDataSource. On a Nexus 5 I measured time to first frame from MediaPlayer for 1) 1350kbps h264, and 2) 20480kbps vp8. Without a cache, MediaDataSource was ~250ms slower than an fd. With a 2kb cache it's 30ms slower for (1) and 70ms slower for (2). Change-Id: If1e811db7b853c4f79430603318d4744ac30acb9
* | | Merge "HLS: reduce number of guessed wrong seq numbers"Chong Zhang2015-04-186-190/+266
|\ \ \
| * | | HLS: reduce number of guessed wrong seq numbersChong Zhang2015-04-176-190/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - account for playlist age in live streaming when calculating segment time - be more conservative on downswitching if bandwidth is unstable - adjust forward or backward if guessed wrong seq number - code refactor bug: 19567254 Change-Id: I0b61cea888fdffd1b3ee2446747ed10152e9e7d7
* | | | am 4c85e16c: am d2dc1ea3: am 88574352: am 7725022e: Merge "SoftMPEG2: start ↵Lajos Molnar2015-04-182-5/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output at first I-frame" * commit '4c85e16c9f7cbd9e9fa4713d62ed2c7f4da2f7d3': SoftMPEG2: start output at first I-frame
| * \ \ \ am 88574352: am 7725022e: Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '88574352adec1af117d21bb6fadf85b3b9b2f4bc': SoftMPEG2: start output at first I-frame
| | * \ \ \ am 7725022e: Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7725022e8bbff4160e46055ebaa4128dff86821c': SoftMPEG2: start output at first I-frame
| | | * | | | SoftMPEG2: start output at first I-frameVenkatarama Avadhani2015-04-172-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes thumbnail generation for open GOP sequences Also add -Werror to this library to detect issues. Change-Id: I0136ca05070326c895fb3010b8e9557eac2d25df
* | | | | | | Merge "NuPlayer: queue a deferred scan sources when flushing during scan"Chong Zhang2015-04-187-31/+32
|\ \ \ \ \ \ \
| * | | | | | | NuPlayer: queue a deferred scan sources when flushing during scanChong Zhang2015-04-177-31/+32
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also refactor code to move scheduleRequestBuffers to decoder base. bug: 20267388 Change-Id: I48f16adc6b4d4008f8fcda8b3b01c595ad199f8b
* | | | | | | Merge "libmediaplayerservice: fix warnings, make warnings errors, use clang"Lajos Molnar2015-04-1723-45/+50
|\ \ \ \ \ \ \
| * | | | | | | libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-1723-45/+50
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
* | | | | | | Merge "stagefright: make more warnings errors"Lajos Molnar2015-04-1724-44/+46
|\ \ \ \ \ \ \
| * | | | | | | stagefright: make more warnings errorsLajos Molnar2015-04-1724-44/+46
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
* | | | | | | libmedia: fix all warning, make warnings errors, use clangLajos Molnar2015-04-1712-16/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ic00d2c5d0bbb1605e96666e25c9ccc22bea6d3ff
* | | | | | stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-1777-194/+262
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
* | | | | Merge "NuPlayerDriver: Maintain the timeStamp after seek"Wei Jia2015-04-171-0/+3
|\ \ \ \ \
generated by cgit v1.1 at 2024-05-03 05:18:20 +0000