2240 Commits

Author SHA1 Message Date
Nipun Kwatra
b1fb6079ef Implementing getSupportedPictureSizes
Go through all the supported picture sizes and choose the smallest one with
both dimensions higher than the passed in video width and height.

Change-Id: I4e9fe7a6384a0feeb9e069239ec68c70fb5f3033
2010-08-02 09:49:07 -07:00
James Dong
e1c5dae372 am 7600f934: am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Merge commit '7600f934015cff4d678b0f4e8df0eb93749be7bb'

* commit '7600f934015cff4d678b0f4e8df0eb93749be7bb':
  Added damr box for AMR (NB and WB) sample entry
2010-07-30 14:54:26 -07:00
James Dong
7600f93401 am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
  Added damr box for AMR (NB and WB) sample entry
2010-07-30 14:52:05 -07:00
James Dong
f0aa24d91d Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 2010-07-30 14:49:23 -07:00
James Dong
aea75231a5 am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c'

* commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c':
  Lower the lower bound for max file duration check
2010-07-30 14:33:05 -07:00
James Dong
e915b0ef5d am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp

* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
  Lower the lower bound for max file duration check
2010-07-30 14:30:31 -07:00
James Dong
d973a533da Merge "Lower the lower bound for max file duration check" into gingerbread 2010-07-30 14:28:26 -07:00
James Dong
c80218a966 Added damr box for AMR (NB and WB) sample entry
- Some players, like QT, sometimes are picky about the missing sample entry

Change-Id: Ia32d78e48ac9fd8af8285dbc67f0d69142ba98b4
2010-07-30 13:55:18 -07:00
James Dong
8894de6d3e Lower the lower bound for max file duration check
- This fixed a CTS test where 200 ms is being used

Change-Id: Ib598b7b94be54e98a96703c58c5f244bc379cf7d
2010-07-30 12:41:59 -07:00
Jean-Baptiste Queru
154a320069 resolved conflicts for merge of 27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
2010-07-30 12:08:31 -07:00
Eric Laurent
b422107d1d am e67332f8: am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Merge commit 'e67332f879b3f97baaac2252b53ac64686aebdbb'

* commit 'e67332f879b3f97baaac2252b53ac64686aebdbb':
  Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
2010-07-30 09:58:09 -07:00
Eric Laurent
e67332f879 am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Merge commit '92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp

* commit '92e847ed8e455dca3b2d33d92999e3960404d9af':
  Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
2010-07-30 09:52:40 -07:00
Eric Laurent
92e847ed8e Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Modified types of some arguments and returned values of the Equalizer class from int to short
to match those defined by OpenSL ES SLEqualizerItf interface.

Also fixed a problem with set properties in equalizer engine implementation.

Change-Id: I75894bad0cb67b01c18ca5e22f9687e75ee491b8
2010-07-30 09:12:51 -07:00
Jean-Baptiste Queru
8f5d160c92 am 0c51c98f: am 4506c62a: fix inaccurate copyrights
Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf'

* commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf':
  fix inaccurate copyrights
2010-07-29 17:54:42 -07:00
Jean-Baptiste Queru
0c51c98fd9 am 4506c62a: fix inaccurate copyrights
Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp

* commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625':
  fix inaccurate copyrights
2010-07-29 17:52:09 -07:00
The Android Open Source Project
27eecb704a Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD 2010-07-29 17:45:56 -07:00
Jean-Baptiste Queru
83407b993f fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:41:35 -07:00
Jean-Baptiste Queru
4506c62abd fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:35:37 -07:00
Nipun Kwatra
dce4beb179 Support for video size to be different from captured picture size.
Adding support to allow video size to be different than the supported
picture sizes. A picture size larger than the demanded video size is
chosen. Captured pictures are then cropped to the size of the desired
video size. Cropping is done from the the center portion of the picture.

Change-Id: I6bcbe16f94b6ecbcf28b7f46826a81b4b6b8cbc3
2010-07-29 12:18:58 -07:00
Nipun Kwatra
a435c1389a Adding YUVImage and YUVCanvas.
YUVImage is a container class to hold YUV data and provide
various utilities, e.g. to set/get pixel values for different
YUV formats, fast copying routines, etc.
Currently supported YUV420 Planar and YUV420 Semi Planar.

YUVCanvas holds a reference to a YUVImage on which it can do various
drawing operations.

Change-Id: I052a57b7fbc834efe1626914f76c04c091996cac
2010-07-29 12:15:57 -07:00
Andreas Huber
26d9b9870e am 42556025: am 6dea6f4e: am 16263d9f: Squashed commit of the following:
Merge commit '425560259c6d41e7f413fdd0f517dc47f350c533'

* commit '425560259c6d41e7f413fdd0f517dc47f350c533':
  Squashed commit of the following:
2010-07-29 11:15:09 -07:00
Andreas Huber
425560259c am 6dea6f4e: am 16263d9f: Squashed commit of the following:
Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp

* commit '6dea6f4e71b53e421564d783c227cbe0a2469183':
  Squashed commit of the following:
2010-07-29 11:11:46 -07:00
Andreas Huber
6dea6f4e71 am 16263d9f: Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread

* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
  Squashed commit of the following:
2010-07-29 11:07:49 -07:00
Andreas Huber
16263d9f8c Squashed commit of the following:
commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date:   Tue Jul 20 09:21:17 2010 -0700

    Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

    Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
    related-to-bug: 2826841

commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date:   Sun Jul 18 17:57:01 2010 -0700

    Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

    Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8

commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date:   Thu Jul 8 20:56:13 2010 -0700

    Enable the support for decoding audio with AAC+ and eAAC+ features

    bug - 282684

    Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b

Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
2010-07-29 09:45:06 -07:00
James Dong
16edf317cd am 8ddb8f81: am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Merge commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0'

* commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0':
  Eliminate the linear cost associated with mSampleSizes.size()
2010-07-28 15:33:56 -07:00
James Dong
8ddb8f8190 am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Merge commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp

* commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d':
  Eliminate the linear cost associated with mSampleSizes.size()
2010-07-28 15:31:09 -07:00
James Dong
e991e5f334 Eliminate the linear cost associated with mSampleSizes.size()
- The linear cost associated with mSampleSizes.size() call causes the
  CPU load to increase overtime as more and more audio/video samples
  are recorded.

- Other Lists used in the MP4 file writer may have similar issues, but
  the size() call is not made for each output audio/video output sample,
  or the size of the list is bounded (not linear to the total number
  of audio/video output samples). As for now, we can live with the small
  cost (tested with 30 minutes long recording).

Change-Id: I23bd93ea4256cb0be0c1649760e39e6809eb4946
2010-07-28 15:21:59 -07:00
Mike Lockwood
03a545e5ed Merge changes I00d6980a,I814221b4,Id88603a5
* changes:
  CameraBrowser: Launch itself when a camera is attached to USB.
  Send Intents when PTP compatible devices are connected/disconnected to USB
  Give system server permission to access USB.
2010-07-28 14:59:45 -07:00
James Dong
a5e0330db0 am 84665f6d: am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested
Merge commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511'

* commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511':
  Reduce memory usage by the MP4 file writer
2010-07-28 12:21:37 -07:00
James Dong
84665f6dc2 am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested
Merge commit '7e397842d53a4242a019daa4b234910273121c30' into gingerbread-plus-aosp

* commit '7e397842d53a4242a019daa4b234910273121c30':
  Reduce memory usage by the MP4 file writer
2010-07-28 12:19:33 -07:00
James Dong
733bfae99b am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b'

* commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b':
  Interleave the audio and video by default
2010-07-28 12:02:59 -07:00
James Dong
7e397842d5 Reduce memory usage by the MP4 file writer
- Don't store timestamp for each output sample
- Don't store timestamp for statistical data collection if the collection of statistical data is not requested

TODO:
1. Reduce CPU load by elimnating the list cost associated with List.size() call.

Change-Id: I590bc17176596a65952c982574b82ee3b15b7d1c
2010-07-28 12:02:57 -07:00
James Dong
cb51115cca am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp

* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
  Interleave the audio and video by default
2010-07-28 12:00:58 -07:00
James Dong
5587bb7e37 Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread 2010-07-28 11:58:12 -07:00
James Dong
63299c0387 Interleave the audio and video by default
- default interleave duration is set to 1 second

This can dramatically reduce the memory usage
by the MP4 file writer.

Change-Id: Ia3ff202cabfcd2d3f183065d31e4596617c2dded
2010-07-28 10:08:03 -07:00
Eric Laurent
ba2709583d am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf'

* commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf':
  Audio effects: modified command() parameter types.
2010-07-28 07:53:24 -07:00
Eric Laurent
6fa8888254 am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb' into gingerbread-plus-aosp

* commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb':
  Audio effects: modified command() parameter types.
2010-07-28 07:51:02 -07:00
Eric Laurent
a4c72acfbc Audio effects: modified command() parameter types.
The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command()
function have been modified from int to uint32_t. This is more consistent with their role.

Change-Id: I84d289fc262d6753747910f06f485597dfee6591
2010-07-28 05:49:21 -07:00
Mike Lockwood
725552a0df CameraBrowser: Launch itself when a camera is attached to USB.
Change-Id: I00d6980a1f8e6607c1368cbf78d8e824514c666b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 19:20:31 -04:00
Mike Lockwood
bb2b2a996b MTP host: Reduce buffer size for readObject so we don't clog our pipe.
Change-Id: I24d2b1551af5843e48c0a63b84925b3a6451e36a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 12:38:33 -04:00
Mike Lockwood
456d8e6e67 MTP: Turn off excessive logging
Change-Id: Ib0dd8cb99efa324d0b4e742bffeb913d6122ace2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 12:38:29 -04:00
Mike Lockwood
1a987b8e45 Try to fix the sim build.
Change-Id: I6e94c938263b2fd1931ed60c26af1134ff035455
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 10:55:26 -04:00
Eric Laurent
b008e9b128 resolved conflicts for merge of d306cc81 to master
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
2010-07-27 02:41:41 -07:00
Eric Laurent
d306cc8192 am ca57d1cc: Audio Effects: added methods to effects java classes to store and load current effect settings in a single call.
Merge commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3' into gingerbread-plus-aosp

* commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3':
  Audio Effects: added methods to effects java classes to store and load current effect settings in
2010-07-27 01:54:30 -07:00
Eric Laurent
ca57d1cc89 Audio Effects: added methods to effects java classes to store and load current effect settings in
a single call.

Addional changes:
- Fixed simulator build
- Use effect interface UUIDs from OpenSL ES includes when available
- Added cleanspec rules to remove now obsolete test effect libraries
- Fixed bug in AudioEffect JNI setParameter function.

Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
2010-07-27 00:41:31 -07:00
Mike Lockwood
133dfe7e98 Merge "Simple command line test tool for MTP host." 2010-07-26 17:51:16 -07:00
Mike Lockwood
1979628e1e Merge "CameraBrowser: Add support for copying files from camera to internal storage." 2010-07-26 17:51:02 -07:00
Mike Lockwood
2f493f0ff1 Merge "MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor" 2010-07-26 17:50:13 -07:00
Mike Lockwood
f7785521bf Merge "MTP: Don't request thumbnails for folder objects in MtpCursor" 2010-07-26 17:49:28 -07:00
Mike Lockwood
bc55034ef9 Merge "MTP: Add hard coded support to recognize a couple MTP music players for testing purposes." 2010-07-26 17:49:04 -07:00