James Dong
6370387680
Release a recording frame only if mCamera exists and is not cleared.
...
and also call mCamera->stopRecording() only after CameraSource releases all the
outstanding video frames sent from CameraSource to its clients (such as video encoder).
Change-Id: I7eeed4e2f388e77c28668d52c24b5330d3d9ebde
2010-12-10 07:34:08 -08:00
Mike Lockwood
faa27f932e
Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService"
2010-12-09 22:53:27 -08:00
Mike Lockwood
770126a678
Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService
...
In preparation for an upcoming change that will make UsbService into a real system service
Change-Id: Id85d624cfc6b10b49a08105cfaaacc667a492c12
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 22:52:05 -08:00
James Dong
337885be6e
Merge "First step towards renabling Timelapse video recording"
2010-12-09 20:27:59 -08:00
Mike Lockwood
bfd1d72a1a
MTP host: Handle receiving a response packet instead of data packet.
...
This will happen if the device needs to report an error rather than returning the data.
Change-Id: I477512b3676c2f0518a85a4135832ed4475fbc2d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 18:34:18 -08:00
James Dong
08800f3fdc
First step towards renabling Timelapse video recording
...
Change-Id: I93836b066fb69d5152d3774546a9935057a1f12f
2010-12-09 15:37:04 -08:00
Mike Lockwood
ed6f095a83
Merge "CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP"
2010-12-09 13:45:34 -08:00
James Wylder
d285415e8a
libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode
...
Speeds up the decoding leaving more time for cpuidle (lp2),
thus lowering overall current drain.
Change-Id: Ia4e0636b1813810072fe0a4f94f6921adf2eab31
Signed-off-by: James Wylder <james.wylder@motorola.com>
2010-12-09 12:00:58 -08:00
Mike Lockwood
485059de22
CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP
...
Change-Id: Ic5c7810ff4b7e25ba5f49a1107f5121391943108
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 11:45:44 -08:00
Mike Lockwood
51f56cbd30
Merge "MTP: Improve argument checking in SendObjectInfo"
2010-12-08 17:15:22 -08:00
Mike Lockwood
365e03e494
MTP: Improve argument checking in SendObjectInfo
...
In particular, make sure the parent is a folder and make sure file
does not already exist.
Change-Id: Ifa870faba3285f03a92025d9e82f93fed78a761c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-08 16:09:37 -08:00
Andreas Huber
daac81d1f7
Merge "Fix thumbnail extraction for extractors that don't have a preference."
2010-12-08 14:52:11 -08:00
Andreas Huber
b1d49ded62
Fix thumbnail extraction for extractors that don't have a preference.
...
Change-Id: Id305a44416b08a667aae86c2109aa4dff9f17342
2010-12-08 14:50:10 -08:00
Eric Laurent
7b2029be0b
Merge "Fix issue 3159946."
2010-12-08 11:05:28 -08:00
Andreas Huber
f69583cde5
Merge "Better buffer status management and verification in OMXCodec."
2010-12-08 09:09:25 -08:00
Andreas Huber
bbbcf65532
Better buffer status management and verification in OMXCodec.
...
Change-Id: I90410f2ac0d8ff86076a239dc6e281b1bc4d8643
2010-12-08 09:07:28 -08:00
Mike Lockwood
7f889328b7
Merge "MTP: pass format back as default value in GetObjectPropDesc for format property"
2010-12-07 18:57:18 -08:00
Mike Lockwood
a9e67c11c0
Merge "MTP: Support format argument in host GetObjectPropDesc command"
2010-12-07 18:56:58 -08:00
Mike Lockwood
9b5e9c407d
MTP: pass format back as default value in GetObjectPropDesc for format property
...
Change-Id: Icc4071af16763a613c9fb31e87dc716f1516c7d8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 18:53:50 -08:00
Mike Lockwood
a194cc7d8b
MTP: Support format argument in host GetObjectPropDesc command
...
Change-Id: Ic14313c0f95bea1d1d475cc6a001b256fccb91c8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 18:53:04 -08:00
Mike Lockwood
b3f522f34b
Merge "MTP: Read property code before calling isDeviceProperty in MtpProperty::read()"
2010-12-07 17:21:01 -08:00
Mike Lockwood
bf1dbd1938
MTP: Read property code before calling isDeviceProperty in MtpProperty::read()
...
Change-Id: I0b1493f3af5d9caac08327f9ffba91ee255d3d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 17:16:20 -08:00
Mike Lockwood
c7f2f0ab01
Merge "MTP: Improve MtpProperty logging support"
2010-12-07 17:15:02 -08:00
Mike Lockwood
e4880e421f
MTP: Improve MtpProperty logging support
...
Change-Id: I46800b99763edcc5e994d912941f9f5e9b1c94d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 17:13:12 -08:00
Mike Lockwood
9cf29560e8
Merge "MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc"
2010-12-07 17:11:07 -08:00
Mike Lockwood
612ca8781f
Merge "MTP: Use correct return type for getSupportedObjectProperties"
2010-12-07 17:10:43 -08:00
Mike Lockwood
ea4af54093
Merge "Revert "MTP: Remove static library build for linux host.""
2010-12-07 17:10:25 -08:00
Mike Lockwood
ecce2f6d82
Merge "MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property."
2010-12-07 17:10:02 -08:00
Eric Laurent
62ef767b15
Fix issue 3159946.
...
AudioService now uses SCO virtual calls instead of voice recognition to
implement startBluetoothSco() method.
Also make sure that a virtual call is not started when SCO audio is active
due to in call audio or voice recognition.
Change-Id: I93ed119afbc57250a4433201156714e35f70fea4
2010-12-07 15:24:58 -08:00
Mike Lockwood
5768f1089b
MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc
...
Change-Id: I6fd23587597fc68227dfb61118b097eda3e3e1d5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 10:58:56 -08:00
Mike Lockwood
4cb956cc58
MTP: Use correct return type for getSupportedObjectProperties
...
Change-Id: I6d5bd63fecaa3384dfa1b97dbc0d89ea5668981f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 10:51:20 -08:00
Mike Lockwood
87626b1d01
Revert "MTP: Remove static library build for linux host."
...
This reverts commit d46c683f0e13ad9341ba83453835f6658ae5ad15.
Change-Id: I7e56760c92bad1d66d4a1f2415328a4d2138de84
2010-12-07 10:45:22 -08:00
Mike Lockwood
ea93fa16b1
MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property.
...
Return screen size as preferred maximum image size.
Change-Id: I8dc4afb0e49fe45f6925a35aa443d3fc30211453
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-07 10:41:35 -08:00
Andreas Huber
b0fa4f2c6f
Merge "API Support for both synchronous and queued commands, optionally associated metadata."
2010-12-07 10:12:47 -08:00
James Dong
25d7094279
Log the exception cause for better problem analysis
...
Change-Id: Ia1f81adb6fc3be87098c9399509b68d5daf7f2da
2010-12-06 14:41:00 -08:00
James Dong
0efe974ee6
Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created."
2010-12-06 14:18:18 -08:00
Andreas Huber
ae9d507253
API Support for both synchronous and queued commands, optionally associated metadata.
...
Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
2010-12-06 12:45:50 -08:00
Yu Shan Emily Lau
28bec9ebce
Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)"
2010-12-06 10:14:16 -08:00
Andreas Huber
b5590846c0
Squashed commit of the following:
...
commit 9254c845d7c82976fd4b8be406ce4b17eeb0e119
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:26:12 2010 -0800
Remove obsolete code from the cached data source.
Change-Id: I794b986ac8977cbc834dff189221a636ba564e36
commit 2ee33711064c58c53ba65ed9e63dd4b01ec2380e
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:23:13 2010 -0800
LiveSource is dead, long live LiveSession.
Change-Id: Ibcd0731ecf9c94f0b3e5db3d53d012d9da2a1c66
commit 9eabb2c3cd8571ab859bdeae0aa7f655c414d8fa
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 12:49:31 2010 -0800
Respect explicitly signalled discontinuities.
Change-Id: I3c0c16a2de7a99742d25db7d1b2ff0258de52271
commit 7f7f7b6b906b6ece6e4d43af7fd5f494e805c5e5
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 11:45:57 2010 -0800
Better protection against syncword emulation in AAC ADTS content.
Change-Id: I867e80a4556dd46d24ab3e781177c248a5221719
commit fe765766582efcc350aed01135ea603576adccf6
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 09:15:59 2010 -0800
New implementation of http live driving code.
Change-Id: I31ddf3d6a0d5929b121be704a2b9c3d6775f7737
Change-Id: Id8d1829c8fcb173756965013f848c1d426ef1048
2010-12-06 08:28:36 -08:00
James Dong
5df53fe2f0
Remove check if the target video resolution is not supported by CameraSource
...
and clean up Camera is CameraSource could not created.
bug - 3254411
Change-Id: I43497c450e7007de5ce027e2912b1421119e8887
2010-12-05 16:08:30 -08:00
Yu Shan Emily Lau
e8f317d32c
Suppress the unsupported camera recording size (ie QVGA and SQVGA)
...
Change-Id: I34b6433f0aae4a117b2467069523a62e44bf9bbe
2010-12-03 19:32:25 -08:00
James Dong
f6bd1ea0c7
Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()
...
as part of the preparation for publishing MediaMetadataRetriever as public Java API
bug - 2433195
Change-Id: I6e8a771347e3d89bfe359ae403ebfe3205ea6313
2010-12-03 17:14:25 -08:00
James Dong
faf09ba940
Prepare for publishing MediaMetadataRetriever as public API
...
step one:
o replaced captureFrame with getFrameAtTime
o removed getMode
bug - 2433195
Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
2010-12-03 15:32:47 -08:00
James Dong
ded695bb30
Merge "If camera source uses the metadata, we must use HW encoder Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera"
2010-12-02 15:01:46 -08:00
Gil Dobjanschi
f3332a1d87
Merge "Remove the VideoEditorTestImpl"
2010-12-02 14:55:48 -08:00
James Dong
6312dd6d2b
If camera source uses the metadata, we must use HW encoder
...
Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera
bug - 3242213
Change-Id: I97361ed88b2a687190e5129459011afff7f32c2d
2010-12-02 14:50:07 -08:00
Andreas Huber
0a218eab61
Merge "Squashed commit of the following:"
2010-12-02 14:04:55 -08:00
Gil Dobjanschi
731e46575a
Remove the VideoEditorTestImpl
...
Change-Id: I16302716f4aa32f69f48c9f4cc5732b421c1a675
2010-12-02 13:50:49 -08:00
Gil Dobjanschi
cd023f98fa
Merge "Added a callback interface to the generatePreview method."
2010-12-02 13:39:06 -08:00
Andreas Huber
b5c6afc208
Squashed commit of the following:
...
commit de99ae4a523ff5ec40b47071f22fdde1a4b2a0bf
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:18:40 2010 -0800
Scan for sync words to find H.264 frame/AAC frame boundaries if PES packets do not start with them.
Change-Id: If2861982ecb3006fac806105dbfcd1d43c2a4205
commit be23791ff0d037aa7073589cdc8bfc362e1c281d
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:12:39 2010 -0800
Properly expand relative key URLs and strip surrounding quotes in the M3UParser.
Change-Id: I013a6d83a64f095d090e5c7730298bdac7d03ab4
commit 0f1d8f65effe0cc42a265dd91d8b91dce6534325
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:11:27 2010 -0800
Ugly hack that assumes that any http url containing "m3u8" refers to an httplive stream.
Change-Id: I05d7bbc5dab0f9822558122b5b9dc2a109ed8518
commit 255f0d5cdb1072ecd66b47ee614bf574f1388e5a
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:10:56 2010 -0800
Add one more mimetype "application/x-mpegurl" to identify httplive playlists.
Change-Id: I63fd3b8c2539c9ee23c077df533157af78b10863
Change-Id: I135687383009dbe32d690c9ba8dea60159adc616
2010-12-02 13:27:47 -08:00