Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp
* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
Remove fflush when storing thumbanil to sdcard.
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp
* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
Only scan windows media files when those codecs are enabled.
Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp
* commit '7756cbeef475127ed56bfeabecb3c291366a952f':
Removed the device type checking
Merge commit 'e9bd4788d4370714374d833aed1339d17c5ded09' into eclair-plus-aosp
* commit 'e9bd4788d4370714374d833aed1339d17c5ded09':
Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
Merge commit '3f790d87838114a71bff96b4a0a51537ca879597' into eclair-plus-aosp
* commit '3f790d87838114a71bff96b4a0a51537ca879597':
Added the checking for the wma in the memory test.
When the AudioTrack callback notification size is relatively high (Which is the case on Sholes and over A2DP), it is likely that the end of tone is reached during the first callback. In this case, the AudioTrack is stopped before exiting the callback which causes 2 problems:
- 1: If the AudioFlinger thread is scheduled before we exit the ToneGenerator callback, the track can be stopped and reset before the data is actually marked as present in the buffer by the AudioTrack callback => no audio will be processed by AudioFlinger.
- 2: In this case, the data write index in the AudioTrack buffer is incremented after the track was reset by the AudioFlinger which leaves unplayed data in the buffer. This data will be played the next time the AudioTrack is started if not flushed in between.
The fix consists in adding an intermediate state to ToneGenerator state machine so that we exit the callback function when the stop condition is reached and stop the AudioTrack the next time we execute the callback.
Merge commit '80d8ace484525f0272b8a56142ef838f5f4d38e4' into eclair-plus-aosp
* commit '80d8ace484525f0272b8a56142ef838f5f4d38e4':
Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
Merge commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9' into eclair-plus-aosp
* commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9':
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
* changes:
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
* changes:
1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases.
3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp
* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
Make media scanner read the jpeg orientation tag.
Merge commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676' into eclair-plus-aosp
* commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676':
There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp
* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
Merge commit 'b39dcb796ddf40fb87724ac28932a687756c91bd' into eclair-plus-aosp
* commit 'b39dcb796ddf40fb87724ac28932a687756c91bd':
Modified the validation to use singal media player instance.
Merge commit '56af9e9f9cbc3626acf55558d581efd2de3caa03' into eclair-plus-aosp
* commit '56af9e9f9cbc3626acf55558d581efd2de3caa03':
Modified the new stream video url.
Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp
* commit '3065a3cad069b847165c99a38a251c072950d07f':
Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
* changes:
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java Added the error callback to handle the media server crash.
