drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,873 Commits 1 Branch 0 Tags
Commit Graph

3926 Commits

Author SHA1 Message Date
Basavapatna Dattaguru
141a2adb25 am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 
* commit '3b728ca70a4fe6760b682589505d76848c47d765':
  Revert "Fixes Issue ID: 3396697"
 2011-01-26 22:52:31 -08:00
Basavapatna Dattaguru
89378fd166 Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb 2011-01-26 22:50:59 -08:00
Basavapatna Dattaguru
3b728ca70a Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 2011-01-26 22:50:50 -08:00
Basavapatna Dattaguru
d36b1f0739 Revert "Video editor CTS: Framework modifications" 
This reverts commit eb6d6ecf4ba7a3965ce6ab178dce48eb9416bfc7.
 2011-01-26 22:38:47 -08:00
Basavapatna Dattaguru
4b9969af57 Revert "Fixes Issue ID: 3396697" 
This reverts commit 8b9ba616444a265df6cd2b4f4a0a39d808c65ade.
 2011-01-26 22:36:10 -08:00
Basavapatna Dattaguru
e9ad1bf4ed am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
  Video editor CTS: Framework modifications
 2011-01-26 21:54:16 -08:00
Basavapatna Dattaguru
497c56f67f am 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21':
  Fixes Issue ID: 3396697
 2011-01-26 21:52:02 -08:00
Basavapatna Dattaguru
a33537c3f1 am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
  Video editor CTS: Framework modifications
 2011-01-26 21:51:49 -08:00
Basavapatna Dattaguru
55bf9bdbcb am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '643e8476e1b9da93a06d073797863298ae268393':
  Fixes Issue ID: 3396697
 2011-01-26 21:49:34 -08:00
Basavapatna Dattaguru
9af5da5258 Merge "Video editor CTS: Framework modifications" into honeycomb 2011-01-26 21:48:02 -08:00
Basavapatna Dattaguru
643e8476e1 Merge "Fixes Issue ID: 3396697" into honeycomb 2011-01-26 21:47:40 -08:00
James Dong
d4d138a064 am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb 
* commit 'f1e687b6e31ba4597558de94c40a73a074ba7703':
  Eliminate duplicated code in export method
 2011-01-26 21:20:16 -08:00
James Dong
f1e687b6e3 am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb 
* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
  Eliminate duplicated code in export method
 2011-01-26 21:15:37 -08:00
Basavapatna Dattaguru
eb6d6ecf4b Video editor CTS: Framework modifications 
Fixes Issue ID: 3396697

Copyright changed to 2011

Change-Id: I1b69c6903bb6b0434eb93337783f93c92fd20899
 2011-01-26 20:58:56 -08:00
Basavapatna Dattaguru
8b9ba61644 Fixes Issue ID: 3396697 
Updated with annotation LargeTest

Copyright changed to 2011

Review reworked and with new test contents

Video Editor CTS Test code

Change-Id: Ia37956ef39fafcc5d969996c1791fce8663aa0fe
 2011-01-26 20:31:11 -08:00
James Dong
20586a128c Eliminate duplicated code in export method 
bug - 3385135

Change-Id: I26b8113b457bf08bf8a89cef25cf45cdba79c08d
 2011-01-26 20:15:49 -08:00
Andreas Huber
edbf4b3b21 am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb 
* commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb':
  This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-26 19:06:43 -08:00
Andreas Huber
bba92023e5 am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb 
* commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
  This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-26 15:52:48 -08:00
Andreas Huber
63b38e31aa Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb 2011-01-26 15:50:04 -08:00
Andreas Huber
0f535afd7e This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. 
And now we're just ignoring them. Yay standards.

Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35
related-to-bug: 3353752
 2011-01-26 15:40:56 -08:00
Mike Lockwood
82cb6731a0 am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb 
* commit 'bd65c065b2dcb54dde563a8a21c9f92da947c7dd':
  MTP: Fix month off by one error in date parsing and formatting code
 2011-01-26 15:34:15 -08:00
Mike Lockwood
bd65c065b2 am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb 
* commit 'a13732e17a0f3d69df9c418407985b3ad64b1852':
  MTP: Fix month off by one error in date parsing and formatting code
 2011-01-26 15:32:11 -08:00
Mike Lockwood
a13732e17a Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb 2011-01-26 15:30:07 -08:00
Mike Lockwood
2107d23fc9 MTP: Fix month off by one error in date parsing and formatting code 
BUG: 3379100

Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-26 15:11:48 -08:00
James Dong
804d8798d5 am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb 
* commit '8bea1d5585822bb62996e789f59c7629dfd9ac50':
  Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
 2011-01-26 14:49:23 -08:00
James Dong
8bea1d5585 am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb 
* commit '7fb232c40cde91d0958be1694db2d97a126b95f9':
  Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
 2011-01-26 14:45:41 -08:00
James Dong
7fb232c40c Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb 2011-01-26 14:43:59 -08:00
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