drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,800 Commits 1 Branch 0 Tags
Commit Graph

3161 Commits

Author SHA1 Message Date
Andreas Huber
69b8d69aad Squashed commit of the following: 
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
 2010-10-29 13:20:06 -07:00
James Dong
9085a2441d Merge "Added profile and level translation in SW video encoders" 2010-10-29 09:19:48 -07:00
Andreas Huber
6e9f6d1e03 Merge "Upgrade to the latest version of libwebm to fix YouTube webm playback." 2010-10-29 08:04:13 -07:00
Gil Dobjanschi
393b2f9b8d Merge "Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations." 2010-10-28 18:03:58 -07:00
Gil Dobjanschi
6ea92ecabb Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations. 
Change-Id: I5f619807435dc75c285446bfd60327bc1c1ecacd
 2010-10-28 16:24:41 -07:00
Andreas Huber
4b84445788 Upgrade to the latest version of libwebm to fix YouTube webm playback. 
Change-Id: I6a0f5e1aa07d3af428c314d36f69b119fa8d2d3a
related-to-bug: 3141937
 2010-10-28 10:50:47 -07:00
James Dong
af50969f07 Added profile and level translation in SW video encoders 
Change-Id: I6b9c33c7e4b497f3dc61b2a0dcf4e65727f9bcdd
 2010-10-27 23:47:37 -07:00
Andreas Huber
b0d25a00fe Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries. 
Change-Id: I20e3b86f52b7f0f41663ffe8bc1f4db92280e884
 2010-10-27 14:33:18 -07:00
Gil Dobjanschi
30ca240a98 Merge "Waveform member variables must be private" 2010-10-27 12:37:34 -07:00
Gil Dobjanschi
6f3c808b4f Waveform member variables must be private 
Change-Id: I8e61dbe5ad51b455377e39a0918ac82d138d8228
 2010-10-27 12:26:54 -07:00
Yu Shan Emily Lau
0af3cfc6f3 am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:58:58 -07:00
Yu Shan Emily Lau
751cc4245f am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:14:36 -07:00
Yu Shan Emily Lau
8b023a2ea2 Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:12:58 -07:00
Marco Nelissen
b89a29dd75 am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:11:19 -07:00
Marco Nelissen
cd08ada7f1 am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:08:14 -07:00
Andreas Huber
05e148360b Merge "Remove annoying warning during mpeg4 extraction." 2010-10-27 10:58:31 -07:00
Gil Dobjanschi
00c346becf Merge "Added waveform data support" 2010-10-27 10:50:28 -07:00
Andreas Huber
936747d672 Merge "FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem." 2010-10-27 10:39:57 -07:00
Gil Dobjanschi
4545f73530 Added waveform data support 
Change-Id: I28e922e0d6588ffe13da7e814dae61f17446b1e9
 2010-10-27 10:35:29 -07:00
Andreas Huber
7459b018db FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem. 
Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683
 2010-10-27 10:33:04 -07:00
Andreas Huber
c69b9d3370 Remove annoying warning during mpeg4 extraction. 
Change-Id: Iffadeefb43bab6da1299b0a0582d6c6990156c32
related-to-bug: 3093774
 2010-10-27 10:25:44 -07:00
Marco Nelissen
f514bdc964 Fix off-by-two and other bugs in the visualization code. 
b/3137511

Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
 2010-10-27 10:23:59 -07:00
Kristian Monsen
883a922fbe Fix for simulator build break 
strrchr returns a const char* in c++ if you give in a const char*

Change-Id: I15ac2ae9e1d41d7737193146c526fcbddccae27c
 2010-10-27 17:54:46 +01:00
Gil Dobjanschi
c7415b7800 Merge "Removed the start and end transition types." 2010-10-26 18:57:57 -07:00
Vasu Nori
8aebc966d2 Merge "add method in MediaFile to determine if a file is a mediatype of not" 2010-10-26 17:59:03 -07:00
Andreas Huber
a8264dfe5a am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:25:51 -07:00
Andreas Huber
e1e8274588 am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:23:54 -07:00
Vasu Nori
45b43622e3 add method in MediaFile to determine if a file is a mediatype of not 
this helps DownloadService to avoid invoking MediaScanner on
pdf or other non-mediatype files.

Change-Id: I92514e1a11f5119229c0c7292e410e352a9dbcdd
 2010-10-26 16:12:27 -07:00
Andreas Huber
0a612889b5 Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise. 
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
 2010-10-26 15:06:44 -07:00
Yu Shan Emily Lau
93aa00c664 Add the mediaplayer release in the test validation. This is to ensure the media player release properly. 
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
 2010-10-26 14:36:09 -07:00
James Dong
ee1dc6221f Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java" 2010-10-26 12:01:39 -07:00
Gil Dobjanschi
fa3d263131 Removed the start and end transition types. 
Change-Id: I0c3f9f82a90e0835f550b11c5f1ea8a1147535a4
 2010-10-26 11:53:24 -07:00
Gil Dobjanschi
23617befe4 Merge "Effects and overlays are not modified when a video clip is trimmed." 2010-10-26 11:50:04 -07:00
James Dong
a0cab99dd2 Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java 
Change-Id: Ia464d79d65e43c84937624c5a6fa77c7155cffaa
 2010-10-26 11:30:42 -07:00
James Dong
028b537051 Merge "Add two creation flags to OMXCodec::Create()" 2010-10-26 09:26:24 -07:00
Gil Dobjanschi
ce03445c32 Effects and overlays are not modified when a video clip is trimmed. 
Change-Id: Ib9a54ecab4ea253caa6c64204493fc3f40a6aa53
 2010-10-26 07:44:00 -07:00
Gloria Wang
7f266f089e A temporary fix for "Waiting for service drm.drmManager". 
Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
 2010-10-26 03:31:13 -07:00
Gil Dobjanschi
70bfc087d9 Check before and after media item reference 
Change-Id: I9abc017896ed82f069479a468e1b0b9d3303e3a6
 2010-10-25 19:17:35 -07:00
Gil Dobjanschi
479f788a7d Merge "Transition bug fix" 2010-10-25 19:13:32 -07:00
James Dong
170a929648 Add two creation flags to OMXCodec::Create() 
o This allows to force to use software codecs or hardware codecs
o If request cannot be fullfilled, Create() returns NULL.

Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
 2010-10-25 18:21:55 -07:00
James Dong
fc6d54ea07 Merge "Remove OMX.PV.* components from OMXCodec.cpp" 2010-10-25 18:02:44 -07:00
James Dong
5592bcc57a Remove OMX.PV.* components from OMXCodec.cpp 
Change-Id: Ie43c00a4d589e9cca6e9505a5dabd4e0d8af321a
 2010-10-25 17:59:44 -07:00
James Dong
068ee16b57 Merge "Don't change the video recording frame rate if it is not requested." 2010-10-25 17:56:14 -07:00
Gloria Wang
cbb053c3c9 resolved conflicts for merge of 965f960e to master 
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
 2010-10-25 16:56:49 -07:00
James Dong
b15f2eaa92 Don't change the video recording frame rate if it is not requested. 
o set the default video frame rate to the current frame rate being used
o add check on whether the requested frame rate is supported
o fix an issue where the hardware video encoder setting was bypassed
o increases the max frame rate from 30 t0 120 frames per second
  the actual frame rate will be clipped if the requested frame rate is too
  high when recording starts by checking the hardware encoder capabilities

Change-Id: I1b47671d74da0ebcb9601bdca390d430cc048fbc
 2010-10-25 16:16:10 -07:00
Gloria Wang
b8791479af resolved conflicts for merge of 9084631d to gingerbread-plus-aosp 
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
 2010-10-25 16:11:18 -07:00
Gil Dobjanschi
36b7cc5e0b Transition bug fix 
Change-Id: I0999aca3b341e4d6a4303ef84da8f5e541310bf0
 2010-10-25 15:26:56 -07:00
Andreas Huber
cf74754f9f We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets. 
Change-Id: I02a9b4af929601c899f04cee9864d0dd0716de62
 2010-10-25 12:48:00 -07:00
Gloria Wang
d5770917a5 DRM framework support: 
- add a sniffer for DRM files
- add DRMSource and DRMExtractor for es_based DRM
- add pread in FileSource.cpp for container_based DRM
- add native DRM framework API calls in the player for
  DRM audio/video playback

Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
 2010-10-25 12:16:56 -07:00
Mike Lockwood
b04e3940d1 Fixes for simulator build on lucid 
strchr and strrchr now return const char* instead of char*

Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
 2010-10-24 08:52:08 -07:00