OSDN Git Service

android-x86/frameworks-av.git
9 years agoOptimize the YUV buffer copy a little bit to skip unnecessary operation.
hkuang [Fri, 12 Sep 2014 20:38:04 +0000 (13:38 -0700)]
Optimize the YUV buffer copy a little bit to skip unnecessary operation.

Bug: 17326758

Change-Id: I2505751cb40a53242ceeb3be8f362c3754c2ee3f

9 years agoMerge "Camera2: improve ZSL candidate selection logic" 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

9 years agoMerge "camera2: skip capture result after clearZslQueue" 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

9 years agoMerge "LiveSession: raise upwards adaptation constraint" 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

9 years agoMerge "StagefrightRecorder: default to codec and fps from camcorder low profile"...
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

9 years agoMerge "PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlis...
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

9 years agocamera2: skip capture result after clearZslQueue
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

9 years agoavoid kWhatReadBuffer message spam in GenericSource
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

9 years agoMerge "Clean up AudioTrack position and timestamp handling" into lmp-dev
Glenn Kasten [Thu, 11 Sep 2014 19:28:07 +0000 (19:28 +0000)]
Merge "Clean up AudioTrack position and timestamp handling" into lmp-dev

9 years agoStagefrightRecorder: default to codec and fps from camcorder low profile
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

9 years agoMerge "AudioPolicyManager: Use "safe" speaker for notifications if available" into...
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

9 years agoMerge "stagefright: add adaptive playback support to SoftAVC decoder." into lmp-dev
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

9 years agoCamera2: improve ZSL candidate selection logic
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

9 years agoClean up AudioTrack position and timestamp handling
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

9 years agoam 0568cd5b: am e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am...
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

9 years agoam e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am...
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

9 years agoam 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am...
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

9 years agoam 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am...
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

9 years agoMerge "stagefright: don't use AAtomizer in AMessage" into lmp-dev
Lajos Molnar [Thu, 11 Sep 2014 00:32:44 +0000 (00:32 +0000)]
Merge "stagefright: don't use AAtomizer in AMessage" into lmp-dev

9 years agoAudioPolicyManager: Use "safe" speaker for notifications if available
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

9 years agomediaplayer: release MediaBuffer in stale input buffers
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

9 years agoam 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am...
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

9 years agoam 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am...
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

9 years agoam ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleT...
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

9 years agoam 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check...
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

9 years agoam cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overfl...
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

9 years agoam 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during...
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

9 years agoam 482b18bb: am f106b199: 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

9 years agoMerge "NuPlayerDriver: do not set to paused state when receiving playback complete...
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

9 years agoam f106b199: SampleTable: check integer overflow during table alloc
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

9 years agoMerge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" into...
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

9 years agoMerge "fix failure in MediaCodecTest#testException" 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

9 years agoRevert "Fix AAC timestamps for multiple aac frames per input buffer"
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

9 years agoMerge "mediaplayer: limit number of outstanding buffer requests" into lmp-dev
Lajos Molnar [Wed, 10 Sep 2014 19:02:45 +0000 (19:02 +0000)]
Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-dev

9 years agoLiveSession: raise upwards adaptation constraint
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

9 years agoNuPlayerDriver: do not set to paused state when receiving playback complete and reset...
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

9 years agofix failure in MediaCodecTest#testException
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

9 years agoMerge "camera2: Fix video snapshot for HAL 2.* devices." into lmp-dev
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

9 years agostagefright: add adaptive playback support to SoftAVC decoder.
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

9 years agostagefright: don't use AAtomizer in AMessage
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

9 years agoMerge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
Zhijun He [Wed, 10 Sep 2014 05:12:17 +0000 (05:12 +0000)]
Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev

9 years agomediaplayer: limit number of outstanding buffer requests
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

9 years agoMerge "audioflinger: fix audio patch release" into lmp-dev
Eric Laurent [Wed, 10 Sep 2014 01:03:58 +0000 (01:03 +0000)]
Merge "audioflinger: fix audio patch release" into lmp-dev

9 years agoaudioflinger: fix audio patch release
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

9 years agoMerge "Add error code for insufficient output protection" into lmp-dev
Jeff Tinker [Tue, 9 Sep 2014 23:56:04 +0000 (23:56 +0000)]
Merge "Add error code for insufficient output protection" into lmp-dev

9 years agocamera2: Fix video snapshot for HAL 2.* devices.
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

9 years agoCamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
Zhijun He [Tue, 9 Sep 2014 23:18:31 +0000 (16:18 -0700)]
CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P

Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac

9 years agoMerge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev
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

9 years agoMerge "[media][nuplayer] Remove debug message EWOULDBLOCK" 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

9 years ago[media][nuplayer] Remove debug message EWOULDBLOCK
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>
9 years agoNuPlayer: make previous decoders obsolete when reset is done.
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

9 years agoMerge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning."...
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

9 years agoMerge "Fix AAC timestamps for multiple aac frames per input buffer" 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

9 years ago NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
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

9 years agoMerge "NuPlayer: check mSource before deferencing it." into lmp-dev
Wei Jia [Tue, 9 Sep 2014 19:43:15 +0000 (19:43 +0000)]
Merge "NuPlayer: check mSource before deferencing it." into lmp-dev

9 years agoNuPlayer: check mSource before deferencing it.
Wei Jia [Tue, 9 Sep 2014 19:08:47 +0000 (12:08 -0700)]
NuPlayer: check mSource before deferencing it.

Bug: 17428608
Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16

9 years agoMerge "audio policy: fix output stream selection" into lmp-dev
Eric Laurent [Tue, 9 Sep 2014 18:57:42 +0000 (18:57 +0000)]
Merge "audio policy: fix output stream selection" into lmp-dev

9 years agoaudio policy: fix output stream selection
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

9 years agoMerge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-dev
Phil Burk [Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)]
Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-dev

9 years agoMerge "Fix potential deadlock between AudioPolicyService and AudioSystem" 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

9 years agoMerge "Camera2: reconfigure video snapshot size if needed" 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

9 years agoFix potential deadlock between AudioPolicyService and AudioSystem
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

9 years ago[audio][nuplayer] Aggregate buffers to reduce power.
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>
9 years agoMerge "NuPlayerDriver: put player in paused state when reaching EOS." into lmp-dev
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

9 years agoMerge "Make IPowerManager native conform to .aidl for oneway" 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

9 years agoCamera2: reconfigure video snapshot size if needed
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

9 years agoMerge "audiopolicy: fix direct output profile probing" into lmp-dev
Eric Laurent [Mon, 8 Sep 2014 15:37:45 +0000 (15:37 +0000)]
Merge "audiopolicy: fix direct output profile probing" into lmp-dev

9 years agoMerge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" 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

9 years agoPlaylistFetcher: avoid repeated fetch when we run off the edge of live playlists
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

9 years agoaudiopolicy: fix direct output profile probing
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

9 years agoFix AAC timestamps for multiple aac frames per input buffer
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

9 years agoMerge "Fix "invalid device combination" in system audio mode." into lmp-dev
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

9 years agoMerge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd...
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

9 years agoDO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd
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)

9 years agoMake IPowerManager native conform to .aidl for oneway
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

9 years agoMerge "Cache audio attributes when player not available" into lmp-dev
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

9 years agoMerge "stagefright: allow P-frames spacing of 0 and 1" 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

9 years agoMerge "GenericSource: refactor track selection for dedicated looper" 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

9 years agoNuPlayerDriver: put player in paused state when reaching EOS.
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

9 years agoMerge "Camera API1: fix AE state check in precapture state" into lmp-dev
Zhijun He [Fri, 5 Sep 2014 21:53:53 +0000 (21:53 +0000)]
Merge "Camera API1: fix AE state check in precapture state" into lmp-dev

9 years agoMerge "NuPlayer: Restrict seek on video texture changes" into lmp-dev
Andy Hung [Fri, 5 Sep 2014 21:49:32 +0000 (21:49 +0000)]
Merge "NuPlayer: Restrict seek on video texture changes" into lmp-dev

9 years agoMerge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-dev
Andy Hung [Fri, 5 Sep 2014 20:38:27 +0000 (20:38 +0000)]
Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-dev

9 years agoMerge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-dev
Chong Zhang [Fri, 5 Sep 2014 19:19:47 +0000 (19:19 +0000)]
Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-dev

9 years agoCache audio attributes when player not available
Jean-Michel Trivi [Fri, 5 Sep 2014 18:20:11 +0000 (11:20 -0700)]
Cache audio attributes when player not available

Cache the audio attributes stored in a Parcel in the client-side
 MediaPlayer object if they are set through setParameter()
 before the server-side MediaPlayer is available. Apply them when
 the player is prepared.

Bug 17280746

Change-Id: I72f1a7fc4e2b076fae8cbdede77a2f74e98b2a03

9 years agoNuPlayer: Restrict seek on video texture changes
Andy Hung [Fri, 5 Sep 2014 18:42:58 +0000 (11:42 -0700)]
NuPlayer: Restrict seek on video texture changes

MediaPlayer::setVideoSurfaceTexture() should generate seek to refresh
display only if player is started and has video.

Bug: 17379148
Bug: 17404923
Change-Id: I5f55dc40943e4419d08be6fdab964b8a2c5ee519

9 years agoMerge "audio policy service: filter out delayed audio patch commands if needed."...
Eric Laurent [Fri, 5 Sep 2014 18:01:41 +0000 (18:01 +0000)]
Merge "audio policy service: filter out delayed audio patch commands if needed." into lmp-dev

9 years agoMerge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-dev
Eric Laurent [Fri, 5 Sep 2014 17:13:31 +0000 (17:13 +0000)]
Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-dev

9 years agoFix to parse audio_source_t member of audio_attributes_t
Hyejin Kim [Fri, 5 Sep 2014 06:50:03 +0000 (15:50 +0900)]
Fix to parse audio_source_t member of audio_attributes_t

When unmarshalling audio_attributes_t typed data,
it didn't parse the audio_source_t member between content_type and flags.

Bug: 16906307

Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d

9 years agoaudio policy service: filter out delayed audio patch commands if needed.
Eric Laurent [Thu, 4 Sep 2014 23:40:57 +0000 (16:40 -0700)]
audio policy service: filter out delayed audio patch commands if needed.

As for set parameters commands, create or release audio patch commands
modifying the same patch handle should be filtered by the audio policy service
command thread so that an immediate command is not overridden by
a pending delayed command.

Bug: 17379728.

Change-Id: I6aa4652b4bfec59eebd3c3cb7d1d9ac1bc1d6e49

9 years agoFix "invalid device combination" in system audio mode.
Jungshik Jang [Fri, 5 Sep 2014 12:25:48 +0000 (21:25 +0900)]
Fix "invalid device combination" in system audio mode.

HDMI-CEC system audio mode removes speaker from output
list. It also has multiple outputs by connected outputs.
However, getDeviceForVolume() doesn't cover multiple
output with no speaker or bluetooth case.
This change picks one of system audio outputs in order.

Bug: 17400026
Change-Id: I102fd0052c9c4c9543f9e8f3b16ec6815d7485d8

9 years agoNuPlayer: Discard seeks when source and decoders are NULL
Andy Hung [Thu, 4 Sep 2014 01:22:22 +0000 (18:22 -0700)]
NuPlayer: Discard seeks when source and decoders are NULL

Problem occurs when loop mode asynchronously seeks to the
start of the source after a MediaPlayer::reset().

Bug: 17379148
Change-Id: I50bfe65a753afffb1d478db54c76067a9c61a0ae

9 years agoMerge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lmp-dev
Robert Shih [Thu, 4 Sep 2014 22:58:34 +0000 (22:58 +0000)]
Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lmp-dev

9 years agostagefright: allow P-frames spacing of 0 and 1
Lajos Molnar [Thu, 4 Sep 2014 18:45:26 +0000 (11:45 -0700)]
stagefright: allow P-frames spacing of 0 and 1

Bug: 17387418
Change-Id: Ib966496b4ca220d96fb3741c29002c13cd2db848

9 years agoSplit CEA-608 Closed caption into 4 tracks CC1~CC4
Chong Zhang [Fri, 1 Aug 2014 20:46:53 +0000 (13:46 -0700)]
Split CEA-608 Closed caption into 4 tracks CC1~CC4

Bug: 16463078

Change-Id: Ib3073090934232016e535fbb8fa56cdf9d7ab6eb

9 years agoGenericSource: refactor track selection for dedicated looper
Robert Shih [Thu, 21 Aug 2014 00:00:21 +0000 (17:00 -0700)]
GenericSource: refactor track selection for dedicated looper

 - move getFormatMeta, getSelectedTrack, selectTrack, and seekTo to
   dedicated looper
 - start & dequeueAccessUnit posts readBuffer requests instead of reading
   directly
 - call internal doGetFormatMeta in onPrepareAsync

Bug: 16892748
Change-Id: I5d5e34381f1dfceca655c52a201627b53454ad22

9 years agoPlaylistFetcher: do not reset mStartTimeUs if we are resuming
Robert Shih [Sat, 30 Aug 2014 01:57:34 +0000 (18:57 -0700)]
PlaylistFetcher: do not reset mStartTimeUs if we are resuming

Bug: 17376049
Change-Id: Ie519bdf7128841172df41e6512d624e99d9853d6

9 years agoRevert "Revert "disable AwesomePlayer for Ogg vorbis""
Andy Hung [Wed, 3 Sep 2014 23:28:52 +0000 (23:28 +0000)]
Revert "Revert "disable AwesomePlayer for Ogg vorbis""

This reverts commit da65048e8e6f65ed9b3f23cda3f4554025c76fc4.

Deadlock audio issues for NuPlayer have been resolved.

Change-Id: I1853d367dc771a9396a9b2d48ff34e50c78c112c

9 years agoMerge "Fix the bug that same video frame has been decoded twice during port reconfig...
hkuang [Wed, 3 Sep 2014 21:54:45 +0000 (21:54 +0000)]
Merge "Fix the bug that same video frame has been decoded twice during port reconfig." into lmp-dev

9 years agoMerge "NuPlayer: add seek operation when change video texture surface." into lmp-dev
Wei Jia [Wed, 3 Sep 2014 21:23:57 +0000 (21:23 +0000)]
Merge "NuPlayer: add seek operation when change video texture surface." into lmp-dev

9 years agoCamera API1: fix AE state check in precapture state
Zhijun He [Wed, 3 Sep 2014 18:36:00 +0000 (11:36 -0700)]
Camera API1: fix AE state check in precapture state

It is legal to transit to CONVERGED or FLASH_REQUIRED after a AE precapture
trigger.

Bug: 17365185
Change-Id: Id041eff5eac564c32d09b547a0139d24807336f4