summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Report key request message type for unprefixed EME"Jeff Tinker2015-03-241-1/+2
|\
| * Report key request message type for unprefixed EMEJeff Tinker2015-03-161-1/+2
| | | | | | | | | | bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
* | 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 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-231-1/+1
|\ \ \ | |/ /
| * | AudioRecord::releaseBuffer() buffer is const *, like AudioTrackGlenn Kasten2015-03-231-1/+1
| | | | | | | | | | | | 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-232-1/+8
|\ \ \ | |/ /
| * | Deprecate AudioRecord::getInput() and AudioTrack::getOutput()Glenn Kasten2015-03-232-1/+8
| | | | | | | | | | | | | | | | | | | | | Does not completely fix the bug, but is a step in the right direction. Bug: 12593118 Change-Id: Id591cd700ab58fd927ae44c71c81dac55b5cac2d
* | | 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-232-5/+5
|\ \ \ | |/ /
| * | WhitespaceGlenn Kasten2015-03-232-5/+5
| | | | | | | | | | | | 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-231-13/+21
|\ \ \ | |/ /
| * | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-231-13/+21
| | | | | | | | | | | | Change-Id: I6c3620c60c0ba159e4688b42de4ec8b91920e048
* | | Merge "Fix typos"Glenn Kasten2015-03-232-3/+3
|\ \ \ | |/ /
| * | Fix typosGlenn Kasten2015-03-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix typos in comments Add formal parameter name to declaration where it was missing Fix out of order comments Change-Id: I1de81ae82af5ca507864e4c7b959111bac898b98
* | | am f1300d31: am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"Marco Nelissen2015-03-222-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * commit 'f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba': ulaw and alaw aren't limited to 8kHz
| * | | ulaw and alaw aren't limited to 8kHzMarco Nelissen2015-03-202-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=158490 Change-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf
| * | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-1922-58/+384
| |\ \ \
* | | | | camera2: Remove ProCamera.Ruben Brunk2015-03-204-500/+0
| |_|/ / |/| | | | | | | | | | | | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* | | | Merge "Event driven wake for AudioRecordThread notification changes"Andy Hung2015-03-191-1/+4
|\ \ \ \
| * | | | Event driven wake for AudioRecordThread notification changesAndy Hung2015-03-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used for setMarkerPosition and setPositionUpdatePeriod. Change-Id: Iedd1be8725dea32bdba6908b78c5166780a66fec
* | | | | Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-192-3/+54
|\ \ \ \ \
| * | | | | Camera: plumbing rotation field throughYin-Chia Yeh2015-03-182-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | | | | | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-191-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This updates the CameraService to implement client eviction behavior based on process priority. Bug: 19186859 Change-Id: I646939b1cdf1a2237c4e5044164d55a2542cf36e
* | | | | | Merge "Add FIXME to deprecate all APIs that assume a route"Glenn Kasten2015-03-163-0/+6
|\ \ \ \ \ \
| * | | | | | Add FIXME to deprecate all APIs that assume a routeGlenn Kasten2015-03-133-0/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: I84e160e3945004338c808edd86b5dbbca1e12874
* | | | | | Merge "Update comments"Glenn Kasten2015-03-164-6/+8
|\ \ \ \ \ \
| * | | | | | Update commentsGlenn Kasten2015-03-134-6/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I37d3c4ce22b74fe8581a886fe5a7f9fef8266dad
* | | | | | Merge "libstagefright: add ProcessInfo to get process priority."Ronghua Wu2015-03-162-0/+73
|\ \ \ \ \ \
| * | | | | | libstagefright: add ProcessInfo to get process priority.Ronghua Wu2015-03-162-0/+73
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I240b814b8925b1d6266e6f998a7debd654a2145a
* | | | | | Merge "radio client"Eric Laurent2015-03-162-0/+126
|\ \ \ \ \ \
| * | | | | | radio clientEric Laurent2015-03-102-0/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added implementation of native broadcast radio client class and callback. Change-Id: I82478448e32a5b9be5165e7eb53b99b6289884ed
* | | | | | | Merge "radio service binder interfaces"Eric Laurent2015-03-163-0/+179
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | radio service binder interfacesEric Laurent2015-03-103-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added definiiton and implemention of binder interfaces fro native broadcastradio service. Change-Id: Id5a93bc3146229dffc74b56c29ba48e02b9a5518
* | | | | | Merge "libstagefright: handle MediaFormat "priority" key."Ronghua Wu2015-03-161-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | libstagefright: handle MediaFormat "priority" key.Ronghua Wu2015-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I73675c7cc3d742b9a1a98d6c0f48dcf17557e2ad
* | | | | | Merge "Fix warning while building mediaserver"Glenn Kasten2015-03-131-0/+2
|\ \ \ \ \ \
| * | | | | | Fix warning while building mediaserverGlenn Kasten2015-03-091-0/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In file included from frameworks/av/services/audiopolicy/managerdefault/AudioPolicyManager.h:31:0, from frameworks/av/services/audiopolicy/service/AudioPolicyService.h:38, from frameworks/av/media/mediaserver/main_mediaserver.cpp:36: frameworks/av/services/audiopolicy/managerdefault/ConfigParsingUtils.h:29:0: warning: "ARRAY_SIZE" redefined #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) ^ In file included from frameworks/av/media/libmediaplayerservice/MediaPlayerService.h:31:0, from frameworks/av/media/mediaserver/main_mediaserver.cpp:35: frameworks/av/include/media/stagefright/foundation/ABase.h:21:0: note: this is the location of the previous definition #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) ^ Change-Id: I4b80f783c592a78aa88b3dad297278353740466e
generated by cgit v1.1 at 2024-06-02 00:59:35 +0000