OSDN Git Service
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
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"
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"
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."
Jianing Wei [Thu, 13 Mar 2014 01:29:36 +0000 (18:29 -0700)]
CameraService: trigger appropriate callbacks for burst capture.
* Instead of tracking CameraMetadata only, now we track both
CameraMetadata and CaptureResultExtras, which is not part of
the HAL metadata. This will enable the correct callback of
onCaptureStarted and onResultReceived given burst requests.
* Get last frame number in reply when submitting requests,
canceling requests, and flushing device. For repeating requests,
this frame number is the last frame number of the previous
request. For non-repeating requests, this frame number is the
expected last frame number of the current request. The goal
is provide frame number to Java side in order to trigger
onCaptureSequenceCompleted correctly.
* Fix notifyError so that onDeviceError can be called correctly.
Bug:
10749500
Change-Id: I2f3dda6c530090055d4a2ff9f0f087bbbe8d9257
Andy Hung [Wed, 9 Apr 2014 01:44:38 +0000 (18:44 -0700)]
Add and enable floating point option for audio resampler
Can be tested with test-resample.
Change-Id: I8339846d7c647444b6025d33cfa145d5d3658121
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Wed, 9 Apr 2014 01:28:09 +0000 (18:28 -0700)]
Add floating point to audio resample processing
Add template type parameters for input, output data type.
Minor change in non-NEON mono channel handling.
Minor fixup on comments.
Change-Id: I7dc9972d130913718b62f32c02d31f99c06682f2
Signed-off-by: Andy Hung <hunga@google.com>
Igor Murashkin [Fri, 4 Apr 2014 01:09:04 +0000 (18:09 -0700)]
camera3: Remove register_stream_buffers for HAL 3.2+
Use 'setprop camera.dev.register_stream 1' to skip the fatal NULL check
- This property will be removed before shipping L
Bug:
13301331
Bug:
13435680
Change-Id: I16aacd7b22e0a10b34f6fb8501be0256170a8cd5
Andy Hung [Wed, 9 Apr 2014 01:10:02 +0000 (18:10 -0700)]
Add capability for floating point Kaiser window filters
Change-Id: Idbb33248bbab2300c2650a4657d8fbc482a5d46c
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Wed, 9 Apr 2014 00:59:59 +0000 (17:59 -0700)]
Update test-resample to handle floating point
Change-Id: Ib34d716fbabcd5eb70f8a5ffcf362e242671d916
Signed-off-by: Andy Hung <hunga@google.com>
Glenn Kasten [Tue, 8 Apr 2014 19:16:11 +0000 (19:16 +0000)]
Merge "Fix 64-bit build warnings"
Glenn Kasten [Tue, 8 Apr 2014 17:41:02 +0000 (10:41 -0700)]
Fix 64-bit build warnings
Change-Id: I667401522cb4ccd41013e2883a4c75ddeca08ef6
Glenn Kasten [Mon, 7 Apr 2014 21:53:53 +0000 (21:53 +0000)]
Merge "Fix regression in FastMixer statistics"
Dan Stoza [Mon, 7 Apr 2014 20:37:50 +0000 (13:37 -0700)]
Remove deprecated BufferQueue constructor
Bug:
13415624
Change-Id: I16e874c376d2f84d270f6a8c733618719cf49901
Glenn Kasten [Mon, 7 Apr 2014 20:02:08 +0000 (13:02 -0700)]
Fix regression in FastMixer statistics
At some point, the mSampleRate in FastMixerDumpState stopped being
initialized correctly. I'm not sure when this happened, it doesn't seem to
be introduced in recent CLs. This lack of initialization caused
some of the FastMixer statistics based on sample rate to be useless.
Change-Id: Id2a96d606130a90c4c4f1bddd59778f6c6428a9c
Lajos Molnar [Wed, 2 Apr 2014 14:35:29 +0000 (07:35 -0700)]
stagefright: handle corrupt matroska files gracefully
Bug:
13693438
Bug:
13744158
Change-Id: I557595b5b5d4a20934f79e00a622b06d13378223
Lajos Molnar [Fri, 4 Apr 2014 02:13:01 +0000 (19:13 -0700)]
stagefright: log uri protocols, and opt-in to log full uri
Added property media.stagefright.log-uri. Set it to true or 1 to
log uris by AwesomePlayer.
Added utility function to get uri debug string based on incognito
and log opt-in status.
Change-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec
Related-Bug:
6994761
Lajos Molnar [Sat, 5 Apr 2014 01:09:35 +0000 (18:09 -0700)]
stagefright: add AString constructor from String8
Change-Id: I85b37b6dee4ea9d5f7f1c1a40ff405a01a0c67f1
Dan Stoza [Fri, 4 Apr 2014 17:36:04 +0000 (17:36 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Glenn Kasten [Thu, 3 Apr 2014 17:20:09 +0000 (10:20 -0700)]
Merge commit '
52a23bd3' into manualmerge
Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
Glenn Kasten [Thu, 3 Apr 2014 17:11:25 +0000 (17:11 +0000)]
am
51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"
* commit '
51b3ea2b8f7298bffbd246c65a606cd053357b66':
64-bit: Correction to OMX_U32 and OMX_S32
Glenn Kasten [Thu, 3 Apr 2014 17:09:07 +0000 (17:09 +0000)]
am
8260bf63: am
93bbc834: Merge "Fix aac decoder flush"
* commit '
8260bf63e2fa974b524029f170d9ad17b69b884f':
Fix aac decoder flush
Glenn Kasten [Thu, 3 Apr 2014 17:00:25 +0000 (17:00 +0000)]
Merge "64-bit: Correction to OMX_U32 and OMX_S32"
Glenn Kasten [Thu, 3 Apr 2014 15:09:26 +0000 (15:09 +0000)]
am
93bbc834: Merge "Fix aac decoder flush"
* commit '
93bbc8343133b910aeae536617efce978040bbae':
Fix aac decoder flush
Glenn Kasten [Thu, 3 Apr 2014 15:01:21 +0000 (15:01 +0000)]
Merge "Fix aac decoder flush"
Jeff Tinker [Thu, 3 Apr 2014 08:31:22 +0000 (08:31 +0000)]
am
d009aa2b: am
81e0bd44: Add signature|system permission to MediaDrm signer APIs
* commit '
d009aa2bac4a4c8ca2e0c1203148194e237cc5d0':
Add signature|system permission to MediaDrm signer APIs
Jeff Tinker [Thu, 3 Apr 2014 01:35:29 +0000 (01:35 +0000)]
am
81e0bd44: Add signature|system permission to MediaDrm signer APIs
* commit '
81e0bd44a10e90778ab5b0a3babd4fc52cadedd8':
Add signature|system permission to MediaDrm signer APIs
Andy Hung [Thu, 3 Apr 2014 01:15:09 +0000 (01:15 +0000)]
Merge "Change references of Q19.12 to Q4.27 for clarity"
Jeff Tinker [Wed, 2 Apr 2014 23:41:38 +0000 (16:41 -0700)]
Add signature|system permission to MediaDrm signer APIs
Change-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394
related-to-bug:
12702350
Glenn Kasten [Wed, 2 Apr 2014 22:09:37 +0000 (15:09 -0700)]
Merge commit '
54654025' into manualmerge
Change-Id: I2df92dbae606cc9805ff5dd7abc2f53b60108112
Glenn Kasten [Wed, 2 Apr 2014 21:48:01 +0000 (21:48 +0000)]
am
2b2fbe29: Merge "Fix decoder EOS handling"
* commit '
2b2fbe299163b544668b41f594943a19b78dafd3':
Fix decoder EOS handling
Glenn Kasten [Wed, 2 Apr 2014 21:38:17 +0000 (21:38 +0000)]
Merge "Fix decoder EOS handling"
Lajos Molnar [Wed, 2 Apr 2014 21:36:57 +0000 (21:36 +0000)]
Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"
Andy Hung [Wed, 2 Apr 2014 18:24:53 +0000 (11:24 -0700)]
Change references of Q19.12 to Q4.27 for clarity
Change-Id: I5beb7daf6ff9bc123ff3582f7c294edcaf8652f6
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Wed, 2 Apr 2014 20:52:10 +0000 (13:52 -0700)]
Improve resampler filter computation speed
Approximate speed improvement is 10-15% for filter computation,
which is floating point intensive. This will be important
for devices without hw floating point support.
Change-Id: I10b4e778c8d632b52218a777504b092c189e437f
Signed-off-by: Andy Hung <hunga@google.com>
Glenn Kasten [Wed, 2 Apr 2014 17:25:35 +0000 (10:25 -0700)]
64-bit: Correction to OMX_U32 and OMX_S32
Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
Marco Nelissen [Fri, 20 Sep 2013 14:18:21 +0000 (07:18 -0700)]
Fix aac decoder flush
b/
8543366
Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
Marco Nelissen [Thu, 29 Aug 2013 16:31:26 +0000 (09:31 -0700)]
Fix decoder EOS handling
Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.
b/
8747869
Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
Jeff Tinker [Tue, 1 Apr 2014 22:23:23 +0000 (22:23 +0000)]
am
f356a123: am
68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit '
f356a123bf966150965a1af1cb9bd6ff2ca020de':
Support CAST V2 Authentication in MediaDrm
Jeff Tinker [Tue, 1 Apr 2014 22:00:45 +0000 (22:00 +0000)]
am
68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit '
68d9d71a792deed75d32fe13febc07c9c12c8449':
Support CAST V2 Authentication in MediaDrm
Lajos Molnar [Mon, 31 Mar 2014 19:30:01 +0000 (12:30 -0700)]
ACodec: do not signal kWhatShutdownCompleted on codec error
Do not signal kWhatShutdownCompleted when moving to Uninitialized
state due to receiving a codec error.
Do not abort if error happens just before handling a stop request.
Bug:
13675112
Change-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b
Lajos Molnar [Tue, 1 Apr 2014 18:41:59 +0000 (18:41 +0000)]
Merge "MediaCodec: move to UNINITIALIZED state on codec error"
Glenn Kasten [Tue, 1 Apr 2014 17:47:00 +0000 (17:47 +0000)]
Merge "FastMixer use FastThread and FastMixerState use FastThreadState"
Glenn Kasten [Tue, 1 Apr 2014 17:32:17 +0000 (17:32 +0000)]
Merge changes I5748f47d,I3f074933
* changes:
Add FastThread.h
Add FastThreadState
Lajos Molnar [Mon, 31 Mar 2014 19:30:01 +0000 (12:30 -0700)]
MediaCodec: move to UNINITIALIZED state on codec error
ACodec moves to Uninitialized state after receiving codec error.
Make MediaCodec also move to the same state, so stop() and
release() will work correctly.
Bug:
13675112
Change-Id: I1c7e8b274f68345fc0e6a55c70dff6c7a4fb2e72
Glenn Kasten [Wed, 19 Mar 2014 00:01:15 +0000 (17:01 -0700)]
FastMixer use FastThread and FastMixerState use FastThreadState
Change-Id: I594c973e9f575113bdefee6f4cf8c29d8beac1f3
Glenn Kasten [Tue, 18 Mar 2014 23:25:04 +0000 (16:25 -0700)]
Add FastThread.h
Change-Id: I5748f47dbfa42c14cc93973742e05ac963bf3ba8
Glenn Kasten [Wed, 19 Mar 2014 00:17:04 +0000 (17:17 -0700)]
Add FastThreadState
Change-Id: I3f07493375ace6e5cfdcd02ad90c4b6fad543b0c
Glenn Kasten [Thu, 13 Mar 2014 22:07:51 +0000 (15:07 -0700)]
Add FIXMEs to createRecord for fast capture
Change-Id: I759be200fae32969212c52a409f46f2e704081e3
Jeff Tinker [Tue, 4 Mar 2014 21:21:31 +0000 (13:21 -0800)]
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861
related-to-bug:
12702350
Lajos Molnar [Fri, 28 Mar 2014 21:37:51 +0000 (14:37 -0700)]
ACodec: ignore OMX messages to already freed component
Bug:
12916984
Change-Id: I92848797b8d556cff468b9b0f0a618946083208f
Lajos Molnar [Fri, 28 Mar 2014 16:53:46 +0000 (09:53 -0700)]
mediaplayer: add temporary developer settings to use NuPlayer as default
Bug:
11784824
Change-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8
Glenn Kasten [Fri, 28 Mar 2014 16:43:59 +0000 (16:43 +0000)]
Merge "Mark the logging heap read-only to media.log service"
Lajos Molnar [Fri, 28 Mar 2014 05:24:07 +0000 (05:24 +0000)]
am
4f1ef2cd: (-s ours) am
1000d426: am
f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit '
4f1ef2cd65d734edae17f8586cf717598b40f2c3':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
Lajos Molnar [Fri, 28 Mar 2014 05:24:02 +0000 (05:24 +0000)]
am
ff382d0c: (-s ours) am
8bf96c01: am
3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
* commit '
ff382d0c40493303ceb81a6c22d1a48c0fecfe9c':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
Lajos Molnar [Fri, 28 Mar 2014 01:50:50 +0000 (01:50 +0000)]
am
1000d426: am
f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit '
1000d426bedb1ec38bdfff98fc8f004b64af13cb':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
Lajos Molnar [Fri, 28 Mar 2014 01:50:50 +0000 (01:50 +0000)]
am
8bf96c01: am
3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
* commit '
8bf96c011ff4128f9bf06b892a38d869192d6a25':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
Lajos Molnar [Fri, 28 Mar 2014 01:45:11 +0000 (01:45 +0000)]
am
f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit '
f780d28de2e3cf7f6b26b9626321dba75719736e':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
Lajos Molnar [Fri, 28 Mar 2014 01:45:10 +0000 (01:45 +0000)]
am
3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
* commit '
3d4e4fcbcfc5c16dd794591727f5c713831ab6dc':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
Zhijun He [Thu, 27 Mar 2014 23:46:15 +0000 (16:46 -0700)]
CameraMetadata: Fix String tag update null character issue
String8.size() doesn't count the null character in whatever case. But camera
metadata tag android.jpeg.gpsProcessingMethod need a null-terminited string.
Bug:
13679912
Change-Id: I91e742702b16b9ab9b42f9822de189a9a96e8e53
Lajos Molnar [Fri, 28 Mar 2014 00:11:23 +0000 (00:11 +0000)]
Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
Lajos Molnar [Fri, 28 Mar 2014 00:11:04 +0000 (00:11 +0000)]
Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev