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
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
Martin Storsjo
5ab5e003b7
stagefright aacenc: Fix an inline asm constraint
...
Output-only parameters should use =r or =&r constrains, never +r.
This avoids a warning about the variable 'result' being used
uninitialized.
This avoids loading the uninitialized value into the register,
before it is overwritten by the multiplication.
Change-Id: I0ef6179e133c35d290feb8e12bea180ecae11a05
2012-01-13 21:20:03 +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
51a50f01b5
stagefright aacenc: Don't address a Word32 with a Word16 pointer
...
Currently, a pointer to a Word32 is used as a pointer to Word16, which
doesn't work as intended on big endian architectures.
This change needs to be analyzed and tested properly so that it doesn't
cause issues with overflows in these variables. Another solution would be
to change all the scf arrays to 32 bit instead.
Change-Id: I53d9eb83bdaf8d3b1530eb5064dd10b08bce737a
2012-01-13 20:57:27 +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
d24a8f7c0a
stagefright aacenc: Make the bits to write in WriteBits unsigned
...
They shouldn't, as far as I know, ever be a signed value.
Change-Id: I64429c7c0b2b52bec768a04d3c3eb0eb252955fa
2012-01-13 20:56:54 +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
Jean-Baptiste Queru
b4cee0f871
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
2012-01-13 07:48:56 -08: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
John Reck
0a3fcc3eed
Fix Apache stack
...
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
2012-01-11 13:35:29 -08:00
The Android Open Source Project
57ea96a4b3
Reconcile with ics-mr1-release
...
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
2011-12-16 08:08:07 -08:00
Dirk Dougherty
4365a48612
am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview.
...
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
Doc change: edits to ICS MR1 API Overview.
2011-12-16 00:25:06 -08:00
Dirk Dougherty
8b6ed2d17d
Doc change: edits to ICS MR1 API Overview.
...
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
2011-12-16 00:11:43 -08:00
Joe Fernandez
9b06f091c4
am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
...
* commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
2011-12-15 23:12:57 -08:00
Joe Fernandez
5b18c714bb
Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
2011-12-15 23:11:26 -08:00
Joe Fernandez
71d5c1db17
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
...
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
2011-12-15 23:09:43 -08:00
Fred Chung
d30167f0cd
am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
...
* commit '14633f1b1eea585cdc094ebae75708db2293fe56':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
2011-12-15 22:35:10 -08:00
Fred Chung
14633f1b1e
am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
...
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
2011-12-15 22:33:31 -08:00
Fred Chung
48e0617b9e
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
...
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
2011-12-15 22:25:19 -08:00
Scott Main
ed8851a6f2
am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
...
* commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
2011-12-15 22:14:48 -08:00
Scott Main
8e980c1e4e
Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
2011-12-15 22:12:53 -08:00
Scott Main
4faca92faa
am 36c67785: docs: update homepage for 4.0.3 announcment
...
* commit '36c677855c0a54ede9e92aa856cb2250960e922e':
docs: update homepage for 4.0.3 announcment
2011-12-15 22:09:46 -08:00
Scott Main
36c677855c
docs: update homepage for 4.0.3 announcment
...
Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
2011-12-15 22:04:46 -08:00
Jamie Gennis
94180377e7
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 20:52:26 -08:00
The Android Automerger
ce2ac73d1d
merge in ics-mr1-release history after reset to ics-mr1
2011-12-15 20:50:02 -08:00
Scott Main
b193d24145
am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
...
* commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
docs: fix encoding issue or whatever with docs (not showing titles)
2011-12-15 20:22:39 -08:00
Scott Main
4cb7d09535
am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
...
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
docs: fix encoding issue or whatever with docs (not showing titles)
2011-12-15 20:19:55 -08:00
Jamie Gennis
3e0f448fbe
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 20:18:19 -08:00
Scott Main
98af5edc70
docs: fix encoding issue or whatever with docs (not showing titles)
...
Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
2011-12-15 20:13:20 -08:00
Scott Main
34e46115a5
am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
...
* commit '8f266b9e348ba69d953568624b8d0e2cea07f99d':
docs: add remembering users class to nav
2011-12-15 19:59:25 -08:00
Scott Main
8f266b9e34
am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
...
* commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
docs: add remembering users class to nav
2011-12-15 19:56:47 -08:00
Scott Main
d9bc2d21c5
Merge "docs: add remembering users class to nav" into ics-mr0
2011-12-15 19:55:25 -08:00
Scott Main
98e4adf942
am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
...
* commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed':
Doc merge from master:Training class on Identifying and Authenticating Users.
2011-12-15 19:55:00 -08:00
Scott Main
26e461b34f
am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
...
* commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
Doc merge from master:Training class on Identifying and Authenticating Users.
2011-12-15 19:52:50 -08:00
Scott Main
2956f2fd2c
docs: add remembering users class to nav
...
Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
2011-12-15 19:52:33 -08:00
Scott Main
5dac197619
Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
2011-12-15 19:51:48 -08:00
Scott Main
ec09b2691e
am ce5643c7: am abfcbd16: docs: typo in training orientation
...
* commit 'ce5643c7c43c2c680e683c56507ffa1bf5b9a316':
docs: typo in training orientation
2011-12-15 19:49:50 -08:00
Scott Main
ce5643c7c4
am abfcbd16: docs: typo in training orientation
...
* commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
docs: typo in training orientation
2011-12-15 19:47:47 -08:00
Dirk Dougherty
3b33cdcbf8
Doc merge from master:Training class on Identifying and Authenticating Users.
...
Conflicts:
docs/html/training/id-auth/authenticate.jd
docs/html/training/id-auth/custom_auth.jd
docs/html/training/id-auth/identify.jd
docs/html/training/id-auth/index.jd
Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
2011-12-15 19:45:27 -08:00
Scott Main
abfcbd162f
docs: typo in training orientation
...
Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
2011-12-15 19:33:04 -08:00
Roman Nurik
0bc0e5e35a
am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
...
* commit '1584a816ed2e431ae804954dc6bd2d9dc79a540e':
docs: Minor bugfix to Android U navigation design class
2011-12-15 19:27:25 -08:00
Roman Nurik
1584a816ed
am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
...
* commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05':
docs: Minor bugfix to Android U navigation design class
2011-12-15 19:25:25 -08:00
Dave Burke
0cc1e42d74
am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
...
* commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
SurfaceMediaSource: use the HW_TEXTURE usage bit
2011-12-15 19:25:07 -08:00
Dave Burke
ac279de9d9
Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
2011-12-15 19:23:26 -08:00
Roman Nurik
408f94b147
Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
2011-12-15 19:23:00 -08:00
Roman Nurik
265644e22a
docs: Minor bugfix to Android U navigation design class
...
Change-Id: Icedd7edc33b864d1464797a78a5bb878b84f937f
2011-12-15 19:20:02 -08:00