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

4740 Commits

Author SHA1 Message Date
Glenn Kasten
df02afe835 Merge "Remove unneeded #include <sys/resource.h>" 2011-06-20 07:47:51 -07:00
Dongwon Kang
48810fdda5 OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData(). 
BUG:4689872
Change-Id: I483bf230b5571a8d1815b954dce2c52e9a5f1f37
 2011-06-20 17:35:19 +09:00
Mike Lockwood
f4c043c2a8 Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands" 2011-06-17 20:54:53 -07:00
Mike Lockwood
6acc90fc21 MTP: Fix some problems with GetObjectHandles and GetNumObjects commands 
These calls did not correctly handle some variants of the arguments,
which showed up when running in PTP mode.

Change-Id: Iedbaefebfa39111c8bcaee7c6cc3820a65d6c98f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-17 19:49:05 -04:00
James Dong
d11f591b45 Merge "Use system property to control whether we will enable B frame support in MPEG4Writer" 2011-06-17 15:50:19 -07:00
James Dong
bf8116f28d Use system property to control whether we will enable B frame support in MPEG4Writer 
o This is to work around a bug in crespo's video encoder output timestamp

related-to-bug: 4600191,4724339

Change-Id: I485c1e044bd2f604b318692efd6433345cfc6487
 2011-06-17 15:28:07 -07:00
Eric Laurent
c310dcbed6 Added audio_bytes_per_sample() helper function 
Change-Id: Ibfcd75c4c241a53d5f052c25ada091904991048a
 2011-06-17 14:19:55 -07:00
Eric Laurent
759c5b3d49 Fix regression in audio effect factory 
commit 0fb66c2 introduced a bug in EffectCreate() that prevents detection
of problems reported by the engine library upon effect creation.

Change-Id: I5bd2d42505ac29ab4a5768fd7f0c2ced135cf3e3
 2011-06-16 18:28:54 -07:00
Yu Shan Emily Lau
0a4d51d581 Merge "Add new open source test contents. Removed old test files. Updated the tests with new test contents." 2011-06-15 18:47:55 -07:00
Yu Shan Emily Lau
c4fe54a238 Add new open source test contents. 
Removed old test files.
Updated the tests with new test contents.

Change-Id: Id74f1aae391ef868843ab4058ae9a9328d98f868
 2011-06-15 18:45:54 -07:00
Glenn Kasten
79cd8ba46b Remove unneeded #include <sys/resource.h> 
Suggested in code review for previous change.

Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
 2011-06-15 07:30:19 -07:00
Kristian Monsen
30d71a05aa Merge "Merge chromium to r11.0.672.0: Compile fix" 2011-06-14 20:57:57 -07:00
James Dong
05be9531b6 Second attempt to fix the broken build 
o due to a link to a hidden method

Change-Id: Ia488743e9bff6854253696cc368facbd50d2d8f4
 2011-06-14 18:51:24 -07:00
James Dong
d52ad9ca8d Fix broken build 
Change-Id: Icf7e33a3a4d9b430cd8cbc97801df24a94f9e079
 2011-06-14 18:21:59 -07:00
Glenn Kasten
370a71bcaf Merge "Bug 4608375" 2011-06-14 17:54:25 -07:00
James Dong
113543c909 Merge "Enforce the rule that the timestamp from timelapse video source monotically increases" 2011-06-14 17:01:11 -07:00
James Dong
9ddb7888b4 Update MediaPlayer and MediaRecorder javadoc 
o Adding some description to the Looper requirement for receiving callbacks

Change-Id: I79e7014c521f2286e6c2ccea1097d7e7467eb9ee
 2011-06-14 16:38:08 -07:00
tedbo
114420f531 Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink." 2011-06-14 11:18:30 -07:00
Glenn Kasten
1d24aaa4b4 Bug 4608375 
Update priority and policy together for audio threads

Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
 2011-06-14 10:41:50 -07:00
Dima Zavin
922261deab Merge "audio: update for audio/audio_policy header names/locations" 2011-06-13 19:43:59 -07:00
James Dong
21663e5dc7 Enforce the rule that the timestamp from timelapse video source monotically increases 
Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e
 2011-06-13 18:42:24 -07:00
Dima Zavin
290029d19a audio: update for audio/audio_policy header names/locations 
Change-Id: I36c49352eee57559403cd1597f56a8485a360289
Signed-off-by: Dima Zavin <dima@android.com>
 2011-06-13 18:16:26 -07:00
James Dong
4108b1edc6 Add B frame support for MPEG4Writer 
o requires the support of negative ctts duration values (ctts version 1)

Change-Id: Ib14130c9359c3bff3c76f20a7380d468a065dcaf
 2011-06-13 17:06:29 -07:00
tedbo
cc5278a3e2 Support for setting a ParcelSurfaceTexture as the MediaPlayer sink. 
This adds support for setting a SurfaceTexture as the MediaPlayer video
sink by using a ParcelSurfaceTexture object. The goal is to enable a
SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then
be set on the MediaPlayer.

Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
 2011-06-13 14:27:39 -07:00
James Dong
8aec83eb15 Merge "Avoid duplicated code calculating the stts sample duration" 2011-06-10 16:23:41 -07:00
Dianne Hackborn
4bb506afeb am 15e9d474: am 88748e6d: am d86302df: Quiet the log. 
* commit '15e9d474d1033adbedc8632309df26c3d6dfaee3':
  Quiet the log.
 2011-06-10 14:08:45 -07:00
James Dong
a7ea9f935e Avoid duplicated code calculating the stts sample duration 
o This also speeds up the MediaRecorder.stop() call.
o Also fix incorrect start time compensation in stts box

Change-Id: I6392b8b980e0f786ddeeec0fe2c341de67208c6f
 2011-06-10 11:55:40 -07:00
James Dong
be674b1864 Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition" 2011-06-10 09:57:01 -07:00
James Dong
d24f94989f Merge "Correctly handle crop rect event in SoftAVC.cpp" 2011-06-10 09:56:44 -07:00
Andreas Huber
c8841e2ef4 Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it." 2011-06-10 08:02:18 -07:00
Dianne Hackborn
15e9d474d1 am 88748e6d: am d86302df: Quiet the log. 
* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
  Quiet the log.
 2011-06-10 07:46:27 -07:00
Marco Nelissen
6b6091a140 am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac':
  Make sure we don't read from invalid fds
 2011-06-09 18:56:02 -07:00
Dianne Hackborn
88748e6dc0 am d86302df: Quiet the log. 
* commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867':
  Quiet the log.
 2011-06-09 17:40:08 -07:00
Dianne Hackborn
d86302df0e Quiet the log. 
Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
 2011-06-09 17:37:00 -07:00
James Dong
a81fcadb96 Fix an issue in MPEG4Writer where the write of outstanding chunks in the last batch was missing 
Change-Id: I93c9f6ae7ed098cdf828b2b11a9273c9e0c244e3
 2011-06-09 15:31:39 -07:00
James Dong
a65610a04c Merge "Add timestamp and data pointer checks in CameraSource" 2011-06-09 15:27:38 -07:00
James Dong
dc03da0444 am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit '2488a94350e0c0b088da2646557c9a0f3a0e9847':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:50:25 -07:00
Conley Owens
e668c0b698 am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit '644f36eab4eb9911ad897c9caae68b9c5a72388f':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:21:05 -07:00
Conley Owens
644f36eab4 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:14:11 -07:00
James Dong
2488a94350 am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit 'e3b80c838753fe8c9049950216c6379098465810':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:03:52 -07:00
James Dong
e3b80c8387 Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 2011-06-09 11:56:09 -07:00
Marco Nelissen
6a91953cc9 am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
  Make sure we don't read from invalid fds
 2011-06-09 11:41:57 -07:00
James Dong
3731e1bdf6 Correctly handle crop rect event in SoftAVC.cpp 
Width and height of the video frame was incorrectly overwritten when a cropping need was detected. Using a separate
crop width and crop height resolves the problem.

Change-Id: I8a371c7fe7f8417a7995d7a7fe231120274ea0c8
related-to-bug: 4575591
 2011-06-09 11:39:36 -07:00
Conley Owens
d8b027b18f Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
Marco Nelissen
90dc22fa09 am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
 2011-06-09 10:36:24 -07:00
Marco Nelissen
a02d9bf9c3 Make sure we don't read from invalid fds 
b/4580570

Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
 2011-06-09 09:39:52 -07:00
Andreas Huber
fddf5d9f48 Make dumpsys(media.player) more useful by having AwesomePlayer populate it. 
Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
 2011-06-08 16:04:26 -07:00
Andreas Huber
762b6d001a This device-specific workaround is no longer necessary. 
We can now enable yuv->yuv blitting instead of converting to RGB565.

Change-Id: Ia6a94b706f20a0c9e6ef78a7325cff4f5bb216b8
related-to-bug: 4394005
 2011-06-08 15:00:14 -07:00
James Dong
7d6143a9f0 Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition 
This can potentially save lot of memory for video recording use case since the video encoder
can advertise a much smaller size of the input buffers which are allocated by SF by default.

Change-Id: I582a356cd02c7852e13f2713d90ad5f1eb43177d
 2011-06-08 10:38:26 -07:00
Mike Lockwood
aa48835ce9 MTP: Remove obsolete setPtpMode support 
PTP mode will be implemented as a separate USB function instead.

Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-08 09:19:23 -07:00