summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Add color format query support to QueryCodecs()James Dong2010-11-111-0/+14
| | | | Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
* Merge "Fix memory leak when 0-memcpy quirk is used"James Dong2010-11-111-1/+18
|\
| * Fix memory leak when 0-memcpy quirk is usedJames Dong2010-11-111-1/+18
| | | | | | | | | | | | | | o minor change to the original patch by Andreas: call restorePatchedDataPointer() method only if kAvoidMemcopyInputRecordingFrames is turned on Change-Id: Idf3710e6f759d37d28e866613f98d39215722cb9
* | MTP: Add missing call to closedir() in recursive delete codeMike Lockwood2010-11-111-0/+1
|/ | | | | | | BUG: 3185660 Change-Id: I3744d2cb193829d20a689af2aea50e8516779631 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Merge "Fix uninitialized variable"James Dong2010-11-101-0/+1
|\
| * Fix uninitialized variableJames Dong2010-11-101-0/+1
| | | | | | | | | | | | o This was missed while the rotation patch was hand merged. Change-Id: I4016f9fb9cd54c5e853da15bbaaa50b1d1dac8c8
* | Merge changes I49b383d3,I70809401Mike Lockwood2010-11-104-2/+92
|\ \ | |/ |/| | | | | | | * changes: MTP: Don't dump data packets twice in debug output. Add support for range and enum forms in MTP ObjectPropDescs
| * MTP: Don't dump data packets twice in debug output.Mike Lockwood2010-11-102-2/+0
| | | | | | | | | | Change-Id: I49b383d39aea101a58ae6902952ba91b44e7dc3b Signed-off-by: Mike Lockwood <lockwood@android.com>
| * Add support for range and enum forms in MTP ObjectPropDescsMike Lockwood2010-11-102-0/+92
| | | | | | | | | | Change-Id: I70809401e37a1cfb82f5dbf86947be7d9500ccf1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Fix missing breaks in the profile/level conversion code in M4vH263 ↵James Dong2010-11-091-1/+6
|\ \ | | | | | | | | | encoder"
| * | Fix missing breaks in the profile/level conversion code in M4vH263 encoderJames Dong2010-11-091-1/+6
| |/ | | | | | | Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
* | Merge "Some refactoring and added support for another form of vbr headers."Andreas Huber2010-11-098-196/+609
|\ \
| * | Some refactoring and added support for another form of vbr headers.Andreas Huber2010-11-098-196/+609
| |/ | | | | | | | | | | related-to-bug: 3172324 Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
* | Rotation supportJames Dong2010-11-093-19/+84
|/ | | | | | | | | | | | | | - We only support 0, 90, 180, and 270 degree clockwise rotation - Some players are known to ignore composition matrix in the MP4 file, although this is part of the MP4 file standard. Both QT and YT are supporting the rotation The original patch (65a73f4e8c79d05c0d9001b660325748d4ecf37b) was not merged. The only change I made is to reuse the same kKeyRotation in MetaData.h; and thus do not neeed to use kKeyRotationDegree. Change-Id: Ib328716d4842201c4adf57e4ddfe1f1ac1ae4d8a
* am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated ↵James Dong2010-11-082-0/+8
|\ | | | | | | | | | | | | video tracks" into gingerbread * commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84': Support extracting thumbnail from rotated video tracks
| * am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" ↵James Dong2010-11-082-0/+8
| |\ | | | | | | | | | | | | | | | | | | into gingerbread * commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e': Support extracting thumbnail from rotated video tracks
| | * Support extracting thumbnail from rotated video tracksJames Dong2010-11-082-0/+8
| | | | | | | | | | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
| * | resolved conflicts for merge of 31dc911a to gingerbread-plus-aospAndreas Huber2010-11-088-90/+230
| |\ \ | | |/ | | | | | | Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
| | * Support post-decode video rotation.Andreas Huber2010-11-058-89/+228
| | | | | | | | | | | | Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
| * | am 1653e261: Merge "Rotation support" into gingerbreadJames Dong2010-11-063-19/+84
| |\ \ | | |/ | | | | | | | | | * commit '1653e261e84922facfe27d3d8acc455ed2b6b6da': Rotation support
| | * Rotation supportJames Dong2010-11-053-19/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We only support 0, 90, 180, and 270 degree clockwise rotation - Some players are known to ignore composition matrix in the MP4 file, although this is part of the MP4 file standard. Both QT and YT are supporting the rotation Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
| * | am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into ↵James Dong2010-11-032-27/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | gingerbread * commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b': Revert "Support rotation in media recorder"
| | * Revert "Support rotation in media recorder"James Dong2010-11-032-27/+0
| | | | | | | | | | | | This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
| * | am c181a082: Merge "Support rotation in media recorder" into gingerbreadHiroshi Lockheimer2010-11-032-0/+27
| |\ \ | | |/ | | | | | | | | | * commit 'c181a08209dc85c80e4da5d20cd3980998def40d': Support rotation in media recorder
| | * Support rotation in media recorderJames Dong2010-11-032-0/+27
| | | | | | | | | | | | | | | | | | o needs to be tested with camera hal and camcorder application Change-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232
| * | am f3847e87: Merge "DO NOT MERGE" into gingerbreadJames Dong2010-11-031-3/+29
| |\ \ | | |/ | | | | | | | | | * commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a': DO NOT MERGE
| | * DO NOT MERGEJames Dong2010-11-021-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | Fix premature release of recording frames when physical address or metadata is stored in input video buffers - bug 3158459 Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
* | | Merge "Use meta data in the media recording framework"James Dong2010-11-053-5/+45
|\ \ \
| * | | Use meta data in the media recording frameworkJames Dong2010-11-043-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | o This patch allows us to do 720p video recording Change-Id: I2ea37e80a59630145396b08ebcdc6ee71df53333
* | | | Merge "Add support for WV DRM"Gloria Wang2010-11-0512-11/+233
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for WV DRMGloria Wang2010-11-0512-11/+233
| | | | | | | | | | | | | | | | Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
* | | | Fix a MediaBuffer leak in Stagefright.Jamie Gennis2010-11-031-34/+29
| | | | | | | | | | | | | | | | Change-Id: I548e60b07cf1676476874b156cfbc4ffefdfa2b9
* | | | Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."Andreas Huber2010-11-031-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Experimentally reenable mpeg4 and h.263 hardware decoders.Andreas Huber2010-11-031-2/+2
| | | | | | | | | | | | | | | | Change-Id: I1be266bd4534004a08e8836b48cc6c09ca890ccc
* | | | am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to ↵Gloria Wang2010-11-031-23/+6
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | gingerbread-plus-aosp" into gingerbread-plus-aosp * commit 'cf393faaa871333496a63c13196fdbc0f2bd9118': - Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
| * | resolved conflicts for merge of c1c45a4d to gingerbread-plus-aospGloria Wang2010-11-022-24/+14
| |\ \ | | | | | | | | | | | | Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
| | * | - Move the business rule management down to DRM agents.Gloria Wang2010-11-012-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | - Do not register DRM sniffer because drmserver is not enabled. Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
* | | | Stop using OMX_COLOR_FormatAndroidPrivateStart.Jamie Gennis2010-11-011-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the use (and definition) of the Android-private range of OMX color formats from Stagefright. Instead we will just be interpreting the video color format of an OMX port as an Android pixel format if the port is in native buffer mode. Change-Id: I3ea50703336a88249e7563bc7022dfedbeac506e
* | | | Merge "Notify surfaceflinger about (changes to) the crop rectangle output by ↵Andreas Huber2010-11-011-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | the decoder."
| * | | | Notify surfaceflinger about (changes to) the crop rectangle output by the ↵Andreas Huber2010-11-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder. Change-Id: I9c33618dd3351be1ecadcc7d0329654ea50bad3f related-to-bug: 3153626
* | | | | Media scanner support for FL(Forward Lock) DRM file typesGloria Wang2010-11-011-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
* | | | After seeking display the first new video frame right away without concern ↵Andreas Huber2010-11-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for A/V sync. This looks much more responsive to the user. related-to-bug: 3152363 Change-Id: Ia097bf61ca05e01365357cb23ff83e2ad417f3fd
* | | | Merge "Added some debugging log messages at stop()"James Dong2010-10-291-1/+5
|\ \ \ \
| * | | | Added some debugging log messages at stop()James Dong2010-10-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are so many cases where the codecs just could not stopped ... Change-Id: If9ff261fcd4726c2ee21ec7c9336ca9c2917d399
* | | | | Merge "- register DRM sniffer only when drmserver is up - notify DRM agents ↵Gloria Wang2010-10-292-8/+15
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | the status after seeking"
| * | | | - register DRM sniffer only when drmserver is upGloria Wang2010-10-292-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - notify DRM agents the status after seeking Change-Id: Id77977fc7548970559dc8974461b0bd1d2aa9514
* | | | | Squashed commit of the following:Andreas Huber2010-10-296-70/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0d5694ba2d399dd0869532a4d6256448185a1be0 Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:59:23 2010 -0700 suspend() and resume() methods on VideoView are back but don't do anything. They need to be back because they were public before. Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425 commit 16192891ed7d349ee97e47d1729d20a2d0d247b8 Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:47:05 2010 -0700 Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming." This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25. Conflicts: api/current.xml Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5 commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:44:16 2010 -0700 Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093." This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f. commit f2ed03550887986f39d36b5dabcd9e919949c7cf Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:44:08 2010 -0700 Revert "Release MediaPlayer if suspend() returns false." This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268. commit 441ecce678bd24e9660a72c8627b5bd94433ff8b Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:40:46 2010 -0700 manually. Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87 Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
* | | | Merge "Added profile and level translation in SW video encoders"James Dong2010-10-292-5/+188
|\ \ \ \
| * | | | Added profile and level translation in SW video encodersJames Dong2010-10-272-5/+188
| | | | | | | | | | | | | | | | | | | | Change-Id: I6b9c33c7e4b497f3dc61b2a0dcf4e65727f9bcdd
* | | | | Upgrade to the latest version of libwebm to fix YouTube webm playback.Andreas Huber2010-10-283-3533/+5067
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I6a0f5e1aa07d3af428c314d36f69b119fa8d2d3a related-to-bug: 3141937
generated by cgit v1.1 at 2024-07-01 14:54:19 +0000