OSDN Git Service
Jean-Michel Trivi [Wed, 8 Jan 2014 19:00:19 +0000 (19:00 +0000)]
Merge "Support more channel configurations in MPEG4Extractor"
Jean-Michel Trivi [Wed, 18 Dec 2013 23:47:49 +0000 (15:47 -0800)]
Support more channel configurations in MPEG4Extractor
Add support for streams having an audio specific configuration with the
channel_configuration equal to zero.
Add support for 6.1 and 7.1 channel configurations.
Bug
9428126
Change-Id: Iaac2516139093579c52095d4f74ae4428f8e368a
Narayan Kamath [Wed, 8 Jan 2014 09:48:22 +0000 (09:48 +0000)]
am
f41d9bc9: am
f60cfa7f: am
99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
* commit '
f41d9bc92410784fc12fa15a544282c06da76008':
Change M4OSA_ERR_CREATE to return unsigned integer.
Narayan Kamath [Wed, 8 Jan 2014 09:45:25 +0000 (09:45 +0000)]
am
f60cfa7f: am
99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
* commit '
f60cfa7faa0bdde0a4f302f1272d6aa869588cc4':
Change M4OSA_ERR_CREATE to return unsigned integer.
Narayan Kamath [Wed, 8 Jan 2014 09:01:54 +0000 (01:01 -0800)]
am
99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
* commit '
99044adc6e209d31e9c5308d960e2bd5f6999f85':
Change M4OSA_ERR_CREATE to return unsigned integer.
Narayan Kamath [Wed, 8 Jan 2014 08:56:10 +0000 (08:56 +0000)]
Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
Glenn Kasten [Wed, 8 Jan 2014 00:21:03 +0000 (00:21 +0000)]
Merge "Remove unnecessary defaults for parameters in AudioSystem"
Andy McFadden [Fri, 20 Dec 2013 21:40:34 +0000 (13:40 -0800)]
Provide raw H.264 output from screenrecord
This adds an experimental (undocumented) "--raw" flag. If set, we
output an H.264 byte stream rather than a .mp4 file.
If the filename is "-", we send the output to stdout. If stdout is a
tty, we reconfigure it to avoid CRLF line termination over adb.
Bug
12239887
Change-Id: I00ceb628bd885916eaf4658ea7f08f620ad74c03
Eric Laurent [Tue, 7 Jan 2014 02:06:07 +0000 (02:06 +0000)]
Merge "audioflinger: fix static track end detection"
Jean-Michel Trivi [Mon, 6 Jan 2014 23:39:26 +0000 (23:39 +0000)]
Merge "Update AAC decoder wrapper to latest FDK API for output channel count"
Ashok Bhat [Thu, 2 Jan 2014 14:54:57 +0000 (14:54 +0000)]
Change M4OSA_ERR_CREATE to return unsigned integer.
While M4OSA_ERR is defined as M4OSA_UInt32, MOSA_ERR_CREATE
is defined to return M4OSA_Int32. This leads to signed/unsigned
comparison warnings. M4OSA_ERR_CREATE has been changed to return
M4OSA_UInt32 to fix this issue.
Change-Id: I71a5c50a95c7f296469604b486a1d3969d302a3f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Andy Hung [Mon, 30 Dec 2013 18:34:29 +0000 (10:34 -0800)]
Fix for Change 396851
Fix a typo in a variable name.
Change-Id: I2555f729fc22b9c158ae488c8cefde029fa244cb
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Mon, 30 Dec 2013 18:17:31 +0000 (18:17 +0000)]
Merge "Audio resampler update to add S16 filters"
Andy Hung [Mon, 9 Dec 2013 20:12:46 +0000 (12:12 -0800)]
Audio resampler update to add S16 filters
This does not affect the existing resamplers.
New resampler accessed through additional quality settings:
DYN_LOW_QUALITY = 5
DYN_MED_QUALITY = 6
DYN_HIGH_QUALITY = 7
Change-Id: Iebbd31871e808a4a6dee3f3abfd7e9dcf77c48e1
Signed-off-by: Andy Hung <hunga@google.com>
Jean-Michel Trivi [Wed, 18 Dec 2013 17:43:21 +0000 (09:43 -0800)]
Update AAC decoder wrapper to latest FDK API for output channel count
Rename decoder parameter for the maximum number of PCM output channels,
according to FDK AAC decoder interface, as defined in aacdecoder_lib.h
Bug
9428126
Change-Id: I2f0f6ca848bdbc8657d8dea589b03238245c0eaf
Zhijun He [Thu, 26 Dec 2013 19:15:29 +0000 (19:15 +0000)]
Merge "Camera2 API: fix front facing camera flip issue"
Zhijun He [Thu, 26 Dec 2013 18:38:46 +0000 (10:38 -0800)]
Camera2 API: fix front facing camera flip issue
Camera stream transform calculation should take camera facing into account.
For example, front facing camera preview stream should be horizontally or
vertically flipped.
Bug:
12300670
Change-Id: Ib497f0b8c3e65974de05d4f0aca3c51e99717c3d
Eric Laurent [Sat, 21 Dec 2013 01:37:03 +0000 (01:37 +0000)]
am
42d89e5d: am
b904d53f: am
8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"
* commit '
42d89e5de5f401c7e81e1961061d07ae490c9d29':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Sat, 21 Dec 2013 01:36:01 +0000 (17:36 -0800)]
audioflinger: fix static track end detection
If a static track is not a fast track,
prepareTracks_l() must rely on framesReady() to
detect end of buffer and remove the track from the active
track list.
Failing to do so results in the track staying active but
not processed by the mixer because in underrun. This leaves the
mix buffer content uninitialized and causes the effect process
function to accumulate its output onto undefined data.
Bug:
12013676.
Change-Id: Iad72c921fa18d34811abf7d1073890c093a27725
Eric Laurent [Sat, 21 Dec 2013 01:32:26 +0000 (01:32 +0000)]
am
b904d53f: am
8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"
* commit '
b904d53ffaaafddb2f9b6f469b73d2a3bec3dd0d':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Sat, 21 Dec 2013 01:30:20 +0000 (01:30 +0000)]
am
5f7483eb: am
5a086733: am
1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."
* commit '
5f7483eb6a03b3a14283c1ef09ed65bd3e015b96':
stagefright: fix offloading HE-AAC sampling rate.
Eric Laurent [Sat, 21 Dec 2013 01:28:59 +0000 (01:28 +0000)]
am
5a086733: am
1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."
* commit '
5a086733f8a7472bee85b371e9d02874c9317f3b':
stagefright: fix offloading HE-AAC sampling rate.
Eric Laurent [Sat, 21 Dec 2013 01:26:47 +0000 (17:26 -0800)]
am
8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"
* commit '
8115f4b206dbd04c620f062feb3c7785e2732ab3':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Sat, 21 Dec 2013 01:23:27 +0000 (17:23 -0800)]
am
1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."
* commit '
1777ed30bfb3b9c1edc037a1b5482d5ab8f28b9b':
stagefright: fix offloading HE-AAC sampling rate.
Eric Laurent [Sat, 21 Dec 2013 01:19:56 +0000 (01:19 +0000)]
Merge "stagefright: do not offload LD-AAC decoding"
Eric Laurent [Fri, 6 Dec 2013 19:51:42 +0000 (11:51 -0800)]
stagefright: do not offload LD-AAC decoding
For now, do not offload LD and ELD AAC decoding because there
is no way to know if it is supported by the audio DSP implementation.
The longer term fix will be to have mapMimeToAudioFormat() use the
audio object type in track metadata to refine the AAC format and the
audio HAL list supported AAC profiles.
Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
Eric Laurent [Sat, 21 Dec 2013 01:18:46 +0000 (01:18 +0000)]
Merge "stagefright: fix offloading HE-AAC sampling rate."
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:06 +0000 (16:35 -0800)]
Remove unnecessary defaults for parameters in AudioSystem
Change-Id: I0ee7bc13cf64f50b1ea780f4d99899aed20421a0
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
Eric Laurent [Fri, 6 Dec 2013 19:16:54 +0000 (11:16 -0800)]
stagefright: fix offloading HE-AAC sampling rate.
Fix HE AAC SBR sampling rate reading for explicit
signaling.
Bug:
11697128.
Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
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':