OSDN Git Service
Eric Laurent [Sun, 14 Sep 2014 18:47:10 +0000 (18:47 +0000)]
Merge "audio policy: fix relative priorities of PHONE and ENFORCED_AUDIBLE" into lmp-dev
Eino-Ville Talvala [Sat, 13 Sep 2014 21:16:11 +0000 (21:16 +0000)]
Merge "Camera: Allow larger preview resolutions in API1 for >= HALv2 devices" into lmp-dev
Eino-Ville Talvala [Sat, 13 Sep 2014 00:15:24 +0000 (17:15 -0700)]
Camera: Allow larger preview resolutions in API1 for >= HALv2 devices
Limit preview resolutions to a max of 1920x1920 instead of 1920x1080p,
so that any aspect ratio with a 1920 as the larger dimension can be used.
Also improve the initial preview/video size selection logic, to ensure
that the selected size is both a valid preview and video size, and not
too large.
Bug:
17458832
Change-Id: Iea006fadb5fbf0f03d23c3c5babb5b3611469688
Zhijun He [Sat, 13 Sep 2014 18:58:02 +0000 (18:58 +0000)]
Merge "Camera2: fix 4K recording" into lmp-dev
Yin-Chia Yeh [Fri, 12 Sep 2014 21:50:27 +0000 (14:50 -0700)]
Camera2: fix 4K recording
Bug:
17484683
Change-Id: I09bb12698057555329286c777102b9b310452fb3
Jon Eklund [Tue, 9 Sep 2014 20:39:49 +0000 (15:39 -0500)]
audio policy: fix relative priorities of PHONE and ENFORCED_AUDIBLE
ENFORCED_AUDIBLE should only be highest priority if system tones
are being forced. Otherwise it should behave like SONIFICATION.
Bug:
17474485.
Change-Id: Ia651779870d51100cc3179c96fa09694bc691ba7
Robert Shih [Sat, 13 Sep 2014 01:51:36 +0000 (01:51 +0000)]
Merge "LiveSession: reliable switch" into lmp-dev
Robert Shih [Sat, 30 Aug 2014 01:09:26 +0000 (18:09 -0700)]
LiveSession: reliable switch
Bug:
17142706
Change-Id: I9cd6c068178d62c294496e8ab0b0a3763354964f
Marco Nelissen [Sat, 13 Sep 2014 00:28:38 +0000 (00:28 +0000)]
Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev
Robert Shih [Sat, 13 Sep 2014 00:23:59 +0000 (00:23 +0000)]
Merge "LiveSession: re-buffer on under run to avoid stutter" into lmp-dev
Eric Laurent [Sat, 13 Sep 2014 00:18:18 +0000 (00:18 +0000)]
Merge "audio policy: fix check in creaateAudioPatch()" into lmp-dev
Eric Laurent [Fri, 12 Sep 2014 23:19:41 +0000 (16:19 -0700)]
audio policy: fix check in creaateAudioPatch()
Bug:
17488759.
Change-Id: I9dd2c3ca7f83de4b3573f4fb0e9934e1bc37c3bc
Igor Murashkin [Fri, 12 Sep 2014 22:37:14 +0000 (22:37 +0000)]
Merge "camera: add latest parameters to dumpsys for api1 cameras" into lmp-dev
Robert Shih [Sat, 30 Aug 2014 01:16:29 +0000 (18:16 -0700)]
LiveSession: re-buffer on under run to avoid stutter
Bug:
13742725
Change-Id: I7dad8876e18084c3c060d08190fa8a72fc2f5bad
Ronghua Wu [Fri, 12 Sep 2014 19:07:39 +0000 (19:07 +0000)]
Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into lmp-dev
Robert Shih [Fri, 12 Sep 2014 18:26:27 +0000 (18:26 +0000)]
Merge "GenericSource: move track packet init from start to prepare" into lmp-dev
Robert Shih [Fri, 12 Sep 2014 18:24:02 +0000 (18:24 +0000)]
Merge "LiveSession: added onSwitchDown" into lmp-dev
Yin-Chia Yeh [Fri, 12 Sep 2014 16:47:25 +0000 (16:47 +0000)]
Merge "Camera2: improve ZSL candidate selection logic" into lmp-dev
Yin-Chia Yeh [Fri, 12 Sep 2014 16:47:11 +0000 (16:47 +0000)]
Merge "camera2: skip capture result after clearZslQueue" into lmp-dev
Robert Shih [Fri, 12 Sep 2014 00:27:44 +0000 (00:27 +0000)]
Merge "LiveSession: raise upwards adaptation constraint" into lmp-dev
Chong Zhang [Thu, 11 Sep 2014 23:54:48 +0000 (23:54 +0000)]
Merge "StagefrightRecorder: default to codec and fps from camcorder low profile" into lmp-dev
Robert Shih [Sat, 30 Aug 2014 01:02:56 +0000 (18:02 -0700)]
LiveSession: added onSwitchDown
additionally in this change
- AnotherPacketSource: added getEstimatedDurationUs that avoids
looping through buffered access units in most cases; this method
is called by LiveSession before triggering onSwitchDown. Also fix
the original getBufferedDurationUs to accumulate durations across
discontinuities.
Bug:
13742612
Change-Id: I135932ea0c74671b7019a3c7054844926c18bc14
Robert Shih [Thu, 11 Sep 2014 22:50:40 +0000 (22:50 +0000)]
Merge "PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists" into lmp-dev
Robert Shih [Thu, 11 Sep 2014 22:38:54 +0000 (15:38 -0700)]
GenericSource: move track packet init from start to prepare
Bug:
17244704
Change-Id: I15eba0e4d2a178cc0ba46bbc17be0e6d95e76935
Yin-Chia Yeh [Tue, 9 Sep 2014 20:31:46 +0000 (13:31 -0700)]
camera2: skip capture result after clearZslQueue
After ZSL queue is cleared, don't add capture result to ZSL queue
if its corresponding buffer has been cleared.
Bug:
17185356
Change-Id: Iddac39ab09b2560e2ce9390895927217c1736d5a
Igor Murashkin [Thu, 11 Sep 2014 21:43:24 +0000 (14:43 -0700)]
camera: add latest parameters to dumpsys for api1 cameras
Bug:
17290106
Change-Id: I08ac1659d0367613c37669d5bf6e6bf7b2b63bc2
Lajos Molnar [Thu, 11 Sep 2014 17:01:55 +0000 (10:01 -0700)]
avoid kWhatReadBuffer message spam in GenericSource
When playig WVM video, an extra readBuffer is posted for each
dequeueAccessUnit, resulting in an unbounded number of messages.
Bug:
17472979
Change-Id: Ice92ccf2454bf7a70856a4a8b535cefffc9e61ac
Glenn Kasten [Thu, 11 Sep 2014 19:28:07 +0000 (19:28 +0000)]
Merge "Clean up AudioTrack position and timestamp handling" into lmp-dev
Chong Zhang [Tue, 9 Sep 2014 01:55:34 +0000 (18:55 -0700)]
StagefrightRecorder: default to codec and fps from camcorder low profile
Bug:
16870964
Change-Id: I18425af630d3f041a3bcf77fbae3f07856fe8af2
Eric Laurent [Thu, 11 Sep 2014 18:23:53 +0000 (18:23 +0000)]
Merge "AudioPolicyManager: Use "safe" speaker for notifications if available" into lmp-dev
Ronghua Wu [Fri, 5 Sep 2014 21:25:39 +0000 (14:25 -0700)]
stagefright: add adaptive playback support to SoftMPEG decoder.
This covers both MPEG4 and H263 adaptive playback.
Bug:
17326758
Change-Id: I80a67b7f3ceab05e792f0a459439a8274bd78e20
Ronghua Wu [Thu, 11 Sep 2014 17:22:22 +0000 (17:22 +0000)]
Merge "stagefright: add adaptive playback support to SoftAVC decoder." into lmp-dev
Yin-Chia Yeh [Wed, 10 Sep 2014 22:14:18 +0000 (15:14 -0700)]
Camera2: improve ZSL candidate selection logic
1. Clear ZSL queue when focus mode is changed and autoFocus is
cancelled.
2. Do not check focus state is focus mode is fixed.
Bug:
17185356
Change-Id: I2cb10fb457b080f0db950c894e56995f638e147b
Glenn Kasten [Fri, 15 Aug 2014 22:13:30 +0000 (15:13 -0700)]
Clean up AudioTrack position and timestamp handling
Replace epoch concept by observing and accumulating server delta
positions. The advantage of using server deltas instead of absolute
values is that they (1) are not sensitive to 32-bit wraparound,
(2) are not sensitive to server behavior for stop(), and
(3) prepare for future 64-bit client positions without requiring 64-bit
positions on server.
Add comments to AudioTrack::getTimestamp() and friends
that the timestamp output parameter is undefined on error.
Don't allow getTimestamp to return a negative frame position after stop().
Accumulate the client released frames, which may be useful for a future API.
Bug:
11815245
Change-Id: I652940fa2db2f34a78c012a3ead0d9204fa29c6e
Robert Shih [Thu, 11 Sep 2014 04:26:01 +0000 (04:26 +0000)]
am
0568cd5b: am
e6b5d4c2: am
6fd1cf0c: am
86543654: am
0d83cf22: am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
0568cd5bf0a93c54a5bca47b48f7cbe799ccafcf':
SampleTable: check integer overflow during table alloc
Robert Shih [Thu, 11 Sep 2014 01:14:28 +0000 (01:14 +0000)]
am
e6b5d4c2: am
6fd1cf0c: am
86543654: am
0d83cf22: am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
e6b5d4c2d58a02184dd97815b5f76980025379bc':
SampleTable: check integer overflow during table alloc
Robert Shih [Thu, 11 Sep 2014 00:50:33 +0000 (00:50 +0000)]
am
6fd1cf0c: am
86543654: am
0d83cf22: am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
6fd1cf0c00ee76802cfff0035011691aac8a1724':
SampleTable: check integer overflow during table alloc
Robert Shih [Thu, 11 Sep 2014 00:34:29 +0000 (00:34 +0000)]
am
86543654: am
0d83cf22: am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
8654365499f8e9956c490e98184abe33978d4e67':
SampleTable: check integer overflow during table alloc
Lajos Molnar [Thu, 11 Sep 2014 00:32:44 +0000 (00:32 +0000)]
Merge "stagefright: don't use AAtomizer in AMessage" into lmp-dev
Jon Eklund [Mon, 23 Jun 2014 19:47:03 +0000 (14:47 -0500)]
AudioPolicyManager: Use "safe" speaker for notifications if available
On particularly loud devices, unexpected audio bursts can be harmful.
For longer audio events, the conventional mitigation strategy is to
somehow soft-start (ramp) the loudspeaker volume, but this strategy
can severely impact the audibility of short audio events.
Use of the "safe" speaker path hints to AudioHAL to immediately output
at best allowable level for transient audio events.
SPEAKER_SAFE is aliased to SPEAKER for purposes of volume control.
Bug:
17319721
Change-Id: I75187c23f3d1f18e9f638c5d14e7b0bf805a67bc
Marco Nelissen [Fri, 5 Sep 2014 16:28:24 +0000 (09:28 -0700)]
Fix AAC timestamps for multiple aac frames per input buffer
Support multiple aac frames per input buffer also for non-ADTS streams,
now also works with 5.1 audio.
Bug:
16715379
Lajos Molnar [Wed, 10 Sep 2014 20:53:21 +0000 (13:53 -0700)]
mediaplayer: release MediaBuffer in stale input buffers
Bug:
17454455
Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
Robert Shih [Wed, 10 Sep 2014 20:48:04 +0000 (20:48 +0000)]
am
0d83cf22: am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
0d83cf22991c48f4bb5f2afe3d16ae076861f394':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:26:40 +0000 (20:26 +0000)]
am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
97d917bc1ccc958d8f1051de6a888de9a25dc6bd':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:19:54 +0000 (20:19 +0000)]
am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
ab0b3212e0c15132f2dab2beeb39c47d31bb1dab':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:09:14 +0000 (20:09 +0000)]
am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
9b51a37fa8ad9d28be791213ceba4fcbec52b14d':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:58:37 +0000 (19:58 +0000)]
am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
cb5dc219b78e6eeacb7ee2f5c93e6763db677122':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:47:42 +0000 (19:47 +0000)]
am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
74abb1ae32fbd3fa4112cc8b8d53882777feb191':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:41:45 +0000 (19:41 +0000)]
am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
482b18bbfd6c9214157bfab47feae86df48a7178':
SampleTable: check integer overflow during table alloc
Wei Jia [Wed, 10 Sep 2014 19:41:40 +0000 (19:41 +0000)]
Merge "NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress." into lmp-dev
Robert Shih [Wed, 10 Sep 2014 19:31:46 +0000 (19:31 +0000)]
am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
f106b1993143df44282777253244ce67974c9d4a':
SampleTable: check integer overflow during table alloc
Marco Nelissen [Wed, 10 Sep 2014 19:28:49 +0000 (19:28 +0000)]
Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" into lmp-dev
Chong Zhang [Wed, 10 Sep 2014 19:27:03 +0000 (19:27 +0000)]
Merge "fix failure in MediaCodecTest#testException" into lmp-dev
Marco Nelissen [Wed, 10 Sep 2014 19:21:59 +0000 (12:21 -0700)]
Revert "Fix AAC timestamps for multiple aac frames per input buffer"
This reverts commit
e086387c805311ac87904c3c4d6d4eb08d4b4ee2.
(broke multichannel movie playback)
Bug:
17454025
Change-Id: I95b82359f87f8beca66f35c34b7e125850a44747
Lajos Molnar [Wed, 10 Sep 2014 19:02:45 +0000 (19:02 +0000)]
Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-dev
Robert Shih [Sat, 30 Aug 2014 01:13:13 +0000 (18:13 -0700)]
LiveSession: raise upwards adaptation constraint
Adjust bandwidth more conservatively when considering an upwards
adaptation. Also fixed an issue with kWhatCheckBandwidth messages
being accumulated across switch generations; this causes
onCheckBandwidth to be fired at a high frequency and LiveSession to
be too sensitive to network glitches.
Bug:
13743153
Change-Id: I1dec99cb5d123c6675abe0847fd12aab5178eefd
Wei Jia [Wed, 10 Sep 2014 17:06:11 +0000 (10:06 -0700)]
NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress.
Bug:
17453240
Change-Id: If243e2232779681fc84dc767feaed00f23d8fdb1
Chong Zhang [Wed, 10 Sep 2014 17:43:41 +0000 (10:43 -0700)]
fix failure in MediaCodecTest#testException
reset codec after failed configure()
Bug:
17418876
Change-Id: I21ff8a0751dae6a164678015142e11d481403bed
Ruben Brunk [Wed, 10 Sep 2014 17:11:11 +0000 (17:11 +0000)]
Merge "camera2: Fix video snapshot for HAL 2.* devices." into lmp-dev
Ronghua Wu [Tue, 2 Sep 2014 17:55:41 +0000 (10:55 -0700)]
stagefright: add adaptive playback support to SoftAVC decoder.
Also change SoftVPX decoder to use common handlePortSettingsChanged
and copyYV12FrameToOutputBuffer method.
Bug:
17326758
Change-Id: I6fb2ee8fb9291f69c70493b8558af341adc1f4b2
Lajos Molnar [Wed, 27 Aug 2014 16:02:47 +0000 (09:02 -0700)]
stagefright: don't use AAtomizer in AMessage
Bug:
15094301
Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
Zhijun He [Wed, 10 Sep 2014 05:12:17 +0000 (05:12 +0000)]
Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
Lajos Molnar [Wed, 10 Sep 2014 03:08:39 +0000 (20:08 -0700)]
mediaplayer: limit number of outstanding buffer requests
Bug:
14679336
Change-Id: I94a20ada30a9a25065329a85fc884d32d154d029
Eric Laurent [Wed, 10 Sep 2014 01:03:58 +0000 (01:03 +0000)]
Merge "audioflinger: fix audio patch release" into lmp-dev
Eric Laurent [Wed, 10 Sep 2014 00:00:14 +0000 (17:00 -0700)]
audioflinger: fix audio patch release
Fix error in PatchPanel:releaseAudioPatch() causing
the wrong patch handle to be passed to the audio HAL.
Bug:
17368621.
Change-Id: I037fd2e6273508c830414b5900d07c0178b96dae
Jeff Tinker [Tue, 9 Sep 2014 23:56:04 +0000 (23:56 +0000)]
Merge "Add error code for insufficient output protection" into lmp-dev
Ruben Brunk [Tue, 9 Sep 2014 23:20:53 +0000 (16:20 -0700)]
camera2: Fix video snapshot for HAL 2.* devices.
Bug:
15408128
- Lazily destroy ZSL stream when ZslProcessor is updated, or
when the camera client is disconnected, allowing HAL 2.*
devices that rely on the ZSL stream to capture video snapshots
to function correctly.
Change-Id: Ia5cf14c62acda4d9c640440dc5b8e0796dc0b3fa
Zhijun He [Tue, 9 Sep 2014 23:18:31 +0000 (16:18 -0700)]
CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
Bug:
17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
Wei Jia [Tue, 9 Sep 2014 22:08:44 +0000 (22:08 +0000)]
Merge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev
Phil Burk [Tue, 9 Sep 2014 22:03:13 +0000 (22:03 +0000)]
Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev
Phil Burk [Tue, 9 Sep 2014 18:46:18 +0000 (11:46 -0700)]
[media][nuplayer] Remove debug message EWOULDBLOCK
A debug message that was silent during testing is now spewing messages.
It was removed.
Bug:
17438882
Change-Id: I9c61409cac77c7bc1fd1088815823207094606f2
Signed-off-by: Phil Burk <philburk@google.com>
Wei Jia [Tue, 9 Sep 2014 21:49:08 +0000 (14:49 -0700)]
NuPlayer: make previous decoders obsolete when reset is done.
Bug:
17428608
Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
Rachad [Tue, 9 Sep 2014 21:44:13 +0000 (21:44 +0000)]
Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning." into lmp-dev
Marco Nelissen [Tue, 9 Sep 2014 20:30:29 +0000 (20:30 +0000)]
Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev
Rachad [Tue, 9 Sep 2014 20:10:28 +0000 (13:10 -0700)]
NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
Bug:
17436451
Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
Wei Jia [Tue, 9 Sep 2014 19:43:15 +0000 (19:43 +0000)]
Merge "NuPlayer: check mSource before deferencing it." into lmp-dev
Wei Jia [Tue, 9 Sep 2014 19:08:47 +0000 (12:08 -0700)]
NuPlayer: check mSource before deferencing it.
Bug:
17428608
Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
Eric Laurent [Tue, 9 Sep 2014 18:57:42 +0000 (18:57 +0000)]
Merge "audio policy: fix output stream selection" into lmp-dev
Eric Laurent [Mon, 8 Sep 2014 23:44:28 +0000 (16:44 -0700)]
audio policy: fix output stream selection
Make sure that all outputs considered by selectOutput()
when called from AudioPolicyManager::getOutputForDevice()
support the requested audio format.
Bug:
17340382.
Change-Id: I76520ce60e9a8fe4d2d23125d6143bb016522754
Phil Burk [Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)]
Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-dev
Andy Hung [Mon, 8 Sep 2014 21:17:22 +0000 (21:17 +0000)]
Merge "Fix potential deadlock between AudioPolicyService and AudioSystem" into lmp-dev
Yin-Chia Yeh [Mon, 8 Sep 2014 20:56:03 +0000 (20:56 +0000)]
Merge "Camera2: reconfigure video snapshot size if needed" into lmp-dev
Andy Hung [Mon, 8 Sep 2014 18:47:24 +0000 (11:47 -0700)]
Fix potential deadlock between AudioPolicyService and AudioSystem
Bug:
17109761
Change-Id: I315c1c5066f62b05e1c13b04fae1272b5fbce977
Phil Burk [Wed, 3 Sep 2014 22:04:12 +0000 (15:04 -0700)]
[audio][nuplayer] Aggregate buffers to reduce power.
Combine audio data from multiple buffers into one.
This reduces churn between threads and saves battery power.
Only use buffer aggregation when offloading the decoder.
Pend buffer if it won't fit in the bigger buffer.
Bug:
15094301
Change-Id: Iad3dac90b5d6b0fa43432b0e6776652ee2eafaa1
Signed-off-by: Phil Burk <philburk@google.com>
Wei Jia [Mon, 8 Sep 2014 17:45:06 +0000 (17:45 +0000)]
Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lmp-dev
Glenn Kasten [Mon, 8 Sep 2014 16:35:00 +0000 (16:35 +0000)]
Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
Yin-Chia Yeh [Fri, 5 Sep 2014 21:14:44 +0000 (14:14 -0700)]
Camera2: reconfigure video snapshot size if needed
When recording fails to start due to stream configuration failed,
try configure stream again by setting jpeg stream to video size.
Bug:
16162133
Change-Id: Ib20271e787ae07719ce419f0b15c7f86434f7ebb
Eric Laurent [Mon, 8 Sep 2014 15:37:45 +0000 (15:37 +0000)]
Merge "audiopolicy: fix direct output profile probing" into lmp-dev
Andy Hung [Mon, 8 Sep 2014 04:46:12 +0000 (04:46 +0000)]
Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-dev
Robert Shih [Sat, 30 Aug 2014 01:48:52 +0000 (18:48 -0700)]
PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists
Bug:
17416658
Change-Id: I1d07ce03a293206c48ff9ee11dc78b815ba367a4
Eric Laurent [Sun, 7 Sep 2014 19:26:06 +0000 (12:26 -0700)]
audiopolicy: fix direct output profile probing
Do not select maximum sampling rate and channel count
when opening a direct output for the first time
to make sure that the combination of sampling rate
and channel count is supported by the connected sink.
Bug:
17047809.
Change-Id: I077a3c1436158378f2762343469ceb39fab9775e
Marco Nelissen [Fri, 5 Sep 2014 16:28:24 +0000 (09:28 -0700)]
Fix AAC timestamps for multiple aac frames per input buffer
Support multiple aac frames per input buffer also for non-ADTS streams.
Bug:
16715379
Change-Id: I84f33d9bb65b6821b2a697f6750356cea98777c4
Jungshik Jang [Sat, 6 Sep 2014 02:58:39 +0000 (02:58 +0000)]
Merge "Fix "invalid device combination" in system audio mode." into lmp-dev
Robert Shih [Sat, 6 Sep 2014 00:49:52 +0000 (00:49 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd" into lmp-dev
Robert Shih [Fri, 16 May 2014 19:22:35 +0000 (12:22 -0700)]
DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd
Bug:
14895152
Change-Id: Ibfee9e176459099507589c26a5eca6c61caabd1c
(cherry picked from commit
bc413f6ad0023f7ad451a0129a07fc31dbc65665)
Glenn Kasten [Fri, 5 Sep 2014 23:45:52 +0000 (16:45 -0700)]
Make IPowerManager native conform to .aidl for oneway
But provide a temporary escape hatch for AudioFlinger.
This oneway option will be removed as soon as possible.
Bug:
16408906
Change-Id: I058a50906af810787e444a96819cb781b7f639ad
Jean-Michel Trivi [Fri, 5 Sep 2014 23:36:21 +0000 (23:36 +0000)]
Merge "Cache audio attributes when player not available" into lmp-dev
Lajos Molnar [Fri, 5 Sep 2014 23:08:53 +0000 (23:08 +0000)]
Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev
Robert Shih [Fri, 5 Sep 2014 22:12:51 +0000 (22:12 +0000)]
Merge "GenericSource: refactor track selection for dedicated looper" into lmp-dev
Wei Jia [Fri, 5 Sep 2014 21:58:59 +0000 (14:58 -0700)]
NuPlayerDriver: put player in paused state when reaching EOS.
Bug:
17352759
Change-Id: I19b183e0a86b712524f79ec7c35e32b5a5b47bc6