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

4328 Commits

Author SHA1 Message Date
Mike Lockwood
b83dee77e2 Merge "MTP and media provider support for multiple storage devices:" 2011-04-05 13:36:49 -07:00
Mike Lockwood
b239b68376 MTP and media provider support for multiple storage devices: 
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
 2011-04-05 15:19:16 -04:00
Eric Laurent
ae29b7632e New fix for issue 4111672: control block flags 
The first fix (commit 913af0b4) is problematic because it makes threads
in mediaserver process block on the cblk mutex. This is not permitted
as it can cause audio to skip or worse have a malicious application
prevent all audio playback by keeping the mutex locked.

The fix consists in using atomic operations when modifying the control
block flags.

Also fixed audio_track_cblk_t::framesReady() so that it doesn't block
when called from AudioFlinger (only applies when a loop is active).

Change-Id: Ibf0abb562ced3e9f64118afdd5036854bb959428
 2011-04-05 12:05:41 -07:00
Andreas Huber
dc5ba0451c Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491" 2011-04-04 12:45:23 -07:00
Andreas Huber
c6e3b27fa1 This reverts an earlier change 4aeec2da39 
Instead of returning 0-filled buffers after EOS from AudioTrack we do this
work in AudioOutput instead. That way the EOS signal (0 frames returned)
is preserved in AudioCache which otherwise would lead to a heap size overflow
filling everything with zeroes.

Change-Id: I7e07429ba887957a4340dd4b21eef4bba76248cd
related-to-bug: 3514073
 2011-04-04 11:43:40 -07:00
Andreas Huber
8e64c31f6c Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock. 
Change-Id: Idfea452ff661b264e013fe515bcd2a2762bd959c
related-to-bug: 4193552
 2011-04-04 11:29:35 -07:00
James Dong
55311e8d13 Merge "ISurfaceTexture does not have a method getIdentity()" 2011-04-01 14:06:56 -07:00
Andreas Huber
1aebc47141 Merge "Remove legacy hack to only drop frames every other late frame" 2011-04-01 14:02:06 -07:00
Andreas Huber
5e9c3de539 Merge "Fix a webm-seek issue introduced when adding support for streaming webm" 2011-04-01 14:01:09 -07:00
Andreas Huber
21796929d3 Fix a webm-seek issue introduced when adding support for streaming webm 
Change-Id: I52ec841832077603ee035f7a648316349513e978
related-to-bug: 4199894
 2011-04-01 13:36:53 -07:00
James Dong
a93f84e067 ISurfaceTexture does not have a method getIdentity() 
Change-Id: I81e6b0335747bd5c2c4b15c9f8c99100842a06c1
 2011-04-01 13:29:27 -07:00
Andreas Huber
2334d82073 Remove legacy hack to only drop frames every other late frame 
Change-Id: I197e568d292341c330efb394c41aa9af0e74b081
related-to-bug: 4203195
 2011-04-01 13:27:42 -07:00
Mike Lockwood
8538149572 am 1c56976a: am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. 
* commit '1c56976a774434bd279b6181c4fc3c555c4648c2':
  Improve Javadoc for USB Manager and MTP/PTP support.
 2011-04-01 11:38:52 -07:00
Mike Lockwood
1c56976a77 am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. 
* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
  Improve Javadoc for USB Manager and MTP/PTP support.
 2011-04-01 11:37:05 -07:00
Mike Lockwood
38f04c0f28 am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. 
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
  Improve Javadoc for USB Manager and MTP/PTP support.
 2011-04-01 11:34:39 -07:00
Mike Lockwood
11dd5ae97b Improve Javadoc for USB Manager and MTP/PTP support. 
Bug: 4091519

Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-04-01 14:11:50 -04:00
Glenn Kasten
ea2c96541b am 69250839: am 4ed59de6: am ffa670b5: Bug 4167061 
* commit '69250839bb0ae94305ee1ac9a452b98d67acc5cf':
  Bug 4167061
 2011-03-31 11:11:43 -07:00
Glenn Kasten
69250839bb am 4ed59de6: am ffa670b5: Bug 4167061 
* commit '4ed59de640e46e42b5af3d79448be9da6e79667d':
  Bug 4167061
 2011-03-31 11:08:52 -07:00
Glenn Kasten
4ed59de640 am ffa670b5: Bug 4167061 
* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
  Bug 4167061
 2011-03-31 11:06:41 -07:00
Glenn Kasten
ffa670b5b0 Bug 4167061 
Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
 2011-03-30 18:50:41 -07:00
Andreas Huber
6c3f60e3d5 am 399792b8: am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit '399792b83174a835840a4f47adcd34aed4e0b9ba':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 16:40:43 -07:00
Andreas Huber
05e11b29b2 am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '66ec90687f3579fe73f6baa2a188f8a4583167a3':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 16:38:38 -07:00
Brad Fitzpatrick
36bafb0b7d am 0ddcc8bc: am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit '0ddcc8bc60ffa00e103f420f95b7f8a7c77639b6':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 16:38:03 -07:00
Andreas Huber
399792b831 am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit '06ac039962c7f15938afc4bbb74c2f14de4dc505':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:22:57 -07:00
Andreas Huber
06ac039962 am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:19:46 -07:00
Andreas Huber
b676b73e39 Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 2011-03-30 15:16:36 -07:00
Andreas Huber
45ad57aab3 When http streaming and Content-Length is unknown, make sure to return all 
data that we successfully received before signalling the error.

Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
 2011-03-30 15:00:34 -07:00
Andreas Huber
cabb7da712 Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files 
Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6
related-to-bug: 4192562
 2011-03-30 13:13:25 -07:00
Andreas Huber
fc2143473a Merge "Stagefright DataSources now expose the underlying content mime type." 2011-03-30 11:26:04 -07:00
Andreas Huber
a2e57ca650 Stagefright DataSources now expose the underlying content mime type. 
Use that mime type to determine if we should do upfront buffering at the start of
playback and don't for audio streams to ensure playback starts fairly instantly.

Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42
related-to-bug: 4090916
 2011-03-30 11:15:27 -07:00
James Dong
4d3cdb5515 Check whether WAVE extractor can be initialized successfully in the sniffer for WAVE 
bug - 3373994

Change-Id: I91c420815caae3b868fe9184ba48f37046b495fb
 2011-03-30 10:54:58 -07:00
Andreas Huber
66ec90687f am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '8de5df439244e77d7892deceb86520551ff0499c':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:34:15 -07:00
Andreas Huber
8de5df4392 am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:27:14 -07:00
Brad Fitzpatrick
0ddcc8bc60 am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 08:20:58 -07:00
James Dong
5c8eff3308 Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc" 2011-03-29 15:17:47 -07:00
Marco Nelissen
30ec6c2bf5 Merge "Fix media scanner uri handling." 2011-03-29 15:16:55 -07:00
Andreas Huber
35eebbab59 Merge "Add a user-agent header to our RTSP requests." 2011-03-29 13:52:15 -07:00
Andreas Huber
b0e7381ccb Add a user-agent header to our RTSP requests. 
Change-Id: I02f8ff6a4a37fa59cc8c5fcfd3afb64ee11ba576
related-to-bug: 4173725
 2011-03-29 13:34:28 -07:00
Andreas Huber
8fddd761f9 Merge "Adding support for the '.mxmf' MIDI file extension." 2011-03-29 13:33:58 -07:00
Marco Nelissen
3e5e805594 Fix media scanner uri handling. 
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: Ifdf3a177750f1e71ca5a058fa534d272e1505653
 2011-03-29 13:29:42 -07:00
Andreas Huber
eecadb9a84 Adding support for the '.mxmf' MIDI file extension. 
Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
 2011-03-29 13:17:30 -07:00
James Dong
c36b3c6956 Fix missing cross-ref links in the MediaPlayer.java javadoc 
Change-Id: Ie5fba234d226ff792661ec346ddf87f43b5a0dc7
 2011-03-29 12:16:59 -07:00
Andreas Huber
21e73bf25a Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread. 
Change-Id: I669d589ab4521fe44a3e8f638c7ce8e79174d625
related-to-bug: 4179898
 2011-03-29 11:50:24 -07:00
Andreas Huber
b13c4a9b6c Surfaceflinger expects rectangles to be specified right/bottom edge exclusive. 
Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
 2011-03-29 10:00:20 -07:00
Iliyan Malchev
d2b1f29aa0 Merge "frameworks/base: some camera-interface cleanup" 2011-03-28 17:07:02 -07:00
Iliyan Malchev
40c364136f frameworks/base: some camera-interface cleanup 
Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct
image_rect_struct are no longer used (instead, the necessary information is
passed through ANativeWindow.)

Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2011-03-28 16:28:57 -07:00
Andreas Huber
3a28b022bc Ignore OMX codec messages once we're in ERROR state. 
Change-Id: I2bdf58ed705a641be1f3aec89fa41cada6acfc96
related-to-bug: 4175573
 2011-03-28 14:48:28 -07:00
Andreas Huber
ab13a89c99 am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:34:06 -07:00
Brad Fitzpatrick
b618b2ef87 am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-28 08:26:02 -07:00
Andreas Huber
e7cedad2b8 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:16:52 -07:00