Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp
* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
Squashed commit of the following:
commit 46744c7697f29aec71aed8de3c95ce035c284d97
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 16:44:57 2010 -0700
better separation of access units
Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c
commit d34952ac0feb1ae722ff65824d7353335502219b
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 15:35:01 2010 -0700
Support for ES packets that do not start on PES packet boundaries.
Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4
related-to-bug: 2368598
Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
This issue showed that when an AudioTrack underruns during a too long period
of time and is therefore disabled by audioflinger mixer, it takes an additional
delay of up to 3 seconds to recover.
This fix adds a simple mechanism to recover immediately when the client application
is ready to write data again in the AudioTrack buffer
Also throttle warnings on record overflows
Change-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d
Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'
* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp
* commit 'd6877fa4971710150de20453bf4ba54dca863429':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same
file without conflict definition.
Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
Merge commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd'
* commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd':
Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
Fixed the following issues in LVM effect bundle wrapper:
- memory leaks in EffectCreate() in case effect creation fails at various stages
- Added saturation when accumulating to output buffer
- Fixed problems with enabled effects count when an effect is released while enabled
- Do not allocate temporary buffer for accumulation each time process() is called
Fixed the following issues in effects framework (AudioFlinger)
- Release effect synchronously in the library when deleted from effect chain
- Do not call the effect process function if no tracks are present in the same
audio session
Change-Id: Ifbd80a163415cfb3c0a337c12082853ea45d9c91
Merge commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023'
* commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023':
Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
Merge commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06'
* commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp
* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
Merge commit 'be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp
* commit 'be0450619528e65eebfa1d7eab78fde757d094cc':
Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
Merge commit '4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp
* commit '4769f57948455277d0670ef18f64824ca5d894c1':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp
* commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
Squashed commit of the following:
The dump function whitelists several directories as filters to the output.
The mount point changed for SD card in Froyo, and we started filtering files
that were open on the SD card. This fix changes the filter for the SD card,
and adds the directory for data files as well.
Change-Id: I61b67c3d11d93dbd530e8b3566000e79bc037137
commit 29a4d3effb05a2e074cb0693316ab1977baeb0b6
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 12:01:32 2010 -0700
Fully working implementation of MPEG2TSWriter (for AAC and AVC sources).
Change-Id: I8a32a47565b647bf6c078c520e39565e08ea0d84
commit f4dec4c3899f3be393508e180d6c07e249d3335e
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 10:36:31 2010 -0700
More reliable identification of MPEG2 transport streams. Don't keep scanning forever in case the stream does not have both audio and video tracks.
Change-Id: Icc5b4e8be145b2805e8776559546a6818342aea7
commit 4fe3cc942f9b3d3cf54138b828c41214aa916dd2
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 08:23:39 2010 -0700
test code
Change-Id: I16560a17661407d06497f99ff88230724bb898af
commit 64d988b24f49f179a90fa677be11c823959e734b
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 23 14:42:52 2010 -0700
First shot at supporting writing to an MPEG2 transport stream.
Change-Id: Ie537939a99fa3ddc0c7661c47c18277584817c74
Change-Id: If78fd034af8f6e8ceac8dbeff96d5ecb3f6b96dc
* changes:
MTP: Implement extra object properties for audio, video and image files
MediaStore: Add helper method to create Uri for querying genre for an audio file
We cannot rely on the VM automatically freeing local references for us
in a timely manner in JNI code that is not called directly from Java.
Change-Id: I6ee8a9a97cb557b9d3b2ace4e4d20467b436fb9c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp
* commit 'bf47092e1e76224474745b6919febd3aa9df5bcf':
Fix track duration calculation if the start timestamp is non-zero
