236 Commits

Author SHA1 Message Date
Mike Lockwood
bc20c93863 Merge "MTP: Fix JNI warnings in MtpDevice" 2011-02-11 05:21:26 -08:00
Mike Lockwood
40304e2272 MTP: Fix JNI warnings in MtpDevice
Needed to add a global ref to the classse to avoid
"not a valid JNI reference" errors when calling the constructor.

Change-Id: Ieb7e69f5d19fd5a090c53d32f69a201040c49112
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-11 08:19:11 -05:00
Santosh Madhava
91ba3a0033 Fix for 3431967: Memory leak from video editor engine in JNI
Change-Id: If879bbcf68d01fea0995be0faf070b6dd7361218
2011-02-09 19:25:17 -08:00
Danny Fernandes
5bdbb562ee am 7d913d43: am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb
* commit '7d913d4350230afba8dea55718d887cf967d1ab2':
  Fixed 3423072 Imported 1080x720 video clips present distorted view
2011-02-07 13:49:25 -08:00
Dheeraj Sharma
0b180a7fae am d5924e9d: am 67ec9aa8: Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
* commit 'd5924e9d3a370c2816613d4420b622b857da4f00':
  Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
2011-02-07 13:43:02 -08:00
Dheeraj Sharma
4d3cd2c23e am 6a9cb7dd: am e05c33fe: Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb
* commit '6a9cb7ddec346145b4563e06ff0940199758f888':
  Modification for using Software decoder for thumbnail generation in JNI
2011-02-07 13:42:06 -08:00
Danny Fernandes
6ef407c0e6 Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb 2011-02-04 16:52:10 -08:00
Danny Fernandes
69e868dcab Fixed 3423072 Imported 1080x720 video clips present distorted view
Change-Id: If4f4039c516eb77423dd590e8634a2d4a05d4622
2011-02-04 16:08:07 -08:00
Dheeraj Sharma
67ec9aa878 Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
Change-Id: Ie9cf769e42869b5cab57694e92884900d33f40d9
2011-02-04 02:31:45 -08:00
Dheeraj Sharma
b62d78bd0d Modification for using Software decoder for thumbnail generation in JNI
Change-Id: Ie3dd5a28311627fd0b559bc3d4e28d2f668ccc61
2011-02-03 23:20:07 -08:00
Dharmaray Kundargi
8930a1259d am 2fa861cc: am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb
* commit '2fa861cc6ef65696854dc4a85494bea6dd87fd8e':
  Fix issue 3408285 Crash while generating KenBurns
2011-02-02 13:22:29 -08:00
Nemmara Venkateswaran
bf1e5cefe2 am e00d44ce: am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb
* commit 'e00d44ced228dc523f4492edd66d4eeb5dabd305':
  Fix for issue 3370023 : Wrong aspect ratio in overlay
2011-02-02 09:31:35 -08:00
Dharmaray Kundargi
beb9fc8ee8 Fix issue 3408285 Crash while generating KenBurns
Change-Id: Iaa207229e2c699e1d374b424893bcf252c6614f3
2011-02-02 03:25:01 -08:00
Santosh Madhava
63298a9809 Fix for issue 3370023 : Wrong aspect ratio in overlay
Change-Id: I65bdfb2b5c9edc26de94052e21b8f55ec8671f6a
2011-02-02 01:38:45 -08:00
Dharmaray Kundargi
13c0552643 am e9c5ade3: am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.
* commit 'e9c5ade37168e43203c060635c66dbd4de2ae458':
  Fix issue 3414805 Crash during Overlay editing. JNI fixes.
2011-02-01 20:44:33 -08:00
Dharmaray Kundargi
c08f85a648 Fix issue 3414805 Crash during Overlay editing. JNI fixes.
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
2011-02-01 20:19:16 -08:00
Dheeraj Sharma
3a70cf3aff am 60a3ead5: am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb
* commit '60a3ead52ec6216b28d1d82ab3480a08bf919c17':
  Fix for issue 3404671 Crash when exporting movie in JNI
2011-01-30 18:18:43 -08:00
Dheeraj Sharma
cd73d1ed6d Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 2011-01-30 18:12:25 -08:00
Dharmaray Kundargi
8e6c69b092 am 75aa290d: am ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit '75aa290d5d23a9bb862e409f9b5de23a0ffda579':
  Merging the same files on top of tree.
2011-01-30 16:37:41 -08:00
Dharmaray Kundargi
4e70320521 Merging the same files on top of tree.
Add support for .m4v Issue 3395600

Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
2011-01-30 16:17:53 -08:00
Dheeraj Sharma
407a558af5 am 471ebbca: am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
* commit '471ebbca5f404062bed232aa27da9c1f1ebf0a1d':
  Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
2011-01-30 15:25:07 -08:00
Dheeraj Sharma
9803b8435e Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
2011-01-30 12:50:23 -08:00
Dheeraj Sharma
5618e037af Fix for issue 3404671 Crash when exporting movie in JNI
Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
2011-01-29 21:29:49 -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
c16ccc1c5a Fix for Issue 3370836 : JNI files for Overlay optmization.
Change-Id: I3d7a0248bfd75bbd7c23321e22c3c331eb33ddd2
2011-01-26 00:27:58 -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
2aaa776429 Merge "VideoEditor:Fix for 3369908" into honeycomb 2011-01-25 20:34:15 -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
Mike Lockwood
2b3da7ab61 Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 2011-01-25 15:44:28 -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
Dheeraj Sharma
454693d3f6 am 4ba9e68f: am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb
* commit '4ba9e68fa95c59e4f2c7c6b17a663b10a5405f45':
  Video Editor:Fix for 3375632
2011-01-25 12:55:36 -08:00
Dheeraj Sharma
b894210882 Merge "Video Editor:Fix for 3375632" into honeycomb 2011-01-25 12:50:34 -08:00
Dheeraj Sharma
244d6d3c8b am 08902803: am a2edecfe: Merge "Issue no : 3370622" into honeycomb
* commit '08902803458faa74fd9aeaec2d9de35046912ed0':
  Issue no : 3370622
2011-01-24 23:09:22 -08:00
Dheeraj Sharma
1ac760afab Issue no : 3370622
VideoEditor: Fix for Clear Surface API

Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
2011-01-24 22:52:40 -08:00
Gil Dobjanschi
dc5b1762da am 6c170ecc: am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into honeycomb
* commit '6c170eccf2864e526a145c91102b204cb787c860':
  VideoEditor:Clear Surface API addition
2011-01-24 13:27:07 -08:00
Dheeraj Sharma
05d9f81bd6 VideoEditor:Clear Surface API addition
Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
2011-01-23 21:41:34 -08:00
Dheeraj Sharma
474cb4d2d5 VideoEditor:Fix for 3369908
Change-Id: Ic28d1c96a681dcc56d4432e10dffc273029e1c85
2011-01-23 14:21:18 -08:00
Dheeraj Sharma
b21827d1bc Video Editor:Fix for 3375632
Change-Id: I354b8b653ea0ccddda49a6e530ad63b5bd44a5b2
2011-01-23 11:55:47 -08:00
Mike Lockwood
47063a859a Merge "New APIs for MTP and PTP host support" 2011-01-22 15:59:28 -08:00
Mike Lockwood
8182e72479 New APIs for MTP and PTP host support
This replaces the previous ContentProvider based interface

Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-22 15:56:09 -08:00
Mike Lockwood
2d044d1ff9 Merge "Remove MTP related log spam" into honeycomb 2011-01-22 14:35:39 -08:00
Mike Lockwood
f26a586c86 Remove MTP related log spam
Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-21 21:00:54 -08:00
Carl Shapiro
8f995b5f6d Remove dead code referencing an obsolete interface.
Bug: 3378919

Change-Id: I780d98492ea7996187e3d97fcae7748f7ee68e91
2011-01-21 16:10:08 -08:00
Carl Shapiro
ae12a50a35 Perform orthogonal rotations without using a Skia canvas.
Bug: 3371653

Change-Id: I315f671c0016f61417ff7c2a98d2c96f6b243bdf
2011-01-21 14:45:14 -08:00
Dharmaray Kundargi
fe93351cf1 Merge "remove eng developement local tags in make file" into honeycomb 2011-01-19 14:02:12 -08:00
Dharmaray Kundargi
6dbd3ee67b remove eng developement local tags in make file
Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
2011-01-19 12:14:46 -08:00
James Dong
581cad2221 Turn error/exception logging on at the native layer
o also fixed some compilation warnings

Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
2011-01-19 11:42:53 -08:00
Mike Lockwood
897f894e88 MTP: Close and reopen driver file after an error.
BUG: 3368665

Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-19 10:11:28 -08:00
Mike Lockwood
a1c9180461 MTP: Fix problem with MTP starting up on the first try.
BUG: 3361230

Change-Id: Ibc2e8adf24a14ea18385b306e786a77983ff8f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 20:11:29 -08:00
James Dong
0a3dbf6f69 Merge "Fix the build break in git_master-without-vendor" into honeycomb 2011-01-18 13:26:14 -08:00