OSDN Git Service
Ruben Brunk [Sat, 3 May 2014 00:28:33 +0000 (00:28 +0000)]
Revert "camera3: Update CameraMetadata vendor tag handling."
This reverts commit
4764324d2704f1b08bb7407014bf203924ff2363.
Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
Ruben Brunk [Thu, 17 Apr 2014 23:14:57 +0000 (16:14 -0700)]
camera3: Update CameraMetadata vendor tag handling.
Bug:
12134423
Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
Glenn Kasten [Tue, 29 Apr 2014 16:01:52 +0000 (09:01 -0700)]
Remove AUDIO_CHANNEL_OUT_SURROUND
and corresponding downmix effect
Change-Id: I1576aa373ca7acbb84d7742bacbd9c2da04a7a4c
Bill Yi [Wed, 30 Apr 2014 12:50:21 +0000 (12:50 +0000)]
Bill Yi [Wed, 30 Apr 2014 00:59:03 +0000 (00:59 +0000)]
Bill Yi [Tue, 29 Apr 2014 18:34:16 +0000 (11:34 -0700)]
Glenn Kasten [Tue, 29 Apr 2014 16:15:21 +0000 (16:15 +0000)]
Merge "Start pulling bits of FastMixer up to FastThread"
Zhijun He [Tue, 29 Apr 2014 01:11:11 +0000 (01:11 +0000)]
Merge "Camera3: scale the max jpeg buffer size based on resolutions"
Glenn Kasten [Mon, 28 Apr 2014 22:56:59 +0000 (15:56 -0700)]
resolved conflicts for merge of
6643b3d8 to master
Change-Id: Ibbbf6abb9146a4903ace1fb9189b61d5a7b04ce0
Glenn Kasten [Mon, 28 Apr 2014 22:49:34 +0000 (22:49 +0000)]
am
f131f873: Merge "Add private method NBLog::Reader::dumpLine()"
* commit '
f131f87369ec06fc27fc1f14ea72f0ca1a066509':
Add private method NBLog::Reader::dumpLine()
Glenn Kasten [Mon, 28 Apr 2014 22:43:21 +0000 (22:43 +0000)]
Merge "Add private method NBLog::Reader::dumpLine()"
Robert Shih [Mon, 28 Apr 2014 22:31:50 +0000 (22:31 +0000)]
Merge "PlaylistFetcher: clear mTSParser on bad starting seq # hint"
Glenn Kasten [Thu, 11 Jul 2013 21:29:59 +0000 (14:29 -0700)]
Add private method NBLog::Reader::dumpLine()
This allows us to abstract out fdprintf vs ALOGI
so that callers don't need an 'if' at every location.
Change-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8
Glenn Kasten [Mon, 7 Apr 2014 19:04:41 +0000 (12:04 -0700)]
Start pulling bits of FastMixer up to FastThread
Change-Id: I4c6f7b8f88fcf107bb29ee6432feecd4ab6554d2
Zhijun He [Thu, 24 Apr 2014 20:27:56 +0000 (13:27 -0700)]
Camera3: scale the max jpeg buffer size based on resolutions
The max jpeg buffer size was always the android.jpeg.maxSize, regardless of
the actual jpeg capture size. This creates a huge memory waste especially
for smaller size jpeg capture. Now the max jpeg buffer is linearly scaled based
on the resolution.
Bug:
14288983
Change-Id: I8a971b8e2f4fc7fec0154547bdb688579af71a47
Robert Shih [Thu, 24 Apr 2014 00:07:21 +0000 (17:07 -0700)]
PlaylistFetcher: clear mTSParser on bad starting seq # hint
Bug:
14159556
Change-Id: If25187477066282d5980da3c4d8a76dcfcf54d27
Robert Shih [Thu, 17 Apr 2014 18:16:05 +0000 (11:16 -0700)]
AwesomePlayer: fixed division by zero in onBufferingUpdate
Bug:
13911283
Change-Id: I968a274634a86f5c46f75dc533024dad44afc36b
Alex Glaznev [Thu, 24 Apr 2014 21:54:08 +0000 (21:54 +0000)]
Merge "Support VP8 encoder key frame interval and number of temporal layers configuration."
Alex Glaznev [Fri, 21 Mar 2014 00:32:57 +0000 (17:32 -0700)]
Support VP8 encoder key frame interval and number of
temporal layers configuration.
- Change ACodec.cpp to populate VP8 extra parameters
structure with key frame interval, number of temporal
layers and quantization parameters.
- Change software VP8 encoder to select frame temporal
patterns and temporal layers bitrate distribution based
on the number of layers similar to patterns used in WebRTC.
- Calculate video frame duration in VP8 encoder from the
timestamps.
Bug:
11969958
Change-Id: Ia96054d886cd09d8c108dfe250fc5f4478eaa042
Glenn Kasten [Thu, 24 Apr 2014 15:43:05 +0000 (15:43 +0000)]
am
7e5c6351: am
4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resample by intrinsics."
* commit '
7e5c635114a7762ad44581300021667a0da97389':
AArch64: rewrite audioflinger's sinc resample by intrinsics.
Glenn Kasten [Thu, 24 Apr 2014 09:02:28 +0000 (09:02 +0000)]
am
4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resample by intrinsics."
* commit '
4513aa2cda9e636e4ac675dab9a1353b22e951ae':
AArch64: rewrite audioflinger's sinc resample by intrinsics.
Glenn Kasten [Wed, 23 Apr 2014 23:45:27 +0000 (23:45 +0000)]
Merge "AArch64: rewrite audioflinger's sinc resample by intrinsics."
Zhijun He [Tue, 22 Apr 2014 20:39:37 +0000 (20:39 +0000)]
Merge "camera3: Don't hold mLock during flush call"
Lajos Molnar [Tue, 22 Apr 2014 18:38:18 +0000 (18:38 +0000)]
Merge "Removed libvideoeditor"
Zhijun He [Mon, 21 Apr 2014 23:04:17 +0000 (16:04 -0700)]
camera3: Don't hold mLock during flush call
HAL calls into Camera3Device functions like processCaptureResult during flush
call. When Camera3Device runs into error state during flush call,
processCaptureResult calls setErrorState(), which leads to deadlock.
Change-Id: I35a03f6eb4b77f914097917cb37de98663de365f
Lajos Molnar [Mon, 21 Apr 2014 22:02:44 +0000 (15:02 -0700)]
Removed libvideoeditor
No longer supported and should not be used.
Bug:
13542518
Change-Id: I697f90fd9f6720742c8b6dc73e45de1b213cc3c0
Jianing Wei [Mon, 21 Apr 2014 20:43:52 +0000 (20:43 +0000)]
Merge "CameraService: fix waitUntilIdle bug revealed by TestingCamera2."
Eino-Ville Talvala [Mon, 21 Apr 2014 20:32:03 +0000 (20:32 +0000)]
am
dae621c2: am
95006625: Merge "camera: set mNeedConfig after creating ZSL stream"
* commit '
dae621c2c7f40f1587b97636975908e1374ade9a':
camera: set mNeedConfig after creating ZSL stream
Nick Kralevich [Mon, 21 Apr 2014 20:32:02 +0000 (20:32 +0000)]
am
474038ae: am
27158eb5: Merge "AArch64: AString::append for longs and pointers"
* commit '
474038aef32f47d080567e8519d916b069a4f707':
AArch64: AString::append for longs and pointers
Eino-Ville Talvala [Mon, 21 Apr 2014 20:28:59 +0000 (20:28 +0000)]
am
95006625: Merge "camera: set mNeedConfig after creating ZSL stream"
* commit '
95006625bd1c562c952833bf08c52e7e6c524363':
camera: set mNeedConfig after creating ZSL stream
Nick Kralevich [Mon, 21 Apr 2014 20:28:58 +0000 (20:28 +0000)]
am
27158eb5: Merge "AArch64: AString::append for longs and pointers"
* commit '
27158eb55de8150258faba6574fc51c7aa641516':
AArch64: AString::append for longs and pointers
Eino-Ville Talvala [Mon, 21 Apr 2014 20:22:53 +0000 (20:22 +0000)]
Merge "camera: set mNeedConfig after creating ZSL stream"
Nick Kralevich [Mon, 21 Apr 2014 20:21:42 +0000 (20:21 +0000)]
Merge "AArch64: AString::append for longs and pointers"
Jianing Wei [Mon, 21 Apr 2014 18:34:34 +0000 (11:34 -0700)]
CameraService: fix waitUntilIdle bug revealed by TestingCamera2.
* clear mStreamingRequestList in flush
* fix frame number checker in notify and processCaptureResult
Bug:
14166437
Change-Id: I022421080d05138f9068c1b9b85d83bd613b04fb
Dan Stoza [Mon, 21 Apr 2014 16:11:20 +0000 (16:11 +0000)]
Merge "BufferQueue: Increase max slots from 32 to 64"
Zhijun He [Tue, 15 Apr 2014 21:09:55 +0000 (14:09 -0700)]
Camera3: block until get an available buffer
Camera3Stream shouldn't error out when the max number of buffers are already
dequeued. It should block until next buffer returned from camera device.
Bug:
11595505
Change-Id: If65a70c29cb04219e14ded0744059c0ab783444b
Mark Salyzyn [Fri, 18 Apr 2014 22:11:00 +0000 (22:11 +0000)]
am
e1ff1051: am
e0f20cea: Merge "libeffects: 64 bit compile issues"
* commit '
e1ff1051ffee8fb650741ad133f0f28b73eb7a73':
libeffects: 64 bit compile issues
Mark Salyzyn [Fri, 18 Apr 2014 22:09:04 +0000 (22:09 +0000)]
am
e0f20cea: Merge "libeffects: 64 bit compile issues"
* commit '
e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f':
libeffects: 64 bit compile issues
Mark Salyzyn [Fri, 18 Apr 2014 22:03:45 +0000 (22:03 +0000)]
Merge "libeffects: 64 bit compile issues"
Mark Salyzyn [Fri, 18 Apr 2014 20:48:25 +0000 (13:48 -0700)]
libeffects: 64 bit compile issues
Change-Id: I32dd13d307572fee91150f8e113df78924ca0067
Jianing Wei [Thu, 17 Apr 2014 23:59:59 +0000 (23:59 +0000)]
Merge "CameraService: fix race condition and wrong last frame number."
Jianing Wei [Fri, 11 Apr 2014 17:00:31 +0000 (10:00 -0700)]
CameraService: fix race condition and wrong last frame number.
Change-Id: Ie2be9a77a0b074497615de38cbb8e8f13b4858ec
Mark Salyzyn [Tue, 15 Apr 2014 23:37:20 +0000 (23:37 +0000)]
am
f5f24006: am
cd4eb72e: Merge "media: -Werror re-enabled"
* commit '
f5f24006f7bd997c6bca00804ec0f35bddd7ccc2':
media: -Werror re-enabled
Mark Salyzyn [Tue, 15 Apr 2014 23:37:19 +0000 (23:37 +0000)]
am
e80631aa: am
839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '
e80631aa1992ca50af679cd6a018c0ffda7f9b17':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Dmitriy Ivanov [Tue, 15 Apr 2014 23:36:30 +0000 (23:36 +0000)]
am
d4a3cae8: am
1df2557a: Merge "Remove code markers"
* commit '
d4a3cae8cc4cf924925ae57723e61c89f6c4fd51':
Remove code markers
Mark Salyzyn [Tue, 15 Apr 2014 22:38:32 +0000 (22:38 +0000)]
am
cd4eb72e: Merge "media: -Werror re-enabled"
* commit '
cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed':
media: -Werror re-enabled
Mark Salyzyn [Tue, 15 Apr 2014 22:35:00 +0000 (22:35 +0000)]
am
839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '
839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Mark Salyzyn [Tue, 15 Apr 2014 22:31:39 +0000 (22:31 +0000)]
Merge "media: -Werror re-enabled"
Mark Salyzyn [Tue, 15 Apr 2014 22:28:34 +0000 (22:28 +0000)]
Merge changes I0a744dc7,Id993a70d
* changes:
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Mark Salyzyn [Tue, 15 Apr 2014 21:55:53 +0000 (14:55 -0700)]
media: use size_t for integer iterator to Vector::size()
Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
Mark Salyzyn [Tue, 15 Apr 2014 20:52:53 +0000 (20:52 +0000)]
am
6bb7a891: am
432ed3d6: Merge "libstagefright: fix 64-bit warnings"
* commit '
6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66':
libstagefright: fix 64-bit warnings
Mark Salyzyn [Fri, 4 Apr 2014 21:47:28 +0000 (14:47 -0700)]
media: 64 bit compile issues
- change internal sized types to use stdint.h
- printf & scanf formats
- size_t or unsigned int for iterators
Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
Dmitriy Ivanov [Tue, 15 Apr 2014 19:40:57 +0000 (19:40 +0000)]
am
1df2557a: Merge "Remove code markers"
* commit '
1df2557ac95a6d8a087fb15f6f842dc049f2759b':
Remove code markers
Dmitriy Ivanov [Tue, 15 Apr 2014 19:37:19 +0000 (19:37 +0000)]
Merge "Remove code markers"
Dmitriy Ivanov [Tue, 15 Apr 2014 19:10:43 +0000 (12:10 -0700)]
Remove code markers
Change-Id: Iaebfaef2e58e9659d86699d9b7fc68f24cf09bf3
Mark Salyzyn [Mon, 14 Apr 2014 19:51:07 +0000 (12:51 -0700)]
media: -Werror re-enabled
Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
Zhijun He [Tue, 15 Apr 2014 17:06:04 +0000 (17:06 +0000)]
Merge "Camera: don't dereference timestamp if it is missing"
Mark Salyzyn [Tue, 15 Apr 2014 14:33:48 +0000 (14:33 +0000)]
am
432ed3d6: Merge "libstagefright: fix 64-bit warnings"
* commit '
432ed3d66d09464778df31c73374ee897f7b8840':
libstagefright: fix 64-bit warnings
Mark Salyzyn [Tue, 15 Apr 2014 14:30:03 +0000 (14:30 +0000)]
Merge "libstagefright: fix 64-bit warnings"
Yuvraj Pasi [Tue, 15 Apr 2014 13:07:45 +0000 (18:37 +0530)]
camera: set mNeedConfig after creating ZSL stream
Set mNeedConfig after creating ZSL stream, camera device
will reconfigure for the case when only ZSL stream
is changed.
Change-Id: Ib592817f81125969824a1280349f77973116f375
Marcus Oakland [Tue, 25 Mar 2014 17:32:00 +0000 (17:32 +0000)]
AArch64: AString::append for longs and pointers
The AString::append methods for long, unsigned long and void *
pointers were using char arrays of 16 elements, which were not long
enough for 64-bit longs and pointers in __LP64__ systems. This
resulted in "FORTIFY_SOURCE: vsprintf: prevented write past end of
buffer. Calling abort()." when the
android.media.cts.DecoderTest#testFlush CTS test was run.
The AString::append methods that were using sprintf have been modifed
to use snprintf instead, taking the sizeof the "s" array (which has
been made 32 char without conditional compilation for __LP64__ where
appropriate), and checking the return value to ensure that the string
has not been truncated.
After this change and changes to the types of OMX_U32 and OMX_S32 in the
frameworks/native/include/media/openmax/OMX_Types.h header file, the
android.media.cts.DecoderTest#testFlush CTS test passes.
Change-Id: I76d897373473c82f52986f43a15b050b844a370a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Zhijun He [Tue, 15 Apr 2014 02:35:04 +0000 (19:35 -0700)]
Camera: don't dereference timestamp if it is missing
Bug:
14059542
Change-Id: I8b45a98ef4b296db314cab3819d11626ac7211be
Andy Hung [Tue, 15 Apr 2014 02:09:14 +0000 (02:09 +0000)]
Merge "Improve resampler filter computation speed"
Colin Cross [Tue, 15 Apr 2014 00:12:27 +0000 (17:12 -0700)]
libstagefright: fix 64-bit warnings
%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.
(cherry picked from commit
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
Glenn Kasten [Mon, 14 Apr 2014 18:49:03 +0000 (18:49 +0000)]
Merge "audioflinger: forward device change to effects in direct thread"
Mark Salyzyn [Mon, 14 Apr 2014 18:11:48 +0000 (18:11 +0000)]
am
29fe1ea4: am
9829344d: Merge "media: memset sizeof argument issues"
* commit '
29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1':
media: memset sizeof argument issues
Mark Salyzyn [Mon, 14 Apr 2014 18:07:35 +0000 (18:07 +0000)]
am
9829344d: Merge "media: memset sizeof argument issues"
* commit '
9829344d526f87ca745208f04216ec795b239581':
media: memset sizeof argument issues
Mark Salyzyn [Mon, 14 Apr 2014 18:01:24 +0000 (18:01 +0000)]
Merge "media: memset sizeof argument issues"
Glenn Kasten [Sat, 12 Apr 2014 01:37:33 +0000 (18:37 -0700)]
audioflinger: forward device change to effects in direct thread
Device change during offload playback is not informed to effect chain
which causes effects still work on unexpected output devices. Add device
change notification in direct output thread.
Original author wjiang <wjiang@codeaurora.org>
CRs-Fixed: 630408
Bug:
14053172
Signed-off-by: Glenn Kasten <gkasten@google.com>
Change-Id: I094a99bdf540479cee2fca6614ec35c2fa7d6046
Andy Hung [Sat, 12 Apr 2014 00:43:36 +0000 (00:43 +0000)]
Merge "Update test-resample to handle multichannel"
Dan Stoza [Wed, 9 Apr 2014 23:10:53 +0000 (16:10 -0700)]
BufferQueue: Increase max slots from 32 to 64
Increases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask
returned by IGBC::getReleasedBuffers from 32 to 64 bits.
Bug:
13174352
Change-Id: I1c41256ffbc30abcf9f7b0b5fcf53da40462da28
Mark Salyzyn [Fri, 11 Apr 2014 22:05:19 +0000 (22:05 +0000)]
am
b1b1e303: am
e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build
1119326"
* commit '
b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9':
Fix aosp_arm64 mirror-aosp-master build
1119326
Mark Salyzyn [Fri, 11 Apr 2014 22:03:28 +0000 (22:03 +0000)]
am
e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build
1119326"
* commit '
e523889332b88348e673137d272854278acbef8f':
Fix aosp_arm64 mirror-aosp-master build
1119326
Mark Salyzyn [Fri, 11 Apr 2014 21:57:21 +0000 (21:57 +0000)]
Merge "Fix aosp_arm64 mirror-aosp-master build
1119326"
Mark Salyzyn [Fri, 11 Apr 2014 21:29:37 +0000 (14:29 -0700)]
Fix aosp_arm64 mirror-aosp-master build
1119326
Remove -Werror that was set in 'warnings be gone'
Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
Colin Cross [Fri, 11 Apr 2014 18:54:52 +0000 (11:54 -0700)]
Revert "build fix for aosp-idea133 @
1119318"
Build fix is needed in AOSP, but in master it re-introduces a warning
and breaks the build on -Werror. Revert it in master.
This reverts commit
effbb3a9b72050dbe150af7302d9148fe7e927d3.
Mark Salyzyn [Fri, 11 Apr 2014 18:33:10 +0000 (18:33 +0000)]
am
a7281ee1: am
a133bc87: Merge "build fix for aosp-idea133 @
1119318"
* commit '
a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50':
build fix for aosp-idea133 @
1119318
Mark Salyzyn [Fri, 11 Apr 2014 18:30:00 +0000 (18:30 +0000)]
am
a133bc87: Merge "build fix for aosp-idea133 @
1119318"
* commit '
a133bc87eb8269a6fa61772cb708f10c9c3b7a87':
build fix for aosp-idea133 @
1119318
Mark Salyzyn [Fri, 11 Apr 2014 18:28:38 +0000 (18:28 +0000)]
am
4cd0d582: am
0938c6f7: Merge "warnings be gone (4/4)"
* commit '
4cd0d582379ca9decba7ee0b99010d9a39f298de':
warnings be gone (4/4)
Mark Salyzyn [Fri, 11 Apr 2014 18:28:37 +0000 (18:28 +0000)]
am
8819b515: am
2a27a640: Merge "warnings be gone (3/4)"
* commit '
8819b515f541daea4288a87cfbae37561cb80b13':
warnings be gone (3/4)
Mark Salyzyn [Fri, 11 Apr 2014 18:28:36 +0000 (18:28 +0000)]
am
355c04df: am
79724856: Merge "warnings be gone (2/4)"
* commit '
355c04dfe84b06311bdb15a1617e22bea4eb2571':
warnings be gone (2/4)
Mark Salyzyn [Fri, 11 Apr 2014 18:26:28 +0000 (18:26 +0000)]
am
0938c6f7: Merge "warnings be gone (4/4)"
* commit '
0938c6f7a1e713030b04e32548012f0c29c94f4d':
warnings be gone (4/4)
Mark Salyzyn [Fri, 11 Apr 2014 18:26:27 +0000 (18:26 +0000)]
am
2a27a640: Merge "warnings be gone (3/4)"
* commit '
2a27a640d0d9747659cc609b4384ffead090866e':
warnings be gone (3/4)
Mark Salyzyn [Fri, 11 Apr 2014 18:26:26 +0000 (18:26 +0000)]
am
79724856: Merge "warnings be gone (2/4)"
* commit '
797248568b5ba32606ac0d8de024190e3cc95973':
warnings be gone (2/4)
Mark Salyzyn [Thu, 10 Apr 2014 16:37:52 +0000 (09:37 -0700)]
media: memset sizeof argument issues
Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
Mark Salyzyn [Fri, 11 Apr 2014 18:24:17 +0000 (18:24 +0000)]
Merge "build fix for aosp-idea133 @
1119318"
Mark Salyzyn [Fri, 11 Apr 2014 18:21:02 +0000 (18:21 +0000)]
Merge "warnings be gone (4/4)"
Mark Salyzyn [Fri, 11 Apr 2014 16:50:45 +0000 (09:50 -0700)]
warnings be gone (4/4)
(cherry picked from commit
84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139
Mark Salyzyn [Fri, 11 Apr 2014 18:20:39 +0000 (18:20 +0000)]
Merge "warnings be gone (3/4)"
Mark Salyzyn [Fri, 11 Apr 2014 16:49:23 +0000 (09:49 -0700)]
warnings be gone (3/4)
(cherry picked from commit
84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f
Mark Salyzyn [Fri, 11 Apr 2014 18:20:12 +0000 (18:20 +0000)]
Merge "warnings be gone (2/4)"
Mark Salyzyn [Fri, 11 Apr 2014 16:47:30 +0000 (09:47 -0700)]
warnings be gone (2/4)
(cherry picked from commit
84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e
Mark Salyzyn [Fri, 11 Apr 2014 18:01:18 +0000 (11:01 -0700)]
build fix for aosp-idea133 @
1119318
Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
Mark Salyzyn [Fri, 11 Apr 2014 17:32:36 +0000 (17:32 +0000)]
am
dd01ce9c: am
52a861d2: Merge "warnings be gone."
* commit '
dd01ce9c28e37d4556606f481faeec032a1fe04e':
warnings be gone.
Mark Salyzyn [Fri, 11 Apr 2014 17:26:28 +0000 (17:26 +0000)]
am
52a861d2: Merge "warnings be gone."
* commit '
52a861d2825544fe2eb90f8e5f6351d02ff95536':
warnings be gone.
Mark Salyzyn [Fri, 11 Apr 2014 17:20:54 +0000 (17:20 +0000)]
Merge "warnings be gone."
Andreas Huber [Fri, 11 Apr 2014 14:54:53 +0000 (07:54 -0700)]
warnings be gone.
(cherry picked from commit
84333e0475bc911adc16417f4ca327c975cf6c36)
Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.
Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
Andy Hung [Thu, 10 Apr 2014 02:10:15 +0000 (19:10 -0700)]
Update test-resample to handle multichannel
Option -c # specifies number of channels (mono default).
Option -s to specify stereo is removed (-c 2 replaces).
Option -h to specify WAV header is removed (WAV is now default).
Change-Id: Iba4b83806028a8a9c1ddba6f555182d214ef73ff
Signed-off-by: Andy Hung <hunga@google.com>
Vineeta Srivastava [Thu, 10 Apr 2014 20:44:29 +0000 (20:44 +0000)]
Merge "camera3: Remove register_stream_buffers for HAL 3.2+"
Jianing Wei [Thu, 10 Apr 2014 19:53:05 +0000 (19:53 +0000)]
Merge "CameraService: trigger appropriate callbacks for burst capture."