summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* VideoEditor:Clear Surface API additionDheeraj Sharma2011-01-234-2/+180
| | | | Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
* Merge "Remove MTP related log spam" into honeycombMike Lockwood2011-01-226-64/+17
|\
| * Remove MTP related log spamMike Lockwood2011-01-216-64/+17
| | | | | | | | | | Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Remove dead code referencing an obsolete interface.Carl Shapiro2011-01-211-17/+0
| | | | | | | | | | | | Bug: 3378919 Change-Id: I780d98492ea7996187e3d97fcae7748f7ee68e91
* | Merge "Perform orthogonal rotations without using a Skia canvas." into honeycombCarl Shapiro2011-01-211-17/+72
|\ \
| * | Perform orthogonal rotations without using a Skia canvas.Carl Shapiro2011-01-211-17/+72
| | | | | | | | | | | | | | | | | | Bug: 3371653 Change-Id: I315f671c0016f61417ff7c2a98d2c96f6b243bdf
* | | Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."Carl Shapiro2011-01-211-13/+0
|/ / | | | | | | | | | | | | This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c. Bug: 3378444 Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
* | Properly rotate video that's marked as such and decoded to a surface.Andreas Huber2011-01-211-0/+32
| | | | | | | | | | Change-Id: I1e9144db3447e58c99aac3f47702ad471678789c related-to-bug: 3378148
* | Some tweaks to HTTP live / nuplayer behaviourAndreas Huber2011-01-214-19/+96
|/ | | | | | | | | | - play audio-only streams again - workaround for malformed streams that switch PIDs across bandwidths - attempt to pick a different bandwidth stream if the previously chosen one appears to be malformed/unsupported. Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9 related-to-bug: 2368598
* Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into ↵Santosh Madhava2011-01-201-3/+4
|\ | | | | | | honeycomb
| * Fix for issue 3370052 : Export progress percentage is incorrectSantosh Madhava2011-01-201-3/+4
| | | | | | | | Change-Id: If1a39ab4c34e44b84dc6ada7b4d7b634ac347099
* | Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ↵Santosh Madhava2011-01-201-1/+1
|\ \ | |/ | | | | ratio" into honeycomb
| * Fix for PR 3369866 : Project thumbnail should have the same aspect ratioSantosh Madhava2011-01-201-1/+1
| | | | | | | | Change-Id: I028f0c74f71c8b5497a6c904b93a3f09dde559e0
* | Implement missing pause/resume support for NuPlayer.Andreas Huber2011-01-204-5/+85
|/ | | | | Change-Id: Ia3f1ce521dd4b70e134ef03aa7c9db8e8d39a134 related-to-bug: 2368598
* Merge "Eliminate recording sound by starting the video track before audio ↵James Dong2011-01-201-6/+9
|\ | | | | | | track." into honeycomb
| * Eliminate recording sound by starting the video track before audio track.James Dong2011-01-201-6/+9
| | | | | | | | | | | | | | | | | | | | | | Due to the variable delays in the system, the recording sound can still be heard if the audio track is started early. This happens even after we suppress a relative long period of initial audio for a recording session. By starting the video track before the audio track, we effectively play the recording sound earlier. bug - 3371141 Change-Id: I2cccf77eae953d96827fc080c618b1d962445c26
* | Merge "Prefill the cache before trying to instantiate the media extractor." ↵Andreas Huber2011-01-192-3/+32
|\ \ | |/ |/| | | into honeycomb
| * Prefill the cache before trying to instantiate the media extractor.Andreas Huber2011-01-192-3/+32
| | | | | | | | | | | | | | | | | | The latter is an operation that otherwise could block on the datasource for a significant amount of time. During that time we'd be unable to abort the preparation phase without this prefill. Change-Id: Ia42496d88a11314386ea8797d665bf4e94871e30 related-to-bug: 3362836
* | Bug fix: 368813 Transition is regenerated when overlay duration changes ↵Gil Dobjanschi2011-01-192-91/+137
| | | | | | | | | | | | outside the transition Change-Id: I8217e7fe00392455427e117dc54c3461301f95c5
* | Merge "remove eng developement local tags in make file" into honeycombDharmaray Kundargi2011-01-191-1/+1
|\ \
| * | remove eng developement local tags in make fileDharmaray Kundargi2011-01-191-1/+1
| | | | | | | | | | | | Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
* | | Merge "Logging the duration range from different media tracks for recording" ↵James Dong2011-01-191-0/+9
|\ \ \ | |_|/ |/| | | | | into honeycomb
| * | Logging the duration range from different media tracks for recordingJames Dong2011-01-191-0/+9
| | | | | | | | | | | | Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
* | | Merge "Always revert to the previous bandwidth if the required sequence ↵Andreas Huber2011-01-191-2/+1
|\ \ \ | |/ / |/| | | | | number cannot be found" into honeycomb
| * | Always revert to the previous bandwidth if the required sequence number ↵Andreas Huber2011-01-191-2/+1
| | | | | | | | | | | | | | | | | | cannot be found Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
* | | Turn error/exception logging on at the native layerJames Dong2011-01-192-11/+10
|/ / | | | | | | | | | | o also fixed some compilation warnings Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
* | Return a runtime error if decryption fails instead of asserting.Andreas Huber2011-01-191-2/+8
| | | | | | | | Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
* | Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG ↵Andreas Huber2011-01-191-58/+20
|\ \ | | | | | | | | | requests." into honeycomb
| * | Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.Andreas Huber2011-01-191-58/+20
| | | | | | | | | | | | | | | | | | Refactor the logic a little. Change-Id: Idd7a26678d846c96b0b11f096305e7467381bda3
* | | Merge "Expose average video frame rate via MPEG4Extractor" into honeycombJames Dong2011-01-191-1/+16
|\ \ \
| * | | Expose average video frame rate via MPEG4ExtractorJames Dong2011-01-191-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3362483 Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
* | | | Merge "MTP: Close and reopen driver file after an error." into honeycombMike Lockwood2011-01-191-15/+16
|\ \ \ \ | |/ / / |/| | |
| * | | MTP: Close and reopen driver file after an error.Mike Lockwood2011-01-191-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 3368665 Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "Fix the presentation video resolution when it is different from the ↵James Dong2011-01-193-2/+29
|\ \ \ \ | |_|/ / |/| | | | | | | actual image resolution of the video." into honeycomb
| * | | Fix the presentation video resolution when it is different from the actual ↵James Dong2011-01-193-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image resolution of the video. bug - 3352413 Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
* | | | Turn another assertion into a runtime error. Damn you surfaces.Andreas Huber2011-01-191-1/+5
|/ / / | | | | | | | | | | | | Change-Id: Ib62957180949293a6fb84bb5a40af058798337ab related-to-bug: 3335220
* | | Use metadata in video buffers for timelapse video recording by default to ↵James Dong2011-01-182-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | eliminate memcpy bug - 3361771 Change-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9
* | | Merge changes I7df1ff78,Ibc2e8adf into honeycombMike Lockwood2011-01-182-14/+37
|\ \ \ | |/ / | | / | |/ |/| | | * changes: MediaScanner: Make sure name field is set for file based playlists MTP: Fix problem with MTP starting up on the first try.
| * MediaScanner: Make sure name field is set for file based playlistsMike Lockwood2011-01-181-9/+16
| | | | | | | | | | Change-Id: I7df1ff783d815d6021ec2432467ba56cb3f3ad1b Signed-off-by: Mike Lockwood <lockwood@android.com>
| * MTP: Fix problem with MTP starting up on the first try.Mike Lockwood2011-01-181-5/+21
| | | | | | | | | | | | | | BUG: 3361230 Change-Id: Ibc2e8adf24a14ea18385b306e786a77983ff8f5b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Apparently our native TCP sockets do not return an error from ↵Andreas Huber2011-01-181-4/+81
|\ \ | | | | | | | | | blocking "connect"" into honeycomb
| * | Apparently our native TCP sockets do not return an error from blocking "connect"Andreas Huber2011-01-181-4/+81
| | | | | | | | | | | | | | | | | | | | | if the network interface is shutdown while connecting. Change-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0 related-to-bug: 3362836
* | | Fix the sluggish preview during timelapse video recording because software ↵James Dong2011-01-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | encoder is used. bug - 3361771 Change-Id: Ic5344e9eabe7f1b82910b65b4260e4ad8dc51c32
* | | Merge "Fix typo" into honeycombEric Laurent2011-01-182-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix typoGlenn Kasten2011-01-182-2/+2
| | | | | | | | | | | | Change-Id: I73e7c5cf13c5ed82398006af61308665eb1d3ad0
* | | Merge "MTP: Set modification date for abstract playlists" into honeycombMike Lockwood2011-01-181-0/+1
|\ \ \
| * | | MTP: Set modification date for abstract playlistsMike Lockwood2011-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 3224269 Change-Id: I96ae8e6d2f7e28860e9217ceb911331b333e1391 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "Fix the build break in git_master-without-vendor" into honeycombJames Dong2011-01-181-3/+1
|\ \ \ \
| * | | | Fix the build break in git_master-without-vendorDharmaray Kundargi2011-01-181-3/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8fff5ee69958212a80711e0d86fb86514c8797f4
* | | | | Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" ↵Mike Lockwood2011-01-181-0/+4
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | into honeycomb