Dharmaray Kundargi
7a58635e84
am 666b9eb3: am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '666b9eb3a260034c85e2a6eaa5e8f4ceea968f33':
Overlay java files Issue 3370836
2011-01-26 12:52:05 -08:00
Dharmaray Kundargi
5af2ce4c5f
am 81bebad0: am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit '81bebad0f1fa0bda5a74e4e78b43bd94bd94bf40':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:51:58 -08:00
Dharmaray Kundargi
666b9eb3a2
am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
Overlay java files Issue 3370836
2011-01-26 12:48:32 -08:00
Dharmaray Kundargi
81bebad0f1
am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit 'ecebf173deca568aa44f4fc29968e10c78ad7571':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:48:28 -08:00
Dharmaray Kundargi
45e3d123bc
Merge "Overlay java files Issue 3370836" into honeycomb
2011-01-26 12:46:23 -08:00
Dharmaray Kundargi
ecebf173de
Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
2011-01-26 12:46:20 -08:00
Andreas Huber
17c914a067
am 11934aa3: am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
...
* commit '11934aa32102d56ea920b058cb3cc9a455cd2232':
More instrumentation to track down the hardware decoder not shutting down bug.
2011-01-26 12:12:33 -08:00
Andreas Huber
bd36c2230b
am 1a6e6d55: am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
...
* commit '1a6e6d55b8dd33b3bd2b52849d39ef96b556b52f':
Ignore errors returned from native_window_set_crop.
2011-01-26 12:12:28 -08:00
James Dong
5f3ab06e90
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
...
This will fix the stop failure issue where we have to wait n * time_interval before a key frame can be received by the file writer, where
o n is the actual number of buffers advertised by the video encoder
o time_interval is the interval settings for timelapse video recording
specifying the time distance between neighboring input video frames
The fix includes two parts:
o OMXCodec will not submit all n buffers at one time, but instead submit one input
frame at one time if it become available.
o Timelapse camera source made available the first two input frames and do not skip
them so that the first compressed output frame data can be received regardless
the specified time_interval
bug - 3367659
Change-Id: Ia68cc2cb0d71aa7dc54540e9ad82fae911ad530b
2011-01-26 12:11:22 -08:00
Andreas Huber
11934aa321
am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
...
* commit '373d357a8b13dc2cdc82d9e1d6144fb26e3bb202':
More instrumentation to track down the hardware decoder not shutting down bug.
2011-01-26 12:10:00 -08:00
Andreas Huber
1a6e6d55b8
am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
...
* commit '6df89fde0db446bb530ab872b373b1faa3ccb06c':
Ignore errors returned from native_window_set_crop.
2011-01-26 12:09:56 -08:00
Andreas Huber
373d357a8b
Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
2011-01-26 12:08:09 -08:00
Andreas Huber
06be3b14c9
More instrumentation to track down the hardware decoder not shutting down bug.
...
Change-Id: I3f31b6fdf5c90b436567bbce578dcbc4666ed7c2
related-to-bug: 3362836
2011-01-26 12:04:06 -08:00
Andreas Huber
00d6c725ec
Ignore errors returned from native_window_set_crop.
...
If the surface is already invalid, we'll know soon enough.
Change-Id: If360ffb8293817afb47df8c1a75722aea74bb335
related-to-bug: 3394601
2011-01-26 12:02:35 -08:00
Andreas Huber
dca5cb3204
am 38a1714b: am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
...
* commit '38a1714bf79821dad296eeddfda1b6a7ce93ebbd':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
2011-01-26 11:48:07 -08:00
Andreas Huber
36fc650bd8
am 807398e7: am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
...
* commit '807398e7f0718aaa9e8f53c556d0707c083819cf':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
2011-01-26 11:48:01 -08:00
Andreas Huber
38a1714bf7
am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
...
* commit '7765c65dbe1ba8f2229f2fec5a83ba2d1da79733':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
2011-01-26 11:44:11 -08:00
Andreas Huber
807398e7f0
am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
...
* commit 'd030359ff10a031c762d4f229d9c1bdfd366cb50':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
2011-01-26 11:43:50 -08:00
Dharmaray Kundargi
9c077e44c0
Overlay java files Issue 3370836
...
Change-Id: If062ad12dc2f5faf58936436527234ce80dffad9
2011-01-26 11:35:29 -08:00
Andreas Huber
7765c65dbe
Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
2011-01-26 11:24:13 -08:00
Andreas Huber
4aeec2da39
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
...
Change-Id: I9aa797cf5bb58eefed51d732f4e5d09450551158
related-to-bug: 3347428
2011-01-26 10:41:38 -08:00
Andreas Huber
231640950e
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
...
Change-Id: Id53e7831761619f72ddc61f63571230011c93f16
related-to-bug: 3362836
2011-01-26 10:14:38 -08:00
Dharmaray Kundargi
c16ccc1c5a
Fix for Issue 3370836 : JNI files for Overlay optmization.
...
Change-Id: I3d7a0248bfd75bbd7c23321e22c3c331eb33ddd2
2011-01-26 00:27:58 -08:00
Santosh Madhava
ae27549f83
am c4132eb2: am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb
...
* commit 'c4132eb299d52575c3a5f4a9361f62f1737ad64e':
Review rework for issue 3385068 : Play gets out of sync
2011-01-25 22:48:57 -08:00
Santosh Madhava
c4132eb299
am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb
...
* commit '4991a00b28ea17941681396ec5dfc62a53408158':
Review rework for issue 3385068 : Play gets out of sync
2011-01-25 22:46:41 -08:00
Santosh Madhava
4991a00b28
Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb
2011-01-25 22:44:07 -08:00
Santosh Madhava
3cf1554b76
am 7196a266: am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb
...
* commit '7196a266c5967f64a858519c5fe71f0964035390':
Fix for issue 3366265 : Native crash exporting movie
2011-01-25 22:24:21 -08:00
Santosh Madhava
7196a266c5
am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb
...
* commit 'b38ed1af92c6af03249a50fed0530d20de5cd14d':
Fix for issue 3366265 : Native crash exporting movie
2011-01-25 22:21:42 -08:00
Santosh Madhava
1abe0050fa
Fix for issue 3366265 : Native crash exporting movie
...
Change-Id: I04195198031eeb7d34d4249b49a1092321a2eb0a
2011-01-25 20:41:55 -08:00
Dheeraj Sharma
53df92d84e
am d28bb6e2: am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb
...
* commit 'd28bb6e279c17224e843101199d228fe5aad459d':
VideoEditor:Fix for 3369908
2011-01-25 20:38:58 -08:00
Dheeraj Sharma
d28bb6e279
am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb
...
* commit '2aaa776429f58069e25c8160a9e5b9a969f6e993':
VideoEditor:Fix for 3369908
2011-01-25 20:36:26 -08:00
Dheeraj Sharma
2aaa776429
Merge "VideoEditor:Fix for 3369908" into honeycomb
2011-01-25 20:34:15 -08:00
Santosh Madhava
de412d277c
Review rework for issue 3385068 : Play gets out of sync
...
Change-Id: I7f7435bd898a72302500cdc15874e469922cbebe
2011-01-25 20:22:41 -08:00
Mike Lockwood
2c91b5699e
am c80daa1b: am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
...
* commit 'c80daa1b05b8f1d2873df23821ae2c5344e76fb8':
StagefrightMediaScanner: Close metadata retriever after we are done scanning
2011-01-25 16:20:56 -08:00
Mike Lockwood
501e52f09d
am 7fadb5e7: am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
...
* commit '7fadb5e77fd079c3a6c5eeae1ae81a487864b129':
MTP: Fix race conditions in MtpServer JNI code
2011-01-25 16:20:50 -08:00
James Dong
7ae6dac845
am 45800cf9: am 3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb
...
* commit '45800cf939d716a6d6435872f5f876b2cfd2689d':
Report errors to applications if AudioRecord->start() fails
2011-01-25 16:20:34 -08:00
Santosh Madhava
4a39e8ad70
am d6451721: am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb
...
* commit 'd645172123f6aac530986ede22fae13f647ccb9f':
Fix for issue 3385068 : Play gets out of sync
2011-01-25 16:19:17 -08:00
Mike Lockwood
c80daa1b05
am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
...
* commit 'f10d940413000732f1cd35bcb113c41019c7e3b7':
StagefrightMediaScanner: Close metadata retriever after we are done scanning
2011-01-25 15:48:06 -08:00
Mike Lockwood
f10d940413
Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
2011-01-25 15:46:25 -08:00
Mike Lockwood
7fadb5e77f
am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
...
* commit '2b3da7ab61ac920881f35bbf66234c073d79ba24':
MTP: Fix race conditions in MtpServer JNI code
2011-01-25 15:45:48 -08:00
Mike Lockwood
2b3da7ab61
Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
2011-01-25 15:44:28 -08:00
James Dong
45800cf939
am 3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb
...
* commit '3115dad3fc8493ff510b9f6a46b18d951bf5c162':
Report errors to applications if AudioRecord->start() fails
2011-01-25 15:33:27 -08:00
James Dong
d7ef5b6feb
Report errors to applications if AudioRecord->start() fails
...
bug - 3385198
Change-Id: I86ac8071eb28a538b333e102192193d1b9eda5eb
2011-01-25 15:30:34 -08:00
Yu Shan Emily Lau
18bb1ce02f
am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
...
* commit '2af4e71dd47565d794ad48041a156871396a7dde':
Fix the test application orientation. Bug# 3205196
2011-01-25 15:21:41 -08:00
Mike Lockwood
8151dc3229
StagefrightMediaScanner: Close metadata retriever after we are done scanning
...
This prevents the mediaserver from leaking a file descriptor after
the media scanner runs
BUG: 3373546
Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-25 15:20:04 -08:00
Mike Lockwood
071b2b6739
MTP: Fix race conditions in MtpServer JNI code
...
Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.
BUG: 3317803
Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-25 15:10:31 -08:00
Glenn Kasten
164fddfeae
Merge "Bug 3117154"
2011-01-25 15:06:20 -08:00
Santosh Madhava
d645172123
am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb
...
* commit '1c9ac91634f7663b7a199f6eacc5a363f888e4d4':
Fix for issue 3385068 : Play gets out of sync
2011-01-25 14:48:28 -08:00
Santosh Madhava
1c9ac91634
Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb
2011-01-25 14:46:15 -08:00
Jaikumar Ganesh
da6e64a6b4
am e4d494b4: am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
...
* commit 'e4d494b49548eca62bf665fd5954c90731fd18e3':
Rename virtual call API to ScoUsingVirtualCall.
2011-01-25 14:07:12 -08:00