OSDN Git Service
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:15 +0000 (13:15 -0800)]
am
19bb6261: am
bf826923: am
faf38b24: am
9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit '
19bb62613f512b62d492fb4caf36de88fd1914dd':
stagefright aacenc: Add prototypes for arm specific implementations of functions
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:13 +0000 (13:15 -0800)]
am
360db46e: am
b7913f70: am
163777b8: am
354ac772: Merge "stagefright amrwb: Make local const arrays static"
* commit '
360db46e78a1492b695d5be6e779386dc66a502e':
stagefright amrwb: Make local const arrays static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:10 +0000 (13:15 -0800)]
am
5ba910d8: am
040c5b2c: am
ded8e681: am
695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
* commit '
5ba910d867d029e69c4f52667c02a4c114f849df':
stagefright amrwb: Change a C++ style cast into a C style cast
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:06 +0000 (13:15 -0800)]
am
b205a5d8: am
50ee92e9: am
d91b744d: am
f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* commit '
b205a5d861c5ba31599084a42c7d92549f464dac':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:15:03 +0000 (13:15 -0800)]
am
18a64b74: am
a887ff9a: am
4f74be57: am
1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '
18a64b74aa3cb0babb5f50e5f80660f601d80123':
stagefright aacenc: Simplify the definition of __inline
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:59 +0000 (13:14 -0800)]
am
6b4d7bad: am
f7210cf5: am
7346d73c: am
77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
* commit '
6b4d7bada0b1d34f93149211cb179b71c864d5d3':
stagefright amrwbenc: Remove a useless check
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:56 +0000 (13:14 -0800)]
am
2bf76b98: am
3e61e413: am
32901b39: am
be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
* commit '
2bf76b983da1d1730d685f9907d5d4fa6ea46fcd':
stagefright aacenc: Remove a stray semicolon
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:53 +0000 (13:14 -0800)]
am
484fc74b: am
4bcdeb86: am
716a0517: am
fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
* commit '
484fc74beb79d0b8d49223cb3fce9e1ccbfd3501':
stagefright amrwb: Make a global const array static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:48 +0000 (13:14 -0800)]
am
eb483de5: am
bf5c5e5b: am
c1da1e1b: am
94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '
eb483de58e4b41cb549149459e492e9ad1d65bd0':
stagefright amrwbenc: Change keyword ordering
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:14:45 +0000 (13:14 -0800)]
am
5b299d2f: am
18643e70: am
6bc542e0: am
5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '
5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:43 +0000 (13:07 -0800)]
am
9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit '
9e3d957599c76ba19e23fd25b75ccc02d54efe3e':
stagefright aacenc: Add prototypes for arm specific implementations of functions
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:40 +0000 (13:07 -0800)]
am
354ac772: Merge "stagefright amrwb: Make local const arrays static"
* commit '
354ac772eca0afea25dd12d233e5cdee9677888b':
stagefright amrwb: Make local const arrays static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:36 +0000 (13:07 -0800)]
am
695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
* commit '
695cfe1e1e189f176fdf994f72d05a0129a66394':
stagefright amrwb: Change a C++ style cast into a C style cast
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:33 +0000 (13:07 -0800)]
am
f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* commit '
f7f1280e0c71d64098efb42b58a922d056164b5e':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:30 +0000 (13:07 -0800)]
am
1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '
1a864db7723a7947b72d24e6008ba48341d0feff':
stagefright aacenc: Simplify the definition of __inline
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:26 +0000 (13:07 -0800)]
am
77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
* commit '
77576ff487e227092cdaf09db163e21f1e07604a':
stagefright amrwbenc: Remove a useless check
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:23 +0000 (13:07 -0800)]
am
be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
* commit '
be9a705586edafcedc9fabb94d3259f882b7cbd7':
stagefright aacenc: Remove a stray semicolon
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:20 +0000 (13:07 -0800)]
am
fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
* commit '
fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
stagefright amrwb: Make a global const array static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:16 +0000 (13:07 -0800)]
am
94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '
94ee1bf232d1f1cc97902dab1e4148eb478cd304':
stagefright amrwbenc: Change keyword ordering
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:12 +0000 (13:07 -0800)]
am
5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '
5aff259c61e54e441ed04bf77e3cc69a0374432d':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Mathias Agopian [Sun, 26 Feb 2012 02:48:35 +0000 (18:48 -0800)]
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
Mathias Agopian [Sun, 26 Feb 2012 03:52:53 +0000 (19:52 -0800)]
libagl shouldn't export anything
Change-Id: Ia823dbc56aab2a0b8a6063df4348fe6baac124c6
Jean-Baptiste Queru [Mon, 27 Feb 2012 20:14:40 +0000 (12:14 -0800)]
Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
Jean-Baptiste Queru [Mon, 27 Feb 2012 20:14:01 +0000 (12:14 -0800)]
Merge "stagefright amrwb: Make local const arrays static"
Jean-Baptiste Queru [Mon, 27 Feb 2012 20:13:26 +0000 (12:13 -0800)]
Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:16:22 +0000 (11:16 -0800)]
Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* changes:
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:11:56 +0000 (11:11 -0800)]
Merge "stagefright aacenc: Simplify the definition of __inline"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:11:17 +0000 (11:11 -0800)]
Merge "stagefright amrwbenc: Remove a useless check"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:09:58 +0000 (11:09 -0800)]
Merge "stagefright aacenc: Remove a stray semicolon"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:08:08 +0000 (11:08 -0800)]
Merge "stagefright amrwb: Make a global const array static"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:06:24 +0000 (11:06 -0800)]
Merge "stagefright amrwbenc: Change keyword ordering"
Jean-Baptiste Queru [Mon, 27 Feb 2012 18:58:50 +0000 (10:58 -0800)]
Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
Glenn Kasten [Mon, 27 Feb 2012 15:24:46 +0000 (07:24 -0800)]
Merge "Make threadLoop() logs identical"
Glenn Kasten [Mon, 27 Feb 2012 15:21:00 +0000 (07:21 -0800)]
Merge "Move declaration of mixerStatus to inner block"
Mathias Agopian [Sat, 25 Feb 2012 03:08:12 +0000 (19:08 -0800)]
Merge "remove dependency on android_native{s_priv|buffer}.h"
Mathias Agopian [Sat, 25 Feb 2012 02:25:41 +0000 (18:25 -0800)]
remove dependency on android_native{s_priv|buffer}.h
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
Glenn Kasten [Fri, 24 Feb 2012 19:18:09 +0000 (11:18 -0800)]
Make threadLoop() logs identical
Change the wording of the logs in the various copies of threadLoop()
to be identical. This will make it easier to merge them soon.
Change-Id: Idfa181e437738712c784dc7f746cac79f83d2931
Glenn Kasten [Fri, 24 Feb 2012 15:25:40 +0000 (07:25 -0800)]
Move declaration of mixerStatus to inner block
mixerStatus was being declared (and initialized) too early,
which also resulted in a duplicate initialization. Moved
the declaration into the block where it is actually used.
Change-Id: Ifdcfefe362a5efe3493dd616cdb44645c6f9aed5
Glenn Kasten [Fri, 24 Feb 2012 15:21:48 +0000 (07:21 -0800)]
Pull out duplicated copies of silent mode check
Also fix the error handling for the property_get.
This is part of preparation for the threadLoop() merge.
Change-Id: I6405190ea18146d1271575e1dfe9f279e8f36b17
Glenn Kasten [Fri, 24 Feb 2012 22:25:15 +0000 (14:25 -0800)]
Merge "Pull CPU statistics code out of threadLoop()"
Andreas Huber [Fri, 24 Feb 2012 22:03:27 +0000 (14:03 -0800)]
Merge "Make sure we return input/output buffers to the codec not just while"
Andreas Huber [Fri, 24 Feb 2012 22:02:52 +0000 (14:02 -0800)]
Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm"
Andreas Huber [Fri, 24 Feb 2012 21:58:09 +0000 (13:58 -0800)]
Make sure we return input/output buffers to the codec not just while
flushing but also while stopping.
Change-Id: I23534008b93654c9b9c022c0b1d204c2b546d566
Glenn Kasten [Fri, 24 Feb 2012 15:21:32 +0000 (07:21 -0800)]
Pull CPU statistics code out of threadLoop()
This is to prepare for the threadLoop() merge
Change-Id: I118c7d5c6b011b5d5b95ec7d63fb03feb166a9cf
Andreas Huber [Fri, 24 Feb 2012 21:42:47 +0000 (13:42 -0800)]
Fix two more locations that use the old setObject("buffer", ...) paradigm
that I'd previously missed.
Change-Id: Ifbdbfb94d1bc1cbe8c0a403fed05ce99fca8397b
Glenn Kasten [Fri, 24 Feb 2012 21:17:36 +0000 (13:17 -0800)]
Merge "Remove TrackBase::mFlags"
Glenn Kasten [Tue, 21 Feb 2012 18:35:56 +0000 (10:35 -0800)]
Remove TrackBase::mFlags
The bit-field TrackBase::mFlags was supposed to have track-specific
flags in the upper 16 bits, and system flags in the lower 16 bits.
The upper 16 bits of mFlags were initialized in the TrackBase
constructor from the flags parameter of IAudioFlinger::createTrack()
and IAudioFlinger::openRecord(), and the lower 16 bits were cleared.
However, the upper 16 bits of mFlags were never acccessed again.
So really there are no track-specific flags. I left the flags
in the parameter list of createTrack() and openRecord() but made a
note that these should be removed eventually as they are dead.
This leaves only the one system flag "step server failed". I replaced
the bit-field mFlags by bool mStepServerFailed, which is simpler and
slightly faster.
Change-Id: I6650f5487be72791b4a67d73adcd10ffa04e2aa5
Martin Storsjo [Wed, 18 May 2011 09:28:33 +0000 (12:28 +0300)]
stagefright amrnb: Remove extern from table definitions
Local prototype declarations are added where no suitable ones are
available in headers.
This fixes warnings when compiling as C - while the source
files are named .cpp, they actually are compileable as pure C.
This was committed on the master branch of the opencore
repository in commit
a0acb494ea6682ca966b5ebbd3676c89c56d63a6,
based on AOSP contribution 10303.
Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
Martin Storsjo [Wed, 18 May 2011 09:27:51 +0000 (12:27 +0300)]
stagefright amrnb: Add includes for prototype declarations of tables
This was committed on the master branch of the opencore
repository in commit
da3d0463c999871ee584a0d750be65be65d19b00,
based on AOSP contribution 10302.
Change-Id: I4ad5526634efecc2d2bb3d2169184b8d4d4d7671
Martin Storsjo [Wed, 18 May 2011 09:26:52 +0000 (12:26 +0300)]
stagefright amrnb: Add missing const qualifier to table declarations in headers
This was committed on the master branch of the opencore
repository in commit
5ce7a6fdf125116ffce2e692e14eafef1c807628,
based on AOSP contribution 10301.
Change-Id: Ie32b32c7407f449e382c0b4fd2d60a664e0daa33
Martin Storsjo [Wed, 18 May 2011 09:25:42 +0000 (12:25 +0300)]
stagefright amrwb: Make a global const array static
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C. Prior to this,
this table produced multiple definitions of the same symbol.
This was committed on the master branch of the opencore
repository in commit
a803bd49a631317e0d52ff060cf1799f7741a47e,
based on AOSP contribution 10017.
Change-Id: Id76274964242b119ab61b8181e557477df1e1521
Martin Storsjo [Wed, 18 May 2011 09:24:50 +0000 (12:24 +0300)]
stagefright amrwb: Make local const arrays static
Some of these tables exist in both the amrnb and amrwb libraries,
but with different content.
This avoids some cases of multiple definitions of symbols, if
linking in both libraries statically into the same executable,
if the libraries are built as C. (As C++, the local symbols
get mangled so they don't conflict with the external C symbols
in amrnb, that are unmangled.)
Most of this was committed on the master branch of the opencore
repository in commit
0cd4b3ac412dd0a8370ce339e89cf346c6cfe395,
based on AOSP contribution 10016.
Change-Id: I5387e699ce54a56dc43fcfa0396dee5c99280fd9
Martin Storsjo [Wed, 18 May 2011 09:24:11 +0000 (12:24 +0300)]
stagefright amrwb: Change a C++ style cast into a C style cast
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C (except for this
cast).
This was committed on the master branch of the opencore
repository in commit
ae27d9b2ef68c4e6fc383a8cab93d6baa235ff6b,
based on AOSP contribution 10014.
Change-Id: I4f533313be041ad3e0a03ffc5f4207480894ddd1
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:11:10 +0000 (11:11 -0800)]
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
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:02:29 +0000 (11:02 -0800)]
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
Martin Storsjo [Thu, 12 Jan 2012 12:28:30 +0000 (14:28 +0200)]
stagefright aacenc: Remove a stray semicolon
This avoids warnings about an empty body in an if statement.
mem_free does the same null check, so the accidental extra
semicolon was harmless, and the whole if statement actually
is needless. But if removing the if statements, all the
other ones should be removed too, for consistency.
(This could be done as a separate change).
Change-Id: I1b6064dedd15ffa949043bb5396148aaed9b43f6
Martin Storsjo [Thu, 12 Jan 2012 13:10:01 +0000 (15:10 +0200)]
stagefright aacenc: Add prototypes for arm specific implementations of functions
The arm specific functions are implemented in .s files,
without any function declarations in headers.
This fixes compiler warnings about implicit declarations
of these functions.
Change-Id: I1512560b6740c1879f378886e05aaad2e3a6c869
Martin Storsjo [Thu, 12 Jan 2012 12:53:17 +0000 (14:53 +0200)]
stagefright amrwbenc: Change keyword ordering
This avoids warnings about 'static' not being at the beginning
of the declarations.
Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
Martin Storsjo [Thu, 12 Jan 2012 12:52:47 +0000 (14:52 +0200)]
stagefright amrwbenc: Remove a useless check
Since the Length field is unsigned, the comparison will always
be false. The corresponding code in the aac encoder doesn't have
any check for Length.
This avoids a warning about comparison always being false.
Change-Id: I57c28ff9d09cb9ac4effeaeb40db608ab976acc6
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:35:47 +0000 (10:35 -0800)]
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
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:33:05 +0000 (10:33 -0800)]
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
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:28:00 +0000 (10:28 -0800)]
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:26:53 +0000 (10:26 -0800)]
am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
d6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:24:34 +0000 (10:24 -0800)]
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
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:22:33 +0000 (10:22 -0800)]
Merge "stagefright aacenc: Fix an inline asm constraint"
Andreas Huber [Fri, 24 Feb 2012 18:16:28 +0000 (10:16 -0800)]
Merge "Small fix to MediaCodec"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:07:47 +0000 (10:07 -0800)]
Merge changes I903353c5,I822dcc74
* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:03:47 +0000 (10:03 -0800)]
am
15278119: am
61022b06: am
5f83b957: am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
1527811984557ee0b5d6e476e84ed147e073cb45':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:54:58 +0000 (09:54 -0800)]
am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:52:54 +0000 (09:52 -0800)]
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
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:47:22 +0000 (09:47 -0800)]
Merge "stagefright aacenc: Zero-initialize a struct"
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:45:40 +0000 (09:45 -0800)]
am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:28:09 +0000 (09:28 -0800)]
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
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:20:44 +0000 (09:20 -0800)]
am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:20:36 +0000 (09:20 -0800)]
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:12:17 +0000 (09:12 -0800)]
am
5c2f1220: am
901b8bb0: am
aa86aa60: am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
5c2f1220f90ae68a064195ba3c94f1319813f32c':
stagefright aacenc: Fix inline asm
Andreas Huber [Fri, 24 Feb 2012 16:41:46 +0000 (08:41 -0800)]
Small fix to MediaCodec
Change-Id: I6bcbfd35fdf5a2b0260b8f07a630a5b380e139a0
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:53:24 +0000 (08:53 -0800)]
Merge "stagefright aacenc: Add const declarations to some pointers"
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:50:32 +0000 (08:50 -0800)]
am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:38:22 +0000 (08:38 -0800)]
Merge "stagefright aacenc: Fix inline asm"
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:01:10 +0000 (08:01 -0800)]
am
0c96e869: am
41087f79: am
d7ab4e0c: am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
0c96e8690408e3cfc12eee521a442c52f1c10b27':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:53:43 +0000 (07:53 -0800)]
am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:39:02 +0000 (07:39 -0800)]
Merge "stagefright aacenc: Fix inline asm constraints"
James Dong [Fri, 24 Feb 2012 05:00:59 +0000 (21:00 -0800)]
Merge "Changed TimedTextInBandSource to TimedText3GPPSource."
James Dong [Thu, 23 Feb 2012 20:23:57 +0000 (12:23 -0800)]
Fix memory leakage due to unreleased MuxOMX objects after disconnection
o related-to-bug:
5984232
Change-Id: I20cbeff6ae865e995d02342549f1e09320543740
Andreas Huber [Thu, 23 Feb 2012 19:21:43 +0000 (11:21 -0800)]
Be more greedy when it comes to gathering input and output buffers.
Change-Id: I54c4f608e5155917ca35eba5655b4c06357fb112
Andreas Huber [Thu, 23 Feb 2012 17:13:45 +0000 (09:13 -0800)]
Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass"
Steve Block [Thu, 23 Feb 2012 12:29:30 +0000 (04:29 -0800)]
Merge "Drop support for Android HTTP stack"
Insun Kang [Thu, 23 Feb 2012 05:03:23 +0000 (14:03 +0900)]
Changed TimedTextInBandSource to TimedText3GPPSource.
Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
Andreas Huber [Tue, 21 Feb 2012 22:38:23 +0000 (14:38 -0800)]
Add new APIs AMessage::(set|find)Buffer to make it safer to pass
ABuffer objects through messages.
Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
Andreas Huber [Wed, 22 Feb 2012 23:13:44 +0000 (15:13 -0800)]
Merge "Implementation of a java media codec interface and associated tools."
Andreas Huber [Tue, 21 Feb 2012 19:47:18 +0000 (11:47 -0800)]
Implementation of a java media codec interface and associated tools.
Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
Glenn Kasten [Wed, 22 Feb 2012 21:22:13 +0000 (13:22 -0800)]
Merge "Avoid wp<>::unsafe_get() with a few exceptions"
Glenn Kasten [Fri, 20 Jan 2012 21:32:16 +0000 (13:32 -0800)]
Avoid wp<>::unsafe_get() with a few exceptions
Avoid using wp<>::unsafe_get() except in a log, and other specific cases
when it's known to be safe.
Use more specific subclass types for parameters to avoid down-casts.
When a constructor or method parameter is "this" of an object that is
currently being constructed, it's better to use a raw pointer rather
than either sp<> or wp<>.
Using the raw pointer is safe, provided either:
- it is "this" of an object being constructed (which has sp<> refcount of 0),
- or the caller already holds an sp<>
The raw pointer is simpler and faster, and it avoids the problem of the
sp<> reference count being incremented and then decremented to zero on
scope exit, which would cause the object's destructor to run while the
object is still being constructed.
Also removed some dead code per a review comment.
Change-Id: I7375f64da3aec11b928c33cb01faff186252ef5e
Glenn Kasten [Wed, 22 Feb 2012 21:14:50 +0000 (13:14 -0800)]
Merge "Fix build warning"
Glenn Kasten [Sat, 18 Feb 2012 00:24:10 +0000 (16:24 -0800)]
Fix build warning
warning: pointer of type 'void *' used in arithmetic
warning: enumeral and non-enumeral type in conditional expression
Change-Id: I7b8d626a636145ef648e3b5d0e77068216dd012e
James Dong [Wed, 22 Feb 2012 01:16:25 +0000 (17:16 -0800)]
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
Steve Block [Thu, 16 Feb 2012 17:49:31 +0000 (17:49 +0000)]
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
James Dong [Tue, 21 Feb 2012 19:10:35 +0000 (11:10 -0800)]
Merge "Limit the amount of audio record data in each buffer"
Steve Block [Fri, 17 Feb 2012 17:45:42 +0000 (17:45 +0000)]
Update stagefright makefile after dropping support for JSC
Bug:
5495373
Change-Id: Ibb81196edd3a6eaa4999cf0e30a78368afb66360