Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'
* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
ALoopers can now be named (useful to distinguish threads).
Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp
* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
ALoopers can now be named (useful to distinguish threads).
- changed client_id->clientId, mClient_id->mClientId
- there was a bug in the condition for calling
signalReadComplete_lock() in stop. We should call it only when
!mLastReadCompleted and also if the current client has not already
completed its read (this second check was missing before).
Change-Id: I9a57cf6b5c6f3260883a6c74d0c7b22f675c422e
Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc'
* commit 'a5fe77d004091bd9521d087c2572f587191afbfc':
Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
Merge commit '05c1cadaeaf272a70acc889bfccd607648058470'
* commit '05c1cadaeaf272a70acc889bfccd607648058470':
Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'
* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
We accidentally always aborted after 10 secs, even if the connection was fine.
Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp
* commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad':
Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
Merge commit 'b86365ad74a197f2af6d70eedeb19083e31a9686' into gingerbread-plus-aosp
* commit 'b86365ad74a197f2af6d70eedeb19083e31a9686':
Suppress the video recording start signal
MediaSourceSplitter provides a way to split a single mediaSource
into multiple sources. It takes in the real mediaSource and multiple
clients can then be created which serve from the same real mediaSource.
Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp
* commit '577615c98e390f8417e07844d04304eac5b0e911':
Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp
* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
We accidentally always aborted after 10 secs, even if the connection was fine.
Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4'
* commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4':
Support for RTP packets arriving interleaved with RTSP responses.
Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'
* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
Changed type of reverb presets from int to short
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.
