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

3227 Commits

Author SHA1 Message Date
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
James Dong
798a9d2eb1 Merge "Fix memory leak when 0-memcpy quirk is used" 2010-11-11 14:06:30 -08:00
Mike Lockwood
5c7d5ae094 Merge "MediaFile: Recognize MPG file extension as MPEG video" 2010-11-11 13:15:57 -08:00
Mike Lockwood
28d1a4aaf3 MediaFile: Recognize MPG file extension as MPEG video 
Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-11 16:14:19 -05:00
Gil Dobjanschi
34fad15699 Invalidate transitions when an image media item duration changes. 
Change-Id: I3cff920ef629df49dcfcb63065afeeb47a649287
 2010-11-11 11:55:19 -08:00
James Dong
31b9375f45 Fix memory leak when 0-memcpy quirk is used 
o minor change to the original patch by Andreas:
  call restorePatchedDataPointer() method only if kAvoidMemcopyInputRecordingFrames is turned on

Change-Id: Idf3710e6f759d37d28e866613f98d39215722cb9
 2010-11-11 11:26:16 -08:00
James Dong
0fbb7a601f Merge "Fix testWAVSeekToEnd() testcase" 2010-11-11 09:58:44 -08:00
Mike Lockwood
f0c3a99cee Merge "MTP: Add missing call to closedir() in recursive delete code" 2010-11-11 08:44:19 -08:00
Mike Lockwood
a108b2fdc1 MTP: Add missing call to closedir() in recursive delete code 
BUG: 3185660

Change-Id: I3744d2cb193829d20a689af2aea50e8516779631
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-11 11:22:32 -05:00
James Dong
c5d4730ed1 Fix testWAVSeekToEnd() testcase 
The testcase does not depend on the availability of WMV decoder

Change-Id: I983f6d5954242a28fb9818fa03447b4afe7ad3d1
 2010-11-11 00:03:59 -08:00
Gil Dobjanschi
a71f52bf32 Merge "Close the file input stream if the XML file parsing fails." 2010-11-10 14:43:19 -08:00
James Dong
d1970b8c6e Merge "Fix uninitialized variable" 2010-11-10 14:18:26 -08:00
James Dong
5d0b783c44 Fix uninitialized variable 
o This was missed while the rotation patch was hand merged.

Change-Id: I4016f9fb9cd54c5e853da15bbaaa50b1d1dac8c8
 2010-11-10 14:07:13 -08:00
Mike Lockwood
f1094227f8 Merge changes I49b383d3,I70809401 
* changes:
  MTP: Don't dump data packets twice in debug output.
  Add support for range and enum forms in MTP ObjectPropDescs
 2010-11-10 09:57:34 -08:00
Mike Lockwood
83cff86dcd MTP: Don't dump data packets twice in debug output. 
Change-Id: I49b383d39aea101a58ae6902952ba91b44e7dc3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-10 12:49:36 -05:00
Mike Lockwood
4a65e281fa Add support for range and enum forms in MTP ObjectPropDescs 
Change-Id: I70809401e37a1cfb82f5dbf86947be7d9500ccf1
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-10 12:48:39 -05:00
Gil Dobjanschi
1fbeece669 Close the file input stream if the XML file parsing fails. 
Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
 2010-11-10 09:27:13 -08:00
James Dong
c32474d90a Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder" 2010-11-09 15:48:11 -08:00
James Dong
0244d94455 Fix missing breaks in the profile/level conversion code in M4vH263 encoder 
Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
 2010-11-09 15:15:50 -08:00
Andreas Huber
40e8dc171f Merge "Some refactoring and added support for another form of vbr headers." 2010-11-09 14:59:13 -08:00
Andreas Huber
1bd9949815 Some refactoring and added support for another form of vbr headers. 
related-to-bug: 3172324

Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
 2010-11-09 14:45:08 -08:00
Jean-Michel Trivi
820b9e0d3b Add recording source for voice communication 
Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
 2010-11-09 14:32:43 -08:00