summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "media: add ResourceManagerService"Ronghua Wu2015-03-2415-0/+1526
|\
| * media: add ResourceManagerServiceRonghua Wu2015-03-2315-0/+1526
| | | | | | | | | | Bug: 19620911 Change-Id: Iea173d310d31781bc50effe3d9bd6553cb5139eb
* | Merge "MediaSync: support MediaSync in native code."Wei Jia2015-03-245-14/+806
|\ \
| * | MediaSync: support MediaSync in native code.Wei Jia2015-03-205-14/+806
| | | | | | | | | | | | | | | Bug: 19666434 Change-Id: Ib6678153f43f5063bdaaf53dd8ad5e8d26434e1e
* | | Merge "Report key request message type for unprefixed EME"Jeff Tinker2015-03-249-16/+40
|\ \ \
| * | | Report key request message type for unprefixed EMEJeff Tinker2015-03-169-16/+40
| | | | | | | | | | | | | | | | | | | | bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
* | | | LoggingGlenn Kasten2015-03-232-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move log of latency to where it is first computed. Log more parameters when a fast track is denied by client. Log session ID in destructor. Remove obsolete ALOGV that were for debugging a particular problem. Log more parameters of set(). Change-Id: I0156bceaf397f2faa053214572c57136705685ee
* | | | Merge "Fix position when restoring streaming audio track"Andy Hung2015-03-231-1/+1
|\ \ \ \
| * | | | Fix position when restoring streaming audio trackAndy Hung2015-03-201-1/+1
| | |/ / | |/| | | | | | | | | | | | | | Bug: 19802225 Change-Id: I19ca7836bc89627f6cead4961641b94c6b27b5f6
* | | | Merge "Update AudioRecord comments to match AudioTrack"Glenn Kasten2015-03-231-2/+8
|\ \ \ \
| * | | | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-231-2/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I02cb51af058277991ad0b1b5dce45744b8e8c129
* | | | | Merge "Update AudioTrack constructor and set() comments"Glenn Kasten2015-03-232-6/+13
|\ \ \ \ \ | |/ / / /
| * | | | Update AudioTrack constructor and set() commentsGlenn Kasten2015-03-232-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments were missing for recently added parameters. Change-Id: I414594fed56317112be5f3b415871d77e7f7e282
* | | | | Merge "Update AudioTrack code to match AudioRecord"Glenn Kasten2015-03-231-2/+9
|\ \ \ \ \ | |/ / / /
| * | | | Update AudioTrack code to match AudioRecordGlenn Kasten2015-03-231-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | session ID check buffer error code check Change-Id: I092a61adfd249122f9127dceedf67c0a3bdcfe7b
* | | | | Merge "Update AudioTrack comments to match AudioRecord"Glenn Kasten2015-03-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Update AudioTrack comments to match AudioRecordGlenn Kasten2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I176a4830513a0b37c38f86815fe637093b9ad52f
* | | | | Merge "AudioTrack::dump() comment"Glenn Kasten2015-03-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | AudioTrack::dump() commentGlenn Kasten2015-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id3b5210293a77404189555a0c797fb099e3c6c04
* | | | | Merge "AudioRecord::releaseBuffer() buffer is const *, like AudioTrack"Glenn Kasten2015-03-232-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | AudioRecord::releaseBuffer() buffer is const *, like AudioTrackGlenn Kasten2015-03-232-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: If09689a8411392281ad06fcf781f3198941c642d
* | | | | Merge "Remove dead AudioTrack::setAttributesFromStreamType()"Glenn Kasten2015-03-231-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove dead AudioTrack::setAttributesFromStreamType()Glenn Kasten2015-03-231-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I34feb3f9df49458f8a81ddcced4dd769fdaca945
* | | | | Merge "Deprecate AudioRecord::getInput() and AudioTrack::getOutput()"Glenn Kasten2015-03-233-3/+10
|\ \ \ \ \ | |/ / / /
| * | | | Deprecate AudioRecord::getInput() and AudioTrack::getOutput()Glenn Kasten2015-03-233-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not completely fix the bug, but is a step in the right direction. Bug: 12593118 Change-Id: Id591cd700ab58fd927ae44c71c81dac55b5cac2d
* | | | | Merge "namespace does not need a closing semicolon"Glenn Kasten2015-03-2331-31/+31
|\ \ \ \ \ | |/ / / /
| * | | | namespace does not need a closing semicolonGlenn Kasten2015-03-2331-31/+31
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie8f9d42fc061f6d558f23b98414e04eb3d14b376
* | | | | Merge "Declare and initialize in one statement"Glenn Kasten2015-03-232-8/+5
|\ \ \ \ \ | |/ / / /
| * | | | Declare and initialize in one statementGlenn Kasten2015-03-232-8/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie8593692907e67558f9d7654c9a4bf8cbce99bd8
* | | | | Merge "Move AudioTrack::isOffloaded() and isDirect() variants"Glenn Kasten2015-03-231-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Move AudioTrack::isOffloaded() and isDirect() variantsGlenn Kasten2015-03-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be near each other. Change-Id: Ic26681716ea48886f0bfed23803240466db5d8fa
* | | | | Merge "Whitespace"Glenn Kasten2015-03-234-9/+7
|\ \ \ \ \ | |/ / / /
| * | | | WhitespaceGlenn Kasten2015-03-234-9/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I4640be948ad3caff0eb7525991398a1353e4bfe6
* | | | | Merge "Add FIXME to deprecate AudioTrack::getMinFrameCount()"Glenn Kasten2015-03-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add FIXME to deprecate AudioTrack::getMinFrameCount()Glenn Kasten2015-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continuation of previous change, for all APIs that assume a route Change-Id: Ia1315032cf6366f428db342b16b2e1c3b574f407
* | | | | Merge "Update AudioRecord comments to match AudioTrack"Glenn Kasten2015-03-232-14/+22
|\ \ \ \ \ | |/ / / /
| * | | | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-232-14/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: I6c3620c60c0ba159e4688b42de4ec8b91920e048
* | | | | Merge "Fix typos"Glenn Kasten2015-03-233-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Fix typosGlenn Kasten2015-03-233-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in comments Add formal parameter name to declaration where it was missing Fix out of order comments Change-Id: I1de81ae82af5ca507864e4c7b959111bac898b98
* | | | am de68ef61: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ↵Qiwen Zhao2015-03-220-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MERGE ANYWHERE. * commit 'de68ef61adef43be293e81ed1e8adcee8ebbbe04':
| * \ \ \ reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \ \ \
| | * \ \ \ reset to lmp-mr1-dev-plus-aosp with history.Qiwen Zhao2015-03-200-0/+0
| | |\ \ \ \ | |/ / / / /
| | * | | | am 1830c701: am 90073050: Merge "Fix the bug that same video frame has been ↵hkuang2015-03-200-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoded twice during port reconfig." into lmp-dev * commit '1830c7015989a10a803ebff8d710c2655ec9d81d':
| | * \ \ \ \ am 6e2ced09: am d3db0bfa: Merge "NuPlayer: add seek operation when change ↵Wei Jia2015-03-200-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | video texture surface." into lmp-dev * commit '6e2ced090d64e0ddeb274035dc4ffaf6b01153b0':
| | * \ \ \ \ \ am e866880a: am d71233a8: Merge "Use CharacterEncodingDetector in ↵Marco Nelissen2015-03-200-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metadataretriever" into lmp-dev * commit 'e866880ae1709062e0a8b36e62a78d91c3f06cc9':
| | * \ \ \ \ \ \ am e8d39b9d: am acdae5d7: Merge "Move stale handler cleanup to constructor" ↵Marco Nelissen2015-03-200-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'e8d39b9d70c69656e897fece70df0c0bfa5bfb88':
| | * \ \ \ \ \ \ \ am ba19ee84: am ea8462cc: Merge "Fix more potential deadlocks in ↵Marco Nelissen2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALooperRoster" into lmp-dev * commit 'ba19ee846cef06e2c70adfd6be7e17ae26cb14e1':
| | * \ \ \ \ \ \ \ \ am 955d8f90: am 23c8cf95: Merge "Restore the ability to build tee sink for ↵Glenn Kasten2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging" into lmp-dev * commit '955d8f906e920fe8da66e7943a7f2bfa98422e19':
| | * \ \ \ \ \ \ \ \ \ am 85b41b0f: am 453d633b: Merge "render one video frame after flush even ↵Chong Zhang2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we\'re paused" into lmp-dev * commit '85b41b0f1fd9b683e3075cac53d522e664ee2ac7':
| | * \ \ \ \ \ \ \ \ \ \ am 3d640e0a: am 97d547da: audio flinger: fix use of global effect bufferEric Laurent2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3d640e0a93e31bb53e671ed467774b63bb69750e':