OSDN Git Service
Chong Zhang [Thu, 31 Jul 2014 01:27:58 +0000 (01:27 +0000)]
Merge "handle rotation in NuPlayer" into lmp-dev
Chong Zhang [Thu, 31 Jul 2014 00:25:06 +0000 (17:25 -0700)]
handle rotation in NuPlayer
Bug:
16653284
Change-Id: I54165041da5a13498d627eee1b3ec59ef3c923b0
Andy Hung [Wed, 30 Jul 2014 18:08:00 +0000 (18:08 +0000)]
Merge "Add Quad channel output to AudioPolicyManager" into lmp-dev
Eric Laurent [Tue, 29 Jul 2014 17:26:26 +0000 (10:26 -0700)]
audio policy: add missing enums in config file parsing
Change-Id: I4edd6cde11de62c9c19dfa623d08cddf42c953db
Andy Hung [Wed, 30 Jul 2014 00:56:46 +0000 (17:56 -0700)]
Add Quad channel output to AudioPolicyManager
Matches some USB device configurations.
Change-Id: I2429f9de87816b4ad1d39516e3821562617c76ee
Andy Hung [Wed, 30 Jul 2014 00:59:56 +0000 (00:59 +0000)]
Merge "Add isSafeArraySize for new array size checks" into lmp-dev
Andy Hung [Tue, 29 Jul 2014 19:14:00 +0000 (12:14 -0700)]
Add isSafeArraySize for new array size checks
Bug:
15328708
Change-Id: I9dfca30745c3e4dda91c3894363462f8631c41a1
Andy Hung [Tue, 29 Jul 2014 23:53:25 +0000 (23:53 +0000)]
Merge "Enable multichannel in AudioFlinger" into lmp-dev
Andy Hung [Tue, 29 Jul 2014 23:52:28 +0000 (23:52 +0000)]
Merge "Update multichannel audio policy handling" into lmp-dev
Glenn Kasten [Mon, 28 Jul 2014 23:34:45 +0000 (16:34 -0700)]
Fix build warnings
Change-Id: Ife5e40264f43fb3ccb40830228701003fe106bf5
Andy Hung [Mon, 28 Jul 2014 23:28:06 +0000 (16:28 -0700)]
Enable multichannel in AudioFlinger
Change-Id: Ibdbdc6ea0b87cdcd15432257a3455b11b3ce14b7
Andy Hung [Mon, 28 Jul 2014 23:16:31 +0000 (16:16 -0700)]
Update multichannel audio policy handling
Ensure AUDIO_FORMAT_PCM_FLOAT and AUDIO_FORMAT_PCM_32_BIT
have proper precedence.
Allow more mixer channels than 2.
Change-Id: I02af97dad6218b25cbada4d93077a213314c6725
Chong Zhang [Thu, 31 Jul 2014 00:01:12 +0000 (00:01 +0000)]
Merge "ATSParser: treat stream type 0x83 as TrueHD AC3" into lmp-dev
Chong Zhang [Wed, 30 Jul 2014 22:40:31 +0000 (15:40 -0700)]
ATSParser: treat stream type 0x83 as TrueHD AC3
Bug:
16668055
Change-Id: I11fd3f795bbb50113e1a1e28e682edd76f11e146
Wei Jia [Wed, 30 Jul 2014 20:40:49 +0000 (13:40 -0700)]
Eino-Ville Talvala [Tue, 29 Jul 2014 19:01:19 +0000 (19:01 +0000)]
Merge "Camera2: Fix transforms for front-facing cameras" into lmp-dev
Eino-Ville Talvala [Tue, 29 Jul 2014 18:16:17 +0000 (11:16 -0700)]
Camera2: Fix transforms for front-facing cameras
Mirror, mirror on the wall, who is the best rotated of them all?
Also, use consistent enum names.
Bug:
16637957
Change-Id: Ie211d3b57b9e7d01122192ad03b73ceba5bf1bd3
Eino-Ville Talvala [Fri, 25 Jul 2014 01:10:23 +0000 (18:10 -0700)]
CameraService: Replace deprecated native_window methods
Change-Id: I3be5a720ac8b488d1e507c606a9146480faeef63
Eino-Ville Talvala [Thu, 24 Jul 2014 00:17:59 +0000 (17:17 -0700)]
CameraService: Clean up availability listeners and HAL error codes
- Refactor where availability listeners are called to centralize behavior,
ensuring that all client creation/destruction invokes the listeners
- Clean up some of the client hierarchy
- Filter error codes from key HAL calls to ensure proper reporting
Bug:
16514157
Bug:
16483222
Change-Id: I59875a865b6a508b47423946c78862da8df34cd1
Robert Shih [Tue, 29 Jul 2014 17:00:27 +0000 (17:00 +0000)]
Merge "SampleTable: check integer overflow during table alloc" into lmp-dev
Robert Shih [Tue, 29 Jul 2014 16:58:01 +0000 (16:58 +0000)]
Merge "GenericSource: start/stop tracks correctly on selection" into lmp-dev
Eric Laurent [Tue, 29 Jul 2014 00:26:49 +0000 (17:26 -0700)]
audio policy: pass session ID to capture activity methods
Indicate the audio session ID when calling getInput(),
startInput(), stopInput(), releaseInput().
Bug:
12378680.
Change-Id: I763793752f93e2f4e1445a5ab217c895af011038
Robert Shih [Mon, 28 Jul 2014 16:54:57 +0000 (09:54 -0700)]
SampleTable: check integer overflow during table alloc
Bug:
15328708
Bug:
15342615
Bug:
15342751
Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053
Robert Shih [Fri, 25 Jul 2014 21:14:34 +0000 (14:14 -0700)]
GenericSource: start/stop tracks correctly on selection
Change-Id: I10343151f930a4ab778a6d2574ab5165af2013ba
Glenn Kasten [Mon, 28 Jul 2014 23:55:02 +0000 (23:55 +0000)]
Merge "Fix rounding in RecordThread resampler buffer computation" into lmp-dev
Andy Hung [Mon, 28 Jul 2014 21:38:41 +0000 (14:38 -0700)]
Fix rounding in RecordThread resampler buffer computation
Bug:
16525305
Change-Id: Ie010822b0fa9dec74adde1d1b091ee44c183fc94
Eric Laurent [Mon, 28 Jul 2014 01:38:22 +0000 (18:38 -0700)]
rename AudioSystem::newAudioSessionId()
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.
Bug:
12378680.
Change-Id: I611ea3b5eb57a4b0774437f477ee87dc4ccc2cc2
Robert Shih [Mon, 28 Jul 2014 20:01:04 +0000 (20:01 +0000)]
Merge "GenericSource: timed text support" into lmp-dev
Lajos Molnar [Mon, 28 Jul 2014 04:22:11 +0000 (21:22 -0700)]
mediaplayer: make nuplayer the default player
Bug:
11784824
Change-Id: I60d215d0348adcd589da5bd479d5921dcf076ee4
Robert Shih [Wed, 23 Jul 2014 22:53:14 +0000 (15:53 -0700)]
GenericSource: timed text support
Bug:
16385674
Change-Id: I954cc463b55af4b93c6a6e714115db4fda729dc8
Robert Shih [Sat, 26 Jul 2014 01:04:22 +0000 (01:04 +0000)]
Merge "NuPlayer: timed text support" into lmp-dev
Robert Shih [Wed, 23 Jul 2014 22:00:25 +0000 (15:00 -0700)]
NuPlayer: timed text support
Bug:
16385674
Change-Id: Ifa9fbc17a1276aa774d57b82cdce500876a0b543
Eric Laurent [Mon, 28 Jul 2014 20:56:49 +0000 (20:56 +0000)]
Merge "AudioFlinger: update openInput() and openOutput()" into lmp-dev
Eric Laurent [Fri, 25 Jul 2014 23:20:43 +0000 (16:20 -0700)]
AudioFlinger: update openInput() and openOutput()
Add parameters to openInput() and openOutput(): device address,
input source.
Allow caller to specify a given I/O handle
Group parameters in a struct audio_config.
Bug:
12378680.
Change-Id: I7e9af74c0d996561cc13cbee7d9012d2daf33025
Glenn Kasten [Sun, 27 Jul 2014 22:39:40 +0000 (22:39 +0000)]
Merge "Enable lower latency audio capture on more devices" into lmp-dev
Glenn Kasten [Sun, 27 Jul 2014 22:02:23 +0000 (15:02 -0700)]
Enable lower latency audio capture on more devices
Bug:
16601366
Change-Id: I573b98631f81b7768f7cc00aa09e560008dea587
Jean-Michel Trivi [Tue, 22 Jul 2014 23:19:14 +0000 (16:19 -0700)]
AudioPolicyManager: handle outputs for different addresses
Add the notion of device types that cause the device address
to be taken into account, i.e. multiple devices of the
same type but with a different address can be connected/
disconnected.
AUDIO_DEVICE_OUT_REMOTE_SUBMIX is such a device type.
When making those devices available / unavailable, look for
all outputs with a matching address.
Bug
16009464
Change-Id: I260f8248b7794c4932094e876afdf29fdea007a3
Lajos Molnar [Fri, 25 Jul 2014 14:53:14 +0000 (07:53 -0700)]
stagefright: add flexible YUV support
Bug:
10706245
Change-Id: Icd246f22edfc67ed5240d59f5a5bde3e5f749465
Lajos Molnar [Fri, 25 Jul 2014 14:53:14 +0000 (07:53 -0700)]
stagefright: add ABuffer.CreateAsCopy
Bug:
10706245
Change-Id: I8c4e96a2581a039e9e8237c3e09e2c22226da055
Ruben Brunk [Sat, 26 Jul 2014 01:18:08 +0000 (01:18 +0000)]
Merge "DNG: Clean up logging." into lmp-dev
Ruben Brunk [Sat, 26 Jul 2014 01:05:46 +0000 (18:05 -0700)]
DNG: Clean up logging.
Change-Id: Ie34d5a22c89a726215d740fef359d53e5a1a360b
Zhijun He [Sat, 26 Jul 2014 00:57:14 +0000 (00:57 +0000)]
Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev
Andy Hung [Fri, 25 Jul 2014 17:42:54 +0000 (17:42 +0000)]
Merge "Add multichannel capability to AudioFlinger" into lmp-dev
Andy Hung [Tue, 22 Jul 2014 04:56:01 +0000 (21:56 -0700)]
Add multichannel capability to AudioFlinger
But not enabled (kEnableExtendedChannels == false).
Change-Id: I62f7e31fbd29ad703a9a02f5d1a280b6972dd423
Andy Hung [Fri, 18 Jul 2014 04:30:53 +0000 (21:30 -0700)]
Add multichannel capability to AudioMixer
tests/test-mixer updated to handle multichannel.
New mixer path is still disabled (kUseNewMixer = false).
Subsequent CL will enable multichannel capability.
Change-Id: I71dafa94cc1d9af567c285e0ded7c5c94e3ff926
Andy Hung [Fri, 25 Jul 2014 17:08:58 +0000 (17:08 +0000)]
Merge "Add multichannel capability to AudioMixer" into lmp-dev
Wei Jia [Thu, 24 Jul 2014 17:28:47 +0000 (10:28 -0700)]
Reset the value for Vector of pointers.
Bug:
16467066
Change-Id: I3674e07779a59f4d4fa639d066ed1988df89b3f5
Glenn Kasten [Sun, 27 Jul 2014 22:05:14 +0000 (22:05 +0000)]
Merge "audio policy: compatible sample rates and channel masks" into lmp-dev
Eric Laurent [Sun, 27 Jul 2014 20:47:31 +0000 (13:47 -0700)]
audiopolicy: fix output audio format selection
Fix two problems in output stream audio format selection
added by commit
1e693b55:
- flags must be set before picking the format.
- fix logic error in best format selection.
Change-Id: I6458b32725f771da5a08108932d64e71964ae9f1
Glenn Kasten [Thu, 24 Jul 2014 20:46:44 +0000 (13:46 -0700)]
audio policy: compatible sample rates and channel masks
Change-Id: I50d068a968aa6bd9e53e5b3111a1b09a6c2d219c
Glenn Kasten [Fri, 25 Jul 2014 15:24:14 +0000 (15:24 +0000)]
Merge "audio policy: clean up checking for active input" into lmp-dev
Ricardo Garcia [Fri, 25 Jul 2014 15:08:24 +0000 (15:08 +0000)]
Merge "-Making sure mAudioCommands list is empty before going to sleep. -Wake_lock release before sleeping or quitting threadLoop()." into lmp-dev
Ricardo Garcia [Thu, 24 Jul 2014 22:48:24 +0000 (15:48 -0700)]
-Making sure mAudioCommands list is empty before going to sleep.
-Wake_lock release before sleeping or quitting threadLoop().
Change-Id: Icab53d7984a3ba3eaf13e514667b4d60f40cbcd6
Glenn Kasten [Thu, 24 Jul 2014 21:09:55 +0000 (14:09 -0700)]
audio policy: clean up checking for active input
Change-Id: I85cc089df32e6d469e8aef307599f1021ea5b835
Glenn Kasten [Thu, 24 Jul 2014 21:08:35 +0000 (14:08 -0700)]
audio policy: add audio_input_flags_t and mOpenRefCount
Change-Id: I5f9c7b5ebf03b9bc94efe70d3677edfabb99c194
Glenn Kasten [Fri, 25 Jul 2014 14:49:53 +0000 (14:49 +0000)]
Merge "audio policy: add audio_input_flags_t and mOpenRefCount" into lmp-dev
Chong Zhang [Fri, 25 Jul 2014 00:51:51 +0000 (00:51 +0000)]
Merge "reset battery stats when media player service is started" into lmp-dev
Robert Shih [Fri, 25 Jul 2014 00:45:20 +0000 (00:45 +0000)]
Merge "StagefrightRecorder: check for WEBM format instead of MP4" into lmp-dev
Robert Shih [Thu, 24 Jul 2014 21:00:09 +0000 (14:00 -0700)]
StagefrightRecorder: check for WEBM format instead of MP4
Bug:
16544665
Change-Id: Idc45bd4cafc65a11132d10fdf21f8439e186f35f
Chong Zhang [Fri, 25 Jul 2014 00:02:40 +0000 (00:02 +0000)]
Merge "signal mFrameAvailableCondition when AudioSource is stopped" into lmp-dev
Zhijun He [Thu, 24 Jul 2014 23:46:46 +0000 (23:46 +0000)]
Merge "Camera3: tear down Camera3 streams when they are deleted." into lmp-dev
Elliott Hughes [Thu, 24 Jul 2014 22:42:39 +0000 (15:42 -0700)]
Remove last user of <cutils/tztime.h>.
Bug:
15765976
(cherry picked from commit
56687f7cbf0a3d7909830fc1390a98c713a05e6f)
Change-Id: Iacb225584c3acdbb512f46b638a215b75b32cdcb
Zhijun He [Thu, 24 Jul 2014 20:45:15 +0000 (13:45 -0700)]
Camera3: tear down Camera3 streams when they are deleted.
Also override the disconnectLocked method in Camera3ZslStream to make sure the
Camera3ZslStream specific buffer queue is cleaned up properly.
Also revert
0be123df1897fd3fe1b7ba30f24d8ae4c91b4dc7, as it was not the right
fix.
Change-Id: I89bdcb2e206379ae1f2602421e7fdbcde9a31399
Eric Laurent [Sat, 21 Jun 2014 01:31:16 +0000 (18:31 -0700)]
audio flinger: add patch connection between hw modules
Add support for audio device connections between different audio
hw modules.
The patch is performed by creating a bridge between the playback
thread connected to the sink device and the record thread connected
to the source device using a pair of specialized PlaybackTrack and
RecordTrack.
- Added PatchTrack and PatchRecord classes.
- Added TrackBase type to indicate more clearly the track behavior.
- A TrackBase can allocate the buffer or reuse an existing one.
- Factored some code in openOutput() and openInput() for internal use
by PatchPanel.
Bug:
14815883.
Change-Id: Ib9515fcda864610458a4bc81fa8f59096ff4d7db
Chong Zhang [Thu, 24 Jul 2014 02:23:16 +0000 (19:23 -0700)]
signal mFrameAvailableCondition when AudioSource is stopped
This allows last read() to exit properly, otherwise it could get
stuck waiting for the condition forever.
Bug:
15849309
Change-Id: I79bba53630e59783a5fc041cfc5d3fdb2545cc2c
Zhijun He [Wed, 23 Jul 2014 22:17:26 +0000 (15:17 -0700)]
CamcorderProfiles: add high speed profile constants
Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
Chong Zhang [Wed, 23 Jul 2014 21:46:05 +0000 (14:46 -0700)]
reset battery stats when media player service is started
Bug:
12979595
Change-Id: Ia800de3e65ed4dec8334c6fde566edab12d23c42
Eric Laurent [Wed, 23 Jul 2014 02:48:16 +0000 (19:48 -0700)]
audio policy: remove redundant fixed volume management
Remove code handling fixed device volume in
AudioPolicyManager::computeVolume() as this is already
managed by AudioService.
Change-Id: Ib2be7578e40652c85a7d44c685ff9cc703d0c969
Wei Jia [Wed, 23 Jul 2014 17:40:46 +0000 (10:40 -0700)]
Hook up querying of VP8 temporal layering support.
Bug:
14562236
Change-Id: I0ec5866173f7fb84dd3f79b588d1b35b523ca08a
Chong Zhang [Wed, 23 Jul 2014 21:00:38 +0000 (21:00 +0000)]
Merge "NuPlayer: save thread id in MediaPlayer::start" into lmp-dev
Chong Zhang [Wed, 23 Jul 2014 18:43:46 +0000 (11:43 -0700)]
NuPlayer: save thread id in MediaPlayer::start
so that when MediaPlayer::notify is called from within start,
it doesn't try to lock itself again.
Bug:
15323063
Change-Id: Idd77e892cd22538bbfe3e65c64c9dd2a216a0aee
Andy Hung [Wed, 23 Jul 2014 20:41:59 +0000 (20:41 +0000)]
Merge "Fix multichannel integer resampling and add tests" into lmp-dev
Robert Shih [Wed, 16 Jul 2014 22:47:09 +0000 (15:47 -0700)]
GenericSource: support track (de)selection
Bug:
15153976
Change-Id: I522b1f9f0ffedf4edbea03a6654a6dbc0262860a
Zhijun He [Tue, 22 Jul 2014 23:08:13 +0000 (16:08 -0700)]
Camera3: only append partial result to partial result collection
Otherwise, the metadata entries will be duplicated.
Change-Id: If0cd96e09960fdf746a70913d380e9036745a944
Lajos Molnar [Wed, 23 Jul 2014 02:23:51 +0000 (02:23 +0000)]
Merge "MediaRecorder: constants for webm recordering" into lmp-dev
Robert Shih [Wed, 23 Jul 2014 02:00:02 +0000 (19:00 -0700)]
MediaRecorder: constants for webm recordering
Bug:
16329805
Change-Id: Idcd603545352e36a88589d3e23ccf1ee37704695
Robert Shih [Thu, 10 Jul 2014 03:09:43 +0000 (20:09 -0700)]
StagefrightRecorder: webm (video only) support
Bug:
16329805
Change-Id: I8a0ecd100fca397add97a1416125bcc6aeb86364
Robert Shih [Wed, 23 Jul 2014 01:41:41 +0000 (01:41 +0000)]
Merge "GenericSource: support track (de)selection" into lmp-dev
Robert Shih [Wed, 23 Jul 2014 01:31:34 +0000 (01:31 +0000)]
Merge "StagefrightRecorder: webm (video only) support" into lmp-dev
Robert Shih [Wed, 23 Jul 2014 01:31:12 +0000 (01:31 +0000)]
Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-dev
Wei Jia [Tue, 22 Jul 2014 23:01:33 +0000 (16:01 -0700)]
Fall back to s/w decoding when audio offloading fails.
Change-Id: Icde3d65c964b2a13fb1c6636adcce52ae048a3fb
Chong Zhang [Wed, 23 Jul 2014 00:03:03 +0000 (00:03 +0000)]
Merge "update battery stats for video/audio" into lmp-dev
Chong Zhang [Tue, 22 Jul 2014 16:12:03 +0000 (09:12 -0700)]
update battery stats for video/audio
Bug:
12979595
Change-Id: Iafd93046a4fd9f22bcd66084deace746a7ca5d3c
Zhijun He [Tue, 22 Jul 2014 23:29:54 +0000 (23:29 +0000)]
Merge "Camera3: only append partial result to partial result collection" into lmp-dev
Eric Laurent [Tue, 22 Jul 2014 22:36:10 +0000 (15:36 -0700)]
audio policy: fix hotword capture
commit
1c333e2 introduced a regression causing the
wrong input source type to be communicated to
the audio HAL when starting hotword (background) capture.
Change-Id: Iec6b3c58cbc15b9988793077232ff3e7e72a4d6d
Ruchit Sharma [Tue, 22 Jul 2014 16:35:30 +0000 (12:35 -0400)]
camera: clear ZSLQueue when switching modes
not clearing the queue here will eat up unnecessary memory every time
we switch from video to still mode.
Change-Id: I279ec709b485ca0dab672464e5b829be849bcaa5
Yin-Chia Yeh [Tue, 22 Jul 2014 16:57:30 +0000 (16:57 +0000)]
Merge "cameraservice: remove record stream in stopPreview" into lmp-dev
Andy Hung [Sun, 20 Jul 2014 21:04:19 +0000 (14:04 -0700)]
Fix multichannel integer resampling and add tests
Change-Id: I384bf8317d4f03616bf9f2b458a8700965d5cf56
Lajos Molnar [Mon, 21 Jul 2014 20:47:21 +0000 (13:47 -0700)]
stagefright: handle seeking to before first cue-point.
Bug:
16446994
Change-Id: Id3f9d6780a7c4f62171cbfa8675a67334e8dfa10
Glenn Kasten [Mon, 21 Jul 2014 19:14:22 +0000 (19:14 +0000)]
Merge "Remove execute bit" into lmp-dev
Glenn Kasten [Mon, 21 Jul 2014 18:49:08 +0000 (11:49 -0700)]
Remove execute bit
Change-Id: I1cf0c0d9375779b3074af12f4cbf9c1ec07bf4ff
Eric Laurent [Tue, 22 Jul 2014 02:11:17 +0000 (02:11 +0000)]
Merge "audio policy: add missing formats to audio_policy.conf parser." into lmp-dev
Eric Laurent [Tue, 22 Jul 2014 00:49:25 +0000 (17:49 -0700)]
audio policy: add missing formats to audio_policy.conf parser.
Change-Id: I872c11d080c505abe3025e7bbb554ca9711de9af
Jean-Michel Trivi [Mon, 21 Jul 2014 00:58:33 +0000 (17:58 -0700)]
audio_attributes_t for SoundPool
Add support for the audio_attributes_t structure in the
SoundPoool constructor.
Remove SRC quality which was never implemented.
Remove stream types.
Add file to contain audio helper functions related to policy.
Change-Id: I1720ff15e7b23ea7b713a4395fdfac26dc3fd4da
Yin-Chia Yeh [Thu, 17 Jul 2014 23:05:23 +0000 (16:05 -0700)]
cameraservice: remove record stream in stopPreview
Remove recording stream every time stopPreview is called.
Change-Id: Iabb783a75418aa41ddc2693cfdfd5a2131109070
Andy Hung [Thu, 17 Jul 2014 21:00:07 +0000 (14:00 -0700)]
Fix initial audio glitch on startup
Also happens when restarting AudioFlinger.
Bug:
16322824
Change-Id: I382b20174cb0639e04316130141f2094d7dd0cb3
Robert Shih [Thu, 17 Jul 2014 18:46:13 +0000 (11:46 -0700)]
MediaWriter: make get/setStartTimeOffsetMs virtual
Bug:
16329805
Change-Id: Ib971dd95b54829438c8af97528f9e00b87ab3f1e
Zhijun He [Thu, 17 Jul 2014 20:36:14 +0000 (20:36 +0000)]
Merge "Camera HAL3: migrate from partial quirks to partial result" into lmp-dev
Andy Hung [Sun, 20 Jul 2014 20:53:44 +0000 (20:53 +0000)]
Merge "Add RemixBufferProvider to AudioMixer" into lmp-dev
Lajos Molnar [Sat, 19 Jul 2014 09:27:41 +0000 (02:27 -0700)]
Fix: Add MediaCodecList capabilities
fix getting capability index from type
Bug:
12065651
Change-Id: Id2bc60410a92e17c841a5dd072257bc40ad6236f