2403 Commits

Author SHA1 Message Date
James Dong
1441bdfc19 Merge "Use the target color format from the camera source if possible" into gingerbread 2010-08-05 15:10:03 -07:00
James Dong
3933cb79ec am 41b29cb0: am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread
Merge commit '41b29cb0a8e04e553357662b81bffea26f1c2d84'

* commit '41b29cb0a8e04e553357662b81bffea26f1c2d84':
  Fix an issue where the track duration does not include the last sample duration
2010-08-05 14:25:59 -07:00
James Dong
afd97e82cf Use the target color format from the camera source if possible
- If the target color format is unavailable, the default
  platform-dependent color format will be used.

- Also add some logic to prevent looping forever if the
  omx component is buggy supporting color format enumeration.

Change-Id: I119a78f0d6201b4c3621235cca2f523ec14e24e3
2010-08-05 13:47:01 -07:00
Andreas Huber
2184abfead am 870678a9: am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
Merge commit '870678a954e1e2a96caf76453c20de808253ffd1'

* commit '870678a954e1e2a96caf76453c20de808253ffd1':
  Better support for fake timestamps in RTP, H.263 video now also requests FIR.
2010-08-05 12:09:22 -07:00
Andreas Huber
8776781c89 am 2405988f: am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread
Merge commit '2405988fa07dfc7f6607cafe75322326628a9f52'

* commit '2405988fa07dfc7f6607cafe75322326628a9f52':
  A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
2010-08-05 12:09:18 -07:00
Andreas Huber
b2b1a2dc3a am c6d1519e: am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
Merge commit 'c6d1519e549740abd56df7a98b5348bd9095ae46'

* commit 'c6d1519e549740abd56df7a98b5348bd9095ae46':
  Specification of codec specific data as part of the session description is now optional.
2010-08-05 12:09:04 -07:00
Scott Main
613d363c96 am ef9fd39d: am 769f9b89: am 5b86de94: fix doc bugs
Merge commit 'ef9fd39d73877162ba200ef8b2000216133dab2e'

* commit 'ef9fd39d73877162ba200ef8b2000216133dab2e':
  fix doc bugs
2010-08-05 12:07:55 -07:00
Marco Nelissen
15e762bd4f am 533dc786: am 7d146197: Merge "Fix divide by zero." into gingerbread
Merge commit '533dc7866c19327e31ec6a13e36b997bcc74a650'

* commit '533dc7866c19327e31ec6a13e36b997bcc74a650':
  Fix divide by zero.
2010-08-05 11:46:39 -07:00
Andreas Huber
63ff094e88 am ac8e7060: am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
Merge commit 'ac8e7060e09cc8eecc3f959691185bf156939404'

* commit 'ac8e7060e09cc8eecc3f959691185bf156939404':
  Don't return a decoder error if the encoded stream does not start with SPS/PPS.
2010-08-05 11:46:12 -07:00
Andreas Huber
0a3858b0de am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf'

* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
2010-08-05 11:46:04 -07:00
Eric Laurent
ff43836b88 am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbread
Merge commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067'

* commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067':
  Fix issue 2876124.
2010-08-05 11:43:45 -07:00
James Dong
41b29cb0a8 am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread
Merge commit '3aad8c38520956708e51882f3fad63a7a217e8e4' into gingerbread-plus-aosp

* commit '3aad8c38520956708e51882f3fad63a7a217e8e4':
  Fix an issue where the track duration does not include the last sample duration
2010-08-05 11:06:25 -07:00
James Dong
91b22a9453 Fix an issue where the track duration does not include the last sample duration
Change-Id: Ib6e01c1c84ad9b7404536f9c40bf90a13340ae53
2010-08-05 10:46:13 -07:00
Andreas Huber
870678a954 am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp

* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
  Better support for fake timestamps in RTP, H.263 video now also requests FIR.
2010-08-05 10:13:30 -07:00
Andreas Huber
2405988fa0 am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread
Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp

* commit '407ec58c6604da3255b04aa99577515deba3a26f':
  A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
2010-08-05 10:13:26 -07:00
Andreas Huber
2c37f3d3a0 Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread 2010-08-05 10:11:28 -07:00
Andreas Huber
1f7fba1ffb A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
Change-Id: I001fa36d3f5bf385b9f9d086c802673071c65db9
related-to-bug: 2896814
2010-08-05 10:00:10 -07:00
Andreas Huber
3eaa3006a8 Better support for fake timestamps in RTP, H.263 video now also requests FIR.
Change-Id: I2385461887197fe4062d329086e0204f6d6620fc
2010-08-05 09:28:17 -07:00
Andreas Huber
c6d1519e54 am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
Merge commit 'fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp

* commit 'fb861523318710b95c08110b9b2de28f7da74a40':
  Specification of codec specific data as part of the session description is now optional.
2010-08-05 09:25:25 -07:00
Andreas Huber
fb86152331 Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread 2010-08-05 09:18:38 -07:00
Eric Laurent
4e68d506b0 resolved conflicts for merge of acc4e683 to master
Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8
2010-08-05 02:53:22 -07:00
Scott Main
ef9fd39d73 am 769f9b89: am 5b86de94: fix doc bugs
Merge commit '769f9b8980a774e3493cbd9beac565c6b5d62161' into gingerbread-plus-aosp

* commit '769f9b8980a774e3493cbd9beac565c6b5d62161':
  fix doc bugs
2010-08-04 18:05:22 -07:00
Scott Main
769f9b8980 am 5b86de94: fix doc bugs
Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread

* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
  fix doc bugs
2010-08-04 18:02:18 -07:00
Scott Main
5b86de94a1 fix doc bugs
Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
2010-08-04 17:07:36 -07:00
Marco Nelissen
533dc7866c am 7d146197: Merge "Fix divide by zero." into gingerbread
Merge commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce' into gingerbread-plus-aosp

* commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce':
  Fix divide by zero.
2010-08-04 15:39:55 -07:00
Marco Nelissen
7d14619787 Merge "Fix divide by zero." into gingerbread 2010-08-04 15:37:37 -07:00
Marco Nelissen
0fc9f34d94 Fix divide by zero.
Change-Id: I3113234aa5936965424dde5b24e448df1be0b603
2010-08-04 15:29:26 -07:00
Andreas Huber
ac8e7060e0 am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
Merge commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp

* commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c':
  Don't return a decoder error if the encoded stream does not start with SPS/PPS.
2010-08-04 14:18:58 -07:00
Andreas Huber
86d2c088f1 Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 2010-08-04 14:16:20 -07:00
Andreas Huber
1f513d8821 am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp

* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
2010-08-04 14:15:23 -07:00
Andreas Huber
1564455518 Don't return a decoder error if the encoded stream does not start with SPS/PPS.
Change-Id: I960ada0c53f8ffe413ecd07c2c754a996841f592
2010-08-04 14:08:14 -07:00
Andreas Huber
426b650e1b Specification of codec specific data as part of the session description is now optional.
Change-Id: Ie1953909e1d241381add3cc82a7a1f7d7d1540f2
2010-08-04 14:04:31 -07:00
Mike Lockwood
c3cc7011c2 Merge changes I085cb3cf,Ied1cddc6
* changes:
  MTP: Add support for syncing MTP playlists
  MTP: Fix some thread safety issues in MTP server start/stop sequence.
2010-08-04 13:02:06 -07:00
Andreas Huber
57648e4eec Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
Change-Id: I95b8dd487061add9bade15749e563b01cd99d9a6
2010-08-04 11:49:24 -07:00
Nipun Kwatra
bf3699a558 Unhide MediaRecorder::setTimeLapseParameters()
This function is used to enable time lapse video capture
and set the related parameters.

Change-Id: Ib6c4c107a92942d8e8fcce935d2c8542f8006cfb
2010-08-04 11:17:49 -07:00
James Dong
13f5b25c62 am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
Merge commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb'

* commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb':
  Replace CHECK with a failure return value when mCamera->setParameters() fails
2010-08-04 11:12:40 -07:00
James Dong
26d7a6df73 am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
Merge commit '246aad12cf2becda5111d03fd1dd8f39712686f2'

* commit '246aad12cf2becda5111d03fd1dd8f39712686f2':
  File writer has a designated writer thread now
2010-08-04 11:12:03 -07:00
James Dong
327c0bd9e2 am 9b84e8df: am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Merge commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80'

* commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80':
  Fixed a typo in a method name of MediaPlayerPerformance.java class
2010-08-04 11:11:50 -07:00
Eric Laurent
eec3fca627 am 7629e8dd: Merge "Fix issue 2876124." into gingerbread
Merge commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36' into gingerbread-plus-aosp

* commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36':
  Fix issue 2876124.
2010-08-04 10:07:24 -07:00
Eric Laurent
7629e8dd14 Merge "Fix issue 2876124." into gingerbread 2010-08-04 10:03:36 -07:00
Eric Laurent
acc4e6838d am 1340ee8a: Merge "NEW_API: Unhide audio effect APIs." into gingerbread
Merge commit '1340ee8a273a9b25a779f3b18d6f832ce496c68e' into gingerbread-plus-aosp

* commit '1340ee8a273a9b25a779f3b18d6f832ce496c68e':
  NEW_API: Unhide audio effect APIs.
2010-08-04 08:52:27 -07:00
Eric Laurent
1340ee8a27 Merge "NEW_API: Unhide audio effect APIs." into gingerbread 2010-08-04 08:42:37 -07:00
Eric Laurent
17cb280e7f NEW_API: Unhide audio effect APIs.
This change unhides all public APIs for controling audio effects exposed
by the following classes:
- AudioEffect
- BassBoost
- EnvironmentalReverb
- Equalizer
- PresetReverb
- Virtualizer
- Visualizer

Also fixes several problems in javadoc.

Change-Id: I541ee4ad0232312ec720545737cbcdb8c9a82597
2010-08-04 08:31:01 -07:00
Eric Laurent
1d53b2a177 Fix issue 2876124.
Allow calls to MediaPlayer::notify() in idle state to signal errors from JNI.

Change-Id: I1515fe69766f0a926b76e15c4971317da2acd6a0
2010-08-04 05:38:56 -07:00
James Dong
d152c1c753 am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
Merge commit 'd194f3d68188a0993617ba8cc29d8abd381b6069' into gingerbread-plus-aosp

* commit 'd194f3d68188a0993617ba8cc29d8abd381b6069':
  Replace CHECK with a failure return value when mCamera->setParameters() fails
2010-08-03 15:57:26 -07:00
James Dong
6c8687cf1e am 51a260d8: am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread
Merge commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef'

* commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef':
  Add lost frame handling in AudioSource
2010-08-03 15:52:48 -07:00
James Dong
af3f29e62b Replace CHECK with a failure return value when mCamera->setParameters() fails
if the camera is locked by someone else.

bug - 2827892

Change-Id: I217d4a00f04ebd57b557d3faef28787c14f23ea0
2010-08-03 15:29:20 -07:00
Mike Lockwood
9a2046fb5c MTP: Add support for syncing MTP playlists
MTP playlists now correspond to playlists in the media provider
(like those created by the Music app).

Change-Id: I085cb3cff003037ad62f0e297fb0cfd3047cb3a2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-03 15:36:22 -04:00
Mike Lockwood
23ee42f904 MTP: Fix some thread safety issues in MTP server start/stop sequence.
Change-Id: Ied1cddc6220fa7394e8de99df9bc37a1208b04ff
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-03 15:35:38 -04:00
James Dong
246aad12cf am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
Merge commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp

* commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
  File writer has a designated writer thread now
2010-08-03 10:37:32 -07:00