OSDN Git Service
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: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: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 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 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
Jean-Baptiste Queru [Tue, 21 Aug 2012 17:14:59 +0000 (10:14 -0700)]
am
aa411adf: Merge "h264 streaming: make profile-level-id optional"
* commit '
aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3':
h264 streaming: make profile-level-id optional
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:49:26 +0000 (09:49 -0700)]
Merge "avcenc: Update a comment about the inline assembly"
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:18:31 +0000 (09:18 -0700)]
Merge "h264 streaming: make profile-level-id optional"
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:09:45 +0000 (09:09 -0700)]
am
41ee747f: am
5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"
* commit '
41ee747fc019eb5856454c698adf23f55073c69e':
avcenc: Fix the gcc inline assembly constraints
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:09:44 +0000 (09:09 -0700)]
am
894a7e45: am
9e13e927: Merge "avcenc: Properly indent assembly blocks"
* commit '
894a7e450704b0c7858a2187a5432b479ac69c1d':
avcenc: Properly indent assembly blocks
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:08:38 +0000 (09:08 -0700)]
am
5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"
* commit '
5ebce52c46360b349daa8c944ca81e3c74accec0':
avcenc: Fix the gcc inline assembly constraints
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:08:37 +0000 (09:08 -0700)]
am
9e13e927: Merge "avcenc: Properly indent assembly blocks"
* commit '
9e13e927206b7c7c15359af2b0ccc8f525e78a7d':
avcenc: Properly indent assembly blocks
Jean-Baptiste Queru [Tue, 21 Aug 2012 15:37:26 +0000 (08:37 -0700)]
Merge "avcenc: Fix the gcc inline assembly constraints"
Jean-Baptiste Queru [Tue, 21 Aug 2012 15:36:58 +0000 (08:36 -0700)]
Merge "avcenc: Properly indent assembly blocks"
Martin Storsjo [Tue, 21 Aug 2012 11:28:45 +0000 (12:28 +0100)]
avcenc: Update a comment about the inline assembly
Since the inline assembly was fixed in commit
3fdb405597f the
comment was no longer accurate.
Change-Id: Id4f8a111d1fa6e0c2e97f7db64262e8d1604c519
Eino-Ville Talvala [Mon, 20 Aug 2012 23:28:00 +0000 (16:28 -0700)]
Merge "Camera2: Add support for preview callbacks" into jb-mr1-dev
Eino-Ville Talvala [Mon, 13 Aug 2012 19:16:06 +0000 (12:16 -0700)]
Camera2: Add support for preview callbacks
- Move camera overall state enum to be part of parameters
- No longer use ICameraLock to guard access to overall state enum
- Add callback flag management
- Add callback stream and management
Bug:
6243944
Change-Id: Ideb3dc523a23c05e440e429ebf838b1900a96573
Martin Storsjo [Fri, 13 Apr 2012 11:17:30 +0000 (14:17 +0300)]
avcenc: Fix the gcc inline assembly constraints
Use +r for registers whose value is used as input to the block.
Also switch input registers to output registers with +r, for
registers that are modified by the assembly block (SUB_SAD in
sad_inline.h).
Without this, the inline assembly fails on modern gcc versions
(tested on gcc 4.6), where the intended input value never is
loaded into the registers, causing segfaults at runtime.
Currently this assembly isn't used, but this change makes it
work properly if enabled.
Change-Id: I37c247cd5c8aff213445e31ab3bd33d8f0f37e05
Martin Storsjo [Fri, 13 Apr 2012 11:16:54 +0000 (14:16 +0300)]
avcenc: Properly indent assembly blocks
Also line break multiline assembly blocks - previously they were
virtually unreadable.
Change-Id: Icb269909b78746e26b28ab7dcb6979c4655a0b0c
Glenn Kasten [Mon, 20 Aug 2012 22:46:06 +0000 (15:46 -0700)]
Merge "Revert "Swap the order of creating IAudioTrack and thread"" into jb-mr1-dev
Nick Kralevich [Mon, 20 Aug 2012 19:55:05 +0000 (12:55 -0700)]
am
add7c4d3: am
46b7eeb8: Merge "hardening: eliminate text relocations from h264"
* commit '
add7c4d329586119fb8b5501b049905004400233':
hardening: eliminate text relocations from h264
Nick Kralevich [Mon, 20 Aug 2012 19:53:43 +0000 (12:53 -0700)]
am
46b7eeb8: Merge "hardening: eliminate text relocations from h264"
* commit '
46b7eeb8be7449515082ecb1a61700affb44115f':
hardening: eliminate text relocations from h264
Nick Kralevich [Mon, 20 Aug 2012 18:55:17 +0000 (11:55 -0700)]
Merge "hardening: eliminate text relocations from h264"
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:29:35 +0000 (10:29 -0700)]
am
af5f9f05: am
cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
* commit '
af5f9f05937521acb4855848d77bed1d4ed7db0a':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:29:34 +0000 (10:29 -0700)]
am
3b939a5e: am
02a4ec21: Merge "avcenc: Remove a leftover define"
* commit '
3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a':
avcenc: Remove a leftover define
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:13 +0000 (09:40 -0700)]
am
cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
* commit '
cd622346235829f60246a061560adf5921ba129c':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:12 +0000 (09:40 -0700)]
am
02a4ec21: Merge "avcenc: Remove a leftover define"
* commit '
02a4ec216cf5ca903e1765ca3e7ff2985436b236':
avcenc: Remove a leftover define
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:54:11 +0000 (08:54 -0700)]
Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:53:54 +0000 (08:53 -0700)]
Merge "avcenc: Remove a leftover define"
Martin Storsjo [Mon, 20 Aug 2012 13:34:14 +0000 (14:34 +0100)]
MPEG2TSWriter: Fix an off-by-one in the condition for padding
This makes a remuxed file play without any decoding warnings,
while there still were some occasional warnings with the previous
version.
Change-Id: I31d73446ded1eeb3da10783c5ef841270563ca12
Patrik2 Carlsson [Mon, 20 Aug 2012 07:53:09 +0000 (09:53 +0200)]
h264 streaming: make profile-level-id optional
profile-level-id is made optional according to rfc3984:
"If no profile-level-id is present, the Baseline Profile without
additional constraints at Level 1 MUST be implied."
Change-Id: If868468a48917ceccb963b8ac15767583da29723
James Dong [Fri, 17 Aug 2012 20:41:59 +0000 (13:41 -0700)]
Don't log streaming url.
o related-to-bug:
6994761
Change-Id: I79d5549a70b3bde67ddf496cfc6283ac92b1f569
Martin Storsjo [Fri, 17 Aug 2012 08:28:09 +0000 (11:28 +0300)]
avcenc: Remove a leftover define
This should have been removed as part of
f5af6314db, but
the second __arm__ define was introduced after the original commit
was written, and not removing the second one was an oversight in
rebasing the patch on top of the new code.
Change-Id: Iccf08ffdef130446dd6e97dc1e15e6a1d4f9386f
Jean-Baptiste Queru [Fri, 17 Aug 2012 00:40:07 +0000 (17:40 -0700)]
am
523c09d5: am
64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"
* commit '
523c09d56c78933eea7fb4f028e0bfa595ca82b1':
stagefright amrnb: Remove unused leftover source files
Jean-Baptiste Queru [Fri, 17 Aug 2012 00:40:06 +0000 (17:40 -0700)]
am
f20e4ad9: am
c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
* commit '
f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
Jean-Baptiste Queru [Fri, 17 Aug 2012 00:37:44 +0000 (17:37 -0700)]
am
64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"
* commit '
64b3fe55f7edd16be32e07c28c2c90f84f3b9b80':
stagefright amrnb: Remove unused leftover source files
Jean-Baptiste Queru [Fri, 17 Aug 2012 00:37:43 +0000 (17:37 -0700)]
am
c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
* commit '
c1d2777c8004a9491e1381cca33a6768faed50c3':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
Eino-Ville Talvala [Fri, 17 Aug 2012 00:20:36 +0000 (17:20 -0700)]
Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev
Eino-Ville Talvala [Thu, 16 Aug 2012 23:03:59 +0000 (16:03 -0700)]
Camera2: Fix SCENE_MODE
Now can set scene mode back to auto.
Bug:
7001465
Change-Id: Ia25ba54d13de662bef5bf79957987513a7313c18
Jean-Baptiste Queru [Thu, 16 Aug 2012 23:42:06 +0000 (16:42 -0700)]
Merge "stagefright amrnb: Remove unused leftover source files"
Jean-Baptiste Queru [Thu, 16 Aug 2012 23:40:19 +0000 (16:40 -0700)]
Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:19 +0000 (15:31 -0700)]
am
0df213ba: am
dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit '
0df213babc4fb41b7daa05cb3c08071f2b60f6a5':
hardening: eliminate text relocations from mp3
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:18 +0000 (15:31 -0700)]
am
a109e9d5: am
b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit '
a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99':
avcenc: Clarify the ifdefs surrounding inline assembly
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:16 +0000 (15:31 -0700)]
am
fba9d50d: am
4f981882: Merge "hardening: eliminate text relocations from amrwb"
* commit '
fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe':
hardening: eliminate text relocations from amrwb
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:16 +0000 (15:31 -0700)]
am
1191287b: am
c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
* commit '
1191287bc438c164a89cf86704936aeddbefb136':
aacenc/amrwbenc: Remove the now unused LINUX define
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:31:15 +0000 (15:31 -0700)]
am
eeb9fde0: am
3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit '
eeb9fde0cb8e0ace44eb720bcac272ee70282d4d':
aacenc/amrwbenc: Remove unused and dubious typedefs
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:28 +0000 (15:29 -0700)]
am
dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit '
dde79acfb97083d690e3cceabff78931b10d1539':
hardening: eliminate text relocations from mp3
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:26 +0000 (15:29 -0700)]
am
b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit '
b7ca7dc9652456181080bf28ec376bc5a36cf6a2':
avcenc: Clarify the ifdefs surrounding inline assembly
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:25 +0000 (15:29 -0700)]
am
4f981882: Merge "hardening: eliminate text relocations from amrwb"
* commit '
4f981882da8080e1d41d000bfbad92df61adcfba':
hardening: eliminate text relocations from amrwb
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:24 +0000 (15:29 -0700)]
am
c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
* commit '
c3bfa0260a530af3e9c091c1c9d90d1283021dd6':
aacenc/amrwbenc: Remove the now unused LINUX define
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:23 +0000 (15:29 -0700)]
am
3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit '
3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49':
aacenc/amrwbenc: Remove unused and dubious typedefs
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:45:30 +0000 (14:45 -0700)]
Merge "hardening: eliminate text relocations from mp3"