summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio policy: fix IOProfile::isCompatibleProfile()Eric Laurent2015-03-302-3/+11
| | | | | | | | | | | Handle composite devices in IOProfile::isCompatibleProfile() by just checking the type in this case, not the address which is relevant only if a single device type is passed as input. Also remove warning. Bug: 19762960. Change-Id: Iaecb7fcfbf7ad39b1e33cb460922f7c069a34a00
* Merge "HLS: bandwidth estimator changes"Chong Zhang2015-03-193-69/+149
|\
| * HLS: bandwidth estimator changesChong Zhang2015-03-193-69/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - separate bandwidth estimator from HTTPBase, so that we have better control on which samples to use, it also allows bandiwdth history across multiple HTTPBase objects (which we'll use later). - use min buffer duration among the streams to decide whether to download next segment. - maintain constant buffer level, time next download to happen when buffer just goes below kMinBufferedDurationUs. bug: 19567254 Change-Id: I5c481ad1f7ff3f084d57ec68856e12ae6b40ce41
* | Merge "Fix link error of PROCESS_STATE_NONEXISTENT."Chih-Hung Hsieh2015-03-191-1/+5
|\ \ | |/ |/|
| * Fix link error of PROCESS_STATE_NONEXISTENT.Chih-Hung Hsieh2015-03-191-1/+5
| | | | | | | | | | | | | | | | | | * A reference to PROCESS_STATE_NONEXISTENT will cause link error with clang or standard C++ compiler because there is no out-of-class definition, although g++ is allowing it. Use +PROCESS_STATE_NONEXISTENT to get the value instead of reference. Change-Id: I62049584b94e6847b64b572f6ef6c3e9dcc573eb
* | Merge "audio routing management for radio"Eric Laurent2015-03-193-42/+101
|\ \
| * | audio routing management for radioEric Laurent2015-03-193-42/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added radio tuner device connection/disconnection indication to audio policy manager. Added documentation and removed unused Module class member. Change-Id: I92438c1ff212c4d76f008149554fa89e367fee42
* | | Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-1928-66/+196
|\ \ \ | |_|/ |/| |
| * | Camera: plumbing rotation field throughYin-Chia Yeh2015-03-1828-66/+196
| | | | | | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | | Merge "Initial implementation of fast capture dump"Glenn Kasten2015-03-194-1/+30
|\ \ \
| * | | Initial implementation of fast capture dumpGlenn Kasten2015-03-064-1/+30
| | | | | | | | | | | | | | | | Change-Id: I898d903e539f760ef7caa80f41ca21c223f67264
* | | | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-1914-941/+2427
|\ \ \ \
| * | | | camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-1814-941/+2427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This updates the CameraService to implement client eviction behavior based on process priority. Bug: 19186859 Change-Id: I646939b1cdf1a2237c4e5044164d55a2542cf36e
* | | | | Merge "Fix periodic notification timing error for AudioRecord"Andy Hung2015-03-171-2/+5
|\ \ \ \ \
| * | | | | Fix periodic notification timing error for AudioRecordAndy Hung2015-03-131-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I768d8a30c6845372ad7c306ed1bc0ec030ae1804
* | | | | | Merge "audioflinger: refresh fast track underrun state upon start"Andy Hung2015-03-171-2/+6
|\ \ \ \ \ \
| * | | | | | audioflinger: refresh fast track underrun state upon startHaynes Mathew George2015-03-161-2/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | False underrun is detected when starting recycled fast tracks, which leads to continuous fatal assertion failures and even AP reboot. Track's last mObservedUnderruns isn't updated one at previous stop() call. Hence, when we start the same track again, we should synchronize it to the latest state instead of relying on stale one. authored-by: Weiyin Jiang<wjiang@codeaurora.org> CRs-Fixed: 803389 Bug: 19635137 Signed-off-by: Andy Hung <hunga@google.com> Change-Id: Ia003a49c6896dba965798c062c98b8c367ef8369
* | | | | | Fix 64-bit build break caused by print typeChong Zhang2015-03-172-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2239d875420f6926918c1a0dcab31b71c8329d1f
* | | | | | Merge "HLS: some fixes for seek with discontinuity."Chong Zhang2015-03-176-104/+173
|\ \ \ \ \ \
| * | | | | | HLS: some fixes for seek with discontinuity.Chong Zhang2015-03-176-104/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - keep old fetcher when seeking, unless the URI is changing. - when restarting after a seek, check discontinuity seq, and queue format change if it's changed. - add a simple kill switch to abort when stop (or pause for seek). - when seeking, if searching for start time goes into 2nd segment, do not signal time discontinuity or reset first PTS. - use setFormat() to set format in AnotherPacketSource, otherwise video/audio flags are not updated and format are not cleared on discontinuities. - do not start queueing video access unit until first IDR after start bug: 19656539 Change-Id: I79108d26964f59ea00d2eeac8f5f9318747f8541
* | | | | | | 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-167-8/+10
|\ \ \ \ \ \ \
| * | | | | | | Update commentsGlenn Kasten2015-03-137-8/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I37d3c4ce22b74fe8581a886fe5a7f9fef8266dad
* | | | | | | Merge "libstagefright: add ProcessInfo to get process priority."Ronghua Wu2015-03-166-33/+96
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | libstagefright: add ProcessInfo to get process priority.Ronghua Wu2015-03-166-33/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I240b814b8925b1d6266e6f998a7debd654a2145a
* | | | | | | Merge "radio service initial implementation"Eric Laurent2015-03-166-2/+1320
|\ \ \ \ \ \ \
| * | | | | | | radio service initial implementationEric Laurent2015-03-106-2/+1320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First implementation of broadcast radio service. This native service runs in mediaserver process and controls broadcast radio hardware modules. There is one ihardware module per broadcast radio class. The service allows serveral clients to control tuners on hardware modules and manages resource conflicts. Change-Id: I21469a084c7ccd65042b8ac5f724d060044c45ab
* | | | | | | | Merge "radio client"Eric Laurent2015-03-164-0/+410
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | radio clientEric Laurent2015-03-104-0/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added implementation of native broadcast radio client class and callback. Change-Id: I82478448e32a5b9be5165e7eb53b99b6289884ed
* | | | | | | | Merge "radio service binder interfaces"Eric Laurent2015-03-167-0/+817
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | radio service binder interfacesEric Laurent2015-03-107-0/+817
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added definiiton and implemention of binder interfaces fro native broadcastradio service. Change-Id: Id5a93bc3146229dffc74b56c29ba48e02b9a5518
* | | | | | | Merge "Remove mId from DeviceDescriptor."Rakesh Iyer2015-03-161-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove mId from DeviceDescriptor.Rakesh Iyer2015-03-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeviceDescriptor inherits from AudioPort which has the correct handle mId. The mId in DeviceDescriptor shadows this so calls like DeviceVector::getDeviceFromId() findDeviceById fail because they are looking at the wrong mId. The failure itself manifested as createAudioPatch failing. Change-Id: I8dd012d0678facaac84844b92226cc4b788abece
* | | | | | | | Merge "libstagefright: handle MediaFormat "priority" key."Ronghua Wu2015-03-162-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | libstagefright: handle MediaFormat "priority" key.Ronghua Wu2015-03-122-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I73675c7cc3d742b9a1a98d6c0f48dcf17557e2ad
* | | | | | | | | Merge "libcameraservice: Stop using IGBC::BufferItem"Dan Stoza2015-03-169-16/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | libcameraservice: Stop using IGBC::BufferItemDan Stoza2015-03-129-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switches all uses of IGraphicBufferConsumer::BufferItem (and BufferQueue::BufferItem) to the BufferItem in libgui. Depends on frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9. Change-Id: I187b3a7d05196b6289596afac8fb9a9d4aebff76
* | | | | | | | | | Merge "libstagefright: Stop using IGBC::BufferItem"Dan Stoza2015-03-166-21/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | libstagefright: Stop using IGBC::BufferItemDan Stoza2015-03-126-21/+25
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switches all uses of IGraphicBufferConsumer::BufferItem (and BufferQueue::BufferItem) to the BufferItem in libgui. Depends on frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9. This is a member of I187b3a7d05196b6289596afac8fb9a9d4aebff76, but since it was split out from the camera change in frameworks/av, they have to have different change IDs. Change-Id: I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc
* | | | | | | | | | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-160-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am faefd08b: (-s ours) Revert "DO NOT MERGE: stagefright: add support for ↵Lajos Molnar2015-02-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel\'s YUV420SP format in SoftwareRenderer" * commit 'faefd08b11d1f4955b5da6c10e1a9be1a5cbefad': Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"
| * \ \ \ \ \ \ \ \ \ \ am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" ↵Lajos Molnar2015-02-105-2/+190
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '0c11f31b610534754f48b40d0a6ccdd311d43fcf': nuplayer: acquire wakelock during offload pause timeout
| * \ \ \ \ \ \ \ \ \ \ \ am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl ↵Lajos Molnar2015-02-09290-332/+4575
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources" into lmp-mr1-dev * commit '0c11001c58526cddc7f6135982f456fff6e34aeb': stagefright: change licensing headers on h264dec omxdl sources
| * \ \ \ \ \ \ \ \ \ \ \ \ am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-091-0/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17e95f40a534101e2df48f077a8029430adef6c3': stagefright: add media_codecs_google_video_le.xml
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '41d3f579d2c166984958263533284209b90c87d5': Fix GSM WAV playback
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35395ea6: (-s ours) DO NOT MERGE: stagefright: add support for Intel\'s ↵Lajos Molnar2015-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YUV420SP format in SoftwareRenderer * commit '35395ea6ad11824a4a89cc1ab9ee84f936188296': DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "avc_util: fix aspect_ratio_idc 14~16"Chong Zhang2015-03-141-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | avc_util: fix aspect_ratio_idc 14~16Chong Zhang2015-03-131-9/+24
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19702519 Change-Id: I00772fe70be27f6a6a051fc0d18ebca64bbac43e
* | | | | | | | | | | | | | | | Merge "Fix warning while building mediaserver"Glenn Kasten2015-03-132-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |