OSDN Git Service
Glenn Kasten [Thu, 15 Aug 2013 15:22:38 +0000 (15:22 +0000)]
Merge "Add ThreadBase::processConfigEvents_l()"
Glenn Kasten [Thu, 15 Aug 2013 15:03:49 +0000 (15:03 +0000)]
Merge "Pull in scope of effectChains"
Glenn Kasten [Thu, 15 Aug 2013 14:45:44 +0000 (14:45 +0000)]
Merge "Add record thread locking comments and FIXMEs"
Glenn Kasten [Thu, 15 Aug 2013 14:31:03 +0000 (14:31 +0000)]
Merge "Convert if/else-if in threadLoop to switch"
Ying Wang [Thu, 15 Aug 2013 03:44:47 +0000 (20:44 -0700)]
Ying Wang [Thu, 15 Aug 2013 03:42:35 +0000 (20:42 -0700)]
Ying Wang [Thu, 15 Aug 2013 03:39:49 +0000 (20:39 -0700)]
Fix build.
Change-Id: If87636a654c8cfb2449e246df213fb24b08b4ad3
Glenn Kasten [Tue, 13 Aug 2013 23:00:42 +0000 (16:00 -0700)]
Add ThreadBase::processConfigEvents_l()
Change-Id: I6bcdc212a984c52ab98b0b0744943b4ecc1e1542
Glenn Kasten [Tue, 13 Aug 2013 22:43:49 +0000 (15:43 -0700)]
Pull in scope of effectChains
Change-Id: Id5336f8663099088a0958fb8bd59fc5df9f92829
Glenn Kasten [Tue, 13 Aug 2013 22:37:35 +0000 (15:37 -0700)]
Add record thread locking comments and FIXMEs
Change-Id: Ia5bdc9b8b013c2e40af17c82833051290bf4df70
Glenn Kasten [Tue, 13 Aug 2013 20:54:08 +0000 (13:54 -0700)]
Convert if/else-if in threadLoop to switch
Change-Id: I7428abb332ead6c2a1df5903f6c4e166be1f7abb
Mathias Agopian [Thu, 15 Aug 2013 00:18:21 +0000 (17:18 -0700)]
am
4dc2abeb: am
c13a958f: Merge "fix build. optional tests broke" into klp-dev
* commit '
4dc2abebf199df8d30b9ff76b4c5045c59a01de2':
fix build. optional tests broke
Mathias Agopian [Thu, 15 Aug 2013 00:14:19 +0000 (17:14 -0700)]
am
c13a958f: Merge "fix build. optional tests broke" into klp-dev
* commit '
c13a958fba83dae63a8cf23b76b36a8fc8580aef':
fix build. optional tests broke
Glenn Kasten [Thu, 15 Aug 2013 00:10:55 +0000 (00:10 +0000)]
Merge "Fix switch indentation to follow our audio style"
Mathias Agopian [Thu, 15 Aug 2013 00:09:17 +0000 (00:09 +0000)]
Merge "fix build. optional tests broke" into klp-dev
Mathias Agopian [Thu, 15 Aug 2013 00:08:40 +0000 (17:08 -0700)]
fix build. optional tests broke
Change-Id: Ifb38fb2a7bd9c3d6305726f8e6d661be05cdcf7e
Glenn Kasten [Tue, 13 Aug 2013 23:01:22 +0000 (16:01 -0700)]
Fix switch indentation to follow our audio style
Change-Id: I137763917962b276838715319b163c763cb54c71
Andy McFadden [Wed, 14 Aug 2013 23:32:39 +0000 (16:32 -0700)]
am
3ecddeb9: am
99a2297e: Merge "Another error check" into klp-dev
* commit '
3ecddeb951ee77bb2c2a33cee4dfbcc55e184c4c':
Another error check
Andy McFadden [Wed, 14 Aug 2013 23:29:46 +0000 (16:29 -0700)]
am
99a2297e: Merge "Another error check" into klp-dev
* commit '
99a2297e4f9746cd5efc3aa3731d17052f32e058':
Another error check
Andy McFadden [Wed, 14 Aug 2013 23:29:21 +0000 (16:29 -0700)]
am
9bb7135c: am
69b5e38c: Merge "Use destroyDisplay()" into klp-dev
* commit '
9bb7135c702f57f59f47253839fee81b983aa22e':
Use destroyDisplay()
Andy McFadden [Wed, 14 Aug 2013 23:26:29 +0000 (16:26 -0700)]
am
69b5e38c: Merge "Use destroyDisplay()" into klp-dev
* commit '
69b5e38ca1af5696da1c00627d2e64f7db00d2e1':
Use destroyDisplay()
Andy McFadden [Wed, 14 Aug 2013 23:25:59 +0000 (23:25 +0000)]
Merge "Another error check" into klp-dev
Andy McFadden [Wed, 14 Aug 2013 23:23:15 +0000 (23:23 +0000)]
Merge "Use destroyDisplay()" into klp-dev
Andy McFadden [Wed, 14 Aug 2013 22:08:29 +0000 (15:08 -0700)]
Another error check
Change-Id: I01ed5c0c7dcb520732d2856859bced31df5fbbb5
The Android Open Source Project [Wed, 14 Aug 2013 20:02:50 +0000 (13:02 -0700)]
am
5c9fb641: (-s ours) Reconcile with klp-release - do not merge
* commit '
5c9fb641d93fa6758978adfb02cc0f2a51d02bdc':
Fix regression for AudioRecord streaming callback mode
The Android Open Source Project [Wed, 14 Aug 2013 19:58:24 +0000 (12:58 -0700)]
Reconcile with klp-release - do not merge
Change-Id: I4bdda8ab19e05b9e74dba9094cb6f36af09d58d2
Andy McFadden [Wed, 14 Aug 2013 18:23:06 +0000 (11:23 -0700)]
Use destroyDisplay()
Use the new SurfaceComposerClient::destroyDisplay call to shut the
virtual display down.
Change-Id: I0225a44594abf427d386456622b23b01fdd1690f
Lajos Molnar [Wed, 14 Aug 2013 14:51:53 +0000 (07:51 -0700)]
am
984b3f4d: am
7f76a81b: Merge "Check adaptive playback support via CodecCapabilities" into klp-dev
* commit '
984b3f4df6ac50a7d655391b19afefa8d5ce30ba':
Check adaptive playback support via CodecCapabilities
The Android Automerger [Wed, 14 Aug 2013 13:06:00 +0000 (06:06 -0700)]
merge in klp-release history after reset to klp-dev
Lajos Molnar [Wed, 14 Aug 2013 01:30:44 +0000 (18:30 -0700)]
am
7f76a81b: Merge "Check adaptive playback support via CodecCapabilities" into klp-dev
* commit '
7f76a81b18ade3158ae27015637074ce08e837b2':
Check adaptive playback support via CodecCapabilities
Lajos Molnar [Wed, 14 Aug 2013 01:27:14 +0000 (01:27 +0000)]
Merge "Check adaptive playback support via CodecCapabilities" into klp-dev
Lajos Molnar [Tue, 6 Aug 2013 22:02:22 +0000 (15:02 -0700)]
Check adaptive playback support via CodecCapabilities
Added flags field to CodecCapabilities, so that applications
can query whether codecs support various features. For now
added one video-decoder feature:
kFlagSupportsAdaptivePlayback
Media playback applications can query it to see if a codec
supports seamless resolution changes, such as by supporting
dynamic output buffers.
Signed-off-by: Lajos Molnar <lajos@google.com>
Change-Id: I09da46e8ab6b8645fa2749e33128e49eda2e865b
Related-to-bug:
7093648
Glenn Kasten [Tue, 13 Aug 2013 17:29:13 +0000 (17:29 +0000)]
Merge "Explicit comparison to 0 for integral types"
Glenn Kasten [Tue, 13 Aug 2013 17:28:25 +0000 (17:28 +0000)]
Merge "Move local variable declarations to point of first use"
Glenn Kasten [Tue, 13 Aug 2013 17:27:49 +0000 (17:27 +0000)]
Merge "Use curly braces in 'if' to make it easier to add logs"
Andreas Huber [Tue, 13 Aug 2013 17:20:01 +0000 (10:20 -0700)]
am
65a6b3b6: am
cd06d357: Merge "Optionally repeat the previously submitted frame to the encoder" into klp-dev
* commit '
65a6b3b6a19e0b4920ba504a3ee40e4abe3a740d':
Optionally repeat the previously submitted frame to the encoder
Andreas Huber [Tue, 13 Aug 2013 17:17:33 +0000 (10:17 -0700)]
am
cd06d357: Merge "Optionally repeat the previously submitted frame to the encoder" into klp-dev
* commit '
cd06d357ed4fcde991aa55dc97317d97cb287332':
Optionally repeat the previously submitted frame to the encoder
Andreas Huber [Tue, 13 Aug 2013 17:13:24 +0000 (17:13 +0000)]
Merge "Optionally repeat the previously submitted frame to the encoder" into klp-dev
Andreas Huber [Wed, 31 Jul 2013 20:50:42 +0000 (13:50 -0700)]
Optionally repeat the previously submitted frame to the encoder
if no new frame has been delivered by surface flinger within the timeout
interval.
Change-Id: I282f1b726dfe5646b178d7858d6f5d4f5a264fde
Andreas Huber [Tue, 13 Aug 2013 17:09:59 +0000 (10:09 -0700)]
am
8ec8a534: am
1e0b0808: Merge "Restore stagefright command line tool." into klp-dev
* commit '
8ec8a5346831efa699d31274363da9cf516981db':
Restore stagefright command line tool.
Andreas Huber [Tue, 13 Aug 2013 17:07:30 +0000 (10:07 -0700)]
am
1e0b0808: Merge "Restore stagefright command line tool." into klp-dev
* commit '
1e0b080825a169c6ac655f11a798ff177575608c':
Restore stagefright command line tool.
Glenn Kasten [Tue, 13 Aug 2013 17:07:17 +0000 (17:07 +0000)]
Merge "Whitespace"
Glenn Kasten [Tue, 13 Aug 2013 17:06:18 +0000 (17:06 +0000)]
Merge "Comments"
Andreas Huber [Tue, 13 Aug 2013 17:03:29 +0000 (17:03 +0000)]
Merge "Restore stagefright command line tool." into klp-dev
Andy McFadden [Tue, 13 Aug 2013 17:02:07 +0000 (10:02 -0700)]
am
00dbc7ba: am
46052913: Better error message
* commit '
00dbc7ba6ba089c40ff1cbea370828b57a464b52':
Better error message
Andy McFadden [Tue, 13 Aug 2013 17:00:49 +0000 (10:00 -0700)]
am
46052913: Better error message
* commit '
46052913f307b1561f1661bb776fa29c0775758c':
Better error message
Andy McFadden [Tue, 13 Aug 2013 16:56:19 +0000 (09:56 -0700)]
Better error message
Attempt to create the output file before handing it to MediaMuxer,
which doesn't report file-open failures in a useful way.
Change-Id: Ie24ff577dd50e185b4eb72575684d23a46f38d3d
Glenn Kasten [Tue, 13 Aug 2013 16:48:14 +0000 (09:48 -0700)]
Explicit comparison to 0 for integral types
Change-Id: I2bfe864d1bda719581e297a38d96abfc0e3748b9
Glenn Kasten [Tue, 6 Aug 2013 17:45:10 +0000 (10:45 -0700)]
Move local variable declarations to point of first use
Change-Id: Ia0fc4b099a3cf8bb5b67b287e7687e9dc9691e0e
Glenn Kasten [Tue, 13 Aug 2013 16:14:51 +0000 (09:14 -0700)]
Use curly braces in 'if' to make it easier to add logs
Change-Id: I58b33fefdd8bf703647414157a99a3223be3531c
Glenn Kasten [Tue, 13 Aug 2013 16:13:36 +0000 (09:13 -0700)]
Whitespace
Change-Id: Id3ccc183a03421330d0498faaa62a45915cdc3d6
Glenn Kasten [Mon, 5 Aug 2013 21:58:14 +0000 (14:58 -0700)]
Comments
Change-Id: I56f82904cb3855bad6f33ad1ff4ddf66a61c5720
Andreas Huber [Tue, 13 Aug 2013 15:55:47 +0000 (08:55 -0700)]
Restore stagefright command line tool.
Change-Id: Ia17f48522f601d6a057ef3e1e8cd01f80a5c9951
Glenn Kasten [Tue, 13 Aug 2013 15:28:12 +0000 (15:28 +0000)]
Merge "Check input HAL channel mask instead of channel count"
Glenn Kasten [Tue, 13 Aug 2013 14:49:12 +0000 (14:49 +0000)]
Merge "Clean up error handling in createTrack and openRecord"
The Android Automerger [Tue, 13 Aug 2013 13:02:10 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Jeff Brown [Tue, 13 Aug 2013 02:18:00 +0000 (19:18 -0700)]
am
82278b2c: am
fe9611bd: Merge "Fix potential leak of audio input handle." into klp-dev
* commit '
82278b2ceeebbcf345ed81413eeffa82fa82e05b':
Fix potential leak of audio input handle.
Jeff Brown [Tue, 13 Aug 2013 01:11:25 +0000 (18:11 -0700)]
am
fe9611bd: Merge "Fix potential leak of audio input handle." into klp-dev
* commit '
fe9611bd65a8d968d6512f6a83078ac064ec8e6e':
Fix potential leak of audio input handle.
Jeff Brown [Mon, 12 Aug 2013 23:59:55 +0000 (23:59 +0000)]
Merge "Fix potential leak of audio input handle." into klp-dev
Glenn Kasten [Tue, 6 Aug 2013 22:40:54 +0000 (15:40 -0700)]
Clean up error handling in createTrack and openRecord
Outside callers now use initCheck() to determine whether a TrackBase
has been created successfully, instead of relying on internal knowledge.
Previously, callers needed to know that a TrackBase was only valid if it's
getCbk() != 0. For a Track (playback), they needed to know to also check
the track's name (track index). Now, outsiders can just call initCheck().
Other changes:
- Return a 0 reference if track creation fails
- Remove a dead line of code in AudioFlinger::openRecord
Change-Id: If374924a3f6fd27906f625aa83dd0a1e3f506e00
Glenn Kasten [Tue, 6 Aug 2013 22:39:08 +0000 (15:39 -0700)]
Status pointer passed by caller is always non-NULL
in createTrack, openRecord, createEffect, createTrack_l,
createRecordTrack_l, and createEffect_l.
Change-Id: I2e459e4de9c78145f4d496e6abf289479a2f0941
Glenn Kasten [Mon, 12 Aug 2013 18:53:12 +0000 (18:53 +0000)]
Merge "Remove obsolete TrackBase::getBuffer()"
Glenn Kasten [Mon, 12 Aug 2013 18:45:02 +0000 (18:45 +0000)]
Merge "Pull up readyToRun into ThreadBase"
Andreas Huber [Mon, 12 Aug 2013 18:09:24 +0000 (11:09 -0700)]
am
4d9bc1a7: am
b8689b31: Support for "request-sync" parameter in ACodec
* commit '
4d9bc1a742b386db4985ad1f973091a50207fdc2':
Support for "request-sync" parameter in ACodec
Andreas Huber [Mon, 12 Aug 2013 18:01:38 +0000 (11:01 -0700)]
am
b8689b31: Support for "request-sync" parameter in ACodec
* commit '
b8689b31813f55cbc1bf8e9ca0d46a9ee113e38a':
Support for "request-sync" parameter in ACodec
Glenn Kasten [Mon, 12 Aug 2013 17:44:53 +0000 (17:44 +0000)]
Merge "Simplify the code that allocates mMixBuffer by removing mAllocMixBuffer"
Andreas Huber [Mon, 12 Aug 2013 17:08:23 +0000 (10:08 -0700)]
Support for "request-sync" parameter in ACodec
Also returns errors to caller instead of asserting...
Change-Id: Id3018655a2b3da4289167fba16af907350a511ae
The Android Automerger [Mon, 12 Aug 2013 13:01:48 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Jeff Brown [Sat, 10 Aug 2013 01:32:30 +0000 (18:32 -0700)]
Fix potential leak of audio input handle.
The audio input handle is ultimately owned by the audio recorder
object but it could be dropped on the floor if an error occurred
before that object was fully initialized.
Rearranged some of the argument validation and merged getInput_l
with openRecord_l to simplify the code and prevent such a leak
from occurring.
Bug:
10265163
Change-Id: I124dce344b1d11c2dd66ca5e2c9aec0c52c230e2
Glenn Kasten [Fri, 9 Aug 2013 23:49:22 +0000 (16:49 -0700)]
am
60147776: (-s ours) am
7473e356: (-s ours) am
943917c4: (-s ours) Merge "Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE"
* commit '
601477769cef254d3a95338e853a37ccf9aac63f':
Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE
Glenn Kasten [Fri, 9 Aug 2013 23:45:49 +0000 (16:45 -0700)]
am
7473e356: (-s ours) am
943917c4: (-s ours) Merge "Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE"
* commit '
7473e356f5b7de6b67aef3b34faa6ddb1c054060':
Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE
Glenn Kasten [Fri, 9 Aug 2013 23:40:22 +0000 (16:40 -0700)]
am
943917c4: (-s ours) Merge "Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE"
* commit '
943917c41f447fdceab6ce75e00c05551072000b':
Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE
Glenn Kasten [Fri, 9 Aug 2013 23:14:43 +0000 (23:14 +0000)]
Merge "Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE"
Glenn Kasten [Fri, 9 Aug 2013 21:32:40 +0000 (14:32 -0700)]
Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE
The change I7370d6e59a7ef26dfb284a8b058d5ab2e0a42ccf caused a regression
in SoundPool looping when using SoundPool's streaming implementation.
This reverts a portion of that change.
Bug: https://code.google.com/p/android/issues/detail?id=58113
Bug:
10171337
Change-Id: I8af0dc8683a7c7f225c80f0eb4d39770667b52e5
Glenn Kasten [Fri, 9 Aug 2013 15:20:32 +0000 (15:20 +0000)]
Merge "Use 0 for sp<>, NULL for raw pointers"
Glenn Kasten [Fri, 9 Aug 2013 15:11:07 +0000 (15:11 +0000)]
Merge "Rename reqChannels to reqChannelMask"
Glenn Kasten [Fri, 9 Aug 2013 14:26:10 +0000 (14:26 +0000)]
Merge "Line length 100"
Glenn Kasten [Fri, 9 Aug 2013 13:06:33 +0000 (06:06 -0700)]
am
1b832c3d: Merge "Fix regression for AudioRecord streaming callback mode" into klp-dev
* commit '
1b832c3d8f2b1b24f9bc7025afd2b4a8b4e6c6f9':
Fix regression for AudioRecord streaming callback mode
Andreas Huber [Fri, 9 Aug 2013 13:06:02 +0000 (06:06 -0700)]
am
9bdc9c4e: am
bcd86896: am
d0f5664a: Merge "Handle undefined NAL type for h264 streaming"
* commit '
9bdc9c4ee0b44ca407cdca4499df9b3134bc5884':
Handle undefined NAL type for h264 streaming
Glenn Kasten [Thu, 8 Aug 2013 22:20:53 +0000 (15:20 -0700)]
Fix regression for AudioRecord streaming callback mode
The notification period (frequency of client wakeups) was broken in
streaming callback mode. Fast tracks were OK, but non-fast tracks with
normal latency weren't getting woken up at all.
Bug:
10222943
Change-Id: Ife9a2f57fa73c6eb921f1c5ba62de0bfcc20557b
Glenn Kasten [Thu, 8 Aug 2013 23:39:34 +0000 (23:39 +0000)]
Merge "Fix regression for AudioRecord streaming callback mode" into klp-dev
Andreas Huber [Thu, 8 Aug 2013 23:21:42 +0000 (16:21 -0700)]
am
bcd86896: am
d0f5664a: Merge "Handle undefined NAL type for h264 streaming"
* commit '
bcd86896e486e303d285e13477e0623b2a920e78':
Handle undefined NAL type for h264 streaming
Glenn Kasten [Thu, 8 Aug 2013 22:20:53 +0000 (15:20 -0700)]
Fix regression for AudioRecord streaming callback mode
The notification period (frequency of client wakeups) was broken in
streaming callback mode. Fast tracks were OK, but non-fast tracks with
normal latency weren't getting woken up at all.
Bug:
10222943
Change-Id: Ife9a2f57fa73c6eb921f1c5ba62de0bfcc20557b
Glenn Kasten [Thu, 8 Aug 2013 16:47:17 +0000 (16:47 +0000)]
Merge "Pull up mBufferSize from RecordThread to ThreadBase"
Glenn Kasten [Thu, 8 Aug 2013 16:33:34 +0000 (16:33 +0000)]
Merge "Remove obsolete field RecordTrack::mAudioRecordServerProxy"
Andreas Huber [Thu, 8 Aug 2013 15:56:37 +0000 (08:56 -0700)]
am
d0f5664a: Merge "Handle undefined NAL type for h264 streaming"
* commit '
d0f5664abb5a8d94ae13f63a5f3491b47383ee2f':
Handle undefined NAL type for h264 streaming
Andreas Huber [Thu, 8 Aug 2013 15:52:47 +0000 (15:52 +0000)]
Merge "Handle undefined NAL type for h264 streaming"
Glenn Kasten [Thu, 8 Aug 2013 15:31:23 +0000 (15:31 +0000)]
Merge "Consistent style for comparisons of raw pointers to NULL"
Glenn Kasten [Thu, 8 Aug 2013 15:19:02 +0000 (15:19 +0000)]
Merge "memset audio_config to zero"
Glenn Kasten [Wed, 7 Aug 2013 17:19:36 +0000 (17:19 +0000)]
Merge "Cleanup comments for the new control block implementation"
Jeff Tinker [Wed, 7 Aug 2013 01:44:37 +0000 (01:44 +0000)]
Merge "Adds a drm resource busy error, removes some deprecated errors"
Lajos Molnar [Tue, 6 Aug 2013 23:55:31 +0000 (23:55 +0000)]
Merge "IOMX: add updateGraphicBufferInMeta method for metadata mode"
Mathias Agopian [Tue, 6 Aug 2013 23:06:09 +0000 (23:06 +0000)]
Merge "fix build"
Mathias Agopian [Tue, 6 Aug 2013 23:05:27 +0000 (16:05 -0700)]
fix build
Change-Id: I859bd75eb796b0cb8da30ad947776d3e38f3873f
Ying Wang [Tue, 6 Aug 2013 22:54:17 +0000 (15:54 -0700)]
Fix build. last attempt.
Change-Id: Ib955134f90b78cfc0d31272021ad5907a41df708
Glenn Kasten [Wed, 17 Jul 2013 14:30:58 +0000 (07:30 -0700)]
Check input HAL channel mask instead of channel count
The only supported channel masks are mono and stereo;
arbitrary channel masks are not yet allowed.
Change-Id: I9cebbe56480b53b98e59aa55245a1f03a30d2839
Glenn Kasten [Tue, 6 Aug 2013 21:41:45 +0000 (14:41 -0700)]
Remove obsolete TrackBase::getBuffer()
Change-Id: Ic39c7baa9538080bfec114bf18ff9b9986c93fed
Glenn Kasten [Tue, 6 Aug 2013 21:31:26 +0000 (14:31 -0700)]
Line length 100
Change-Id: I8ad58a961cefd0b0c2b041e04fd78669917453d1
Glenn Kasten [Wed, 26 Jun 2013 18:19:36 +0000 (11:19 -0700)]
Use 0 for sp<>, NULL for raw pointers
Change-Id: Ia0595afdc41e1dec428d7a3db73558b54c417bf3
Lajos Molnar [Mon, 22 Jul 2013 19:57:43 +0000 (12:57 -0700)]
IOMX: add updateGraphicBufferInMeta method for metadata mode
This is used to set the handle in the metadata buffer that is
valid in the mediaserver process, as well as to keep a reference
for the graphic buffers in BufferMeta.
Change-Id: I46bb68d8bed894f357eeeb25368360d11b276634
Signed-off-by: Lajos Molnar <lajos@google.com>