OSDN Git Service

android-x86/frameworks-av.git
11 years agoCamera3: Refactor stream code to be DRY
Igor Murashkin [Thu, 9 May 2013 01:03:15 +0000 (18:03 -0700)]
Camera3: Refactor stream code to be DRY

Bug: 8851039
Change-Id: Iaac2926bfa25dd6e9db8b307765d4fe709b88d21

11 years agocamera3: Manage fences properly when buffers are returned with an error
Igor Murashkin [Tue, 7 May 2013 17:58:13 +0000 (10:58 -0700)]
camera3: Manage fences properly when buffers are returned with an error

Bug: 8622089
Change-Id: I4df0258d6803d460d4dd98f0a80829eb844ca30d

11 years agoMerge "Camera: Hotplug - conditionally transition to PRESENT when clients disconnect...
Igor Murashkin [Tue, 7 May 2013 23:42:30 +0000 (23:42 +0000)]
Merge "Camera: Hotplug - conditionally transition to PRESENT when clients disconnect" into jb-mr2-dev

11 years agoFix Audioflinger crash when TeeSink is enabled
Glenn Kasten [Mon, 6 May 2013 23:06:24 +0000 (16:06 -0700)]
Fix Audioflinger crash when TeeSink is enabled

Bug: 8834855
Change-Id: I54665f16d79901970348a8247d9a354da2990f42

11 years agoMerge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev
Igor Murashkin [Mon, 6 May 2013 03:20:18 +0000 (03:20 +0000)]
Merge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev

11 years agoMerge "camera3: Don't eagerly finish configuring bidi streams more than once" into...
Igor Murashkin [Mon, 6 May 2013 03:18:23 +0000 (03:18 +0000)]
Merge "camera3: Don't eagerly finish configuring bidi streams more than once" into jb-mr2-dev

11 years agoMerge "Remove timing jitter during startup of audio" into jb-mr2-dev
Eric Laurent [Fri, 3 May 2013 15:39:52 +0000 (15:39 +0000)]
Merge "Remove timing jitter during startup of audio" into jb-mr2-dev

11 years agoCamera: Hotplug - conditionally transition to PRESENT when clients disconnect
Igor Murashkin [Wed, 1 May 2013 22:42:20 +0000 (15:42 -0700)]
Camera: Hotplug - conditionally transition to PRESENT when clients disconnect

Fixes an issue where a client could unconditionally transition to PRESENT
after a client disconnects, even though the underlying HAL status was actually
NOT_PRESENT or ENUMERATING.

Bug: 8780114
Change-Id: I68adb5fc819eec3b046ddcb2507b84bedc999a0f

11 years agocamera: Use new camera_metadata structure validation functions
Igor Murashkin [Wed, 1 May 2013 01:18:06 +0000 (18:18 -0700)]
camera: Use new camera_metadata structure validation functions

* Reject unvalidated metadata across binder boundaries
* Sanity check in-process CameraMetadata when mutating data

Bug: 8713951
Change-Id: I121d8e15f8fdc9cdbbaf27dfd947813e11831e1c

11 years agoMerge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb...
Igor Murashkin [Thu, 2 May 2013 23:03:48 +0000 (23:03 +0000)]
Merge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb-mr2-dev

11 years agocamera3: Don't eagerly finish configuring bidi streams more than once
Igor Murashkin [Thu, 2 May 2013 21:59:28 +0000 (14:59 -0700)]
camera3: Don't eagerly finish configuring bidi streams more than once

Finishing all stream configuration immediately is good, but when a stream is
both input and output it attempted to finish configuring bidi streams twice.
Since all ZSL streams are bidi, when we had a ZSL stream active preview would
immediately stop working.

Bug: 8563838
Change-Id: Iec998f11f6405fc15f3f31bd7cd29f03a7968d14

11 years agoA reference to the psi section data could become invalid if more
Andreas Huber [Mon, 29 Apr 2013 20:17:50 +0000 (13:17 -0700)]
A reference to the psi section data could become invalid if more

sections were added to the KeyedVector.

Change-Id: I095b5452ccfad89d69fc502fb21ce39495e201c3
related-to-bug: 8754565

11 years agoMerge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev
Eino-Ville Talvala [Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)]
Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev

11 years agoMerge "The software FLAC encoder now properly signals an error if client" into jb...
Andreas Huber [Thu, 2 May 2013 21:17:20 +0000 (21:17 +0000)]
Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev

11 years agoMerge "Don't even try to verify the native resolution validity a" into jb-mr2-dev
Andreas Huber [Thu, 2 May 2013 21:16:23 +0000 (21:16 +0000)]
Merge "Don't even try to verify the native resolution validity a" into jb-mr2-dev

11 years agoMerge "Fix miracast source code to ignore the encoder output format change" into...
Andreas Huber [Thu, 2 May 2013 21:16:08 +0000 (21:16 +0000)]
Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev

11 years agocamera3: Don't crash when taking a still capture with ZSL disabled
Igor Murashkin [Thu, 2 May 2013 18:53:00 +0000 (11:53 -0700)]
camera3: Don't crash when taking a still capture with ZSL disabled

Bug: 8790212
Change-Id: I4bf7ac5ab856b0ea1738844182efb86137e14083

11 years agoMerge "Fix reverb at 48kHz" into jb-mr2-dev
Eric Laurent [Wed, 1 May 2013 23:53:44 +0000 (23:53 +0000)]
Merge "Fix reverb at 48kHz" into jb-mr2-dev

11 years agoFix reverb at 48kHz
Eric Laurent [Wed, 1 May 2013 23:15:49 +0000 (16:15 -0700)]
Fix reverb at 48kHz

The LVM reverb wrapper had a test to only accept input
sampling rate of 44.1 kHz. As the LVM reberb engine
supports multiple sampling rate we can remove this test.

The fix for issue 8512027 (commit 2a9c5cd4) caused a regression
because the framework now checks the return code of the effect
configure command and ignores subsequent commands in case of error.

Bug: 8630044
Change-Id: I3146871f1ad8f7945a2e63ea763dd7b87368337d

11 years agoFix miracast source code to ignore the encoder output format change
Andreas Huber [Wed, 1 May 2013 23:03:28 +0000 (16:03 -0700)]
Fix miracast source code to ignore the encoder output format change

it doesn't care about.

Change-Id: Iec1594775a98b0c1aba662cc9f08652d2f8d4805
related-to-bug: 8616651

11 years agoCamera2/3: Fix still image FOV reporting.
Eino-Ville Talvala [Mon, 29 Apr 2013 20:50:24 +0000 (13:50 -0700)]
Camera2/3: Fix still image FOV reporting.

Still FOV can vary as a function of the output sizes, with
the function depending on the HAL version.

Calculate and update the FOV whenever the output sizes might change.

Bug: 8484377
Change-Id: I56f2cc768a1e128a159b326588be55b2752db06e

11 years agoMerge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev
Andreas Huber [Wed, 1 May 2013 21:47:29 +0000 (21:47 +0000)]
Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev

11 years agoDon't even try to verify the native resolution validity a
Andreas Huber [Wed, 1 May 2013 21:13:26 +0000 (14:13 -0700)]
Don't even try to verify the native resolution validity a

miracast sink advertises, even if it were valid we couldn't use it
since it's not consistently implemented by sinks.

Change-Id: Ibee6b3e23b5a55270fc3c419a581e2626530e3af
related-to-bug: 8772006

11 years agoThe software FLAC encoder now properly signals an error if client
Andreas Huber [Wed, 1 May 2013 20:58:36 +0000 (13:58 -0700)]
The software FLAC encoder now properly signals an error if client

attempts to configure it with too large an input buffer size.
Previously this would lead to memory corruption during encoding due to a
typo.

Change-Id: I229b07b7dbe87fb8424419706671b66a8d58ec6b
related-to-bug: 8778893

11 years agoMerge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-dev
Igor Murashkin [Wed, 1 May 2013 18:25:44 +0000 (18:25 +0000)]
Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-dev

11 years agoCamera3: Add missing buffer listener include (for ZSL)
Igor Murashkin [Wed, 1 May 2013 18:18:40 +0000 (11:18 -0700)]
Camera3: Add missing buffer listener include (for ZSL)

Bug: 8563838
Change-Id: Ie053655f5583d20003abdabccee68980d7cdcbfd

11 years agoMerge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
Igor Murashkin [Wed, 1 May 2013 17:48:57 +0000 (17:48 +0000)]
Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev

* changes:
  Camera3: Add ZSL stream support
  camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
  Camera3: Add input stream support

11 years agoSupport MediaCodec::getOutputFormat for encoders
Andreas Huber [Tue, 30 Apr 2013 23:08:47 +0000 (16:08 -0700)]
Support MediaCodec::getOutputFormat for encoders

codec specific data is provided as part of the MediaFormat if available.

Change-Id: I5a79c936e2411fe66ebc694791071faefc33941e
related-to-bug: 8616651

11 years agoCamera: Don't complain repeatedly about missing android.led.availableLeds
Igor Murashkin [Tue, 30 Apr 2013 20:06:15 +0000 (13:06 -0700)]
Camera: Don't complain repeatedly about missing android.led.availableLeds

Bug: 8765726
Change-Id: I78f5f98315068aaad3a39d56698b9c8a18cc8f4a

11 years agoCamera3: Add ZSL stream support
Igor Murashkin [Mon, 22 Apr 2013 21:03:54 +0000 (14:03 -0700)]
Camera3: Add ZSL stream support

Bug: 8563838

Change-Id: I2feda142ff5172aba17ade5c8d502f9bb5d5b766

11 years agocamera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Igor Murashkin [Mon, 29 Apr 2013 17:31:06 +0000 (10:31 -0700)]
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames

Bug: 8563838
Change-Id: I5a95e0be94e5388b30639905efae42d3c3279f72

11 years agoMerge "ProCamera: Add security permission checks for disabling transmit LED" into...
Igor Murashkin [Sat, 27 Apr 2013 00:43:13 +0000 (00:43 +0000)]
Merge "ProCamera: Add security permission checks for disabling transmit LED" into jb-mr2-dev

11 years agoMerge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev
Eino-Ville Talvala [Sat, 27 Apr 2013 00:10:38 +0000 (00:10 +0000)]
Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev

11 years agoCamera3: Add input stream support
Igor Murashkin [Mon, 15 Apr 2013 21:59:22 +0000 (14:59 -0700)]
Camera3: Add input stream support

- Untested with actual CAMERA3_STREAM_INPUT streams.

Bug: 8629088

Change-Id: Ia0c21ef0a2c951e401ea8babd15d3cceb4bb25a1

11 years agoCamera2: Fix deadlock on shutdown due to client getting killed.
Eino-Ville Talvala [Tue, 23 Apr 2013 22:16:57 +0000 (15:16 -0700)]
Camera2: Fix deadlock on shutdown due to client getting killed.

When the binder connection dies and is the only holder of a strong
pointer to the Camera2Client, disconnect is called from the
destructor. At this point, all weak pointers to Camera2Client are no
longer promotable, and lots of cleanup code paths are broken as a
result.

Rework all such code paths to not need the client pointer, and to
discard image buffers that arrive during shutdown.

Bug: 8696047
Change-Id: Ic0672ecde7c1baaf65079f925a45bd5be45f1fb3

11 years agoMerge "Handle the case where an asynchronous prepare was initiated and then" into...
Andreas Huber [Thu, 25 Apr 2013 22:32:19 +0000 (22:32 +0000)]
Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev

11 years agoHandle the case where an asynchronous prepare was initiated and then
Andreas Huber [Thu, 25 Apr 2013 22:11:19 +0000 (15:11 -0700)]
Handle the case where an asynchronous prepare was initiated and then

the mediaplayer was reset.

Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41
related-to-bug: 8688986

11 years agoProCamera: Add security permission checks for disabling transmit LED
Igor Murashkin [Tue, 23 Apr 2013 21:51:29 +0000 (14:51 -0700)]
ProCamera: Add security permission checks for disabling transmit LED

Bug: 8554573
Change-Id: Ie909908a4cab3700bd622282e8342e8fa5b72376

11 years agoaudioflinger: fix duplicating track sampling rate
Eric Laurent [Thu, 25 Apr 2013 19:56:18 +0000 (12:56 -0700)]
audioflinger: fix duplicating track sampling rate

Add missing initialization of client proxy sampling rate
and volumes in OutputTrack constructor.

Bug: 8687522
Change-Id: I813e700315bb97083a63dd32279f1998ac775483

11 years agoMerge "Remove all traces of wifi display sink implementation and supporting code...
Andreas Huber [Wed, 24 Apr 2013 15:42:23 +0000 (15:42 +0000)]
Merge "Remove all traces of wifi display sink implementation and supporting code." into jb-mr2-dev

11 years agoRemove timing jitter during startup of audio
Glenn Kasten [Tue, 23 Apr 2013 19:39:37 +0000 (12:39 -0700)]
Remove timing jitter during startup of audio

This fixes a regression introduced recently, that increased timing jitter
during the startup of the FastMixer and AudioTrack callback threads.

The regression was to make requestPriority() asynchronous as a way to
avoid an apparent priority inversion in system_server.  This means that
the target thread could run briefly with the initial priority, before
the new priority takes effect.

This change removes the startup jitter for FastMixer, by making the
requestPriority() synchronous again for that case.  It doesn't matter
that this restores the priority inversion involving normal mixer thread,
because it happens during startup of both threads.

The change also removes the startup jitter for the AudioTrack callback
thread, by having the target thread check whether the requestPriority()
has completed yet.  If not, the target thread blocks with a timeout
until the priority boost finishes.

Finally, we now log an error message if the expected priority boost
doesn't happen.

Bug: 8698989
Change-Id: Id590e9a274b70ec1ba85b44a585ee37a22e41cbc

11 years agoRemove all traces of wifi display sink implementation and supporting code.
Andreas Huber [Tue, 23 Apr 2013 20:47:46 +0000 (13:47 -0700)]
Remove all traces of wifi display sink implementation and supporting code.

Change-Id: I64b681b7e3df1ef0dd80c0d261cacae293d5e684
related-to-bug: 8698812

11 years agoMerge "Camera3: Register all stream buffers at stream configuration time." into jb...
Eino-Ville Talvala [Tue, 23 Apr 2013 16:16:35 +0000 (16:16 +0000)]
Merge "Camera3: Register all stream buffers at stream configuration time." into jb-mr2-dev

11 years agoMerge "3rd time's the charm, right? Fix another instance where MediaCodec would"...
Andreas Huber [Mon, 22 Apr 2013 16:15:51 +0000 (16:15 +0000)]
Merge "3rd time's the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev

11 years agoCamera3: Register all stream buffers at stream configuration time.
Eino-Ville Talvala [Sat, 20 Apr 2013 00:26:13 +0000 (17:26 -0700)]
Camera3: Register all stream buffers at stream configuration time.

While registering them later would be nice for startup time, current
hardware will have to reinitialize everything, resulting in glitches.

Bug: 8657740
Change-Id: I1ed1f0a65d648f219f5228c8df15ffcf2a4b272e

11 years agoMerge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev
Igor Murashkin [Fri, 19 Apr 2013 23:46:38 +0000 (23:46 +0000)]
Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev

11 years agoMerge "A flush of a video decoder connected to a native window must reclaim" into...
Andreas Huber [Fri, 19 Apr 2013 21:39:36 +0000 (21:39 +0000)]
Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev

11 years ago3rd time's the charm, right? Fix another instance where MediaCodec would
Andreas Huber [Fri, 19 Apr 2013 21:33:45 +0000 (14:33 -0700)]
3rd time's the charm, right? Fix another instance where MediaCodec would

not return from a stop() or release() call if mediaserver dies at just the right
moment.

Change-Id: I7728f8df82d62602d4d272f8023aa88678dd7d95
related-to-bug: 8397711

11 years agoA flush of a video decoder connected to a native window must reclaim
Andreas Huber [Fri, 19 Apr 2013 18:55:18 +0000 (11:55 -0700)]
A flush of a video decoder connected to a native window must reclaim

output buffers already queued for rendering before considering a flush
completed. Otherwise the decoder may not have enough output buffers to
continue decoding after the discontinuity and we'll never dequeue more
from the native window.

Change-Id: I42e275dc336568e180081c6d7c0dc05fc9637c79
related-to-bug: 8578467

11 years agoMerge "Fix error message to match CTS" into jb-mr2-dev
Glenn Kasten [Fri, 19 Apr 2013 16:23:55 +0000 (16:23 +0000)]
Merge "Fix error message to match CTS" into jb-mr2-dev

11 years agoMerge "Use correct pid when running under test harness" into jb-mr2-dev
Glenn Kasten [Fri, 19 Apr 2013 16:23:42 +0000 (16:23 +0000)]
Merge "Use correct pid when running under test harness" into jb-mr2-dev

11 years agoMerge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into...
Andreas Huber [Fri, 19 Apr 2013 15:34:03 +0000 (15:34 +0000)]
Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev

11 years agoMerge "Fix sample info parsing" into jb-mr2-dev
Marco Nelissen [Fri, 19 Apr 2013 14:58:42 +0000 (14:58 +0000)]
Merge "Fix sample info parsing" into jb-mr2-dev

11 years agoOMXNodeInstance: actually fix OMX_GetExtIndex logging
Jamie Gennis [Thu, 18 Apr 2013 23:34:44 +0000 (16:34 -0700)]
OMXNodeInstance: actually fix OMX_GetExtIndex logging

Bug: 8538872
Change-Id: I228746e8eb502af4bba4054caa4d8569fab35025

11 years agoUse correct pid when running under test harness
Glenn Kasten [Tue, 16 Apr 2013 19:35:20 +0000 (12:35 -0700)]
Use correct pid when running under test harness

This is a partial fix which addresses one of the root causes of this bug,
but only when running under test harness.  It has no effect otherwise.

Bug: 8598539
Change-Id: I87444daef1d76b17544f331e651ba1c87893c381

11 years agoFix error message to match CTS
Glenn Kasten [Thu, 18 Apr 2013 22:26:47 +0000 (15:26 -0700)]
Fix error message to match CTS

Bug: 8657725
Change-Id: Ib608eb55f14d557d667f93e4f646c03d5ea470c1

11 years agoFix ProCameraTests to pass on Wolfie, disabling failing tests
Igor Murashkin [Thu, 18 Apr 2013 18:53:35 +0000 (11:53 -0700)]
Fix ProCameraTests to pass on Wolfie, disabling failing tests

Note: tests fail in racy conditions, but we don't occur those conditions
in practice in other consumers of ProCamera.

Bug: 8654735
Change-Id: Ic73395ad564031a6b30ad99762dee59f9c35cecf

11 years agoMake sure MediaCodec::stop() and MediaCodec::release() still return
Andreas Huber [Thu, 18 Apr 2013 20:24:17 +0000 (13:24 -0700)]
Make sure MediaCodec::stop() and MediaCodec::release() still return

instead of blocking indefinitely if the mediaserver died while the call
is pending.

Change-Id: If2789b7fe99634d947ce4a3bb69c04baff5f8b10
related-to-bug: 8397711

11 years agoFix sample info parsing
Marco Nelissen [Wed, 17 Apr 2013 18:49:11 +0000 (11:49 -0700)]
Fix sample info parsing

b/8626561

Change-Id: Ibd5168282eb33d1abdc423e15a0d9aeb5a1ad687

11 years agoMerge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev
Jeff Tinker [Thu, 18 Apr 2013 00:53:55 +0000 (00:53 +0000)]
Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev

11 years agoAdd new error codes for DRM to improve error reporting
Jeff Tinker [Wed, 17 Apr 2013 23:12:27 +0000 (16:12 -0700)]
Add new error codes for DRM to improve error reporting

bug: 8621516
Change-Id: I9a06c9ea5bfde924906d3876a417b9451b6abde8

11 years agoMerge "Make sure the drain buffer is big enough" into jb-mr2-dev
Marco Nelissen [Wed, 17 Apr 2013 22:38:19 +0000 (22:38 +0000)]
Merge "Make sure the drain buffer is big enough" into jb-mr2-dev

11 years agoMerge "Apparently the mp3 decoder glitches if it was configured with the wrong" into...
Andreas Huber [Wed, 17 Apr 2013 22:35:28 +0000 (22:35 +0000)]
Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev

11 years agoMerge "Fix a typo that would cause us not to shutdown/flush the decoders in" into...
Andreas Huber [Wed, 17 Apr 2013 19:52:41 +0000 (19:52 +0000)]
Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev

11 years agoMerge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev
Andreas Huber [Wed, 17 Apr 2013 19:52:14 +0000 (19:52 +0000)]
Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev

11 years agoApparently the mp3 decoder glitches if it was configured with the wrong
Andreas Huber [Tue, 16 Apr 2013 23:35:19 +0000 (16:35 -0700)]
Apparently the mp3 decoder glitches if it was configured with the wrong

sample rate. Make sure we tell it about the one the extractor provides.

Change-Id: Ice5b9cf55485ca1a8f099a14be0202be9540e781
related-to-bug: 8621639

11 years agoMerge "Added CTS test for secure stop APIs" into jb-mr2-dev
Jeff Tinker [Wed, 17 Apr 2013 16:16:39 +0000 (16:16 +0000)]
Merge "Added CTS test for secure stop APIs" into jb-mr2-dev

11 years agoAdded CTS test for secure stop APIs
Jeff Tinker [Mon, 8 Apr 2013 22:23:17 +0000 (15:23 -0700)]
Added CTS test for secure stop APIs

bug: 8604418

Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365

11 years agoMake sure the drain buffer is big enough
Marco Nelissen [Tue, 16 Apr 2013 22:57:38 +0000 (15:57 -0700)]
Make sure the drain buffer is big enough

b/8614909

Change-Id: I9d973dcd74100b793791359c262b821207ff9ddd

11 years agoFix a typo that would cause us not to shutdown/flush the decoders in
Andreas Huber [Tue, 16 Apr 2013 17:54:03 +0000 (10:54 -0700)]
Fix a typo that would cause us not to shutdown/flush the decoders in

some cases.

related-to-bug: 8630032

Change-Id: I8e94b53b34e137e827e9630c65f3252ea91e4ebd

11 years agoMerge "Camera3: Allow multiple process_capture_result calls per request" into jb...
Eino-Ville Talvala [Tue, 16 Apr 2013 17:26:38 +0000 (17:26 +0000)]
Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev

11 years agoParse the last none-empty line of .m3u8 file
Sungsoo Lim [Mon, 31 Dec 2012 08:48:20 +0000 (17:48 +0900)]
Parse the last none-empty line of .m3u8 file

If the last sentence of .m3u8 file is not processed, because
it is not empty and has no line feed, M3UParser.isComplete()
returns false even though it is completed.

Change-Id: I01b9f900d44247a3ef40369a2f9198bb7eaf01b7
related-to-bug: 8405824

11 years agoMerge "Guard against mLooper == NULL." into jb-mr2-dev
Andreas Huber [Tue, 16 Apr 2013 16:15:14 +0000 (16:15 +0000)]
Merge "Guard against mLooper == NULL." into jb-mr2-dev

11 years agoMerge "Better default AAC DRC setting" into jb-mr2-dev
Jean-Michel Trivi [Tue, 16 Apr 2013 15:42:00 +0000 (15:42 +0000)]
Merge "Better default AAC DRC setting" into jb-mr2-dev

11 years agoBetter default AAC DRC setting
Jean-Michel Trivi [Tue, 16 Apr 2013 01:40:51 +0000 (18:40 -0700)]
Better default AAC DRC setting

By default, use boost and attenuation together.

bug 7140036

Change-Id: Ie0565f9e5cd24f7a59b5a218b4e6186661832601

11 years agoFix Vorbis decoder reset
Marco Nelissen [Mon, 15 Apr 2013 23:28:49 +0000 (16:28 -0700)]
Fix Vorbis decoder reset

b/8543366

Change-Id: I9f32e96fdfc355cf444259a7c40554e2de184728

11 years agoGuard against mLooper == NULL.
Andreas Huber [Mon, 15 Apr 2013 23:18:56 +0000 (16:18 -0700)]
Guard against mLooper == NULL.

Change-Id: I01aa0e47b55d0dffe34525edf9f055a5cb4dc70f
related-to-bug: 8620223

11 years agoCamera3: Allow multiple process_capture_result calls per request
Eino-Ville Talvala [Tue, 9 Apr 2013 21:13:50 +0000 (14:13 -0700)]
Camera3: Allow multiple process_capture_result calls per request

To simplify HAL implementation, allow the results for a single
capture request to be sent from the HAL across multiple calls
to process_capture_request.

This requires that the HAL must call notify() with the SHUTTER message
to indicate start of exposure time, before the first call to
process_capture_result for a given frame.

Bug: 8565103

Change-Id: I6a61449725f98af88769fafa07736848a226dad2

11 years agoMerge "Fix AAC decoder reconfiguration" into jb-mr2-dev
Marco Nelissen [Mon, 15 Apr 2013 20:42:33 +0000 (20:42 +0000)]
Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev

11 years agoMerge "Workaround: requestPriority() is one-way" into jb-mr2-dev
Glenn Kasten [Mon, 15 Apr 2013 19:07:56 +0000 (19:07 +0000)]
Merge "Workaround: requestPriority() is one-way" into jb-mr2-dev

11 years agoFix AAC decoder reconfiguration
Marco Nelissen [Mon, 15 Apr 2013 19:06:18 +0000 (12:06 -0700)]
Fix AAC decoder reconfiguration

The recent flush() changed made the codec behave differently after
a reconfigure. Now we reset its state properly again.
b/8543366

Change-Id: I8807b5ab02249b43fc1cf315d4e8d4ceb3f9b298

11 years agoMerge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode....
ztenghui [Mon, 15 Apr 2013 18:36:01 +0000 (18:36 +0000)]
Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev

11 years agoMediaMuxer prefer not to use the MPEG4Writer in real time recording mode.
ztenghui [Fri, 12 Apr 2013 20:50:38 +0000 (13:50 -0700)]
MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.

By default, MPEG4Write will keep running in real time recording mode.

bug:8598944

Change-Id: Idf7fbd4e0feb7763660a74279ba8817b79098aaf

11 years agoMerge "Instead of returning an error, return an invalid duration (-1 ms)" into jb...
Andreas Huber [Mon, 15 Apr 2013 15:16:02 +0000 (15:16 +0000)]
Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev

11 years agoMerge "Update the test output path." into jb-mr2-dev
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:30:32 +0000 (01:30 +0000)]
Merge "Update the test output path." into jb-mr2-dev

11 years agoUpdate the test output path.
Yu Shan Emily Lau [Fri, 12 Apr 2013 21:52:52 +0000 (14:52 -0700)]
Update the test output path.

In order for the automated test to pick up the test.
The output must be in /data/nativetest.

Change-Id: Idc15036afb5617ac1ef67ff74ba332c5f73fe155

11 years agoMerge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev
Jamie Gennis [Fri, 12 Apr 2013 17:38:49 +0000 (17:38 +0000)]
Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev

11 years agoMerge "Fix MediaCodec.flush()" into jb-mr2-dev
Marco Nelissen [Fri, 12 Apr 2013 17:20:51 +0000 (17:20 +0000)]
Merge "Fix MediaCodec.flush()" into jb-mr2-dev

11 years agoFix MediaCodec.flush()
Marco Nelissen [Tue, 9 Apr 2013 21:57:38 +0000 (14:57 -0700)]
Fix MediaCodec.flush()

There were two problems here. One was that the skip/cut buffer
wasn't cleared when it should be, and the second was that we
were always sending the first buffer of encoded data to the AAC
decoder twice.
b/8543366

Change-Id: Ic040edabf16cccd1f6ef8c9e5c9cfbacbdd8a089

11 years agoMerge "ACodec now signals an error if the mediaserver died while it is in" into jb...
Andreas Huber [Fri, 12 Apr 2013 15:22:20 +0000 (15:22 +0000)]
Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev

11 years agoMerge "The framework really doesn't need to know the specifics of the codec" into...
Andreas Huber [Fri, 12 Apr 2013 15:22:05 +0000 (15:22 +0000)]
Merge "The framework really doesn't need to know the specifics of the codec" into jb-mr2-dev

11 years agoWorkaround: requestPriority() is one-way
Glenn Kasten [Fri, 12 Apr 2013 00:21:41 +0000 (17:21 -0700)]
Workaround: requestPriority() is one-way

Bug: 8565696
Change-Id: If5fcdf8593e1ca15bea45217bd683b43a2a106c7

11 years agoMerge "Camera3: Improve error logging" into jb-mr2-dev
Eino-Ville Talvala [Thu, 11 Apr 2013 23:47:32 +0000 (23:47 +0000)]
Merge "Camera3: Improve error logging" into jb-mr2-dev

11 years agoACodec now signals an error if the mediaserver died while it is in
Andreas Huber [Thu, 11 Apr 2013 23:06:14 +0000 (16:06 -0700)]
ACodec now signals an error if the mediaserver died while it is in

anything other than "uninitialized" state.

Change-Id: Id133d897ac65b455b34e5de17ff9c39b47285630
related-to-bug: 8397711

11 years agoThe framework really doesn't need to know the specifics of the codec
Andreas Huber [Thu, 11 Apr 2013 18:37:28 +0000 (11:37 -0700)]
The framework really doesn't need to know the specifics of the codec

color format, so stop trying to enforce a whitelist.

Change-Id: I0ceb3bdd5bcc6c1bbd56740b0cd662a2b5820dfe
related-to-bug: 8596546

11 years agoInstead of returning an error, return an invalid duration (-1 ms)
Andreas Huber [Thu, 11 Apr 2013 18:07:55 +0000 (11:07 -0700)]
Instead of returning an error, return an invalid duration (-1 ms)

if no duration information was available. This prevents us from
entering ERROR state, effectively rendering the player instance useless.

Change-Id: I602d2661ae8b8633360306c0ea9208fb11e2bf17
related-to-bug: 8596285

11 years agoAdd liblog
Ying Wang [Wed, 10 Apr 2013 04:53:49 +0000 (21:53 -0700)]
Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0

11 years agoOMXNodeInstance: fix OMX_GetExtensionIndex logging
Jamie Gennis [Tue, 9 Apr 2013 23:40:54 +0000 (16:40 -0700)]
OMXNodeInstance: fix OMX_GetExtensionIndex logging

This change fixes the logging of OMX_GetExtensionIndex errors.  Under certain
circumstances these errors are not harmful and should not be logged.

Bug: 8538872
Change-Id: I19a13d29ca6263454a9a7a8be205e10363725f31

11 years agoCamera3: Improve error logging
Eino-Ville Talvala [Tue, 9 Apr 2013 20:49:56 +0000 (13:49 -0700)]
Camera3: Improve error logging

In preparation for supporting fragmented result calls.

Bug: 8565103
Change-Id: Id834637d7cbecf7b550333beedab3281b5400748

11 years agoAdd support for common encryption
Marco Nelissen [Mon, 8 Apr 2013 21:30:57 +0000 (14:30 -0700)]
Add support for common encryption

b/7465749

Change-Id: I5403b74a5ae428ad28b382863a09daafc400b137