summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use video output if necessary for timelapse video recordingJames Dong2011-01-042-12/+22
| | | | Change-Id: I88d0cc824f0fbf8b2f392fbc23c69b5bfefda1b8
* Merge "Remove captureFrame from MediaMetadataRetriever.java class It has ↵James Dong2011-01-041-1/+1
|\ | | | | | | been replaced by getFrameAtTime() method"
| * Remove captureFrame from MediaMetadataRetriever.java classJames Dong2011-01-041-1/+1
| | | | | | | | | | | | It has been replaced by getFrameAtTime() method Change-Id: I9ed762e10e61dbc188e2a740e489a3e2ef9a6bb2
* | Make AwesomePlayer's reset process more verbose to track down ANRs.Andreas Huber2011-01-041-0/+14
|/ | | | | Change-Id: I8c9fa872263796ba61b3e8de6bc05d50f57833f5 related-to-bug: 3302399
* Fix build.Ying Wang2010-12-291-0/+2
| | | | | | | Due to a bug (fixed by 59163bf2f15e28712be6598144ae0fdb94dac52b), libstagefright_yuv.so was actually not prelinked. Change-Id: Idbc9b968708d0fc31a087d2e4f24398072d915e2
* Change libusbhost and libmtp from static to shared librariesMike Lockwood2010-12-291-1/+3
| | | | | Change-Id: Iccc67db32400cdeb88aa33261c9e0cf73db992ca Signed-off-by: Mike Lockwood <lockwood@android.com>
* Squashed commit of the following:Andreas Huber2010-12-2327-213/+632
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit eaeaa2672d4e0a82891493b2bde8bdd0c0e79a1b Author: Andreas Huber <andih@google.com> Date: Thu Dec 23 10:26:48 2010 -0800 Remove lowest bandwidth stream if using the legacy player. Change-Id: I2f885e26344996de9152f8fda9fd6bdef89bf953 commit 7d652972615b2750fd8f1c21b9fab0e136df2b82 Author: Andreas Huber <andih@google.com> Date: Thu Dec 23 10:14:36 2010 -0800 Don't clear the packet source's format for legacy discontinuities. Change-Id: I9bd5a21b9bd28043ad38bd0658ccc8eda3c1079a commit 2b18a45aac17cbfe1aa089d0f6510957d438dd64 Author: Andreas Huber <andih@google.com> Date: Thu Dec 23 10:13:55 2010 -0800 Use NuPlayer for HTTP live streaming based on runtime property. adb shell setprop media.httplive.enable-nuplayer true Change-Id: I22738df3403985dc8e6992b1ab5da5747309f773 commit 50d899fb7b9ea52c3994b0a58e993998d926aeed Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 16:25:22 2010 -0800 Make ACodec a lot less verbose. Change-Id: I94c7e499b61032321ffaf999f5ad2c913cde6a48 commit b19e1740cb4d02990a56844654b5d019987c6405 Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 16:22:22 2010 -0800 Wait until we have fresh codec-specific-data before instantiating the decoders after a discontinuity involving a format change. Change-Id: I7bcf9b5ae3319f08bf8978a117e8ee5220902e37 commit 06428c006906c9099e430aface3b439ff1d36ecc Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 15:20:38 2010 -0800 Disable random seeks in the streaming tool for now. Change-Id: Ie86fde422dcfc4b2c7a01be51a193fda9c88cd71 commit e19db68f3bea8a61c191f60f6940f30e3a0d5f1b Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 15:20:27 2010 -0800 Tweak HTTP live parameters. Change-Id: If4b71e12485facc523a8a43d8213d0feb190daab commit 1e9942791538c2256b579d96c6c04264b0d8b087 Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 14:48:23 2010 -0800 Enable http live streaming through NuPlayer for http URLs containing the string m3u8 Change-Id: I1691fe12ae8f1507fe3673313959cd50bc324624 commit 4c33f96a6e499ee0efe0e70b687094430cb7c1c0 Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 14:40:27 2010 -0800 Support for HTTP live streaming in NuPlayer. Change-Id: Iacba1c3ebaeb8d3b972185deaf4cff18c8009c54 commit ddf705ce553708bc5b13d89a878484cf839bd674 Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 13:42:47 2010 -0800 StreamingSource now a subclass of abstract NuPlayer::Source Change-Id: Ia6c7c639628910b9d1f37decc55da48b07a70de3 commit 9e04a8406b1882a8e3fdeb7b4d52db5ae70b970a Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 13:33:52 2010 -0800 Refactor media data sourcing to NuPlayer::Source. Change-Id: I1db9fb08c4e527bf7b19c29978cf342c2b0a0bc9 Change-Id: I9610a097481dda58f22142eacda3ac2dba0b63f9
* Distinguish discontinuities w/ a format change from those without.Andreas Huber2010-12-225-24/+63
| | | | | | Shutdown decoders as needed in anticipation of a format change, otherwise just flush. Change-Id: Ieb04f8aa8658569b091409c4903075fd496e5abb
* Better handling of forming absolute https URLs, runtime error on https:// ↵Andreas Huber2010-12-212-3/+4
| | | | | | access. Change-Id: I7f6275520b0bd070e645024dd151a8541b8787b2
* Merge "Squashed commit of the following:"Andreas Huber2010-12-2111-29/+172
|\
| * Squashed commit of the following:Andreas Huber2010-12-2111-29/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 63be8ceb8b2354fb997a277c0092abae015ecf10 Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:45:34 2010 -0800 Enable handling of discontinuities that involve potential format changes. Change-Id: I21848a113db8764abb54bdcf302b0923253eaf4d commit d18a7f80ec09af382026809263dcbbfa9e7a9ec8 Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:45:01 2010 -0800 Signal whether or not a format change occured as part of the discontinuity. Change-Id: I06e64f542f4369549c9cebbb892dc612346ae43d commit c400adbd5fdbd65cfef7aed9ec65bcaace4bb69b Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:44:46 2010 -0800 A little more instrumentation of ACodec Change-Id: I07f4aeccbbd15cdd9f80f48c3f92ee984ef6d92b commit 1d802ee01f47b3cdc5b89502cec7fbb595e197a3 Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:43:58 2010 -0800 Only sync audio/video queues if both types of media are actually present. Change-Id: Ic88edf9bb1ebd4034c08747cce9877a4e28e0d35 commit e402da39d9a4d8b75653a78f728e20a3ef0fb497 Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:42:24 2010 -0800 Disable the random seek for now. Change-Id: Iddd597b546e2f229e88214f9bdd6452bb188105e Change-Id: I27c4d9ba916080be94ce6117dbb095e9022ed62b
* | Add more debugging code to track down hang during video recordingJames Dong2010-12-212-5/+20
|/ | | | | | bug - 3276561 Change-Id: I1e02590b23031f29bcbfc4a1064f039ed80cb862
* Merge "Backward-compatibility max file size support, ignoring 0 or negative ↵James Dong2010-12-201-1/+9
|\ | | | | | | file size limit"
| * Backward-compatibility max file size support, ignoring 0 or negative file ↵James Dong2010-12-201-1/+9
| | | | | | | | | | | | | | | | size limit bug - 3281011 Change-Id: I2d3ae4565602e2374ca794c5e8d0837ad33cf0e8
* | Merge "Change a Stagefright assert to an error check."Jamie Gennis2010-12-201-1/+3
|\ \ | |/ |/|
| * Change a Stagefright assert to an error check.Jamie Gennis2010-12-171-1/+3
| | | | | | | | | | | | | | | | | | | | During OMX codec initialization it is possible that buffer allocation fails. This changes Stagefright to set an error state and abort initialization rather than crashing with an assert failure when that happens. Change-Id: I2fc2fadfe75657cdbf649cc8cafd2e4c251a5f8b Bug: 3282700
* | Merge "Fix issue 3217707."Eric Laurent2010-12-172-1/+14
|\ \
| * | Fix issue 3217707.Eric Laurent2010-12-172-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that when the A2DP headset is disconnected, there is a transition period during which the A2DP sink pumps data at a very high pace. This makes that: 1 the audio flinger mixer thread spins and starves binder threads thus delaying the completion of the A2DP output stream shutdown 2 we read the audio http audio stream faster than normal and we reach the end of stream for audio while video is still playing if the streamed file is small enough. The fix consists in detecting abnormal short write intervals and sleep to restore a normal write pace. Change-Id: Iab127882494ab0e26266371dc0ce5c2ff6fa476e
* | | Merge "MediaScanner: Add support for scanning empty directories"Mike Lockwood2010-12-172-7/+12
|\ \ \ | |/ / |/| |
| * | MediaScanner: Add support for scanning empty directoriesMike Lockwood2010-12-162-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the media scanner does not create database entries for directories unless they contain a file that is scanned. Fixing this so we provide a consistent view of the world to MTP. Change-Id: Ia776acfeae23192183e7192d63cdc34d830ea889 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am a1608902: am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when ↵Eric Laurent2010-12-160-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | playing audio while recording over bluetooth SCO." into gingerbread * commit 'a1608902f95dc8ff31a52c1f1c384829a803a701': Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
| * \ \ am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio ↵Eric Laurent2010-12-161-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while recording over bluetooth SCO." into gingerbread * commit '5a756fb0f1f3f8cd7612284c889dfc69875577a8': Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
| | * | | Fix issue 2712130: Sholes: problem when playing audio while recording over ↵Eric Laurent2010-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bluetooth SCO. The problem is that when an input stream is opened for record over bluetooth SCO, the kernel mono audio device should be opened in RW mode to allow further use of this same device by an output stream also routed to bluetooth SCO. This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO). Change-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75
* | | | | Instead of asserting, gracefully abort and signal and error.Andreas Huber2010-12-161-2/+10
| |_|/ / |/| | | | | | | | | | | Change-Id: I170a602ed80e6c85a94e46deadfc02aaf92bfebb
* | | | Merge "The HTTP/1.1 Host request header must include port if it's not the ↵Andreas Huber2010-12-162-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | default (80)."
| * | | | The HTTP/1.1 Host request header must include port if it's not the default (80).Andreas Huber2010-12-162-0/+12
| | |_|/ | |/| | | | | | | | | | Change-Id: Idcc1429fbeecef99dad435208c9a1bd481132e2b
* | | | Merge "Fix speakerphone routing to analog dock"Eric Laurent2010-12-161-4/+2
|\ \ \ \
| * | | | Fix speakerphone routing to analog dockEric Laurent2010-12-161-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio routing policy when speakerphone is on and a dock with built-in speakers is connected should be to output audio to teh dock speakers Also removed route to SCO car kit if forced usage is not SCO as the SCO socket might not be established. Change-Id: I1aa2954092e28de935304b90f7a7a64d661934c7
* | | | | Merge "Remove now obsolete implementation of streaming from AwesomePlayer."Andreas Huber2010-12-161-249/+1
|\ \ \ \ \
| * | | | | Remove now obsolete implementation of streaming from AwesomePlayer.Andreas Huber2010-12-161-249/+1
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: If62bedbf74c8e987d6651604d7bebc9da381e86a
* | | | | Merge "Properly announce decoder output format changes, make sure ↵Andreas Huber2010-12-165-38/+123
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | AMessage::dup does."
| * | | | | Properly announce decoder output format changes, make sure AMessage::dup does.Andreas Huber2010-12-165-38/+123
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ia77f6b6d5e5c5055583740dfe876b8a3c22be9b6
* | | | | Give the standard not compliant video sample a chance if its size in the mp4 ↵James Dong2010-12-151-0/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | header is invalid Change-Id: Ib573ededb9c73285822fa238120faa484402bcf7
* | | | Opted to recognize "h263" or "H263" boxes in an mp4 fileJames Dong2010-12-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3278240 Change-Id: Ifd1b1f3e5dd55dbf2c33bbad9dd51998c25bfc15
* | | | Merge "Properly order the data written out to the transport stream by ↵Andreas Huber2010-12-151-11/+140
|\ \ \ \ | | | | | | | | | | | | | | | timestamp."
| * | | | Properly order the data written out to the transport stream by timestamp.Andreas Huber2010-12-151-11/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures data locality across tracks. Change-Id: I823b9407e3603473422177ec02dff4860ffc5b4f
* | | | | Initial support for a true streaming player for mpeg2 transport streams.Andreas Huber2010-12-1534-60/+5713
| | | | | | | | | | | | | | | | | | | | Change-Id: I153eec439d260a5524b21270e16d36940ec3161a
* | | | | Merge "Proper recovery of timestamp information in the transport stream parser."Andreas Huber2010-12-153-15/+80
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Proper recovery of timestamp information in the transport stream parser.Andreas Huber2010-12-153-15/+80
| |/ / / | | | | | | | | | | | | Change-Id: I647c73688c95529f54f0bb6af17d109dfe2bb11d
* | | | Merge "Change audio routing policy for HDMI"Eric Laurent2010-12-151-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Change audio routing policy for HDMIEric Laurent2010-12-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HDMI device should have a higher priority than analog dock audio but a lower priority than wired headsets. Also modified AudioService so that HDMI is mapped to DEVICE_OUT_AUX_DIGITAL device and not DEVICE_OUT_DGTL_DOCK_HEADSET as before to enable discrimination between SPDIF going to digital dock and SPIDF going to HDMI. Change-Id: I887d0c73479784dd2edaf41ce1a7d8d0bdcbb4bd
* | | | Merge "Emit better (correct) timestamps that respect AAC upsampling."Andreas Huber2010-12-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Emit better (correct) timestamps that respect AAC upsampling.Andreas Huber2010-12-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I6587416c9caa0e263aa8ec6c6d89a42e28f6ff19
* | | | Merge "Fix an issue where a fixed number of bits per sample is used for seek ↵James Dong2010-12-141-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | position calculation."
| * | | Fix an issue where a fixed number of bits per sample is used for seek ↵James Dong2010-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position calculation. The patch was from NV. bug - 3278233 Change-Id: I9bc22b6b0ee6bfa5d4617a8c497f67eb577efca4
* | | | Merge "Properly signal the condition if we run out of input data."Andreas Huber2010-12-141-0/+1
|\ \ \ \
| * | | | Properly signal the condition if we run out of input data.Andreas Huber2010-12-141-0/+1
| |/ / / | | | | | | | | | | | | Change-Id: I7a5ada8c25c1d32ca603b3b2c75e1808e140c367
* | | | Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes."Andreas Huber2010-12-142-5/+25
|\ \ \ \
| * | | | Support malformed ID3 V2.4 tags written by early versions of iTunes.Andreas Huber2010-12-142-5/+25
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I90c2a9bbf216e2ae9a37accdaa2214233f5e54ea related-to-bug: 3275576
* | | | MTP: check for replacing existing files via the database instead of the file ↵Mike Lockwood2010-12-131-4/+0
|/ / / | | | | | | | | | | | | | | | | | | system Change-Id: I283dab48f24d2836e48fab8e49764a9cdf13de55 Signed-off-by: Mike Lockwood <lockwood@android.com>