3439 Commits

Author SHA1 Message Date
Gloria Wang
95dbffb241 Notify the playback status to DRM agents before the playback starts
Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
2010-11-22 11:03:51 -08:00
James Dong
0950b4bd5b Fixed an issue in SampleTable where the table index was incorrectly wrapped around to -1
bug - 3198642

Change-Id: Ia0544172502fc771f48fce22d5c1db19ac3554bb
2010-11-21 10:23:11 -08:00
James Dong
86e735375e Merge "Fixed MediaPlayer unit test issues" 2010-11-19 17:35:26 -08:00
Jean-Baptiste Queru
621b41c744 am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2':
  StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
2010-11-19 16:56:49 -08:00
James Dong
f360acf875 Fixed MediaPlayer unit test issues
o We used to have two different "idle" state with OpenCore.
  Now, with SF, we have a single and consistent "idle" state.

bug - 3198642

Change-Id: I2bbb5e8b6c2d8166841a6e99a1c2c4a47e00b574
2010-11-19 16:56:02 -08:00
James Dong
04d070f293 Merge "Removed uncessary FILE structure pointer for I/O" 2010-11-19 16:49:10 -08:00
Jean-Baptiste Queru
716f60ce60 resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
2010-11-19 16:21:31 -08:00
Eric Laurent
d48124e0fe Merge "Fix issue 3157123." 2010-11-19 15:58:24 -08:00
Eric Laurent
f3d6dd0782 Fix issue 3157123.
Use a Mutex wherever atomic operations were used in AudioTrack,
AudioRecord, AudioFlinger and AudioEffect classes.

Change-Id: I6f55b2cabdcd93d64ef19446735b8f33720f8dbc
2010-11-19 15:49:42 -08:00
Mike Lockwood
c2b18f28e0 Merge "CameraBrowser: temporarily move to system partition" 2010-11-19 14:56:07 -08:00
Mike Lockwood
af8632ccb4 CameraBrowser: temporarily move to system partition
Change-Id: Ied871109f98bdeba7456aacefc537d70a81ee8c9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 17:53:03 -05:00
Mike Lockwood
04ee03d593 Merge "CameraBrowser improvements:" 2010-11-19 12:31:00 -08:00
Mike Lockwood
1d5dedc9e4 CameraBrowser improvements:
Replace menu for importing and deleting files with buttons.

Automatically close activities when camera is disconnected.

Change-Id: I88351e7c337c796057ce3f7da46fc287305f2220
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 15:28:36 -05:00
Mike Lockwood
76151f2505 Merge "PTP: Fix permissions problems with files imported via PTP" 2010-11-19 10:58:47 -08:00
Mike Lockwood
929b3da2fc PTP: Fix permissions problems with files imported via PTP
Change-Id: I630a89c67e5b3d6d0c29e6c257f84e1909fa4de2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 13:55:22 -05:00
James Dong
2747e0e07f Removed uncessary FILE structure pointer for I/O
o also move the fd owner from caller to callee in the Writers

Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
2010-11-19 10:48:22 -08:00
Andreas Huber
978ba93842 Merge "Fix an artifact of going from off_t to off64_t" 2010-11-19 10:31:50 -08:00
Jean-Baptiste Queru
f69f356eba am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
  build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
2010-11-19 10:24:51 -08:00
Mike Lockwood
ec99f45fc5 Merge "Remove command line mtp host tool" 2010-11-19 10:22:09 -08:00
Andreas Huber
783f68398b Fix an artifact of going from off_t to off64_t
Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
2010-11-19 10:08:23 -08:00
Andreas Huber
61c79b6df9 Squashed commit of the following:
commit 610ed879d57785cb0457f7f127889496d325f732
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 09:28:52 2010 -0800

    HTTP header keys are to be treated case insensitive.

    Change-Id: I9690880528a6b0f611958de7996c2753948a03c3

commit 554a2499a293d8d53907d01d972a9cfe9b92738e
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 09:22:45 2010 -0800

    Remove one more legacy "string" implementation.

    Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b

Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
2010-11-19 09:36:13 -08:00
Mike Lockwood
49fd5d9957 Remove command line mtp host tool
I don't need this any more, and don't have time to finish nor maintain it.

Change-Id: I35c5d003e1ad163d429832eb1d0c8d880058c7f1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 12:24:03 -05:00
Mike Lockwood
954c267725 PTP: Improve performance and reliability of file importing
Now the file copy is done completely within the media process
rather than pushing data to the client via ContProvider.openFile().

File system writes are now interleaved with USB reads, which allows us
to copy the data faster and prevents the camera from timing out during transfer.

File is automatically inserted in the media provider after a successful import
and a Uri is returned to the client.

BUG: 2994234

Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 11:30:10 -05:00
Hiroshi Takekawa
dc1a26eb78 StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
addStringTag() caches non-ascii metadata strings for later
processing, and then endFile() will be called at the end of
processFile() to convert non-ascii strings from locale's charset
to utf-8 if required.

Stagefright's processFile() failed to call endFile() when the
processing file is a MIDI file or an OGG file.  This patch fixes
this problem to populate metadata correctly.

Reviewed by: Brad Fitzpatrick, Marco Nelissen.

Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
2010-11-19 12:14:37 +09:00
James Dong
71d4ecb185 Merge "64-bit file size/offset support for media framework" 2010-11-18 18:19:30 -08:00
Gil Dobjanschi
b9401d9010 Merge "AudioTrack getTimelineDuration clarification." 2010-11-18 17:14:14 -08:00
Jamie Gennis
b04c150314 Set the external display usage bit in Stagefright.
Change-Id: Ie18fa773fdb83508d96300dd7e4e4c7c3cdc4540
2010-11-18 15:23:47 -08:00
Gil Dobjanschi
a0dfa2cdd8 AudioTrack getTimelineDuration clarification.
Change-Id: I276316e851918df227b7246766916fa8572f1b89
2010-11-18 14:54:02 -08:00
Gil Dobjanschi
23c430ca75 Merge "Added IOException to WaveformData constructor" 2010-11-18 14:47:18 -08:00
Gil Dobjanschi
b1fcb2abd3 Added IOException to WaveformData constructor
Change-Id: Ic00b582beaa2701ffa72e99194693fd7cfa45a6d
2010-11-18 14:35:12 -08:00
James Dong
b1262a8b1d 64-bit file size/offset support for media framework
Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
2010-11-18 14:12:24 -08:00
Andreas Huber
6ac2cb2c52 Log H.264 profile/level in OMXCodec
Change-Id: I5bf98e1ace701b543234dd9dae1315037ff363c2
2010-11-18 14:06:07 -08:00
Andreas Huber
83ed1ae073 Merge "Support for "chunked" HTTP transfer encoding." 2010-11-18 13:19:07 -08:00
James Dong
ced153a22e Merge "Fix an issue wherre error notification will not be sent after mediaplayer reset" 2010-11-18 13:13:12 -08:00
Andreas Huber
9d20276032 Support for "chunked" HTTP transfer encoding.
Change-Id: I2f20d2d9ec0fa0c840b429049b0385289a30e774
related-to-bug: 3205131
2010-11-18 12:45:12 -08:00
James Dong
c5bba6cc70 Fix an issue wherre error notification will not be sent after mediaplayer reset
bug - 3198642

Change-Id: Ieab13e12af9fdd0ad0873c522885e1350e7cd24c
2010-11-18 12:25:52 -08:00
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
Matthias Bady
b61d530575 build failed with g++ v. 4.4.5
err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’
strrchr provides two prototypes. the one used returns const char* instead of char*

Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
2010-11-18 00:22:48 +01: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