OSDN Git Service
Glenn Kasten [Fri, 20 Dec 2013 23:47:09 +0000 (23:47 +0000)]
Merge "Fix some (but not all) unused parameter warnings"
Glenn Kasten [Fri, 20 Dec 2013 23:45:54 +0000 (23:45 +0000)]
Merge "Add versions of get/SetParameters without I/O handle"
Glenn Kasten [Fri, 20 Dec 2013 15:35:48 +0000 (15:35 +0000)]
Merge "Fix compile warning / incomplete initialization"
Glenn Kasten [Fri, 20 Dec 2013 00:34:04 +0000 (16:34 -0800)]
Fix some (but not all) unused parameter warnings
Change-Id: Ia99e23a0b46db3f3e6aa46f9018e63c14f4af369
Glenn Kasten [Fri, 20 Dec 2013 00:35:18 +0000 (16:35 -0800)]
Add versions of get/SetParameters without I/O handle
This is a step towards hiding I/O handles from application level,
as much as possible.
Change-Id: I30f4171d5dcf77f8e8eb332ce2e9245b30f5f2e1
Glenn Kasten [Thu, 19 Dec 2013 17:09:33 +0000 (09:09 -0800)]
Fix compile warning / incomplete initialization
Change-Id: Ib4accf99be800988e081f96222e1ee73538221ec
Glenn Kasten [Wed, 18 Dec 2013 15:55:48 +0000 (15:55 +0000)]
Merge "Fix bug in test-resample's AudioBufferProvider"
Nick Kralevich [Wed, 18 Dec 2013 05:54:13 +0000 (05:54 +0000)]
am
33425f66: am
d497b648: am
1f95555c: Merge "libeffects: do not use GNU old-style field designators"
* commit '
33425f660affa39da98aeb9735b82cc00dbd47a0':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Wed, 18 Dec 2013 05:50:54 +0000 (05:50 +0000)]
am
d497b648: am
1f95555c: Merge "libeffects: do not use GNU old-style field designators"
* commit '
d497b648ccb316e3fbda4c081f7c3010318bbcd9':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Wed, 18 Dec 2013 04:17:23 +0000 (20:17 -0800)]
am
1f95555c: Merge "libeffects: do not use GNU old-style field designators"
* commit '
1f95555c69219180f792ac742cc0e386496c29e6':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Wed, 18 Dec 2013 04:12:18 +0000 (04:12 +0000)]
Merge "libeffects: do not use GNU old-style field designators"
synergy dev [Wed, 18 Dec 2013 01:48:51 +0000 (17:48 -0800)]
libeffects: do not use GNU old-style field designators
Avoiding the use of GCC extensions improves code portability
Change-Id: I9edbedc5c8ad4aa46ca54bc2e28280441431a530
Lajos Molnar [Wed, 18 Dec 2013 00:40:25 +0000 (00:40 +0000)]
Merge "stagefright: Fix issue with tracking media format in packet source"
Glenn Kasten [Wed, 18 Dec 2013 00:14:04 +0000 (16:14 -0800)]
Fix bug in test-resample's AudioBufferProvider
The contract for AudioBufferProvider::releaseBuffer() was missing.
Bug:
12194314
Change-Id: I2fcf75e7b8eaf6db34f360206d79457a04a73565
Glenn Kasten [Tue, 17 Dec 2013 23:22:08 +0000 (15:22 -0800)]
Add ability to read .wav files to test-resample
Previously test-resample could only read .raw files, and the input
sample rate had to be specified. Now the input sample rate is derived
from the input file. This also allows us to read 8-bit PCM files,
and other formats such as floating-point in the future.
However, the ability to read raw files is lost.
A workaround is to use sox or equivalent on the host.
Change-Id: Icd06b4d02482b3ad07bf03979f46860e68d38ad9
Glenn Kasten [Tue, 17 Dec 2013 22:49:17 +0000 (14:49 -0800)]
Use libsndfile to write .wav files
This will reduce code duplication, and allow us take advantage of more
advanced capabilities of libsndfile in the future.
Change-Id: I25fa2b6d0c21e325aeaf05bda62cf7aab0c5deb4
Glenn Kasten [Tue, 17 Dec 2013 23:56:46 +0000 (23:56 +0000)]
Merge "Fix several test-resample BufferProvider bugs"
Lajos Molnar [Tue, 17 Dec 2013 22:10:46 +0000 (14:10 -0800)]
stagefright: Fix issue with tracking media format in packet source
Media format in AnotherPacketSource is now tracked across discontinuities.
This fixes a bug where format was set on queueAccessUnit and cleared on
dequeueAccessUnit, thereby allowing it to remain cleared.
Change-Id: I20975a630443f4a223a2b4344e8244f34b9560b9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
12060952
Eric Laurent [Tue, 17 Dec 2013 22:21:24 +0000 (22:21 +0000)]
am
b73d4878: am
35da47e5: am
274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQueue"
* commit '
b73d48783665bcf4fe3282e469ccb0fc89a7a1f9':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Tue, 17 Dec 2013 22:21:10 +0000 (22:21 +0000)]
am
58be57a0: am
e4301da6: am
f81f7a52: Merge "audioflinger: check for condition before waiting"
* commit '
58be57a04de323fa1c7cc4c1bf42f785d12056a7':
audioflinger: check for condition before waiting
Eric Laurent [Tue, 17 Dec 2013 22:21:09 +0000 (22:21 +0000)]
am
c63662a2: am
38138bb1: am
645e4397: Merge "AudioTrack: fix position callback after restore"
* commit '
c63662a23c156ad6bacaf5d3524adbc2914dd712':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 17 Dec 2013 22:21:08 +0000 (22:21 +0000)]
am
9c1969c8: am
51d166ec: am
9060d498: Merge "update offloaded audio track sampling rate"
* commit '
9c1969c854266216e7885e02d1cfffc62b16ced4':
update offloaded audio track sampling rate
Eric Laurent [Tue, 17 Dec 2013 22:17:31 +0000 (22:17 +0000)]
am
35da47e5: am
274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQueue"
* commit '
35da47e5d55392e6adbc97efaf181cb1dd259c04':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Tue, 17 Dec 2013 22:17:31 +0000 (22:17 +0000)]
am
e4301da6: am
f81f7a52: Merge "audioflinger: check for condition before waiting"
* commit '
e4301da6b830b8ae3e27b6f095c1a96bed0b69ac':
audioflinger: check for condition before waiting
Eric Laurent [Tue, 17 Dec 2013 22:17:30 +0000 (22:17 +0000)]
am
38138bb1: am
645e4397: Merge "AudioTrack: fix position callback after restore"
* commit '
38138bb1816e49f3f4e73e5bff2affe3d24a96fc':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 17 Dec 2013 22:17:29 +0000 (22:17 +0000)]
am
51d166ec: am
9060d498: Merge "update offloaded audio track sampling rate"
* commit '
51d166ec7985949fa69262f213a4162708ebe81e':
update offloaded audio track sampling rate
Glenn Kasten [Tue, 17 Dec 2013 21:54:29 +0000 (13:54 -0800)]
Fix several test-resample BufferProvider bugs
Previously getNextBuffer always returned the same data address over
and over. Now it correctly returns the right portion of the input buffer.
Previously getNextBuffer always returned the total number of frames in
the input, which might be larger than the size requested by the caller,
and/or larger than the number of remaining input frames. It also always
returned successfully, even when there should be no frames available.
This violates the contract for getNextBuffer. Now getNextBuffer will
return the maximum of the number of frames requested, and the number of
remaining frames available. If that maximum is zero, getNextBuffer will
return an error instead.
Previously releaseBuffer would silently allow releasing more frames than
were actually gotten, which violates the contract for releaseBuffer.
Now releaseBuffer checks for this and logs a message if it happens.
Add 'v' (verbose) option to log buffer provider calls.
Bug:
12194314
Change-Id: I9b915e954b3612a07ef271da8652486b8875e0fd
Eric Laurent [Tue, 17 Dec 2013 22:11:15 +0000 (14:11 -0800)]
am
274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQueue"
* commit '
274cc85dcb255185838705a91dba00efa52bf436':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Tue, 17 Dec 2013 22:11:14 +0000 (14:11 -0800)]
am
f81f7a52: Merge "audioflinger: check for condition before waiting"
* commit '
f81f7a52d4720f441197f75918d2b2c05d41ab45':
audioflinger: check for condition before waiting
Eric Laurent [Tue, 17 Dec 2013 22:11:14 +0000 (14:11 -0800)]
am
645e4397: Merge "AudioTrack: fix position callback after restore"
* commit '
645e43977d3aabc5addab022d772accc32fd5bdc':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 17 Dec 2013 22:11:13 +0000 (14:11 -0800)]
am
9060d498: Merge "update offloaded audio track sampling rate"
* commit '
9060d498be0c54d3caf84e2dbf1ba62516b3e76e':
update offloaded audio track sampling rate
Eric Laurent [Tue, 17 Dec 2013 22:06:50 +0000 (22:06 +0000)]
Merge "libstagefright: Delay release of wakelock in TimedEventQueue"
Haynes Mathew George [Fri, 6 Dec 2013 19:31:57 +0000 (11:31 -0800)]
libstagefright: Delay release of wakelock in TimedEventQueue
Delay release of wakelock in the TimedEventQueue to
after an event has been processed.
This ensures AP shutdown does not happen while an event
is ready but hasn't been processed yet.
Bug:
11976087.
Change-Id: I71a5f3ac4a57e1d05dd5d9ab5c6f91ed7bb64c87
Eric Laurent [Tue, 17 Dec 2013 22:06:10 +0000 (22:06 +0000)]
Merge "audioflinger: check for condition before waiting"
Haynes Mathew George [Wed, 4 Dec 2013 05:26:02 +0000 (21:26 -0800)]
audioflinger: check for condition before waiting
AsyncCallbackThread must check for any condition that
has already been satisfied before waiting.
Bug:
11824817
Change-Id: Ic8c2090d521ecd6a30b76ee75635258d35eb1eff
Eric Laurent [Tue, 17 Dec 2013 22:05:19 +0000 (22:05 +0000)]
Merge "AudioTrack: fix position callback after restore"
Eric Laurent [Wed, 27 Nov 2013 22:29:13 +0000 (14:29 -0800)]
AudioTrack: fix position callback after restore
When restoring an AudioTrack, the next position callback point
should not be modified and set ahead of current buffer head.
Otherwise, as frames are dropped, the new position is never reached
and an application relying on position callbacks to reload the buffer
would be stalled.
Bug:
11868603.
Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
Eric Laurent [Tue, 17 Dec 2013 22:04:08 +0000 (22:04 +0000)]
Merge "update offloaded audio track sampling rate"
Eric Laurent [Sat, 27 Jul 2013 00:16:50 +0000 (17:16 -0700)]
update offloaded audio track sampling rate
AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.
Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
Glenn Kasten [Tue, 17 Dec 2013 16:35:48 +0000 (16:35 +0000)]
am
5c474238: am
5893736d: am
a67c7653: Merge "Increase kFastTrackMultiplier from 1 to 2"
* commit '
5c474238bc579224ec8f7267d05651b0aa934100':
Increase kFastTrackMultiplier from 1 to 2
Glenn Kasten [Tue, 17 Dec 2013 16:33:47 +0000 (16:33 +0000)]
am
5893736d: am
a67c7653: Merge "Increase kFastTrackMultiplier from 1 to 2"
* commit '
5893736dc1776008026e660526d34943ea888fd6':
Increase kFastTrackMultiplier from 1 to 2
Glenn Kasten [Tue, 17 Dec 2013 16:30:03 +0000 (08:30 -0800)]
am
a67c7653: Merge "Increase kFastTrackMultiplier from 1 to 2"
* commit '
a67c76538fff102cd44b2f38dd073df5f2a33605':
Increase kFastTrackMultiplier from 1 to 2
Glenn Kasten [Tue, 17 Dec 2013 16:26:41 +0000 (16:26 +0000)]
Merge "Increase kFastTrackMultiplier from 1 to 2"
Lajos Molnar [Mon, 16 Dec 2013 18:16:32 +0000 (10:16 -0800)]
stagefright: Fix bugs in playlist fetcher logic
1. Improve start time: start playback as soon as the target duration
or 10s was buffered.
2. Select playlist monitor time based on target duration to avoid
continuously missing the boat.
3. If "we miss the boat" we still must request a safe sequence
number (last - 3)
Change-Id: Ie99c360ac67b152ad9af19e9c6e520016f67e4e3
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
12060952
Marco Nelissen [Thu, 12 Dec 2013 02:04:01 +0000 (02:04 +0000)]
Merge "Better character set encoding detection"
Andy McFadden [Wed, 11 Dec 2013 23:04:40 +0000 (23:04 +0000)]
am
a9d563f3: am
7c464c07: am
a0e1c391: Merge changes Ia684fde5,I58fcb526
* commit '
a9d563f307c71f91026e9464662434e6feb06ec2':
Fix the help text
screenrecord fixes
Andy McFadden [Wed, 11 Dec 2013 22:58:56 +0000 (14:58 -0800)]
Merge commit '
ca084e88' into manualmerge
Doing a "merge -s ours" since the changes are already in master.
Change-Id: Id8cf832d5f2d30ec880d91c0392a53d5fcfe54f3
Andy McFadden [Wed, 11 Dec 2013 22:07:50 +0000 (22:07 +0000)]
am
7c464c07: am
a0e1c391: Merge changes Ia684fde5,I58fcb526
* commit '
7c464c0783ab2917572fdc565056ca677abf90ba':
Fix the help text
screenrecord fixes
Andy McFadden [Wed, 11 Dec 2013 22:07:49 +0000 (22:07 +0000)]
am
17ce8846: am
1c9ca7d1: Merge "Add "--bugreport" option to screenrecord"
* commit '
17ce8846ca97754579442f80d3e19e2d5aa7597f':
Add "--bugreport" option to screenrecord
Andy McFadden [Wed, 11 Dec 2013 21:48:44 +0000 (13:48 -0800)]
am
a0e1c391: Merge changes Ia684fde5,I58fcb526
* commit '
a0e1c3918dd1356445df98e89dab6be2c8a78da3':
Fix the help text
screenrecord fixes
Andy McFadden [Wed, 11 Dec 2013 21:48:43 +0000 (13:48 -0800)]
am
1c9ca7d1: Merge "Add "--bugreport" option to screenrecord"
* commit '
1c9ca7d13e948af4633d5e5f8117d8c53ac684f6':
Add "--bugreport" option to screenrecord
Andy McFadden [Wed, 11 Dec 2013 21:30:41 +0000 (21:30 +0000)]
Merge changes Ia684fde5,I58fcb526
* changes:
Fix the help text
screenrecord fixes
Andy McFadden [Wed, 11 Dec 2013 21:29:49 +0000 (21:29 +0000)]
Merge "Add "--bugreport" option to screenrecord"
Andy McFadden [Wed, 20 Nov 2013 00:48:50 +0000 (16:48 -0800)]
Fix the help text
Pesky bloggers.
(cherry-pick from Ia8677b054423db292a34e28337431b57804df259)
Change-Id: Ia684fde52697ea78fca79de958ef8b31a50e68ba
Andy McFadden [Tue, 19 Nov 2013 20:50:17 +0000 (12:50 -0800)]
screenrecord fixes
Fixes to issues identified during code review.
(cherry-pick from I2203694acb5c0544878f64f4347d29ad1a0725c4)
Change-Id: I58fcb5264fc17b26fac4b03f95d35262e9e199e2
Andy McFadden [Fri, 18 Oct 2013 14:31:41 +0000 (07:31 -0700)]
Add "--bugreport" option to screenrecord
The --bugreport option adds two visible features: (1) a timestamp
overlay that (mostly) matches logcat, making it easier to match what
appears in the video with what's in the log, and (2) an "info page"
at the start of the video that shows the system configuration.
Enabling this option adds an additional composition step,
increasing the overhead of screenrecord. Depending on the device
and circumstances, this may be unnoticeable or very pronounced.
If --bugreport is not enabled, the overhead of screenrecord is
unchanged.
We also now track device orientation changes. This is currently
detected by polling surfaceflinger, which is suboptimal. As a
result, we detect the rotation too late, and get a weird mixed
frame before the start of the animation for 90-degree changes.
Also, allow the bit rate to be specified as e.g. "4M" for 4Mbps.
Also, --rotate is now deprecated.
Bug
11220305
Bug
11136964
(cherry pick from Ibb94b81d2f73547b95d7a47e027da75fab187a4f)
Change-Id: I829a91aaca5ab82a07c14172d9e188ec38f14e57
Marco Nelissen [Wed, 13 Nov 2013 22:18:21 +0000 (14:18 -0800)]
Better character set encoding detection
Id3 tags are supposed to be ISO-8859-1 or unicode, but often aren't.
To better detect the real encoding we now use ICU to detect possible
encodings for a given byte sequence, then apply additional heuristics
to determine the most likely one.
b/
5564857
Change-Id: I53bc83b006433da5c2f2ccfcd770ddb3a26b64d0
Haynes Mathew George [Fri, 6 Dec 2013 19:31:57 +0000 (11:31 -0800)]
libstagefright: Delay release of wakelock in TimedEventQueue
Delay release of wakelock in the TimedEventQueue to
after an event has been processed.
This ensures AP shutdown does not happen while an event
is ready but hasn't been processed yet.
Bug:
11976087.
Change-Id: I71a5f3ac4a57e1d05dd5d9ab5c6f91ed7bb64c87
Eric Laurent [Wed, 11 Dec 2013 01:20:46 +0000 (17:20 -0800)]
Revert "stagefright: fix TimedEventQueue wakelock"
This reverts commit
aef04853de0ce27222cf6250b2ba4fa9fc6a72a8.
Zhijun He [Tue, 10 Dec 2013 19:20:59 +0000 (19:20 +0000)]
Merge "CameraMetadata: fix metadata alignment issue"
Zhijun He [Thu, 5 Dec 2013 15:46:51 +0000 (07:46 -0800)]
CameraMetadata: fix metadata alignment issue
When camera metadata is passed through binder interface, there is no
guarantee the destination address of the metadata copy is aligned to
the alignment boundary required by metadata copy, which could cause
metadata validation fail. this change aligns the start address of the
metadata copy destination blob to address this issue.
Bug:
12010193
Change-Id: I540c6b4c484fe87a1d625a362310f33a309c1772
Qiwen Zhao [Tue, 10 Dec 2013 01:58:41 +0000 (01:58 +0000)]
am
e2976465: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '
e2976465ef00aa6aeee94fc845a487c95b47a304':
Qiwen Zhao [Mon, 9 Dec 2013 22:17:36 +0000 (14:17 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev
Haynes Mathew George [Wed, 4 Dec 2013 05:26:02 +0000 (21:26 -0800)]
audioflinger: check for condition before waiting
AsyncCallbackThread must check for any condition that
was already been satisfied before waiting.
Bug:
11824817
Change-Id: Ic8c2090d521ecd6a30b76ee75635258d35eb1eff
Eric Laurent [Fri, 6 Dec 2013 18:11:32 +0000 (10:11 -0800)]
stagefright: fix TimedEventQueue wakelock
If an event is taking a wakelock, the wakelock must be
released after the event is fired.
If the wakelock is released before and the event execution
implies some sleeps or I/O the system can go idle as
no wakelock is held anymore.
Bug:
11976087.
Change-Id: Ie7df8ed4834952ff818ff27d6be415c0b1794a9f
The Android Open Source Project [Fri, 6 Dec 2013 01:43:28 +0000 (01:43 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:26:01 +0000 (17:26 -0800)]
Andreas Huber [Thu, 5 Dec 2013 22:51:53 +0000 (22:51 +0000)]
am
899180ea: (-s ours) am
8ec8a534: am
1e0b0808: Merge "Restore stagefright command line tool." into klp-dev
* commit '
899180eab65d54181f6d99c239cae63be1b1d908':
Andy McFadden [Thu, 5 Dec 2013 22:51:52 +0000 (22:51 +0000)]
Jeff Brown [Thu, 5 Dec 2013 22:51:51 +0000 (22:51 +0000)]
am
2b40124d: (-s ours) am
82278b2c: am
fe9611bd: Merge "Fix potential leak of audio input handle." into klp-dev
* commit '
2b40124d81c84381b2b21313b4b6c7d0449883d1':
Andreas Huber [Thu, 5 Dec 2013 22:50:05 +0000 (22:50 +0000)]
am
69505439: (-s ours) am
4d9bc1a7: am
b8689b31: Support for "request-sync" parameter in ACodec
* commit '
6950543979b2943c82c96cd232878c3e8aa7ab2c':
Glenn Kasten [Thu, 5 Dec 2013 22:50:04 +0000 (22:50 +0000)]
am
71b6b571: (-s ours) 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 '
71b6b57127ec245c55b1b13b07637957229ee25e':
Glenn Kasten [Thu, 5 Dec 2013 22:49:46 +0000 (22:49 +0000)]
Merge "Add RecordThread media.log and deferred deallocation"
Glenn Kasten [Thu, 5 Dec 2013 22:16:25 +0000 (22:16 +0000)]
Merge "Change mActiveTrack to mActiveTracks vector"
Glenn Kasten [Mon, 30 Sep 2013 21:39:28 +0000 (14:39 -0700)]
Add RecordThread media.log and deferred deallocation
This change allows a media.log buffer for RecordThread.
Unlike playback threads which stick around forever, the RecordThread comes
and goes for every capture session. This means that the media.log buffer
for a RecordThread would disappear too, and so was useless. Now when a
thread exits, it's associated media.log buffer is just marked for deferred
deallocation. It is only actually freed when the memory is needed.
Other changes:
- Fix bug in unregistering comparison, it was comparing the wrong pointers
- Increased size of log area so we can log for RecordThread also
Change-Id: If45d4c03a793b86390a0112ec3acc5d41b2e3635
Andreas Huber [Thu, 5 Dec 2013 21:30:53 +0000 (21:30 +0000)]
am
8ec8a534: am
1e0b0808: Merge "Restore stagefright command line tool." into klp-dev
* commit '
8ec8a5346831efa699d31274363da9cf516981db':
Andy McFadden [Thu, 5 Dec 2013 21:30:52 +0000 (21:30 +0000)]
Jeff Brown [Thu, 5 Dec 2013 21:29:06 +0000 (21:29 +0000)]
am
82278b2c: am
fe9611bd: Merge "Fix potential leak of audio input handle." into klp-dev
* commit '
82278b2ceeebbcf345ed81413eeffa82fa82e05b':
Marco Nelissen [Thu, 5 Dec 2013 20:26:30 +0000 (12:26 -0800)]
Print statistics after ctrl-C
And exit cleanly when no audio or video track is found.
Change-Id: I3e030d60c774ad3ede839cba999ab32dd86bab5a
The Android Open Source Project [Thu, 5 Dec 2013 20:38:14 +0000 (12:38 -0800)]
Andreas Huber [Thu, 5 Dec 2013 19:46:23 +0000 (19:46 +0000)]
am
4d9bc1a7: am
b8689b31: Support for "request-sync" parameter in ACodec
* commit '
4d9bc1a742b386db4985ad1f973091a50207fdc2':
Glenn Kasten [Thu, 5 Dec 2013 19:40:45 +0000 (19:40 +0000)]
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 [Tue, 3 Dec 2013 17:06:43 +0000 (09:06 -0800)]
Increase kFastTrackMultiplier from 1 to 2
Change-Id: I158f147295eebcea96e4047d7618069bc48bdd7d
Marco Nelissen [Mon, 2 Dec 2013 23:31:18 +0000 (23:31 +0000)]
am
7ecfe4ec: am
92630351: Merge "NuPlayer: Use a software renderer when using software codecs"
* commit '
7ecfe4ec3f6842377f840513850ad31933bcea30':
NuPlayer: Use a software renderer when using software codecs
Glenn Kasten [Mon, 2 Dec 2013 18:37:46 +0000 (18:37 +0000)]
Merge "Code simplification and movement to prepare for mActiveTracks"
Marco Nelissen [Thu, 28 Nov 2013 17:34:37 +0000 (09:34 -0800)]
am
92630351: Merge "NuPlayer: Use a software renderer when using software codecs"
* commit '
92630351d265a61faae2dfe006a8bb330283aa7b':
NuPlayer: Use a software renderer when using software codecs
Marco Nelissen [Thu, 28 Nov 2013 17:26:16 +0000 (17:26 +0000)]
Merge "NuPlayer: Use a software renderer when using software codecs"
Eric Laurent [Wed, 27 Nov 2013 22:29:13 +0000 (14:29 -0800)]
AudioTrack: fix position callback after restore
When restoring an AudioTrack, the next position callback point
should not be modified and set ahead of current buffer head.
Otherwise, as frames are dropped, the new position is never reached
and an application relying on position callbacks to reload the buffer
would be stalled.
Bug:
11868603.
Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
Zhijun He [Wed, 27 Nov 2013 19:05:24 +0000 (19:05 +0000)]
Merge "camera2/3: Add protection for still capture path"
Zhijun He [Tue, 26 Nov 2013 23:11:05 +0000 (15:11 -0800)]
camera2/3: Add protection for still capture path
Jpeg stream in JpegProcessor could be deleted while process new capture is
ongoing, which unsafe to access a dead consumer endpoint.
Bug:
9316454
Change-Id: I2950f31ea28d0ba01f08502e2e3ba452bf8bb818
Marco Nelissen [Tue, 26 Nov 2013 16:48:39 +0000 (08:48 -0800)]
am
616c2cf1: am
90892d1b: Merge "Fix SIGABRT when playing mp4 file"
* commit '
616c2cf1507898a0de4228b95d435fd36ec1e029':
Fix SIGABRT when playing mp4 file
Marco Nelissen [Tue, 26 Nov 2013 16:38:55 +0000 (08:38 -0800)]
am
90892d1b: Merge "Fix SIGABRT when playing mp4 file"
* commit '
90892d1be84776f59a619ea4ef9ce51be5828ff8':
Fix SIGABRT when playing mp4 file
Robert Shih [Tue, 26 Nov 2013 06:03:20 +0000 (06:03 +0000)]
Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initialization failed in the parent class ctor CameraSource::CameraSource."
Marco Nelissen [Tue, 26 Nov 2013 02:10:18 +0000 (02:10 +0000)]
Merge "Fix SIGABRT when playing mp4 file"
Marco Nelissen [Mon, 25 Nov 2013 17:45:31 +0000 (09:45 -0800)]
am
97f6618f: am
11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"
* commit '
97f6618fb3eae850945decda725151baa9388aca':
Fixed data offset at parsing IPMP Descriptors
Marco Nelissen [Mon, 25 Nov 2013 17:39:47 +0000 (09:39 -0800)]
am
11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"
* commit '
11e715589e0f3f96389d0eedab677369da680fd4':
Fixed data offset at parsing IPMP Descriptors
Marco Nelissen [Mon, 25 Nov 2013 16:39:56 +0000 (08:39 -0800)]
Fix SIGABRT when playing mp4 file
If the track duration was shorter than the segment duration, the calculated
encoder padding would be negative, resulting in a crash.
b/
11823061
https://code.google.com/p/android/issues/detail?id=62610
Change-Id: I3989ad88caea38d212b61355c15aec13382c6116
Marco Nelissen [Mon, 25 Nov 2013 16:34:06 +0000 (16:34 +0000)]
Merge "Fixed data offset at parsing IPMP Descriptors"
Ichitaro Kohara [Thu, 6 Jun 2013 03:19:17 +0000 (12:19 +0900)]
Fixed data offset at parsing IPMP Descriptors
MPEG4Extractor::parseDrmSINF() miscalculated data offset in parsing
IPMP Descriptors. This commit makes it to take in 2 bytes which is
the size of IPMPS_Type field.
Change-Id: I42cbb6793af9d9b2f14dbfdd7a616096002793f9
The Android Open Source Project [Sat, 23 Nov 2013 03:31:24 +0000 (19:31 -0800)]