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

5406 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Scott Main
79cfde69fd am 52bfc243: docs: fix misc doc bugs from external issue tracker 
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker
 2012-02-09 12:48:08 -08:00
Scott Main
52bfc24368 docs: fix misc doc bugs from external issue tracker 
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
 2012-02-09 12:45:16 -08:00
Martin Storsjo
832dc8f794 stagefright aacenc: Avoid warnings about incompatible pointer types 
Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
 2012-01-30 12:59:03 +02:00
Jean-Baptiste Queru
64085d03ef am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:27:41 -08:00
Jean-Baptiste Queru
12045502c4 Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 2012-01-25 09:17:46 -08:00
Jean-Baptiste Queru
4cd2b34327 am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-24 15:13:45 -08:00
Jean-Baptiste Queru
fc2ea24b02 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-24 15:13:42 -08:00
Jean-Baptiste Queru
98539a4eba Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 2012-01-24 14:26:32 -08:00
Jean-Baptiste Queru
d80cbb8c7b Merge "stagefright aacenc: Add missing newlines at the end of files" 2012-01-24 10:34:25 -08:00
Jean-Baptiste Queru
2ae5805cf1 am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" 
* commit '164a984224f5d430757628028f2522329987350f':
  stagefright aacenc: Properly terminate a comment
 2012-01-24 08:40:50 -08:00
Jean-Baptiste Queru
164a984224 Merge "stagefright aacenc: Properly terminate a comment" 2012-01-24 07:51:12 -08:00
Jean-Baptiste Queru
c3c36b4fe5 am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-19 17:26:16 -08:00
Jean-Baptiste Queru
12b7da6995 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
f3f650db96 am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:26:08 -08:00
Jean-Baptiste Queru
08d3c6e5ba am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:26:03 -08:00
Jean-Baptiste Queru
7ae84204c1 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-19 17:25:58 -08:00
Jean-Baptiste Queru
97aa8ee811 Merge ee4618bc 
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
 2012-01-19 17:18:25 -08:00
Steve Block
f68633da3c Rename LOG_ASSERT to ALOG_ASSERT 
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
 2012-01-19 14:45:08 -08:00
Steve Block
c6aacce371 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
 2012-01-19 14:45:03 -08:00
Steve Block
a51f0e707f Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) 
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
 2012-01-19 14:44:59 -08:00
Steve Block
933e856150 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) 
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
 2012-01-19 14:44:56 -08:00
Steve Block
1afd5bab4e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) 
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
 2012-01-19 14:44:50 -08:00
Steve Block
06ade6ae1b Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) 
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
 2012-01-19 14:44:31 -08:00
Martin Storsjo
4054856dad stagefright aacenc: Add const declarations to some pointers 
This avoids some compilation warnings.

Change-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36
 2012-01-18 08:16:42 +02:00
Jean-Baptiste Queru
c0ef548c74 am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2012-01-13 11:25:09 -08:00
Martin Storsjo
d7bbc3d41a stagefright aacenc: Properly terminate a comment 
This avoids a warning about /* within a comment.

Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
 2012-01-13 21:21:51 +02:00
Mans Rullgard
5433616a0e stagefright aacenc: Fix inline asm 
- don't write input-only registers
- use temp variables instead of hardcoded regs
- don't build constants manually, specify as asm inputs
- remove unnecessary volatile qualifiers

Change-Id: I3b9bb2d30768bcf409dc478bde4489135eeb50d7
 2012-01-13 21:16:12 +02:00
Mans Rullgard
e7e3c5c272 stagefright aacenc: Fix inline asm constraints 
Output-only parameters should use =r or =&r constrains, never +r.

This fixes a lot of warnings about the variable 'result' being
used uninitialized.

Change-Id: Ie689fce8c6ecd874d4fc66e87687c67551d9ab6a
 2012-01-13 21:16:08 +02:00
Martin Storsjo
84b5a370e3 stagefright aacenc: Zero-initialize a struct 
This avoids using uninitialized data in some cases, according
to valgrind.

Change-Id: I2eb5242b93c4d83a1cf6a15f022ec9579e0742a4
 2012-01-13 21:09:06 +02:00
Martin Storsjo
75261fa150 stagefright aacenc: Fix type definitions for 64 bit platforms 
Also don't require LINUX to be defined, enable the MSVC typedefs
only within _MSC_VER.

This fixes a lot of warnings about dereferencing pointer 'winPtr'
breaking strict aliasing rules.

Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
 2012-01-13 21:05:56 +02:00
Martin Storsjo
656bb978b3 stagefright amrwbenc: Make the mem_malloc function 64-bit safe 
Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
 2012-01-13 20:57:09 +02:00
Martin Storsjo
17510c1b4e stagefright aacenc: Add missing newlines at the end of files 
This avoids compiler warnings about missing newlines.

Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
 2012-01-13 20:56:42 +02:00
Mans Rullgard
62a62ef415 stagefright aacenc/amrwbenc: Remove trailing whitespace 
This was applied in AOSP master earlier, in commit
b21611e5b0f1797e39e781d91ade023bac87637f, but when merged
into the Google internal tree in
88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these
changes have been brought in. (The diff of this merge commit
and its first parent, d94b71d, is empty.)

Therefore, reapply the rest of these changes on the files
that still are present in the current version.

Change-Id: I645a9b9134769958a11808a06163123d28d83e46
 2012-01-12 11:14:04 +02:00
Eric Laurent
577d6ccb7b stagefright: limit audio gap for looped playback 
The audio gap when looping audio is mostly due to
a delay requested by the audio player when executing
the end of stream message. This is to allow the audio
to be drained out of the pipe before actually stopping the
AudioTrack.
This delay is not needed when looping as the AudioTrack
is not stopped.

The fix consists in ignoring the requested delay when the
looping flag is set in awesome player.

Issue 5800981.

Change-Id: Ib32d2930c53ecebc21ca8440e6e054c7e20db4a5
 2012-01-09 13:48:25 -08:00
Jamie Gennis
09fc76664a SurfaceMediaSource: use the HW_TEXTURE usage bit 
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
 2011-12-15 18:36:08 -08:00
James Dong
d70c64db9f Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 
1. Revert "Fix drm flag setting missed in false drm recognition fix."
   This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

2. Revert "Fixed the false drm recognition."
   This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.

3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
   This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.

4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
   This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.

As a result of the reverting, many ANRs from WV sniffing are back.

related-to-bug: 5739618
 2011-12-14 11:01:59 -08:00
Andreas Huber
9a023f1f8e DO NOT MERGE: Support for parsing of "folded" RTSP header values 
and some tweaks to the AMR assembler contributed by Samsung (untested).

Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1
related-to-bug: 5669027
 2011-12-13 10:09:48 -08:00
Jeff Tinker
9f704f6c46 Fix drm flag setting missed in false drm recognition fix. 
Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug: 5732033
 2011-12-09 09:09:08 -08:00