OSDN Git Service
Marco Nelissen [Mon, 19 Aug 2013 20:10:57 +0000 (13:10 -0700)]
am
5eab65aa: am
ff58698e: am
f36ae7ca: Merge "Added support for 3GPP meta data atoms"
* commit '
5eab65aa7bd40e907d11dca8aad69714ffef19f1':
Added support for 3GPP meta data atoms
Marco Nelissen [Mon, 19 Aug 2013 20:07:07 +0000 (13:07 -0700)]
am
ff58698e: am
f36ae7ca: Merge "Added support for 3GPP meta data atoms"
* commit '
ff58698ec7e0f32bf9f3e1758173fe170e17270c':
Added support for 3GPP meta data atoms
Marco Nelissen [Mon, 19 Aug 2013 20:04:50 +0000 (13:04 -0700)]
am
f36ae7ca: Merge "Added support for 3GPP meta data atoms"
* commit '
f36ae7ca47dff5a5266f633bb36bf92308eec3f8':
Added support for 3GPP meta data atoms
Marco Nelissen [Mon, 19 Aug 2013 20:02:37 +0000 (20:02 +0000)]
Merge "Added support for 3GPP meta data atoms"
Ruben Brunk [Sat, 17 Aug 2013 00:36:49 +0000 (17:36 -0700)]
am
a8542f05: am
e9f3a314: Merge "Refactor CameraService to handle errors properly." into klp-dev
* commit '
a8542f05253e31a64428baf93a31183988a065bb':
Refactor CameraService to handle errors properly.
Ruben Brunk [Sat, 17 Aug 2013 00:33:52 +0000 (17:33 -0700)]
am
e9f3a314: Merge "Refactor CameraService to handle errors properly." into klp-dev
* commit '
e9f3a3141c2eaafa3a5a3417d1e5682a909c5b31':
Refactor CameraService to handle errors properly.
Ruben Brunk [Sat, 17 Aug 2013 00:29:13 +0000 (00:29 +0000)]
Merge "Refactor CameraService to handle errors properly." into klp-dev
Ruben Brunk [Thu, 8 Aug 2013 20:07:18 +0000 (13:07 -0700)]
Refactor CameraService to handle errors properly.
Bug:
10361136
-Connect calls now return status_t error flags.
Change-Id: Idca453b111e5df31327f6c99ebe853bb2e332b95
Glenn Kasten [Wed, 14 Aug 2013 22:17:55 +0000 (15:17 -0700)]
Don't lock and then immediately unlock effect chains
Change-Id: Id9a4b1e9c49cecfd3a008a7814b5c14dad9a5831
Glenn Kasten [Wed, 14 Aug 2013 22:08:12 +0000 (15:08 -0700)]
Fix races in reading activeTrack->mState without lock
Change-Id: I8cfbd9884fa5959a846ddb52cdc797266b896769
Glenn Kasten [Wed, 14 Aug 2013 21:39:50 +0000 (14:39 -0700)]
Simplify flow by having all mActiveTrack.clear() continue
Change-Id: Icd160b0aa79a747bd19fabaa7feee813afb155e0
Glenn Kasten [Wed, 14 Aug 2013 23:30:49 +0000 (16:30 -0700)]
Don't sleep with effect chains locked
Change-Id: I6eae037304d3dc8a8f3ef55c5b210fd4f8856e99
Glenn Kasten [Wed, 14 Aug 2013 21:21:34 +0000 (14:21 -0700)]
Copy mActiveTrack for stability and easier access
Change-Id: If0d88610ec35128054a22f42b2d79f07c4b724eb
Glenn Kasten [Wed, 14 Aug 2013 21:02:21 +0000 (14:02 -0700)]
Simplify code by pulling up mActiveTrack == 0 test
Change-Id: I225bb032b2fde97d891191f3599d9850c2d27bb2
Glenn Kasten [Fri, 16 Aug 2013 21:00:19 +0000 (21:00 +0000)]
Merge "Remove dead 'if'"
Glenn Kasten [Fri, 16 Aug 2013 20:59:26 +0000 (20:59 +0000)]
Merge "Fix race in checking exitPending() in RecordThread::threadLoop()"
Lajos Molnar [Fri, 16 Aug 2013 19:38:01 +0000 (12:38 -0700)]
am
54233057: am
1cb4e166: Merge "Add MEDIA_STARTED/PAUSED/STOPPED events to media players" into klp-dev
* commit '
54233057d1c8466d3cc86e2f5ecc39e7816c4f7a':
Add MEDIA_STARTED/PAUSED/STOPPED events to media players
Lajos Molnar [Fri, 16 Aug 2013 19:35:41 +0000 (12:35 -0700)]
am
1cb4e166: Merge "Add MEDIA_STARTED/PAUSED/STOPPED events to media players" into klp-dev
* commit '
1cb4e1661e4144cb188c2c79b89804fcb902fd19':
Add MEDIA_STARTED/PAUSED/STOPPED events to media players
Lajos Molnar [Fri, 16 Aug 2013 19:32:29 +0000 (19:32 +0000)]
Merge "Add MEDIA_STARTED/PAUSED/STOPPED events to media players" into klp-dev
Lajos Molnar [Thu, 15 Aug 2013 01:30:38 +0000 (18:30 -0700)]
Add MEDIA_STARTED/PAUSED/STOPPED events to media players
This is needed for the MediaTimeProvider java interface, so it does not
continually poll for current media time.
Note: NuPlayer and AwesomePlayer do not correctly handle stop (pause
instead), so for those we will signal PAUSED.
Signed-off-by: Lajos Molnar <lajos@google.com>
Change-Id: I3c61e1bda475f131323f475c18a42e3ec66c9ae1
Bug:
10326117
Glenn Kasten [Wed, 14 Aug 2013 20:55:45 +0000 (13:55 -0700)]
Remove dead 'if'
Change-Id: I23c082f0115ae598cad293be0ac66a130afb692a
Glenn Kasten [Wed, 14 Aug 2013 20:52:27 +0000 (13:52 -0700)]
Fix race in checking exitPending() in RecordThread::threadLoop()
Change-Id: I97a1c5ab17a6c334d275be794392dcf6c9a88d0e
Andreas Huber [Thu, 15 Aug 2013 16:17:50 +0000 (09:17 -0700)]
am
ce57e797: am
75c16dde: Merge "You can now opt-in to having the video decoder push blank buffers to the" into klp-dev
* commit '
ce57e797526db119f5baaaeab75cd8de4b162c9a':
You can now opt-in to having the video decoder push blank buffers to the
Andreas Huber [Thu, 15 Aug 2013 16:15:19 +0000 (09:15 -0700)]
am
75c16dde: Merge "You can now opt-in to having the video decoder push blank buffers to the" into klp-dev
* commit '
75c16dde986e16ac5fd4d34b06b0cc6a90679866':
You can now opt-in to having the video decoder push blank buffers to the
Andreas Huber [Thu, 15 Aug 2013 16:12:08 +0000 (16:12 +0000)]
Merge "You can now opt-in to having the video decoder push blank buffers to the" into klp-dev
Glenn Kasten [Thu, 15 Aug 2013 16:01:00 +0000 (16:01 +0000)]
Merge "Simplify code that checks for record standby"
Glenn Kasten [Thu, 15 Aug 2013 15:47:35 +0000 (15:47 +0000)]
Merge "checkForNewParameters_l returns a value which is currently ignored"
Glenn Kasten [Thu, 15 Aug 2013 15:37:09 +0000 (15:37 +0000)]
Merge "Use Autolock where possible"
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 [Wed, 14 Aug 2013 20:12:11 +0000 (13:12 -0700)]
Simplify code that checks for record standby
Take advantage of the new processConfigEvents_l()
and it's post condition that mConfigEvents is empty.
Change-Id: Icd40fb175f3e374203c9c8d2e9df2c3929bed89b
Glenn Kasten [Wed, 14 Aug 2013 20:11:40 +0000 (13:11 -0700)]
checkForNewParameters_l returns a value which is currently ignored
Change-Id: I19b9cc9df094d67560f6e832d94fa284dca18687
Glenn Kasten [Wed, 14 Aug 2013 20:11:06 +0000 (13:11 -0700)]
Use Autolock where possible
Change-Id: Id0e1836831c45beda4e5cb11e983005ea699fc2a
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
Andreas Huber [Wed, 14 Aug 2013 17:28:14 +0000 (10:28 -0700)]
You can now opt-in to having the video decoder push blank buffers to the
surface on the transition from executing->idle by specifying the key
"push-blank-buffers-on-shutdown" with a value of 1 in the call to configure.
Change-Id: I1155fccf89f18e717728c985e590651597595515
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"
Oscar Rydhé [Fri, 14 Dec 2012 12:52:07 +0000 (13:52 +0100)]
Added support for 3GPP meta data atoms
3GPP metadata is not supported, only iTunes Metadata
Format is supported.
Change-Id: I78b41c88788d5a43800c936e0ac0f98424515c62
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