2458 Commits

Author SHA1 Message Date
Mike Lockwood
0a7fa0a868 MTP: Check and clear exceptions after calling into Java in MtpDatabase
Change-Id: I805858c66fe57208c06aa624d16b72966555e005
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-24 11:25:28 -04:00
Andreas Huber
7fdaa2329e Merge "Account for the _ADRENO constant being moved." 2010-08-23 14:08:02 -07:00
Jamie Gennis
c6c9b496aa Account for the _ADRENO constant being moved.
Change-Id: I443e2028c06f8b03e864525365c5c38de79314fe
2010-08-23 14:03:49 -07:00
Dima Zavin
7f81d4cbf1 Merge changes Ic94c18a6,Iff770de1,Ifed6b4dc
* changes:
  libstagefright: enable tegra hw audio decoders
  libstagefright: Enable tegra hw video decoders
  libstagefright: Enable tegra hw encoder
2010-08-23 13:18:58 -07:00
Andreas Huber
d5350764c9 Merge "Squashed commit of the following:" 2010-08-23 12:31:59 -07:00
Andreas Huber
e3c01832fc Squashed commit of the following:
commit 35cc68814a9537c31fde146e171e7b0bbdfe211e
Author: Andreas Huber <andih@google.com>
Date:   Mon Aug 16 08:48:42 2010 -0700

    Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else.

commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 13 13:56:44 2010 -0700

    The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise.

commit 684972074b74318bdcb826ed9b5b0864d2d2e273
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 13 09:34:35 2010 -0700

    A first shot at supporting the new rendering APIs.

Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
2010-08-23 12:30:24 -07:00
James Dong
37e2592f28 am 3540760d: am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in the MP4 file
Merge commit '3540760d1d68cc883122d44ab1d38f542fb646e6'

* commit '3540760d1d68cc883122d44ab1d38f542fb646e6':
  Don't drop a late frame which may lead to missing I frames in the MP4 file
2010-08-23 12:01:07 -07:00
James Dong
a75d87ffc4 am 177a7ad8: am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread
Merge commit '177a7ad825445acaeea38c48c74ad87db935d054'

* commit '177a7ad825445acaeea38c48c74ad87db935d054':
  Return error from MPEG4Writer stop() if the check on codec specific data failed
2010-08-23 12:00:44 -07:00
Dima Zavin
30ba6cb915 libstagefright: enable tegra hw audio decoders
Change-Id: Ic94c18a6a6df8e0370dc28634f95561056ed2d02
Signed-off-by: Dima Zavin <dima@android.com>
2010-08-23 11:10:03 -07:00
pgudadhe
6ad2c357c3 libstagefright: Enable tegra hw video decoders
Change-Id: Iff770de1369e57e7833a8cfa9a30955030d9974c
2010-08-23 11:09:13 -07:00
James Dong
349250f3b6 am c8d2fa70: am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217'

* commit 'c8d2fa704abebdbf0bd8aac185216dc068950217':
  Make MediaWriter stop and pause return errors if necessary
2010-08-21 09:43:41 -07:00
Andreas Huber
83b3e3515a am 873ebfb8: am 223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
Merge commit '873ebfb825cb498d9ff3012d1d31b02e31a79980'

* commit '873ebfb825cb498d9ff3012d1d31b02e31a79980':
  Support for MP4V-ES packetization format according to RFC3016.
2010-08-21 09:42:37 -07:00
Andreas Huber
fc5d0cf564 am b29ebd39: am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
Merge commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f'

* commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f':
  In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
2010-08-21 09:41:54 -07:00
Eric Laurent
08b352be43 am 5aff90a6: am 1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
Merge commit '5aff90a638da53e66fba90c92d412812760fe8e5'

* commit '5aff90a638da53e66fba90c92d412812760fe8e5':
  Audio Effects: fixed "strength supported" parameter size.
2010-08-21 09:41:26 -07:00
Andreas Huber
a6a0fe436b am 6bcffcd2: am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
Merge commit '6bcffcd2dc410db780c152c70a01b22da6ca58be'

* commit '6bcffcd2dc410db780c152c70a01b22da6ca58be':
  Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
2010-08-21 09:40:57 -07:00
Nipun Kwatra
727f658e81 Merge "Added downsample()" 2010-08-20 11:35:38 -07:00
Nipun Kwatra
96624731c3 Added downsample()
Added a downsample function which downsamples the source image
starting at an offset and skipping every few pixels. Currently
no low pass filtering is done, but it should be added later.

Change-Id: Iec34092c536bfc661a15521e6a1ef2ef3f815c61
2010-08-20 10:54:59 -07:00
Nipun Kwatra
437e6c49f1 Merge "const correctness, validPixel test." 2010-08-20 10:41:08 -07:00
pgudadhe
9c3053246c libstagefright: Enable tegra hw encoder
Change-Id: Ifed6b4dc4877e3fcab86ee81c9117a92b1d1ce8f
2010-08-19 22:01:18 -07:00
Nipun Kwatra
d1fbdf1a3f const correctness, validPixel test.
- made width(), height() const member functions.
- added validPixel() which returns true if pixel is in the allowed range.
- now testing validPixel in get/setPixelValue

Change-Id: I1dee5060bd4f8dcbdcd542ec4647ea328f0185c3
2010-08-19 18:26:58 -07:00
James Dong
3540760d1d am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in the MP4 file
Merge commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8' into gingerbread-plus-aosp

* commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8':
  Don't drop a late frame which may lead to missing I frames in the MP4 file
2010-08-19 18:07:08 -07:00
James Dong
177a7ad825 am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread
Merge commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90' into gingerbread-plus-aosp

* commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90':
  Return error from MPEG4Writer stop() if the check on codec specific data failed
2010-08-19 18:04:47 -07:00
James Dong
0ea4ed3bbb Don't drop a late frame which may lead to missing I frames in the MP4 file
Change-Id: I8fef1454264230c1369561670236eb0a19ae4e76
2010-08-19 18:04:27 -07:00
James Dong
62948fa4de Return error from MPEG4Writer stop() if the check on codec specific data failed
Change-Id: Icbd08eec9b4201facbad56ff2040f0830cfb0115
2010-08-19 14:04:04 -07:00
James Dong
c8d2fa704a am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Merge commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118' into gingerbread-plus-aosp

* commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118':
  Make MediaWriter stop and pause return errors if necessary
2010-08-19 14:02:25 -07:00
James Dong
cbd038fe20 Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread 2010-08-19 13:59:32 -07:00
James Dong
d036662470 Make MediaWriter stop and pause return errors if necessary
o Make the API consistent with SF framework, which the MediaSource
  provides a return status for stop

o Also, helps to convey errors that occurred right when a
  premature stop() is called, leading to a potentially
  mal-formed output file.

Change-Id: I52a932345f38570fdf8ea04d67d73dd94ccd30ef
2010-08-19 13:33:13 -07:00
Andreas Huber
873ebfb825 am 223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
Merge commit '223e4f732a325e456ca6151f132f1d4c3c625631' into gingerbread-plus-aosp

* commit '223e4f732a325e456ca6151f132f1d4c3c625631':
  Support for MP4V-ES packetization format according to RFC3016.
2010-08-19 11:22:14 -07:00
Andreas Huber
a979ad6739 Support for MP4V-ES packetization format according to RFC3016.
Change-Id: I5e182936c52f9eb80cdcf6132ead03705ee32d61
2010-08-19 11:18:35 -07:00
Andreas Huber
b29ebd397e am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
Merge commit 'f0ad54846168f07fc1fd7f18cde93deea1559f86' into gingerbread-plus-aosp

* commit 'f0ad54846168f07fc1fd7f18cde93deea1559f86':
  In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
2010-08-19 10:56:40 -07:00
Andreas Huber
f0ad548461 Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread 2010-08-19 10:54:21 -07:00
Eric Laurent
5aff90a638 am 1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
Merge commit '1aaba885def9a3b59edbfe2a0f8c3899948533ff' into gingerbread-plus-aosp

* commit '1aaba885def9a3b59edbfe2a0f8c3899948533ff':
  Audio Effects: fixed "strength supported" parameter size.
2010-08-19 10:47:01 -07:00
Eric Laurent
1aaba885de Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread 2010-08-19 10:42:36 -07:00
Andreas Huber
eef3c33e56 In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
Change-Id: I98c4194593c7e6e24f6fc339c862245111800293
2010-08-19 10:39:47 -07:00
Andreas Huber
6bcffcd2dc am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
Merge commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a' into gingerbread-plus-aosp

* commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a':
  Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
2010-08-19 09:11:28 -07:00
Andreas Huber
8c192fe990 Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread 2010-08-19 09:09:12 -07:00
Eric Laurent
ba8da2e61b Audio Effects: fixed "strength supported" parameter size.
The "strength supported" parameter for bass boost and virtualizer effect was incorrectly using a
short value whereas it should be an int. This is to comply to the definition of boolean type in OpenSL ES
that is uint32.

Change-Id: I74ccb61dcc70fc9d390524a1ca5bbbd8b13ab1af
2010-08-18 14:31:25 -07:00
Andreas Huber
f5a36b24ac am 00557baf: am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread
Merge commit '00557baf36ab62592ae1c424a7298a21e8588f5a'

* commit '00557baf36ab62592ae1c424a7298a21e8588f5a':
  Make the OggExtractor less verbose.
2010-08-18 14:21:57 -07:00
Andreas Huber
c7dbac57e2 am 31eb1ac1: am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
Merge commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58'

* commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58':
  Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
2010-08-18 14:21:51 -07:00
Andreas Huber
00557baf36 am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread
Merge commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd' into gingerbread-plus-aosp

* commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd':
  Make the OggExtractor less verbose.
2010-08-18 13:38:53 -07:00
Andreas Huber
31eb1ac1db am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp

* commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
  Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
2010-08-18 13:38:49 -07:00
Mike Lockwood
2b2bff5d98 MTP: Remove retry loop from MTP server code
This should eliminate the spammy logging that my coworkers have noticed.

Change-Id: Ic0e611f5277dd13651490cbe5f7ded5f6e17db4f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-18 13:31:48 -04:00
Mike Lockwood
9e837861b2 MTP: Compatibility fixes for transferring strings
Change-Id: Ic06d754ee68b0389439cdc34f73adff0f2b33afa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-18 13:31:46 -04:00
Andreas Huber
af063a67b2 Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
Change-Id: Ibe71f5941485660510e24d714da3865b9c6f89a2
2010-08-18 10:17:18 -07:00
Andreas Huber
4dda6ddb25 Merge "Make the OggExtractor less verbose." into gingerbread 2010-08-18 10:10:14 -07:00
Andreas Huber
08c94b265c Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
Change-Id: Ia29b967cbee9eabb21c6c26508b27b379ff9ba17
2010-08-18 09:58:30 -07:00
Jean-Baptiste Queru
09f672509b resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c
2010-08-17 15:24:11 -07:00
Rene Bolldorf
0b7bd95d69 Fix compilation errors in libmedia, libstagefright.
(invalid conversion from 'const char*' to 'char*')

Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
2010-08-17 23:45:14 +02:00
James Dong
8ef786bf56 am f54da15b: am eff30e3d: Change the default time scale for audio/video track during recording and reduce rounding errors in calculating the sample duration
Merge commit 'f54da15b7c3fa55268451c485544e831832fdf15'

* commit 'f54da15b7c3fa55268451c485544e831832fdf15':
  Change the default time scale for audio/video track during recording
2010-08-16 15:19:29 -07:00
James Dong
4ad5c707fa am 4fc2c928: am b7208196: Use audio clock as the reference media clock
Merge commit '4fc2c9280c5262c835a4eb78961241de105313c1'

* commit '4fc2c9280c5262c835a4eb78961241de105313c1':
  Use audio clock as the reference media clock
2010-08-16 15:18:13 -07:00