OSDN Git Service
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 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:08:23 +0000 (11:08 -0700)]
Merge "aacenc: Mark some global arrays const"
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: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: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 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 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 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 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 18:55:17 +0000 (11:55 -0700)]
Merge "hardening: eliminate text relocations from h264"
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 [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 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 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 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:37:03 +0000 (10:37 -0700)]
Merge "amrnb: Fix audio distortion in an AMR-NB clip"
Jean-Baptiste Queru [Fri, 10 Aug 2012 22:26:43 +0000 (15:26 -0700)]
Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:03:54 +0000 (09:03 -0700)]
Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:03:15 +0000 (09:03 -0700)]
Merge "Fix initialization of audio mixer track resources for MIPS."
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:33 +0000 (13:40 -0700)]
Merge "Store correct time stamps in recorded mp4 files"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:42 +0000 (12:58 -0700)]
Merge "Correct ID3::StringSize calculation for UCS-2 data."
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:09:01 +0000 (12:09 -0700)]
Merge "avcenc: Remove redundant zero-initialization of allocated memory"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:44 +0000 (12:08 -0700)]
Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:19 +0000 (12:08 -0700)]
Merge "avcenc: Remove useless casts"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:04 +0000 (12:08 -0700)]
Merge "Initialize pool's buffer pointers to null."
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:07:47 +0000 (12:07 -0700)]
Merge "avcenc: Fix indentation"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:07:27 +0000 (12:07 -0700)]
Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:06:48 +0000 (12:06 -0700)]
Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
Paul Lind [Thu, 2 Aug 2012 01:49:49 +0000 (18:49 -0700)]
Fix initialization of audio mixer track resources for MIPS.
The value 1 << 32 (maxNumTracks defaults to 32) is surprisingly not defined
in C, and differs on MIPS than the other arch.
Therefore the track resources were not initialized properly, resulting
in failure to play any audio.
The fix allows the mConfiguredNames bitmask to be correctly set to all
1's in the 32-track case, for all arch.
Change-Id: Ied3e1305952e9567602e2cd76c5ef3acb0809ee0
Signed-off-by: Paul Lind <plind@mips.com>
Eino-Ville Talvala [Wed, 1 Aug 2012 23:13:50 +0000 (16:13 -0700)]
Merge "Shutter sound is heard at the end of the recorded video"
Johannes Carlsson [Thu, 8 Mar 2012 10:06:13 +0000 (11:06 +0100)]
Store correct time stamps in recorded mp4 files
According to the specification (ISO_IEC_14496-12_2008 page 17, 19 and
21) the time is "in seconds since midnight, Jan. 1, 1904, in UTC time"
which is not the same as Unix epoch time. This is already correctly
handled in MPEG4Extractor.cpp when reading files.
The specification also supports 64 bit timestamps which would make
it a bit more future proof, but unfortunately it seems like support
for this in players are poor (tested both Windows media player and
Quicktime player).
Change-Id: I102d728f098b8b0a21013956f017b0c4f2d69112
Martin Storsjo [Fri, 13 Jul 2012 09:48:19 +0000 (12:48 +0300)]
mediacodec: Return an error on getOutputFormat if there is no output format yet
This avoids crashing if calling the public java method
MediaCodec.getOutputFormat immediately after MediaCodec.start
(as the documentation example shows that one should do!).
Change-Id: Icd3dd7ab9ae9e8f2a67cef171ff176735de95f58
Martin Storsjo [Mon, 16 Apr 2012 17:51:34 +0000 (20:51 +0300)]
avcenc: Remove redundant zero-initialization of allocated memory
The allocation callback is now supposed to always return initialized
memory.
Change-Id: I7a4d036e498c9f87c730dda3aab5057eb764a1e7
Martin Storsjo [Mon, 16 Apr 2012 17:50:37 +0000 (20:50 +0300)]
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
Valgrind reported use of uninitialized memory in AVCEncodeSlice,
which this fixes.
Change-Id: Ia09ad3e50d05b2b0487a4d588d9b00fc0828c816
Truls Bengtsson [Wed, 11 Jul 2012 13:50:44 +0000 (15:50 +0200)]
Initialize pool's buffer pointers to null.
If these pointers are not properly initialized to null and
allocation of one of the buffers subsequently fail, the freePool
mechanism might erroneously free uninitialized pointers.
Change-Id: I2101bdb2cc576e5f50b5a1440e6fc0c54dc4e81b
Jesper Tragardh [Wed, 11 Jul 2012 12:13:47 +0000 (14:13 +0200)]
Correct ID3::StringSize calculation for UCS-2 data.
Album art was not displayed when albums were transferred via MediaGo
because the length of the description in the APIC tag was not
correctly calculated.
The method StringSize used to calculate the length of the tag
does not add the size of the null termination in UCS-2 case.
Change-Id: I5409d42f5e87d315e6e03c4d7e6cbd8a378a160d
Martin Storsjo [Fri, 13 Apr 2012 11:17:14 +0000 (14:17 +0300)]
avcenc: Fix indentation
Change-Id: I4fcdf619e3b75387a7909272f3164b8d608b6cc2
Patric Frederiksen [Tue, 10 Jul 2012 11:38:35 +0000 (13:38 +0200)]
Shutter sound is heard at the end of the recorded video
On fast hardware, which is more common, the shutter sound is
played and recorded before video recording is stopped.
Before we call play shutter sound before calling stop recording.
With this fix we call play shutter sound after calling stop recording.
Change-Id: I06a3e65fd2700f1d2457fea5ff0f64500eac436f
Martin Storsjo [Fri, 13 Apr 2012 11:23:26 +0000 (14:23 +0300)]
avcenc: Clarify the ifdefs surrounding inline assembly
Previously, the code was structured like this:
#if defined(__GNUC__) && defined(__arm__)
/* Generic C implementation */
#elif defined(__CC_ARM)
/* RVCT version */
#elif defined(__GNUC__) && defined(__arm__)
/* GCC arm assembly version */
#endif
This had two implications - the gcc arm version never was used
in practice, and the code required -D__arm__ to build at all for
other architectures.
The inline assembly constraints are buggy (requires changes so as
to not crash), and if fixed, the optimizations still aren't faster
than the generic C code on modern gcc versions. Therefore, just
ignore them and use the generic C code.
Due to the peculiar code block ordering and preprocessor conditions,
the generic C code is what has been used before anyway, but it
did require -D__arm__ to build, which can cause problems if building
for other architectures, if the system headers have ifdefs for this
define. This change makes it build without that define.
Change-Id: Ib3fcf5651ee720310b7dff10fd04279b5f90759c
Martin Storsjo [Fri, 13 Apr 2012 11:15:36 +0000 (14:15 +0300)]
avcenc: Remove useless casts
Change-Id: I73a6f74268bcf6ca22d489d13936be8fd1b3fc92
Martin Storsjo [Fri, 13 Apr 2012 11:15:08 +0000 (14:15 +0300)]
avcenc: Switch malloc/free callbacks to use pointers instead of ints
There is no reason for casting the pointers to ints. This fixes
building the code on platforms where pointers are larger than ints,
e.g. 64 bit platforms.
Change-Id: I910cd207d0908287931c9a96eb270139967e029b
Martin Storsjo [Thu, 23 Jun 2011 14:56:25 +0000 (17:56 +0300)]
stagefright amrnb: Remove unused leftover source files
This allows getting rid of adding the plain common directory
(not common/include) to the include paths in projects that use
this code, too.
Change-Id: Ifb1fe4fc1f5c6f1264cb2b64f7b78e42b1e7833a
Martin Storsjo [Thu, 1 Mar 2012 13:03:29 +0000 (15:03 +0200)]
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
Change-Id: I6d6f9dc5799750394a853325466ffa2ebec44625
PacketVideo CM [Wed, 18 May 2011 09:31:42 +0000 (12:31 +0300)]
amrnb: Fix audio distortion in an AMR-NB clip
This fix had the PacketVideo internal tracking number
RIO-9190.
This was committed on the master branch of the opencore
repository in commit
7d6ccc907d3a15ca2ff74b9c76f122ab87d0ffbe.
Change-Id: Icbd7d6fe94e02cae360946cfb6f3b8dc90c8b518
Martin Storsjo [Wed, 18 May 2011 09:29:28 +0000 (12:29 +0300)]
amrnb: Restart the p_xn pointer when retraversing the array on overflow
This is a safeguard to avoid issues in a rare codepath.
This was committed on the master branch of the opencore
repository in commit
f532d145194e474cb30d8644b8eee83873ad24cc,
based on AOSP contribution 10905.
Change-Id: I9688b009bcbe63d88ee5040e883a021aefa30664
Paul Fariello [Mon, 23 Jan 2012 16:21:33 +0000 (17:21 +0100)]
MPEG2TSWriter: Write a proper CRC in PAT and PMT
Change-Id: I6ec8039b176878da6f02691194d96b0a1e894055
Paul Fariello [Mon, 23 Jan 2012 16:24:35 +0000 (17:24 +0100)]
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
Change-Id: If94e31e51c563867db6d2376ad771f9751416084
The Android Open Source Project [Tue, 3 Jul 2012 19:11:47 +0000 (12:11 -0700)]
Reconcile with jb-release
Change-Id: I7c52b8e82465f28b32e8ebf6df56c258458f2cd3
The Android Automerger [Mon, 2 Jul 2012 19:54:56 +0000 (12:54 -0700)]
merge in jb-release history after reset to jb-dev
Eric Laurent [Mon, 2 Jul 2012 19:43:14 +0000 (12:43 -0700)]
am
109347d4: audioflinger: fix regression in attachAuxEffect().
* commit '
109347d421413303eb1678dd9e2aa9d40acf89d2':
audioflinger: fix regression in attachAuxEffect().
Eric Laurent [Mon, 2 Jul 2012 19:31:03 +0000 (12:31 -0700)]
audioflinger: fix regression in attachAuxEffect().
Commit
717e1286 introduced a regression in PlaybackThread::Track::attachAuxEffect()
when called with an effect ID of 0 to detach the auxiliary effect.
It is normal in this case that AudioFlinger::getEffectThread_l() returns 0.
Bug
6768757.
Change-Id: I7430bd1aad2f68da38f7c3e4794e7ad657bfc6be
Eric Laurent [Sun, 1 Jul 2012 16:33:59 +0000 (09:33 -0700)]
am
717e1286: audioflinger: fix auxiliary effect attachment
* commit '
717e128691f083a9469a1d0e363ac6ecd5c65d58':
audioflinger: fix auxiliary effect attachment
Eric Laurent [Fri, 29 Jun 2012 23:36:52 +0000 (16:36 -0700)]
audioflinger: fix auxiliary effect attachment
Auxiliary effects (Reverb) are global effects and as such follow
the default rule which is to attach them to the output thread that
handles music streams by default. This causes a problem when several
threads are eligible to handle music streams as tracks can be attached
to either thread based on criteria unknown when teh effect is created.
The fix consists in moving the auxiliary effect if necessary when an
AudioTrack is attached to it and this track is not on the same
output thread.
Bug
6608561.
Change-Id: Ib32c3cabc731b2046aba728be1771982999c6069
The Android Open Source Project [Mon, 25 Jun 2012 14:57:15 +0000 (07:57 -0700)]
Reconcile with jb-release
Change-Id: I1ce46fa6332f684c76c276117c7b406bdd5e9336
The Android Automerger [Sat, 23 Jun 2012 01:21:17 +0000 (18:21 -0700)]
merge in jb-release history after reset to jb-dev
Jamie Gennis [Fri, 22 Jun 2012 22:20:48 +0000 (15:20 -0700)]
am
33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
* commit '
33e28dd3c033641f4db9d1b99c7c88d6d08c61f7':
SurfaceMediaSource: keep refs to current buffers
Jamie Gennis [Fri, 22 Jun 2012 22:18:26 +0000 (15:18 -0700)]
Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
Jamie Gennis [Fri, 22 Jun 2012 21:42:00 +0000 (14:42 -0700)]
SurfaceMediaSource: keep refs to current buffers
This change fixes a bug in SurfaceMediaSource where it would not keep a
reference to all of the Gralloc buffers that the video encoder is currently
using.
Bug:
6655597
Change-Id: Ifd99976cc7ae57ed724bbf2bbcff357a39497391
The Android Open Source Project [Fri, 22 Jun 2012 15:16:51 +0000 (08:16 -0700)]
Reconcile with jb-release
Change-Id: Iea91c1026e7fc3a59815e01e4e4168f875527e7c
Andreas Huber [Wed, 20 Jun 2012 19:46:38 +0000 (12:46 -0700)]
Revert input buffer count for the SoftAAC* decoders back to 4.
This improves the netflix bandwidth change responsiveness.
With the old count of 32 the audio decoder running at a higher
priority would starve the video decoder for about 1 sec while
draining the input data.
I haven't been able to break any stream playback using MediaCodec
using the lower count, even though I'm sure I had a good reason
to increase it in the first place (see bug
6478823)
Change-Id: I7fd3e71794b0cc1570ea9d27d1d869ab1e1750c4
related-to-bug:
6685031
Andreas Huber [Wed, 20 Jun 2012 21:31:30 +0000 (14:31 -0700)]
am
39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.
* commit '
39a3113539f9bcc86a8efe562780c23ac8731098':
Revert input buffer count for the SoftAAC* decoders back to 4.
Andreas Huber [Wed, 20 Jun 2012 19:46:38 +0000 (12:46 -0700)]
Revert input buffer count for the SoftAAC* decoders back to 4.
This improves the netflix bandwidth change responsiveness.
With the old count of 32 the audio decoder running at a higher
priority would starve the video decoder for about 1 sec while
draining the input data.
I haven't been able to break any stream playback using MediaCodec
using the lower count, even though I'm sure I had a good reason
to increase it in the first place (see bug
6478823)
Change-Id: I7fd3e71794b0cc1570ea9d27d1d869ab1e1750c4
related-to-bug:
6685031
The Android Open Source Project [Tue, 19 Jun 2012 13:13:22 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: Ic4989b359b302c5d72751cdebae3433064770a29
Glenn Kasten [Mon, 18 Jun 2012 17:32:49 +0000 (10:32 -0700)]
am
eb15716b: Change definition of warmup period
* commit '
eb15716b59020f342df62bce5b293f0603b94861':
Change definition of warmup period
Glenn Kasten [Mon, 18 Jun 2012 17:32:13 +0000 (10:32 -0700)]
am
972af221: FastMixer compensates for SRC jitter in audio HAL
* commit '
972af221ae7253e406e0e1ea853e56a3010ed6b1':
FastMixer compensates for SRC jitter in audio HAL
The Android Automerger [Sat, 16 Jun 2012 14:01:55 +0000 (07:01 -0700)]
merge in jb-release history after reset to jb-dev