summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT ↵Andreas Huber2011-01-290-0/+0
|\ | | | | | | | | | | | | time ranges in RTSP. * commit '70888c00a0371692a07132f0dd94208456dd44c1': DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
| * am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| |\ | | | | | | | | | | | | * commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f': DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
| | * DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| | | | | | | | | | | | | | | Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791 related-to-bug: 3217210
* | | Merge 13212f83 from gingerbread-plus-aospJean-Baptiste Queru2011-01-291-1/+2
|\ \ \ | |/ / | | | | | | Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
| * | am 0ef57993: Merge "Fix issue 2988031." into gingerbreadEric Laurent2011-01-271-1/+2
| |\ \ | | |/ | | | | | | | | | * commit '0ef579939e6c96fcd2b42b164c5debf535a6a53b': Fix issue 2988031.
| | * Fix issue 2988031.Eric Laurent2011-01-271-1/+2
| | | | | | | | | | | | | | | | | | Limit SYSTEM stream volume when a headset is connected and music is playing. Change-Id: Ieb44ae5bb53ffa9cd5fe8e317798eed279b78df8
* | | am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose ↵Andreas Huber2011-01-281-13/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | to track down ANRs (again)"" into honeycomb * commit '79c4648597dab2b7786c8f067896ab66abe190de': Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
| * | | Revert "Make AwesomePlayer's reset process more verbose to track down ANRs ↵Andreas Huber2011-01-281-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (again)" This reverts commit aac2e9e1566a3bb0ef811ebd3a56b538324c95c1. Change-Id: Ic84dfa829981fdc1a1330ccfe6b9dccf64a80719 related-to-bug: 3392386
* | | | am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into ↵Andreas Huber2011-01-283-20/+46
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | honeycomb * commit 'b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4': More robust parsing of NPT time ranges in RTSP.
| * | | More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| | | | | | | | | | | | | | | | | | | | Change-Id: I3674501d2fd66aaface805c0a8678c74671a6dd3 related-to-bug: 3217210
* | | | am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP ↵Andreas Huber2011-01-260-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | server streams MPEG4-LATM audio with extra trailing bytes. * commit '586096a9575a52ea7fa318f6f8540b47ba2ed2e8': DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
| * | | am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM ↵Andreas Huber2011-01-261-1/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | audio with extra trailing bytes. * commit '2dce338e01678620db0734fc3d84bcb3f2512d62': DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
| | * | DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with ↵Andreas Huber2011-01-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra trailing bytes. And now we're just ignoring them. Yay standards. Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749 related-to-bug: 3353752
* | | | am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio ↵Andreas Huber2011-01-261-1/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | with extra trailing bytes." into honeycomb * commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73': This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
| * | | Merge "This particular RTSP server streams MPEG4-LATM audio with extra ↵Andreas Huber2011-01-261-1/+4
| |\ \ \ | | | | | | | | | | | | | | | trailing bytes." into honeycomb
| | * | | This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.Andreas Huber2011-01-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And now we're just ignoring them. Yay standards. Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35 related-to-bug: 3353752
* | | | | am a13732e1: Merge "MTP: Fix month off by one error in date parsing and ↵Mike Lockwood2011-01-261-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | formatting code" into honeycomb * commit 'a13732e17a0f3d69df9c418407985b3ad64b1852': MTP: Fix month off by one error in date parsing and formatting code
| * | | | Merge "MTP: Fix month off by one error in date parsing and formatting code" ↵Mike Lockwood2011-01-261-2/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | into honeycomb
| | * | | MTP: Fix month off by one error in date parsing and formatting codeMike Lockwood2011-01-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 3379100 Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | am 7fb232c4: Merge "Make sure that key frame is generated for timelapse ↵James Dong2011-01-266-4/+35
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | video recording if there are at least two input video frames from camera source." into honeycomb * commit '7fb232c40cde91d0958be1694db2d97a126b95f9': Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
| * | | | Make sure that key frame is generated for timelapse video recording if there ↵James Dong2011-01-266-4/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are at least two input video frames from camera source. This will fix the stop failure issue where we have to wait n * time_interval before a key frame can be received by the file writer, where o n is the actual number of buffers advertised by the video encoder o time_interval is the interval settings for timelapse video recording specifying the time distance between neighboring input video frames The fix includes two parts: o OMXCodec will not submit all n buffers at one time, but instead submit one input frame at one time if it become available. o Timelapse camera source made available the first two input frames and do not skip them so that the first compressed output frame data can be received regardless the specified time_interval bug - 3367659 Change-Id: Ia68cc2cb0d71aa7dc54540e9ad82fae911ad530b
* | | | am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from ↵Jean-Michel Trivi2011-01-260-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | master * commit '1155efdc715413cd7a881e5226b5f5f0b2db8f71': do not merge bug 3370834 Cherrypick from master
| * | | am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-267-27/+49
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master
| | * | do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-267-27/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherripick from master CL 79833, 79417, 78864, 80332, 87500 Add new audio mode and recording source for audio communications other than telelphony. The audio mode MODE_IN_CALL signals the system the device a phone call is currently underway. There was no way for audio video chat or VoIP applications to signal a call is underway, but not using the telephony resources. This change introduces a new mode to address this. Changes in other parts of the system (java and native) are required to take this new mode into account. The generic AudioPolicyManager is updated to not use its phone state variable directly, but to use two new convenience methods, isInCall() and isStateInCall(int) instead. Add a recording source used to designate a recording stream for voice communications such as VoIP. Update the platform-independent audio policy manager to pass the nature of the audio recording source to the audio policy client interface through the AudioPolicyClientInterface::setParameters() method. SIP calls should set the audio mode to MODE_IN_COMMUNICATION, Audio mode MODE_IN_CALL is reserved for telephony. SIP: Enable built-in echo canceler if available. 1. Always initialize AudioRecord with VOICE_COMMUNICATION. 2. If echo canceler is available, disable our echo suppressor. Note that this CL is intentionally not correcting the getAudioSourceMax() return value in MediaRecorder.java as the new source is hidden here. Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
* | | | am 373d357a: Merge "More instrumentation to track down the hardware decoder ↵Andreas Huber2011-01-262-2/+20
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | not shutting down bug." into honeycomb * commit '373d357a8b13dc2cdc82d9e1d6144fb26e3bb202': More instrumentation to track down the hardware decoder not shutting down bug.
| * | | Merge "More instrumentation to track down the hardware decoder not shutting ↵Andreas Huber2011-01-262-2/+20
| |\ \ \ | | | | | | | | | | | | | | | down bug." into honeycomb
| | * | | More instrumentation to track down the hardware decoder not shutting down bug.Andreas Huber2011-01-262-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f31b6fdf5c90b436567bbce578dcbc4666ed7c2 related-to-bug: 3362836
* | | | | am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." ↵Andreas Huber2011-01-261-2/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit '6df89fde0db446bb530ab872b373b1faa3ccb06c': Ignore errors returned from native_window_set_crop.
| * | | | Merge "Ignore errors returned from native_window_set_crop." into honeycombAndreas Huber2011-01-261-2/+3
| |\ \ \ \
| | * | | | Ignore errors returned from native_window_set_crop.Andreas Huber2011-01-261-2/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the surface is already invalid, we'll know soon enough. Change-Id: If360ffb8293817afb47df8c1a75722aea74bb335 related-to-bug: 3394601
* | | | | am a9f27fa6: Merge "Protect notification callback parameters with a mutex." ↵Andreas Huber2011-01-261-4/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit 'a9f27fa631ab21d52c75842ccaacc1cbcd75fca0': Protect notification callback parameters with a mutex.
| * | | | Merge "Protect notification callback parameters with a mutex." into honeycombAndreas Huber2011-01-261-4/+14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Protect notification callback parameters with a mutex.Andreas Huber2011-01-261-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the race condition where notifications are dispatched to a NULL receiver after notifications have been disabled. Change-Id: I6d351ffbee97616e2c35559c132a6c5e6a66948a related-to-bug: 3394139
* | | | | am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not ↵Andreas Huber2011-01-261-17/+79
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | abort pending recv/send calls." into honeycomb * commit '7765c65dbe1ba8f2229f2fec5a83ba2d1da79733': Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
| * | | | Merge "Linux sockets suck, closing a socket descriptor does not abort ↵Andreas Huber2011-01-261-17/+79
| |\ \ \ \ | | | | | | | | | | | | | | | | | | pending recv/send calls." into honeycomb
| | * | | | Linux sockets suck, closing a socket descriptor does not abort pending ↵Andreas Huber2011-01-261-17/+79
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recv/send calls. Change-Id: Id53e7831761619f72ddc61f63571230011c93f16 related-to-bug: 3362836
* | | | | am d030359f: Merge "Instead of not feeding the AudioTrack any data after ↵Andreas Huber2011-01-261-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | EOS, play silence instead." into honeycomb * commit 'd030359ff10a031c762d4f229d9c1bdfd366cb50': Instead of not feeding the AudioTrack any data after EOS, play silence instead.
| * | | | Instead of not feeding the AudioTrack any data after EOS, play silence instead.Andreas Huber2011-01-261-1/+3
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I9aa797cf5bb58eefed51d732f4e5d09450551158 related-to-bug: 3347428
* | | | am df836892: (-s ours) am 239fd805: Merge "fix [3361121] hang in glClear() - ↵Mathias Agopian2011-01-250-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread * commit 'df8368925acd4593a309e06548d7f900bf8d94df': fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
| * | | am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, ↵Mathias Agopian2011-01-251-7/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | OTA fails (DO NOT MERGE)" into gingerbread * commit '239fd805ef7c0e4116b0a89e20caaf287e91f017': fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
| | * | fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)Mathias Agopian2011-01-251-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generally we never want to lock a buffer for write access if it is at the "head" on the surfaceflinger side. The only exception (1) is when the buffer is not currently in use AND there is at least one queued buffer -- in which case, SurfaceFlinger will never use said buffer anymore, because on the next composition around, it will be able to retire the first queued buffer. The logic above relies on SurfaceFlinger always retiring and locking a buffer before composition -- unfortunately this didn't happen during a screenshot. This could leave us in a situation where a buffer is locked by the application for write, and used by SurfaceFlinger for texturing, causing a hang. Here, we fix this issue by never assuming the exception (1), it was intended as an optimization allowing ANativeWindow::lockBuffer() to return sooner and was justified when most of SF composition was done in software. The actual buffer locking is now ensured by gralloc. We could have handled screenshots in a similar way to a regular composition, but it could have caused glitches on screen, essentially, taking a screenshot could cause to skip a frame. now that we removed the notion of a "inUse" buffer in surfaceflinger a lot of code can be simplified / removed. noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete" is also gone.
* | | | am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after ↵Mike Lockwood2011-01-252-36/+35
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | we are done scanning" into honeycomb * commit 'f10d940413000732f1cd35bcb113c41019c7e3b7': StagefrightMediaScanner: Close metadata retriever after we are done scanning
| * | | Merge "StagefrightMediaScanner: Close metadata retriever after we are done ↵Mike Lockwood2011-01-252-36/+35
| |\ \ \ | | | | | | | | | | | | | | | scanning" into honeycomb
| | * | | StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-252-36/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the mediaserver from leaking a file descriptor after the media scanner runs BUG: 3373546 Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | am 3115dad3: Merge "Report errors to applications if AudioRecord->start() ↵James Dong2011-01-253-13/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | fails" into honeycomb * commit '3115dad3fc8493ff510b9f6a46b18d951bf5c162': Report errors to applications if AudioRecord->start() fails
| * | | | Report errors to applications if AudioRecord->start() failsJames Dong2011-01-253-13/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | bug - 3385198 Change-Id: I86ac8071eb28a538b333e102192193d1b9eda5eb
* | | | am 4b440268: am c929677e: Merge "Increase the number of useful bits in the ↵Marco Nelissen2011-01-251-2/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | spectrum." into gingerbread * commit '4b44026879723d924ddc306ea1e330a9e87c3a1c': Increase the number of useful bits in the spectrum.
| * | | am c929677e: Merge "Increase the number of useful bits in the spectrum." ↵Marco Nelissen2011-01-251-2/+7
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into gingerbread * commit 'c929677e017759047d94599faa1b80ebe278fefb': Increase the number of useful bits in the spectrum.
| | * | Merge "Increase the number of useful bits in the spectrum." into gingerbreadMarco Nelissen2011-01-251-2/+7
| | |\ \
| | | * | Increase the number of useful bits in the spectrum.Marco Nelissen2011-01-241-2/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
generated by cgit v1.1 at 2024-12-26 23:15:51 +0000