OSDN Git Service

android-x86/frameworks-av.git
10 years agocamera2: Fix CameraUtils orientation for front camera.
Ruben Brunk [Thu, 21 Aug 2014 20:41:42 +0000 (13:41 -0700)]
camera2: Fix CameraUtils orientation for front camera.

Bug: 16637957
Change-Id: If6d213794a92eb60b8a333546670ca868b75e5fc

10 years agomerge in lmp-release history after reset to 01047680ac57712303e259f485efd9cb97e9a99a
The Android Automerger [Thu, 21 Aug 2014 13:11:24 +0000 (06:11 -0700)]
merge in lmp-release history after reset to 01047680ac57712303e259f485efd9cb97e9a99a

10 years agoMerge "NuPlayerDriver: include lapsed time when reporting current position." into...
Wei Jia [Thu, 21 Aug 2014 00:49:54 +0000 (00:49 +0000)]
Merge "NuPlayerDriver: include lapsed time when reporting current position." into lmp-dev

10 years agoFix typo in comment
Marco Nelissen [Wed, 20 Aug 2014 19:46:47 +0000 (12:46 -0700)]
Fix typo in comment

Bug: 14057920
Change-Id: I51c4d47b9e175ef789ed3c51d59c9eda77edc1e0

10 years agoFix NuPlayer deadlock
Marco Nelissen [Wed, 20 Aug 2014 16:44:44 +0000 (09:44 -0700)]
Fix NuPlayer deadlock

Mutexes can't be locked recursively. This would cause a seek in the prepared
state to deadlock

Bug: 14057920
Change-Id: Ifb5e25f24450b7e5f71611a8ee2bdba45dba70a7

10 years agoNuPlayerDriver: include lapsed time when reporting current position.
Wei Jia [Wed, 20 Aug 2014 22:14:44 +0000 (15:14 -0700)]
NuPlayerDriver: include lapsed time when reporting current position.

Bug: 17031731
Change-Id: I01962ee9194bdaa9e8ed1a51abbf365733be3c85

10 years agoMerge "Fix typo in comment" into lmp-dev
Marco Nelissen [Wed, 20 Aug 2014 20:33:44 +0000 (20:33 +0000)]
Merge "Fix typo in comment" into lmp-dev

10 years agoFix typo in comment
Marco Nelissen [Wed, 20 Aug 2014 19:46:47 +0000 (12:46 -0700)]
Fix typo in comment

Bug: 14057920
Change-Id: I51c4d47b9e175ef789ed3c51d59c9eda77edc1e0

10 years agomerge in lmp-release history after reset to a8143b2bbaabc3f704b05078ccc930dbc28591b9
The Android Automerger [Wed, 20 Aug 2014 13:11:06 +0000 (06:11 -0700)]
merge in lmp-release history after reset to a8143b2bbaabc3f704b05078ccc930dbc28591b9

10 years agoMerge "disable AwesomePlayer for Ogg vorbis" into lmp-dev
Chong Zhang [Wed, 20 Aug 2014 23:00:35 +0000 (23:00 +0000)]
Merge "disable AwesomePlayer for Ogg vorbis" into lmp-dev

10 years agodisable AwesomePlayer for Ogg vorbis
Chong Zhang [Wed, 20 Aug 2014 20:58:34 +0000 (13:58 -0700)]
disable AwesomePlayer for Ogg vorbis

Bug: 17108024

Change-Id: I0a970e6476d0f739e65d2200d0f5220dee8d36ef

10 years agomerge in lmp-release history after reset to 1b786a35ddd072765348eee2bffa2009c1b14da3
The Android Automerger [Tue, 19 Aug 2014 13:10:44 +0000 (06:10 -0700)]
merge in lmp-release history after reset to 1b786a35ddd072765348eee2bffa2009c1b14da3

10 years agoMerge "handle error during flush in MediaPlayer.reset()" into lmp-dev
Marco Nelissen [Wed, 20 Aug 2014 20:16:59 +0000 (20:16 +0000)]
Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev

10 years agohandle error during flush in MediaPlayer.reset()
Marco Nelissen [Mon, 18 Aug 2014 23:13:03 +0000 (16:13 -0700)]
handle error during flush in MediaPlayer.reset()

If there was an error during the flush phase of a reset, then the
reset would never complete. We now make sure the MediaCodec moves
to the right state in this case, and that NuPlayer cleans up and
resumes the rest of the reset after a failed flush.

Bug: 16955082
Change-Id: Ied61136871a9fcdffcc80647fa2bba64a926ac2a

10 years agoMerge "Fix NuPlayer deadlock" into lmp-dev
Marco Nelissen [Wed, 20 Aug 2014 19:44:54 +0000 (19:44 +0000)]
Merge "Fix NuPlayer deadlock" into lmp-dev

10 years agoFix NuPlayer deadlock
Marco Nelissen [Wed, 20 Aug 2014 16:44:44 +0000 (09:44 -0700)]
Fix NuPlayer deadlock

Mutexes can't be locked recursively. This would cause a seek in the prepared
state to deadlock

Bug: 14057920
Change-Id: Ifb5e25f24450b7e5f71611a8ee2bdba45dba70a7

10 years agoMerge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder" into...
Robert Shih [Wed, 20 Aug 2014 18:42:28 +0000 (18:42 +0000)]
Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder" into lmp-dev

10 years agoStagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder
Robert Shih [Wed, 20 Aug 2014 17:51:07 +0000 (10:51 -0700)]
StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder

Bug: 16329805
Change-Id: Ibc80cdeb1958f739dd67b65e57f6b7cc551a9db3

10 years agoMerge "Allow audio and video flushed separately." into lmp-dev
Wei Jia [Tue, 19 Aug 2014 23:08:17 +0000 (23:08 +0000)]
Merge "Allow audio and video flushed separately." into lmp-dev

10 years agoMerge changes I116ee711,Ieb3fc61f into lmp-dev
Igor Murashkin [Tue, 19 Aug 2014 23:06:54 +0000 (23:06 +0000)]
Merge changes I116ee711,Ieb3fc61f into lmp-dev

* changes:
  camera: hal3: Remove register_stream setprop check
  camera: Allow shutter sounds to be disabled from camera2 api

10 years agoMerge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp-dev
Wei Jia [Tue, 19 Aug 2014 22:53:35 +0000 (22:53 +0000)]
Merge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp-dev

10 years agoAllow audio and video flushed separately.
Wei Jia [Tue, 29 Jul 2014 17:22:53 +0000 (10:22 -0700)]
Allow audio and video flushed separately.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 13133027
Change-Id: I956a9f55513970115119c7639a5e33b39e6d2f55

10 years agocamera: hal3: Remove register_stream setprop check
Igor Murashkin [Tue, 19 Aug 2014 22:14:29 +0000 (15:14 -0700)]
camera: hal3: Remove register_stream setprop check

camera3_device_t::register_stream must always be NULL in HAL3.2+ cameras

Bug: 13914251
Change-Id: I116ee71135a827c8b4db61cd91f56ba56da3f0ef

10 years agocamera: Allow shutter sounds to be disabled from camera2 api
Igor Murashkin [Tue, 19 Aug 2014 21:53:08 +0000 (14:53 -0700)]
camera: Allow shutter sounds to be disabled from camera2 api

When using the connectLegacy binder interface (available only
through an @hide java api), then consider the camera to be in the
camera2 api legacy mode.

In legacy mode, allow disabling the shutter sound unconditionally.

Bug: 17109582
Change-Id: Ieb3fc61ff111d792cc657c018e278349c25472cf

10 years agoNuPlayerRenderer: allow flush() to be called multiple times.
Wei Jia [Mon, 18 Aug 2014 18:29:50 +0000 (11:29 -0700)]
NuPlayerRenderer: allow flush() to be called multiple times.

Also fix racing condition on accessing some members.

Bug: 16982307
Bug: 13133027
Change-Id: I0d4a605146e24ad7396a07369d501593cad73f41

10 years agoMerge "NuPlayer: use generation to detect stale requests from old decoders." into...
Wei Jia [Tue, 19 Aug 2014 18:52:03 +0000 (18:52 +0000)]
Merge "NuPlayer: use generation to detect stale requests from old decoders." into lmp-dev

10 years agoNuPlayer: use generation to detect stale requests from old decoders.
Wei Jia [Wed, 6 Aug 2014 18:24:07 +0000 (11:24 -0700)]
NuPlayer: use generation to detect stale requests from old decoders.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 13133027
Change-Id: I3e66b25b2302c0eb795361629b03bf2e96ed34e4

10 years agoMerge "cameraservice: update supportedFocusModes for api1" into lmp-dev
Yin-Chia Yeh [Tue, 19 Aug 2014 15:45:13 +0000 (15:45 +0000)]
Merge "cameraservice: update supportedFocusModes for api1" into lmp-dev

10 years agoMerge "camera: Fix setParameters for Preview FPS single/range values" into lmp-dev
Eino-Ville Talvala [Tue, 19 Aug 2014 00:41:30 +0000 (00:41 +0000)]
Merge "camera: Fix setParameters for Preview FPS single/range values" into lmp-dev

10 years agocamera: Fix setParameters for Preview FPS single/range values
Igor Murashkin [Wed, 19 Mar 2014 01:15:23 +0000 (18:15 -0700)]
camera: Fix setParameters for Preview FPS single/range values

As a workaround, duplicate CameraParameters into CameraParameters2 to
prevent ABI break for some camera HALs that directly link into
CameraParameters.

CameraParameters2 implements the real fixes needed in the framework,
while CameraParameters is left in to satisfy older camera HALs.

Bug: 12609188
Bug: 16654949
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da

10 years agoFix memory access error due to race during fast track removal
Glenn Kasten [Mon, 18 Aug 2014 22:51:59 +0000 (15:51 -0700)]
Fix memory access error due to race during fast track removal

Bug: 16205169
Change-Id: Ie15ec2a737b6ddd16b2d26030d01564ff70177f5

10 years agoMerge "stagefright: Fix thumbnail generation for some clips." into lmp-dev
Ronghua Wu [Tue, 19 Aug 2014 18:34:06 +0000 (18:34 +0000)]
Merge "stagefright: Fix thumbnail generation for some clips." into lmp-dev

10 years agostagefright: Fix thumbnail generation for some clips.
Ronghua Wu [Mon, 4 Aug 2014 23:59:20 +0000 (16:59 -0700)]
stagefright: Fix thumbnail generation for some clips.

Fix thumbnail generation for clips that include an immediate resolution change:
* Enable dynamic resolution change, when port settings may change while we have
  filled buffers.
* Handle the case when port settings change happens right after stop is called.

Bug: 16210021
Change-Id: I8b2c48365d74ce7551f000a1f4b0711647a9796f

10 years agoMerge "NuPlayer: disable deep audio buffer in offload mode." into lmp-dev
Ronghua Wu [Tue, 19 Aug 2014 18:33:40 +0000 (18:33 +0000)]
Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-dev

10 years agoNuPlayer: disable deep audio buffer in offload mode.
Ronghua Wu [Mon, 18 Aug 2014 22:57:03 +0000 (15:57 -0700)]
NuPlayer: disable deep audio buffer in offload mode.

Bug: 17035257
Change-Id: I56ca28d4c4774c1c0103d19126cf0b8f859964b7

10 years agoMerge "NuPlayerRenderer: only query audio sink for position for the first entry....
Ronghua Wu [Tue, 19 Aug 2014 18:31:33 +0000 (18:31 +0000)]
Merge "NuPlayerRenderer: only query audio sink for position for the first entry." into lmp-dev

10 years agoNuPlayerRenderer: only query audio sink for position for the first entry.
Ronghua Wu [Mon, 18 Aug 2014 23:27:08 +0000 (16:27 -0700)]
NuPlayerRenderer: only query audio sink for position for the first entry.

Bug: 17035257
Change-Id: I472ec4610e1174c59986f42d72fe55f90e93731e

10 years agoMerge "NuPlayer: add support for proper stop" into lmp-dev
Lajos Molnar [Tue, 19 Aug 2014 17:54:04 +0000 (17:54 +0000)]
Merge "NuPlayer: add support for proper stop" into lmp-dev

10 years agostagefright: Do not add silence data for compress offload
aarti jadhav-gaikwad [Wed, 13 Aug 2014 09:34:39 +0000 (15:04 +0530)]
stagefright: Do not add silence data for compress offload

Bug: 16683770
Bug: 17035257
Change-Id: I7aef543c47214cc2854d143167b02f1603cf8bea

10 years agoMerge "stagefright: Do not add silence data for compress offload" into lmp-dev
Ronghua Wu [Mon, 18 Aug 2014 22:34:34 +0000 (22:34 +0000)]
Merge "stagefright: Do not add silence data for compress offload" into lmp-dev

10 years agomerge in lmp-release history after reset to 426c719a5f3b4d88480eb35a7b0b373f672ea3cb
The Android Automerger [Mon, 18 Aug 2014 13:09:45 +0000 (06:09 -0700)]
merge in lmp-release history after reset to 426c719a5f3b4d88480eb35a7b0b373f672ea3cb

10 years agomerge in lmp-release history after reset to 426c719a5f3b4d88480eb35a7b0b373f672ea3cb
The Android Automerger [Sun, 17 Aug 2014 14:17:47 +0000 (07:17 -0700)]
merge in lmp-release history after reset to 426c719a5f3b4d88480eb35a7b0b373f672ea3cb

10 years agoMerge "Don't crash for bitstream errors in AMPEG4ElementaryAssembler" into lmp-dev
Chong Zhang [Wed, 20 Aug 2014 00:41:05 +0000 (00:41 +0000)]
Merge "Don't crash for bitstream errors in AMPEG4ElementaryAssembler" into lmp-dev

10 years agoDon't crash for bitstream errors in AMPEG4ElementaryAssembler
Chong Zhang [Tue, 19 Aug 2014 23:53:42 +0000 (16:53 -0700)]
Don't crash for bitstream errors in AMPEG4ElementaryAssembler

Bug: 17110981
Change-Id: I0d0960fa12f2ad179231494be29af307de217b2a

10 years agoMerge "stagefright: add codec capability info for google audio codecs" into lmp-dev
Lajos Molnar [Mon, 18 Aug 2014 17:33:37 +0000 (17:33 +0000)]
Merge "stagefright: add codec capability info for google audio codecs" into lmp-dev

10 years agouse dedicated looper for GenericSource
Chong Zhang [Wed, 13 Aug 2014 04:25:48 +0000 (21:25 -0700)]
use dedicated looper for GenericSource

- handle setVideoSurface in deferred action, and return
  to client immediately

- handle GenericSource's prepareAsync on its own looper,
  instead of sharing looper with NuPlayer

- let HTTPLiveSource share looper with LiveSession, instead
  of NuPlayer

- remove reflector in RTSPSource

Bug: 16892748
Change-Id: I1aed557320052012065f5a90adbcb03c238da988

10 years agostagefright: Fix race condition between MediaCodec and SoftwareRenderer
Ronghua Wu [Fri, 8 Aug 2014 22:24:55 +0000 (15:24 -0700)]
stagefright: Fix race condition between MediaCodec and SoftwareRenderer

* Set the buffer's format info when it's returned from OMX component.
* Move frame format meta from SoftwareRenderer's ctor to the render call.
  I.e. each frame sent to the renderer carries the format info.
* Reset renderer with the new format instead of re-creating
  SoftwareRenderer when incoming frame's format is changed.

Bug: 13842676
Change-Id: Ibab46f109200bcbdeab13a4cc1bcd0870f2a99fb

10 years agoMerge "use dedicated looper for GenericSource" into lmp-dev
Chong Zhang [Fri, 15 Aug 2014 19:13:23 +0000 (19:13 +0000)]
Merge "use dedicated looper for GenericSource" into lmp-dev

10 years agoMerge "stagefright: allow specifying flac copmression level by 'complexity'" into...
Lajos Molnar [Fri, 15 Aug 2014 14:55:50 +0000 (14:55 +0000)]
Merge "stagefright: allow specifying flac copmression level by 'complexity'" into lmp-dev

10 years agoMerge "stagefright/media: add support for codec features with text value" into lmp-dev
Lajos Molnar [Fri, 15 Aug 2014 14:48:45 +0000 (14:48 +0000)]
Merge "stagefright/media: add support for codec features with text value" into lmp-dev

10 years agoMerge "nuplayer: create AudioSink early to verify offload is possible" into lmp-dev
Andy Hung [Fri, 15 Aug 2014 05:34:52 +0000 (05:34 +0000)]
Merge "nuplayer: create AudioSink early to verify offload is possible" into lmp-dev

10 years agostagefright: add codec capability info for google audio codecs
Lajos Molnar [Fri, 15 Aug 2014 00:42:47 +0000 (17:42 -0700)]
stagefright: add codec capability info for google audio codecs

Bug: 11990470
Change-Id: I6a7d6758727cc205c636dfb19eb7fe99d67fb084

10 years agostagefright: allow specifying flac copmression level by 'complexity'
Lajos Molnar [Fri, 15 Aug 2014 02:55:25 +0000 (19:55 -0700)]
stagefright: allow specifying flac copmression level by 'complexity'

Bug: 11990470
Change-Id: I428961cc654b768773814078f753e2e67243f186

10 years agostagefright/media: add support for codec features with text value
Lajos Molnar [Fri, 15 Aug 2014 02:54:08 +0000 (19:54 -0700)]
stagefright/media: add support for codec features with text value

Bug: 11990470
Change-Id: I7600d999c5f4b6821d825d25fa7e8a2bb5a80c46

10 years agonuplayer: create AudioSink early to verify offload is possible
Andy Hung [Thu, 14 Aug 2014 22:56:34 +0000 (15:56 -0700)]
nuplayer: create AudioSink early to verify offload is possible

Offload audio playback is not guaranteed even if AudioSystem says it
is allowed.  Create AudioSink early to verify offload is really possible.
Move AudioSink open / close into functions.

Bug: 16732303
Bug: 16978805
Change-Id: Ie1c73a96656863c1281bed3280a84b86d3cbadf5

10 years agocameraservice: update supportedFocusModes for api1
Yin-Chia Yeh [Thu, 14 Aug 2014 21:24:24 +0000 (14:24 -0700)]
cameraservice: update supportedFocusModes for api1

Do not list infinity focus mode if the focuser is not calibrated.

bug 13933979

Change-Id: I677ed22305703ac09eeaf986f5bc2a680cececd8

10 years agoMerge "make NuPlayer's http connection mechanism behave more like that of AwesomePlay...
Chong Zhang [Thu, 14 Aug 2014 21:17:50 +0000 (21:17 +0000)]
Merge "make NuPlayer's http connection mechanism behave more like that of AwesomePlayer's" into lmp-dev

10 years agouse dedicated looper for GenericSource
Chong Zhang [Wed, 13 Aug 2014 04:25:48 +0000 (21:25 -0700)]
use dedicated looper for GenericSource

- handle setVideoSurface in deferred action, and return
  to client immediately

- handle GenericSource's prepareAsync on its own looper,
  instead of sharing looper with NuPlayer

- let HTTPLiveSource share looper with LiveSession, instead
  of NuPlayer

- remove reflector in RTSPSource

Bug: 16892748
Change-Id: I1aed557320052012065f5a90adbcb03c238da988

10 years agomake NuPlayer's http connection mechanism behave
Chong Zhang [Wed, 13 Aug 2014 22:26:49 +0000 (15:26 -0700)]
make NuPlayer's http connection mechanism behave
more like that of AwesomePlayer's

- remove cache specific headers before connect

- read mime type before creating cached source on top
  of the http source

Bug: 16892521

Change-Id: Ie13a62dd8dd959be6095a42e2b41e3bc817efeb5

10 years agomerge in lmp-release history after reset to 44a5a202101614302f607228d4357496b350bab4
The Android Automerger [Thu, 14 Aug 2014 13:11:21 +0000 (06:11 -0700)]
merge in lmp-release history after reset to 44a5a202101614302f607228d4357496b350bab4

10 years agomerge in lmp-release history after reset to e6e18e8de729316b3fac7733f9ebc7f1b3feba95
The Android Automerger [Wed, 13 Aug 2014 13:12:12 +0000 (06:12 -0700)]
merge in lmp-release history after reset to e6e18e8de729316b3fac7733f9ebc7f1b3feba95

10 years agoMerge "audiopolicy: add dump for audio patches" into lmp-dev
Jean-Michel Trivi [Wed, 13 Aug 2014 16:04:00 +0000 (16:04 +0000)]
Merge "audiopolicy: add dump for audio patches" into lmp-dev

10 years agoCamera API1: Ignore the video size change during recording
Zhijun He [Mon, 11 Aug 2014 21:47:47 +0000 (14:47 -0700)]
Camera API1: Ignore the video size change during recording

Ignore the video size parameter change when recording is active.

Bug: 16524513
Change-Id: I55b7c961c06199764486f48bc2187838c2279606

10 years agoMerge "cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough" into...
Chong Zhang [Wed, 13 Aug 2014 21:02:11 +0000 (21:02 +0000)]
Merge "cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough" into lmp-dev

10 years agocache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough
Chong Zhang [Wed, 13 Aug 2014 20:48:10 +0000 (13:48 -0700)]
cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough

Bug: 16892521
Change-Id: I0e2da4134a37e632f9f2c29d1d27d8fded7a7863

10 years agoMerge "stagefright: allow scenarios when dequeueBufferFromNativeWindow fails" into...
Lajos Molnar [Wed, 13 Aug 2014 00:30:20 +0000 (00:30 +0000)]
Merge "stagefright: allow scenarios when dequeueBufferFromNativeWindow fails" into lmp-dev

10 years agoFix overruns when capturing with resampling
Glenn Kasten [Mon, 21 Jul 2014 18:22:03 +0000 (11:22 -0700)]
Fix overruns when capturing with resampling

Bug: 16658148
Change-Id: I2dd04b23a143e0948b299d408790e7a46b5a53b0

10 years agostagefright: allow scenarios when dequeueBufferFromNativeWindow fails
Lajos Molnar [Tue, 12 Aug 2014 17:28:12 +0000 (10:28 -0700)]
stagefright: allow scenarios when dequeueBufferFromNativeWindow fails

We can run out of native buffers when the bufferqueue is abandoned.

Bug: 16839124
Change-Id: If605f692b87082f1630e1da0fd44da0cb76133f5

10 years agoMerge "Camera API1: Ignore the video size change during recording" into lmp-dev
Zhijun He [Tue, 12 Aug 2014 17:37:53 +0000 (17:37 +0000)]
Merge "Camera API1: Ignore the video size change during recording" into lmp-dev

10 years agoMerge "MediaCodecList: handle errors gracefully" into lmp-dev
Lajos Molnar [Tue, 12 Aug 2014 17:05:56 +0000 (17:05 +0000)]
Merge "MediaCodecList: handle errors gracefully" into lmp-dev

10 years agoMediaCodecList: don't return references
Lajos Molnar [Tue, 12 Aug 2014 15:55:25 +0000 (08:55 -0700)]
MediaCodecList: don't return references

Bug: 16905025
Change-Id: I5b42b294f0cc785b8e4dda0e82c8f8377a46f487

10 years agoMediaCodecList: handle errors gracefully
Lajos Molnar [Mon, 11 Aug 2014 23:46:15 +0000 (16:46 -0700)]
MediaCodecList: handle errors gracefully

Handle missing OMX codecs, and codecs that do not load.
Fix NULL dereference when initializing codec with no type.

Bug: 16907578
Bug: 16905025
Change-Id: I5d103db36ebb029d1aab03222bf6e9324beb1566

10 years agoCamera API1: Ignore the video size change during recording
Zhijun He [Mon, 11 Aug 2014 21:47:47 +0000 (14:47 -0700)]
Camera API1: Ignore the video size change during recording

Ignore the video size parameter change when recording is active.

Bug: 16524513
Change-Id: I55b7c961c06199764486f48bc2187838c2279606

10 years agoMerge "propogate heartbeat error code to app" into lmp-dev
Chong Zhang [Tue, 12 Aug 2014 00:22:47 +0000 (00:22 +0000)]
Merge "propogate heartbeat error code to app" into lmp-dev

10 years agopropogate heartbeat error code to app
Chong Zhang [Mon, 11 Aug 2014 22:14:10 +0000 (15:14 -0700)]
propogate heartbeat error code to app

Bug: 16885604
Change-Id: Ib6c60f0ef8cf72aa1aac67a75121142bff304018

10 years agoMerge "Extend downsampling ratios greater than 2:1" into lmp-dev
Andy Hung [Mon, 11 Aug 2014 20:26:28 +0000 (20:26 +0000)]
Merge "Extend downsampling ratios greater than 2:1" into lmp-dev

10 years agoMerge "camera: Allow Camera#getParameters to be called by mediaserver anytime" into...
Igor Murashkin [Mon, 11 Aug 2014 19:47:12 +0000 (19:47 +0000)]
Merge "camera: Allow Camera#getParameters to be called by mediaserver anytime" into lmp-dev

10 years agoMerge "Fix to support mono in effect buffer allocation." into lmp-dev
Ricardo Garcia [Tue, 12 Aug 2014 16:04:45 +0000 (16:04 +0000)]
Merge "Fix to support mono in effect buffer allocation." into lmp-dev

10 years agoFix to support mono in effect buffer allocation.
Ricardo Garcia [Mon, 11 Aug 2014 19:04:54 +0000 (12:04 -0700)]
Fix to support mono in effect buffer allocation.

Since effects are now enabled for recording, mono cases are possible
and needed to be correctly allocated.

Bug: 16917961
Change-Id: I760fc421f9f90fabb3f0deadd5f9dc61cd284371

10 years agoExtend downsampling ratios greater than 2:1
Andy Hung [Thu, 7 Aug 2014 18:04:34 +0000 (11:04 -0700)]
Extend downsampling ratios greater than 2:1

Also improve robustness to choice of sampling rate or buffer size
such that increasing either by 10x does not cause overflow.

Bug: 12979141
Bug: 15933066
Change-Id: If7989bd745d1bee3bdf811b8b7c978543ccafb65

10 years agoMerge "Camera2/3: Cleanup the jpeg buffer size calcaulation logic" into lmp-dev
Zhijun He [Mon, 11 Aug 2014 17:33:48 +0000 (17:33 +0000)]
Merge "Camera2/3: Cleanup the jpeg buffer size calcaulation logic" into lmp-dev

10 years agoMerge "Update audio ports with profile capabilities" into lmp-dev
Jean-Michel Trivi [Mon, 11 Aug 2014 17:22:38 +0000 (17:22 +0000)]
Merge "Update audio ports with profile capabilities" into lmp-dev

10 years agoCamera2/3: Cleanup the jpeg buffer size calcaulation logic
Zhijun He [Fri, 8 Aug 2014 19:00:47 +0000 (12:00 -0700)]
Camera2/3: Cleanup the jpeg buffer size calcaulation logic

- Only one place calculating the jpeg size-the device layer, Camera2Device and
Camera3Device.
- Remove size argument for CameraDeviceBase and cleanup related code.

Bug: 14327010
Change-Id: I45d2ab4859ee0cc9273e579254f0569108c748f1

10 years agoUpdate audio ports with profile capabilities
Jean-Michel Trivi [Sun, 10 Aug 2014 21:30:48 +0000 (14:30 -0700)]
Update audio ports with profile capabilities

When opening an output, import the profile capabilities associated
  with the device into the AudioPort.

Bug 10549017

Change-Id: If102f5623457542d2c1407ada303c71e43d19a08

10 years agoaudiopolicy: add dump for audio patches
Eric Laurent [Sun, 10 Aug 2014 21:07:09 +0000 (14:07 -0700)]
audiopolicy: add dump for audio patches

Bug: 10549017.
Change-Id: I896c8e16c8cf7490bab75295903620a76236f571

10 years agoNuPlayer: add support for proper stop
Lajos Molnar [Thu, 15 Aug 2013 22:59:19 +0000 (15:59 -0700)]
NuPlayer: add support for proper stop

MediaPlayer.stop() should move to the Stopped state which is
semantically identical to the Initialized state.

Bug: 13138230
Change-Id: I5d7b4a22533f545c24a18e2cd9f7cb2685d42c84
Signed-off-by: Lajos Molnar <lajos@google.com>
10 years agoMerge changes Idc9808f7,If7bc8e5b into lmp-dev
Dan Albert [Sat, 9 Aug 2014 06:46:47 +0000 (06:46 +0000)]
Merge changes Idc9808f7,If7bc8e5b into lmp-dev

* changes:
  Fix the build after -Bsymbolic fix.
  Fix PIC relocations for non-Bsymbolic builds

10 years agoMerge "NuPlayer: getSelectedTrack" into lmp-dev
Robert Shih [Sat, 9 Aug 2014 01:47:09 +0000 (01:47 +0000)]
Merge "NuPlayer: getSelectedTrack" into lmp-dev

10 years agoNuPlayer: getSelectedTrack
Robert Shih [Thu, 10 Jul 2014 01:53:31 +0000 (18:53 -0700)]
NuPlayer: getSelectedTrack

Change-Id: If5251f89b881e7f268e11a06cd3685d794c958b6

10 years agoMerge "stagefright: set crop rect in SoftwareRenderer" into lmp-dev
Lajos Molnar [Sat, 9 Aug 2014 02:01:37 +0000 (02:01 +0000)]
Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-dev

10 years agostagefright: set crop rect in SoftwareRenderer
Lajos Molnar [Fri, 8 Aug 2014 17:05:03 +0000 (10:05 -0700)]
stagefright: set crop rect in SoftwareRenderer

Bug: 9563986
Change-Id: Id66a21ef8cdd8350e3eb95d6359fe9c1b94c4f98

10 years agoMerge "Added Tunneled video playback support to ACodec" into lmp-dev
Rachad [Sat, 9 Aug 2014 04:56:42 +0000 (04:56 +0000)]
Merge "Added Tunneled video playback support to ACodec" into lmp-dev

10 years agoAdded Tunneled video playback support to ACodec
Rachad [Tue, 29 Jul 2014 23:47:56 +0000 (16:47 -0700)]
Added Tunneled video playback support to ACodec

Bug:16132368
Change-Id: I88d2d66b8548fc203f4a2c4797196af15e56ff38

10 years agoMerge "audio policy: enable more than one sink per audio patch." into lmp-dev
Eric Laurent [Sat, 9 Aug 2014 00:50:59 +0000 (00:50 +0000)]
Merge "audio policy: enable more than one sink per audio patch." into lmp-dev

10 years agoMerge "Fix WAVExtractor to output full audio frames only" into lmp-dev
Lajos Molnar [Sat, 9 Aug 2014 01:53:46 +0000 (01:53 +0000)]
Merge "Fix WAVExtractor to output full audio frames only" into lmp-dev

10 years agoaudio policy: enable more than one sink per audio patch.
Eric Laurent [Fri, 8 Aug 2014 22:13:39 +0000 (15:13 -0700)]
audio policy: enable more than one sink per audio patch.

Allow creation of audio patches with more than one sink.
More than one sink is enabled when:
- Connecting an input device to output devices on the same audio HW module.
- Connecting an output mix to output devices on the same audio HA module.

All other patches are limited to one sink.

Bug: 16879363.
Change-Id: I95be6948ef29df64e51e5b8ace38c2db7f3e89f2

10 years agoFix WAVExtractor to output full audio frames only
Andy Hung [Fri, 8 Aug 2014 22:52:38 +0000 (15:52 -0700)]
Fix WAVExtractor to output full audio frames only

Fixes NuPlayer crash from MediaBuffers ending in partial audio frames.

Bug: 16881623
Change-Id: Ia80a9910f99245e645860c00ae85118cc85bef57

10 years agosome clean up of video size change notification
Chong Zhang [Fri, 8 Aug 2014 22:22:35 +0000 (15:22 -0700)]
some clean up of video size change notification

need to consider rotation when notifying video size change after
initial prepare, in addition to after an output format change.

Bug: 16870964
Change-Id: Icd1c9e901ac932e720ce95b8a983c0edcf251c35

10 years agoMerge "some clean up of video size change notification" into lmp-dev
Chong Zhang [Fri, 8 Aug 2014 23:01:06 +0000 (23:01 +0000)]
Merge "some clean up of video size change notification" into lmp-dev

10 years agoMerge "AAC decoder: add support for controlling presentation parameters" into lmp-dev
Jean-Michel Trivi [Fri, 8 Aug 2014 21:05:14 +0000 (21:05 +0000)]
Merge "AAC decoder: add support for controlling presentation parameters" into lmp-dev