Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp
* commit '17a765a139f5a0b10768937cb11ecd9e7941b039':
Support for RTP packets arriving interleaved with RTSP responses.
Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'
* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
Make sure that timestamp does not go backward in MP4 file writer
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp
* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
Changed type of reverb presets from int to short
Changed the type of reverb preset constants exposed by the PresetReverb API to
match the type of the setPreset() method parameter.
Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp
* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
Make sure that timestamp does not go backward in MP4 file writer
- Added tests for preset and environmental reverb to functional media frame work tests.
- created a new class for energy probing used by all audio effect tests and corrected energy calculation.
Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
Merge commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96'
* commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp
* commit '8ac0983edafa064126c4480dd31047d1bb4ce111':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.
Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'cec075cc420e601602d6bfe16272c30006d262a6'
* commit 'cec075cc420e601602d6bfe16272c30006d262a6':
Ensure that buffering updates eventually hit 100% after we download everything.
Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp
* commit '235840228b0692b66d854ff499b5c4060f883e03':
Ensure that buffering updates eventually hit 100% after we download everything.
Merge commit '96dc45597e53742a2c8453f9ce03f7d501a75668'
* commit '96dc45597e53742a2c8453f9ce03f7d501a75668':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp
* commit 'b8814dce287552c1bdf13fa999296ebc7387776d':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2'
* commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2':
A first shot at proper support for seeking of rtsp streams.
Modified lvm reverb wrapper code to expose a preset reverb interface.
Also removed debug log from bundle and reverb wrapper.
Change-Id: If9b95d91e25a6ff834decdfdda34b17df9b46967
Merge commit '6b6ae996b2e84af030397cff3a7f0087de93e01c' into gingerbread-plus-aosp
* commit '6b6ae996b2e84af030397cff3a7f0087de93e01c':
A first shot at proper support for seeking of rtsp streams.
Merge commit 'a102871c7cbb74ebddc53231a871145de61351b0'
* commit 'a102871c7cbb74ebddc53231a871145de61351b0':
Visualizer: replace the FFT implementation with a faster one.
Merge commit '701b710c194181765616520f6d89d450b4b6c1f5'
* commit '701b710c194181765616520f6d89d450b4b6c1f5':
setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
Merge commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5'
* commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5':
Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
