OSDN Git Service
Igor Murashkin [Tue, 25 Mar 2014 20:15:40 +0000 (20:15 +0000)]
am
65550a0e: am
0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
* commit '
65550a0e17852fe657795508e3bf05bdbfb2520b':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Igor Murashkin [Tue, 25 Mar 2014 20:11:09 +0000 (20:11 +0000)]
am
0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
* commit '
0370be96e33ea0c8fb4069e704deccce43b7403c':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Eino-Ville Talvala [Tue, 25 Mar 2014 19:09:34 +0000 (19:09 +0000)]
am
4f53fe74: Merge "CameraService: deadlock fix"
* commit '
4f53fe74051026e6635ba5bdbed4f1898cb66028':
CameraService: deadlock fix
Igor Murashkin [Wed, 19 Mar 2014 01:15:23 +0000 (18:15 -0700)]
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
As a workaround, duplicate CameraParameters into CameraParameters2 to
prevent ABI break for some camera HALs that directly link into
CameraParameters.
CameraParameters2 implements the real fixes needed in the framework,
while CameraParameters is left in to satisfy older camera HALs.
Bug:
12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
Eino-Ville Talvala [Tue, 25 Mar 2014 18:14:01 +0000 (18:14 +0000)]
Merge "CameraService: deadlock fix"
Kalle Lampila [Tue, 30 Apr 2013 12:27:19 +0000 (15:27 +0300)]
CameraService: deadlock fix
Release lock before return from CameraService::dump()
Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774
Signed-off-by: Kalle Lampila <kallex.lampila@intel.com>
Colin Cross [Sat, 22 Mar 2014 00:43:32 +0000 (17:43 -0700)]
resolved conflicts for merge of
3d7c5002 to klp-modular-dev-plus-aosp
Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db
Colin Cross [Sat, 22 Mar 2014 00:23:15 +0000 (00:23 +0000)]
Merge changes I9f28bc42,I135620e0
* changes:
libcameraservice: build 64-bit
libcameraservice: fix 64-bit print format warnings
Colin Cross [Fri, 21 Mar 2014 22:09:19 +0000 (15:09 -0700)]
libcameraservice: build 64-bit
libcameraservice builds fine for 64-bit, remove LOCAL_32_BIT_ONLY
Change-Id: I9f28bc42dc424dee9b92e6ab092f86d3aa1419b7
Colin Cross [Fri, 21 Mar 2014 22:04:25 +0000 (15:04 -0700)]
libcameraservice: fix 64-bit print format warnings
Use PRId64 from inttypes.h to print nsecs_t (int64_t)
Use %zu to print size_t
Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
Lajos Molnar [Fri, 21 Mar 2014 19:26:31 +0000 (19:26 +0000)]
am
30890210: am
333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
* commit '
3089021031d6ad0f2b330567f108aec03fa13994':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
Lajos Molnar [Fri, 21 Mar 2014 19:20:27 +0000 (19:20 +0000)]
am
333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
* commit '
333ceb4f66ccf790081026f645474e07d832fbdb':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
Lajos Molnar [Fri, 21 Mar 2014 19:09:48 +0000 (19:09 +0000)]
Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
Robert Shih [Fri, 7 Feb 2014 20:26:58 +0000 (12:26 -0800)]
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
First check for embedded ID3 tag, then bail out if invalid.
Bug:
12934795
Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
Rachad [Fri, 21 Mar 2014 17:11:22 +0000 (17:11 +0000)]
am
1bfb8f76: am
f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
* commit '
1bfb8f762dd21b39756fd8fd9990172cae1cef79':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
Rachad [Fri, 21 Mar 2014 17:08:11 +0000 (17:08 +0000)]
am
f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
* commit '
f622e2c78407b50806a53a06a89b2b6546420f55':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
Rachad [Tue, 11 Feb 2014 00:54:46 +0000 (16:54 -0800)]
Increased recorded MP4 max file size to 4GB
(more precisely 2^32-1 bytes -- FAT32 max file size)
bug:
11039801
Change-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598
(cherry picked from commit
1f1f2b1678fd0d038dfc501252dd2b65ecf10cae)
Marco Nelissen [Thu, 20 Mar 2014 21:02:03 +0000 (21:02 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 20:57:12 +0000 (20:57 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 20:48:52 +0000 (20:48 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 20:29:33 +0000 (13:29 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:18:07 +0000 (13:18 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:13:35 +0000 (13:13 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:08:17 +0000 (13:08 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:04:11 +0000 (13:04 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:00:07 +0000 (13:00 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 19:32:48 +0000 (12:32 -0700)]
Fix build
As of jb-mr1, need to explicitly include library dependencies. The original
change in jb, which the automerger dutyfully merged, did not need this.
Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7
Marco Nelissen [Thu, 20 Mar 2014 19:09:03 +0000 (19:09 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 18:58:42 +0000 (18:58 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 18:17:24 +0000 (18:17 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 18:08:43 +0000 (11:08 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:49:15 +0000 (10:49 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:31:32 +0000 (10:31 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:27:04 +0000 (10:27 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:21:14 +0000 (10:21 -0700)]
am
dfd90c80: am
d434944b: am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
dfd90c8052a913ed2bbbea1873ee51838d40bfe1':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:16:53 +0000 (10:16 -0700)]
am
d434944b: am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
d434944b00cf83a38019047e0d7db155a15d77f4':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:11:20 +0000 (10:11 -0700)]
am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:04:18 +0000 (10:04 -0700)]
am
0c271b75: Verify certificates
* commit '
0c271b750f7314e187f8479f478ad9382d9a9045':
Verify certificates
Glenn Kasten [Wed, 19 Mar 2014 21:04:56 +0000 (21:04 +0000)]
am
24e1bd71: Merge "libstagefright is no longer 32 bit only."
* commit '
24e1bd71ac6850d9062b3bd803b37c0e92f69c7a':
libstagefright is no longer 32 bit only.
Glenn Kasten [Wed, 19 Mar 2014 20:58:48 +0000 (20:58 +0000)]
Merge "libstagefright is no longer 32 bit only."
Glenn Kasten [Wed, 19 Mar 2014 20:37:03 +0000 (20:37 +0000)]
am
bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger"
* commit '
bd7bde794c587dc9443c22abd3bcaa78fd804615':
Use libaudioresampler instead of libaudioflinger
Glenn Kasten [Wed, 19 Mar 2014 20:29:11 +0000 (20:29 +0000)]
Merge "Use libaudioresampler instead of libaudioflinger"
Lajos Molnar [Wed, 19 Mar 2014 20:00:39 +0000 (20:00 +0000)]
am
fb28c384: am
1faa4170: stagefright: allow for minUndequeuedBufs to be one less
* commit '
fb28c384316518f699e7dd3e9149c9e84b05a525':
stagefright: allow for minUndequeuedBufs to be one less
Lajos Molnar [Wed, 19 Mar 2014 19:56:15 +0000 (19:56 +0000)]
am
1faa4170: stagefright: allow for minUndequeuedBufs to be one less
* commit '
1faa41704e0b976e546321effcb09a85767d51ba':
stagefright: allow for minUndequeuedBufs to be one less
Glenn Kasten [Wed, 19 Mar 2014 19:56:09 +0000 (19:56 +0000)]
am
36817364: Merge "Add libaudioresampler"
* commit '
36817364738d4c45adc3e448fbec02a9611bfeda':
Add libaudioresampler
Glenn Kasten [Wed, 19 Mar 2014 19:45:28 +0000 (19:45 +0000)]
Merge "Add libaudioresampler"
Lajos Molnar [Wed, 19 Mar 2014 19:22:01 +0000 (12:22 -0700)]
stagefright: allow for minUndequeuedBufs to be one less
Bug:
13533477
Change-Id: I909324e3e24f65d8051e0d5474267620efcfc729
Narayan Kamath [Wed, 19 Mar 2014 16:07:30 +0000 (09:07 -0700)]
libstagefright is no longer 32 bit only.
Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b
Signed-off-by: Glenn Kasten <gkasten@android.com>
Glenn Kasten [Wed, 19 Mar 2014 16:05:59 +0000 (09:05 -0700)]
Use libaudioresampler instead of libaudioflinger
in order to be able to build libvideoeditor as 64-bit also.
libaudioresampler is available in both 32-bit and 64-bit,
unlike libaudioflinger which is currently 32-bit only.
Change-Id: Id63857da877b1e45b7c1f8e35f18dca6600be3f7
Glenn Kasten [Wed, 19 Mar 2014 16:05:08 +0000 (09:05 -0700)]
Add libaudioresampler
libaudioresampler is available in both 32-bit and 64-bit,
unlike libaudioflinger which is currently 32-bit only.
Bug:
8141282
Change-Id: I839f7b4e6aaed6984012ca6d514323f927669df6
Marco Nelissen [Thu, 13 Mar 2014 21:18:25 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Cherrypicked from
8a57d24c733b08da846b54d1adf029e606b5a5f3
https://googleplex-android-review.git.corp.google.com/#/c/433309/
Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
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: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: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 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"
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
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
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 [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 [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 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.
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
Marco Nelissen [Thu, 13 Mar 2014 21:18:25 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
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
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
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
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
Chong Zhang [Fri, 14 Feb 2014 23:26:00 +0000 (15:26 -0800)]
fix codec buffer leak in error handling when timestamp goes backward
don't touch codec buffer if we decided to drop a frame with bad pts
Bug:
11971963
Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6
(cherry picked from commit
b63d2433350d56bda9f3477549086c90bb6d535e)
Chong Zhang [Tue, 11 Mar 2014 22:09:39 +0000 (22:09 +0000)]
Merge "Cap pts gap between adjacent frames to specified value" into klp-dev
Robert Shih [Tue, 11 Mar 2014 00:27:15 +0000 (17:27 -0700)]
LiveSession: fix incorrect stream key (subtitle"s")
Bug:
13402087
Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
Robert Shih [Tue, 11 Mar 2014 00:05:01 +0000 (17:05 -0700)]
M3UParser: trim spaces when parsing comma separated codecs.
Bug:
13402087
Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
Robert Shih [Mon, 3 Mar 2014 23:08:27 +0000 (15:08 -0800)]
httplive: clear access units before returning from seekTo.
Bug:
12060952
Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e