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

3346 Commits

Author SHA1 Message Date
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
Gil Dobjanschi
786ecf849c Added a callback interface to the generatePreview method. 
Change-Id: I7ba678aba47f232e1c320bb36decf59f80f3755d
 2010-12-02 13:13:15 -08:00
James Dong
6785699f19 am 80639875: am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread 
* commit '806398755fdc63438b607856574e5b885ad98e6b':
  Be conservative in estimating the file size limit.
 2010-12-02 10:24:24 -08:00
James Dong
806398755f am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread 
* commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74':
  Be conservative in estimating the file size limit.
 2010-12-02 10:21:06 -08:00
Mike Lockwood
f45853af50 MediaScanner: Fix path mismatch in code that check for missing files in postScan() 
BUG: 3213640

Change-Id: I102d6c9ae95adadb855e2199380117808ccaa1ee
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-02 10:35:49 -05:00
Mike Lockwood
7d7fb63071 MTP: Add support for multiple properties in GetObjectPropList command 
Change-Id: Ib469a6c8141937aaa3e811345056195117abb4b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-02 08:16:12 -05:00
Eric Laurent
938f2577e6 am 371ed722: am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread 
* commit '371ed72216789505acadfac3f2e905dafb04f6e0':
  Update java doc for visualizer FFT capture.
 2010-12-01 03:37:07 -08:00
James Dong
5cdcf16ec7 Be conservative in estimating the file size limit. 
bug - 3045580

Change-Id: Ifdffa354b9433639c3f246a0eb581ef14af1e797
 2010-11-30 18:18:08 -08:00
Chia-chi Yeh
1981674771 am 4f93f08d: am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread 
* commit '4f93f08d8c8b8067ff2176d9ec15c76c0e4cc0c2':
  Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
 2010-11-30 16:23:40 -08:00
Andreas Huber
b460779cff am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread 
* commit '30c818444d876dd868b84adec2416308c90f32e3':
  DO NOT MERGE Support for "chunked" HTTP transfer encoding.
 2010-11-30 14:32:09 -08:00
Andreas Huber
30c818444d Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread 2010-11-30 14:30:00 -08:00
Andreas Huber
9157478dcf am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread 
* commit 'a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb':
  DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
 2010-11-30 14:08:56 -08:00
Andreas Huber
a41c1e1de0 Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread 2010-11-30 14:06:26 -08:00
Andreas Huber
d208a2c7b0 DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback. 
DO NOT MERGE
related-to-bug: 3141937

Change-Id: Iaf1b0c5d45a6b5bb7624a59747041c27b4dde83b
 2010-11-30 13:42:50 -08:00
Andreas Huber
8d023ddcd4 DO NOT MERGE Support for "chunked" HTTP transfer encoding. 
DO NOT MERGE

Change-Id: I253d48ea69f239a6d3d0bb7e0d31eef5c773a9d6
related-to-bug: 3205131
 2010-11-30 13:37:01 -08:00
Andreas Huber
aeaa3b3c6a am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread 
* commit '567b2bd1469b1c37e6249637d313253b7d84971e':
  After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
 2010-11-30 13:07:56 -08:00
Andreas Huber
567b2bd146 Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread 2010-11-30 13:00:14 -08:00
Eric Laurent
371ed72216 am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread 
* commit '688f4c58d4a7590ad47c219af3a5b8479d3a084d':
  Update java doc for visualizer FFT capture.
 2010-11-30 11:56:00 -08:00
Andreas Huber
3a2dc0d573 am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread 
* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
  DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
 2010-11-30 11:53:01 -08:00
Eric Laurent
688f4c58d4 Merge "Update java doc for visualizer FFT capture." into gingerbread 2010-11-30 11:50:25 -08:00
Andreas Huber
0fb258d6c3 After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user. 
Change-Id: Ifb1f8c91e95a5cafe30ae1035973316c210b98a5
related-to-bug: 3152363
 2010-11-30 11:46:38 -08:00
Chia-chi Yeh
4f93f08d8c am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread 
* commit '683a7ff922409d2aa6c944bc4e08de32029e80e5':
  Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
 2010-11-30 11:45:54 -08:00
Andreas Huber
122a9ccbcd DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client. 
Change-Id: Ibb14e5aff20920da4917d85de38ba3a8ee71d0bd
related-to-bug: 3188835
 2010-11-30 10:50:25 -08:00
Mike Lockwood
84e3916720 Merge "MTP: Don't fail in playlist transfer if not all playlist items can be found." 2010-11-30 09:22:00 -08:00
Mike Lockwood
50225445f8 Merge "MTP: Make sure buffer is big enough before reading the data packet" 2010-11-30 09:21:19 -08:00
Mike Lockwood
7adfd1896c MTP: Don't fail in playlist transfer if not all playlist items can be found. 
Change-Id: I8275c4e5eca34e193a3cedcba16442bf388e74eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-30 12:19:50 -05:00
Mike Lockwood
9dfc7de2cc MTP: Make sure buffer is big enough before reading the data packet 
Fixes buffer overflow when transferring large playlists.

Change-Id: I1b7feaf9e56d849e5b6609f0f68a6aa5a3ae1ea8
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-30 12:19:41 -05:00
Chia-chi Yeh
683a7ff922 Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread 2010-11-29 22:56:56 -08:00
James Dong
7411c1b836 Renable the captureFrame unit tests 
o We need to make sure that
  /sdcard/media_api/metadata rwx to the test app
  before tests

Change-Id: Iaa2d58bb2d380bf7e93ec71f77c4c769d65b1d85
 2010-11-29 12:59:39 -08:00
Gloria Wang
c584428795 Remove empty Widevine make files 
Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
 2010-11-24 15:39:20 -08:00
Shyam Pallapothu
ca3c639cc4 Merge "Added new bitrate values" 2010-11-24 14:14:28 -08:00
Gil Dobjanschi
83cd9dcf98 Added new bitrate values 
Change-Id: I2e6ab51d9a845beca02f84cefc66663fbf89aabf
 2010-11-24 11:16:38 -08:00
Andreas Huber
6bdbcd748e Merge "Support streaming data across binder boundaries." 2010-11-24 10:58:46 -08:00
Mike Lockwood
2ed9910d55 Merge changes Ia5fec45a,I74927f73,I5a3c0b07 
* changes:
  MTP: Fix typo in MtpServer::doGetObjectPropList
  MTP: Implement GetPartialObject command
  MTP: Use DateTime form in GetObjectPropDesc for date/time properties.
 2010-11-23 16:11:29 -08:00
Mike Lockwood
e3634c3a80 MTP: Fix typo in MtpServer::doGetObjectPropList 
Change-Id: Ia5fec45a238c49a6797a4ac55457ddb5d6521408
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 18:45:25 -05:00
Mike Lockwood
44e82ddaec MTP: Implement GetPartialObject command 
Allows host to read partial contents of files on the device

Change-Id: I74927f7394224d674e1d150a4b72a51d9358459b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 18:45:01 -05:00
Mike Lockwood
5b19af05f2 MTP: Use DateTime form in GetObjectPropDesc for date/time properties. 
Change-Id: I5a3c0b07a9f2958b86947256606e6a824dbe93a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 18:38:55 -05:00
Andreas Huber
52b52cdfb7 Support streaming data across binder boundaries. 
Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
 2010-11-23 14:46:13 -08:00
James Dong
9fff216da9 Merge "Do not getConfig on video encoder on output port" 2010-11-23 13:38:18 -08:00
James Dong
0c9153df10 Do not getConfig on video encoder on output port 
Change-Id: Id53e01dd8f3ec0c9ca94bb1d6dfccd7696254a2d
 2010-11-23 11:44:51 -08:00
Mike Lockwood
5a2755d0c9 Rename MtpCursor to PtpCursor 
Change-Id: I8ce257641388b195f3e17995d323355b19355dc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 12:25:49 -05:00
Mike Lockwood
d46c683f0e MTP: Remove static library build for linux host. 
Change-Id: Iefdd386b91dba0579ca952aca40b7114535e1d4e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 10:30:31 -05:00
Mike Lockwood
c0b8b321d5 Rename MtpClient and MtpCursor to PtpClient and PtpCursor 
Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 10:30:31 -05:00
Mike Lockwood
a31560598a Rename android.provider.Mtp to android.provider.Ptp 
We are only supporting the PTP subset of MTP in host mode and have
no plans for full MTP, so calling it Mtp was misleading.

Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore
and added it to the public API.

Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 10:30:31 -05:00