3551 Commits

Author SHA1 Message Date
Andreas Huber
90c6565741 Make AwesomePlayer's reset process more verbose to track down ANRs.
Change-Id: I8c9fa872263796ba61b3e8de6bc05d50f57833f5
related-to-bug: 3302399
2011-01-04 10:19:13 -08:00
Mike Lockwood
0cd0136d44 Move MTP Java classes to android.mtp.* package.
Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-30 11:54:33 -05:00
Ying Wang
8cb9975f35 Fix build.
Due to a bug (fixed by 	59163bf2f15e28712be6598144ae0fdb94dac52b),
libstagefright_yuv.so was actually not prelinked.

Change-Id: Idbc9b968708d0fc31a087d2e4f24398072d915e2
2010-12-29 13:34:20 -08:00
Mike Lockwood
da03aaad78 Change libusbhost and libmtp from static to shared libraries
Change-Id: Iccc67db32400cdeb88aa33261c9e0cf73db992ca
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 09:12:15 -05:00
Andreas Huber
54e6649e4c Squashed commit of the following:
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
2010-12-23 10:27:40 -08:00
James Dong
2116dc91e9 Expose AMRNB/WB and AAC encoder and related file output formats
Cherry-picked from GB

bug - 3305667

Change-Id: I116ba908666d712495a1bd2bcc47c35f274c7fae
2010-12-22 13:42:36 -08:00
James Dong
6cba61ee68 Merge "Avoid using private Bitmap constructor to generate bitmaps" 2010-12-22 12:03:39 -08:00
James Dong
0e4b535b43 Avoid using private Bitmap constructor to generate bitmaps
bug - 2433195

Change-Id: Ic74225286c9884055ae751cf76a1d65e8e70b3ae
2010-12-22 11:45:42 -08:00
Andreas Huber
222e689267 Distinguish discontinuities w/ a format change from those without.
Shutdown decoders as needed in anticipation of a format change, otherwise just flush.

Change-Id: Ieb04f8aa8658569b091409c4903075fd496e5abb
2010-12-22 10:03:04 -08:00
Andreas Huber
c0bfdb257c Better handling of forming absolute https URLs, runtime error on https:// access.
Change-Id: I7f6275520b0bd070e645024dd151a8541b8787b2
2010-12-21 14:36:19 -08:00
Andreas Huber
3f3c58f1ef Merge "Squashed commit of the following:" 2010-12-21 10:47:34 -08:00
Andreas Huber
41c3f74048 Squashed commit of the following:
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
2010-12-21 10:22:33 -08:00
James Dong
7455630fff Add more debugging code to track down hang during video recording
bug - 3276561

Change-Id: I1e02590b23031f29bcbfc4a1064f039ed80cb862
2010-12-21 10:17:53 -08:00
James Dong
2a1cc5ac30 Merge "Backward-compatibility max file size support, ignoring 0 or negative file size limit" 2010-12-20 12:00:52 -08:00
James Dong
26ea64c744 Backward-compatibility max file size support, ignoring 0 or negative file size limit
bug - 3281011

Change-Id: I2d3ae4565602e2374ca794c5e8d0837ad33cf0e8
2010-12-20 11:59:17 -08:00
Jamie Gennis
7dd7c69f0f Merge "Change a Stagefright assert to an error check." 2010-12-20 10:22:48 -08:00
Jamie Gennis
fd8b75afdd Change a Stagefright assert to an error check.
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
2010-12-17 18:26:28 -08:00
Mike Lockwood
fbc4939d2b MediaScanner: Fix handling of .nomedia files in directories
In particular, fix the code that prevents the database triggers from deleting
files when a .nomedia file is added to a directory

Change-Id: Ie913223f3b1bbf9122842a675b96d4baac3b1c6f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-17 12:27:47 -08:00
Mike Lockwood
28cfb113da Merge "MediaScanner: Add support for scanning empty directories" 2010-12-17 11:22:12 -08:00
Mike Lockwood
076e05b488 MediaScanner: Add support for scanning empty directories
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>
2010-12-16 15:35:36 -08:00
Andreas Huber
c4f297d612 Instead of asserting, gracefully abort and signal and error.
Change-Id: I170a602ed80e6c85a94e46deadfc02aaf92bfebb
2010-12-16 11:31:13 -08:00
Andreas Huber
f76aca984c Merge "The HTTP/1.1 Host request header must include port if it's not the default (80)." 2010-12-16 10:51:15 -08:00
Andreas Huber
3abb7dde86 The HTTP/1.1 Host request header must include port if it's not the default (80).
Change-Id: Idcc1429fbeecef99dad435208c9a1bd481132e2b
2010-12-16 10:45:24 -08:00
Andreas Huber
2e8295950a Merge "Remove now obsolete implementation of streaming from AwesomePlayer." 2010-12-16 10:26:48 -08:00
Andreas Huber
52185ff754 Merge "Properly announce decoder output format changes, make sure AMessage::dup does." 2010-12-16 10:26:37 -08:00
James Dong
49dad77148 Merge "Give the standard not compliant video sample a chance if its size in the mp4 header is invalid" 2010-12-16 10:24:27 -08:00
Andreas Huber
d936726fd7 Remove now obsolete implementation of streaming from AwesomePlayer.
Change-Id: If62bedbf74c8e987d6651604d7bebc9da381e86a
2010-12-16 10:16:36 -08:00
Andreas Huber
687b32d83e Properly announce decoder output format changes, make sure AMessage::dup does.
Change-Id: Ia77f6b6d5e5c5055583740dfe876b8a3c22be9b6
2010-12-16 10:08:26 -08:00
Chih-Chung Chang
c32dd5f2d1 Fix 3274309: Returns correctly sized thumbnails for MINI_KIND video thumbnails.
Change-Id: I88b293e44430eebe780dfb9eb06d80f8ce89483f
2010-12-16 17:44:30 +08:00
James Dong
c9e1c80f78 Give the standard not compliant video sample a chance if its size in the mp4 header is invalid
Change-Id: Ib573ededb9c73285822fa238120faa484402bcf7
2010-12-15 17:40:08 -08:00
James Dong
0efdc95d59 Opted to recognize "h263" or "H263" boxes in an mp4 file
bug - 3278240

Change-Id: Ifd1b1f3e5dd55dbf2c33bbad9dd51998c25bfc15
2010-12-15 15:49:46 -08:00
Andreas Huber
7c6ca1907e Merge "Properly order the data written out to the transport stream by timestamp." 2010-12-15 15:37:30 -08:00
Andreas Huber
a15874665f Initial support for a true streaming player for mpeg2 transport streams.
Change-Id: I153eec439d260a5524b21270e16d36940ec3161a
2010-12-15 15:18:26 -08:00
Andreas Huber
fb16f7009b Properly order the data written out to the transport stream by timestamp.
This ensures data locality across tracks.

Change-Id: I823b9407e3603473422177ec02dff4860ffc5b4f
2010-12-15 14:56:43 -08:00
Andreas Huber
ebf90ac7a8 Merge "Proper recovery of timestamp information in the transport stream parser." 2010-12-15 14:55:29 -08:00
Andreas Huber
9c5d62a5be Proper recovery of timestamp information in the transport stream parser.
Change-Id: I647c73688c95529f54f0bb6af17d109dfe2bb11d
2010-12-15 14:07:50 -08:00
Eric Laurent
828b5a328c Merge "Change audio routing policy for HDMI" 2010-12-15 11:48:46 -08:00
Eric Laurent
2c61bee2b0 Change audio routing policy for HDMI
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
2010-12-15 11:01:48 -08:00
Andreas Huber
08f83a6cd8 Merge "Emit better (correct) timestamps that respect AAC upsampling." 2010-12-15 09:17:21 -08:00
Mike Lockwood
4453aa4c30 CameraBrowser: Catch ActivityNotFoundException when attempting to display imported file.
Change-Id: I448f2506caf0a5599c885654fd0078beb6240965
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 23:38:43 -08:00
James Dong
88b7741228 Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature
Change-Id: I48c94b7a77a717c15fac548c7068a8a3e62c79fb
2010-12-14 22:13:14 -08:00
Andreas Huber
3d6576efd0 Emit better (correct) timestamps that respect AAC upsampling.
Change-Id: I6587416c9caa0e263aa8ec6c6d89a42e28f6ff19
2010-12-14 16:05:16 -08:00
Mike Lockwood
3be80f2e6c Merge "MTP: Make recursive delete more efficient" 2010-12-14 14:20:35 -08:00
Mike Lockwood
55f808cff9 MTP: Make recursive delete more efficient
Change-Id: Iec9df8ac910f5257236b59c95b0ee3d7d05f367c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 14:16:44 -08:00
James Dong
6f7d56cf9f Merge "Fix an issue where a fixed number of bits per sample is used for seek position calculation." 2010-12-14 12:28:31 -08:00
Andreas Huber
1f356b9569 Merge "Properly signal the condition if we run out of input data." 2010-12-14 10:11:28 -08:00
Andreas Huber
69d23b2fc8 Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes." 2010-12-14 10:11:11 -08:00
Andreas Huber
94bced1eb2 Properly signal the condition if we run out of input data.
Change-Id: I7a5ada8c25c1d32ca603b3b2c75e1808e140c367
2010-12-14 09:54:37 -08:00
Andreas Huber
5d266dd84e Support malformed ID3 V2.4 tags written by early versions of iTunes.
Change-Id: I90c2a9bbf216e2ae9a37accdaa2214233f5e54ea
related-to-bug: 3275576
2010-12-14 09:51:11 -08:00
Mike Lockwood
bafca214ea MTP: check for replacing existing files via the database instead of the file system
Change-Id: I283dab48f24d2836e48fab8e49764a9cdf13de55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 21:50:09 -08:00