summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Added audio and video codec parameters to the export method.Gil Dobjanschi2010-11-042-15/+27
| | | | Change-Id: I1badd08ce7148da540bf91df0e19c3da59287756
* Merge "Use SoftReference for WaveformData"Gil Dobjanschi2010-11-022-8/+38
|\
| * Use SoftReference for WaveformDataGil Dobjanschi2010-11-022-8/+38
| | | | | | | | Change-Id: I801a4eb4f55e0c6244f868bf8b474a2a79d81642
* | Use SystemProperties.get() instead of System.getProperty()Gloria Wang2010-11-021-1/+1
| | | | | | | | Change-Id: I92571fa217e6623345bbd84cf87ab939fbe63b0a
* | In java, System.getProperty returns null when the property doesn't exist,Marco Nelissen2010-11-021-3/+7
| | | | | | | | | | | | | | rather than an empty string like it does in native code. b/3157546 Change-Id: I7985a405e4d2d1f20be0a151aa2cf2e5a83b380b
* | Added support for dock headset observerPraveen Bharathi2010-11-012-0/+39
| | | | | | | | | | Change-Id: I06b2e65e3bfa10735e6c7fd3349afa9ae7d45292 Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
* | 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
* | | MTP: Changes to support /mnt/sdcard paths from MediaProvider.Mike Lockwood2010-11-011-4/+16
| | | | | | | | | | | | | | | Change-Id: I337f0514c20ed31738c73e1f7ab6fb71cc744057 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Media scanner support for FL(Forward Lock) DRM file typesGloria Wang2010-11-013-1/+41
|/ / | | | | | | 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-298-131/+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
* | Merge "Upgrade to the latest version of libwebm to fix YouTube webm playback."Andreas Huber2010-10-293-3533/+5067
|\ \
| * | 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
* | Merge "Bug fix: Use getDuration vs. getTimelineDuration in Effect and ↵Gil Dobjanschi2010-10-285-23/+36
|\ \ | |/ |/| | | Overlay limits calculations."
| * Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay ↵Gil Dobjanschi2010-10-285-23/+36
| | | | | | | | | | | | limits calculations. Change-Id: I5f619807435dc75c285446bfd60327bc1c1ecacd
* | Better support for MP4A-LATM RTP disassembly. This used to fail if ↵Andreas Huber2010-10-274-20/+382
|/ | | | | | mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries. Change-Id: I20e3b86f52b7f0f41663ffe8bc1f4db92280e884
* Merge "Waveform member variables must be private"Gil Dobjanschi2010-10-271-3/+3
|\
| * Waveform member variables must be privateGil Dobjanschi2010-10-271-3/+3
| | | | | | | | Change-Id: I8e61dbe5ad51b455377e39a0918ac82d138d8228
* | am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test ↵Yu Shan Emily Lau2010-10-271-0/+1
|\ \ | | | | | | | | | validation. This is to ensure the media player release properly." into gingerbread
| * \ am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This ↵Yu Shan Emily Lau2010-10-271-0/+1
| |\ \ | | | | | | | | | | | | is to ensure the media player release properly." into gingerbread
| | * \ Merge "Add the mediaplayer release in the test validation. This is to ensure ↵Yu Shan Emily Lau2010-10-271-0/+1
| | |\ \ | | | | | | | | | | | | | | | the media player release properly." into gingerbread
| | | * | Add the mediaplayer release in the test validation. This is to ensure the ↵Yu Shan Emily Lau2010-10-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media player release properly. Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
* | | | | am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the ↵Marco Nelissen2010-10-271-9/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | visualization code. b/3137511" into gingerbread
| * | | | am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. ↵Marco Nelissen2010-10-271-9/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | b/3137511" into gingerbread
| | * | | Fix off-by-two and other bugs in the visualization code.Marco Nelissen2010-10-271-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/3137511 Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
* | | | | Merge "Remove annoying warning during mpeg4 extraction."Andreas Huber2010-10-271-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove annoying warning during mpeg4 extraction.Andreas Huber2010-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iffadeefb43bab6da1299b0a0582d6c6990156c32 related-to-bug: 3093774
* | | | | Merge "Added waveform data support"Gil Dobjanschi2010-10-273-2/+111
|\ \ \ \ \
| * | | | | Added waveform data supportGil Dobjanschi2010-10-273-2/+111
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I28e922e0d6588ffe13da7e814dae61f17446b1e9
* | | | | Merge "FileSource may fail to open a file in which case subsequent code ↵Andreas Huber2010-10-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | dereferences a NULL pointer. This fixes this recently introduced problem."
| * | | | | FileSource may fail to open a file in which case subsequent code ↵Andreas Huber2010-10-271-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | dereferences a NULL pointer. This fixes this recently introduced problem. Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683
* | | | | Fix for simulator build breakKristian Monsen2010-10-271-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | strrchr returns a const char* in c++ if you give in a const char* Change-Id: I15ac2ae9e1d41d7737193146c526fcbddccae27c
* | | | Merge "Removed the start and end transition types."Gil Dobjanschi2010-10-266-247/+15
|\ \ \ \
| * | | | Removed the start and end transition types.Gil Dobjanschi2010-10-266-247/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I0c3f9f82a90e0835f550b11c5f1ea8a1147535a4
* | | | | Merge "add method in MediaFile to determine if a file is a mediatype of not"Vasu Nori2010-10-261-0/+6
|\ \ \ \ \
| * | | | | add method in MediaFile to determine if a file is a mediatype of notVasu Nori2010-10-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this helps DownloadService to avoid invoking MediaScanner on pdf or other non-mediatype files. Change-Id: I92514e1a11f5119229c0c7292e410e352a9dbcdd
* | | | | | am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio ↵Andreas Huber2010-10-261-6/+14
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | data is valid unless the source indicates otherwise." into gingerbread
| * | | | | am 2088e371: Merge "Assume that all of the decoded vorbis audio data is ↵Andreas Huber2010-10-261-6/+14
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | valid unless the source indicates otherwise." into gingerbread
| | * | | | Assume that all of the decoded vorbis audio data is valid unless the source ↵Andreas Huber2010-10-261-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indicates otherwise. Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
* | | | | | Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java"James Dong2010-10-261-10/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.javaJames Dong2010-10-261-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia464d79d65e43c84937624c5a6fa77c7155cffaa
* | | | | | Merge "Effects and overlays are not modified when a video clip is trimmed."Gil Dobjanschi2010-10-263-30/+53
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
generated by cgit v1.1 at 2025-01-30 16:04:17 +0000