OSDN Git Service
Shuzhen Wang [Fri, 31 Aug 2012 17:24:22 +0000 (10:24 -0700)]
Camera: set vendor_ops on camera metadata.
This makes sure that vendor specific metadata can propogate through
the framework.
Change-Id: I3bd0ae4b889eb907caf7b305dbcb16abbbef0ea3
Jean-Baptiste Queru [Fri, 31 Aug 2012 18:26:10 +0000 (11:26 -0700)]
am
371e1217: (-s ours) am
8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"
* commit '
371e121745c2e43e3c26fd1a854eaf6d3324f057':
OMXCodec: enhance error handling of OMX IL client
Jean-Baptiste Queru [Fri, 31 Aug 2012 18:19:38 +0000 (11:19 -0700)]
am
8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"
* commit '
8b1525663322685ff34d9c09176feebd102e1c3d':
OMXCodec: enhance error handling of OMX IL client
Jean-Baptiste Queru [Fri, 31 Aug 2012 18:01:18 +0000 (11:01 -0700)]
Merge "OMXCodec: enhance error handling of OMX IL client"
Glenn Kasten [Fri, 31 Aug 2012 16:19:13 +0000 (09:19 -0700)]
Merge "Documentation on pipes" into jb-mr1-dev
Glenn Kasten [Fri, 31 Aug 2012 16:17:54 +0000 (09:17 -0700)]
Merge "Update audio comments" into jb-mr1-dev
Andreas Huber [Fri, 31 Aug 2012 15:34:32 +0000 (08:34 -0700)]
Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." into jb-mr1-dev
Weian Chen [Fri, 27 Jul 2012 08:55:11 +0000 (04:55 -0400)]
OMXCodec: enhance error handling of OMX IL client
Original design doesn't handle event EMPTY_BUFFER_DONE and
FILL_BUFFER_DONE which leads to buffer status mess issue,
and in turn leads to mediaserver crash.
Here we will handle those 2 events anyway to fix this.
Change-Id: Ia90b46ea7ec6026d6fda5d33fef6773435788b04
Author: Tianmi Chen<tianmi.chen@intel.com>
Signed-off-by: Tianmi Chen<tianmi.chen@intel.com>
Signed-off-by: Weian Chen <weian.chen@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 49066, 27054
Jamie Gennis [Fri, 31 Aug 2012 01:25:35 +0000 (18:25 -0700)]
Merge "Don't hard code the number of buffers for SurfaceMediaSource" into jb-mr1-dev
Andreas Huber [Thu, 30 Aug 2012 23:04:34 +0000 (16:04 -0700)]
Implement the source->sink(!) keep alive the wfd specs mandate...
Change-Id: I388d9911ebd243aa9c13a13ec3683e76898470a6
Glenn Kasten [Mon, 30 Jul 2012 17:59:30 +0000 (10:59 -0700)]
Update audio comments
Change-Id: Ie7504d0ddb252f7e4d4f99ed0b44cfc7b1049816
Glenn Kasten [Wed, 29 Aug 2012 19:25:28 +0000 (12:25 -0700)]
Documentation on pipes
Change-Id: I3de496c7db026c50dcb6bc577741bb65d08e7c9d
Glenn Kasten [Thu, 30 Aug 2012 22:20:56 +0000 (15:20 -0700)]
Merge "Remove dead code" into jb-mr1-dev
Glenn Kasten [Thu, 2 Aug 2012 23:37:07 +0000 (16:37 -0700)]
Remove dead code
RecordThread::isValidSyncEvent() returns false, so most of
RecordThread::setSyncEvent() is never executed.
Change-Id: I0cf848beb46a367a45126d2df3073c5afa2ca59c
Andreas Huber [Thu, 30 Aug 2012 22:12:29 +0000 (15:12 -0700)]
Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev
Glenn Kasten [Thu, 30 Aug 2012 22:05:00 +0000 (15:05 -0700)]
Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev
Andreas Huber [Thu, 30 Aug 2012 21:51:40 +0000 (14:51 -0700)]
Only run the wifi display RTSP server on demand, and only on the wifi direct
interface.
Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
James Dong [Thu, 23 Aug 2012 16:23:07 +0000 (09:23 -0700)]
Don't hard code the number of buffers for SurfaceMediaSource
Change-Id: I9ce17b3dc82a5d3e4a66569c76ad9745ceedacd6
Eric Laurent [Thu, 30 Aug 2012 18:16:51 +0000 (11:16 -0700)]
audio effects: fix bug in sample rate control.
Fix a bug in LVM bundle wrapper preventing audio framework sample rate
from being sent to the effect bundle instance.
Change-Id: I912027f866d3beac91b977bba869ff96a92d2a62
Eino-Ville Talvala [Thu, 30 Aug 2012 18:37:19 +0000 (11:37 -0700)]
Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev
Eino-Ville Talvala [Thu, 30 Aug 2012 18:37:01 +0000 (11:37 -0700)]
Merge changes I7bef5694,Id38e2a52 into jb-mr1-dev
* changes:
Camera2: Move preview callback processing to its own thread.
Camera2: Move still capture processing to separate thread.
Andreas Huber [Thu, 30 Aug 2012 18:01:13 +0000 (11:01 -0700)]
Merge "Prepare for transmitting audio through AudioSource." into jb-mr1-dev
Andreas Huber [Thu, 30 Aug 2012 17:56:14 +0000 (10:56 -0700)]
Prepare for transmitting audio through AudioSource.
AudioSource can now be configured to output buffers timestamped based
on looper time (absolute) instead of based on systemTime() relative to
start time.
Change-Id: I8eca42648eb50033ac4aafbe5daac64a98a40690
Andreas Huber [Thu, 30 Aug 2012 17:54:41 +0000 (10:54 -0700)]
Merge "Transmit frames at a higher frame rate for smoother updates, increase" into jb-mr1-dev
Andreas Huber [Thu, 30 Aug 2012 17:54:27 +0000 (10:54 -0700)]
Merge "Optionally log the transport stream transmitted to the sink." into jb-mr1-dev
Glenn Kasten [Wed, 29 Aug 2012 18:10:32 +0000 (11:10 -0700)]
Move libnbaio out of AudioFlinger
libnbaio is now a separate shared library from AudioFlinger, rather
than a static library used only by AudioFlinger.
AudioBufferProvider interface is now also independent of AudioFlinger,
moved to include/media/
Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b
Andreas Huber [Thu, 30 Aug 2012 17:01:17 +0000 (10:01 -0700)]
Transmit frames at a higher frame rate for smoother updates, increase
video bandwidth to 5 Mbit/sec.
Change-Id: Ieb9051b0f29d5a20004d1b3befdb745bc67769c7
Eino-Ville Talvala [Tue, 28 Aug 2012 20:38:23 +0000 (13:38 -0700)]
Camera2: Require 2 JPEG thumbnail resolutions.
Include (0,0) as a required thumbnail resolution, to allow turning off
thumbnails.
Change-Id: I3c4efe2d6a4f576a11ce5b75a3d573812a100b80
Eino-Ville Talvala [Tue, 28 Aug 2012 18:34:14 +0000 (11:34 -0700)]
Camera2: Move preview callback processing to its own thread.
To reduce delays for HAL callbacks, manage preview callbacks in their
own thread.
Bug:
6243944
Change-Id: I7bef56949ac889ffce4e031bf40291a771a46f3e
Eino-Ville Talvala [Tue, 28 Aug 2012 08:25:43 +0000 (01:25 -0700)]
Camera2: Move still capture processing to separate thread.
To avoid stalling HAL when it queues up new buffers for still capture,
process still captures in a separate thread. Also move Camera2Heap to
its own class so it can be used by the CaptureProcessor.
Bug:
6243944
Change-Id: Id38e2a52367c0985812fcd4fd9af3ef90beef43f
Eino-Ville Talvala [Thu, 30 Aug 2012 16:41:02 +0000 (09:41 -0700)]
Merge "Camera2: Factor out FrameProcessor." into jb-mr1-dev
Andreas Huber [Thu, 30 Aug 2012 16:13:54 +0000 (09:13 -0700)]
Optionally log the transport stream transmitted to the sink.
Change-Id: I5d392e7997d6beb09ba6eca70d6899747098d2b3
Andreas Huber [Wed, 29 Aug 2012 23:10:01 +0000 (16:10 -0700)]
Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev
Andreas Huber [Wed, 29 Aug 2012 23:08:08 +0000 (16:08 -0700)]
Fix wifi display shutdown deadlock.
Change-Id: I77eed39f39c0de6b427c425248ff7d21c051c074
Andreas Huber [Wed, 29 Aug 2012 22:29:11 +0000 (15:29 -0700)]
Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
Andreas Huber [Wed, 29 Aug 2012 18:41:50 +0000 (11:41 -0700)]
Initial checkin of support for acting as a wifi display source
Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
Andreas Huber [Wed, 29 Aug 2012 21:21:02 +0000 (14:21 -0700)]
Merge "Preliminary support for HDCP as a binder service for wifi display support." into jb-mr1-dev
Andreas Huber [Wed, 29 Aug 2012 18:34:22 +0000 (11:34 -0700)]
Preliminary support for HDCP as a binder service for wifi display support.
Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c
Jean-Baptiste Queru [Wed, 29 Aug 2012 17:58:24 +0000 (10:58 -0700)]
am
8836f8e0: am
5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
* commit '
8836f8e0bfc64dce81963db89dfc5d0f11c29483':
MPEG2TSWriter: Read more immediately if an empty buffer is received
Jean-Baptiste Queru [Wed, 29 Aug 2012 17:58:22 +0000 (10:58 -0700)]
am
bf30787f: am
735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"
* commit '
bf30787f2694057e775f3b527b649a9f8074237b':
avcenc: Don't erase the InputBufferInfo before reading info from it
Jean-Baptiste Queru [Wed, 29 Aug 2012 17:58:21 +0000 (10:58 -0700)]
am
0924dd88: am
2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"
* commit '
0924dd88790ba9cda0d5a86df7d68b7446470fc7':
recordvideo: Add an option for choosing software encoders
Jean-Baptiste Queru [Wed, 29 Aug 2012 17:58:19 +0000 (10:58 -0700)]
am
3f9e843d: am
9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"
* commit '
3f9e843d924f220f6094241bc765cd69d8fc6d7b':
recordvideo: Sleep while waiting for the encoding to finish
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:24 +0000 (09:45 -0700)]
am
5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
* commit '
5b15adfe9e5ee9a92b5f0a2853246fce170d4eef':
MPEG2TSWriter: Read more immediately if an empty buffer is received
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:23 +0000 (09:45 -0700)]
am
735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"
* commit '
735d1b926fa3e057c92d74cebacca2f243ead274':
avcenc: Don't erase the InputBufferInfo before reading info from it
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:22 +0000 (09:45 -0700)]
am
2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"
* commit '
2aa37a7d15f5e2246b8996d2600269684904c581':
recordvideo: Add an option for choosing software encoders
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:22 +0000 (09:45 -0700)]
am
9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"
* commit '
9ce74352d23d833f9627b7be58be964206e6ff6d':
recordvideo: Sleep while waiting for the encoding to finish
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:35:10 +0000 (09:35 -0700)]
Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:07:41 +0000 (09:07 -0700)]
Merge "avcenc: Don't erase the InputBufferInfo before reading info from it"
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:07:26 +0000 (09:07 -0700)]
Merge "recordvideo: Add an option for choosing software encoders"
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:07:19 +0000 (09:07 -0700)]
Merge "recordvideo: Sleep while waiting for the encoding to finish"
Martin Storsjo [Wed, 29 Aug 2012 12:22:18 +0000 (15:22 +0300)]
avcenc: Don't erase the InputBufferInfo before reading info from it
Previously, the timestamp and flags were read from the InputBufferInfo
struct after it had been erased.
This fixes cases where the output timestamp from the avc encoder
could spuriously be garbage every now and then.
Change-Id: I21acf23cfac93bcc201a603feace6499ec6d8e76
Martin Storsjo [Wed, 29 Aug 2012 11:49:28 +0000 (14:49 +0300)]
MPEG2TSWriter: Read more immediately if an empty buffer is received
If writing encoded data from an OMXCodec, the last buffer can be
an empty buffer (with the EOS flag set, which isn't propagated to
MediaBuffer). If we don't retry reading, we won't ever get the
EOS error and thus won't properly signal that the source is done.
Change-Id: Ibe01dbcd0637fbf0c2529a277e9f208c48e0e8ab
Martin Storsjo [Wed, 29 Aug 2012 10:41:01 +0000 (13:41 +0300)]
recordvideo: Sleep while waiting for the encoding to finish
This avoids busy looping while e.g. waiting for the software encoder
to finish.
This is similar to what the 'record' and 'stagefright' test apps
do.
Change-Id: Idce55b15396ce78b621a521229603bec1e799f33
Martin Storsjo [Wed, 29 Aug 2012 10:28:33 +0000 (13:28 +0300)]
recordvideo: Add an option for choosing software encoders
This is similar to the same option in the 'stagefright' test
application.
Change-Id: I2a2e5201bd93460df0911ef12865c9030c0183e5
Eino-Ville Talvala [Tue, 28 Aug 2012 06:41:56 +0000 (23:41 -0700)]
Camera2: Factor out FrameProcessor.
Move FrameProcessor to its own file, add necessary interfaces to
Camera2Client.
Bug:
6243944
Change-Id: I8d1b8280a65d2822461ebe6b6c9de17992b34276
Eino-Ville Talvala [Tue, 28 Aug 2012 19:28:24 +0000 (12:28 -0700)]
Merge "Camera2: Factor out Camera2Client::Parameters" into jb-mr1-dev
Andreas Huber [Tue, 28 Aug 2012 18:11:47 +0000 (11:11 -0700)]
Merge "Fix retries when server doesn't support range requests." into jb-mr1-dev
Andreas Huber [Tue, 28 Aug 2012 16:48:40 +0000 (09:48 -0700)]
Fix retries when server doesn't support range requests.
Change-Id: I2d137f3e799b87af36a279473c0077d860c14477
related-to-bug:
7021436
Andreas Huber [Tue, 28 Aug 2012 17:22:44 +0000 (10:22 -0700)]
Merge "Test to measure UDP roundtrip time between two devices on the same network." into jb-mr1-dev
Andreas Huber [Tue, 28 Aug 2012 16:47:45 +0000 (09:47 -0700)]
Test to measure UDP roundtrip time between two devices on the same network.
Change-Id: I4c9a5190efe18da8b6be7d68bda91df878c4118c
Eino-Ville Talvala [Sun, 26 Aug 2012 16:29:28 +0000 (09:29 -0700)]
Camera2: Factor out Camera2Client::Parameters
Move the parameter structure and the various utility methods using it
to its own class. Rename LockedParameters to SharedParameters to match
the Mutex naming convention.
Also move CameraMetadata to camera2 directory for organization.
No functional changes.
Bug:
6243944
Change-Id: Ie60b535936ecfda9bf23361d52604abf515c83d0
Jeff Brown [Tue, 28 Aug 2012 00:15:59 +0000 (17:15 -0700)]
Merge "Use new surface flinger API." into jb-mr1-dev
Eino-Ville Talvala [Mon, 27 Aug 2012 19:19:52 +0000 (12:19 -0700)]
Merge "Camera2: Fix metering/focusing region coordinates, minor bugs" into jb-mr1-dev
Eino-Ville Talvala [Mon, 27 Aug 2012 19:19:40 +0000 (12:19 -0700)]
Merge "Camera2: Move frame processing to its own thread." into jb-mr1-dev
Eino-Ville Talvala [Mon, 27 Aug 2012 17:33:35 +0000 (10:33 -0700)]
Merge "Camera2: Use CameraMetadata wrapper class." into jb-mr1-dev
James Dong [Mon, 27 Aug 2012 17:14:29 +0000 (10:14 -0700)]
Merge "Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method" into jb-mr1-dev
James Dong [Mon, 27 Aug 2012 17:14:23 +0000 (10:14 -0700)]
Merge "Fixed a native crash due to unexpected state at destroy time when encoder component's source fails to start" into jb-mr1-dev
Eino-Ville Talvala [Sun, 26 Aug 2012 00:12:18 +0000 (17:12 -0700)]
Camera2: Fix metering/focusing region coordinates, minor bugs
- Use active pixel array-based coordinates instead of the normalized
camera API coordinates for ae/awb/af regions
- Fix calculation of UV stride for YV12 format
Bug:
6243944
Change-Id: I80cbd989858b0a3cb75c6f536c145e16e44fdb25
Eino-Ville Talvala [Fri, 24 Aug 2012 23:30:44 +0000 (16:30 -0700)]
Camera2: Move frame processing to its own thread.
To avoid blocking the HAL on possibly long-running binder calls,
move frame receiption and processing to its own thread.
Bug:
6243944
Change-Id: I6385be4410b2f68e2331755027afc10c342187cf
Eino-Ville Talvala [Fri, 24 Aug 2012 18:29:22 +0000 (11:29 -0700)]
Camera2: Use CameraMetadata wrapper class.
Wrap the use of the camera_metadata library inside a CameraMetadata
class to avoid memory leaks, improve code clarity, and increase type
safety.
Bug:
6243944
Change-Id: I90ca592b5875e27e4c58ea1ca680582dc3c3b56a
Jamie Gennis [Sun, 26 Aug 2012 23:28:14 +0000 (16:28 -0700)]
Merge "SurfaceMediaSource: a few fixes / cleanups" into jb-mr1-dev
Jamie Gennis [Fri, 24 Aug 2012 03:24:09 +0000 (20:24 -0700)]
SurfaceMediaSource: a few fixes / cleanups
- Remove the setting of mStopped to true in onBuffersReleased
- Cleaned up a few function call logs
- Removed the 'reset' method.
Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f
James Dong [Sun, 26 Aug 2012 23:13:03 +0000 (16:13 -0700)]
Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method
o The mClient could be disconnected before the notify message is sent out. Use
a local reference could help resolve this issue.
o related-to-bug:
6782035
Change-Id: Ia2047bd7f2666100fed83c6e5417a3bf2e20cd2c
Jeff Brown [Sat, 25 Aug 2012 05:34:11 +0000 (22:34 -0700)]
Use new surface flinger API.
Change-Id: I594c6e15db5f617d2feaac1a65b5316daa3812d0
Marco Nelissen [Sat, 25 Aug 2012 00:18:25 +0000 (17:18 -0700)]
Merge "Fix deadlock" into jb-mr1-dev
Marco Nelissen [Sat, 25 Aug 2012 00:10:17 +0000 (17:10 -0700)]
Fix deadlock
I wanted to save some space, and ended up with a deadlock.
This change basically restores setDataSource(fd, offset, size) to the
way it was before I added the new setDataSource(DataSource) method,
instead of calling through to it.
Change-Id: Iacf4627c8745369fa84b467530189a9f64f8726b
Eric Laurent [Fri, 24 Aug 2012 21:29:56 +0000 (14:29 -0700)]
Merge "Reduce THD when equalizer is ON." into jb-mr1-dev
Eric Laurent [Fri, 24 Aug 2012 21:17:34 +0000 (14:17 -0700)]
Reduce THD when equalizer is ON.
Increase headroom in LVM bundle to reduce THD when equalizer is ON
with high band gains.
Also add a workaround for a bug in headroom parameter control.
Change-Id: I1d67c9ae475f6cf852c2e0e49bacfc82a5e484fd
James Dong [Fri, 24 Aug 2012 17:53:31 +0000 (10:53 -0700)]
Fixed a native crash due to unexpected state at destroy time when encoder component's source fails to start
o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able
to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder
ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in
OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to
bring the state of the encoder component back to the expected state.
o related-to-bug:
7045494
Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
Marco Nelissen [Fri, 24 Aug 2012 17:37:39 +0000 (10:37 -0700)]
Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev
Marco Nelissen [Fri, 24 Aug 2012 16:53:35 +0000 (09:53 -0700)]
Allow directly setting a DataSource for NuMediaExtractor
This adds NuMediaExtractor::setDataSource(const sp<DataSource> &source),
which some new code under frameworks/av will use to let applications
provide a custom data source for extractors.
Change-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2
John Grossman [Fri, 24 Aug 2012 16:20:07 +0000 (09:20 -0700)]
Merge "Add a missing NULL check." into jb-mr1-dev
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:29:47 +0000 (07:29 -0700)]
am
07315f82: am
4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
* commit '
07315f8262f843f3624c70974642e4fb733a661c':
Fixed redefinition of 'i' with a different type error
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:29:45 +0000 (07:29 -0700)]
am
78015984: am
6e55a0f7: Merge "Fixed member access into incomplete type build error"
* commit '
780159840d754eae8e4e3f693ea10932634053f8':
Fixed member access into incomplete type build error
John Grossman [Fri, 24 Aug 2012 00:47:31 +0000 (17:47 -0700)]
Add a missing NULL check.
Don't crash if its time to start the next media player in a media
player chain, but the current player's client has a NULL mAudioOutput,
as is the case when the low level player implements
MediaPlayerHWInterface.
Change-Id: If555da3a46960cbee91ff26e5b1fd05e52c8ef28
Jeffrey Tinker [Fri, 24 Aug 2012 00:24:29 +0000 (17:24 -0700)]
Merge "Send current bandwidth info event when buffering occurs" into jb-mr1-dev
Jean-Baptiste Queru [Thu, 23 Aug 2012 20:01:44 +0000 (13:01 -0700)]
am
4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
* commit '
4b60ac04a878eaf8344b56189509ccd6925855c2':
Fixed redefinition of 'i' with a different type error
Jean-Baptiste Queru [Thu, 23 Aug 2012 20:01:43 +0000 (13:01 -0700)]
am
6e55a0f7: Merge "Fixed member access into incomplete type build error"
* commit '
6e55a0f71eef07c6041077e6e9e7fad8c973a752':
Fixed member access into incomplete type build error
Jean-Baptiste Queru [Thu, 23 Aug 2012 19:42:48 +0000 (12:42 -0700)]
Merge "Fixed redefinition of 'i' with a different type error"
Jean-Baptiste Queru [Thu, 23 Aug 2012 19:42:24 +0000 (12:42 -0700)]
Merge "Fixed member access into incomplete type build error"
Jeffrey Tinker [Thu, 23 Aug 2012 08:56:53 +0000 (01:56 -0700)]
Send current bandwidth info event when buffering occurs
There is a dependent change in vendor/widevine repo.
Change-Id: If063f4b1c8857e5bfc7be54ab0f97a4ed169b303
related-to-bug:
5883234
James Dong [Wed, 22 Aug 2012 21:50:14 +0000 (14:50 -0700)]
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
Tareq A. Siraj [Thu, 26 Jul 2012 20:53:14 +0000 (16:53 -0400)]
Fixed redefinition of 'i' with a different type error
Renamed the redefinition of 'i' to 'k'.
Change-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
Tareq A. Siraj [Fri, 27 Jul 2012 15:49:32 +0000 (11:49 -0400)]
Fixed member access into incomplete type build error
Included the ARTPAssembler.h file to fix the 'member access into
incomplete type "android::ARTPAssembler"' error reported by clang.
Change-Id: I10cb1e38bf360858bb7ebdeae82ba1e64431f87d
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Edwin Vane<edwin.vane@intel.com>
Glenn Kasten [Wed, 22 Aug 2012 16:27:41 +0000 (09:27 -0700)]
Make tee sink compile OK again
Change-Id: Ie865ceeabaeb698a62c11eac9f96e303c44c28ae
Eino-Ville Talvala [Tue, 21 Aug 2012 20:30:45 +0000 (13:30 -0700)]
Camera2: Replace MediaConsumer with BufferItemConsumer.
Get rid of MediaConsumer, which was largely duplicated code, and
replace it with the simpler BufferItemConsumer.
Bug:
6243944
Change-Id: I242d80c5fe39f2ee581ec8bb46f362997d994b0a
Eino-Ville Talvala [Tue, 21 Aug 2012 23:09:31 +0000 (16:09 -0700)]
Camera2: Ignore NOT_FOUND errors for face detect mode on frame receipt.
Reduce log spamming due to incomplete implementations.
Change-Id: I6eb9d657591bd5f1476dd8c96e4a00b8a03e2a5e
Jean-Baptiste Queru [Tue, 21 Aug 2012 17:16:09 +0000 (10:16 -0700)]
am
8d4d590d: am
1e75e972: Merge "avcenc: Update a comment about the inline assembly"
* commit '
8d4d590dcbbd2b178976d0bd024625e9d6216365':
avcenc: Update a comment about the inline assembly
Jean-Baptiste Queru [Tue, 21 Aug 2012 17:16:08 +0000 (10:16 -0700)]
am
8a825ec0: am
aa411adf: Merge "h264 streaming: make profile-level-id optional"
* commit '
8a825ec079da6f2b89149c53568cb9721c10d923':
h264 streaming: make profile-level-id optional
Jean-Baptiste Queru [Tue, 21 Aug 2012 17:15:00 +0000 (10:15 -0700)]
am
1e75e972: Merge "avcenc: Update a comment about the inline assembly"
* commit '
1e75e9721254ae5df05c3d88b30ed7f778406261':
avcenc: Update a comment about the inline assembly