OSDN Git Service
Brian Carlstrom [Wed, 28 May 2014 22:28:37 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
483f59ab9fb4b2d8ab212f77a50eed0528beca58)
Change-Id: I387af6e4721840f98063f26854c02e6da26b9974
Elliott Hughes [Thu, 22 May 2014 21:30:25 +0000 (21:30 +0000)]
Merge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 21:20:39 +0000 (14:20 -0700)]
Move frameworks/av off <sys/atomics.h>.
Bug:
14903517
Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
Calin Juravle [Thu, 22 May 2014 13:36:22 +0000 (13:36 +0000)]
Merge "Move frameworks/av from fdprintf to POSIX dprintf."
Elliott Hughes [Thu, 22 May 2014 08:22:06 +0000 (01:22 -0700)]
Move frameworks/av from fdprintf to POSIX dprintf.
Bug:
11156955
Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
Elliott Hughes [Thu, 22 May 2014 01:45:47 +0000 (01:45 +0000)]
Merge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:44:27 +0000 (18:44 -0700)]
Restore accidentally-removed NULL timeout.
Change-Id: I933c80fea50950243f109acf8d6350013aaa811f
Elliott Hughes [Thu, 22 May 2014 01:23:41 +0000 (01:23 +0000)]
Merge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 00:55:51 +0000 (17:55 -0700)]
Move frameworks/av off private API.
Bug:
11156955
Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
Elliott Hughes [Thu, 22 May 2014 00:35:48 +0000 (00:35 +0000)]
Merge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:31:18 +0000 (17:31 -0700)]
Move frameworks/av off __futex_syscall3.
Bug:
11156955
Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
Eric Laurent [Mon, 19 May 2014 15:26:37 +0000 (15:26 +0000)]
Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"
Andreas Huber [Fri, 16 May 2014 15:11:28 +0000 (15:11 +0000)]
Merge "libstagefright foundation: fix uninitialized varibale warning"
Amit Pundir [Thu, 15 May 2014 07:12:04 +0000 (12:42 +0530)]
libstagefright foundation: fix uninitialized varibale warning
gcc-4.9 reports warning for this uninitialized variable
and -Werror make this warning fatal.
Change-Id: I6901362246d53deeded78fa38ad656b167705346
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Uday Gupta [Tue, 13 May 2014 18:19:17 +0000 (11:19 -0700)]
Codec Offload: Add NULL check as mCallbackThread is NULL
when offloaded HAL is running BLOCKING mode
b/
14897952
Change-Id: I159a33e1181c1a62d80ab4bd3337a35dafaad884
Signed-off-by: Uday Gupta <guptau@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Eino-Ville Talvala [Mon, 12 May 2014 17:27:54 +0000 (17:27 +0000)]
Merge "camera: check Intent entry count before reading it"
Yuvraj Pasi [Tue, 15 Apr 2014 13:33:26 +0000 (19:03 +0530)]
camera: check Intent entry count before reading it
In case when find() returns empty entry, blindly
reading the entry will cause segfault
Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817
Ying Wang [Thu, 8 May 2014 07:25:00 +0000 (07:25 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Thu, 8 May 2014 07:23:11 +0000 (00:23 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: I14865bee99fbcc5188b64fbd22bb49a1947ec6ff
Eric Laurent [Tue, 6 May 2014 15:25:45 +0000 (15:25 +0000)]
Merge "Fix memory leak when filtering commands in insertCommand_l()"
Lajos Molnar [Fri, 2 May 2014 17:56:37 +0000 (17:56 +0000)]
Merge "AwesomePlayer: use PTS for queueBuffer"
Lajos Molnar [Fri, 2 May 2014 17:53:58 +0000 (17:53 +0000)]
Merge "Smooth out AwesomePlayer"
Lajos Molnar [Fri, 2 May 2014 17:11:14 +0000 (17:11 +0000)]
Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
Lajos Molnar [Fri, 2 May 2014 17:10:57 +0000 (17:10 +0000)]
Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
Glenn Kasten [Fri, 2 May 2014 14:45:29 +0000 (14:45 +0000)]
Merge "When passing a size_t via binder, use 64-bits unconditionally"
Lajos Molnar [Wed, 30 Apr 2014 17:19:40 +0000 (10:19 -0700)]
AwesomePlayer: use PTS for queueBuffer
Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
Lajos Molnar [Wed, 30 Apr 2014 18:10:44 +0000 (11:10 -0700)]
Smooth out AwesomePlayer
Use clock estimator to smooth out audio time stamps.
Change-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6
Lajos Molnar [Wed, 30 Apr 2014 18:10:00 +0000 (11:10 -0700)]
AwesomePlayer: improve scheduling of video event to hit PTS
Change-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed
Lajos Molnar [Tue, 22 Apr 2014 23:31:54 +0000 (16:31 -0700)]
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
Glenn Kasten [Thu, 1 May 2014 22:18:34 +0000 (22:18 +0000)]
Merge "Add missing include"
Lajos Molnar [Thu, 1 May 2014 20:04:45 +0000 (20:04 +0000)]
Merge "ACodec: add frame render/drop systrace"
Glenn Kasten [Thu, 1 May 2014 19:27:02 +0000 (19:27 +0000)]
Merge "Temporary workaround for log spam"
Glenn Kasten [Thu, 1 May 2014 17:41:11 +0000 (10:41 -0700)]
Temporary workaround for log spam
Bug:
13790505
Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
Glenn Kasten [Wed, 30 Apr 2014 23:50:37 +0000 (23:50 +0000)]
Merge "Do not force all command-line apps to be 32-bit only"
Lajos Molnar [Wed, 30 Apr 2014 17:13:57 +0000 (10:13 -0700)]
ACodec: add frame render/drop systrace
Change-Id: I7a33d4a937d039fd454b889ddb12b7ca1c0ff3c2
Glenn Kasten [Wed, 30 Apr 2014 18:09:31 +0000 (11:09 -0700)]
Do not force all command-line apps to be 32-bit only
This is a partial revert of
>Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
Change-Id: I214e1bd117dd40150ac5f7447f12c72c61f09a2f
Glenn Kasten [Wed, 30 Apr 2014 18:54:03 +0000 (18:54 +0000)]
Merge "Fix format warnings"
Glenn Kasten [Mon, 28 Apr 2014 22:43:21 +0000 (22:43 +0000)]
Merge "Add private method NBLog::Reader::dumpLine()"
Glenn Kasten [Mon, 28 Apr 2014 21:11:45 +0000 (14:11 -0700)]
Fix format warnings
Change-Id: Id7aded4287cc8d5387a20389d3ef6220d67d1d88
Glenn Kasten [Thu, 11 Jul 2013 21:29:59 +0000 (14:29 -0700)]
Add private method NBLog::Reader::dumpLine()
This allows us to abstract out fdprintf vs ALOGI
so that callers don't need an 'if' at every location.
Change-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8
Glenn Kasten [Wed, 23 Apr 2014 23:45:27 +0000 (23:45 +0000)]
Merge "AArch64: rewrite audioflinger's sinc resample by intrinsics."
Eino-Ville Talvala [Mon, 21 Apr 2014 20:22:53 +0000 (20:22 +0000)]
Merge "camera: set mNeedConfig after creating ZSL stream"
Nick Kralevich [Mon, 21 Apr 2014 20:21:42 +0000 (20:21 +0000)]
Merge "AArch64: AString::append for longs and pointers"
Mark Salyzyn [Fri, 18 Apr 2014 22:03:45 +0000 (22:03 +0000)]
Merge "libeffects: 64 bit compile issues"
Mark Salyzyn [Fri, 18 Apr 2014 20:48:25 +0000 (13:48 -0700)]
libeffects: 64 bit compile issues
Change-Id: I32dd13d307572fee91150f8e113df78924ca0067
Mark Salyzyn [Tue, 15 Apr 2014 22:31:39 +0000 (22:31 +0000)]
Merge "media: -Werror re-enabled"
Mark Salyzyn [Tue, 15 Apr 2014 22:28:34 +0000 (22:28 +0000)]
Merge changes I0a744dc7,Id993a70d
* changes:
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Mark Salyzyn [Tue, 15 Apr 2014 21:55:53 +0000 (14:55 -0700)]
media: use size_t for integer iterator to Vector::size()
Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
Mark Salyzyn [Fri, 4 Apr 2014 21:47:28 +0000 (14:47 -0700)]
media: 64 bit compile issues
- change internal sized types to use stdint.h
- printf & scanf formats
- size_t or unsigned int for iterators
Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
Dmitriy Ivanov [Tue, 15 Apr 2014 19:37:19 +0000 (19:37 +0000)]
Merge "Remove code markers"
Dmitriy Ivanov [Tue, 15 Apr 2014 19:10:43 +0000 (12:10 -0700)]
Remove code markers
Change-Id: Iaebfaef2e58e9659d86699d9b7fc68f24cf09bf3
Mark Salyzyn [Mon, 14 Apr 2014 19:51:07 +0000 (12:51 -0700)]
media: -Werror re-enabled
Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
Mark Salyzyn [Tue, 15 Apr 2014 14:30:03 +0000 (14:30 +0000)]
Merge "libstagefright: fix 64-bit warnings"
Yuvraj Pasi [Tue, 15 Apr 2014 13:07:45 +0000 (18:37 +0530)]
camera: set mNeedConfig after creating ZSL stream
Set mNeedConfig after creating ZSL stream, camera device
will reconfigure for the case when only ZSL stream
is changed.
Change-Id: Ib592817f81125969824a1280349f77973116f375
Marcus Oakland [Tue, 25 Mar 2014 17:32:00 +0000 (17:32 +0000)]
AArch64: AString::append for longs and pointers
The AString::append methods for long, unsigned long and void *
pointers were using char arrays of 16 elements, which were not long
enough for 64-bit longs and pointers in __LP64__ systems. This
resulted in "FORTIFY_SOURCE: vsprintf: prevented write past end of
buffer. Calling abort()." when the
android.media.cts.DecoderTest#testFlush CTS test was run.
The AString::append methods that were using sprintf have been modifed
to use snprintf instead, taking the sizeof the "s" array (which has
been made 32 char without conditional compilation for __LP64__ where
appropriate), and checking the return value to ensure that the string
has not been truncated.
After this change and changes to the types of OMX_U32 and OMX_S32 in the
frameworks/native/include/media/openmax/OMX_Types.h header file, the
android.media.cts.DecoderTest#testFlush CTS test passes.
Change-Id: I76d897373473c82f52986f43a15b050b844a370a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
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
Mark Salyzyn [Mon, 14 Apr 2014 18:01:24 +0000 (18:01 +0000)]
Merge "media: memset sizeof argument issues"
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
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: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
Jesper Tragardh [Mon, 24 Mar 2014 13:12:43 +0000 (14:12 +0100)]
Fix memory leak when filtering commands in insertCommand_l()
When AudioPolicyService::AudioCommandThread::insertCommand_l filters
a command from the queue, the AudioCommand* is removed from the
vector mAudioCommands by calling mAudioCommands.removeAt(). This will
destroy the pointer and compact the vector, but not delete the
AudioCommand object.
This patch adds code to delete a filtered out AudioCommand and its
data object mParam. However, mParam was void* and deleting a void
pointer is undefined behavior according to the C++
standard. Therefore, the data classes are modified to inherit
from an abstract base class with a virtual destructor.
The deletion of non-filtered commands in
AudioPolicyService::AudioCommandThread::threadLoop() was already
correct, as each case casts mParam to the proper type before
deleting.
This also fixes AOSP issue 36370.
Change-Id: I2b63838aff3608132aa496f964a929f78c4b6267
Zhongwei Yao [Thu, 10 Apr 2014 16:23:42 +0000 (17:23 +0100)]
AArch64: rewrite audioflinger's sinc resample by intrinsics.
Pass conformance test on armv7 and aarch64, performance test is done on armv7.
Compared with original armv7 assembly version, this version has similar
result. Here is performance data on pandaboard android4.4 (input: random wave
file, unit: Mspl/s, toolchain:gcc 4.8):
| | origin(assembly) | current(intrinsics) | C version |
|----------------+------------------+---------------------+-----------|
| single channel | 6.17 | 7.14 | 3.43 |
| double channel | 5.24 | 5.63 | 3.50 |
Change-Id: If5670218e1586e9dfd2b8d9c66a6880f3e4808ca
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:01:21 +0000 (15:01 +0000)]
Merge "Fix aac decoder flush"
Igor Chernyshev [Wed, 2 Apr 2014 21:51:40 +0000 (14:51 -0700)]
Add missing include
Change-Id: I9fc3ebf60b98760611ac2071c7c519a0f8326341
Glenn Kasten [Wed, 2 Apr 2014 21:38:17 +0000 (21:38 +0000)]
Merge "Fix decoder EOS handling"
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
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: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
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:29:11 +0000 (20:29 +0000)]
Merge "Use libaudioresampler instead of libaudioflinger"
Glenn Kasten [Wed, 19 Mar 2014 19:45:28 +0000 (19:45 +0000)]
Merge "Add libaudioresampler"
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
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:31:25 +0000 (17:31 +0000)]
Merge "AudioPolicyService: malloc/delete pair"
Glenn Kasten [Tue, 18 Mar 2014 17:13:23 +0000 (17:13 +0000)]
Merge "More precise 32-bit only for libstagefright/ subdirectories"
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: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
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:40:22 +0000 (15:40 +0000)]
Merge "Implemented support for RTSP 301 Redirect"