Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2
* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
Check whether test server is up before running tests which use streaming files.
Merge commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67'
* commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67':
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
Merge commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6' into eclair-mr2-plus-aosp
* commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6':
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
Merge commit '5959228b6cfcbcbc7d27cc969ff49a330398018f'
* commit '5959228b6cfcbcbc7d27cc969ff49a330398018f':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Merge commit 'be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5' into eclair-mr2-plus-aosp
* commit 'be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2
* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-plus-aosp
* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
* changes:
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Merge commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624'
* commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624':
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
Merge commit '421a32fb31f46860ce77b0e8131178a0af52d087'
* commit '421a32fb31f46860ce77b0e8131178a0af52d087':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Merge commit 'd512a3b3a8d0adb37bd0208181a02c91dc8025fb' into eclair-mr2-plus-aosp
* commit 'd512a3b3a8d0adb37bd0208181a02c91dc8025fb':
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
* changes:
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif to from the full image, if both can generate of a thumbnail of same size.
Merge commit '99588d590f0965beb899606a79db0889601c7ec0' into eclair-mr2-plus-aosp
* commit '99588d590f0965beb899606a79db0889601c7ec0':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Merge commit '571529f82159a3205547a61d1b720b695dc066be' into eclair-mr2-plus-aosp
* commit '571529f82159a3205547a61d1b720b695dc066be':
Fix bug 2242585 to unhide the new audio recording sources.
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-mr2
* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-plus-aosp
* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-mr2
* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp
* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
Merge commit 'db8585402f6b4ca219d5d73735a11cee115f50b7'
* commit 'db8585402f6b4ca219d5d73735a11cee115f50b7':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6' into eclair-mr2-plus-aosp
* commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp
* commit '05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-mr2
* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-plus-aosp
* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 12:02:31 2009 -0800
DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback.
commit 991832fe4dc012e51d3d9ed8d647c7f09991858f
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:24:11 2009 -0800
DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though.
commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 16:11:54 2009 -0700
DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:10:49 2009 -0800
DO NOT MERGE: Fix heap corruptin in OMXNodeInstance.
commit 5a47f7439a1298b330541a7e4e647a8b44487388
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:08:19 2009 -0800
DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec.
commit 45bed64722501b9f411a2940aff5aff4cc4d2e98
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:02:23 2009 -0800
DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts.
commit 6738e306a50196f31a73d4fc7b7c45faff639903
Author: Andreas Huber <andih@google.com>
Date: Thu Oct 15 13:46:54 2009 -0700
DO NOT MERGE: Reimplement the OMX backend for stagefright.
Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.
Changed APIs to conform to the rest of the system.
Merge commit '940bc05b38f5295b31fb80e820a98e32200e492f'
* commit '940bc05b38f5295b31fb80e820a98e32200e492f':
Modify the behavior of createThumbnailForEXIF() to:
Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'
* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Merge commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c' into eclair-mr2-plus-aosp
* commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c':
Modify the behavior of createThumbnailForEXIF() to:
Merge commit 'fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp
* commit 'fcae6c71794696a074cabf20beeb02fd87853e30':
Fix issue 2203561: Sholes: audio playing out of earpiece.
* changes:
Modify the behavior of createThumbnailForEXIF() to: returning SizedThumbnailBitmap, which contains the downsampled bitmap either from the thumbnail in EXIF or the full image.
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp
* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2
* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.
Same modifications for AudioRecord.
Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
Merge commit 'bd38397bc4f754c040d4abf5435c2469c3357924'
* commit 'bd38397bc4f754c040d4abf5435c2469c3357924':
Add new audio sources to support the A1026 recording configurations.
Merge commit '3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp
* commit '3d2d155a87cdd3038a2e6df8741181431cb250e1':
Add new audio sources to support the A1026 recording configurations.
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-plus-aosp
* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
Add new audio sources to support the A1026 recording configurations.
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2
* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
Add new audio sources to support the A1026 recording configurations.
Merge commit '7146332e9999443e22296d6d0968f95b80e79af6'
* commit '7146332e9999443e22296d6d0968f95b80e79af6':
Support raw audio sources in MediaPlayerImpl.
