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

3190 Commits

Author SHA1 Message Date
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
Eric Laurent
4de82c7885 am 5a9d2737: am b6a2256e: Merge "Fix issue 3126094." into gingerbread 
Merge commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860'

* commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860':
  Fix issue 3126094.
 2010-10-22 22:47:52 -07:00
Eric Laurent
5a9d273718 am b6a2256e: Merge "Fix issue 3126094." into gingerbread 
Merge commit 'b6a2256e5461160a89d077b761d3253d95ce869f' into gingerbread-plus-aosp

* commit 'b6a2256e5461160a89d077b761d3253d95ce869f':
  Fix issue 3126094.
 2010-10-22 18:41:29 -07:00
Eric Laurent
cc02ac54ac Fix issue 3126094. 
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.

Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
 2010-10-22 18:08:13 -07:00
James Dong
2351e69a13 Merge "OMX extension to support storing meta data in video input buffers during recording" 2010-10-22 14:07:41 -07:00
Jaikumar Ganesh
5a1e4cf83f Update BT APIs return type from Set to List. 
Change-Id: Ia27220dd26cde13007f6938c830517ee7f6968ce
 2010-10-22 11:36:28 -07:00
James Dong
627d836fff am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread 
Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227'

* commit '6123e0f7c91ffc7534da99b4668879dacf662227':
  Turn the media time adjustment in file writer back on
 2010-10-21 20:27:34 -07:00
James Dong
6123e0f7c9 am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread 
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp

* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
  Turn the media time adjustment in file writer back on
 2010-10-21 20:18:16 -07:00
James Dong
89a0104c7c Turn the media time adjustment in file writer back on 
o This was turned off to unblock the tests on some device
o The adjustment duration is increased to suppress fluctuations observed on some device

bug - 3058745

Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
 2010-10-21 18:41:31 -07:00
James Dong
387e38dd87 OMX extension to support storing meta data in video input buffers during recording 
bug - 3042125

Change-Id: I7543809fa4ff61d48da35eec6c2bd5eaa7e8cead
 2010-10-21 14:06:17 -07:00
James Dong
9165145342 am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread 
Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99'

* commit '8ad6335d2c22900de5b46460473495b5bcea9f99':
  File writer size estimation improvement
 2010-10-21 13:49:00 -07:00
James Dong
8ad6335d2c am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread 
Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp

* commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
  File writer size estimation improvement
 2010-10-20 21:28:38 -07:00
Jamie Gennis
6913c6176b Fix a copy & paste logging error. 
This change corrects the name of a variable used in a logging macro,
allowing AwesomePlayer.cpp to build with verbose logging enabled.

Change-Id: Ie23fe0fb17f08ac43348cee3209bfe68088e856e
 2010-10-20 16:05:40 -07:00
Jamie Gennis
7eac136a39 Merge "Fix the non-ANW video decode path." 2010-10-20 16:04:12 -07:00
Jamie Gennis
dbfb32e902 Fix the non-ANW video decode path. 
The BufferInfo::mOwnedByNativeWindow field was not being initialized in
the non-ANativeWindow video decode path.

Change-Id: If2f6249902a08690f6c62ef30791b9979050c0e5
 2010-10-20 15:53:59 -07:00
Andreas Huber
fb26350c00 Merge "If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset()." 2010-10-20 15:13:09 -07:00
Andreas Huber
eaf2c5a5c3 If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset(). 
Change-Id: I71a59d5e019e7b9ec3d9375d6231cc301ad3999b
 2010-10-20 15:12:05 -07:00
Andreas Huber
65b51941e3 Merge "Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF." 2010-10-20 15:11:02 -07:00
Andreas Huber
a0b442edbf Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF. 
Change-Id: I57eaefdc4b300a8f56bbe5cf3a34c424e8efe63a
related-to-bug: 3084183
 2010-10-20 15:01:01 -07:00
Andreas Huber
1dcb42b772 Merge "Make sure we can encode the size of the codec specific data in a single byte." 2010-10-20 14:33:06 -07:00
Andreas Huber
1df9a7b133 Make sure we can encode the size of the codec specific data in a single byte. 
Change-Id: If7680cbfb380180c8dd6d6019b9c6c67661e468d
 2010-10-20 14:29:41 -07:00
James Dong
e6aaa3da33 Merge "Fix an issue where the video size was incorrectly retrieved from preview size" 2010-10-20 13:48:14 -07:00