Merge commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp
* commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp
* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
This change unhides all public APIs for controling audio effects exposed
by the following classes:
- AudioEffect
- BassBoost
- EnvironmentalReverb
- Equalizer
- PresetReverb
- Virtualizer
- Visualizer
Also fixes several problems in javadoc.
Change-Id: I541ee4ad0232312ec720545737cbcdb8c9a82597
Merge commit 'd194f3d68188a0993617ba8cc29d8abd381b6069' into gingerbread-plus-aosp
* commit 'd194f3d68188a0993617ba8cc29d8abd381b6069':
Replace CHECK with a failure return value when mCamera->setParameters() fails
Merge commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp
* commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
File writer has a designated writer thread now
Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp
* commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668':
Fixed a typo in a method name of MediaPlayerPerformance.java class
Merge commit '23796e3b622c6be4feb15d4d57e58645acfa431b' into gingerbread-plus-aosp
* commit '23796e3b622c6be4feb15d4d57e58645acfa431b':
Add lost frame handling in AudioSource
+ This reduces the file I/O block time for audio/video track processing
- Since the file writer is buffering some output samples, the memory
usage would go up, depending on how many output samples are buffered.
Change-Id: I780cc5b26f4b53a5efbd643fcf9505dfc19cd4cd
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp
* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
Added damr box for AMR (NB and WB) sample entry
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp
* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
Lower the lower bound for max file duration check
Merge commit '92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp
* commit '92e847ed8e455dca3b2d33d92999e3960404d9af':
Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Modified types of some arguments and returned values of the Equalizer class from int to short
to match those defined by OpenSL ES SLEqualizerItf interface.
Also fixed a problem with set properties in equalizer engine implementation.
Change-Id: I75894bad0cb67b01c18ca5e22f9687e75ee491b8
Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp
* commit '6dea6f4e71b53e421564d783c227cbe0a2469183':
Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread
* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 20 09:21:17 2010 -0700
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug: 2826841
commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date: Sun Jul 18 17:57:01 2010 -0700
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date: Thu Jul 8 20:56:13 2010 -0700
Enable the support for decoding audio with AAC+ and eAAC+ features
bug - 282684
Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
Merge commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp
* commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d':
Eliminate the linear cost associated with mSampleSizes.size()
- The linear cost associated with mSampleSizes.size() call causes the
CPU load to increase overtime as more and more audio/video samples
are recorded.
- Other Lists used in the MP4 file writer may have similar issues, but
the size() call is not made for each output audio/video output sample,
or the size of the list is bounded (not linear to the total number
of audio/video output samples). As for now, we can live with the small
cost (tested with 30 minutes long recording).
Change-Id: I23bd93ea4256cb0be0c1649760e39e6809eb4946
- Don't store timestamp for each output sample
- Don't store timestamp for statistical data collection if the collection of statistical data is not requested
TODO:
1. Reduce CPU load by elimnating the list cost associated with List.size() call.
Change-Id: I590bc17176596a65952c982574b82ee3b15b7d1c
Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp
* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
Interleave the audio and video by default
