summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | MediaScanner: Fix handling of .nomedia files in directoriesMike Lockwood2010-12-171-18/+19
| | | | | | | | | | | | | | | | 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>
* | Merge "MediaScanner: Add support for scanning empty directories"Mike Lockwood2010-12-174-66/+79
|\ \
| * | MediaScanner: Add support for scanning empty directoriesMike Lockwood2010-12-164-66/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | 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 "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-163-33/+114
|\ \ \ | | | | | | | | | | | | AMessage::dup does."
| * | | Properly announce decoder output format changes, make sure AMessage::dup does.Andreas Huber2010-12-163-33/+114
| |/ / | | | | | | | | | Change-Id: Ia77f6b6d5e5c5055583740dfe876b8a3c22be9b6
* | | Merge "Give the standard not compliant video sample a chance if its size in ↵James Dong2010-12-161-0/+7
|\ \ \ | |/ / |/| | | | | the mp4 header is invalid"
| * | 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
* | Fix 3274309: Returns correctly sized thumbnails for MINI_KIND video thumbnails.Chih-Chung Chang2010-12-161-2/+16
|/ | | | Change-Id: I88b293e44430eebe780dfb9eb06d80f8ce89483f
* 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-1526-53/+4889
| | | | | | | | 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-10/+31
|\ \ | |/ |/|
| * Change audio routing policy for HDMIEric Laurent2010-12-151-10/+31
| | | | | | | | | | | | | | | | | | | | 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
* | | CameraBrowser: Catch ActivityNotFoundException when attempting to display ↵Mike Lockwood2010-12-142-1/+7
| | | | | | | | | | | | | | | | | | | | | imported file. Change-Id: I448f2506caf0a5599c885654fd0078beb6240965 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Fix media metadata retriever JNI due to a change to the private native ↵James Dong2010-12-141-2/+2
| |/ |/| | | | | | | | | Bitmap constructor signature Change-Id: I48c94b7a77a717c15fac548c7068a8a3e62c79fb
* | Merge "MTP: Make recursive delete more efficient"Mike Lockwood2010-12-141-16/+32
|\ \
| * | MTP: Make recursive delete more efficientMike Lockwood2010-12-141-16/+32
| | | | | | | | | | | | | | | Change-Id: Iec9df8ac910f5257236b59c95b0ee3d7d05f367c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | 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-132-4/+20
| | | | | | | | | | | | | | system Change-Id: I283dab48f24d2836e48fab8e49764a9cdf13de55 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Create files/folders with group media_rw instead of sdcard_rwMike Lockwood2010-12-131-1/+1
|/ | | | | | | | | | Otherwise the sdcard daemon that implements the Fuse file system at /mnt/sdcard won't have write access to the files. BUG: 3254123 Change-Id: Ib0c306bbc31ec936fd6164f17e7cd1b5dfff21b8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Merge "MediaScanner: No longer delete playlist files that have no valid entries"Mike Lockwood2010-12-131-11/+0
|\
| * MediaScanner: No longer delete playlist files that have no valid entriesMike Lockwood2010-12-131-11/+0
| | | | | | | | | | | | | | | | | | | | When copying files from MTP we must keep the file in the database, even if we cannot find any of the playlist entries (or even if it is not a valid playlist file) BUG: 3260341 Change-Id: I4b39027ee25ffae6778224cf74830a4b1ca3fecb Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Yield the omx threads so that file writer threads have a chance to retrieve ↵James Dong2010-12-132-0/+5
| | | | | | | | | | | | | | | | the output buffers once they become ready bug - 3252228 Change-Id: Iab7cf1c9a87cce7b814c63b42b21fcd6a7314b36
* | Merge "Revert "Allows the authoring engine to skip frame.""James Dong2010-12-134-112/+20
|\ \ | |/ |/|
| * Revert "Allows the authoring engine to skip frame."James Dong2010-12-114-112/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | o Skipping frames could lead to a lot of issues such as I frames is lost etc. It is not being used anyway. This reverts commit 53d4e0d58e2d5c18f6e026c705af833b9bdd7aba. Conflicts: media/libstagefright/AudioSource.cpp media/libstagefright/CameraSource.cpp Change-Id: I3abba1647de48db25bdc369066eb2a7ae4dedec2
* | Merge "Fix bug 3275151 Request and abandon audio focus with audio mode changes"Jean-Michel Trivi2010-12-131-19/+38
|\ \