3248 Commits

Author SHA1 Message Date
Gloria Wang
3d1c5a2788 Merge "Add getUri() for streaming" 2010-11-18 11:18:35 -08:00
Gloria Wang
43cd12dae2 Add getUri() for streaming
Change-Id: I56e15e67cc5f4d0f41c9e2985404a4d89d757e7e
2010-11-18 09:55:35 -08:00
Gil Dobjanschi
91823e3b25 Merge "Disable ducking by default. Changed ducking threshold parameter range." 2010-11-17 18:34:59 -08:00
Jean-Michel Trivi
ffd0eb0f11 Fix bug 3183484 unhide MediaRecorder.AudioSource.VOICE_COMMUNICATION
Change-Id: I26cd88b1bb05de546415b1f92fbb9430e63b4eab
2010-11-17 17:45:34 -08:00
Gil Dobjanschi
0f76d9b1c2 Disable ducking by default. Changed ducking threshold parameter range.
Change-Id: I66a73b270466ced2ace9e3b10f82cfab1a1306bb
2010-11-17 16:20:34 -08:00
Mike Lockwood
413577d860 MTP: Fixes to allow file transfers > 4 gigabytes
BUG: 3198248

Change-Id: I6f11c79a19d7bdd63718a7370939124b1262d221
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-17 16:43:24 -05:00
Mike Lockwood
558cf79929 Merge "MTP: Set correct format for abstract audio playlists" 2010-11-17 12:50:28 -08:00
Mike Lockwood
0b58c19840 MTP: Set correct format for abstract audio playlists
Fixes a bad interaction with the media scanner that could result in
playlists getting duplicated or deleted after rebooting.

BUG: 3175649

Change-Id: I970234e86b24ac17d069aca085683d988abc7881
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-17 15:42:09 -05:00
Jean-Michel Trivi
05b07fd204 Merge "Add new audio mode for audio communications other than telelphony." 2010-11-17 09:49:23 -08:00
Andreas Huber
66b8994ed2 Merge "Support post-decode video rotation." 2010-11-16 16:03:25 -08:00
Andreas Huber
940c866c99 Support post-decode video rotation.
Change-Id: I9ac90871269c5e132e98a9bf3ad8cae00f329f17
2010-11-16 15:26:30 -08:00
Gil Dobjanschi
3ee66f7b34 Merge "Invalidate transitions when the start time or duration of an effect or overlay changes." 2010-11-16 15:26:01 -08:00
Andreas Huber
c23dabfb20 Remove all traces of legacy renderer support in stagefright.
Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
2010-11-16 13:05:53 -08:00
Gil Dobjanschi
f1d8f2a140 Invalidate transitions when the start time or duration of an effect or overlay changes.
Change-Id: Ibc4d80e92ff46b4ecabed5b998f5b0f2c9ca3473
2010-11-16 11:37:08 -08:00
Mike Lockwood
af376a5427 Merge "MediaScanner: Always use mime type provided to the media scanner" 2010-11-16 11:16:03 -08:00
Andreas Huber
8c7cb61cff Make sure live streamed http live content does not start playing from the very beginning.
The different bandwidth streams may not all start on the same seqnum, so switching bandwidths may fail lateron if we start playing from the very beginning.

Change-Id: I03df8d1f44b3f7b4713d381a3d97847997e3ee59
related-to-bug: 2368598
2010-11-16 10:32:13 -08:00
Jean-Michel Trivi
8f677d66d9 Add new audio mode for audio communications other than telelphony.
The audio mode MODE_IN_CALL signals the system the device a phone
 call is currently underway. There was no way for audio video
 chat or VoIP applications to signal a call is underway, but not
 using the telephony resources. This change introduces a new mode
 to address this. Changes in other parts of the system (java
 and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
 state variable directly, but to use two new convenience methods,
 isInCall() and isStateInCall(int) instead.

Change-Id: Id744cd26520ea1d1a4795eabe6a1f0c58789af76
2010-11-16 10:23:37 -08:00
Mike Lockwood
858caeaaa1 MediaScanner: Always use mime type provided to the media scanner
BUG: 3179926

Change-Id: Ib94aea43b83658e3ab31c5eacf7a5135cd14822a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-16 11:28:42 -05:00
James Dong
36663b2f6c Add initial stereo capture support for AAC encoder
Change-Id: I1b9335f036ff42d958d0b32f25359b21733f96d4
2010-11-15 17:17:29 -08:00
Andreas Huber
7dcf95af05 Merge "Proper support for variable NALsize lengths of AVC content in .mkv files." 2010-11-15 15:31:17 -08:00
Andreas Huber
0f62458434 Proper support for variable NALsize lengths of AVC content in .mkv files.
Change-Id: If60cc80998b3231b6aaedc39fc3f5a94f84a5929
related-to-bug: 3197442
2010-11-15 15:10:34 -08:00
James Dong
df7a856d3d Fixed a race condition where some recording frames may not be released.
When startRecording() is called before setListener(), recording frames
are sent right after startRecording(), but there is no listener to
release the recording frames. This causes the hang in media server.

bug - 3166356

Change-Id: I19366ca682ef9f6b847590c190c30a15ed32b8e4
2010-11-15 13:14:59 -08:00
Mike Lockwood
160b977c81 Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList" 2010-11-15 11:27:47 -08:00
Mike Lockwood
3159991e58 MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList
Change-Id: If9bb8b4b19ed6c8d57736e5d1af948fcc946af0e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-15 14:10:04 -05:00
Andreas Huber
645336a742 Merge "More HTTP live support, AES encryption etc." 2010-11-15 10:07:38 -08:00
Andreas Huber
d98f49b014 Merge "Refactor h.264 profile/level support into avc_utils." 2010-11-15 10:07:31 -08:00
Andreas Huber
ffd998e744 Merge "Provide bandwidth estimation support in NuHTTPDataSource" 2010-11-15 10:07:24 -08:00
Andreas Huber
81a602958f Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser." 2010-11-15 10:07:17 -08:00
James Dong
93248f8160 Merge "Remove legacy PV stuff" 2010-11-15 09:57:33 -08:00
Andreas Huber
2381a8a91b Provide bandwidth estimation support in NuHTTPDataSource
Change-Id: Ic98d8cf147bbba60ec735e7ca200addb2bd09f29
related-to-bug: 2368598
2010-11-15 09:35:54 -08:00
Andreas Huber
6a1f5f90e4 More HTTP live support, AES encryption etc.
Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c
related-to-bug: 2368598
2010-11-15 09:03:03 -08:00
Andreas Huber
f7e2e31f7a Refactor h.264 profile/level support into avc_utils.
Change-Id: Idb33636dc723aa79ea0122dc3582109ada4b1358
related-to-bug: 2368598
2010-11-15 09:01:13 -08:00
Andreas Huber
5dffd0e3af Add http live mime types to MediaFile, add support for playlist mime types to browser.
Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f
related-to-bug: 2368598
2010-11-15 08:54:40 -08:00
Mike Lockwood
e2ad6ec171 MTP: Partial implementation of the GetObjectPropList command
In this initial implementation we only support fetching one property at a time.
Support depth = 0 (single object) or depth = 1 (all objects in a directory)
Reimplemented GetObjectPropValue on top of GetObjectPropList, since the former
is a special case of the latter.

Change-Id: Ia76ee61741d6ee3902b5c5d9fc094cf86dfaf650
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-11-15 11:46:51 -05:00
Mike Lockwood
44d47ad565 Merge "MediaScanner: Add support for importing file based playlists copied over MTP" 2010-11-15 08:39:00 -08:00
James Dong
8ec2d9add9 Remove legacy PV stuff
Change-Id: I60ffea7c65592df4b3a80c590c863f1f79b371fd
2010-11-15 08:36:42 -08:00
James Dong
98d50a0be8 Merge "Disable flaky streaming server check" 2010-11-15 08:13:30 -08:00
James Dong
2fd4e5935c Fix a typo in LOG_TAG for MediaPlayer unit tests
Change-Id: I351f32fe4b4da82c32acf5c9e5ebdb81bb003525
2010-11-14 14:56:56 -08:00
James Dong
a76e7efde8 Disable flaky streaming server check
o Although the streaming server is available, the check fails most of the time.

Change-Id: I1084e715605541c4fc3d40e4055db90ddb118b6f
2010-11-13 15:22:55 -08:00
Gil Dobjanschi
bbced1b9e9 Merge "Transition invalidation bug fix." 2010-11-12 15:39:16 -08:00
James Dong
a9d02bf602 Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h" 2010-11-12 15:33:41 -08:00
Gil Dobjanschi
75159247d8 Transition invalidation bug fix.
Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
2010-11-12 15:29:57 -08:00
Mike Lockwood
caf7e43a40 MediaScanner: Add support for importing file based playlists copied over MTP
Change-Id: I53a9f204297ff29d4df994d2174bd6d6288f2c97
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-12 18:23:19 -05:00
Jean-Michel Trivi
1a22bdb01a Add support for audio recording source in generic audio policy mgr.
Update the platform-independent audio policy manager to pass the
 nature of the audio recording source to the audio policy client
 interface through the AudioPolicyClientInterface::setParameters()
 method.

Change-Id: I6b4fd0f8a3acea0d7d30bbad98edd1977dc012bf
2010-11-12 14:35:52 -08:00
James Dong
aac193cf38 Separate the key for audio sampling rate and video frame rate in MetaData.h
Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
2010-11-11 22:11:20 -08:00
Gil Dobjanschi
0bf3075241 Merge "Invalidate transitions when an image media item duration changes." 2010-11-11 19:09:25 -08:00
Andreas Huber
3de594d370 Increase the prefetcher's low water mark so it restarts fetching data earlier.
720p high bitrate content pretty much requires this.

Change-Id: I2cb29d1fa2e3c511f1b88a106a02c53c68a10f2f
2010-11-11 17:01:43 -08:00
Andreas Huber
dcdb6d001d Merge "Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun." 2010-11-11 15:45:04 -08:00
Andreas Huber
10b920cd99 Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun.
Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3

Conflicts:

	media/libstagefright/AwesomePlayer.cpp
2010-11-11 15:37:17 -08:00
James Dong
d781089731 Add color format query support to QueryCodecs()
Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
2010-11-11 14:08:52 -08:00