3500 Commits

Author SHA1 Message Date
Mike Lockwood
5a2755d0c9 Rename MtpCursor to PtpCursor
Change-Id: I8ce257641388b195f3e17995d323355b19355dc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 12:25:49 -05:00
Mike Lockwood
d46c683f0e MTP: Remove static library build for linux host.
Change-Id: Iefdd386b91dba0579ca952aca40b7114535e1d4e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 10:30:31 -05:00
Mike Lockwood
c0b8b321d5 Rename MtpClient and MtpCursor to PtpClient and PtpCursor
Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 10:30:31 -05:00
Mike Lockwood
a31560598a Rename android.provider.Mtp to android.provider.Ptp
We are only supporting the PTP subset of MTP in host mode and have
no plans for full MTP, so calling it Mtp was misleading.

Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore
and added it to the public API.

Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 10:30:31 -05:00
Gloria Wang
c60df506c1 am 3e18dfab: am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '3e18dfab3417e139c7ec3896cea9e303fdc8fa63':
  Notify the playback status to DRM agents before the playback starts
2010-11-22 21:29:22 -08:00
Gloria Wang
3e18dfab34 am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
  Notify the playback status to DRM agents before the playback starts
2010-11-22 21:26:13 -08:00
Gil Dobjanschi
e45674e284 Merge "Begin transition was invalidated when the image duration was changed." 2010-11-22 16:38:38 -08:00
Andreas Huber
4a0ff4de79 Merge "Squashed commit of the following:" 2010-11-22 15:40:29 -08:00
Gil Dobjanschi
37f7e0c7bf Begin transition was invalidated when the image duration was changed.
Change-Id: I0118813a66c65d8b3746fc2c689cf9d8da651aa3
2010-11-22 15:33:10 -08:00
Andreas Huber
1bb0ffd098 Squashed commit of the following:
commit 0870f7bdd10a7cd36087d723d1957d8e1b967ca7
Author: Andreas Huber <andih@google.com>
Date:   Mon Nov 22 12:57:04 2010 -0800

    set_surface_crop doesn't seem to work right yet, stop using it in the SoftwareRenderer.

    Change-Id: If0a24f78b7810a6cecaa82eb4f23d0f90c22cc42

commit 4767b52bee3a54ae117a8708d6832276a44e6a6a
Author: Andreas Huber <andih@google.com>
Date:   Mon Nov 22 11:14:57 2010 -0800

    info->mMediaBuffer may still be NULL at this point...

    Change-Id: I25a71569015b1bb87f1ea7efff7588958774426f

commit 0cef79874e1f1ddb10b7402177a87d3cffc7de92
Author: Andreas Huber <andih@google.com>
Date:   Mon Nov 22 10:55:12 2010 -0800

    QCOM's YVU420 color format conversion has now been tested.

    Change-Id: I7fef4b642a928af15d42f006f7cdc107d5ff1d67

commit 84fe05a6c969ede0ce8a85a530e110afca07c7a7
Author: Andreas Huber <andih@google.com>
Date:   Mon Nov 22 09:59:50 2010 -0800

    Removed remaining traces of suspend/resume. Proper reporting of video dimensions based on cropping rectangle.

    Change-Id: Ib238b80cbc1f19e7d312f2422eb5e9ab6b06b1bc

commit 50970cdc837c5c498bcf0cb61b436196ca9e2ef7
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 16:11:06 2010 -0800

    Revamped Software Renderer respects the crop rectangle.

    Removed obsolete ADRENO support code.

    Change-Id: I984cbc8a99c4d97e09e7d1b1292099c88b9ae535

commit 8abbc6a5608bff650f968540f24a2eab75f254ed
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 16:10:41 2010 -0800

    The metadata retriever now respects the crop rectangle while capturing a video frame.

    Change-Id: Id3377176060086d16717f62c77ce26fabe899050

commit 2d42e4466609d304e88bd2cdd6eb7b297340cc21
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 16:09:50 2010 -0800

    Changed ColorConverter APIs to be more general.

    Clients can now refer to crop rectangles in both source and destination.

    Change-Id: Ief151d736818396d0389ec04e7df5650e3ad7c04

commit 273184303d54a54febd3e9c3dd4df30507ea78b5
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 15:04:06 2010 -0800

    The stagefright commandline tool now writes the extracted video frame to /sdcard/out.jpg

    Change-Id: Ieb2ab3fda7a7cd9294beccb8db0eed75096eeef4

commit 2d43390328cadf4ba94c1c3c02e4fb30baa29690
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 14:36:55 2010 -0800

    The AVC software decoder now properly advertises the cropping rectangle.

    Change-Id: Idb7a8a7e2fde5740f0fc34b7e8c92eca2577104b

commit 9a7ed23c2fac8ce19dce7a34a603acee945a89f6
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 13:40:39 2010 -0800

    OMXCodec now signals a format change if the cropping rectangle changes.

    ...and puts the cropping info into its output format.

    Change-Id: I3ffbd8e877ba286fe06a82c536ef20d92548d2e2

commit efe0323947029df1c502599ccc288c8d676dfd31
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 11:29:39 2010 -0800

    Stagefright's MetaData object now supports rectangle items.

    Change-Id: I5667bb5ee6622c76104b99fb57f60abb802a8504

Change-Id: I27cb78f2c5e0353f95fdfc5cb53991949ed75b70
2010-11-22 14:05:21 -08:00
Jean-Michel Trivi
8aa798b244 Unhide android.media.AudioManager.MODE_IN_COMMUNICATION
Unhide new constant for an audio mode for a system state when
 the device has a VoIP (as opposed to telephony) call established.
Update the setMode and getMode javadoc to link to the mode constants
 that can be set or retrieved.

Change-Id: I90c4417679f215eb66e5305086fd077beddaa59c
2010-11-22 13:30:34 -08:00
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