OSDN Git Service
Yin-Chia Yeh [Wed, 25 Mar 2015 00:05:59 +0000 (00:05 +0000)]
Merge "Camera: fix metadata assertion"
Yin-Chia Yeh [Tue, 24 Mar 2015 23:51:41 +0000 (16:51 -0700)]
Camera: fix metadata assertion
Bug:
19897963
Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
Phil Burk [Tue, 24 Mar 2015 22:51:26 +0000 (22:51 +0000)]
Merge "AudioFlinger: call SPDIF wrapper from AudioFlinger"
Yin-Chia Yeh [Tue, 24 Mar 2015 22:41:04 +0000 (22:41 +0000)]
Merge "camera: update CameraModule"
Glenn Kasten [Tue, 24 Mar 2015 21:48:03 +0000 (21:48 +0000)]
Merge "AudioRecord TRANSFER_OBTAIN can be used with FAST flag"
Glenn Kasten [Tue, 24 Mar 2015 20:41:37 +0000 (20:41 +0000)]
Merge "AudioRecord::read() can be non-blocking to match AudioTrack"
Wally Yau [Tue, 24 Mar 2015 20:32:27 +0000 (20:32 +0000)]
Merge "Make sure waitRelative is called when waitTime != INT64_MAX"
Phil Burk [Wed, 11 Feb 2015 21:40:50 +0000 (13:40 -0800)]
AudioFlinger: call SPDIF wrapper from AudioFlinger
Create an interface layer between the AudioFlinger and the HAL
that manages the wrapping and format conversion.
Removed unnecessary includes.
Handle rate conversion in getRenderPosition().
Try to open HAL with encoded format before wrapping with SPDIF.
Bug:
17566660
Change-Id: I00ad888ca15ff0f85b85efb8167c7f5ea761a244
Signed-off-by: Phil Burk <philburk@google.com>
Glenn Kasten [Tue, 24 Mar 2015 19:42:30 +0000 (19:42 +0000)]
Merge "set() in AudioRecord and AudioTracks needs no lock"
Glenn Kasten [Tue, 24 Mar 2015 19:16:53 +0000 (19:16 +0000)]
Merge "Remove AudioRecord::notificationFrames()"
Phil Burk [Tue, 24 Mar 2015 19:00:07 +0000 (19:00 +0000)]
Merge "AudioFlinger: prevent retrograde timestamps for direct mode"
Chien-Yu Chen [Tue, 24 Feb 2015 18:28:19 +0000 (10:28 -0800)]
camera: update CameraModule
1. Add more accessor methods to CameraModule to prevent exposing
raw module pointer
2. Use KeyedVector to replace array
Bug:
19897963
Change-Id: I111cc093f09f5fb3c4b13693d5d0687e1f441058
Ronghua Wu [Tue, 24 Mar 2015 16:47:09 +0000 (16:47 +0000)]
Merge "media: add ResourceManagerService"
Wei Jia [Tue, 24 Mar 2015 16:29:21 +0000 (16:29 +0000)]
Merge "MediaSync: support MediaSync in native code."
Wally Yau [Tue, 24 Mar 2015 16:10:58 +0000 (09:10 -0700)]
Make sure waitRelative is called when waitTime != INT64_MAX
b/
19870971
(cherry picked from commit
c600af1459c455583e071e653f0d998032aa423e)
Change-Id: Ic6bb54067d76c96ff6fc45431dc2d72db9f0a3a8
Jeff Tinker [Tue, 24 Mar 2015 00:05:43 +0000 (00:05 +0000)]
Merge "Report key request message type for unprefixed EME"
Ronghua Wu [Wed, 11 Mar 2015 22:10:32 +0000 (15:10 -0700)]
media: add ResourceManagerService
Bug:
19620911
Change-Id: Iea173d310d31781bc50effe3d9bd6553cb5139eb
Glenn Kasten [Fri, 20 Mar 2015 17:58:21 +0000 (10:58 -0700)]
AudioRecord::read() can be non-blocking to match AudioTrack
Change-Id: I23b9466b81ab6037d0bccd5e6f5974b7bd4aeacb
Glenn Kasten [Fri, 20 Mar 2015 16:01:44 +0000 (09:01 -0700)]
set() in AudioRecord and AudioTracks needs no lock
Change-Id: I9d61b3d117e9b21fbbfad772d8981a5abb8fafae
Glenn Kasten [Fri, 20 Mar 2015 15:55:02 +0000 (08:55 -0700)]
Remove AudioRecord::notificationFrames()
This API was unused, and is not present in AudioTrack
Change-Id: I66a1eedc149af085269c0f438c3c8d4e226a0e5b
Glenn Kasten [Wed, 18 Mar 2015 19:57:28 +0000 (12:57 -0700)]
AudioRecord TRANSFER_OBTAIN can be used with FAST flag
Change-Id: I001ba1a88150dddf79d99baf5927f31799745eef
Phil Burk [Thu, 19 Mar 2015 21:30:21 +0000 (14:30 -0700)]
AudioFlinger: prevent retrograde timestamps for direct mode
Prevent retrograde motion in the HAL or drivers from making it
up through the AudioFlinger to the app.
Bug:
19604395
Change-Id: I11d6c0f7cab69e75fd4b4a2a90f64960b4bb6d5a
Signed-off-by: Phil Burk <philburk@google.com>
Glenn Kasten [Fri, 20 Mar 2015 16:05:01 +0000 (09:05 -0700)]
Logging
Move log of latency to where it is first computed.
Log more parameters when a fast track is denied by client.
Log session ID in destructor.
Remove obsolete ALOGV that were for debugging a particular problem.
Log more parameters of set().
Change-Id: I0156bceaf397f2faa053214572c57136705685ee
Andy Hung [Mon, 23 Mar 2015 18:55:48 +0000 (18:55 +0000)]
Merge "Fix position when restoring streaming audio track"
Glenn Kasten [Mon, 23 Mar 2015 18:29:32 +0000 (18:29 +0000)]
Merge "Update AudioRecord comments to match AudioTrack"
Glenn Kasten [Mon, 23 Mar 2015 18:29:19 +0000 (18:29 +0000)]
Merge "Update AudioTrack constructor and set() comments"
Glenn Kasten [Mon, 23 Mar 2015 18:14:39 +0000 (18:14 +0000)]
Merge "Update AudioTrack code to match AudioRecord"
Glenn Kasten [Mon, 23 Mar 2015 17:59:04 +0000 (17:59 +0000)]
Merge "Update AudioTrack comments to match AudioRecord"
Glenn Kasten [Mon, 23 Mar 2015 17:29:23 +0000 (17:29 +0000)]
Merge "AudioTrack::dump() comment"
Glenn Kasten [Mon, 23 Mar 2015 17:21:03 +0000 (17:21 +0000)]
Merge "AudioRecord::releaseBuffer() buffer is const *, like AudioTrack"
Glenn Kasten [Mon, 23 Mar 2015 16:57:00 +0000 (16:57 +0000)]
Merge "Remove dead AudioTrack::setAttributesFromStreamType()"
Glenn Kasten [Mon, 23 Mar 2015 16:36:52 +0000 (16:36 +0000)]
Merge "Deprecate AudioRecord::getInput() and AudioTrack::getOutput()"
Glenn Kasten [Mon, 23 Mar 2015 16:22:35 +0000 (16:22 +0000)]
Merge "namespace does not need a closing semicolon"
Glenn Kasten [Mon, 23 Mar 2015 16:09:01 +0000 (16:09 +0000)]
Merge "Declare and initialize in one statement"
Glenn Kasten [Mon, 23 Mar 2015 16:05:18 +0000 (16:05 +0000)]
Merge "Move AudioTrack::isOffloaded() and isDirect() variants"
Glenn Kasten [Mon, 23 Mar 2015 15:56:19 +0000 (15:56 +0000)]
Merge "Whitespace"
Glenn Kasten [Mon, 23 Mar 2015 15:47:44 +0000 (15:47 +0000)]
Merge "Add FIXME to deprecate AudioTrack::getMinFrameCount()"
Glenn Kasten [Mon, 23 Mar 2015 15:39:37 +0000 (15:39 +0000)]
Merge "Update AudioRecord comments to match AudioTrack"
Glenn Kasten [Mon, 23 Mar 2015 15:30:42 +0000 (15:30 +0000)]
Merge "Fix typos"
Glenn Kasten [Fri, 20 Mar 2015 17:59:40 +0000 (10:59 -0700)]
Update AudioRecord comments to match AudioTrack
Change-Id: I02cb51af058277991ad0b1b5dce45744b8e8c129
Glenn Kasten [Fri, 20 Mar 2015 17:56:35 +0000 (10:56 -0700)]
Update AudioTrack constructor and set() comments
Comments were missing for recently added parameters.
Change-Id: I414594fed56317112be5f3b415871d77e7f7e282
Glenn Kasten [Fri, 20 Mar 2015 17:54:51 +0000 (10:54 -0700)]
Update AudioTrack code to match AudioRecord
session ID check
buffer error code check
Change-Id: I092a61adfd249122f9127dceedf67c0a3bdcfe7b
Glenn Kasten [Fri, 20 Mar 2015 17:54:24 +0000 (10:54 -0700)]
Update AudioTrack comments to match AudioRecord
Change-Id: I176a4830513a0b37c38f86815fe637093b9ad52f
Glenn Kasten [Fri, 20 Mar 2015 17:04:25 +0000 (10:04 -0700)]
AudioTrack::dump() comment
Change-Id: Id3b5210293a77404189555a0c797fb099e3c6c04
Glenn Kasten [Fri, 20 Mar 2015 17:06:37 +0000 (10:06 -0700)]
AudioRecord::releaseBuffer() buffer is const *, like AudioTrack
Change-Id: If09689a8411392281ad06fcf781f3198941c642d
Glenn Kasten [Fri, 20 Mar 2015 16:55:57 +0000 (09:55 -0700)]
Remove dead AudioTrack::setAttributesFromStreamType()
Change-Id: I34feb3f9df49458f8a81ddcced4dd769fdaca945
Glenn Kasten [Fri, 20 Mar 2015 15:55:18 +0000 (08:55 -0700)]
Deprecate AudioRecord::getInput() and AudioTrack::getOutput()
Does not completely fix the bug, but is a step in the right direction.
Bug:
12593118
Change-Id: Id591cd700ab58fd927ae44c71c81dac55b5cac2d
Glenn Kasten [Fri, 20 Mar 2015 16:09:33 +0000 (09:09 -0700)]
namespace does not need a closing semicolon
Change-Id: Ie8f9d42fc061f6d558f23b98414e04eb3d14b376
Glenn Kasten [Fri, 20 Mar 2015 16:04:21 +0000 (09:04 -0700)]
Declare and initialize in one statement
Change-Id: Ie8593692907e67558f9d7654c9a4bf8cbce99bd8
Glenn Kasten [Fri, 20 Mar 2015 16:00:14 +0000 (09:00 -0700)]
Move AudioTrack::isOffloaded() and isDirect() variants
to be near each other.
Change-Id: Ic26681716ea48886f0bfed23803240466db5d8fa
Glenn Kasten [Fri, 20 Mar 2015 15:59:18 +0000 (08:59 -0700)]
Whitespace
Change-Id: I4640be948ad3caff0eb7525991398a1353e4bfe6
Glenn Kasten [Fri, 20 Mar 2015 15:57:24 +0000 (08:57 -0700)]
Add FIXME to deprecate AudioTrack::getMinFrameCount()
Continuation of previous change, for all APIs that assume a route
Change-Id: Ia1315032cf6366f428db342b16b2e1c3b574f407
Glenn Kasten [Fri, 20 Mar 2015 15:54:17 +0000 (08:54 -0700)]
Update AudioRecord comments to match AudioTrack
Change-Id: I6c3620c60c0ba159e4688b42de4ec8b91920e048
Glenn Kasten [Mon, 16 Mar 2015 21:55:53 +0000 (14:55 -0700)]
Fix typos
Fix typos in comments
Add formal parameter name to declaration where it was missing
Fix out of order comments
Change-Id: I1de81ae82af5ca507864e4c7b959111bac898b98
Qiwen Zhao [Sun, 22 Mar 2015 00:40:44 +0000 (00:40 +0000)]
am
de68ef61: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit '
de68ef61adef43be293e81ed1e8adcee8ebbbe04':
Marco Nelissen [Sun, 22 Mar 2015 00:40:42 +0000 (00:40 +0000)]
am
f1300d31: am
cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"
* commit '
f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba':
ulaw and alaw aren't limited to 8kHz
Ruben Brunk [Thu, 19 Mar 2015 06:11:57 +0000 (23:11 -0700)]
camera2: Remove ProCamera.
Bug:
19186859
Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
Qiwen Zhao [Sat, 21 Mar 2015 04:16:15 +0000 (21:16 -0700)]
reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
Qiwen Zhao [Fri, 20 Mar 2015 23:53:38 +0000 (16:53 -0700)]
reset to lmp-mr1-dev-plus-aosp with history.
hkuang [Fri, 20 Mar 2015 23:51:26 +0000 (23:51 +0000)]
am
1830c701: am
90073050: Merge "Fix the bug that same video frame has been decoded twice during port reconfig." into lmp-dev
* commit '
1830c7015989a10a803ebff8d710c2655ec9d81d':
Wei Jia [Fri, 20 Mar 2015 23:51:24 +0000 (23:51 +0000)]
am
6e2ced09: am
d3db0bfa: Merge "NuPlayer: add seek operation when change video texture surface." into lmp-dev
* commit '
6e2ced090d64e0ddeb274035dc4ffaf6b01153b0':
Marco Nelissen [Fri, 20 Mar 2015 23:51:22 +0000 (23:51 +0000)]
am
e866880a: am
d71233a8: Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-dev
* commit '
e866880ae1709062e0a8b36e62a78d91c3f06cc9':
Marco Nelissen [Fri, 20 Mar 2015 23:51:20 +0000 (23:51 +0000)]
am
e8d39b9d: am
acdae5d7: Merge "Move stale handler cleanup to constructor" into lmp-dev
* commit '
e8d39b9d70c69656e897fece70df0c0bfa5bfb88':
Marco Nelissen [Fri, 20 Mar 2015 23:51:18 +0000 (23:51 +0000)]
am
ba19ee84: am
ea8462cc: Merge "Fix more potential deadlocks in ALooperRoster" into lmp-dev
* commit '
ba19ee846cef06e2c70adfd6be7e17ae26cb14e1':
Glenn Kasten [Fri, 20 Mar 2015 23:51:16 +0000 (23:51 +0000)]
am
955d8f90: am
23c8cf95: Merge "Restore the ability to build tee sink for debugging" into lmp-dev
* commit '
955d8f906e920fe8da66e7943a7f2bfa98422e19':
Chong Zhang [Fri, 20 Mar 2015 23:51:14 +0000 (23:51 +0000)]
am
85b41b0f: am
453d633b: Merge "render one video frame after flush even when we\'re paused" into lmp-dev
* commit '
85b41b0f1fd9b683e3075cac53d522e664ee2ac7':
Eric Laurent [Fri, 20 Mar 2015 23:51:12 +0000 (23:51 +0000)]
am
3d640e0a: am
97d547da: audio flinger: fix use of global effect buffer
* commit '
3d640e0a93e31bb53e671ed467774b63bb69750e':
Ruben Brunk [Fri, 20 Mar 2015 23:51:10 +0000 (23:51 +0000)]
am
b3b4f875: am
b72726ba: Merge "camera1: Ensure MemoryHeap buffers are mmapped before copying." into lmp-dev
* commit '
b3b4f8758f5cc384c9464f56bdd38b279eedc52b':
Ronghua Wu [Fri, 20 Mar 2015 23:51:05 +0000 (23:51 +0000)]
am
0b9a8c06: am
e4478feb: Merge "Add adaptive playback support to VPX decoder." into lmp-dev
* commit '
0b9a8c060f8bd229ef7c7680e80452bf982d8a3d':
Wei Jia [Fri, 20 Mar 2015 23:51:02 +0000 (23:51 +0000)]
am
18e24608: am
e7494680: Merge "NuPlayerRenderer: stop feeding AudioSink when paused." into lmp-dev
* commit '
18e24608d92a204191101a374ded26498caf02d9':
Ronghua Wu [Fri, 20 Mar 2015 23:51:00 +0000 (23:51 +0000)]
am
d4fece27: am
64a385d5: Merge "GenericSource: set DRM playback status." into lmp-dev
* commit '
d4fece27b2fa8c84ae4f0fcfba5050028ef55d57':
Wei Jia [Fri, 20 Mar 2015 23:50:57 +0000 (23:50 +0000)]
am
f910a3df: am
c9d62de7: Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." into lmp-dev
* commit '
f910a3dfeb3fb58c297a37757e28150462fe1e9e':
Rachad [Fri, 20 Mar 2015 23:50:54 +0000 (23:50 +0000)]
am
760cfc90: am
b6b927fc: Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match Audio stack api." into lmp-dev
* commit '
760cfc9000c815913305b8714bdde39855df3753':
Lajos Molnar [Fri, 20 Mar 2015 23:50:50 +0000 (23:50 +0000)]
am
42174336: am
3049c672: Merge "stagefright: add codec capability info for google video codecs" into lmp-dev
* commit '
4217433611bf804d8fcdee0f3a2369c4c4610823':
Eric Laurent [Fri, 20 Mar 2015 23:50:49 +0000 (23:50 +0000)]
am
50ae18d3: am
4030b561: Merge "sound trigger: fix cross deadlock between service and client" into lmp-dev
* commit '
50ae18d38005489b5c3e99610118507bc89ec84e':
Eric Laurent [Fri, 20 Mar 2015 23:50:41 +0000 (23:50 +0000)]
am
8b747c28: am
9a63396f: Merge "audio policy: fix input source passed to openInput()" into lmp-dev
* commit '
8b747c28f84abcec7aa7e672d0450d4ddceefb1e':
Dmitry Shmidt [Fri, 20 Mar 2015 23:50:39 +0000 (23:50 +0000)]
am
f6de317d: am
7fa42078: Merge "audiopolicy: Indicate output device change to all input threads for pre-processing" into lmp-dev
* commit '
f6de317dad8fef9a16cbbcd9c0f490dc4bb6504e':
Bart Sears [Fri, 20 Mar 2015 23:50:37 +0000 (23:50 +0000)]
am
ea765de0: am
c2aa6971: Merge "[AU]Sync libmedia/Android.mk modification from KLP-Sprout" into lmp-dev
* commit '
ea765de0b5bfa8d1d29534c4e8500cdc66e4b5e6':
bryant_liu [Fri, 20 Mar 2015 23:50:35 +0000 (23:50 +0000)]
am
2725169a: am
890a5637: frameworks: av: AudioPolicyEffect: Add refCount for each session
* commit '
2725169aa7e5c18cf8b5b20a14b1153bb9073b38':
Eino-Ville Talvala [Fri, 20 Mar 2015 23:50:33 +0000 (23:50 +0000)]
am
d6c3c431: am
8b250cb6: Merge "CameraService: Create a dummy stream when 0 streams are requested." into lmp-dev
* commit '
d6c3c431efc01a27caa27043724cbcef14199805':
Robert Shih [Fri, 20 Mar 2015 23:50:30 +0000 (23:50 +0000)]
am
7f7510ff: am
6868628c: Merge "PlaylistFetcher: add lower bound check when starting live streams" into lmp-dev
* commit '
7f7510fff99385ed1a937c1ab907c6d01df953ea':
Paul McLean [Fri, 20 Mar 2015 23:50:28 +0000 (23:50 +0000)]
am
131ff148: am
8962e08c: Merge "Fix audio dropouts with multiple playback streams." into lmp-dev
* commit '
131ff14853a45beb336cdd39b5ebfe51647272c0':
Eric Laurent [Fri, 20 Mar 2015 23:50:26 +0000 (23:50 +0000)]
am
dca12b44: am
47f64f2e: Merge "audio policy: remove audio patch when closing input or output" into lmp-dev
* commit '
dca12b44dd67ac074674888a91d08c83add2324a':
Yin-Chia Yeh [Fri, 20 Mar 2015 23:50:23 +0000 (23:50 +0000)]
am
1c1688e5: am
01b9256a: Merge "cameraservice: decrease zsl metadata queue size by 1" into lmp-dev
* commit '
1c1688e50629cc8b2b73b382dd673dfa4294c4bc':
Zhijun He [Fri, 20 Mar 2015 23:50:22 +0000 (23:50 +0000)]
am
19f0e163: am
13d98f41: Merge "Camera API1: Fix ZSLProcessor3 deadlock" into lmp-dev
* commit '
19f0e163b74bf426912bf66b7527111830891539':
Marco Nelissen [Fri, 20 Mar 2015 23:50:20 +0000 (23:50 +0000)]
am
02d67d52: am
277090f1: Merge "Fix potential deadlock in unregisterStaleHandlers()" into lmp-dev
* commit '
02d67d529ac52e38a3667844f6f496a1921f7a51':
Ronghua Wu [Fri, 20 Mar 2015 23:50:18 +0000 (23:50 +0000)]
am
1b6d6789: am
d362ea17: Merge "AudioPlayback: delay the post of EOS based on pending playout." into lmp-dev
* commit '
1b6d6789f862a0b37b5f7f323cbb39995ff29e4e':
Eino-Ville Talvala [Fri, 20 Mar 2015 23:50:16 +0000 (23:50 +0000)]
am
599e09a0: am
1754351d: CameraService: Correct API2 error handling
* commit '
599e09a0a559143a2337722e53e6e46cb5f6af3e':
Marco Nelissen [Fri, 20 Mar 2015 23:50:10 +0000 (23:50 +0000)]
am
dd801765: am
60ffbe05: Merge "Fix memory leak in getConnectionState" into lmp-dev
* commit '
dd8017650749ac8d133df9a482540ddc1a25a975':
Andy Hung [Fri, 20 Mar 2015 23:50:07 +0000 (23:50 +0000)]
am
0aaa4f33: am
9dd4a2dd: Merge "Fix AudioMixer MONO muted track handling" into lmp-dev
* commit '
0aaa4f3312353f9a20600c244d77a355ea525789':
Wei Jia [Fri, 20 Mar 2015 23:50:05 +0000 (23:50 +0000)]
am
429b4f7f: am
5bc5b4fb: Merge "NuPlayer: set controlledByApp to true when creating Surface." into lmp-dev
* commit '
429b4f7f425c68e785dea5fa93914bf687cbcaa6':
Marco Nelissen [Fri, 20 Mar 2015 23:50:02 +0000 (23:50 +0000)]
am
faf71460: am
355286ee: Merge "Fix SoundPool lockup" into lmp-dev
* commit '
faf7146006ea8b44a745f4f61d3c9de14e88e2b4':
Chong Zhang [Fri, 20 Mar 2015 23:49:58 +0000 (23:49 +0000)]
am
ab4ff31a: am
5bbffc05: Merge "do string compare with mime immediately after we get the value" into lmp-dev
* commit '
ab4ff31a0ef2650f7d09f5f18ae1df580f5eefd0':
Rachad Alao [Fri, 20 Mar 2015 23:49:54 +0000 (23:49 +0000)]
am
042eac90: am
d42173a4: Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-dev
* commit '
042eac90a5a0e8e4ccaa851bd4f96b237d4ec59f':
Lajos Molnar [Fri, 20 Mar 2015 23:49:51 +0000 (23:49 +0000)]
am
3650440a: am
8dad3f60: Merge "NuPlayer: remember and resubmit CSDs after flush" into lmp-dev
* commit '
3650440a962e6636dcc284fbd8fd3c127939b344':
Robert Shih [Fri, 20 Mar 2015 23:49:49 +0000 (23:49 +0000)]
am
7ccd53f9: am
9c42bf25: Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-dev
* commit '
7ccd53f9d19823489f18be978320a4537d88a7f8':
Lajos Molnar [Fri, 20 Mar 2015 23:49:46 +0000 (23:49 +0000)]
am
23718a84: am
34febc96: stagefright: process CSD regardless of what port was last queued
* commit '
23718a84fb2f9932b484dabb748c761c37af3742':
Wei Jia [Fri, 20 Mar 2015 23:49:40 +0000 (23:49 +0000)]
am
211aae92: am
848726d8: Merge "MediaCodec: handle errors during flushing." into lmp-dev
* commit '
211aae92d3f48a56f266a2b933d6f53b625098b0':
Chong Zhang [Fri, 20 Mar 2015 23:49:32 +0000 (23:49 +0000)]
am
008cee91: am
052efa49: Merge "wait for flush to finish before returning setSurface" into lmp-dev
* commit '
008cee913577839d2377ff79bf4f26655c3a2c7d':
Chong Zhang [Fri, 20 Mar 2015 23:49:19 +0000 (23:49 +0000)]
am
44945f04: am
43febe72: Merge "add buffering update to GenericSource" into lmp-dev
* commit '
44945f04a5f6bbbb79447446a9d12d37d474ab6f':
OSDN Git Service
