OSDN Git Service
Glenn Kasten [Wed, 19 Mar 2014 19:56:17 +0000 (19:56 +0000)]
am
36817364: Merge "Add libaudioresampler"
* commit '
36817364738d4c45adc3e448fbec02a9611bfeda':
Add libaudioresampler
Lajos Molnar [Wed, 19 Mar 2014 19:56:11 +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: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
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
Lajos Molnar [Wed, 19 Mar 2014 03:10:40 +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:19:41 +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:29:58 +0000 (23:29 +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:41:42 +0000 (17:41 +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:22:07 +0000 (17:22 +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 [Mon, 17 Mar 2014 22:55:38 +0000 (22:55 +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:43:03 +0000 (18:43 +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 22:34:55 +0000 (22:34 +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:30 +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:45:54 +0000 (15:45 +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 00:40:22 +0000 (00:40 +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 00:40:21 +0000 (00:40 +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 [Fri, 14 Mar 2014 00:40:14 +0000 (00:40 +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:26:39 +0000 (23:26 +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 23:26:38 +0000 (23:26 +0000)]
am
1c608ab3: save mGraphicBuffer pointer even when we\'re suspended
* commit '
1c608ab33acab82d4a87f1abedcc99a623d1b53a':
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
Marco Nelissen [Thu, 13 Mar 2014 15:54:25 +0000 (15:54 +0000)]
am
19afb386: Merge "Remove streaming URI from default logs"
* commit '
19afb3869eb6a3e3733dc1f7420e1d4c3c03d376':
Remove streaming URI from default logs
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:41:55 +0000 (15:41 +0000)]
Merge "Remove streaming URI from default logs"
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
Chong Zhang [Sat, 11 Jan 2014 01:36:57 +0000 (17:36 -0800)]
Cap pts gap between adjacent frames to specified value
- In the scenario of cast mirroring, encoding could be suspended
for prolonged periods. Limiting the pts gap to workaround the
problem where encoder's rate control logic produces huge frames
after a long period of suspension.
- Repeat last frame a couple more times to get better quality
on static scenes.
- Fix the timestamp on repeat frames (it was not set)
Bug:
11971963
Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7
(cherry picked from commit
94ee4b708acfa941581160b267afb79192b1d816)
Chong Zhang [Sat, 18 Jan 2014 00:29:59 +0000 (16:29 -0800)]
save mGraphicBuffer pointer even when we're suspended
Bug:
12609966
Change-Id: Ifd41fd973876da69039113fcaeacdccf39472b37
(cherry picked from commit
49270665e7a20cd120724fc388da8b166ff0b4f1)
Narayan Kamath [Tue, 11 Mar 2014 18:42:27 +0000 (18:42 +0000)]
am
2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"
* commit '
2ad7af29bb667d939f27417011567847c4b62f94':
Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
Narayan Kamath [Tue, 11 Mar 2014 18:42:26 +0000 (18:42 +0000)]
am
a9b82160: Merge "LP64 fixes for media/libeffects"
* commit '
a9b82160a6682438d43709ba5e7a29022ad1af58':
LP64 fixes for media/libeffects
Glenn Kasten [Tue, 11 Mar 2014 18:36:27 +0000 (18:36 +0000)]
am
395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation"
* commit '
395c2fc0c422c9218f39f6ed2040e90b1cc9920a':
audioflinger: Fix for a deadlock in track creation
Narayan Kamath [Tue, 11 Mar 2014 18:17:48 +0000 (18:17 +0000)]
am
525b099a: Merge "Fix ALOGVs for 64bit"
* commit '
525b099ada155d6654300cb2e5d8c1a09f4eb8ba':
Fix ALOGVs for 64bit
Glenn Kasten [Tue, 11 Mar 2014 18:17:07 +0000 (18:17 +0000)]
am
0cf16339: Merge "Fix preventing from heap overwrite in capture command"
* commit '
0cf1633922f970caee19e2cc2f5c042ca30b4aa6':
Fix preventing from heap overwrite in capture command
Narayan Kamath [Tue, 11 Mar 2014 18:16:23 +0000 (18:16 +0000)]
am
096d72a3: Merge "AArch64: Correction for LP64"
* commit '
096d72a32824a0a8c86a716ba44d589183b2b0b3':
AArch64: Correction for LP64
Ying Wang [Tue, 11 Mar 2014 18:08:16 +0000 (18:08 +0000)]
am
5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
* commit '
5969b40858d2046aa2b8481926e34c4cb9062a4a':
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Glenn Kasten [Tue, 11 Mar 2014 17:12:06 +0000 (17:12 +0000)]
am
8fc4d57d: Merge "Avoid a building error"
* commit '
8fc4d57d41f532b90187b9404a8ac705770d75b4':
Avoid a building error
Zhijun He [Mon, 10 Mar 2014 23:42:18 +0000 (23:42 +0000)]
am
bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size is changed
* commit '
bc69c8ba9a8fc881603669205a56d0ca1b572a95':
DO NOT MERGE: Camera: delete preview callback when preview size is changed
Zhijun He [Tue, 21 Jan 2014 20:15:56 +0000 (12:15 -0800)]
DO NOT MERGE: Camera: delete preview callback when preview size is changed
Preview callback stream is left configured even the preview size is changed.
This makes the callback stream unnecessarily configured even in recording mode,
which could cause distorted preview for some devices.
Bug:
12210027
Bug:
12591410
Change-Id: If50cddfe5562e91aec1feb1760eccb82ddb21730
David Williams [Thu, 6 Sep 2012 14:33:38 +0000 (16:33 +0200)]
Remove streaming URI from default logs
Streaming URI should not be visible in default logcat logs
Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
Eric Laurent [Sat, 8 Mar 2014 06:23:51 +0000 (06:23 +0000)]
am
6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev
* commit '
6db20dcb54dad932a3ea2e3a5dca41fce5802eb4':
AudioTrack: When paused, return cached playback position
Glenn Kasten [Sat, 8 Mar 2014 06:22:13 +0000 (06:22 +0000)]
am
2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev
* commit '
2f55c2c03b17795e94b325d402ac5b409e3ba0e8':
Simplify AudioTrack stream end and fix race
Marco Nelissen [Sat, 8 Mar 2014 06:22:12 +0000 (06:22 +0000)]
am
5874615f: Allow for larger codec private data
* commit '
5874615f26a6ba9cda8ba359e5035b21f6e3818b':
Allow for larger codec private data
Eric Laurent [Sat, 8 Mar 2014 00:29:56 +0000 (00:29 +0000)]
Merge "AudioTrack: When paused, return cached playback position" into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 22:59:21 +0000 (22:59 +0000)]
am
4ee5d2b9: (-s ours) Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"
* commit '
4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae':
LiveSession: Use the actual, possibly redirected url as base in the M3U
Glenn Kasten [Fri, 7 Mar 2014 20:22:38 +0000 (20:22 +0000)]
Merge "Simplify AudioTrack stream end and fix race" into klp-dev
Colin Cross [Fri, 7 Mar 2014 19:33:37 +0000 (19:33 +0000)]
am
80b72e6f: Merge "libeffects: don\'t set module path"
* commit '
80b72e6f4202ce26facbe51b8739814bca198a2c':
libeffects: don't set module path
Glenn Kasten [Fri, 20 Sep 2013 16:28:56 +0000 (09:28 -0700)]
Simplify AudioTrack stream end and fix race
Bug:
10994052
Change-Id: Ib2e38e7a600bcffef8cbc68c1722e40fbbc7ea67
Marco Nelissen [Mon, 3 Feb 2014 22:33:16 +0000 (14:33 -0800)]
Allow for larger codec private data
This change adds support for multibyte sizes in the ESDS. Previously the
Matroska extractor only supported single byte sizes, so codec private data
had to be less than 108 bytes, and would crash if it was bigger.
b/
12584090
Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
Marco Nelissen [Fri, 7 Mar 2014 18:31:40 +0000 (18:31 +0000)]
am
5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev
* commit '
5bc83fc352e5682ecafe61d77062c26ac8db4229':
Fix SIGABRT when playing mp4 file
Lajos Molnar [Fri, 7 Mar 2014 18:31:25 +0000 (18:31 +0000)]
am
49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev
* commit '
49ea13379fb15ddb73183ebafa3a377342ef932f':
LiveSession: Use the actual, possibly redirected url as base in the M3U
M3UParser: Skip query strings when looking for the last slash in a URL
ChromiumHTTPDataSource: Keep track of the redirected URL
Initial HLS seamless switch implementation.
NuPlayer side support for seamless format switch.
LiveSession refactor
PlaylistFetcher: Add support for block-by-block decryption.
LiveSession: Add support for block-by-block fetchFile.
Lajos Molnar [Fri, 7 Mar 2014 18:31:24 +0000 (18:31 +0000)]
am
e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev
* commit '
e0c3058a1d0953f4c85bfc964926cf5babb7dbac':
AnotherPacketSource support to get latest buffered MetaData.
Lajos Molnar [Fri, 7 Mar 2014 18:31:23 +0000 (18:31 +0000)]
am
2613347d: Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev
* commit '
2613347d74c3f35bc6fda5df1c29c1119c22d432':
Added support to query ACodec whether adaptive playback is enabled.
Lajos Molnar [Fri, 7 Mar 2014 18:31:23 +0000 (18:31 +0000)]
am
909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev
* commit '
909498b72d740e3151561fd4435ad0a329ec9c6e':
stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
Lajos Molnar [Fri, 7 Mar 2014 18:31:22 +0000 (18:31 +0000)]
am
2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev
* commit '
2338782d18d9bcc8197c63dbf205332a2a737440':
Fixed misplaced bracket for switch-case block.
Lajos Molnar [Fri, 7 Mar 2014 18:31:21 +0000 (18:31 +0000)]
am
ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev
* commit '
ad21a81af3e7d6b58002c9dce9c3278b6323e4a9':
stagefright: Fix issue with tracking media format in packet source
Lajos Molnar [Fri, 7 Mar 2014 18:31:20 +0000 (18:31 +0000)]
am
b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev
* commit '
b74b209862cbcbab6053cf4a43bbc16940aaafd2':
stagefright: Fix bugs in playlist fetcher logic
Eino-Ville Talvala [Fri, 7 Mar 2014 18:31:19 +0000 (18:31 +0000)]
am
a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
* commit '
a11111f9135c98cf4247bbd1a61d7df3053e549e':
DO NOT MERGE: Camera: fix focusArea wrong indexing issue
DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
DO NOT MERGE: camera2/3: Add protection for still capture path
Eric Laurent [Fri, 7 Mar 2014 18:31:16 +0000 (18:31 +0000)]
am
ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
* commit '
ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Fri, 7 Mar 2014 18:30:41 +0000 (18:30 +0000)]
am
880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
* commit '
880413f7923ec77467243e15dc34d4af4f8064f9':
stagefright: fix offloading HE-AAC sampling rate.
Marco Nelissen [Fri, 7 Mar 2014 18:22:53 +0000 (18:22 +0000)]
Merge "Fix SIGABRT when playing mp4 file" into klp-dev
Narayan Kamath [Fri, 7 Mar 2014 16:04:47 +0000 (16:04 +0000)]
Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"
Narayan Kamath [Fri, 7 Mar 2014 16:04:44 +0000 (16:04 +0000)]
Merge "LP64 fixes for media/libeffects"
Lajos Molnar [Fri, 7 Mar 2014 02:35:50 +0000 (02:35 +0000)]
Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev
* changes:
LiveSession: Use the actual, possibly redirected url as base in the M3U
M3UParser: Skip query strings when looking for the last slash in a URL
ChromiumHTTPDataSource: Keep track of the redirected URL
Initial HLS seamless switch implementation.
NuPlayer side support for seamless format switch.
LiveSession refactor
PlaylistFetcher: Add support for block-by-block decryption.
LiveSession: Add support for block-by-block fetchFile.
Lajos Molnar [Fri, 7 Mar 2014 02:33:32 +0000 (02:33 +0000)]
Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:33:08 +0000 (02:33 +0000)]
Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:32:34 +0000 (02:32 +0000)]
Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:32:25 +0000 (02:32 +0000)]
Merge "Fixed misplaced bracket for switch-case block." into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:32:09 +0000 (02:32 +0000)]
Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev
Lajos Molnar [Fri, 7 Mar 2014 02:31:50 +0000 (02:31 +0000)]
Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev
Glenn Kasten [Fri, 7 Mar 2014 02:30:11 +0000 (02:30 +0000)]
am
af191eb4: Merge "Replace size_t in shared memory by uint32_t"
* commit '
af191eb4feac513d17dc0362e0cea5bc9e0ffe9d':
Replace size_t in shared memory by uint32_t
Lajos Molnar [Fri, 7 Mar 2014 02:27:07 +0000 (02:27 +0000)]
am
7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requires it"
* commit '
7eacea1156a3896ee7813cd9a06c535e63c95f6a':
avcenc: Only do startcode escaping if the next byte requires it
Narayan Kamath [Fri, 7 Mar 2014 02:26:36 +0000 (02:26 +0000)]
am
3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '
3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Colin Cross [Fri, 7 Mar 2014 02:26:14 +0000 (02:26 +0000)]
am
cdda7bf4: Merge "frameworks/av: fix errors inside ALOGV"
* commit '
cdda7bf4d3ca9cad6979374a18dd5be79ea83d80':
frameworks/av: fix errors inside ALOGV
Glenn Kasten [Fri, 7 Mar 2014 02:26:05 +0000 (02:26 +0000)]
am
5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"
* commit '
5930e8ebdacf3a59c13eef11fd03658ba58b443e':
AudioFlinger: Remove code for supporting resampling in fast tracks
Glenn Kasten [Fri, 7 Mar 2014 02:26:05 +0000 (02:26 +0000)]
am
4361749d: Merge "AudioTrack: Never try to use the fast path if resampling is required"
* commit '
4361749d74113069aafb0620a1189404205c58d0':
AudioTrack: Never try to use the fast path if resampling is required
Lajos Molnar [Fri, 7 Mar 2014 02:26:02 +0000 (02:26 +0000)]
am
7142d10a: Merge "avcenc: Update video port parameters in the base class"
* commit '
7142d10a7a3941b2deb18869a7f7b79462e0aa52':
avcenc: Update video port parameters in the base class
Lajos Molnar [Fri, 7 Mar 2014 02:26:02 +0000 (02:26 +0000)]
am
61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"
* commit '
61bdaaa18a1d52666827e31bb7980a5784443835':
ChromiumHTTPDataSource: Keep track of the redirected URL
Lajos Molnar [Fri, 7 Mar 2014 02:26:01 +0000 (02:26 +0000)]
am
88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"
* commit '
88e99f9a5e098ee50019ce85f2b1273b48883f37':
SoftVPXEncoder: Set the frame size on the output port as well
Marco Nelissen [Fri, 7 Mar 2014 02:26:00 +0000 (02:26 +0000)]
am
44f2b8c2: Merge "M3UParser: Fix typo in
8883a38a308"
* commit '
44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc':
M3UParser: Fix typo in
8883a38a308
Marco Nelissen [Fri, 7 Mar 2014 02:25:59 +0000 (02:25 +0000)]
am
8519b8a1: Merge "M3UParser: Skip query strings when looking for the last slash in a URL"
* commit '
8519b8a1298d80949edadce9c8f0963ef62cc3ff':
M3UParser: Skip query strings when looking for the last slash in a URL
Colin Cross [Fri, 7 Mar 2014 02:25:14 +0000 (02:25 +0000)]
am
e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"
* commit '
e2307ccbab9c32a7806f15c2572cfe6ec428f2f5':
frameworks/av: fix errors inside ALOGV
Glenn Kasten [Fri, 7 Mar 2014 02:23:19 +0000 (02:23 +0000)]
am
d66cd743: Merge "audioflinger: conform inline ASM to UAL"
* commit '
d66cd743525cc049033caa3e81cbdf74c72a4556':
audioflinger: conform inline ASM to UAL