summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube ↵Andreas Huber2010-11-303-3533/+5067
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | webm playback." into gingerbread
| | | * | | | DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm ↵Andreas Huber2010-11-303-3533/+5067
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback. DO NOT MERGE related-to-bug: 3141937 Change-Id: Iaf1b0c5d45a6b5bb7624a59747041c27b4dde83b
* | | | | | | am aeaa3b3c: am 567b2bd1: Merge "After seeking display the first new video ↵Andreas Huber2010-12-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread * commit 'aeaa3b3c6ad004b9a13fc9d48c924c77042e8c22': After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
| * | | | | | am 567b2bd1: Merge "After seeking display the first new video frame right ↵Andreas Huber2010-11-301-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | away without concern for A/V sync. This looks much more responsive to the user." into gingerbread * commit '567b2bd1469b1c37e6249637d313253b7d84971e': After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
| | * | | | | After seeking display the first new video frame right away without concern ↵Andreas Huber2010-11-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for A/V sync. This looks much more responsive to the user. Change-Id: Ifb1f8c91e95a5cafe30ae1035973316c210b98a5 related-to-bug: 3152363
* | | | | | | am 3a2dc0d5: (-s ours) am b690e55d: Merge "DO NOT MERGE - Instead of ↵Andreas Huber2010-12-010-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread * commit '3a2dc0d573bcfdebc1464ee9316767c2fca91a55': DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
| * | | | | | am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface ↵Andreas Huber2010-11-305-57/+120
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | successfully registered buffers, report an error and propagate it up to the java client." into gingerbread * commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5': DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
| | * | | | | DO NOT MERGE - Instead of asserting that ISurface successfully registered ↵Andreas Huber2010-11-305-57/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers, report an error and propagate it up to the java client. Change-Id: Ibb14e5aff20920da4917d85de38ba3a8ee71d0bd related-to-bug: 3188835
* | | | | | | am 4f93f08d: am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit ↵Chia-chi Yeh2010-11-301-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | sample to 16-bit sample." into gingerbread * commit '4f93f08d8c8b8067ff2176d9ec15c76c0e4cc0c2': Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
| * | | | | am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to ↵Chia-chi Yeh2010-11-301-4/+4
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | | | | | | | | | | 16-bit sample." into gingerbread * commit '683a7ff922409d2aa6c944bc4e08de32029e80e5': Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
| | * | | Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." ↵Chia-chi Yeh2010-11-291-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.Chia-chi Yeh2010-11-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d
* | | | | | Merge "MTP: Make sure buffer is big enough before reading the data packet"Mike Lockwood2010-11-301-0/+1
|\ \ \ \ \ \
| * | | | | | MTP: Make sure buffer is big enough before reading the data packetMike Lockwood2010-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes buffer overflow when transferring large playlists. Change-Id: I1b7feaf9e56d849e5b6609f0f68a6aa5a3ae1ea8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "Revert "Temporary workaround for issue 3187563""Eric Laurent2010-11-291-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "Temporary workaround for issue 3187563"Eric Laurent2010-11-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 065299b58d1c00cd24e442fa192561decf7b1fec. The work around for issue 3187563 is not needed any more since the new kernel DMA driver implementation (commit 7953250be7c9a1c3417e21b20032b571d495d218) fixes the root cause. Change-Id: Ibaac2826b63c8e5825ae2e5cab2fb2f0e51ab7b4
* | | | | | | | Remove empty Widevine make filesGloria Wang2010-11-241-27/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
* | | | | | | Fix issue 3225810.Eric Laurent2010-11-242-34/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take a wake lock whenever A2DP output stream is active. Change-Id: Ie50e6d4cb34c8a1ba97b301ef25e10aeb153d8f3
* | | | | | | Merge "Support streaming data across binder boundaries."Andreas Huber2010-11-2414-4/+760
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Support streaming data across binder boundaries.Andreas Huber2010-11-2314-4/+760
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
* | | | | | | Merge changes Ia5fec45a,I74927f73,I5a3c0b07Mike Lockwood2010-11-235-4/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: MTP: Fix typo in MtpServer::doGetObjectPropList MTP: Implement GetPartialObject command MTP: Use DateTime form in GetObjectPropDesc for date/time properties.
| * | | | | | | MTP: Fix typo in MtpServer::doGetObjectPropListMike Lockwood2010-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5fec45a238c49a6797a4ac55457ddb5d6521408 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | | | MTP: Implement GetPartialObject commandMike Lockwood2010-11-233-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows host to read partial contents of files on the device Change-Id: I74927f7394224d674e1d150a4b72a51d9358459b Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | | | | MTP: Use DateTime form in GetObjectPropDesc for date/time properties.Mike Lockwood2010-11-232-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a3c0b07a9f2958b86947256606e6a824dbe93a6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Merge "Do not getConfig on video encoder on output port"James Dong2010-11-231-26/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Do not getConfig on video encoder on output portJames Dong2010-11-231-26/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Id53e01dd8f3ec0c9ca94bb1d6dfccd7696254a2d
* | | | | | | Rename MtpCursor to PtpCursorMike Lockwood2010-11-233-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ce257641388b195f3e17995d323355b19355dc1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | MTP: Remove static library build for linux host.Mike Lockwood2010-11-231-29/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefdd386b91dba0579ca952aca40b7114535e1d4e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am 3e18dfab: am 4da48ec8: Merge "Notify the playback status to DRM agents ↵Gloria Wang2010-11-221-7/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before the playback starts" * commit '3e18dfab3417e139c7ec3896cea9e303fdc8fa63': Notify the playback status to DRM agents before the playback starts
| * | | | | am 4da48ec8: Merge "Notify the playback status to DRM agents before the ↵Gloria Wang2010-11-221-7/+12
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | playback starts" * commit '4da48ec88338af2df6f9abba850fb4c65918bb82': Notify the playback status to DRM agents before the playback starts
| | * | | | Merge "Notify the playback status to DRM agents before the playback starts"Gloria Wang2010-11-221-7/+12
| | |\ \ \ \
| | | * | | | Notify the playback status to DRM agents before the playback startsGloria Wang2010-11-221-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
* | | | | | | am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-2218-2/+433
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
| * | | | | | am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-2218-2/+433
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd93349342a89a25c7a884e8543c6adc048c5f86d': Update of DRM Framework.
| | * | | | | Merge "Update of DRM Framework."Gloria Wang2010-11-2218-2/+433
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Update of DRM Framework.Takeshi Aimi2010-11-1918-2/+433
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Access permission handling Introduce an internal function which allows the desired process to access decryption flow. This new function is just for reference and each OEM manufacturer should implement/replace with their solutions. -New API, getMetadata() This API is for retrieving media metadata from container-based DRM, such as OMA forward-lock content. This API asks DRM agent to retrieve media metadata hiddein inside of DRM special container. -New API, acquireRights() This API wraps acquireDrmInfo() and processDrmInfo(). If DRM agent has valid implementation of both APIs, Application can acquire DrmRights only by calling this API. -Bug fix in event loop of OnInfoListener. Separate OnInfo event loop from mail thread loop so as to avoid the issue that message is not dispatched when mail thread is busy. Changes are made by SEMC and Sony. Change-Id: I04ee3e0988152a71e221f2256d83253749a29da0
* | | | | | | Merge "Squashed commit of the following:"Andreas Huber2010-11-2217-696/+581
|\ \ \ \ \ \ \
| * | | | | | | Squashed commit of the following:Andreas Huber2010-11-2217-696/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0870f7bdd10a7cd36087d723d1957d8e1b967ca7 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 12:57:04 2010 -0800 set_surface_crop doesn't seem to work right yet, stop using it in the SoftwareRenderer. Change-Id: If0a24f78b7810a6cecaa82eb4f23d0f90c22cc42 commit 4767b52bee3a54ae117a8708d6832276a44e6a6a Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 11:14:57 2010 -0800 info->mMediaBuffer may still be NULL at this point... Change-Id: I25a71569015b1bb87f1ea7efff7588958774426f commit 0cef79874e1f1ddb10b7402177a87d3cffc7de92 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 10:55:12 2010 -0800 QCOM's YVU420 color format conversion has now been tested. Change-Id: I7fef4b642a928af15d42f006f7cdc107d5ff1d67 commit 84fe05a6c969ede0ce8a85a530e110afca07c7a7 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 09:59:50 2010 -0800 Removed remaining traces of suspend/resume. Proper reporting of video dimensions based on cropping rectangle. Change-Id: Ib238b80cbc1f19e7d312f2422eb5e9ab6b06b1bc commit 50970cdc837c5c498bcf0cb61b436196ca9e2ef7 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:11:06 2010 -0800 Revamped Software Renderer respects the crop rectangle. Removed obsolete ADRENO support code. Change-Id: I984cbc8a99c4d97e09e7d1b1292099c88b9ae535 commit 8abbc6a5608bff650f968540f24a2eab75f254ed Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:10:41 2010 -0800 The metadata retriever now respects the crop rectangle while capturing a video frame. Change-Id: Id3377176060086d16717f62c77ce26fabe899050 commit 2d42e4466609d304e88bd2cdd6eb7b297340cc21 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:09:50 2010 -0800 Changed ColorConverter APIs to be more general. Clients can now refer to crop rectangles in both source and destination. Change-Id: Ief151d736818396d0389ec04e7df5650e3ad7c04 commit 273184303d54a54febd3e9c3dd4df30507ea78b5 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 15:04:06 2010 -0800 The stagefright commandline tool now writes the extracted video frame to /sdcard/out.jpg Change-Id: Ieb2ab3fda7a7cd9294beccb8db0eed75096eeef4 commit 2d43390328cadf4ba94c1c3c02e4fb30baa29690 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 14:36:55 2010 -0800 The AVC software decoder now properly advertises the cropping rectangle. Change-Id: Idb7a8a7e2fde5740f0fc34b7e8c92eca2577104b commit 9a7ed23c2fac8ce19dce7a34a603acee945a89f6 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 13:40:39 2010 -0800 OMXCodec now signals a format change if the cropping rectangle changes. ...and puts the cropping info into its output format. Change-Id: I3ffbd8e877ba286fe06a82c536ef20d92548d2e2 commit efe0323947029df1c502599ccc288c8d676dfd31 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 11:29:39 2010 -0800 Stagefright's MetaData object now supports rectangle items. Change-Id: I5667bb5ee6622c76104b99fb57f60abb802a8504 Change-Id: I27cb78f2c5e0353f95fdfc5cb53991949ed75b70
* | | | | | | | Merge "64-bit file size/offset support for DRM framework"Gloria Wang2010-11-2216-62/+62
|\ \ \ \ \ \ \ \
| * | | | | | | | 64-bit file size/offset support for DRM frameworkGloria Wang2010-11-1916-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
* | | | | | | | | Fixed an issue in SampleTable where the table index was incorrectly wrapped ↵James Dong2010-11-211-1/+3
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around to -1 bug - 3198642 Change-Id: Ia0544172502fc771f48fce22d5c1db19ac3554bb
* | | | | | | | am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbreadWu-cheng Li2010-11-193-17/+28
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6': Improve camera documentation.
| * | | | | | | am 589e8381: Merge "Improve camera documentation." into gingerbreadWu-cheng Li2010-11-193-17/+28
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '589e838116b0dffa696fa39336d0588124877f98': Improve camera documentation.
| | * | | | | | Improve camera documentation.Wu-cheng Li2010-11-193-17/+28
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | bug:3212606 Change-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce
* | | | | | | Display AVC video sample profile and level for "stagefright" utilJames Dong2010-11-191-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I04b3f67d162cf3827bc74ad98cd1e1a0f5f14172
* | | | | | | am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2': StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
| * | | | | | resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
| | * | | | | StagefrightMediaScanner: Call endFile() for MIDI and OGG files.Hiroshi Takekawa2010-11-191-8/+10
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addStringTag() caches non-ascii metadata strings for later processing, and then endFile() will be called at the end of processFile() to convert non-ascii strings from locale's charset to utf-8 if required. Stagefright's processFile() failed to call endFile() when the processing file is a MIDI file or an OGG file. This patch fixes this problem to populate metadata correctly. Reviewed by: Brad Fitzpatrick, Marco Nelissen. Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
* | | | | | Merge "Removed uncessary FILE structure pointer for I/O"James Dong2010-11-199-62/+76
|\ \ \ \ \ \
| * | | | | | Removed uncessary FILE structure pointer for I/OJames Dong2010-11-199-62/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o also move the fd owner from caller to callee in the Writers Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
generated by cgit v1.1 at 2024-07-01 07:43:01 +0000