5761 Commits

Author SHA1 Message Date
Andreas Huber
3be5aad4d9 Merge "Make sure we return input/output buffers to the codec not just while" 2012-02-24 14:03:27 -08:00
Andreas Huber
b5ef6e5d94 Make sure we return input/output buffers to the codec not just while
flushing but also while stopping.

Change-Id: I23534008b93654c9b9c022c0b1d204c2b546d566
2012-02-24 13:58:09 -08:00
Jean-Baptiste Queru
6b48f088b1 am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit 'ed7e1e830165678421ee7d1b3dac044214a6e635':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
2012-02-24 11:11:10 -08:00
Jean-Baptiste Queru
26d9944e3f am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '6a300a5413898ff8b728e77c5a23290cae60e9b5':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
2012-02-24 11:02:29 -08:00
Jean-Baptiste Queru
126d0ce0cb am 70450553: am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '70450553f8f1e6ec4967f86a4b811db2940e8772':
  stagefright aacenc: Fix an inline asm constraint
2012-02-24 10:35:47 -08:00
Jean-Baptiste Queru
0f7f115a5a am 78fc0c0b: am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74
* commit '78fc0c0bfae913a4a44011225396ae525b335fb1':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:33:05 -08:00
Jean-Baptiste Queru
6a300a5413 Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 2012-02-24 10:28:01 -08:00
Jean-Baptiste Queru
2accfc110a am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit 'd6a25154d94c48ab2ef12641c789458ab14ca94f':
  stagefright aacenc: Fix an inline asm constraint
2012-02-24 10:26:53 -08:00
Jean-Baptiste Queru
c4aa19a578 am ea227787: Merge changes I903353c5,I822dcc74
* commit 'ea227787253e29da2d688399b097e05708d3bf73':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:24:34 -08:00
Jean-Baptiste Queru
d6a25154d9 Merge "stagefright aacenc: Fix an inline asm constraint" 2012-02-24 10:22:34 -08:00
Andreas Huber
64c2263428 Merge "Small fix to MediaCodec" 2012-02-24 10:16:28 -08:00
Jean-Baptiste Queru
ea22778725 Merge changes I903353c5,I822dcc74
* changes:
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:07:49 -08:00
Jean-Baptiste Queru
46f465c25f am 15278119: am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '1527811984557ee0b5d6e476e84ed147e073cb45':
  stagefright aacenc: Zero-initialize a struct
2012-02-24 10:03:47 -08:00
Jean-Baptiste Queru
5f83b95705 am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
  stagefright aacenc: Zero-initialize a struct
2012-02-24 09:54:58 -08:00
Jean-Baptiste Queru
ff7629263b am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '4de803c76d4afd0f542c086b555b71729b3c5796':
  stagefright aacenc: Avoid warnings about incompatible pointer types
2012-02-24 09:52:54 -08:00
Jean-Baptiste Queru
bf45bbf3b4 Merge "stagefright aacenc: Zero-initialize a struct" 2012-02-24 09:47:23 -08:00
Jean-Baptiste Queru
e7650c3279 am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
  stagefright aacenc: Avoid warnings about incompatible pointer types
2012-02-24 09:45:40 -08:00
Jean-Baptiste Queru
394906170c am 307f47aa: am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '307f47aa5def85d0c0bb4af725ff557707c5be86':
  stagefright aacenc: Add const declarations to some pointers
2012-02-24 09:28:09 -08:00
Jean-Baptiste Queru
7ffa4546de am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
  stagefright aacenc: Add const declarations to some pointers
2012-02-24 09:20:44 -08:00
Jean-Baptiste Queru
e5bdd24b69 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 2012-02-24 09:20:37 -08:00
Jean-Baptiste Queru
364ac60cb0 am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '5c2f1220f90ae68a064195ba3c94f1319813f32c':
  stagefright aacenc: Fix inline asm
2012-02-24 09:12:17 -08:00
Andreas Huber
51656aa9b5 Small fix to MediaCodec
Change-Id: I6bcbfd35fdf5a2b0260b8f07a630a5b380e139a0
2012-02-24 09:06:58 -08:00
Jean-Baptiste Queru
47b56c5a46 Merge "stagefright aacenc: Add const declarations to some pointers" 2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
aa86aa60dc am 1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
  stagefright aacenc: Fix inline asm
2012-02-24 08:50:32 -08:00
Jean-Baptiste Queru
1b7046108c Merge "stagefright aacenc: Fix inline asm" 2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
0862a56cae am 0c96e869: am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '0c96e8690408e3cfc12eee521a442c52f1c10b27':
  stagefright aacenc: Fix inline asm constraints
2012-02-24 08:01:10 -08:00
Jean-Baptiste Queru
d7ab4e0c42 am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
  stagefright aacenc: Fix inline asm constraints
2012-02-24 07:53:43 -08:00
Jean-Baptiste Queru
bf1e85bfc8 Merge "stagefright aacenc: Fix inline asm constraints" 2012-02-24 07:39:03 -08:00
James Dong
edb948b877 Merge "Changed TimedTextInBandSource to TimedText3GPPSource." 2012-02-23 21:00:59 -08:00
James Dong
ca88e35764 Fix memory leakage due to unreleased MuxOMX objects after disconnection
o related-to-bug: 5984232

Change-Id: I20cbeff6ae865e995d02342549f1e09320543740
2012-02-23 14:04:20 -08:00
Andreas Huber
05e8074eaa Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass" 2012-02-23 09:13:45 -08:00
Steve Block
2eb7309388 Merge "Drop support for Android HTTP stack" 2012-02-23 04:29:30 -08:00
Insun Kang
0de4783ae0 Changed TimedTextInBandSource to TimedText3GPPSource.
Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
2012-02-23 15:13:24 +09:00
Andreas Huber
5c850396b3 Add new APIs AMessage::(set|find)Buffer to make it safer to pass
ABuffer objects through messages.

Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
2012-02-22 16:20:59 -08:00
Andreas Huber
0ae6b481e4 Merge "Implementation of a java media codec interface and associated tools." 2012-02-22 15:13:44 -08:00
Andreas Huber
88572f7a3e Implementation of a java media codec interface and associated tools.
Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
2012-02-22 15:06:06 -08:00
James Dong
be3835c64d Merge "Removed out-of-date TODO in video editor performance/stress test cases" 2012-02-22 14:00:38 -08:00
Glenn Kasten
8c5ecd6af5 Merge "Fix build warning" 2012-02-22 13:14:50 -08:00
James Dong
d5ade1364b Removed out-of-date TODO in video editor performance/stress test cases
o also fixed a typo

Change-Id: I4f11265da77658f642e382cdfe76862d90a3b548
2012-02-22 11:53:51 -08:00
James Dong
a352d1e241 Merge "Allow to record time lapse videos without using setProfile()" 2012-02-22 11:47:07 -08:00
Glenn Kasten
175b2be791 Fix build warning
warning: pointer of type 'void *' used in arithmetic
warning: enumeral and non-enumeral type in conditional expression

Change-Id: I7b8d626a636145ef648e3b5d0e77068216dd012e
2012-02-22 11:46:53 -08:00
James Dong
a4d205d02c Allow to record time lapse videos without using setProfile()
o also added a check on whether capture rate was set before starting time lapse video recording.

o related-to-bug: 6045507

Change-Id: I8e1fdc8e8931e2684ab3822dc6260db44658e87d
2012-02-22 10:20:46 -08:00
Marco Nelissen
c28baf55a3 Merge "Eliminate scanner file cache" 2012-02-22 09:42:54 -08:00
Steve Block
0acb1c32fa Drop support for Android HTTP stack
All future releases will use the Chromium HTTP stack and maintaining two HTTP
    stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we
    now use V8 in all build targets (b/5495373), so we can safely drop the Android
    HTTP stack.

LoadListener, HttpAuthHandlerImpl, Network, SslErrorHandlerImpl, WebViewWorker
- Android-stack specific, removed
StreamLoader, FrameLoader
- Require LoadListener, removed
CacheLoader, ContentLoader, DataLoader, FileLoader
- Extend StreamLoader, removed

BrowserFrame
- Removed methods that create LoadListener
- BrowserFrame.startLoadingResource() is called from native
CallbackProxy, WebView
- Removed calls to Network methods
CacheManager, CookieManager, CookieSyncManager, WebViewCore, WebResourceResponse
- Removed other Android-stack specific code
JniUtlil
- Removed useChromiumHttpStack()
WebViewDatabase
- Removed all code to create cookies and cache databases for Android HTTP stack

See corresponding WebKit change https://android-git.corp.google.com/g/166327.

Bug: 5495616
Change-Id: If491675516f6eb187077af4220214bb6e6a8d045
2012-02-22 17:21:43 +00:00
Marco Nelissen
58ef68905d Eliminate scanner file cache
Get rid of the file cache, since it tends to run out of memory for large
numbers of files. This slows down the scanner somewhat, but recent
optimizations more than make up for that.

With this change, the postscan phase of the media scan now only processes
playlists. Removal of entries for files that no longer exist is done as
part of the prescan.
Lookups in the file cache are replaced by simple queries, which are still
reasonably fast because of a new index recently added to the media provider
database. Note that there was a bug in the case-insensitive matching for
file cache entries, in that e.g. an uppercase a-accent-aigue would be mapped
to its lowercase version, whereas the underlying case-insensitive filesystem
treats them as different characters. Getting rid of the file cache also fixes
this issue.

Bug: 4474617
Change-Id: I39c6f1a35bb518ef7ab912e9b9401663821ef48e
2012-02-22 08:37:26 -08:00
James Dong
f65934a721 Merge "Limit the amount of audio record data in each buffer" 2012-02-21 11:10:35 -08:00
Steve Block
c6389e5d93 Update stagefright makefile after dropping support for JSC
Bug: 5495373
Change-Id: Ibb81196edd3a6eaa4999cf0e30a78368afb66360
2012-02-21 14:19:26 +00:00
John Grossman
d72031cee3 Upintegreate AAH TX and RX players from ICS_AAH
Upintegrate the android at home TX and RX players developed in the
ICS_AAH branch.

Change-Id: I8247d3702e30d8b0e215b31a92675d8ab28dccbb
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:12 -08:00
John Grossman
3540a0197f Enhance Visualizer behavior in the case of mediaserver death.
Bring the Visualizer class into line with the SDK documentation by
returning ERROR_DEAD_OBJECT instead of ERROR_INVALID_OPERATION when
the Visualizer loses its binder connection to the mediaserver because
of a mediaserver restart.

Also add a new callback interface to allow clients to be
asynchronously notified in the case of server death.  Right now, the
interface definition and the registration method are flagged as hidden
pending API council review/approval.

See http://b/issue?id=5717519 for details.

Change-Id: Ic15856f27ed5a950a583ac11ca81f79bd7e9b1a0
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:11 -08:00
John Grossman
449725f9aa Reuse callback buffers in the Visualizer.
Don't re-allocate buffers used by Visualizer callbacks as this causes an
unacceptable amount of GC thrash.  Instead, lazily allocate the buffers and only
reallocate them when the required size changes.

See http://b/issue?id=5717519 for details.

Change-Id: Ibd157ed51f30687ce7c4ef0b4003258a484e0f5d
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:11 -08:00