5497 Commits

Author SHA1 Message Date
Martin Storsjo
8606e6b4da stagefright aacenc: Move system headers before local headers
This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.

Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
2012-06-11 23:32:42 +03:00
Jean-Baptiste Queru
ce4de8d141 Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||" 2012-06-08 14:10:11 -07:00
Mathias Franzén
2fe37b7005 Added mpga as valid MediaFile extension
Added mpga as a valid media file extension, it is treated as mp3.

Change-Id: Ie39036d61b6ca50439861fa10be0d824dcc65ed3
2012-06-05 08:20:16 +02:00
Jean-Baptiste Queru
23cad6eb2b Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" 2012-05-25 10:38:06 -07:00
Martin Storsjo
9af8cfa60f stagefright aacenc: Fix reading out of bounds in pow2_xy
This fixes cases where x was a large number, causing fPart to
exceed the 32 bit signed integer range (while fitting in an
unsigned 32 bit integer), making the table index a negative
number.

Change-Id: I674047db65f89148a93d218c138b42cd8305f80e
2012-05-25 19:49:59 +03:00
Jean-Baptiste Queru
55536138cc Merge "libstagefright/matroska: Fix build with gcc 4.7" 2012-05-24 06:53:51 -07:00
Jean-Baptiste Queru
05cd296e71 Merge "libmedia: Fix build with gcc 4.7" 2012-05-24 06:25:55 -07:00
Jean-Baptiste Queru
64f77c5e31 Merge "stagefright avcenc: Use intptr_t for casting pointers to integers" 2012-05-21 14:12:56 -07:00
Jean-Baptiste Queru
6fd507b927 Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting" 2012-05-21 14:12:49 -07:00
Jun Tian
ba71cdcba4 Enable chromium http stack for x86
Use chromium http stack as the online media http stack for x86 platform.

Change-Id: I16a7a8697127a51fab8105833f7463911852f0b3
2012-05-02 15:12:45 +08:00
Jean-Baptiste Queru
1b34c1bc24 Merge "stagefright: Remove useless declarations" 2012-05-01 14:48:06 -07:00
Martin Storsjo
e1efcca846 stagefright: Remove useless declarations
The encoder common library doesn't contain any source
code with assembly optimizations (there is nothing
using the defines in the single source file in the library),
and the source directories added to the include path do
not exist.

Change-Id: If8854ea3bac4ad3504615ae4ad022267103a8b65
2012-04-16 13:52:00 +03:00
Martin Storsjo
6e868a5865 stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
This fixes building on platforms where int is smaller than
pointers, e.g. 64 bit platforms.

Change-Id: I3da0459bac10cbffd1db699bf4782fe926cd391f
2012-04-13 15:02:47 +03:00
Martin Storsjo
3befb246b4 stagefright avcenc: Use intptr_t for casting pointers to integers
This is used for doing integer arithmetic on the pointers, for
checking pointer alignment.

Change-Id: I7a7ff834dc631ac9cce90e46216f64645e1ae6e5
2012-04-13 15:02:33 +03: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
Bernhard Rosenkraenzer
943347cf16 libstagefright/matroska: Fix build with gcc 4.7
gcc 4.7 doesn't like the redefinition of i in the
same scope

Change-Id: Idf1b33af7041f0302f2f2562442a3e11ce9607d9
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2012-03-29 11:41:17 +02:00
Bernhard Rosenkraenzer
0bd12c1f86 libmedia: Fix build with gcc 4.7
gcc 4.7 doesn't like the redefinition of n in the same
scope:
for(size_t n=...;;) {
  size_t n = 2; // <-- duplicate definition
}

Change-Id: Idfc2e768a0eb85a3dacccd3431b4ad44775432a4
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2012-03-29 11:38:59 +02: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
Martin Storsjo
f4e7ff9e5a stagefright aacenc: Add parentheses in expression with mixed && and ||
This doesn't maintain the exact behaviour, but seems closer to
what the original author probably intended.

This avoids a warning.

Change-Id: I191292faa0a25f715f2b7d46ec770827e2ac0b7b
2012-03-09 20:43:32 +02: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