OSDN Git Service
Lajos Molnar [Wed, 19 Mar 2014 22:21:53 +0000 (15:21 -0700)]
stagefright: initial media_codecs_google*.xml files
Separated description of Google-provided codecs into their own
files based on domain. Google-provided audio/telephony codecs
should be included prior to specifying vendor codecs. Google-
provided video codecs should be included after vendor codecs.
Bug:
13549114
Change-Id: I216f01feaf0379c6cd7d8714e02792fdf2214a90
Lajos Molnar [Wed, 19 Mar 2014 03:24:56 +0000 (03:24 +0000)]
am
129c7653: am
9cde5172: am
b635b0e6: mediaplayer: keep more buffers with the BufferQueue
* commit '
129c76538570cd42fce2154bfb0aec934cf84ff3':
mediaplayer: keep more buffers with the BufferQueue
Lajos Molnar [Wed, 19 Mar 2014 03:15:12 +0000 (03:15 +0000)]
am
9cde5172: am
b635b0e6: mediaplayer: keep more buffers with the BufferQueue
* commit '
9cde517297827156de1c3b2ff54e272a5d4ae7c3':
mediaplayer: keep more buffers with the BufferQueue
Lajos Molnar [Wed, 19 Mar 2014 03:10:58 +0000 (03:10 +0000)]
am
b635b0e6: mediaplayer: keep more buffers with the BufferQueue
* commit '
b635b0e66b257ab442e230bca96afd5105cf6829':
mediaplayer: keep more buffers with the BufferQueue
Robert Shih [Wed, 19 Mar 2014 02:34:48 +0000 (02:34 +0000)]
am
49b2e310: am
a1f0c62c: am
43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.
* commit '
49b2e310f62c590a1af9f921cd8a134cdf589263':
httplive: block-by-block fetch, decrypt, and parse ts files.
Robert Shih [Wed, 19 Mar 2014 02:25:39 +0000 (02:25 +0000)]
am
a1f0c62c: am
43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.
* commit '
a1f0c62c189f2d162cca4af736c3d440f1eff53c':
httplive: block-by-block fetch, decrypt, and parse ts files.
Robert Shih [Wed, 19 Mar 2014 02:19:55 +0000 (02:19 +0000)]
am
43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.
* commit '
43ca783effd99bba0e6e2dd6fe177a8888578ef8':
httplive: block-by-block fetch, decrypt, and parse ts files.
Lajos Molnar [Thu, 13 Feb 2014 23:29:49 +0000 (15:29 -0800)]
mediaplayer: keep more buffers with the BufferQueue
Change OMX buffer allocation policy to allocate
nBufferCountMin + what is required for the BQ.
For the BQ, try to allocate 2 additional buffers than
the minimum undequeued count.
Also account for the fact that BQ may return one less
than the actual minimum undequeued count.
In most cases the resulting number of buffers ends up
being the same as with the previous policy, but we
keep more buffers with the BQ.
Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d
Bug:
13170236
Robert Shih [Thu, 27 Feb 2014 20:33:24 +0000 (12:33 -0800)]
httplive: block-by-block fetch, decrypt, and parse ts files.
Bug:
12060952
Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
Colin Cross [Tue, 18 Mar 2014 23:38:15 +0000 (23:38 +0000)]
am
c7c839dc: am
b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"
* commit '
c7c839dccf58ab6322c1898cbf1b2332792d2e86':
libstagefright_foundation: fix printf format for 64-bit
Colin Cross [Tue, 18 Mar 2014 23:30:04 +0000 (23:30 +0000)]
am
b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"
* commit '
b2ecad7f079f4f852d334e67fd7a72ff1696a78e':
libstagefright_foundation: fix printf format for 64-bit
Colin Cross [Tue, 18 Mar 2014 23:20:52 +0000 (23:20 +0000)]
Merge "libstagefright_foundation: fix printf format for 64-bit"
Colin Cross [Tue, 18 Mar 2014 23:18:27 +0000 (16:18 -0700)]
libstagefright_foundation: fix printf format for 64-bit
Fixes build error:
frameworks/av/media/libstagefright/foundation/ANetworkSession.cpp:582:131: error: format '%d' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Werror=format=]
ALOGI("%d datagrams remain queued.", mOutFragments.size());
^
cc1plus: all warnings being treated as errors
Change-Id: I69d1f086b8f1e450f107671c8f8f3ed696d170b4
Glenn Kasten [Tue, 18 Mar 2014 20:52:42 +0000 (20:52 +0000)]
am
0c282de7: am
77658a06: Merge "AudioPolicyService: malloc/delete pair"
* commit '
0c282de73240b1efce64558ab2fa0a8be1f4292b':
AudioPolicyService: malloc/delete pair
Eric Laurent [Tue, 18 Mar 2014 19:29:19 +0000 (19:29 +0000)]
Merge "audioflinger: OffloadThread fix for resume underrun"
Eric Laurent [Tue, 18 Mar 2014 19:28:44 +0000 (19:28 +0000)]
Merge "AudioFlinger: Change track ready condition in STOPPING_1 state"
Eric Laurent [Tue, 18 Mar 2014 19:28:04 +0000 (19:28 +0000)]
Merge "audioflinger: Handle pause /resume in stopping state"
Glenn Kasten [Tue, 18 Mar 2014 19:08:37 +0000 (19:08 +0000)]
am
098b28fc: am
64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"
* commit '
098b28fc88b3d96eada2f9db318d9c38c70cf674':
More precise 32-bit only for libstagefright/ subdirectories
Dan Stoza [Tue, 18 Mar 2014 17:55:05 +0000 (17:55 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Glenn Kasten [Tue, 18 Mar 2014 17:40:58 +0000 (17:40 +0000)]
am
77658a06: Merge "AudioPolicyService: malloc/delete pair"
* commit '
77658a069c81a0d5b4a1b81443b470a3ea64cab0':
AudioPolicyService: malloc/delete pair
Glenn Kasten [Tue, 18 Mar 2014 17:31:25 +0000 (17:31 +0000)]
Merge "AudioPolicyService: malloc/delete pair"
Glenn Kasten [Tue, 18 Mar 2014 17:21:30 +0000 (17:21 +0000)]
am
64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"
* commit '
64727dd7c8513b6c9ddcce2f4b305618bb76121c':
More precise 32-bit only for libstagefright/ subdirectories
Glenn Kasten [Tue, 18 Mar 2014 17:13:23 +0000 (17:13 +0000)]
Merge "More precise 32-bit only for libstagefright/ subdirectories"
Eric Laurent [Tue, 18 Mar 2014 17:04:52 +0000 (17:04 +0000)]
Merge "audio policy: renamed AudioPolicyManagerBase to AudioPolicyManager"
Eric Laurent [Tue, 18 Mar 2014 17:03:54 +0000 (17:03 +0000)]
Merge "audio policy: remove dependency from AudioSystemLegacy"
Dan Stoza [Tue, 18 Mar 2014 16:52:04 +0000 (16:52 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Dan Stoza [Tue, 18 Mar 2014 16:51:25 +0000 (16:51 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Eric Laurent [Tue, 18 Mar 2014 15:56:41 +0000 (15:56 +0000)]
Merge "audio policy: import audio policy manager from hardware legacy"
Eric Laurent [Tue, 18 Mar 2014 01:54:53 +0000 (01:54 +0000)]
Merge "audio policy: split implementation"
Haynes Mathew George [Fri, 7 Mar 2014 21:43:49 +0000 (13:43 -0800)]
audioflinger: OffloadThread fix for resume underrun
AudioFlinger can miss resuming h/w on a pause->resume transition
if sufficient data isn't available
Bug:
11358524.
Change-Id: Ic3c75256290d3515fd4a96dfcc900909fbe5bc15
Eric Laurent [Tue, 18 Mar 2014 00:22:08 +0000 (17:22 -0700)]
AudioFlinger: Change track ready condition in STOPPING_1 state
Set FS_FILLED only if framesReady() > 0
Change-Id: Ibb1d2e988ff17fcf3a7ab61031a3f85df82f18d5
Krishnankutty Kolathappilly [Wed, 5 Feb 2014 00:23:42 +0000 (16:23 -0800)]
audioflinger: Handle pause /resume in stopping state
-Pre-requisite:
Perform seek on the clip. After seek the data remaining till EOS
is little more than the driver and common block buffering.
-Framework state:
Offload thread is waiting for signal from the HAL for a free
buffer. Audio Player calls sink stop on reaching EOS. Audio
track is waiting on obtain buffer for a free space in common
block to send the last buffer. The track is moved to stopping
state as input EOS is reached.
-Issue:
Perform pause/ resume in this state(STOPPING), Audio playback
does not resume.
-Fix
Ensure resume is called in stopping state if frames ready is
greater than zero.
Bug:
12870871
Change-Id: Ib1378c4ee5ce4bea655691e93de0775f7b1d2804
Signed-off-by: Glenn Kasten <gkasten@google.com>
Igor Murashkin [Tue, 18 Mar 2014 00:32:24 +0000 (00:32 +0000)]
am
557847ee: am
a6ca0acf: am
bd3e2e03: camera2: Fix segfault when using null availability listener
* commit '
557847ee511dd5e75d584ff04449322f0f098241':
camera2: Fix segfault when using null availability listener
Igor Murashkin [Tue, 18 Mar 2014 00:20:54 +0000 (00:20 +0000)]
am
a6ca0acf: am
bd3e2e03: camera2: Fix segfault when using null availability listener
* commit '
a6ca0acf0d009acf45b05561273aaad44ab22533':
camera2: Fix segfault when using null availability listener
Eric Laurent [Tue, 18 Mar 2014 00:14:12 +0000 (00:14 +0000)]
Merge "move audio policy service to a separate library"
Glenn Kasten [Mon, 17 Mar 2014 23:32:11 +0000 (23:32 +0000)]
am
9a9481f8: am
0e7e5db7: Merge "More 32-bit only"
* commit '
9a9481f89b26211b20d7f3fde3d54b455843bf70':
More 32-bit only
Igor Murashkin [Mon, 17 Mar 2014 22:56:00 +0000 (22:56 +0000)]
am
bd3e2e03: camera2: Fix segfault when using null availability listener
* commit '
bd3e2e03f3ab686c52982a9e50cae853128172cf':
camera2: Fix segfault when using null availability listener
Ruben Brunk [Tue, 11 Mar 2014 01:59:38 +0000 (18:59 -0700)]
camera3: Remove old vendor tag ops dependencies.
Bug:
12134423
Change-Id: I7acdf76d4c0674bdb1cc939592d4620687c785c3
Igor Murashkin [Mon, 17 Mar 2014 21:00:29 +0000 (14:00 -0700)]
camera2: Don't log vendor tag errors when camera HAL too old
Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
Igor Murashkin [Mon, 17 Mar 2014 20:01:41 +0000 (13:01 -0700)]
camera2: Fix segfault when using null availability listener
ICameraService::addListener / removeListener will now return BAD_VALUE
if a null listener is used.
Bug:
12891434
Change-Id: I9764110094d8fd42e22fcc8df3ef0e73c1b070e7
Glenn Kasten [Mon, 17 Mar 2014 18:49:35 +0000 (11:49 -0700)]
More precise 32-bit only for libstagefright/ subdirectories
Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
Glenn Kasten [Mon, 17 Mar 2014 18:42:41 +0000 (18:42 +0000)]
am
0e7e5db7: Merge "More 32-bit only"
* commit '
0e7e5db7a0e70fd90fc61133b6a109c85eab29bf':
More 32-bit only
Glenn Kasten [Mon, 17 Mar 2014 18:36:00 +0000 (18:36 +0000)]
Merge "More 32-bit only"
Glenn Kasten [Sat, 15 Mar 2014 00:33:58 +0000 (00:33 +0000)]
Merge "Make error handling more similar for output and capture"
Marco Nelissen [Sat, 15 Mar 2014 00:30:45 +0000 (00:30 +0000)]
am
0dc35830: (-s ours) am
8788c40c: am
75dcf510: Merge "Verify certificates" into klp-dev
* commit '
0dc3583043bb578b149e50a9928894eff2819508':
Verify certificates
Glenn Kasten [Fri, 14 Mar 2014 22:36:20 +0000 (15:36 -0700)]
More 32-bit only
Change-Id: Ic333215e39757f91b12d66b8a9ad7f43c8ba8b36
Marco Nelissen [Fri, 14 Mar 2014 23:33:07 +0000 (23:33 +0000)]
am
8788c40c: am
75dcf510: Merge "Verify certificates" into klp-dev
* commit '
8788c40c7b5bdcaef1dcaa7f36598ae767880047':
Verify certificates
Marco Nelissen [Fri, 14 Mar 2014 22:55:52 +0000 (22:55 +0000)]
am
75dcf510: Merge "Verify certificates" into klp-dev
* commit '
75dcf5101c90e31bbac95694d835b0e8f57ba720':
Verify certificates
Marco Nelissen [Fri, 14 Mar 2014 22:27:17 +0000 (22:27 +0000)]
Merge "Verify certificates" into klp-dev
Glenn Kasten [Thu, 13 Mar 2014 22:08:51 +0000 (15:08 -0700)]
Make error handling more similar for output and capture
And simplify error case
Change-Id: I0bb1ec252945d672cc4cef137977b912f1b23d51
Glenn Kasten [Tue, 24 Sep 2013 18:52:37 +0000 (11:52 -0700)]
Make error handling for audio driver initCheck more similar
Change-Id: I8222f00f7ac89d52235af0f64f3fee7a8c471e1e
Glenn Kasten [Thu, 13 Mar 2014 22:01:06 +0000 (15:01 -0700)]
Make session ID code similar between output and capture
Change-Id: I873a97d0e36e1a452421df4f749d51e1916797a5
Glenn Kasten [Thu, 13 Mar 2014 22:00:32 +0000 (15:00 -0700)]
Move declarations to where needed
Also remove unnecessary ALOGV and dead variable inFrameCount
Change-Id: I34547fb0fd2ff142fc60277bedfa4064e7356611
Glenn Kasten [Thu, 13 Mar 2014 21:59:59 +0000 (14:59 -0700)]
Remove name output parameter from createTrack
It was only used for one log.
A better solution will be a per-track unique ID.
Change-Id: Ia440e02ae4a5a4019a9a2d08970e1ee93ac4c3a3
Glenn Kasten [Thu, 13 Mar 2014 22:05:25 +0000 (15:05 -0700)]
Replace if/else by switch
Change-Id: Ibe96c8fb1f0ba7f850c0561f60769ce63aceba5d
Glenn Kasten [Thu, 13 Mar 2014 22:08:33 +0000 (15:08 -0700)]
Whitespace and comments
Change-Id: I99752cca74a459c4746ea4718acb0115439e50bd
Glenn Kasten [Thu, 13 Mar 2014 22:02:40 +0000 (15:02 -0700)]
Prepare for additional capture formats
Change-Id: Ib10b004f0029191b33a97671e41b0d86ebfbe0b9
Glenn Kasten [Fri, 14 Mar 2014 21:22:08 +0000 (14:22 -0700)]
resolved conflicts for merge of
3c780188 to master
Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
Glenn Kasten [Fri, 14 Mar 2014 20:53:02 +0000 (20:53 +0000)]
am
089affb6: Merge "mediaserver and associated services are 32-bit only"
* commit '
089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
Glenn Kasten [Fri, 14 Mar 2014 20:45:50 +0000 (20:45 +0000)]
Merge "mediaserver and associated services are 32-bit only"
Andreas Huber [Fri, 14 Mar 2014 17:53:13 +0000 (17:53 +0000)]
am
f1ac623f: am
4a67fc49: Merge "Implemented support for RTSP 301 Redirect"
* commit '
f1ac623fcc6bbda2faff9752cd611182a897afe1':
Implemented support for RTSP 301 Redirect
Lajos Molnar [Fri, 14 Mar 2014 17:52:40 +0000 (17:52 +0000)]
am
fa243e07: am
466786b2: am
70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
* commit '
fa243e07f062058e7df01c052eb79086c21fbdbc':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
Lajos Molnar [Fri, 14 Mar 2014 17:52:39 +0000 (17:52 +0000)]
am
a0b94395: (-s ours) am
5b297ba7: am
67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev
* commit '
a0b94395dc82c90ca437bb6fed7aa01fcbbffffe':
httplive: clear access units before returning from seekTo.
Andy Hung [Fri, 14 Mar 2014 17:21:41 +0000 (17:21 +0000)]
Merge "Fix Offload playback in AudioFlinger"
Andy Hung [Fri, 14 Mar 2014 17:21:28 +0000 (17:21 +0000)]
Merge "Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format"""
Chong Zhang [Fri, 14 Mar 2014 17:13:05 +0000 (17:13 +0000)]
am
43d3f40b: am
bd77a1b5: am
cf49a51f: fix codec buffer leak in error handling when timestamp goes backward
* commit '
43d3f40b389904a2bdf4fd4ef8e8b914cf5a4b67':
fix codec buffer leak in error handling when timestamp goes backward
Chong Zhang [Fri, 14 Mar 2014 17:12:41 +0000 (17:12 +0000)]
am
29c291f2: (-s ours) am
a671f943: am
c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev
* commit '
29c291f2337561b1f8c2f79bc34339b0b9c28b9c':
Cap pts gap between adjacent frames to specified value
Chong Zhang [Fri, 14 Mar 2014 16:45:36 +0000 (09:45 -0700)]
resolved conflicts for merge of
28836548 to master
Change-Id: I60bf93bed97a85dd7efe53f873cd1c9764513d8f
Andreas Huber [Fri, 14 Mar 2014 15:46:13 +0000 (15:46 +0000)]
am
4a67fc49: Merge "Implemented support for RTSP 301 Redirect"
* commit '
4a67fc49d926c75fa6a96160ba5627fb0e209db6':
Implemented support for RTSP 301 Redirect
Andreas Huber [Fri, 14 Mar 2014 15:40:22 +0000 (15:40 +0000)]
Merge "Implemented support for RTSP 301 Redirect"
Lajos Molnar [Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)]
am
466786b2: am
70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
* commit '
466786b25b262f4f6e5737b3a88e8d7f6916e45c':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
Lajos Molnar [Fri, 14 Mar 2014 05:14:32 +0000 (05:14 +0000)]
am
5b297ba7: am
67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev
* commit '
5b297ba76271e8554758cbd569e73720bc914af6':
httplive: clear access units before returning from seekTo.
Lajos Molnar [Fri, 14 Mar 2014 04:10:37 +0000 (04:10 +0000)]
am
70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
* commit '
70cc5bdc0fca3f67f3602f04152c29323cad99df':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
Lajos Molnar [Fri, 14 Mar 2014 04:10:37 +0000 (04:10 +0000)]
am
67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev
* commit '
67a10c522898d8223f5a2d389a846b7e2327148a':
httplive: clear access units before returning from seekTo.
Lajos Molnar [Fri, 14 Mar 2014 00:02:07 +0000 (00:02 +0000)]
Merge changes I1455bfc6,I90c7e34b,I06e001df
* changes:
NuPlayer: use MediaCodec instead of ACodec
MediaCodec: add getInputFormat() method
Revert "NuPlayer: Use a software renderer when using software codecs"
Chong Zhang [Thu, 13 Mar 2014 23:57:22 +0000 (23:57 +0000)]
am
bd77a1b5: am
cf49a51f: fix codec buffer leak in error handling when timestamp goes backward
* commit '
bd77a1b5115d355eb1e2bc270fe9aa4ceb3d8e65':
fix codec buffer leak in error handling when timestamp goes backward
Chong Zhang [Thu, 13 Mar 2014 23:53:41 +0000 (23:53 +0000)]
am
cf49a51f: fix codec buffer leak in error handling when timestamp goes backward
* commit '
cf49a51ff59c3cd228d178d23252ac0d39d5a893':
fix codec buffer leak in error handling when timestamp goes backward
Chong Zhang [Thu, 13 Mar 2014 23:43:25 +0000 (23:43 +0000)]
am
a671f943: am
c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev
* commit '
a671f943b72155460f0c94cdd92d829cb059b571':
Cap pts gap between adjacent frames to specified value
Chong Zhang [Thu, 13 Mar 2014 23:43:24 +0000 (23:43 +0000)]
am
1e001f92: am
1c608ab3: save mGraphicBuffer pointer even when we\'re suspended
* commit '
1e001f92e748de00a3e20effa464d59d75a746b3':
save mGraphicBuffer pointer even when we're suspended
Andy Hung [Thu, 13 Mar 2014 20:59:29 +0000 (13:59 -0700)]
Fix Offload playback in AudioFlinger
This fixes Offload playback regression introduced by adding
flexible format to mSinkBuffer. Test case is AAC file playback.
Bug:
13450717
Change-Id: I0fa11978295ed4793be90c565e5b8abedf156914
Signed-off-by: Andy Hung <hunga@google.com>
Marco Nelissen [Thu, 13 Mar 2014 21:18:25 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
Andy Hung [Thu, 13 Mar 2014 20:57:33 +0000 (13:57 -0700)]
Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format""
This reverts commit
e2a9c29f35e0c09782558542fc4cf9823779590e.
Ruben Brunk [Thu, 13 Mar 2014 20:18:27 +0000 (20:18 +0000)]
Merge "camera3: Pass vendor tags through binder."
Chong Zhang [Thu, 13 Mar 2014 19:33:54 +0000 (19:33 +0000)]
am
c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev
* commit '
c69bc40a347c411751cb082b3eb4a82d976a68ec':
Cap pts gap between adjacent frames to specified value
Chong Zhang [Thu, 13 Mar 2014 19:33:54 +0000 (19:33 +0000)]
am
1c608ab3: save mGraphicBuffer pointer even when we\'re suspended
* commit '
1c608ab33acab82d4a87f1abedcc99a623d1b53a':
save mGraphicBuffer pointer even when we're suspended
Ruben Brunk [Fri, 21 Feb 2014 18:51:38 +0000 (10:51 -0800)]
camera3: Pass vendor tags through binder.
Bug:
12134423
- Adds a class for parceling vendor tag definitions.
- Passes vendor tag definitions to clients of the camera service.
- Switches over to new vendor tag mechanism when reading from HAL.
Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
Lajos Molnar [Thu, 13 Mar 2014 18:46:26 +0000 (18:46 +0000)]
Merge "mediaplayer: keep more buffers with the BufferQueue"
Eric Laurent [Thu, 13 Mar 2014 17:44:14 +0000 (10:44 -0700)]
Revert "Convert AudioFlinger mSinkBuffer to flexible format"
This reverts commit
e7e676fd2866fa4898712c4effa9e624e969c182.
Bug:
13450717.
Change-Id: Ib80b0d14428fecce33c62003a1fcf83f71cee03b
Dan Stoza [Wed, 12 Mar 2014 19:18:37 +0000 (12:18 -0700)]
Remove deprecated BufferQueue constructor
Bug:
13415624
Change-Id: I7d98eb8e9201fd920552e7eab75da42a5e2c7dca
Dan Stoza [Wed, 12 Mar 2014 21:51:29 +0000 (14:51 -0700)]
Remove deprecated BufferQueue constructor
Bug:
13415624
Change-Id: If194d12c7ce9b0ac6ea98aeb7d3d7ee53e1574c4
Dan Stoza [Wed, 12 Mar 2014 21:31:05 +0000 (14:31 -0700)]
Remove deprecated BufferQueue constructor
Bug:
13415624
Change-Id: Ifc8f778b70102a38a9f7a086632e6884714e6b58
Lajos Molnar [Wed, 12 Mar 2014 20:58:37 +0000 (20:58 +0000)]
Merge changes Ic46e3069,Idc92716b into klp-dev
* changes:
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
Lajos Molnar [Wed, 12 Mar 2014 20:58:14 +0000 (20:58 +0000)]
Merge "httplive: clear access units before returning from seekTo." into klp-dev
Marco Nelissen [Wed, 12 Mar 2014 20:34:55 +0000 (20:34 +0000)]
am
f4431278: am
19afb386: Merge "Remove streaming URI from default logs"
* commit '
f4431278a9613f55ecd944ab2e3eb615b372f269':
Remove streaming URI from default logs
Zhijun He [Wed, 12 Mar 2014 19:56:48 +0000 (19:56 +0000)]
am
708601d0: (-s ours) am
f0fb921c: am
bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size is changed
* commit '
708601d042ae2a927da2181f33da47d9b01ad411':
DO NOT MERGE: Camera: delete preview callback when preview size is changed
Glenn Kasten [Mon, 3 Mar 2014 03:48:19 +0000 (19:48 -0800)]
mediaserver and associated services are 32-bit only
also 32-bit only command-line apps
Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
Mike Lockwood [Wed, 12 Mar 2014 17:57:52 +0000 (17:57 +0000)]
Merge "MTP: Add support for device property changed events"
Marco Nelissen [Wed, 12 Mar 2014 15:46:07 +0000 (15:46 +0000)]
am
19afb386: Merge "Remove streaming URI from default logs"
* commit '
19afb3869eb6a3e3733dc1f7420e1d4c3c03d376':
Remove streaming URI from default logs
Marco Nelissen [Wed, 12 Mar 2014 15:41:55 +0000 (15:41 +0000)]
Merge "Remove streaming URI from default logs"
Zhijun He [Tue, 11 Mar 2014 23:22:02 +0000 (23:22 +0000)]
am
f0fb921c: am
bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size is changed
* commit '
f0fb921c0170fe3b8ebce8fbe3c133a99c6def9f':
DO NOT MERGE: Camera: delete preview callback when preview size is changed