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

5844 Commits

Author SHA1 Message Date
Jean-Michel Trivi
ae0b36f93f Correct GUID errors in audio effect configuration 
Correct erroneous spaces that were present in some audio effect GUIDs.

Change-Id: Ide3a1552b2f8976f96ee980f1341f935555656d9
 2012-03-02 09:58:05 -08:00
Andreas Huber
d9c3217eff Merge "Remove hacks that worked around issues in OMX components several releases back." 2012-03-01 15:46:19 -08:00
Yu Shan Emily Lau
8790b57588 am 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit '353b61a87d9eb0ee223bdda76c30a1364441d962':
  Set the video encoding bit rate for the media recorder stress test.
 2012-03-01 15:35:43 -08:00
Jean-Baptiste Queru
a4c8511218 am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '9de7793b425be89889412f3a86466d7b19055c3c':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-03-01 15:35:25 -08:00
Jean-Baptiste Queru
adbe671920 am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit '715c78b933f8dec04882ebb73acd61fdd42c6c64':
  stagefright aacenc: Safeguard against overwriting bits
 2012-03-01 15:35:23 -08:00
Andreas Huber
9154f2d902 Remove hacks that worked around issues in OMX components several releases back. 
Change-Id: I89bb3d0be4d2c1824de382aedfdd4f9bd2547dbc
 2012-03-01 15:17:47 -08:00
John Grossman
720aa28279 Switch the way we configure for MediaPlayer retransmission. 
This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
with merge conflicts addressed by hand and additional changes made in
response to code review feedback.

Move in the direction of a more publishable API for configuring a
media player for retransmission.  It used to be that we used a custom
invoke and a modified URL (prefixed with aahTX://).  There are many
issues with this technique and it was never meant to stand the test of
time.

This CL gets rid of all that.  A new (but currently hidden) method was
introduced to the java level MediaPlayer API, called
setRetransmitTarget(InetSocketAddress), which allows an app writer to
set the retransmit target.  For now, this method needs to be called
before a call to setDataSource (which is pretty unusual for the
MediaPlayer API) because this mid level code uses this as a cue to
instantiate an aahTX player instead of relying on the data source to
select a player.  When retranmit functionality becomes part of the
existing android player implemenation, this
set-retrans-before-set-data-source behavior can go away, along with
the aahTX player itself.

Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98
Signed-off-by: John Grossman <johngro@google.com>
 2012-03-01 14:41:35 -08:00
John Grossman
d630f593d7 LibAAH_RTP: Add support for AAC in MP4. 
Cherry picked from Ie8298eb9d253fc6ede448da87660a60d23170987 and
conflicts fixed by hand.

Change-Id: I6f0a59357ba1a3d57caf67d2eb0ade7486723e7b
Signed-off-by: John Grossman <johngro@google.com>
 2012-03-01 14:41:35 -08:00
Andreas Huber
3d3864fff4 Instead of hardcoding OMX component names in our code, support 
a config file instead.

Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
 2012-03-01 11:30:10 -08:00
Yu Shan Emily Lau
0ddfe24a19 am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:00:08 -08:00
Yu Shan Emily Lau
eb4f3256b7 Set the video encoding bit rate for the media 
recorder stress test.

Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
 2012-02-29 15:57:21 -08:00
Jean-Baptiste Queru
4f90636224 am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '9734843102c074c56ac72e221db0f51ae2fa79ec':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 15:47:35 -08:00
Jean-Baptiste Queru
225eec8d2a am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
  stagefright aacenc: Safeguard against overwriting bits
 2012-02-29 15:47:32 -08:00
Jean-Baptiste Queru
9734843102 am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '704131cb7e4f9cc682ea57ed569375f9f289368e':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 15:44:31 -08:00
Jean-Baptiste Queru
f9d4ba77f4 am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" 
* commit '69aae36e900cf7114c5895618747906951a11730':
  stagefright aacenc: Safeguard against overwriting bits
 2012-02-29 15:44:28 -08:00
Glenn Kasten
f79760b4aa Merge "Shorten thread names" 2012-02-29 14:59:08 -08:00
Glenn Kasten
d67f2cf943 Merge "AudioRecord const methods" 2012-02-29 14:45:25 -08:00
Jean-Baptiste Queru
704131cb7e Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* changes:
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-02-29 14:24:52 -08:00
Jean-Baptiste Queru
69aae36e90 Merge "stagefright aacenc: Safeguard against overwriting bits" 2012-02-29 14:23:38 -08:00
Andreas Huber
0c9aa1b6fc Merge "Separate the notion of "stop" from that of "release", i.e." 2012-02-29 09:20:25 -08:00
James Dong
ee31e56a16 Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext." 2012-02-28 18:49:34 -08:00
Glenn Kasten
86e3362f15 Shorten thread names 
prctl(PR_SET_NAME) limits to 15 characters.  Before we had names like
"Binder Thread #" and the counter was cut off :-( Also remove redundant
"thread" at end of name; it's always a thread.

Change-Id: I1f99c2730ba0787ed9b59c15914356cddf698e2f
 2012-02-28 16:38:09 -08:00
Andreas Huber
4484bdd2f9 Separate the notion of "stop" from that of "release", i.e. 
stop - means transition back to LOADED state and keeping the component
instance allocated.

release - means we get rid of the component completely.

Change-Id: I40ad01ce70821faaad43f57999249904f9144924
 2012-02-28 15:54:51 -08:00
Jason Noguchi
eb5698a6b9 am a1de5e48: am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:55:13 -08:00
Jason Noguchi
743aceec42 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:50:14 -08:00
Glenn Kasten
bd714b6cbe AudioRecord const methods 
Change-Id: Ifae4fd7820b650aaca2b13c8658c292db1c46c0f
 2012-02-28 08:50:18 -08:00
Jean-Baptiste Queru
9bb891faf4 am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-28 07:19:40 -08:00
Mathias Agopian
021df141ed remove dependency on unneeded headers 
Change-Id: I890f40c430beca055bedd95c878eb68b42f232c2
 2012-02-27 17:37:26 -08:00
Jean-Baptiste Queru
f016dc1bd7 am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 
* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
 2012-02-27 16:57:06 -08:00
Eric Laurent
b39a159392 Merge "audio preprocessing: fix multiple enable problem" 2012-02-27 16:35:30 -08:00
Jean-Baptiste Queru
f881fa5179 Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 2012-02-27 16:23:19 -08:00
Jean-Baptiste Queru
e912404f85 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
 2012-02-27 13:15:15 -08:00
Jean-Baptiste Queru
308eb8f51f 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
 2012-02-27 13:15:13 -08:00
Jean-Baptiste Queru
930b3c0b22 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
 2012-02-27 13:15:10 -08:00
Jean-Baptiste Queru
e3463238ed 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
 2012-02-27 13:15:06 -08:00
Jean-Baptiste Queru
b8a098b287 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
 2012-02-27 13:15:03 -08:00
Jean-Baptiste Queru
64d2ca5e21 am 6b4d7bad: am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit '6b4d7bada0b1d34f93149211cb179b71c864d5d3':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:14:59 -08:00
Jean-Baptiste Queru
0b8525c9a1 am 2bf76b98: am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" 
* commit '2bf76b983da1d1730d685f9907d5d4fa6ea46fcd':
  stagefright aacenc: Remove a stray semicolon
 2012-02-27 13:14:56 -08:00
Jean-Baptiste Queru
2ba0804164 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
 2012-02-27 13:14:53 -08:00
Jean-Baptiste Queru
cfef1d0ac0 am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:14:48 -08:00
Jean-Baptiste Queru
8eb14828f1 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
 2012-02-27 13:14:45 -08:00
Jean-Baptiste Queru
faf38b24c0 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
 2012-02-27 13:07:43 -08:00
Jean-Baptiste Queru
163777b8be am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 
* commit '354ac772eca0afea25dd12d233e5cdee9677888b':
  stagefright amrwb: Make local const arrays static
 2012-02-27 13:07:40 -08:00
Jean-Baptiste Queru
ded8e6818d 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
 2012-02-27 13:07:36 -08:00
Jean-Baptiste Queru
d91b744ded 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
 2012-02-27 13:07:33 -08:00
Jean-Baptiste Queru
4f74be57e7 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" 
* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
  stagefright aacenc: Simplify the definition of __inline
 2012-02-27 13:07:30 -08:00
Jean-Baptiste Queru
7346d73cac am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit '77576ff487e227092cdaf09db163e21f1e07604a':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:07:26 -08:00
Jean-Baptiste Queru
32901b397b am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" 
* commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7':
  stagefright aacenc: Remove a stray semicolon
 2012-02-27 13:07:23 -08:00
Jean-Baptiste Queru
716a051719 am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" 
* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
  stagefright amrwb: Make a global const array static
 2012-02-27 13:07:20 -08:00
Jean-Baptiste Queru
c1da1e1b2f am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:07:16 -08:00