summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-103-2/+4
|\ | | | | | | | | * commit '429f2bf7527daf872a1bbdafca8ad28635b84644': frameworks/av: fix errors inside ALOGV
| * am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
| |\ | | | | | | | | | | | | * commit 'e2307ccbab9c32a7806f15c2572cfe6ec428f2f5': frameworks/av: fix errors inside ALOGV
| | * Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
| | |\
| | | * frameworks/av: fix errors inside ALOGVColin Cross2014-02-064-5/+4
| | |/ | | | | | | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
* | | Merge "Fix warnings about unused parameters"Glenn Kasten2014-02-072-10/+16
|\ \ \
| * | | Fix warnings about unused parametersGlenn Kasten2014-02-072-10/+16
| | | | | | | | | | | | | | | | Change-Id: I27dc108e2c1f7ffd414bb7ff3d4c349651da6c26
* | | | Merge "Fix whitespace"Glenn Kasten2014-02-076-31/+45
|\ \ \ \
| * | | | Fix whitespaceGlenn Kasten2014-02-076-31/+45
| | | | | | | | | | | | | | | | | | | | Change-Id: I9add0872030a26933f6b6dad1be299154611cc56
* | | | | Merge "set AAC MPEG version to MPEG-2"Chong Zhang2014-02-071-1/+1
|\ \ \ \ \
| * | | | | set AAC MPEG version to MPEG-2Chong Zhang2014-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wifi display play spec only allows MPEG-2 AAC. Bug: 12747927 Change-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817
* | | | | | Merge "Change Format_frameBitShift() API for non-power-of-2 sizes"Glenn Kasten2014-02-072-2/+4
|\ \ \ \ \ \
| * | | | | | Change Format_frameBitShift() API for non-power-of-2 sizesGlenn Kasten2014-02-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie39ff51ab8c403ca9d9898396297efdaa3193588
* | | | | | | Merge "Add FIXMEs about audio_format_t assumption"Glenn Kasten2014-02-072-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add FIXMEs about audio_format_t assumptionGlenn Kasten2014-02-032-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d38241b61f70013573f4a0b9306547afe5f38ad
* | | | | | | Merge "Change NBAIO_Format from typedef to struct"Glenn Kasten2014-02-072-7/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Change NBAIO_Format from typedef to structGlenn Kasten2014-02-032-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to support arbitrary sample rates, channel counts, and sample formats in NBAIO. Change-Id: I5eda412648b094358f5eefc38300e9ec8a734cd3
* | | | | | | Merge "Use Format_isValid() and Format_isEqual() instead of direct comparison"Glenn Kasten2014-02-077-12/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Use Format_isValid() and Format_isEqual() instead of direct comparisonGlenn Kasten2014-02-037-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie87607aa514976947540a77775e6425c4e56e7d9
* | | | | | | Merge "Add Format_isValid() and Format_isEqual() to NBAIO"Glenn Kasten2014-02-072-0/+16
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Add Format_isValid() and Format_isEqual() to NBAIOGlenn Kasten2014-02-032-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for changing the typedef to a struct. Change-Id: I8eb1c7d98fd12f997641e462359864fdb834abe6
* | | | | | Merge "AudioFlinger: Offload track transition fix"Eric Laurent2014-02-072-5/+21
|\ \ \ \ \ \
| * | | | | | AudioFlinger: Offload track transition fixHaynes Mathew George2014-02-062-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger state changes in OffloadThread on adding a new offload track. Bug: 12530661 Change-Id: I95b62764c7ac041d470702e86b951f812eb0e70f
* | | | | | | Merge "AudioFlinger: Modify flush handling for offload path"Eric Laurent2014-02-074-15/+31
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioFlinger: Modify flush handling for offload pathHaynes Mathew George2014-02-064-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow an offload track to directly control the offload thread behavior. OffloadThread can check for any pending flush reporting by its active tracks and decide to flush the HW or not. Bug: 12530661 Change-Id: Ib33f023c942f6c091b618004136b153c38a6eef6
* | | | | | | Merge "audioflinger: OffloadThread state fix"Eric Laurent2014-02-071-3/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audioflinger: OffloadThread state fixHaynes Mathew George2014-02-061-3/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switching from one offload session to another that reuses the same offload output, audio HAL is paused & flushed in preparation for the new track OffloadThread must reset mHwPaused to allow proper state transitions for the second track. In addition, Offload thread need not explicitly call resume on HAL while handling a flush. Bug: 12530661 Change-Id: I8173845e1782b5a8b372a82c7d337299a61e0efe
* | | | | | Merge "Fix IoConfigEvent constructor initializer list"Glenn Kasten2014-02-071-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix IoConfigEvent constructor initializer listGlenn Kasten2014-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortunately this bug never showed up, because the parameter field has not been used yet. Change-Id: I2b36e2b7e1dcc2039c494fc5ea4994d262435aac
* | | | | | Merge "Remove libstagefright_http_support from the PDK build."Andreas Huber2014-02-061-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove libstagefright_http_support from the PDK build.Andreas Huber2014-02-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9f81b1cd2694e65fe2d7590cf2ad9e7dad162ce
* | | | | | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-0614-197/+1290
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-0514-197/+1290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12305192 Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
* | | | | | Merge "Fix restart after EOS for mp3"Marco Nelissen2014-02-061-0/+3
|\ \ \ \ \ \
| * | | | | | Fix restart after EOS for mp3Marco Nelissen2014-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/12890850 Change-Id: I985a1ae94d7d62701296d95da34974eb29fcc535
* | | | | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-0630-1666/+14
|\ \ \ \ \ \ \
| * | | | | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-0530-1666/+14
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we started to use java's HTTPConnection instead of the native implementation. Also remove other remnants of the previous http implementation, such as accounting for the http user's uid. Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
* | | | | | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-052-8/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-052-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I62d6534a9581e84ae20c2422f7ad9aeda9b7c4df
* | | | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-0580-130/+1065
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | available to media code"
| * | | | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-0480-130/+1065
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | | | | | | am 5ef74dce: am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | * commit '5ef74dce64a1b70534547c044a6d15533f4a9dca': audioflinger: conform inline ASM to UAL
| * | | | | | am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | * commit 'd66cd743525cc049033caa3e81cbdf74c72a4556': audioflinger: conform inline ASM to UAL
| | * | | | | Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
| | |\ \ \ \ \
| | | * | | | | audioflinger: conform inline ASM to UALsynergy dev2014-02-041-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang requires some inline ASM to conform to the UAL standards (Unified Assembler Language). This fixes a small issue in this inline asm to allow building. Change-Id: Ifd9b1814343ab5ade636b9401a21d575559dac16
* | | | | | | Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-02-052-4/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-01-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger enters a deadlock (with itself) on trying to free a RecordTrack or Track object that failed initialization. Clear this bad object from the caller instead. Bug: 12423233 Change-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16
* | | | | | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-0412-48/+52
|\ \ \ \ \ \ \
| * | | | | | | Fix unused parameter warnings in audioGlenn Kasten2014-02-0312-48/+52
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I665ba3358dd9502f0adec70d486e7bf8a2e1b0fe
* | | | | | | Merge "Change Format_Invalid from enum to global const"Glenn Kasten2014-02-042-3/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Change Format_Invalid from enum to global constGlenn Kasten2014-02-032-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for changing the typedef to a struct Change-Id: I36d1fe81d2f974224750f753453753303c224591
generated by cgit v1.1 at 2025-01-26 16:07:28 +0000