2576 Commits

Author SHA1 Message Date
Eric Laurent
b6d71351c0 Merge "LVM release 1.05 delivery" into gingerbread 2010-08-24 09:50:13 -07:00
Nipun Kwatra
d820714e30 am 701b710c: am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
Merge commit '701b710c194181765616520f6d89d450b4b6c1f5'

* commit '701b710c194181765616520f6d89d450b4b6c1f5':
  setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
2010-08-24 09:03:55 -07:00
James Dong
7802b20586 am 3fc01525: am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
Merge commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5'

* commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5':
  Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
2010-08-24 09:01:39 -07:00
Mike Lockwood
8c68865649 Merge "MTP: Check and clear exceptions after calling into Java in MtpDatabase" 2010-08-24 08:28:54 -07:00
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
Jamie Gennis
85cfdd0112 Change the framework to use the new camera preview path.
This change makes the camera HAL interface take an ANativeWindow interface from
which all the camera preview buffers will be allocated.  The framework code
running in application processes now passes a Surface object rather than an
ISurface to the camera server via Binder when setting the preview surface.  The
camera server then forwards that Surface object (which implements the
ANativeWindow interface) to the camera HAL, which uses it to communicate with
SurfaceFlinger to allocate the camera preview buffers.

Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
2010-08-23 14:31:30 -07: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
Andreas Huber
31e7113104 am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread
Merge commit '3e22ef1e111966df6ad527632fdc35d105c73916' into gingerbread-plus-aosp

* commit '3e22ef1e111966df6ad527632fdc35d105c73916':
  Better handling of rtsp connection and disconnection.
2010-08-23 12:28:26 -07:00
Andreas Huber
3e22ef1e11 Merge "Better handling of rtsp connection and disconnection." into gingerbread 2010-08-23 12:26:31 -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
Andreas Huber
8370be11de Better handling of rtsp connection and disconnection.
Change-Id: Ib126af6c14c5a212a51a5ee3c4a0a7d1860ad167
2010-08-23 11:28:34 -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
28a92120a7 am 3f51fa78: Runtime dump support for MediaWriter
Merge commit '3f51fa78ada0e064d23db5961337280c267cc2c0' into gingerbread-plus-aosp

* commit '3f51fa78ada0e064d23db5961337280c267cc2c0':
  Runtime dump support for MediaWriter
2010-08-23 10:50:29 -07:00
James Dong
3f51fa78ad Runtime dump support for MediaWriter
Change-Id: I10b2c474de612ee4cef4b7c9eae2ee1dd8c2e895
2010-08-23 10:34:05 -07:00
Chia-chi Yeh
a102871c7c am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
Merge commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a' into gingerbread-plus-aosp

* commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a':
  Visualizer: replace the FFT implementation with a faster one.
2010-08-22 18:38:29 -07:00
Chia-chi Yeh
b80e610b07 Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread 2010-08-22 18:31:15 -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
701b710c19 am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
Merge commit '300b0b7e2b8f0ab922e4a83755ae999da191894e' into gingerbread-plus-aosp

* commit '300b0b7e2b8f0ab922e4a83755ae999da191894e':
  setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
2010-08-20 14:18:08 -07:00
Eric Laurent
a1a96f3570 LVM release 1.05 delivery
- Click have been removed from the HP filter activation in the BassBosst Effect.
- SessionId is now stored as a SessionNo
- Effects now stop being called after a delay
- Unix EOL fixed for .java and .xml
- Updated lines limited to 100 characters.
- Removed the remaining warnings from the wrapper code
- Added reverb

Change-Id: I03a2b3b5ee2286958f4901acc8d9b0daf9e2d7c6
2010-08-20 14:17:41 -07:00
Nipun Kwatra
fb45748a1e setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
according to MediaRecorder::setMaxDuration documentation we should disable duration limit
when zero or negative time is passed. Currently setParamMaxFileDurationUs was treating
zero/negative as an error case. Fixed that.

Change-Id: I468c3bcc74cb5a34ee3e172cef5147550d6be096
2010-08-20 14:06:48 -07:00
James Dong
3fc01525ff am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
Merge commit 'b755e3256510ecd325565d6b461d668d224445b1' into gingerbread-plus-aosp

* commit 'b755e3256510ecd325565d6b461d668d224445b1':
  Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
2010-08-20 11:41:49 -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
James Dong
9767dbf923 Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
Change-Id: Ia64c2751b6304e5d5891416bf23ff9b8ec54d5ef
2010-08-19 21:13:35 -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