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

2436 Commits

Author SHA1 Message Date
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
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
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
Gloria Wang
3e18dfab34 am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts" 
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
  Notify the playback status to DRM agents before the playback starts
 2010-11-22 21:26:13 -08:00
Gloria Wang
95dbffb241 Notify the playback status to DRM agents before the playback starts 
Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
 2010-11-22 11:03:51 -08:00
Jean-Baptiste Queru
716f60ce60 resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp 
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
 2010-11-19 16:21:31 -08:00
Jean-Baptiste Queru
f69f356eba am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*" 
* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
  build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
 2010-11-19 10:24:51 -08:00
Hiroshi Takekawa
dc1a26eb78 StagefrightMediaScanner: Call endFile() for MIDI and OGG files. 
addStringTag() caches non-ascii metadata strings for later
processing, and then endFile() will be called at the end of
processFile() to convert non-ascii strings from locale's charset
to utf-8 if required.

Stagefright's processFile() failed to call endFile() when the
processing file is a MIDI file or an OGG file.  This patch fixes
this problem to populate metadata correctly.

Reviewed by: Brad Fitzpatrick, Marco Nelissen.

Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
 2010-11-19 12:14:37 +09:00
Matthias Bady
b61d530575 build failed with g++ v. 4.4.5 
err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’
strrchr provides two prototypes. the one used returns const char* instead of char*

Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
 2010-11-18 00:22:48 +01:00
Wu-cheng Li
482083c57f am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do not merge 
* commit 'f6bd761f9407a35cc1c4a4b9e199e6a0dc8e4943':
  Use back-facing camera as default in camera/camcorder profile.do not merge
 2010-11-08 23:56:20 -08:00
Wu-cheng Li
f6bd761f94 Use back-facing camera as default in camera/camcorder profile.do not merge 
bug:3173302
Change-Id: I11eaed32bb393206b560834d52c412f3e5a1a7d9
 2010-11-09 14:11:45 +08:00
James Dong
9cebb86c95 am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread 
* commit '1b2efbca7120cf799d1242d277af354df7b0a9bb':
  Update a comment about when setOrientationHint() should be called
 2010-11-08 20:14:19 -08:00
James Dong
1b2efbca71 Merge "Update a comment about when setOrientationHint() should be called" into gingerbread 2010-11-08 19:59:16 -08:00
James Dong
c4a2ead2aa am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread 
* commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e':
  Support extracting thumbnail from rotated video tracks
 2010-11-08 18:19:40 -08:00
James Dong
53ebc72fd8 Support extracting thumbnail from rotated video tracks 
Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
 2010-11-08 16:52:59 -08:00
Andreas Huber
2e1a896724 resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp 
Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
 2010-11-08 11:56:08 -08:00
James Dong
5aa95dd36c Update a comment about when setOrientationHint() should be called 
Change-Id: I389089390a552ee7a86823c050048dcec0a0eb2a
 2010-11-08 10:36:53 -08:00
James Dong
d8166a719e am 1653e261: Merge "Rotation support" into gingerbread 
* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
  Rotation support
 2010-11-06 14:22:05 -07:00
James Dong
bb97d7bbf3 am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread 
* commit '0467b0abfc94f959163d84eadedf6941e41c1882':
  Add a new public API to support recording rotated videos
 2010-11-06 14:21:53 -07:00
Andreas Huber
31dc911aee Support post-decode video rotation. 
Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
 2010-11-05 17:03:17 -07:00
James Dong
1653e261e8 Merge "Rotation support" into gingerbread 2010-11-05 16:58:51 -07:00
James Dong
ad8f19c6b3 Add a new public API to support recording rotated videos 
o changed a comment about the rotation orientation from counter-clockwise
  to clockwise.

Change-Id: I16ad73ce1a55cc627d9a516e23d1325753b3037e
 2010-11-05 15:53:00 -07:00
James Dong
65a73f4e8c Rotation support 
- We only support 0, 90, 180, and 270 degree clockwise rotation

- Some players are known to ignore composition matrix in the MP4 file,
  although this is part of the MP4 file standard.
  Both QT and YT are supporting the rotation

Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
 2010-11-05 15:47:52 -07:00
James Dong
c25c28a496 am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread 
* commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
  Revert "Support rotation in media recorder"
 2010-11-03 19:44:45 -07:00
James Dong
c80c28801d Revert "Support rotation in media recorder" 
This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
 2010-11-03 19:22:47 -07:00
Hiroshi Lockheimer
0ce42c9d31 am c181a082: Merge "Support rotation in media recorder" into gingerbread 
* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
  Support rotation in media recorder
 2010-11-03 17:59:43 -07:00
James Dong
f1febe470a Support rotation in media recorder 
o needs to be tested with camera hal and camcorder application

Change-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232
 2010-11-03 17:49:55 -07:00
James Dong
a3f5b615d7 am f3847e87: Merge "DO NOT MERGE" into gingerbread 
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
  DO NOT MERGE
 2010-11-03 09:25:08 -07:00
James Dong
6786fccf5a DO NOT MERGE 
Fix premature release of recording frames when physical address or metadata is stored in input video buffers

- bug 3158459

Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
 2010-11-02 19:30:01 -07:00
Gloria Wang
35a4f21bd6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp 
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
 2010-11-02 14:02:59 -07:00
Gloria Wang
eab18ea34d - Move the business rule management down to DRM agents. 
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
 2010-11-01 16:12:16 -07:00
Chia-chi Yeh
67f41771d5 Visualizer: Fix the conversion from 8-bit sample to 16-bit sample. 
Change-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d
 2010-11-01 10:56:45 +08:00
Eric Laurent
03a4090b4d Update java doc for visualizer FFT capture. 
The java doc for visualizer FFT capture was not describing
correctly the layout of the data returned by getFft() method.

Change-Id: Idec09538490ea73b211db253b1b8b733ca4d4a72
 2010-10-28 10:14:07 -07:00
Yu Shan Emily Lau
751cc4245f am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:14:36 -07:00
Yu Shan Emily Lau
8b023a2ea2 Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:12:58 -07:00
Marco Nelissen
cd08ada7f1 am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:08:14 -07:00
Marco Nelissen
f514bdc964 Fix off-by-two and other bugs in the visualization code. 
b/3137511

Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
 2010-10-27 10:23:59 -07:00
Andreas Huber
e1e8274588 am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:23:54 -07:00
Andreas Huber
0a612889b5 Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise. 
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
 2010-10-26 15:06:44 -07:00
Yu Shan Emily Lau
93aa00c664 Add the mediaplayer release in the test validation. This is to ensure the media player release properly. 
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
 2010-10-26 14:36:09 -07:00
Gloria Wang
b8791479af resolved conflicts for merge of 9084631d to gingerbread-plus-aosp 
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
 2010-10-25 16:11:18 -07:00
Gloria Wang
d5770917a5 DRM framework support: 
- add a sniffer for DRM files
- add DRMSource and DRMExtractor for es_based DRM
- add pread in FileSource.cpp for container_based DRM
- add native DRM framework API calls in the player for
  DRM audio/video playback

Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
 2010-10-25 12:16:56 -07:00
Mike Lockwood
b04e3940d1 Fixes for simulator build on lucid 
strchr and strrchr now return const char* instead of char*

Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
 2010-10-24 08:52:08 -07:00
Eric Laurent
5a9d273718 am b6a2256e: Merge "Fix issue 3126094." into gingerbread 
Merge commit 'b6a2256e5461160a89d077b761d3253d95ce869f' into gingerbread-plus-aosp

* commit 'b6a2256e5461160a89d077b761d3253d95ce869f':
  Fix issue 3126094.
 2010-10-22 18:41:29 -07:00
Eric Laurent
cc02ac54ac Fix issue 3126094. 
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.

Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
 2010-10-22 18:08:13 -07:00
James Dong
6123e0f7c9 am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread 
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp

* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
  Turn the media time adjustment in file writer back on
 2010-10-21 20:18:16 -07:00
James Dong
89a0104c7c Turn the media time adjustment in file writer back on 
o This was turned off to unblock the tests on some device
o The adjustment duration is increased to suppress fluctuations observed on some device

bug - 3058745

Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
 2010-10-21 18:41:31 -07:00