OSDN Git Service
Marco Nelissen [Fri, 6 Sep 2013 17:00:33 +0000 (10:00 -0700)]
am
c23981d9: Merge "Better workaround for slow decoders." into klp-dev
* commit '
c23981d9375d4a55f5701a4090b36deecda92f92':
Better workaround for slow decoders.
Marco Nelissen [Fri, 6 Sep 2013 16:58:25 +0000 (16:58 +0000)]
Merge "Better workaround for slow decoders." into klp-dev
Ruben Brunk [Fri, 6 Sep 2013 01:24:37 +0000 (18:24 -0700)]
am
36a8b33a: Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev
* commit '
36a8b33a23dca49c9617e97e22e5d67f7d25c268':
camera: Fix race condition between setParameters() and stopPreview().
Ruben Brunk [Fri, 6 Sep 2013 01:21:52 +0000 (01:21 +0000)]
Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev
Ruben Brunk [Thu, 5 Sep 2013 01:18:26 +0000 (18:18 -0700)]
camera: Fix race condition between setParameters() and stopPreview().
Bug:
10414772
Change-Id: I928cb3935afb101da8a7931f88c27dccdb03b4a9
Andy McFadden [Thu, 5 Sep 2013 17:03:44 +0000 (10:03 -0700)]
am
72119ce8: Merge "Start \'am\' with exec()" into klp-dev
* commit '
72119ce833d4f0e1c0342f1722d1433f2ba12b87':
Start 'am' with exec()
Andy McFadden [Thu, 5 Sep 2013 17:00:15 +0000 (17:00 +0000)]
Merge "Start 'am' with exec()" into klp-dev
Andy McFadden [Wed, 4 Sep 2013 22:54:07 +0000 (15:54 -0700)]
Start 'am' with exec()
We were using system() to run 'am broadcast'. Switch to
fork()+exec().
Bug
10606037
Change-Id: Ifae1a2b4f1914f015d09f2cac8cd0b1896d87a84
Marco Nelissen [Wed, 4 Sep 2013 22:00:07 +0000 (15:00 -0700)]
Better workaround for slow decoders.
This is more in the spirit of the original code. Now it checks
whether a codec instantiated by name is a video codec, and enables
the extra looper if so.
b/
10528409
Change-Id: Ia253c04c1283d4ecf66f213ef4bf523279ad7cca
Chong Zhang [Wed, 4 Sep 2013 22:11:34 +0000 (15:11 -0700)]
am
a1991255: Merge "wifi-display: do not use HDCP\'s encryptNative method if its unsupported" into klp-dev
* commit '
a19912554f3779fac0c341ac702227bf4b5fe399':
wifi-display: do not use HDCP's encryptNative method if its unsupported
Chong Zhang [Wed, 4 Sep 2013 22:08:00 +0000 (22:08 +0000)]
Merge "wifi-display: do not use HDCP's encryptNative method if its unsupported" into klp-dev
Ruben Brunk [Wed, 4 Sep 2013 21:50:44 +0000 (14:50 -0700)]
am
7a4c2711: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev
* commit '
7a4c2711d7a85ce962b9d18fee41975f9c574c0b':
Fix CameraService error flag when running HAL1 with API2.
Ruben Brunk [Wed, 4 Sep 2013 21:48:14 +0000 (21:48 +0000)]
Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev
Ruben Brunk [Mon, 19 Aug 2013 22:21:19 +0000 (15:21 -0700)]
Fix CameraService error flag when running HAL1 with API2.
Bug:
10620944
Change-Id: I44c0d09a3d313ae8f724fbe61fa5f36cf5b38b6d
Rachad [Wed, 4 Sep 2013 16:26:13 +0000 (09:26 -0700)]
am
c85d6196: Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/
10294801" into klp-dev
* commit '
c85d61964cb6f9b23cd2e82e43d7052b3e7d4fbc':
Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/
10294801
Rachad [Wed, 4 Sep 2013 16:21:35 +0000 (16:21 +0000)]
Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/
10294801" into klp-dev
Marco Nelissen [Wed, 4 Sep 2013 01:38:34 +0000 (18:38 -0700)]
am
df60eff8: Merge "Work around decoder slowness" into klp-dev
* commit '
df60eff872f276c1a94ab0355b252b73fe61faa9':
Work around decoder slowness
Marco Nelissen [Wed, 4 Sep 2013 01:35:40 +0000 (01:35 +0000)]
Merge "Work around decoder slowness" into klp-dev
Glenn Kasten [Tue, 3 Sep 2013 23:08:29 +0000 (16:08 -0700)]
am
fe346c70: Fix miscellanous AudioTrack::getTimestamp() bugs
* commit '
fe346c707f59d763ded93bc3d27b51f0c0408258':
Fix miscellanous AudioTrack::getTimestamp() bugs
Glenn Kasten [Tue, 3 Sep 2013 23:08:28 +0000 (16:08 -0700)]
am
4d0815d6: Implement MonoPipe::getTimestamp
* commit '
4d0815d694e5a2edb3ce48427de50f55d0f84c0b':
Implement MonoPipe::getTimestamp
Glenn Kasten [Tue, 3 Sep 2013 23:08:27 +0000 (16:08 -0700)]
am
732845c7: FastMixer computes presentation timestamps for fast tracks
* commit '
732845c7e8d294bb1aaa4cd9687da62b51f1f6e6':
FastMixer computes presentation timestamps for fast tracks
Glenn Kasten [Tue, 3 Sep 2013 23:08:26 +0000 (16:08 -0700)]
am
6466c9e6: Add ExtendedAudioBufferProvider::framesReleased and onTimestamp
* commit '
6466c9e6e6278c740aed77f695f679be9f5db478':
Add ExtendedAudioBufferProvider::framesReleased and onTimestamp
Glenn Kasten [Tue, 3 Sep 2013 23:08:26 +0000 (16:08 -0700)]
am
894d6be4: Add NBAIO_Source::onTimestamp()
* commit '
894d6be4f9b4721c77a01919ecf03b27cec90cc9':
Add NBAIO_Source::onTimestamp()
Glenn Kasten [Tue, 3 Sep 2013 23:08:25 +0000 (16:08 -0700)]
am
a07a1c2c: Instantiate SingleStateQueue<AudioTimestamp>
* commit '
a07a1c2c91dc7ee6ded319262499f20cd01edcf7':
Instantiate SingleStateQueue<AudioTimestamp>
Chong Zhang [Tue, 3 Sep 2013 21:35:37 +0000 (14:35 -0700)]
wifi-display: do not use HDCP's encryptNative method if its unsupported
Bug:
10609422
Change-Id: I005f1d04a4191b1503b5f3e895a98b8d6560c402
Marco Nelissen [Tue, 3 Sep 2013 22:29:33 +0000 (15:29 -0700)]
Work around decoder slowness
b/
10528409
Change-Id: Ifcaf0488d63e87676b1e9382437943138deb76a6
Glenn Kasten [Fri, 30 Aug 2013 20:28:22 +0000 (13:28 -0700)]
Fix miscellanous AudioTrack::getTimestamp() bugs
Check that get_presentation_position is non-NULL before calling.
AudioTrack::getTimestamp not implemented for fast tracks.
Fix typo in Track::getTimestamp().
Fix bugs in AudioTrack::getTimestamp after stop:
- getTimestamp while stopped is not allowed.
- stop, start, getTimestamp now returns the correct value.
Change-Id: Ie8d9dc1f28d8927634e04175a68b147ffc2ea8eb
Glenn Kasten [Tue, 3 Sep 2013 22:12:48 +0000 (15:12 -0700)]
am
943ba3cc: Merge "Add NBAIO_Sink::getTimestamp()" into klp-dev
* commit '
943ba3cca8df0da24db38e97e43aaacb5b788a21':
Add NBAIO_Sink::getTimestamp()
Glenn Kasten [Thu, 29 Aug 2013 21:40:55 +0000 (14:40 -0700)]
Implement MonoPipe::getTimestamp
using SingleStateQueue observer
Change-Id: I7b1928b087f1e676c7b291df6cefa7707301662c
Glenn Kasten [Fri, 23 Aug 2013 16:26:31 +0000 (09:26 -0700)]
FastMixer computes presentation timestamps for fast tracks
and forwards them to each track's ExtendedAudioBufferProvider::onTimestamp().
Change-Id: I06fb9586bb7e20d5c0289abdc8cac6cd3fd2f6e8
Glenn Kasten [Fri, 23 Aug 2013 17:54:07 +0000 (10:54 -0700)]
Add ExtendedAudioBufferProvider::framesReleased and onTimestamp
and implement them in SourceAudioBufferProvider using the associated NBAIO_Source,
and in Track using the associated AudioTrackServerProxy.
Change-Id: I60dc4adba63fc1dc452ff16caf347e4a7c8242c2
Glenn Kasten [Mon, 26 Aug 2013 17:29:28 +0000 (10:29 -0700)]
Add NBAIO_Source::onTimestamp()
with dummy default implementation, and implement in MonoPipeReader.
onTimestamp is meant to be called by the corresponding sink when it has
a new timestamp available.
Change-Id: I8a90d24d1061e4a592ce5bd8ee1c9fce6bdd8a84
Glenn Kasten [Fri, 23 Aug 2013 17:54:35 +0000 (10:54 -0700)]
Instantiate SingleStateQueue<AudioTimestamp>
as typedef AudioTimestampSingleStateQueue and use it in MonoPipe.
Change-Id: Idaebb362bd9d0a81a7ed83792ab9369dc37c0e74
Glenn Kasten [Tue, 3 Sep 2013 22:08:53 +0000 (22:08 +0000)]
Merge "Add NBAIO_Sink::getTimestamp()" into klp-dev
Jean-Michel Trivi [Tue, 3 Sep 2013 21:46:25 +0000 (14:46 -0700)]
am
572864b9: Merge "AAC encoder: handle missing object types" into klp-dev
* commit '
572864b94e7882c2d23537525c708abcacde43b0':
AAC encoder: handle missing object types
Jean-Michel Trivi [Tue, 3 Sep 2013 21:43:48 +0000 (21:43 +0000)]
Merge "AAC encoder: handle missing object types" into klp-dev
Eino-Ville Talvala [Tue, 3 Sep 2013 20:56:41 +0000 (13:56 -0700)]
am
0a4df035: Camera2/3: Increase precapture start timeout
* commit '
0a4df03542e7d7aab716a60e206dceaf5da178f3':
Camera2/3: Increase precapture start timeout
Eino-Ville Talvala [Tue, 3 Sep 2013 20:29:28 +0000 (13:29 -0700)]
Camera2/3: Increase precapture start timeout
Currently, we only wait 200 ms for the HAL to switch to the precapture
state. This is insufficient at low preview frame rates (dark
conditions, ~10 fps), where a 3-request-deep HAL pipeline will take
300 ms to produce a precapture trigger output. In those cases, we
would prematurely skip the precapture sequence, causing bad quality
pictures.
Since this is a fallback timeout to prevent deadlock in case of a bad
HAL or framework implementation, increase the timeout to 1 second. Has
no impact on correctly-working implementations
Bug:
10430191
Change-Id: I08e99f8e7f3beb8f15dcee32632cdebfe3dca8b3
Glenn Kasten [Fri, 23 Aug 2013 20:51:43 +0000 (13:51 -0700)]
Add NBAIO_Sink::getTimestamp()
with a real implementation in AudioStreamOutSink
for dummy implementation initially in MonoPipe.
Use in AudioFlinger::PlaybackThread::threadLoop_write()
to keep the input to the timestamp latch up-to-date.
Change-Id: I10ef277991b63bb43d55d6f3df75116ef32246cd
Jeff Tinker [Tue, 3 Sep 2013 17:49:08 +0000 (10:49 -0700)]
am
4585e8f0: Revert "Enhancement for OnInfo callback on DRM Framework"
* commit '
4585e8f0ff47580fdb81ed8652bde32db1770050':
Revert "Enhancement for OnInfo callback on DRM Framework"
Jeff Tinker [Fri, 30 Aug 2013 23:05:00 +0000 (23:05 +0000)]
Revert "Enhancement for OnInfo callback on DRM Framework"
This reverts commit
5ff7836da0220b3097f36c8a5e82111816ebca62.
Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video
bug:
10542864
Change-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca
Eric Laurent [Sat, 31 Aug 2013 17:15:47 +0000 (10:15 -0700)]
am
e45a767e: Merge "Revert "Fix decoder EOS handling"" into klp-dev
* commit '
e45a767e13fe3396185c9d378a70f7f11eb881d0':
Revert "Fix decoder EOS handling"
Eric Laurent [Sat, 31 Aug 2013 17:14:04 +0000 (17:14 +0000)]
Merge "Revert "Fix decoder EOS handling"" into klp-dev
Eric Laurent [Sat, 31 Aug 2013 02:22:29 +0000 (19:22 -0700)]
Revert "Fix decoder EOS handling"
This reverts commit
9da36a6c8df70a5c8179ac78fab33cfbb5078cb2.
Bug:
10571297.
Change-Id: I76f20fe34872ea54fce626077462fb86c8c3f02e
Rachad [Fri, 30 Aug 2013 22:52:00 +0000 (15:52 -0700)]
Fixed timestamp handling in ESQueue Access Unit parser.
This fixes bug b/
10294801
Change-Id: Ie96d36e2ff6fdee0c949a85da3602ab04b34bf6e
Eric Laurent [Fri, 30 Aug 2013 22:41:14 +0000 (15:41 -0700)]
am
6bf9ae20: audioflinger: offloaded tracks flush/pause order
* commit '
6bf9ae20b3bd2dbb8f2e89ee167a6785222301cf':
audioflinger: offloaded tracks flush/pause order
Eric Laurent [Fri, 30 Aug 2013 22:12:37 +0000 (15:12 -0700)]
audioflinger: offloaded tracks flush/pause order
Make sure that a flush received after a pause is forwarded
to the HAL after the pause.
Change-Id: Ib3221f70c59f8b3dbbac20b23104f6b779b75be0
Igor Murashkin [Fri, 30 Aug 2013 18:34:15 +0000 (11:34 -0700)]
am
d656a4be: Merge "camera: Fix deadlock when sending callbacks during disconnect" into klp-dev
* commit '
d656a4be3c3b6bc249b06599c2b02c2863d2c47f':
camera: Fix deadlock when sending callbacks during disconnect
Igor Murashkin [Fri, 30 Aug 2013 18:32:13 +0000 (18:32 +0000)]
Merge "camera: Fix deadlock when sending callbacks during disconnect" into klp-dev
Marco Nelissen [Fri, 30 Aug 2013 18:00:28 +0000 (11:00 -0700)]
am
9404fa6a: Merge "Fix decoder EOS handling" into klp-dev
* commit '
9404fa6ac9f76f8f8d898e35f4fa03906a553e0a':
Fix decoder EOS handling
Marco Nelissen [Fri, 30 Aug 2013 17:56:11 +0000 (17:56 +0000)]
Merge "Fix decoder EOS handling" into klp-dev
Marco Nelissen [Thu, 29 Aug 2013 16:31:26 +0000 (09:31 -0700)]
Fix decoder EOS handling
Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.
b/
8747869
Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
Eino-Ville Talvala [Fri, 30 Aug 2013 01:50:46 +0000 (18:50 -0700)]
am
96be8bb7: Merge "Camera3: Be busy as soon as work arrives." into klp-dev
* commit '
96be8bb7c2ce0fc6d3c62f3467e752ddf87c7f44':
Camera3: Be busy as soon as work arrives.
Eino-Ville Talvala [Fri, 30 Aug 2013 01:48:14 +0000 (01:48 +0000)]
Merge "Camera3: Be busy as soon as work arrives." into klp-dev
Igor Murashkin [Fri, 30 Aug 2013 00:43:01 +0000 (17:43 -0700)]
camera: Fix deadlock when sending callbacks during disconnect
Bug:
10552448
Change-Id: Ie93ba744ae6705aa657f980ae8e08ec624feeb39
Glenn Kasten [Fri, 30 Aug 2013 00:09:38 +0000 (17:09 -0700)]
am
51ec03c2: Merge "Implement Track::getTimestamp()" into klp-dev
* commit '
51ec03c203b902edbea538b9b5ef862dea749099':
Implement Track::getTimestamp()
Glenn Kasten [Fri, 30 Aug 2013 00:09:38 +0000 (17:09 -0700)]
am
9841f636: Merge "Add AudioFlinger::PlaybackThread::Track::getTimestamp()" into klp-dev
* commit '
9841f636ffaf645375983f13c99bf071ba5ffb37':
Add AudioFlinger::PlaybackThread::Track::getTimestamp()
Glenn Kasten [Fri, 30 Aug 2013 00:09:37 +0000 (17:09 -0700)]
am
56b59224: Merge "Add IAudioTrack::getTimestamp()" into klp-dev
* commit '
56b592240073b1ab116c6e23a9c4c34ef5ad80d8':
Add IAudioTrack::getTimestamp()
Glenn Kasten [Fri, 30 Aug 2013 00:05:03 +0000 (00:05 +0000)]
Merge "Implement Track::getTimestamp()" into klp-dev
Glenn Kasten [Fri, 30 Aug 2013 00:04:50 +0000 (00:04 +0000)]
Merge "Add AudioFlinger::PlaybackThread::Track::getTimestamp()" into klp-dev
Glenn Kasten [Fri, 30 Aug 2013 00:04:37 +0000 (00:04 +0000)]
Merge "Add IAudioTrack::getTimestamp()" into klp-dev
Glenn Kasten [Thu, 29 Aug 2013 23:49:59 +0000 (16:49 -0700)]
am
865f6f24: Merge "New AudioTrack C++ API for audio timestamps" into klp-dev
* commit '
865f6f248bf10189272020ebfdbf4827433caf0f':
New AudioTrack C++ API for audio timestamps
Glenn Kasten [Thu, 29 Aug 2013 23:47:34 +0000 (23:47 +0000)]
Merge "New AudioTrack C++ API for audio timestamps" into klp-dev
Eric Laurent [Thu, 29 Aug 2013 23:33:24 +0000 (16:33 -0700)]
am
e3b8b6e3: Merge "AudioPlayer: timestamp fixes for compress offload" into klp-dev
* commit '
e3b8b6e3e3a78ec6f9978f56c4573e193866ef53':
AudioPlayer: timestamp fixes for compress offload
Eric Laurent [Thu, 29 Aug 2013 23:29:35 +0000 (23:29 +0000)]
Merge "AudioPlayer: timestamp fixes for compress offload" into klp-dev
Jean-Michel Trivi [Thu, 29 Aug 2013 22:51:31 +0000 (15:51 -0700)]
AAC encoder: handle missing object types
The audio object type for parametric stereo and lowdelay was not passed
to the FDK AAC encoder.
Bug
9428126
Change-Id: Ic32822afff8b1da6a2d80c1b65d514f24059fb29
Eric Laurent [Thu, 29 Aug 2013 22:21:31 +0000 (15:21 -0700)]
am
ed474f37: Merge "AudioTrack: fix write retries for compressed audio" into klp-dev
* commit '
ed474f370947856e72795c641672fcad90442fcf':
AudioTrack: fix write retries for compressed audio
Eric Laurent [Thu, 29 Aug 2013 22:17:58 +0000 (22:17 +0000)]
Merge "AudioTrack: fix write retries for compressed audio" into klp-dev
Andy McFadden [Thu, 29 Aug 2013 21:42:46 +0000 (14:42 -0700)]
am
e81da7e0: Merge "Add time limit to screenrecord" into klp-dev
* commit '
e81da7e0f5914b30ed7cc65a22751fd78cb828a7':
Add time limit to screenrecord
Andy McFadden [Thu, 29 Aug 2013 21:42:46 +0000 (14:42 -0700)]
am
b897e647: Merge "Notify the media scanner" into klp-dev
* commit '
b897e64767e87828642282d76bd6001175b0d405':
Notify the media scanner
Andy McFadden [Thu, 29 Aug 2013 21:41:16 +0000 (21:41 +0000)]
Merge "Add time limit to screenrecord" into klp-dev
Andy McFadden [Thu, 29 Aug 2013 21:41:07 +0000 (21:41 +0000)]
Merge "Notify the media scanner" into klp-dev
Eric Laurent [Thu, 29 Aug 2013 21:35:05 +0000 (14:35 -0700)]
AudioTrack: fix write retries for compressed audio
When the amount of frames that can be written to the buffer
is less than requested, AudioTrack::processAudioBuffer() estimates
the time needed to free the missing amount of frames and asks the
callback thread to sleep.
This behavior is not possible for compressed audio and should not
be enabled for offloaded tracks.
Change-Id: I5b657283cfba06254c9ac0ea9b447467cce7eb61
Haynes Mathew George [Mon, 5 Aug 2013 18:00:37 +0000 (11:00 -0700)]
AudioPlayer: timestamp fixes for compress offload
Use realtime queried from AudioTrack as the only time for compress
offload playback.
Change-Id: I314447637715c4864690c94173260165369146cb
Eino-Ville Talvala [Thu, 29 Aug 2013 19:46:18 +0000 (12:46 -0700)]
Camera3: Be busy as soon as work arrives.
RequestThread's internal busy flag (mPaused) was not being immediately
set when new work was submitted to it. This allowed for a race
condition where a capture() followed by an immediate
waitUntilDrained() would immediately return from the wait.
Set the mPaused flag to false immediately in capture() and
setStreamingRequest() to avoid this, instead of waiting until the end
of the next RequestThread iteration.
Bug:
10531739
Change-Id: I54a79fe5361d527ec717f41ad805e9b319a48cd8
Chong Zhang [Thu, 29 Aug 2013 19:03:28 +0000 (12:03 -0700)]
am
bdd467ed: Merge "Set PREPARING flag after setDataSource_l()" into klp-dev
* commit '
bdd467edb8550ab006c89a59b556759386e99898':
Set PREPARING flag after setDataSource_l()
Chong Zhang [Thu, 29 Aug 2013 18:58:07 +0000 (18:58 +0000)]
Merge "Set PREPARING flag after setDataSource_l()" into klp-dev
Jeff Tinker [Thu, 29 Aug 2013 18:21:21 +0000 (11:21 -0700)]
am
45e4eb05: Merge "fix MediaDrm.isCryptoSchemeSupported(uuid)" into klp-dev
* commit '
45e4eb050d2cd7f2d7433bf1262bd39e3144584e':
fix MediaDrm.isCryptoSchemeSupported(uuid)
Jeff Tinker [Thu, 29 Aug 2013 18:18:06 +0000 (18:18 +0000)]
Merge "fix MediaDrm.isCryptoSchemeSupported(uuid)" into klp-dev
Glenn Kasten [Fri, 23 Aug 2013 20:53:56 +0000 (13:53 -0700)]
Implement Track::getTimestamp()
using a new timestamp latch in PlaybackThread, and
AudioTrackServerProxy::framesReleased() which returns mServer.
Change-Id: I1ebfba968c773faaab95648c272fd3ebd74718d6
Glenn Kasten [Mon, 26 Aug 2013 16:36:23 +0000 (09:36 -0700)]
Add AudioFlinger::PlaybackThread::Track::getTimestamp()
with a dummy implementation initially,
and use it in AudioFlinger::TrackHandle::getTimestamp()
Change-Id: I2da88fc52a135a7f0d9fd9538986e919dc8ccd3b
Glenn Kasten [Thu, 29 Aug 2013 16:01:02 +0000 (09:01 -0700)]
Add IAudioTrack::getTimestamp()
with dummy implementation in AudioFlinger::TrackHandle, and
implement AudioTrack::getTimestamp() using IAudioTrack.
Also document invariant that mAudioTrack and control block are always
non-0 after successful initialization.
Change-Id: I9861d1454cff7decf795d5d5898ac7999a9f3b7e
Glenn Kasten [Fri, 19 Jul 2013 23:33:58 +0000 (16:33 -0700)]
New AudioTrack C++ API for audio timestamps
This new API is intended to replace latency(), especially for A/V sync.
The application will receive periodic timestamp notifications. The period
is unspecified, but will likely be more frequent after a pause or stop,
set position, underrun, display on/off change, route change, or when audio
framework notices drift. It will be up to the higher level application
(e.g. Stagefright) to reconstruct a clock that updates more frequently.
The current latency() method doesn't indicate when latency changes
due to screen on/off state, route changes, etc.
Includes squahsed change-Id: I2082f8752040be0c234b1a6f1be2e269abf2ce7c
Dummy implementation of AudioTrack:getTimestamp()
Rename AudioTrack::Timestamp to AudioTimestamp.
Renaming and pulling up to a higher level allows more modules to use it.
Change-Id: Ibf7f6a207c3f8d8697f25ede2cd5200697fadb86
(cherry picked from commit
dd69eb893867634fd169c03204a6ad7c74b351e7)
Chong Zhang [Wed, 28 Aug 2013 23:48:35 +0000 (16:48 -0700)]
Set PREPARING flag after setDataSource_l()
Otherwise the reset_l() inside setDataSource_l() will get stuck
waiting for the PREPARING to be cleared.
Bug:
10426788
Change-Id: I7ccdf7abcea71cf150544c7cd3f4781e3a946b97
Jeff Tinker [Wed, 28 Aug 2013 23:40:41 +0000 (16:40 -0700)]
fix MediaDrm.isCryptoSchemeSupported(uuid)
1. Don't expect plugins to support an empty mimeType in isContentTypeSupported
2. Move the cts test mock drm plugin to the cts tree so it is always used
b/
10528466
Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
Andy McFadden [Wed, 28 Aug 2013 22:22:11 +0000 (15:22 -0700)]
Add time limit to screenrecord
Recordings are now limited to 3 minutes. The time can be set lower
with the --time-limit option.
Bug
10529645
Change-Id: I6ac19b9da8d616d38262414c2e821d56efcec55d
Eric Laurent [Wed, 28 Aug 2013 17:53:07 +0000 (10:53 -0700)]
am
c063c175: Merge "AudioTrack: fix unwanted underrun when restarting" into klp-dev
* commit '
c063c1756cbffdc273fe50b208426f59439f1298':
AudioTrack: fix unwanted underrun when restarting
Eric Laurent [Wed, 28 Aug 2013 17:43:16 +0000 (17:43 +0000)]
Merge "AudioTrack: fix unwanted underrun when restarting" into klp-dev
Eric Laurent [Wed, 28 Aug 2013 17:23:01 +0000 (10:23 -0700)]
AudioTrack: fix unwanted underrun when restarting
When restarting an AudioTrack from stopped state, it is necessary
to force refresh of mRemainingFrames by processAudioBuffer() as
the last write before stop() could be partial. No doing so will lead
into unnecessary sleep before filling the non contiguous part
of the buffer returned by obtainBuffer() when processAudioBuffer()
is executed for the first time after start().
Change-Id: Id703f8dc092a6f07c905eee194054b4a978f979d
Andreas Huber [Wed, 28 Aug 2013 15:54:36 +0000 (08:54 -0700)]
am
af66fae1: am
fb949d5d: Merge "Fix crash in MyHandler when sockets are not set."
* commit '
af66fae15f8c386ad884e5fa83db4eaef4c4f2ee':
Fix crash in MyHandler when sockets are not set.
Andreas Huber [Wed, 28 Aug 2013 15:51:53 +0000 (08:51 -0700)]
am
fb949d5d: Merge "Fix crash in MyHandler when sockets are not set."
* commit '
fb949d5dc8a764e31fbd65bee87f59fcfeb6d848':
Fix crash in MyHandler when sockets are not set.
Andreas Huber [Wed, 28 Aug 2013 15:48:39 +0000 (15:48 +0000)]
Merge "Fix crash in MyHandler when sockets are not set."
Andy McFadden [Fri, 23 Aug 2013 20:49:38 +0000 (13:49 -0700)]
Notify the media scanner
Use an "am broadcast" command to notify the media scanner that
a new video file is available.
Bug
10096103
Change-Id: I8261d81d96832969ebb9031a9766c1b1f2a569ed
Eino-Ville Talvala [Tue, 27 Aug 2013 16:53:28 +0000 (09:53 -0700)]
am
e07f5372: Merge "Camera2: Add flush support" into klp-dev
* commit '
e07f53720bcf543bcfe90c228a49c2a85a3fdb4c':
Camera2: Add flush support
Eino-Ville Talvala [Tue, 27 Aug 2013 16:49:13 +0000 (16:49 +0000)]
Merge "Camera2: Add flush support" into klp-dev
Igor Murashkin [Mon, 26 Aug 2013 22:05:08 +0000 (15:05 -0700)]
am
8271f1a2: Merge "camera2: Get rid of annoying "Reading a NULL string...." error message" into klp-dev
* commit '
8271f1a2225a34a0748624786392213a746c56d7':
camera2: Get rid of annoying "Reading a NULL string...." error message
Jeff Tinker [Mon, 26 Aug 2013 22:04:04 +0000 (15:04 -0700)]
am
3bd3690f: Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev
* commit '
3bd3690fb0a423f9d0ba635e8db1c148ac9e93fc':
Enhancement for OnInfo callback on DRM Framework
Chong Zhang [Mon, 26 Aug 2013 22:03:02 +0000 (15:03 -0700)]
am
33142e1e: Merge "wifi-display: pass session info to wifi display settings" into klp-dev
* commit '
33142e1e318c0c766a385d88d2434f62f9e2dfe7':
wifi-display: pass session info to wifi display settings
Chong Zhang [Mon, 26 Aug 2013 22:00:59 +0000 (15:00 -0700)]
am
2484040e: Merge "MediaPlayer: add listener for raw track data" into klp-dev
* commit '
2484040e0f413989e4edbe26ba3bf71122382af6':
MediaPlayer: add listener for raw track data
Igor Murashkin [Mon, 26 Aug 2013 20:22:37 +0000 (20:22 +0000)]
Merge "camera2: Get rid of annoying "Reading a NULL string...." error message" into klp-dev