summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Support for parsing of "folded" RTSP header values and some tweaks to the ↵Andreas Huber2011-12-092-9/+31
| | | | | | | | AMR assembler contributed by Samsung (untested). Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
* am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 ↵Dave Burke2011-12-071-2/+2
|\ | | | | | | | | | | | | sniffer from blocking on data." into ics-mr1 * commit '6727a43f6d8ff193b86ca90b2daa761c47157638': Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
| * am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from ↵Dave Burke2011-12-071-2/+2
| |\ | | | | | | | | | | | | | | | | | | blocking on data." into ics-mr1 * commit '54a53841a9ff48ba4cd004469ae4ff77caed900a': Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
| | * Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." ↵Dave Burke2011-12-071-2/+2
| | |\ | | | | | | | | | | | | into ics-mr1
| | | * Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.Andreas Huber2011-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59 related-to-bug: 5666532
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-070-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
| * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-060-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-070-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89': DO NOT MERGE: Remove the AVI extractor. Disable wifiwatchdog for now
| * | | | am 3de8d36b: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-070-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | * commit '3de8d36b6fd166cf63ca256c455c0ea26a849668': DO NOT MERGE: Remove the AVI extractor. Disable wifiwatchdog for now
| | * | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-070-0/+0
| | |\ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
| | | * | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
* | | | | Merge "Allow data uris to be data sources"Narayan Kamath2011-12-074-2/+156
|\ \ \ \ \
| * | | | | Allow data uris to be data sourcesNarayan Kamath2011-12-064-2/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5571010 Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
* | | | | | am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into ↵Andreas Huber2011-12-060-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | manualmerge" into ics-mr1 * commit '92860d5d4681e684d5f3936137c6c067c950121e': DO NOT MERGE: Remove the AVI extractor.
| * | | | | am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1Andreas Huber2011-12-060-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a': DO NOT MERGE: Remove the AVI extractor.
| | * | | | Merge commit 'babb7200' into manualmergeAndreas Huber2011-12-060-0/+0
| | |\ \ \ \
| | | * | | | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| | | | |/ / | | | |/| | | | | | | | | | | | | | Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
* | | | | | am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame ↵James Dong2011-12-060-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at zeroeth position when searching for sync frames" into ics-mr1 * commit '49782b8100a752056f044f6f3f1cf16a6a1f03b4': DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
| * | | | | am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when ↵James Dong2011-12-061-0/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | searching for sync frames" into ics-mr1 * commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3': DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
| | * | | | Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching ↵James Dong2011-12-061-0/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | for sync frames" into ics-mr1
| | | * | | | DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync ↵James Dong2011-12-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frames The current logic does not check the I-frame at zeroeth position and therefore for the files with only 1 I-Frame at zeroeth postion does not play. Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com> Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch. Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94 related-to-bug: 5711942
* | | | | | | am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI ↵Andreas Huber2011-12-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extractor." into ics-mr1 * commit 'c4738293527618f9a228c3f0f645c0a0704ada9c': DO NOT MERGE: Remove the AVI extractor.
| * | | | | | am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1Andreas Huber2011-12-063-6/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '05d630691127c022befd071b2bede87c707112a9': DO NOT MERGE: Remove the AVI extractor.
| | * | | | | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
* | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-060-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-050-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" ↵Eric Laurent2011-12-052-8/+14
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '5433e25f6ce013860ff2a074ad8d1158cc39ab91': audioflinger: fix audio skipping over A2DP
| * | | | | am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1Eric Laurent2011-12-052-8/+14
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b': audioflinger: fix audio skipping over A2DP
| | * | | | Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1Eric Laurent2011-12-052-8/+14
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | audioflinger: fix audio skipping over A2DPEric Laurent2011-12-052-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum sleep time allowed in the mixer thread when audio tracks are enabled but not ready for mixing is derived from the latency reported by the output stream. This does not work for A2DP where the latency also reflects encoding, decoding and transfer time. Modified activeSleepTimeUs() to take A2DP case into account. Issue 5682206. Change-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35
* | | | | | resolved conflicts for merge of 07bacabe to masterAndreas Huber2011-12-052-26/+134
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
| * | | | | am f2e12498: Merge "Properly identify how much metadata we need to cache in ↵Andreas Huber2011-12-053-41/+136
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order to instantiate" into ics-mr1 * commit 'f2e1249846a17c69d728189a8dc67f37261f0a59': Properly identify how much metadata we need to cache in order to instantiate
| | * | | | Properly identify how much metadata we need to cache in order to instantiateAndreas Huber2011-12-053-41/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the extractor without blocking (and therefore be able to abort). Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3 related-to-bug: 5666532
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-050-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting ↵Mike Lockwood2011-12-020-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 * commit '9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e': MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
| * | | | | am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain ↵Mike Lockwood2011-12-021-4/+7
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subdirectories of the storage DO NOT MERGE" into ics-mr1 * commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd': MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
| | * | | | MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-021-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage DO NOT MERGE Bug: 5527220 Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | | am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more ↵Mike Lockwood2011-12-020-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 * commit '7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2': MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
| * | | | | am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from ↵Mike Lockwood2011-12-021-2/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the MTP driver DO NOT MERGE" into ics-mr1 * commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1': MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
| | * | | | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO ↵Mike Lockwood2011-12-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | | Merge "MTP: Add support for restricting PTP to only certain subdirectories ↵Mike Lockwood2011-12-021-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | of the storage"
| * | | | | | MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-021-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage Bug: 5527220 Change-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | | | Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver"Mike Lockwood2011-12-021-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MTP: Don't attempt to read more than 16K at a time from the MTP driverMike Lockwood2011-12-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | Change-Id: I1c603308272f9b00174c3f9046171e069ffee566
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would ↵Andreas Huber2011-12-011-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | advertise the wrong video dimensions" into ics-mr1 * commit '10526a0bfe070ac4d1e550a81ed68be35d261b16': Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
| * | | | | am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the ↵Andreas Huber2011-12-011-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong video dimensions" into ics-mr1 * commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630': Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
| | * | | | Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab related-to-bug: 5696324
generated by cgit v1.1 at 2024-07-02 08:59:46 +0000