OSDN Git Service
Nick Kralevich [Fri, 19 Oct 2012 15:40:01 +0000 (08:40 -0700)]
Merge "hardening: eliminate more .text relocations"
Nick Kralevich [Thu, 18 Oct 2012 23:52:53 +0000 (16:52 -0700)]
hardening: eliminate more .text relocations
In
74bc3e133bd59a65dbed70b5fc89549f04a545e2, a bunch of text relocations
were cleaned up from amrwbenc. Looks like we forgot one. Fixed.
Change-Id: I80d4c68be435c3461731374d2b6d3bdbd61354a5
Glenn Kasten [Wed, 17 Oct 2012 21:59:40 +0000 (14:59 -0700)]
Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
Glenn Kasten [Wed, 17 Oct 2012 21:38:05 +0000 (14:38 -0700)]
Merge "Rename "Makefile" to "Android.mk" throughout the tree."
Glenn Kasten [Wed, 17 Oct 2012 21:37:43 +0000 (14:37 -0700)]
Merge "Rename "TARGET" to "MODULE" in the build system."
Glenn Kasten [Wed, 17 Oct 2012 21:37:19 +0000 (14:37 -0700)]
Merge "Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now."
Glenn Kasten [Wed, 17 Oct 2012 21:37:00 +0000 (14:37 -0700)]
Merge "A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time."
Glenn Kasten [Wed, 17 Oct 2012 21:36:35 +0000 (14:36 -0700)]
Merge "fix a few small typos in the FIR computation"
Glenn Kasten [Wed, 17 Oct 2012 21:36:09 +0000 (14:36 -0700)]
Merge "This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler."
Dan Bornstein [Fri, 3 Oct 2008 17:34:57 +0000 (10:34 -0700)]
Manually merge change #111620 from tc3 to mainline, to keep the
automerger from choking on it.
p4 sync
p4 integrate -r -b android_to_tc3 //...@111620,111620
p4 resolve -a
p4 resolve # resolve a couple merge travesties
PRESUBMIT=passed
BUG=
1399648
TBR=edheyl
OCL=111902
Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2
Signed-off-by: Glenn Kasten <gkasten@google.com>
Dave Bort [Fri, 18 Jan 2008 22:51:05 +0000 (14:51 -0800)]
Rename "Makefile" to "Android.mk" throughout the tree.
For <http://b/issue?id=960416>.
I've tested this as much as I can, but 1500 open files =
easy to mess things up. Please let me know if there's
a problem rather than rolling back this change.
PRESUBMIT=passed
BUG=960416
TBR=joeo
OCL=46537
Change-Id: I5a404caf0f398a7afa7ae7abaf2f2a1c6ab490eb
Signed-off-by: Glenn Kasten <gkasten@google.com>
Dave Bort [Tue, 13 Nov 2007 09:30:32 +0000 (01:30 -0800)]
Rename "TARGET" to "MODULE" in the build system.
Part one of the grand renaming.
API_CHANGE: Third parties may need to update their makefiles.
Any variables with "LOCAL" and "TARGET" in their names
should now use "MODULE" instead of "TARGET"; e.g., LOCAL_MODULE,
LOCAL_MODULE_TAGS.
PRESUBMIT=passed
OCL=39840
Change-Id: Ica9a7937d3d9552ab84db46ac6eea8a290e404fe
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Tue, 30 Oct 2007 06:44:25 +0000 (23:44 -0700)]
Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
Change-Id: I50ac7e6c6702a427fa36ab6d976c507155057507
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Mon, 29 Oct 2007 11:34:36 +0000 (04:34 -0700)]
A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
Change-Id: I80eb5185e13ebdb907e0b85c49ba1272c23d60ec
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Fri, 24 Aug 2007 04:01:28 +0000 (21:01 -0700)]
fix a few small typos in the FIR computation
Change-Id: I6e56b514fe520f30f7487f85c64ea5d2a7c19b40
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Thu, 23 Aug 2007 10:16:02 +0000 (03:16 -0700)]
This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
Change-Id: I99be2505139b8e0e7647200e1647509d4f7e6067
Signed-off-by: Glenn Kasten <gkasten@google.com>
Jean-Baptiste Queru [Wed, 12 Sep 2012 22:26:28 +0000 (15:26 -0700)]
am
1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit '
1b0ae9e47273357e19a9beb22466319753e8242d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
Jean-Baptiste Queru [Wed, 12 Sep 2012 21:24:19 +0000 (14:24 -0700)]
Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
Elliott Hughes [Wed, 12 Sep 2012 15:55:32 +0000 (08:55 -0700)]
am
fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
* commit '
fbe1cc92d9e8930700c15f68717dd66fc1523177':
Don't include <linux/socket.h> directly.
Elliott Hughes [Wed, 12 Sep 2012 15:50:35 +0000 (08:50 -0700)]
Merge "Don't include <linux/socket.h> directly."
Elliott Hughes [Wed, 12 Sep 2012 01:47:53 +0000 (18:47 -0700)]
Don't include <linux/socket.h> directly.
In newer versions of Linux, stuff you need isn't in that file any more.
Change-Id: I62923ed2d92a75ff3182ba2ae27578ce7bde8356
Elliott Hughes [Tue, 11 Sep 2012 17:04:48 +0000 (10:04 -0700)]
am
290ac693: Merge "Stop building the unused host libmtp static library."
* commit '
290ac69379e649a2fed1d9441a17e39c6a912d8c':
Stop building the unused host libmtp static library.
Elliott Hughes [Tue, 11 Sep 2012 16:57:54 +0000 (09:57 -0700)]
Merge "Stop building the unused host libmtp static library."
Elliott Hughes [Tue, 11 Sep 2012 16:33:46 +0000 (09:33 -0700)]
Stop building the unused host libmtp static library.
This removes the need to support the bionic mktime_tz and localtime_tz
extensions on glibc, which makes my life easier.
Bug:
7012465
Change-Id: Ibfa187f2857dda7bd1536348e314a80abacb9d1e
Jean-Baptiste Queru [Mon, 10 Sep 2012 18:26:55 +0000 (11:26 -0700)]
am
d81be6d6: Merge "aacenc: Mark some global arrays const"
* commit '
d81be6d670f0d89aa6048a82fbbff82c584e9922':
aacenc: Mark some global arrays const
Jean-Baptiste Queru [Mon, 10 Sep 2012 18:08:23 +0000 (11:08 -0700)]
Merge "aacenc: Mark some global arrays const"
Elliott Hughes [Sun, 9 Sep 2012 23:07:48 +0000 (16:07 -0700)]
am
5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit '
5abc91d61718e334e05c6d4858bd868bd5a5769c':
Fix libmedia and libstagefright to get expat header files from the approved location.
Elliott Hughes [Sun, 9 Sep 2012 22:11:49 +0000 (15:11 -0700)]
Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
Elliott Hughes [Sun, 9 Sep 2012 21:58:14 +0000 (14:58 -0700)]
Fix libmedia and libstagefright to get expat header files from the approved location.
Found during a libexpat upgrade.
Change-Id: I9e5abd502a884975d898486edde374fb2519164e
Martin Storsjo [Sun, 9 Sep 2012 13:33:52 +0000 (16:33 +0300)]
aacenc: Mark some global arrays const
This gets rid of initialized writeable data in the library.
Change-Id: I7c1cbeb3df10c302b645b7311591ead87a289ca1
Jean-Baptiste Queru [Fri, 31 Aug 2012 18:19:38 +0000 (11:19 -0700)]
am
8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"
* commit '
8b1525663322685ff34d9c09176feebd102e1c3d':
OMXCodec: enhance error handling of OMX IL client
Jean-Baptiste Queru [Fri, 31 Aug 2012 18:01:18 +0000 (11:01 -0700)]
Merge "OMXCodec: enhance error handling of OMX IL client"
Weian Chen [Fri, 27 Jul 2012 08:55:11 +0000 (04:55 -0400)]
OMXCodec: enhance error handling of OMX IL client
Original design doesn't handle event EMPTY_BUFFER_DONE and
FILL_BUFFER_DONE which leads to buffer status mess issue,
and in turn leads to mediaserver crash.
Here we will handle those 2 events anyway to fix this.
Change-Id: Ia90b46ea7ec6026d6fda5d33fef6773435788b04
Author: Tianmi Chen<tianmi.chen@intel.com>
Signed-off-by: Tianmi Chen<tianmi.chen@intel.com>
Signed-off-by: Weian Chen <weian.chen@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 49066, 27054
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:24 +0000 (09:45 -0700)]
am
5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
* commit '
5b15adfe9e5ee9a92b5f0a2853246fce170d4eef':
MPEG2TSWriter: Read more immediately if an empty buffer is received
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:23 +0000 (09:45 -0700)]
am
735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"
* commit '
735d1b926fa3e057c92d74cebacca2f243ead274':
avcenc: Don't erase the InputBufferInfo before reading info from it
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:22 +0000 (09:45 -0700)]
am
2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"
* commit '
2aa37a7d15f5e2246b8996d2600269684904c581':
recordvideo: Add an option for choosing software encoders
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:22 +0000 (09:45 -0700)]
am
9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"
* commit '
9ce74352d23d833f9627b7be58be964206e6ff6d':
recordvideo: Sleep while waiting for the encoding to finish
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:35:10 +0000 (09:35 -0700)]
Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:07:41 +0000 (09:07 -0700)]
Merge "avcenc: Don't erase the InputBufferInfo before reading info from it"
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:07:26 +0000 (09:07 -0700)]
Merge "recordvideo: Add an option for choosing software encoders"
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:07:19 +0000 (09:07 -0700)]
Merge "recordvideo: Sleep while waiting for the encoding to finish"
Martin Storsjo [Wed, 29 Aug 2012 10:53:15 +0000 (13:53 +0300)]
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
Without this, the caller might hang waiting for more output buffers.
Change-Id: Ief6be00b7600be8498a953e8e88f0582ea8fce85
Martin Storsjo [Wed, 29 Aug 2012 12:22:18 +0000 (15:22 +0300)]
avcenc: Don't erase the InputBufferInfo before reading info from it
Previously, the timestamp and flags were read from the InputBufferInfo
struct after it had been erased.
This fixes cases where the output timestamp from the avc encoder
could spuriously be garbage every now and then.
Change-Id: I21acf23cfac93bcc201a603feace6499ec6d8e76
Martin Storsjo [Wed, 29 Aug 2012 11:49:28 +0000 (14:49 +0300)]
MPEG2TSWriter: Read more immediately if an empty buffer is received
If writing encoded data from an OMXCodec, the last buffer can be
an empty buffer (with the EOS flag set, which isn't propagated to
MediaBuffer). If we don't retry reading, we won't ever get the
EOS error and thus won't properly signal that the source is done.
Change-Id: Ibe01dbcd0637fbf0c2529a277e9f208c48e0e8ab
Martin Storsjo [Wed, 29 Aug 2012 10:41:01 +0000 (13:41 +0300)]
recordvideo: Sleep while waiting for the encoding to finish
This avoids busy looping while e.g. waiting for the software encoder
to finish.
This is similar to what the 'record' and 'stagefright' test apps
do.
Change-Id: Idce55b15396ce78b621a521229603bec1e799f33
Martin Storsjo [Wed, 29 Aug 2012 10:28:33 +0000 (13:28 +0300)]
recordvideo: Add an option for choosing software encoders
This is similar to the same option in the 'stagefright' test
application.
Change-Id: I2a2e5201bd93460df0911ef12865c9030c0183e5
Jean-Baptiste Queru [Thu, 23 Aug 2012 20:01:44 +0000 (13:01 -0700)]
am
4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
* commit '
4b60ac04a878eaf8344b56189509ccd6925855c2':
Fixed redefinition of 'i' with a different type error
Jean-Baptiste Queru [Thu, 23 Aug 2012 20:01:43 +0000 (13:01 -0700)]
am
6e55a0f7: Merge "Fixed member access into incomplete type build error"
* commit '
6e55a0f71eef07c6041077e6e9e7fad8c973a752':
Fixed member access into incomplete type build error
Jean-Baptiste Queru [Thu, 23 Aug 2012 19:42:48 +0000 (12:42 -0700)]
Merge "Fixed redefinition of 'i' with a different type error"
Jean-Baptiste Queru [Thu, 23 Aug 2012 19:42:24 +0000 (12:42 -0700)]
Merge "Fixed member access into incomplete type build error"
Tareq A. Siraj [Thu, 26 Jul 2012 20:53:14 +0000 (16:53 -0400)]
Fixed redefinition of 'i' with a different type error
Renamed the redefinition of 'i' to 'k'.
Change-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
Tareq A. Siraj [Fri, 27 Jul 2012 15:49:32 +0000 (11:49 -0400)]
Fixed member access into incomplete type build error
Included the ARTPAssembler.h file to fix the 'member access into
incomplete type "android::ARTPAssembler"' error reported by clang.
Change-Id: I10cb1e38bf360858bb7ebdeae82ba1e64431f87d
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Edwin Vane<edwin.vane@intel.com>
Jean-Baptiste Queru [Tue, 21 Aug 2012 17:15:00 +0000 (10:15 -0700)]
am
1e75e972: Merge "avcenc: Update a comment about the inline assembly"
* commit '
1e75e9721254ae5df05c3d88b30ed7f778406261':
avcenc: Update a comment about the inline assembly
Jean-Baptiste Queru [Tue, 21 Aug 2012 17:14:59 +0000 (10:14 -0700)]
am
aa411adf: Merge "h264 streaming: make profile-level-id optional"
* commit '
aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3':
h264 streaming: make profile-level-id optional
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:49:26 +0000 (09:49 -0700)]
Merge "avcenc: Update a comment about the inline assembly"
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:18:31 +0000 (09:18 -0700)]
Merge "h264 streaming: make profile-level-id optional"
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:08:38 +0000 (09:08 -0700)]
am
5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"
* commit '
5ebce52c46360b349daa8c944ca81e3c74accec0':
avcenc: Fix the gcc inline assembly constraints
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:08:37 +0000 (09:08 -0700)]
am
9e13e927: Merge "avcenc: Properly indent assembly blocks"
* commit '
9e13e927206b7c7c15359af2b0ccc8f525e78a7d':
avcenc: Properly indent assembly blocks
Jean-Baptiste Queru [Tue, 21 Aug 2012 15:37:26 +0000 (08:37 -0700)]
Merge "avcenc: Fix the gcc inline assembly constraints"
Jean-Baptiste Queru [Tue, 21 Aug 2012 15:36:58 +0000 (08:36 -0700)]
Merge "avcenc: Properly indent assembly blocks"
Martin Storsjo [Tue, 21 Aug 2012 11:28:45 +0000 (12:28 +0100)]
avcenc: Update a comment about the inline assembly
Since the inline assembly was fixed in commit
3fdb405597f the
comment was no longer accurate.
Change-Id: Id4f8a111d1fa6e0c2e97f7db64262e8d1604c519
Martin Storsjo [Fri, 13 Apr 2012 11:17:30 +0000 (14:17 +0300)]
avcenc: Fix the gcc inline assembly constraints
Use +r for registers whose value is used as input to the block.
Also switch input registers to output registers with +r, for
registers that are modified by the assembly block (SUB_SAD in
sad_inline.h).
Without this, the inline assembly fails on modern gcc versions
(tested on gcc 4.6), where the intended input value never is
loaded into the registers, causing segfaults at runtime.
Currently this assembly isn't used, but this change makes it
work properly if enabled.
Change-Id: I37c247cd5c8aff213445e31ab3bd33d8f0f37e05
Martin Storsjo [Fri, 13 Apr 2012 11:16:54 +0000 (14:16 +0300)]
avcenc: Properly indent assembly blocks
Also line break multiline assembly blocks - previously they were
virtually unreadable.
Change-Id: Icb269909b78746e26b28ab7dcb6979c4655a0b0c
Nick Kralevich [Mon, 20 Aug 2012 19:53:43 +0000 (12:53 -0700)]
am
46b7eeb8: Merge "hardening: eliminate text relocations from h264"
* commit '
46b7eeb8be7449515082ecb1a61700affb44115f':
hardening: eliminate text relocations from h264
Nick Kralevich [Mon, 20 Aug 2012 18:55:17 +0000 (11:55 -0700)]
Merge "hardening: eliminate text relocations from h264"
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:13 +0000 (09:40 -0700)]
am
cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
* commit '
cd622346235829f60246a061560adf5921ba129c':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:12 +0000 (09:40 -0700)]
am
02a4ec21: Merge "avcenc: Remove a leftover define"
* commit '
02a4ec216cf5ca903e1765ca3e7ff2985436b236':
avcenc: Remove a leftover define
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:54:11 +0000 (08:54 -0700)]
Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:53:54 +0000 (08:53 -0700)]
Merge "avcenc: Remove a leftover define"
Martin Storsjo [Mon, 20 Aug 2012 13:34:14 +0000 (14:34 +0100)]
MPEG2TSWriter: Fix an off-by-one in the condition for padding
This makes a remuxed file play without any decoding warnings,
while there still were some occasional warnings with the previous
version.
Change-Id: I31d73446ded1eeb3da10783c5ef841270563ca12
Patrik2 Carlsson [Mon, 20 Aug 2012 07:53:09 +0000 (09:53 +0200)]
h264 streaming: make profile-level-id optional
profile-level-id is made optional according to rfc3984:
"If no profile-level-id is present, the Baseline Profile without
additional constraints at Level 1 MUST be implied."
Change-Id: If868468a48917ceccb963b8ac15767583da29723
Martin Storsjo [Fri, 17 Aug 2012 08:28:09 +0000 (11:28 +0300)]
avcenc: Remove a leftover define
This should have been removed as part of
f5af6314db, but
the second __arm__ define was introduced after the original commit
was written, and not removing the second one was an oversight in
rebasing the patch on top of the new code.
Change-Id: Iccf08ffdef130446dd6e97dc1e15e6a1d4f9386f
Jean-Baptiste Queru [Fri, 17 Aug 2012 00:37:44 +0000 (17:37 -0700)]
am
64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"
* commit '
64b3fe55f7edd16be32e07c28c2c90f84f3b9b80':
stagefright amrnb: Remove unused leftover source files
Jean-Baptiste Queru [Fri, 17 Aug 2012 00:37:43 +0000 (17:37 -0700)]
am
c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
* commit '
c1d2777c8004a9491e1381cca33a6768faed50c3':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
Jean-Baptiste Queru [Thu, 16 Aug 2012 23:42:06 +0000 (16:42 -0700)]
Merge "stagefright amrnb: Remove unused leftover source files"
Jean-Baptiste Queru [Thu, 16 Aug 2012 23:40:19 +0000 (16:40 -0700)]
Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:28 +0000 (15:29 -0700)]
am
dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit '
dde79acfb97083d690e3cceabff78931b10d1539':
hardening: eliminate text relocations from mp3
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:26 +0000 (15:29 -0700)]
am
b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit '
b7ca7dc9652456181080bf28ec376bc5a36cf6a2':
avcenc: Clarify the ifdefs surrounding inline assembly
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:25 +0000 (15:29 -0700)]
am
4f981882: Merge "hardening: eliminate text relocations from amrwb"
* commit '
4f981882da8080e1d41d000bfbad92df61adcfba':
hardening: eliminate text relocations from amrwb
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:24 +0000 (15:29 -0700)]
am
c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
* commit '
c3bfa0260a530af3e9c091c1c9d90d1283021dd6':
aacenc/amrwbenc: Remove the now unused LINUX define
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:23 +0000 (15:29 -0700)]
am
3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit '
3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49':
aacenc/amrwbenc: Remove unused and dubious typedefs
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:45:30 +0000 (14:45 -0700)]
Merge "hardening: eliminate text relocations from mp3"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:44:54 +0000 (14:44 -0700)]
Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:44:39 +0000 (14:44 -0700)]
Merge "hardening: eliminate text relocations from amrwb"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:42:35 +0000 (14:42 -0700)]
Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:42:16 +0000 (14:42 -0700)]
Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
Martin Storsjo [Wed, 7 Mar 2012 11:17:52 +0000 (13:17 +0200)]
aacenc/amrwbenc: Remove the now unused LINUX define
This is no longer used by the codec code (except for the
amrwbenc sample).
Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
Martin Storsjo [Thu, 23 Jun 2011 07:53:55 +0000 (10:53 +0300)]
aacenc/amrwbenc: Remove unused and dubious typedefs
These typedefs aren't used anywhere, and their description
doesn't really match their actual definition. The VO_TCHAR
type is even defined as pointer for one configuration and
as non-pointer for another configuration.
This gets rid of the last use of the LINUX define in the
VO codecs (except for the amrwbenc sample application).
Within the codecs, the use of this define is unclear - does it
indicate code specific to android but not normal linux, linux
but not other unixes, unix but not windows, or gcc but not
other compilers, etc.
Originally, prior to cleanup, the define has meant many
different of these - these uses has now been cleaned up to
use the proper feature detection macros (e.g. looking for
defines automatically set by the compiler, instead of
relying on manually setting this define).
Change-Id: I1a675d653d6d305f558aa7f74c7255858dc62758
Jean-Baptiste Queru [Wed, 15 Aug 2012 18:24:36 +0000 (11:24 -0700)]
am
2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
* commit '
2c3d9b7b9e34c9122c0a568d6b1fb24404021f55':
MPEG2TSWriter: Correctly add padding using the adaptation field
Jean-Baptiste Queru [Wed, 15 Aug 2012 17:14:29 +0000 (10:14 -0700)]
Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
Paul Fariello [Mon, 23 Jan 2012 16:32:06 +0000 (17:32 +0100)]
MPEG2TSWriter: Correctly add padding using the adaptation field
Change-Id: I268cce36ada910ba168c4c9dcedab0b20f6e6ebb
Jean-Baptiste Queru [Mon, 13 Aug 2012 22:19:13 +0000 (15:19 -0700)]
am
98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
* commit '
98159acd68307bf0fcec40ae0fffc1a715517d1d':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
Jean-Baptiste Queru [Mon, 13 Aug 2012 21:37:57 +0000 (14:37 -0700)]
Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
Ard Biesheuvel [Mon, 13 Aug 2012 20:55:51 +0000 (22:55 +0200)]
hardening: eliminate text relocations from h264
Change-Id: I8bdf9746f28f2f7bed6c1109c0f4badbab765a7c
Ard Biesheuvel [Mon, 13 Aug 2012 20:47:33 +0000 (22:47 +0200)]
hardening: eliminate text relocations from mp3
Change-Id: I671ed4c8c7bb15172a8b64d513e2844319495102
Ard Biesheuvel [Mon, 13 Aug 2012 20:44:43 +0000 (22:44 +0200)]
hardening: eliminate text relocations from amrwb
Change-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62
Jean-Baptiste Queru [Mon, 13 Aug 2012 17:53:51 +0000 (10:53 -0700)]
am
5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit '
5efa7bf945f53c419501b0a4f9718962f24f0df5':
amrnb: Fix audio distortion in an AMR-NB clip
Jean-Baptiste Queru [Mon, 13 Aug 2012 17:37:03 +0000 (10:37 -0700)]
Merge "amrnb: Fix audio distortion in an AMR-NB clip"
Jean-Baptiste Queru [Fri, 10 Aug 2012 22:32:40 +0000 (15:32 -0700)]
am
24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
* commit '
24893fef8e0f816a8a21749fa3eb9eed9173a0fd':
MPEG2TSWriter: Write a proper CRC in PAT and PMT
Jean-Baptiste Queru [Fri, 10 Aug 2012 22:26:43 +0000 (15:26 -0700)]
Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"