4224 Commits

Author SHA1 Message Date
Santosh Madhava
bba9529d79 Merge "Cleanup for issue 3471160 : video editor calls System.gc" 2011-02-23 09:59:07 -08:00
Gloria Wang
87e639bc15 Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data" 2011-02-23 09:58:33 -08:00
Gloria Wang
d211f41f76 - Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data

Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
2011-02-22 22:42:05 -08:00
James Dong
9a146d9d65 am d97c598f: am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit 'd97c598ff4d902583f9083960b088b31350d0018':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:41:25 -08:00
James Dong
d97c598ff4 am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit '6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:15:19 -08:00
James Dong
e00cab707d Application-managed callback buffer support for raw image
bug - 3292153

Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
2011-02-22 20:48:15 -08:00
Santosh Madhava
3f48207ea4 Cleanup for issue 3471160 : video editor calls System.gc
Change-Id: I8cdebde25a45767a1c1b9b6c2c59b7e65cacc0bd
2011-02-22 20:19:38 -08:00
Mathias Agopian
a688b574d2 Remove RefBase.h dependency on TextOutput.h
Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
2011-02-22 18:08:58 -08:00
Mike Lockwood
16dc3073a2 Don't treat WMV and ASF files as video files unless WMV is supported
Change-Id: I512d1db67e06273d9c23d10fa30d2d62f9f75a75
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-22 17:49:00 -08:00
James Dong
5fb008e380 Merge "Remove mkvparser code from /frameworks/base" 2011-02-22 16:52:12 -08:00
James Dong
8433f75b07 Remove mkvparser code from /frameworks/base
bug - 3322129

Change-Id: I94dca6234ce57c9a32290aa7ac4885b0a2f566a9
2011-02-22 16:33:50 -08:00
Andreas Huber
b6723735cf Support for PCMA and PCMU raw audio data in RTP/RTSP.
Change-Id: Icb87bdfa7cf572c572e2a86c46fa072d9fad18f6
related-to-bug: 3084183
2011-02-22 16:25:00 -08:00
Mike Lockwood
66e57f6aa9 MTP: Disable MTP when the keyguard is locked and secure
BUG:  3402847

Change-Id: I6c77efe18f525cd0af37911c8b6aac4f17352552
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-22 13:57:23 -08:00
Mike Lockwood
467ca0de6d MTP: Add support for dynamically adding and removing storage units
BUG: 3402847

Change-Id: I7da266061d949abcb6bb11c6faaa47b5e4a2a977
2011-02-22 13:57:23 -08:00
Andreas Huber
dc94eea3f4 Merge "Support more MPEG4-LATM audio functionality." 2011-02-22 13:51:22 -08:00
James Dong
14460b9564 Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
bug - 3040402

Change-Id: I455d2a664851c73212711e8c4b88e97b50ee5b62
2011-02-22 13:45:57 -08:00
Andreas Huber
8c7c6dc413 Support more MPEG4-LATM audio functionality.
related-to-bug: 3474610

Change-Id: I6dab40e8b465922c62be9ee7f168718822c6caac
Now skipping extra header that the spec claimed shouldn't be present in LATM...
2011-02-22 13:21:38 -08:00
James Dong
117549fc78 Merge "Check file descriptor before passing it through binder calls" 2011-02-22 13:10:15 -08:00
James Dong
bafa7eaccb Check file descriptor before passing it through binder calls
bug - 3476613

Change-Id: I858933fd2fe4c095c0bd58bf50344c47fc104be9
2011-02-22 12:34:02 -08:00
Basavapatna Dattaguru
3ed54d03ee Merge "VideoEditor:IssueID:3396697: Added Performance test code" 2011-02-22 10:56:29 -08:00
Basavapatna Dattaguru
b2c3c3e011 Merge "VideoEditor:IssueID:3396697: Updated Preview Test code" 2011-02-22 10:56:19 -08:00
Rajneesh Chowdury
dab9689491 Merge "Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash" 2011-02-22 10:50:21 -08:00
Rajneesh Chowdury
06a087a52b Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash
Change-Id: Ib257484ff8646b8e6a0a6a4bb9b937d5338c060c
2011-02-21 17:46:41 -08:00
Gloria Wang
e8c89a3199 Move all Widevine code which have dependency on vendor modules to vendor/widevine
Change-Id: If75bce539bae02117fb4f628be64e3a7363375e9
2011-02-18 22:42:26 -08:00
Basavapatna Dattaguru
f1f9ff28c3 VideoEditor:IssueID:3396697: Added Performance test code
Updated with review comments: MediaFrameworkStressTestRunner.java deleted
Updated with growing heap report in Stress test case

Change-Id: I847f8810e2b844015c47b7d24e488a611d85287c
2011-02-18 18:42:56 -08:00
Gloria Wang
6681984cf6 - Update from Widevine
- Bug fixes

Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
2011-02-18 16:10:53 -08:00
Glenn Kasten
df0b651236 Don't crash when parsing DRM MIME types
Change-Id: I414897c911a6588061ddbb5f05c574e78162dca9
2011-02-18 15:42:25 -08:00
Basavapatna Dattaguru
c2b9eb88fd VideoEditor:IssueID:3396697: Updated Preview Test code
Change-Id: I895bcdbb0c65679b837e616de58e533a080bbf2f
2011-02-17 20:43:08 -08:00
Santosh Madhava
28926cb964 Merge "Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames" 2011-02-17 19:10:02 -08:00
Yu Shan Emily Lau
a3da3b18b5 Merge "Fixed the media playback report format." 2011-02-17 15:56:41 -08:00
Yu Shan Emily Lau
414e15309c Fixed the media playback report format.
Change-Id: I8b943f8cd914acc6c9ee81a71f0efbecece7263e
2011-02-17 15:51:56 -08:00
Andreas Huber
3f0a485307 Merge "Experimental support for https transfers in stagefright." 2011-02-17 14:52:38 -08:00
James Dong
5b025c4615 Merge "A/V synchronization at the beginning of a recording session" 2011-02-17 14:50:14 -08:00
James Dong
cbeebb194b A/V synchronization at the beginning of a recording session
o do not use edts/elst boxes since these optional boxes are ignored
o manipulate the first video/audio frame duration to make sure that the rest
  of the audio/video is in sync (ideally, we should only manipulate
  the vidoe frame duration, not the audio)
o reduce the initial audio mute/suppression period, which is used to
  eliminate the "recording" sound.

bug - 3405882 and 3362703

Change-Id: Ib0acfb4f3843b365157288951dc122b006299c18
2011-02-17 14:43:16 -08:00
Andreas Huber
118a150a67 Experimental support for https transfers in stagefright.
Change-Id: If1bd0f265dda136c7c34b53317f64383023b53a3
2011-02-17 14:30:05 -08:00
Yu Shan Emily Lau
45fde07742 Merge "Update the summary output format which match the PM data posting." 2011-02-17 12:21:13 -08:00
Yu Shan Emily Lau
ce6ff2c2e6 Update the summary output format which match the PM data posting.
Change-Id: I3e3f7313020da6d0d219acd90ac9edc8a4d0bce4
2011-02-17 12:10:17 -08:00
Santosh Madhava
df4723ef3c Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames
Change-Id: I0f9257a1bfb96c00acfdffa0f4f7f8188646c713
2011-02-16 22:32:02 -08:00
Basavapatna Dattaguru
83361072e7 Merge "VideoEditor:Issue ID: 3431967" 2011-02-16 14:54:08 -08:00
Basavapatna Dattaguru
9cfeb6ecfa VideoEditor:Issue ID: 3431967
Fixes memory leak in getProperties
Updated with Review comments

Change-Id: Ie4e8edaee1c76f18d0526b5eae9f9a128e0a3c17
2011-02-16 14:29:02 -08:00
Andreas Huber
79a9748949 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
  DO NOT MERGE: Respond to RTSP server->client requests.
2011-02-16 14:24:53 -08:00
Andreas Huber
dbe09da6ac DO NOT MERGE: Respond to RTSP server->client requests.
Even if it's just to tell them that we don't support any (this is optional).

Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug: 3353752
2011-02-16 13:37:19 -08:00
Andreas Huber
9464f9c5a4 Merge "Respond to RTSP server->client requests." 2011-02-16 13:27:02 -08:00
Andreas Huber
e0666163ab Respond to RTSP server->client requests.
Even if it's just to tell them that we don't support any (this is optional).

Change-Id: I557865ac00d0fb65ffa69363eb1eceaabe522a1a
related-to-bug: 3353752
2011-02-16 13:21:35 -08:00
Yu Shan Emily Lau
85305f04d5 Change the media player stress test to repor the total number of failure and the total number of info.
Register the surface callback in the test application bug# 2909064

Change-Id: I3420b5bc81e276b50f612c126ed5fc1f4f16c08c
2011-02-16 12:24:34 -08:00
James Dong
d33a4ccb5c Decouple AudioRecord read and audio encoding
bug - 3313754

Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
2011-02-16 11:23:21 -08:00
Andreas Huber
d6c421f1a0 Remove legacy, AwesomePlayer-based http live implementation.
Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
2011-02-16 09:19:40 -08:00
Andreas Huber
16d94f580a am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
2011-02-16 09:02:08 -08:00
Gloria Wang
94f4019994 Merge "Add AAC extractor" 2011-02-15 17:22:01 -08:00
Gloria Wang
c5b0abf900 Add AAC extractor
Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
2011-02-15 17:16:22 -08:00