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

5486 Commits

Author SHA1 Message Date
Dianne Hackborn
ea8ceca869 am 90577af7: Merge "use utf8_length() instead of local function, isValidUtf8()" 
* commit '90577af796cd526f842d6f07c2d95ed4fcc2f6d8':
  use utf8_length() instead of local function, isValidUtf8()
 2012-04-18 20:39:37 -07:00
Homin Lee
1a8b6c29aa use utf8_length() instead of local function, isValidUtf8() 
utf8_length() from libutils returns -1 when source not contains
valid sequence for UTF-8. Fixed to use it and removed the local
function isValidUtf8().

Change-Id: If2834ce1d1ae07fd8526ce8bc5df3fd3f44e85c8
Signed-off-by: Homin Lee <suapapa@insignal.co.kr>
 2012-04-13 12:31:48 +09:00
Jason Noguchi
f5693a6a50 am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.
 2012-04-03 17:31:00 -07:00
Jason Noguchi
a784b3dea1 Fix build break introduced by missing parenthesis in camera stress test. 
Change-Id: I8da9321a7674dbbe48cc0c214c0b043fbce8eeab
 2012-04-03 17:01:50 -07:00
Jason Noguchi
34a4e519b2 am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 15:32:34 -07:00
Jason Noguchi
6e6d8df5d0 Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 2012-04-03 15:30:22 -07:00
Jason Noguchi
41d88d5f58 Adding camera zoom test to mediaframework stress suite. 
Change-Id: I3ee72156f42cf189ff1d0bd469f83b938a6b87ff
 2012-03-22 17:52:03 -07:00
Eric Laurent
eaa08d3515 am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency
 2012-03-16 17:26:24 -07:00
Eric Laurent
b388138ff2 resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp 
Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
 2012-03-16 17:19:25 -07:00
Eric Laurent
dc63f3fe40 MediaPlayerService: fix AudioSink latency 
The AudioSink latency is currently cached when the associated AudioTrack
is created. However, the AudioTrack latency can change if the AudioTrack is moved
from one output stream to another.
The AudioPlayer must also periodically update its view of the latency
as it is needed to compensate the real audio time used for A/V sync.

This fixes an A/V sync problem seen when switching A2DP on and off while
playing a video.

Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4

Conflicts:

	media/libmediaplayerservice/MediaPlayerService.cpp
 2012-03-16 12:25:31 -07:00
Eric Laurent
0df689495a AudioTrack: relax check on minimum buffer size 
Current AudioTrack implementation enforces that the requested audio
buffer size is at least corresponding the audio latency.
This requirement is too strong and leads to problems with current
stagefright and AudioSink implementations when playing over output
streams with long latency.

Ultimately, the AudioSink design should be changed to specify a minimum
buffer size in time or frames units but not in buffer count units.

Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f

Conflicts:

	media/libmedia/AudioTrack.cpp
 2012-03-16 12:22:07 -07:00
Glenn Kasten
aa1bd6dec6 am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit 'd8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
  Add empty libmedia_native in old location
 2012-03-16 10:01:28 -07:00
Glenn Kasten
d8cc14211a am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit '42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
  Add empty libmedia_native in old location
 2012-03-15 22:09:38 -07:00
Glenn Kasten
e6aa25bb8e Add empty libmedia_native in old location 
Submitting this first, in the old location, will allow early testing of
the build for all the dependent projects.  Then those projects will not
need to be updated atomically when libmedia_native is moved.

Change-Id: I31ab315e53970986d18a4e3b1673e31460f6a3f1
 2012-03-15 15:32:20 -07:00
Conley Owens
c24f5ba4ee am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo" 
* commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
  stagefright amrwbenc: Simplify the definition of static_vo
 2012-03-09 15:10:08 -08:00
Conley Owens
66da3fdce4 am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028 
* commit '972efafb90b543eea51aa5b23104d469a1bcc1fb':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero
 2012-03-09 15:09:58 -08:00
Conley Owens
9a3f3b9db6 am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo" 
* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
  stagefright amrwbenc: Simplify the definition of static_vo
 2012-03-09 15:06:53 -08:00
Conley Owens
972efafb90 am 6db6ea02: Merge changes I00c852e4,Ib31bf028 
* commit '6db6ea02b999e86dfbddd08780eeab0034389f93':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero
 2012-03-09 15:06:48 -08:00
Conley Owens
67cf093d86 Merge "stagefright amrwbenc: Simplify the definition of static_vo" 2012-03-09 08:54:59 -08:00
Conley Owens
6db6ea02b9 Merge changes I00c852e4,Ib31bf028 
* changes:
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero
 2012-03-09 08:53:40 -08:00
Dirk Dougherty
56bab8bd83 am 4d7bc655: Doc change: String changes for Android Market 
* commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
  Doc change: String changes for Android Market
 2012-03-05 22:55:49 -08:00
Dirk Dougherty
4d7bc65538 Doc change: String changes for Android Market 
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
 2012-03-05 22:02:35 -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
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
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
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
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
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
Jean-Baptiste Queru
6bc542e0f3 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
 2012-02-27 13:07:12 -08:00
Jean-Baptiste Queru
9e3d957599 Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 2012-02-27 12:14:41 -08:00
Jean-Baptiste Queru
354ac772ec Merge "stagefright amrwb: Make local const arrays static" 2012-02-27 12:14:02 -08:00
Jean-Baptiste Queru
695cfe1e1e Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 2012-02-27 12:13:27 -08:00
Martin Storsjo
b084141342 stagefright amr: Avoid C++/C99 for loops with variable declaration 
This makes the code compileable in C89 mode, too.

Change-Id: I9b76f8bfca148d1aec6081b8db139f351d64cfed
 2012-02-27 21:35:48 +02:00
Jean-Baptiste Queru
f7f1280e0c 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
 2012-02-27 11:16:23 -08:00
Jean-Baptiste Queru
1a864db772 Merge "stagefright aacenc: Simplify the definition of __inline" 2012-02-27 11:11:57 -08:00
Jean-Baptiste Queru
77576ff487 Merge "stagefright amrwbenc: Remove a useless check" 2012-02-27 11:11:18 -08:00