History log of /frameworks/base/media/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
61ebf9cd8f0b7bfbad6840bb828f2300beef745d 29-Oct-2012 Eric Laurent <elaurent@google.com> Merge "audio service: make dock audio is off by default" into jb-mr1-dev
f4a8eb22112c534f436357b50f231778c5c15c25 29-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> No playback and music widget from other user on user switch

On user switch:
- make the current audio focus owner loose audio focus
- clear the remote control display

Bug 7205290
Bug 7307156

Change-Id: I6ebcb94d1d2bae8c57ab98dd7e795b239a981d28
ava/android/media/AudioService.java
5ba0ffa0237a5c300545e4c72591613c6e5b2ed9 29-Oct-2012 Eric Laurent <elaurent@google.com> audio service: make dock audio is off by default

It is better to turn dock audio off by default if the user
has not yet explicitly turned it on from the settings menu.
There is a discoverability issue with current implementation
as we do not launch the settings menu at first dock insertion.
Having audio routed to the dock by default would make the tablet
silent for media content when docked and users will not be directed
to the settings menu.

As the dock audio enable setting is for low end docks only
(analog connection and no jack detection) disabling audio for low end docks
by default does not impact manta and prime docks.

Bug 7302106.

Change-Id: I571f361d41940cfb811f038442ae9ba9c6361d1d
ava/android/media/AudioService.java
c99a1107c0d4fdf47595e5072192d647a01e13b3 27-Oct-2012 Eric Laurent <elaurent@google.com> Merge "add settings for dock audio enabled" into jb-mr1-dev
7ee1e4ff7346a278a6722108fbc1869240b3e866 27-Oct-2012 Eric Laurent <elaurent@google.com> add settings for dock audio enabled

Add settings dock_audio_media_enabled indicating if dock audio
is enabled for media for docks that do not implement jack detection.

Bug 7302106.

Change-Id: I75766b606ceb870b3f89979c4e3cca88ed197aaf
ava/android/media/AudioService.java
92130f6407dc51c58b3b941d28a6daf4e04b8d62 25-Oct-2012 Jeff Brown <jeffbrown@google.com> Add MediaRouter API to get presentation display.

This new API makes it possible for an application to ask on
which Display it should show a Presentation based on the currently
selected media route.

Also added a new API on DisplayManager to query displays that
support a certain category of uses.

Improved the documentation of the Presentation class to explain
how to choose an appropriate Display for presentation.

Bug: 7409073
Change-Id: Iab451215e570ae55f3718fc228303143c800fe51
ava/android/media/MediaRouter.java
33c0a616dbd284b47cc8e6af2eec358fba7c701f 25-Oct-2012 Bryan Mawhinney <bryanmawhinney@google.com> Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
2bb7c122ef6ce8539dfbaeb3292adcd942185f82 24-Oct-2012 Bryan Mawhinney <bryanmawhinney@google.com> Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)

Change-Id: Id8fa45aefde85e2ba2b57694b91485ef25e2e5f2
ava/android/media/MediaRouter.java
d799db406b0bace285b7a82a468f75887f0308b6 24-Oct-2012 Eric Laurent <elaurent@google.com> AudioService: add fix for corrupted settings

Added correction of MODE_RINGER_STREAMS_AFFECTED setting in
case it is inconsistent when read from the database: ringtone,
notification and system streams are always affected by ringer mode.
A corruption of this setting persists accross reboots and propagates via
backup/restore causing devices to play notification and ringtones in silent mode.

Bug 7384750.

Change-Id: I23170413d01e6a8e34ef514f1516d7b9ab8bc656
ava/android/media/AudioService.java
8d9a1f66d9d3dbbd45a56d441a746ec11dba7645 19-Oct-2012 Jeff Sharkey <jsharkey@android.com> More migration to Global settings.

Bug: 7375796
Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
ava/android/media/AudioService.java
3662f2011f1c77d0cc1929a0c28a95bebe9cc505 17-Oct-2012 Yu Shan Emily Lau <yslau@google.com> Append the test case name in the beginning
of the test log.

Change-Id: I621286274d84bfff474f1cc1e01353b3fd66dc23
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
fc2652efedeaae40c4a3748a8de9ee833e1443e1 17-Oct-2012 Yu Shan Emily Lau <yslau@google.com> Merge "Fix the NPE for the memwriter." into jb-mr1-dev
87b8a1c3b69a7c975ae2a8ebaaef5724f1b09cef 17-Oct-2012 Yu Shan Emily Lau <yslau@google.com> Fix the NPE for the memwriter.

Change-Id: Id3a5c8f29b0f6be994ea95eb62f1a0eec8fe75b5
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
256ab9e9b9ccf4ea23e1fcd6e4a9029a8004747f 16-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Use device availability to start WFD audio routing" into jb-mr1-dev
39ca39b0268b6c8d227163c52653162e06b84bda 12-Oct-2012 Marco Nelissen <marcone@google.com> Rewind buffer before copying into it.

b/7334897

Change-Id: I83f795cb662d0845314bfb80b9a27ae45b2a0517
ava/android/media/videoeditor/MediaArtistNativeHelper.java
c203ecfd9f6c356542fcb10bc85b27b98b170ddf 11-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Use device availability to start WFD audio routing

Don't use the force_use mechanism to start WFD audio routing,
but rather only the availability of the remote submix audio
device. This is matched by a change in the audio policy
manager.

Bug 7318180

Change-Id: I756f032d8ca0375c3dbeddb7c321261c497539bc
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
2444ae7e2b8658a4a90f996e678423558744b4a2 11-Oct-2012 Jeff Brown <jeffbrown@google.com> Ensure MediaRouter correctly handles renamed Wifi displays.

Fix a couple of bugs that cause MediaRouter to disconnect from
the current Wifi display whenever it is renamed.

Added an extra check in WifiDisplayAdapter for identity renames.
The Settings app already handles this case but it's good to have
the service check for it as well so we don't store unnecessary
aliases.

Bug: 7310777
Change-Id: I8fddd32ca59f9b798ee31b467b81457508c345f8
ava/android/media/MediaRouter.java
bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4 11-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Don't play notifications during speech recognition" into jb-mr1-dev
3f369684e13dfea0ba8ea134f3e95930b0dd7df0 11-Oct-2012 Adam Powell <adamp@google.com> Fix MediaRouter prioritization around a2dp devices

Most recently connected audio output gets priority. Wifi display will
dominate over everything.

Bug 7324334

Change-Id: I29b59570a2e9b5352be436dc5b7a0a6861dfae6b
ava/android/media/MediaRouter.java
d677054ca63f55abaa1c478ea3c50f6be665a979 10-Oct-2012 Jean-Michel Trivi <jmtrivi@google.com> Don't play notifications during speech recognition

Add support for querying AudioManager to know whether speech
recognition is currently underway.

Don't play a notification if speech recognition is underway.

Bug 7314859

Change-Id: I1bd013a3168cfe1a6b6dcfd28565e1c3c512eb6a
ava/android/media/AudioManager.java
ava/android/media/AudioSystem.java
d175a75d9f4d0b0d32db8ccaeead935687072605 10-Oct-2012 Yu Shan Emily Lau <yslau@google.com> Merge "Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie." into jb-mr1-dev
2ffd20753e9c187c057b2b8f1e65cfddc901c8e9 10-Oct-2012 Yu Shan Emily Lau <yslau@google.com> Instead of collecting the procmem output in
the test, change it as optional. This is to avoid
the tool breakage will block the whole memory test sutie.

Change-Id: Ia7425531ca2151230d7fd98eb710f282e166b4f7
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
14dfe4e0abe21782236af987f39d01dfb38e6ff3 09-Oct-2012 Eric Laurent <elaurent@google.com> Merge "enforce camera sound according to country code" into jb-mr1-dev
b072a9686c29bfbc05b732076a4e89bcca8db08a 09-Oct-2012 Adam Powell <adamp@google.com> Don't do a wifi p2p scan in MediaRouter if we're already connected

When we're connected to a wifi display already, some configurations
might hiccup or otherwise disrupt the media stream if we initiate a
new scan. Block the MediaRouter's default scanning behavior if we
start up while already connected to a wifi display. (A scan will still
occur if the user opens the picker dialog.)

Change-Id: I413efa883eec41fe0377da18bcb55bc72e2ac729
ava/android/media/MediaRouter.java
dd45d01128423a82652a3c9d77fa393631d95229 08-Oct-2012 Eric Laurent <elaurent@google.com> enforce camera sound according to country code

Use mcc config overlay mechanism to enforce camera shutter sounds
in countries where it is mandatory.
Property ro.camera.sound.forced is not needed anymore.
When camera sound is forced, STREAM_SYSTEM_ENFORCED is removed from
streams affected by ringer mode and its volume is
maxed out. AudioSystem.FORCE_SYSTEM_ENFORCED is sent to audio
policy manager to alter the routing policy for STREAM_SYSTEM_ENFORCED.

Also fix streams being unmuted when settings are reloaded
upon user switch while in silent mode.

Add ringer mode to audio service dump.

Bug 7032634.

Change-Id: Iceea5bba3b8d3aabf8e42b222deb33a893dc8f38
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/IAudioService.aidl
33902db75011d863009585682bd08560c5b89a75 08-Oct-2012 Eric Laurent <elaurent@google.com> AudioService: fix settings for fixed volume device

Force max volume for devices with fixed volume policy (HDMI, dock...)
when reading the settings from DB. Otherwise, these devices would
get the default volume which is not what we want.

Also fix a problem related to ringer mode management when reloading the
volume settings upon user switch that would cause a muted stream to be
unmuted.

Bug 7301563;

Change-Id: I81cdb97125b845da584ed680181b93c7c1e5903f
ava/android/media/AudioService.java
11b999d0aaca72a33526795b6849b473cc3dd569 05-Oct-2012 Adam Powell <adamp@google.com> MediaRouter/Wireless Display - correct initial state

Make sure we get the right initial status for wifi displays when a new
display route is first added to the MediaRouter.

Bug 7289746

Change-Id: Id41f704fc88021bd4cdf21e9f4b3c810775e1aea
ava/android/media/MediaRouter.java
097922b9c1e0821beb107024bcd0dc14144c0920 04-Oct-2012 James Dong <jdong@google.com> Throw an exception instead of crash when a surface does not have a binding surface texture

o related-to-bug: 7270329

Change-Id: I498d72187968e89d9498d01b10719569e12be2af
ni/android_media_MediaPlayer.cpp
31fed73701041cd5455942abe2dacfc7639c5370 04-Oct-2012 Eric Laurent <elaurent@google.com> Merge "AudioService: filter flags in volume methods" into jb-mr1-dev
799448bee167c046ed715c7c4e3fe3486bf80d43 25-Sep-2012 Eric Laurent <elaurent@google.com> AudioService: filter flags in volume methods

Strip FIXED_VOLUME flag in setStreamVolume() and
adjustStreamVolume() as this flag is reserved for
framework use.

Bug 4335692.

Change-Id: I507582270f4c4cd631ee81fe50dca895bb6352b3
ava/android/media/AudioService.java
002e9d382d2daa7ed41636463ecdbddbd4897aba 02-Oct-2012 Eric Laurent <elaurent@google.com> audio service: fix system volume settings

STREAM_SYSTEM stream volume is never persisted to settings as
it is always derived from another stream volume (STREAM_RING on phones
and STREAM_MUSIC on tablets). Therefore values stored in settings
are stale from previous releases and should be ignored.

Also fix a problem where a muted stream can be unmuted by
readAudioSettings() even if it is muted by ringer mode.

Bug 7216630.

Change-Id: If23561ddfbc704f89fd0a997faf1b50299a50c2e
ava/android/media/AudioService.java
d640bd325c3be9a350058c835b880a7e0b40dc60 29-Sep-2012 Eric Laurent <elaurent@google.com> enable safe media volume according to country

Enable safe headphone volume feature for all countries that
do not opt otherwise in their mmc configuration.
Opt out for US.

Bug 7231029.

Change-Id: I2619d627508eb2cd1f73db9242e0cb5efa839a2a
ava/android/media/AudioService.java
2ee6a2a83262d05a566bd713d238e89edfd33a29 01-Oct-2012 Adam Powell <adamp@google.com> MediaRouter/Wifi Display improvements

* Don't select the default route on initialization in a process

* Add "connecting" state to MediaRouteButton

Bug 7258981
Bug 7262522

Change-Id: I5cd39b09843783b7e1e17620ca33193f0f3b8fca
ava/android/media/MediaRouter.java
4131a37366d59b5e61f55c4e48d2b22ee0c4cad4 28-Sep-2012 Adam Powell <adamp@google.com> String change for video routing via MediaRouter; "HDMI" not "HDMI audio."

Change-Id: Ifece0cf0bc11ff2ffab254c6177f9db741037df6
ava/android/media/MediaRouter.java
705ab808cf023e0cc38c2ba7cdb9571942cdc04f 17-Sep-2012 Adam Powell <adamp@google.com> Add wireless display selection support to MediaRouter.

* Adds the new route type LIVE_VIDEO

* Wireless displays support both LIVE_VIDEO and LIVE_AUDIO, making
wireless display routes valid selections in when apps make selecting
live audio routes available.

* MediaRouter will only report/manipulate wireless displays that have
already been paired at the system level.

Bug 7177920

Change-Id: Ic221b8687d77b4c0df9801c396b74870e86206e9
ava/android/media/MediaRouter.java
1951db86f527ff4e8c2ddf4306779ce956cd372d 26-Sep-2012 Jeff Sharkey <jsharkey@android.com> Merge "Multi-user ringtone playback." into jb-mr1-dev
65c4a2b26cd8776b0927e9b0e07ecf53bd31b627 26-Sep-2012 Jeff Sharkey <jsharkey@android.com> Multi-user ringtone playback.

Change RingtonePlayer to open content:// Uris based on requesting
UserHandle. Grant SystemUI visibility to all emulated storage so
it can play ringtones for apps without READ_EXTERNAL_STORAGE.

Resolve canonical file:// Uris before passing out of source app,
replacing any /emulated_legacy/-style paths with user-specific
variant so they can be opened by SystemUI. Calling for RemoteViews,
Ringtones, and Notifications.

Bug: 7202982
Change-Id: Ibf0eca8df80c1486711144a7b648f464aadfe099
ava/android/media/IRingtonePlayer.aidl
ava/android/media/Ringtone.java
c6c4365ddb0213c548b055f257dc8077389224fb 25-Sep-2012 Glenn Kasten <gkasten@google.com> Implement android.media.AudioManager.getProperty()

Bug: 6635041
Change-Id: I0e7d53b99559cdc89f2f107f23048e4b1a8dd383
ava/android/media/AudioManager.java
ava/android/media/AudioSystem.java
4bbcc6549738f3d69831b2bd9eb4accec3e9920e 24-Sep-2012 Eric Laurent <elaurent@google.com> Display a fixed volume silder when docked.

Align UI indication to volume policy when docked: the music volume
cannot be adjusted when docked or connected to HDMI. Display
a disabled slider at max volume in this case to be consistent.

Bug 4335692.

Change-Id: I6f8db143b0e2ecf54e4bdacd88afdeb661a98a18
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
bf2e088b008cdc80059b943c3b144ec982963f4e 25-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge into jb-mr1-dev

Change-Id: Iba23d16643b8754f6e0a7288b2ca242f722f1bdd
5bfaeaef3fc348d66f48b86be08655e91dff910a 22-Sep-2012 Eric Laurent <elaurent@google.com> pause music playback when switching user.

AudioService sends AudioManager.ACTION_AUDIO_BECOMING_NOISY
intent when notified of a user switch to pause music playback
for all background users.

Bug 7128886.

Change-Id: I6a24409533bf40c517c43da25b9baeceb3379cb8
ava/android/media/AudioService.java
9903e2638a6c502d96413680d3ebae4fb77fc412 22-Sep-2012 Eric Laurent <elaurent@google.com> Volume keys control music volume after music stops

On phones, add a short delay during which volume keys still
control music volume after music has stopped. This is similar
to the tablet behavior for notifications volume.
It allows users to control the prompt volume for talk back,
voice search or navigation even after the prompt has stopped.

Bug 7162364.

Change-Id: Iffbca9ec30ebcbe5846f783ddd260b6e736caf2b
ava/android/media/AudioService.java
f1a457d06c53a901ea08d2d3fb6e766bc06c4d4f 21-Sep-2012 Eric Laurent <elaurent@google.com> Do not turn safe volume on upon headset connection

It is not a requirement to force headphone volume limitation
back on when a headset is plugged in. Only turn it back on
when the device is power off or after 20 hours of cumulative
music listening.

Bug 7064975.

Change-Id: Idabd417a9a9b8096552119c0ff528ba193cfdb5d
ava/android/media/AudioService.java
d86077c3792ca03f004376d81e449a3ecdaa5e8b 20-Sep-2012 Glenn Kasten <gkasten@google.com> Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev
62796aac596f556a1871358bb8ce93af9d55c5a5 20-Sep-2012 Glenn Kasten <gkasten@google.com> Expose android.media.AudioManager.getProperty()

Also fix minor documentation errors.

Bug: 6635041
Change-Id: I6bbbf1b7c5ab705ac374436ea0c098cb3c27fd4a
ava/android/media/AudioManager.java
f9fac2c5fe3f304ee866b1afc3191d36835e96bd 20-Sep-2012 Eric Laurent <elaurent@google.com> Merge "Add multi user volume management" into jb-mr1-dev
bc0fab1fc2db832ef86d8a33466ec4d68b103ca0 19-Sep-2012 Eric Laurent <elaurent@google.com> Add multi user volume management

Notification and Alarm volumes are per user: they are saved and restored
when the foreground user changes.
Media volume is global: it is still saved and restored per user for
implentation reasons but is copied from one user to the next to ensure
media playback volume continuity when switching users.

Ringer mode (silent, vibrate...) is now a global setting.

Bug 7128886.

Change-Id: I9f4f5a0a3985552bca61c2cc3bbe5a144db755a6
ava/android/media/AudioService.java
549be8beadf5ad2a56b7f4269d419753c0d61be8 19-Sep-2012 Glenn Kasten <gkasten@google.com> Merge "New API for querying audio properties" into jb-mr1-dev
954a5d61a2b66a64a841669f75e1cbd9103029b5 19-Sep-2012 Mike Lockwood <lockwood@google.com> Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev
db45484e4b5858d14da93d3a06311b93bf0cf320 18-Sep-2012 Mike Lockwood <lockwood@google.com> AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected

Bug: 7051259

Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
465d72073c6d47a27b51d384bd9e019faa7957c1 18-Sep-2012 Mike Lockwood <lockwood@google.com> am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"

* commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6':
MtpData bmp format file can't recognize when copy bmp into DUT
945080b5b61e28bfc05c75ba5b2030d1e43d0f19 18-Sep-2012 Mike Lockwood <lockwood@google.com> am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"

* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
MtpData bmp format file can't recognize when copy bmp into DUT
1e86994cd0e13f9084d3f4bd0060b9e34c935490 18-Sep-2012 Mike Lockwood <lockwood@google.com> Merge "MtpData bmp format file can't recognize when copy bmp into DUT"
c5a6cdeb14c5112e9c418fe7bf4a3c15740629e4 18-Sep-2012 Marco Nelissen <marcone@google.com> Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev
af68e7c5f5e67455e0c9d91c0e9326f437cba32a 18-Sep-2012 Marco Nelissen <marcone@google.com> Visualizer only works on sounds >5 sec.

Various media framework tests use a Visualizer to look at the output
of another effect, but this requires the played file to be longer
than 5 seconds.
b/4571740
b/7173543
b/7173545
b/7175623

Change-Id: I066a737542bb50e7245fef99f9e11ae8f2aadd6c
ests/contents/media_api/music/sine_200+1000Hz_44K_mo.wav
4dff2ab52bb36f532954a5fc92df1b524e067a82 18-Sep-2012 Marco Nelissen <marcone@google.com> Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev
c7fb118d90e92a26794257e837018b8c1cb15673 18-Sep-2012 Marco Nelissen <marcone@google.com> Activity.onStop(Bundle) does not exist

Since that method doesn't exist, the MediaFrameworkTest wake lock was
never released, which caused the test to be killed when the GC collected
the still active wake lock.

Change-Id: Iee2c0478470be987ade405a45abf42ca61b681ab
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
228c9847a31b79f8baa80302731cdbf6a2b3c0d4 14-Sep-2012 Glenn Kasten <gkasten@google.com> New API for querying audio properties

Bug: 6635041
Change-Id: I66e87c75af7c84cdb23cb25a958e79bba8e53baa
ava/android/media/AudioManager.java
c34dcc1e1ebf152bb400abbb8bc25f7dc0c3ba97 10-Sep-2012 Eric Laurent <elaurent@google.com> headphone volume limitation

Limit music volume when headphones or headset are inserted.
Display warning message when user wants to increase the volume
above a platform specific volume and request user acknowledgement
before proceeding.

TODO: exact wording of the warning message must be defined by UX.

Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
ava/android/media/AudioService.java
51e67a0a742e86415314b2d9261b1abf47a64165 13-Sep-2012 Ruei-sung Lin <rslin@google.com> Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-mr1-dev
3ddaace1a27e35eed78bdc4b6dc380d81ba6806d 13-Sep-2012 Mike Lockwood <lockwood@google.com> Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev
f6f16614574767263fcd0073f72c099edaca0607 13-Sep-2012 Mike Lockwood <lockwood@google.com> MtpDatabase: Use actual file size instead of media database size column

Fixes problems with file transfer from device to host that can occur
if the database size value is wrong.

Bug: 6954446

Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/mtp/MtpDatabase.java
ni/android_mtp_MtpDatabase.cpp
c733a79a4309a75ecda1731b2ffc84a8b9ac4f3c 12-Sep-2012 Ruei-sung Lin <rslin@google.com> Fix b/7087723 Patch leftover after tapping the red eye area

Change-Id: I06f5c491b09cf13698f001e8b11f42506fda5bbd
ca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java
a962d749ede478602ebff82d9dfab0482d5c6b54 12-Sep-2012 Marco Nelissen <marcone@google.com> Merge "EffectsTest enhancements" into jb-mr1-dev
80cd3fcd5cdae6a2ea4a7c834d1df0dd79eb5b89 11-Sep-2012 Marco Nelissen <marcone@google.com> EffectsTest enhancements

Fix the session edit boxes, and make the effects list more readable
by translating known effect type UUIDs

Change-Id: I67e78d8d2781c5a56fa35d994bc21911d15f8715
ests/EffectsTest/res/layout/bassboosttest.xml
ests/EffectsTest/res/layout/equalizertest.xml
ests/EffectsTest/res/layout/presetreverbtest.xml
ests/EffectsTest/res/layout/virtualizertest.xml
ests/EffectsTest/res/layout/visualizertest.xml
ests/EffectsTest/src/com/android/effectstest/EffectsTest.java
25da9375fdf2e92c3f50c878da9c781a368bf255 11-Sep-2012 Mike Lockwood <lockwood@google.com> Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev
58e6831ccb54b33a914115e88ebb67e720615fb8 11-Sep-2012 Mike Lockwood <lockwood@google.com> MtpDatabase: Fix typo affecting parent and format queries

Bug: 7114350

Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/mtp/MtpDatabase.java
2ac2afeac989ea1dc326b0db996d6c6c8e00cc29 21-Aug-2012 Jean-Michel Trivi <jmtrivi@google.com> Add support for controlling remote submix audio routing

Add method in AudioManager to control remote submix through
AudioService.
AudioService controls remote submxi: enabling/disabling
remote submix will:
- make the sink audio device available/unavailable
- make the audio source available/unavailable
- force/unforce media streams to be routed to WFD

Change-Id: I05d9cc7c3e8a720318ec1385737cbd46a21a3207
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/IAudioService.aidl
ava/android/media/MediaRecorder.java
7017e48380ab0c1be033594bb2a9331898ad5be8 08-Sep-2012 Jeff Brown <jeffbrown@google.com> Merge "Add support for Wifi display." into jb-mr1-dev
cbad976b2a36a0895ca94510d5208a86f66cf596 05-Sep-2012 Jeff Brown <jeffbrown@google.com> Add support for Wifi display.

Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
ava/android/media/RemoteDisplay.java
53082eced917e0af8fd06486e824d3ea78bc65b6 28-Aug-2012 Eric Laurent <elaurent@google.com> AudioSystem: new audio device enums

Update audio device enums to match new definitions in
native framework.

Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
ava/android/media/AudioSystem.java
37ee53420ce47860807eb8eaeb454c12fa46797b 07-Sep-2012 Mike Dodd <mdodd@google.com> Merge "Add context support to backdropper filter." into jb-mr1-dev
f330d19a17ebdaabdad4e97222f65e7b580abe76 07-Sep-2012 Mike Dodd <mdodd@google.com> Add context support to backdropper filter.

Part of b/7028438

Change-Id: Idcae38b452abc847c7b869a5568d1c5d831411b7
ca/effect/java/android/media/effect/effects/BackDropperEffect.java
2e2beaaee2a427598ced5067fc59f3ae9a98cf35 06-Sep-2012 Marco Nelissen <marcone@google.com> Audio Effects test app

Change-Id: I93fff0e195af3205207ade32ab31f2a760574c7f
ests/EffectsTest/Android.mk
ests/EffectsTest/AndroidManifest.xml
ests/EffectsTest/res/drawable/icon.png
ests/EffectsTest/res/drawable/stop.png
ests/EffectsTest/res/layout/bassboosttest.xml
ests/EffectsTest/res/layout/effectstest.xml
ests/EffectsTest/res/layout/envreverbtest.xml
ests/EffectsTest/res/layout/equalizertest.xml
ests/EffectsTest/res/layout/presetreverbtest.xml
ests/EffectsTest/res/layout/virtualizertest.xml
ests/EffectsTest/res/layout/visualizertest.xml
ests/EffectsTest/res/raw/mp3_sample.mp3
ests/EffectsTest/res/raw/sine440_mo_16b_16k.wav
ests/EffectsTest/res/values/strings.xml
ests/EffectsTest/src/com/android/effectstest/BassBoostTest.java
ests/EffectsTest/src/com/android/effectstest/EffectParameter.java
ests/EffectsTest/src/com/android/effectstest/EffectsTest.java
ests/EffectsTest/src/com/android/effectstest/EnvReverbTest.java
ests/EffectsTest/src/com/android/effectstest/EqualizerTest.java
ests/EffectsTest/src/com/android/effectstest/PresetReverbTest.java
ests/EffectsTest/src/com/android/effectstest/SimplePlayer.java
ests/EffectsTest/src/com/android/effectstest/VirtualizerTest.java
ests/EffectsTest/src/com/android/effectstest/VisualizerTest.java
c67fb6c39e75a08e50977e143d7ae7bd11e2604c 06-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."

* commit '657dba9e66ff02785c2bf034ebecc3c357cbc333':
Musicplayer application can not display DRM files of internal storage.
4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858 06-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."

* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
Musicplayer application can not display DRM files of internal storage.
20c38ea9fd4024cc076c825f46cdfb34ffc090de 18-May-2012 Jan Bjernler <jan2.bjernler@sonymobile.com> Musicplayer application can not display DRM files of internal storage.

Make DRM-protected files transferred over MTP be detected.
Previously it was inserted into the database as MEDIA_TYPE_NONE,
the result of this was that the file was not detected properly.
With this fix the file is scanned from the beginning.

Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
ava/android/media/MediaScanner.java
73365695e4d169126c6932df8e8e932aefe6aaca 30-Aug-2012 Dianne Hackborn <hackbod@google.com> Merge "Improve multi-user broadcasts." into jb-mr1-dev
4dc187b43a77be3785c76f42c2fed598f4cee5da 30-Aug-2012 Teng-Hui Zhu <ztenghui@google.com> Merge "Fix a typo in the sample code" into jb-mr1-dev
a242deb1de365f0ed0032a87565df1971cb6bbe2 30-Aug-2012 Teng-Hui Zhu <ztenghui@google.com> Fix a typo in the sample code

Change-Id: I27ee1b0ef8abf5decefae1ec1706a9f142016344
ava/android/media/MediaExtractor.java
5ac72a29593ab9a20337a2225df52bdf4754be02 30-Aug-2012 Dianne Hackborn <hackbod@google.com> Improve multi-user broadcasts.

You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.

Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.

New Context APIs for more kinds of sending broadcasts as users.

Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.

Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.

Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
ava/android/media/AudioService.java
794da7a0543cbecffefb73794aa68d1a93e41adf 30-Aug-2012 Eric Laurent <elaurent@google.com> AudioService: pause music when undocked

Send becomming noisy event also when disconnecting a dock
(analog, digital or USB) or HDMI.

Bug 6760590.

Change-Id: I497df35a3c6817d2b300f532d4cc3f12e3ce9ace
ava/android/media/AudioService.java
dc7d8008eceb08850142fcd77a97404b4fbe688d 28-Aug-2012 Jeff Brown <jeffbrown@google.com> Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev
64a55af0ac700baecb0877235eb42caac59a3560 26-Aug-2012 Jeff Brown <jeffbrown@google.com> Add plumbing for new surface flinger display API.

Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.

Added JNI for all of the new surface flinger display API calls.

Enforced the requirement that all Surfaces created by
the window manager be named.

Updated the display manager service to use the new methods.

Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
ni/android_media_MediaCodec.cpp
ni/android_media_MediaPlayer.cpp
c77c6898b3e0fd057d1f9d8696f467d29bc2441f 27-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"

* commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a':
Make setCaptureRate locale safe
3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a 27-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"

* commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
Make setCaptureRate locale safe
1c7928e8c68654d087f83c7cefc59095950b8bef 27-Aug-2012 Johan Redestig <johan.redestig@sonymobile.com> Make setCaptureRate locale safe

Dont use the default String.format in setCaptureRate as it is both
locale unsafe and less efficient than regular string concatenation
in this case.

Change-Id: I29418ec0352ef8c79967592b6eb8ff66cc9c99f0
ava/android/media/MediaRecorder.java
2adac496a891ba70cc2797a36aacf642e10b8c8d 26-Aug-2012 James Dong <jdong@google.com> Added some common error codes in MediaPlayer.java

o related-to-bug: 6770717

Change-Id: Iea8ba6943755a9af8df5b6e91284c7c1b32c3c6c
ava/android/media/MediaPlayer.java
c209a06cfdcf633f12a299245312e3ac32bff27c 24-Aug-2012 Marco Nelissen <marcone@google.com> Let apps provide a custom data source for extractors

Adds android.media.DataSource, which is modeled after its native namesake,
and a new method on MediaExtractor that lets apps specify their implementation
of a DataSource as the source of data for the extractor.

Change-Id: If1b169bd18d2691ebc4f8996494dfc8ee0894b6c
ava/android/media/DataSource.java
ava/android/media/MediaExtractor.java
ni/android_media_MediaExtractor.cpp
ni/android_media_MediaExtractor.h
2253eeab6c0c20e0b03f144c5bc23ae13e8ab234 07-Aug-2012 Teng-Hui Zhu <ztenghui@google.com> Add context support into the filter framework.

Basically we need the context to pass the content URI into MediaPlayer.
bug:6837809

Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2
ca/filterpacks/java/android/filterpacks/videosrc/MediaSource.java
1abb7b541521d528c8d4f1ec5b79238842e1d155 21-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"

* commit 'f96fcd5095e751fc9402d8bbecdf59f53e00d854':
To avoid the JNI memory leaks in video editor codes
f96fcd5095e751fc9402d8bbecdf59f53e00d854 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"

* commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
To avoid the JNI memory leaks in video editor codes
240582eabee56d55751b85e220811d48fabe839a 27-Feb-2012 bo huang <bo.b.huang@intel.com> MtpData bmp format file can't recognize when copy bmp into DUT

add support for bmp format.

Change-Id: I67d4703b43cd32abad638bae57bbceb65b4be6de
Author: bo huang <bo.b.huang@intel.com>
Signed-off-by: bo huang <bo.b.huang@intel.com>
Signed-off-by: Wu, Hao <hao.wu@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 24555
ava/android/mtp/MtpDatabase.java
c96a7294a4ec7f807dbe0fd82a2ba2d58008304b 25-Jun-2012 wfeng6 <wei.feng@intel.com> To avoid the JNI memory leaks in video editor codes

There is a protential memory leak in video editor JNI codes.
When importing so many video clips, the number of local reference
will exceed 512, which will cause the Dalvik virtual machine
crash. The patch will free each local reference when it's no
longer used to avoid memory leaks.

Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40
Author: Wei Feng <wei.feng@intel.com>
Signed-off-by: Wei Feng <wei.feng@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 40786
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorJava.cpp
ni/mediaeditor/VideoEditorMain.cpp
97fb26c838340a7e21a7c3249940bc11df70c873 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am b18bcf13: am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"

* commit 'b18bcf13fd47102a2527e599cde0b1d59ab7c51e':
Fix Issue #35489: drm content corruption on GB
b18bcf13fd47102a2527e599cde0b1d59ab7c51e 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"

* commit 'd2fb6e99bda1ae607b5dfbb68905030f2133f8e8':
Fix Issue #35489: drm content corruption on GB
fd20296c27fd95859d623a2bc23ac9b4799710e3 30-Jul-2012 git-you.kim72.gmail.com <you.kim72@gmail.com> Fix Issue #35489: drm content corruption on GB

If rawContent is copied into mediaBuf, readBuf is copied to wrong address.
mediaBuf should be forwarded by readBytes.

Change-Id: I4fc9c1f7f4e3d5dfe3c7e5cd92261608f6b3e248
Signed-off-by: git-you.kim72.gmail.com <you.kim72@gmail.com>
ibdrm/mobile1/src/objmng/drm_api.c
0bf666a875415bae7a1e575eea9b8e5e7762ff3d 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist"

* commit '4da3769d30851f0b517a688a5c835715d7d0b0bf':
mediacodec: Don't crash if trying to open a codec that does not exist
e68323325b398eee98d5c81a6024d377ebc48bc1 13-Jul-2012 Martin Storsjo <martin@martin.st> mediacodec: Don't crash if trying to open a codec that does not exist

Change-Id: If75e3156517993629f50622a84a9ac573fced815
ni/android_media_MediaCodec.cpp
d0604565ee0a21bb72c3b31a39f51b9758177a11 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am d2388b50: am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"

* commit 'd2388b50a5c16b920bdd656448107a21e49d753b':
MtpStorage: correct the size of reserve space for MTP
d2388b50a5c16b920bdd656448107a21e49d753b 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"

* commit '53ad027c46bf578e26e5db70319b17a671ce8a36':
MtpStorage: correct the size of reserve space for MTP
53ad027c46bf578e26e5db70319b17a671ce8a36 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "MtpStorage: correct the size of reserve space for MTP"
6736cca08df84328913962f9a14fafa13a25d390 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"

* commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3':
mediacodec: Don't suggest calling getOutputFormat() immediately
aef4af4cd122ca5713110ccc7539828ce6e2f642 08-Aug-2012 James Dong <jdong@google.com> Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev
a35379ae984ddb8fe067c4b115fffc5a21e565e1 08-Aug-2012 James Dong <jdong@google.com> Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class

o As a result, applications can listen for death notification from MediaRecorder onError callbacks

Change-Id: I49896c4ae8130bd67b52deff6eb97a22b43d3f32
ava/android/media/MediaRecorder.java
2d286f4984d478cc5947a3a3ceea85b292d5f920 07-Aug-2012 Mike Lockwood <lockwood@google.com> MediaFile: Fix case sensitive file extension matching for computing MTP format code

Bug: 6939136

Change-Id: Iefd4083aefbd4b175a2f8c860a9e13c99ded9c82
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/MediaFile.java
d932de9aff49d1d9f752ad479b42854d2557c881 13-Jul-2012 Martin Storsjo <martin@martin.st> mediacodec: Don't crash if trying to open a codec that does not exist

Change-Id: If75e3156517993629f50622a84a9ac573fced815
ni/android_media_MediaCodec.cpp
b529e4c9ca8a6790162275ac2e481f768a6d585f 12-Jul-2012 Martin Storsjo <martin@martin.st> mediacodec: Don't suggest calling getOutputFormat() immediately

Calling getOutputFormat() at this point currently crashes in
native code. (After a fix to the native code, this gives an
IllegalStateException instead.)

Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
ava/android/media/MediaCodec.java
3b60dacb4e1871d1c7b410ac55fd3e5fd6bfacfb 06-Aug-2012 bo huang <bo.b.huang@intel.com> MtpStorage: correct the size of reserve space for MTP

According to description in frameworks/base/core/res/res/xml/storage_list.xml,
"mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage".
Mtpstorage class use it directly and doesn't change it to correct size in megabyes.
Mtp initor can not get correct storage information from android.

Change-Id: Icf59eb1eb478e67ea5990be96a9decb41aa55504
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
Signed-off-by: Jack Ren<jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ava/android/mtp/MtpStorage.java
8ab2dc2f9680307febe997631c2148729f714e3d 01-Aug-2012 Marco Nelissen <marcone@google.com> Improve scan time for some cases

When the path being matched has a sqlite wildcard character in it, a "like"
match will be quite slow. Unfortunately this is fairly common, since "_"
is a wildcard character. However, because in most cases the case of the path
in the database will match the case on disk, an "=" match will work, so it
is worthwhile to try an "=" match first, before trying a "like".

If there are no wildcard characters, the "like" will be as fast as the "=",
because of the case-insensitive index on the _data column, so there is no
need to try "=" first in that case.

b/6751354

Change-Id: I1cd4efbd56a37886cb44a86acb73eb9a3c9f303d
ava/android/media/MediaScanner.java
998483319195f903529363ebbad0e694acd0a21b 31-Jul-2012 James Dong <jdong@google.com> Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class

o related-to-bug: 6872687

Change-Id: I94569bb8357c39e8309974ede8284b33a996866c
ava/android/media/MediaMetadataRetriever.java
b10ec1f4b1f6a3552060d44359dd64cc37b1a497 31-Jul-2012 James Dong <jdong@google.com> Fix a typo (dependant => dependent)

Change-Id: I0337bec1a26e852c32ea9f1ce54f270f79ee3ab1
ava/android/media/MediaPlayer.java
1f9196a8e5de9b004e61afabc70b18caf7cf9c7e 27-Jul-2012 Jean-Michel Trivi <jmtrivi@google.com> Relax rules for media apps to stay on RemoteControlDisplay

The playback of notification would make the display of the
RemoteControlClient disappear from the lockscreen.

Fixed by modifying which AudioFocus owner to consider when
reevaluating how the RemoteControlDisplay needs to be updated:
use the first (starting from the top of the AudioFocus stack) that
uses STREAM_MUSIC, or that uses any other stream type for a short
period.

Change-Id: Id7cef00c5eed1f6ebfa59634eea8e2c9b2f3f5eb
ava/android/media/AudioService.java
33806e25b176efb11a5ee8b0f038bfda8f933f0d 26-Jul-2012 Jean-Baptiste Queru <jbq@google.com> Remove unnecessary stagefright notices

They now live in frameworks/media

Change-Id: Ic8b457c422359f260d6a1fed8c499b74aa9c6491
ibstagefright/codecs/aacdec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/aacdec/NOTICE
ibstagefright/codecs/aacenc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/aacenc/NOTICE
ibstagefright/codecs/aacenc/SampleCode/MODULE_LICENSE_APACHE2
ibstagefright/codecs/aacenc/SampleCode/NOTICE
ibstagefright/codecs/amrnb/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrnb/NOTICE
ibstagefright/codecs/amrnb/common/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrnb/common/NOTICE
ibstagefright/codecs/amrnb/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrnb/dec/NOTICE
ibstagefright/codecs/amrnb/enc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrnb/enc/NOTICE
ibstagefright/codecs/amrwb/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrwb/NOTICE
ibstagefright/codecs/amrwbenc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrwbenc/NOTICE
ibstagefright/codecs/amrwbenc/SampleCode/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrwbenc/SampleCode/NOTICE
ibstagefright/codecs/avc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/avc/NOTICE
ibstagefright/codecs/avc/common/MODULE_LICENSE_APACHE2
ibstagefright/codecs/avc/common/NOTICE
ibstagefright/codecs/avc/enc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/avc/enc/NOTICE
ibstagefright/codecs/common/MODULE_LICENSE_APACHE2
ibstagefright/codecs/common/NOTICE
ibstagefright/codecs/g711/MODULE_LICENSE_APACHE2
ibstagefright/codecs/g711/NOTICE
ibstagefright/codecs/g711/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/g711/dec/NOTICE
ibstagefright/codecs/m4v_h263/MODULE_LICENSE_APACHE2
ibstagefright/codecs/m4v_h263/NOTICE
ibstagefright/codecs/m4v_h263/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/m4v_h263/dec/NOTICE
ibstagefright/codecs/m4v_h263/enc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/m4v_h263/enc/NOTICE
ibstagefright/codecs/mp3dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/mp3dec/NOTICE
ibstagefright/codecs/on2/MODULE_LICENSE_APACHE2
ibstagefright/codecs/on2/NOTICE
ibstagefright/codecs/on2/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/on2/dec/NOTICE
ibstagefright/codecs/vorbis/MODULE_LICENSE_APACHE2
ibstagefright/codecs/vorbis/NOTICE
ibstagefright/codecs/vorbis/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/vorbis/dec/NOTICE
ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4 26-Jul-2012 Jeff Smith <whydoubt@yahoo.com> am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214

* commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c':
Fix several cases of broken droiddoc syntax external issue 35214
71930dd77e4dc6f6be5c648019d2ab0da5f0584c 25-Jul-2012 Jeff Smith <whydoubt@yahoo.com> am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214

* commit 'a45746efadd11bb7dfab026fb3c81a25fae74ca4':
Fix several cases of broken droiddoc syntax external issue 35214
a45746efadd11bb7dfab026fb3c81a25fae74ca4 19-Jul-2012 Jeff Smith <whydoubt@yahoo.com> Fix several cases of broken droiddoc syntax
external issue 35214

patch contributed by Jeff Smith <whydoubt@yahoo.com>

Change-Id: I70dcee88a140699bf3e1ab369bed6dcd2fdd3d83
ava/android/media/MediaExtractor.java
ava/android/media/MediaPlayer.java
15a89e6b48e9cd0112efcfd903843c5912e26567 24-Jul-2012 James Dong <jdong@google.com> Added MEDIA_INFO_VIDEO_RENDERING_START as an informational event

o MEDIA_INFO_VIDEO_RENDERING_START indicates that the player just pushed the very first video frame
of a video source for rendering.

Change-Id: I32dad93990f5d48b70fc79d841ca3ce3b1af4027
related-to-bug: 6851811
ava/android/media/MediaPlayer.java
c64c1cbef4d52cbd82c38485be3270eddf743f98 19-Jul-2012 James Dong <jdong@google.com> am d1a0a53e: am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev

* commit 'd1a0a53eec141b615697652b3a8907a60298a414':
Changed to obtain a parcel in each notify() call in jni.
d1a0a53eec141b615697652b3a8907a60298a414 19-Jul-2012 James Dong <jdong@google.com> am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev

* commit '5d478b9c1009b077649f7f870d993832d380d63c':
Changed to obtain a parcel in each notify() call in jni.
5d478b9c1009b077649f7f870d993832d380d63c 19-Jul-2012 James Dong <jdong@google.com> Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev
41a48e4a9984eff92705a0c52104b0abd365521a 17-Jul-2012 Adam Powell <adamp@google.com> am c36b8acd: am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev

* commit 'c36b8acd1e850619de0bbf678b9573d4d761d836':
Properly switch MediaRouter to wired audio over a2dp.
c36b8acd1e850619de0bbf678b9573d4d761d836 17-Jul-2012 Adam Powell <adamp@google.com> am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev

* commit '388953942b536b5eebd942ef78ae5b7499bc2078':
Properly switch MediaRouter to wired audio over a2dp.
fdd3241a24fc31d7e161ce0e1bb50bef413394c7 12-Jul-2012 Martin Storsjo <martin@martin.st> mediacodec: Don't suggest calling getOutputFormat() immediately

Calling getOutputFormat() at this point currently crashes in
native code. (After a fix to the native code, this gives an
IllegalStateException instead.)

Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
ava/android/media/MediaCodec.java
bcf21e913af7252fb1994e07b6cf179321ecd049 12-Jul-2012 Adam Powell <adamp@google.com> Properly switch MediaRouter to wired audio over a2dp.

The system gives priority to physically connected
headphones/speakers/docks/etc. Reflect this in MediaRouter and
associated UI.

Bug 6777592

Change-Id: Ibabf3d7512207117e892c99f004443490c3d0612
ava/android/media/MediaRouter.java
0fb362b41ef4c272148b90d16880f09160293f96 11-Jul-2012 Yu Shan Emily Lau <yslau@google.com> am 413b5c19: am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev

* commit '413b5c19a681bb4fda4cc5a6e8347d37792aa905':
Remove the unnecssary intent call.
413b5c19a681bb4fda4cc5a6e8347d37792aa905 11-Jul-2012 Yu Shan Emily Lau <yslau@google.com> am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev

* commit '10366b93157718ed8621f5af087e7a771191b41a':
Remove the unnecssary intent call.
10366b93157718ed8621f5af087e7a771191b41a 11-Jul-2012 Yu Shan Emily Lau <yslau@google.com> Merge "Remove the unnecssary intent call." into jb-dev
e60393ae7168e97922dd7d4821a69d5546a6a522 11-Jul-2012 Yu Shan Emily Lau <yslau@google.com> Remove the unnecssary intent call.

Change-Id: Ia0a460ca8532ccb2f4b0f0205d192b1ba907b5b6
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
f2b0c11f4e797e183131261724d8de310dac5431 09-Jul-2012 Jean-Michel Trivi <jmtrivi@google.com> Fix sound effect attenuation calculation

The sound effect volume attenuation calculation is wrong: the
division by 20 was always returning 1 or 0.
In AudioService, rename the sound effect attenuation value to
follow the naming conventions for static variables.

Change-Id: I3c36d50f4470ff09ca98cb944aefb5ad0f968782
ava/android/media/AudioService.java
28b7809e309637decc867547dc34b7635785c5f8 10-Jul-2012 Eric Laurent <elaurent@google.com> Merge "AudioService: fix a2dp force use delay"
333c09945e7399c6a2b1f4d9fdf981508e38db52 09-Jul-2012 Insun Kang <insun@google.com> Changed to obtain a parcel in each notify() call in jni.

Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85
related-to-bug: 6785452
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
c390bed06b4a572e273ead1254da9a932e04dce3 03-Jul-2012 Eric Laurent <elaurent@google.com> AudioService: fix a2dp force use delay

Fixed setBluetoothA2dpOnInt() so that AudioSystem.setForceUse()
is called synchronously and not via a message.

This is because the order in which setForceUse() and setDeviceConnectionState()
are executed is important to avoid audio glitches when called from
onSetWiredDeviceConnectionState().

Bug 6720482.

Change-Id: I09c975d1108fd38f31b047c082acdf944ab790a7
ava/android/media/AudioService.java
9b52b9c83d4b39c22c0e90d982c145282d829363 04-Jul-2012 Scott Main <smain@google.com> am 7b5488d8: am 099fd80f: docs: add throws notice for isPlaying per external issue 33610

* commit '7b5488d85d8ed36c42a821fb0064de741cca35c9':
docs: add throws notice for isPlaying per external issue 33610
7b5488d85d8ed36c42a821fb0064de741cca35c9 04-Jul-2012 Scott Main <smain@google.com> am 099fd80f: docs: add throws notice for isPlaying per external issue 33610

* commit '099fd80f984b8493de58bdda8ea05563261b0af2':
docs: add throws notice for isPlaying per external issue 33610
099fd80f984b8493de58bdda8ea05563261b0af2 04-Jul-2012 Scott Main <smain@google.com> docs: add throws notice for isPlaying
per external issue 33610

Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
ava/android/media/MediaPlayer.java
f16b211ebfe36544bae832f9b9968b9640720be3 28-Jun-2012 Scott Main <smain@google.com> am 00a82605: am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev

* commit '00a82605a17360f5b9005035a75d779a231d5a5c':
Minor corrections to the javadoc overview to reflect late API changes.
00a82605a17360f5b9005035a75d779a231d5a5c 28-Jun-2012 Scott Main <smain@google.com> am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev

* commit 'f443c5ea2c67285322d4790e5bee4c3c6f6af1ae':
Minor corrections to the javadoc overview to reflect late API changes.
f443c5ea2c67285322d4790e5bee4c3c6f6af1ae 28-Jun-2012 Scott Main <smain@google.com> Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev
2ac3f2e285159300c62c797bb2123604773ccac7 27-Jun-2012 Andreas Huber <andih@google.com> Minor corrections to the javadoc overview to reflect late API changes.

Change-Id: If64e7ea0fa9c892d728282e5e18547a4da115989
ava/android/media/MediaCodec.java
ava/android/media/MediaExtractor.java
68ff8cbc3832811baf2e932b1d96ed64d0a291c0 27-Jun-2012 Mike Lockwood <lockwood@google.com> am 1524e625: am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev

* commit '1524e625067da52e1365e4f939d4683edeea2fd5':
MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
1524e625067da52e1365e4f939d4683edeea2fd5 27-Jun-2012 Mike Lockwood <lockwood@google.com> am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev

* commit '7017d51e147a0f6ed2370fb79c656c9726304131':
MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
7017d51e147a0f6ed2370fb79c656c9726304131 27-Jun-2012 Mike Lockwood <lockwood@google.com> Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev
1e855d98aa979b30cee9e096cf6a1cb54df0367b 27-Jun-2012 Mike Lockwood <lockwood@google.com> MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes

Bug: 6684451

Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/mtp/MtpDatabase.java
7b10a492bc9fa21039eb93bd0fe6d387001f7a7f 25-Jun-2012 Andreas Huber <andih@google.com> am 6dfd6aec: am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev

* commit '6dfd6aec2730bfdde6da646dafa8597a34a17b4e':
Document some of the more common mimetypes to be used when instantiating
6dfd6aec2730bfdde6da646dafa8597a34a17b4e 25-Jun-2012 Andreas Huber <andih@google.com> am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev

* commit 'c8c5e98b9ea0be4d161382fc537955d505e65a6c':
Document some of the more common mimetypes to be used when instantiating
68b1a6eed8479e16456f018663b1bcfaecc2a3f4 25-Jun-2012 Andreas Huber <andih@google.com> Document some of the more common mimetypes to be used when instantiating

MediaCodec components.

Change-Id: I810507d1d76a28666eb6fb63e3b597d38e5f1389
ava/android/media/MediaCodec.java
c497bc69e90adc3114967bb12f82dfcaf52c7d65 24-Jun-2012 Adam Powell <adamp@google.com> am 3c419da6: am dbbfa702: Fix MediaRouter bugs

* commit '3c419da632c7f332a50e5001331544cb8c919dce':
Fix MediaRouter bugs
3c419da632c7f332a50e5001331544cb8c919dce 24-Jun-2012 Adam Powell <adamp@google.com> am dbbfa702: Fix MediaRouter bugs

* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
Fix MediaRouter bugs
dbbfa702a09f6d2d36dee1b552442d04a4673f89 24-Jun-2012 Adam Powell <adamp@google.com> Fix MediaRouter bugs

Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.

Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.

Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
ava/android/media/MediaRouter.java
0c26f97684f131624aadc8cea05f0f07ac0e7d89 23-Jun-2012 Adam Powell <adamp@google.com> am 3b939b72: am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev

* commit '3b939b7242f9c4155f4d8b34cb474abc77c6417f':
Update route count properly when MediaRouteButton detects grouped/ungrouped events
3b939b7242f9c4155f4d8b34cb474abc77c6417f 23-Jun-2012 Adam Powell <adamp@google.com> am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev

* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
Update route count properly when MediaRouteButton detects grouped/ungrouped events
f3b653a21cdffe04c94c275e69ecb56e00766e82 23-Jun-2012 Adam Powell <adamp@google.com> Update route count properly when MediaRouteButton detects
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
ava/android/media/MediaRouter.java
c7be481af1ea9ed4c849cc83dd095e8835d2b5f6 21-Jun-2012 Adam Powell <adamp@google.com> am fd7ea067: am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev

* commit 'fd7ea06787f0be4def188621888d228f38f3a4d1':
MediaRouter group volume reporting
fd7ea06787f0be4def188621888d228f38f3a4d1 21-Jun-2012 Adam Powell <adamp@google.com> am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-dev

* commit 'd7c00d2bdd011d3a73faf1c4a5bb8012d24dd648':
MediaRouter group volume reporting
f8ac14a7f5a59b4ec8e89283a2da40b626e42065 21-Jun-2012 Adam Powell <adamp@google.com> MediaRouter group volume reporting

RouteGroups always report back the loudest volume of their component
routes. Maintain this through volume update requests (such as those
reported by volume hard keys) such that each route updates
individually, but the group slider always indicates the loudest value.

Change-Id: I5de4b9048bf55682b6271e9485fe50496a1c97c2
ava/android/media/MediaRouter.java
a08e6881c58c56aba2ac1f6e02db1529e10f9e6e 21-Jun-2012 Adam Powell <adamp@google.com> am ed044cda: am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev

* commit 'ed044cda8f6a7600923eecdec682c449f86e0429':
Expand volume APIs for MediaRouter
ed044cda8f6a7600923eecdec682c449f86e0429 21-Jun-2012 Adam Powell <adamp@google.com> am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev

* commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf':
Expand volume APIs for MediaRouter
c83788cec9fb5cbc5de12aace58dd25eee734ae4 21-Jun-2012 Pannag Sanketi <psanketi@google.com> am 4bae6149: am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-dev

* commit '4bae6149bd419eac00e5782a30d19463957e3c42':
Crash in SurfaceTextureTarget filter open
09829b71de3a84cb9d1bc0d8aad78dd16daadddf 21-Jun-2012 Adam Powell <adamp@google.com> Merge "Expand volume APIs for MediaRouter" into jb-dev
4bae6149bd419eac00e5782a30d19463957e3c42 21-Jun-2012 Pannag Sanketi <psanketi@google.com> am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-dev

* commit '60c5b714dc747eef0b5c2a57db60b162315fba2f':
Crash in SurfaceTextureTarget filter open
8e37a85bf3dc39519942698dc90a3951306b934b 21-Jun-2012 Adam Powell <adamp@google.com> Expand volume APIs for MediaRouter

Allow applications to set a requested volume level on RouteInfo
objects. If requested for a user route, the app-supplied callback will
be invoked to perform actual volume adjustment.

Change-Id: I856990a0da7292492aa15e6562dbc3d055b848a0
ava/android/media/MediaRouter.java
60c5b714dc747eef0b5c2a57db60b162315fba2f 21-Jun-2012 Pannag Sanketi <psanketi@google.com> Merge "Crash in SurfaceTextureTarget filter open" into jb-dev
22f2a8728ee2000a01aa6fc6108d8478d7c0ced9 18-May-2012 Pannag Sanketi <psanketi@google.com> Crash in SurfaceTextureTarget filter open

If the filter graph in an app closes out, the SurfaceTextureTarget
filter was losing the reference to the original surfacetexture, and the
app would re-start the graph without setting the surfacetexture again,
thus leading to a crash in registering a surface from surfacetexture.

Typical scenarios is start/stop immediately in camera effects recording.

Fix part of b/6651352
Fix part of b/6655597

Change-Id: Ib2bae7e886784e91b3a886f7ccd439ff190feb22
ca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java
ecab2aab19263826447cfed1586232d2e8672139 21-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am e44440f4: am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev

* commit 'e44440f40c6b005dce2eba1b37b3cabe97133152':
Unhide new API in android.media.MediaRouter for remote playback
63258b253ccce8add3fd424c5a05998cdf179c2e 21-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am 7fe75d97: am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-dev

* commit '7fe75d9759544d9b2eccac19aacb8c3992dfcc02':
Asynchronous handling of remote volume updates
e44440f40c6b005dce2eba1b37b3cabe97133152 21-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev

* commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994':
Unhide new API in android.media.MediaRouter for remote playback
7fe75d9759544d9b2eccac19aacb8c3992dfcc02 21-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-dev

* commit 'fc178e381d3db299901a96461122eb22a4ffb43e':
Asynchronous handling of remote volume updates
2cd5d253786b115470adc04a3609358f5eb7eb0a 20-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> Unhide new API in android.media.MediaRouter for remote playback

Expose new functionality for handling remote volume in:
android.media.MediaRouter.RouteInfo
android.media.MediaRouter.UserRouteInfo
android.media.MediaRouter.VolumeCallback

Change-Id: I8fd9c92be606364599e65939f318e11c2860bab9
ava/android/media/MediaRouter.java
f98de1e8dd6dcbd191921b4aa07a1d41b0b9db91 20-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> Asynchronous handling of remote volume updates

Remote playback information updates will be posted from the
application thread, and sent to AudioService. Because they
require locking the stack containing the remote playback
information, the update should happen on AudioService's handler
thread to avoid lock contention.

Change-Id: Ie04898295e08c16dd8ab5985fd825301e9cf1981
ava/android/media/AudioService.java
ava/android/media/RemoteControlClient.java
6009dc014f8fa0aefc68e7265761960c5433d108 20-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am b92d2a13: am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev

* commit 'b92d2a13c4ab34862968f47191d2713de3701757':
Remote volume handling in MediaRouter
b92d2a13c4ab34862968f47191d2713de3701757 20-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev

* commit '18ddb6ce6f3672a24a6f86ee4b28f5baa746bc20':
Remote volume handling in MediaRouter
1357012968f9066ea3051d83995e9bac69526c3c 19-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> Remote volume handling in MediaRouter

Extend MediaRouter.UserRouteInfo to enable setting playback
information, which includes volume. When the user route instance
has a RemoteControlClient, forward any playback information to it.
Enable specifying a callback to be notified of volume events
on the route.
Extend MediaRouter.RouteInfo to enable retrieving playback
information.

Update RemoteControlClient javadoc to reflect which parts of the
API are not intended to be made public.

Change-Id: I59d728eb61747af6c8c89d53f0faeb07940594c3
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
ava/android/media/IRemoteVolumeObserver.aidl
ava/android/media/MediaRouter.java
ava/android/media/RemoteControlClient.java
629f051f7d061f4db4a174dbd267a96f0c8113df 19-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am 586b8ee6: am 2f442304: Merge "Remote volume handling" into jb-dev

* commit '586b8ee62e0245e3c88ce9db51e1c1c3b4f1fb2c':
Remote volume handling
586b8ee62e0245e3c88ce9db51e1c1c3b4f1fb2c 19-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am 2f442304: Merge "Remote volume handling" into jb-dev

* commit '2f4423043ffeaf232ec984be03743326f08cdc8a':
Remote volume handling
2f4423043ffeaf232ec984be03743326f08cdc8a 19-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Remote volume handling" into jb-dev
e97d22211095cd5a6257887ff2bc01ccf5d4ec2e 19-Jun-2012 Adam Powell <adamp@google.com> am 29a2f84f: am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev

* commit '29a2f84fbee96c1bbbcb50eceb17d9b726854146':
MediaRouter bluetooth a2dp selection
29a2f84fbee96c1bbbcb50eceb17d9b726854146 19-Jun-2012 Adam Powell <adamp@google.com> am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev

* commit '5bb835a95942b0b313b2fa4e3f05941e630f9be7':
MediaRouter bluetooth a2dp selection
dd0a19266d5c837069da1ea188744d54c8d723a8 19-Jun-2012 Adam Powell <adamp@google.com> MediaRouter bluetooth a2dp selection

Remove bluetooth permission check from internal AudioService method
setBluetoothA2dpOn

Manage BT A2DP state in MediaRouter. A2DP is only enabled or disabled
when either the system built-in audio route or the A2DP audio route is
selected; when selecting any other route the current state is left
alone.

Change-Id: Ib14274e206e79bd8762edca1205ecfa87b7a94cf
ava/android/media/AudioService.java
ava/android/media/MediaRouter.java
3114ce3861f20f9a5c2c59dd2629197a1f4874a8 12-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> Remote volume handling

Extend RemoteControlClient class to enable an applicaton to
specify more information about how it's playing media, now covering
usecases where media playback happens "remotely". This playback
information can be used to set the volume and maximum volume
used remotely.
Declare a new intent and associated extras in Intent,
ACTION_VOLUME_UPDATE, so an application can be notified that
the volume it handles should be updated. It can then use
the new RemoteControlClient.setPlaybackInformation() method
to notify AudioService what the volume is.
Extend AudioService to maintain playback information associated
with the RemoteControlClient information in the stack of
media button event receivers (mRCStack). The information
about the active remote is cached so the stack doesn't have
to be iterated over in order to retrieve remote playback info.
Events to "adjust" the remote volume based on hardware key
presses cause the client application to be notified of
volume updates, and the volume panel to display the volume
set by the app.
Revise which stream type is controlled when none is specified
according to latest guidelines for remote playback.
Update VolumePanel class to support a new pseudo stream type,
AudioService.STREAM_REMOTE_MUSIC, that corresponds to the
remote playback volume, and uses the new "media route" icon.
Enable it to receive asynchronously new volume values for
the remote that will be displayed if the UI is still up,
and ignored otherwise.
Now supports hiding/showing sliders dynamically so remote
volume only appears when AudioService has a remote control
client handling remote volume.
Define new java symbols for the two media route icons.
Modify lockscreen behavior: don't automatically control music
volume when music is active, consider also remote playback.

Still to do:
- playback information set by RemoteControlClient should post
a message for AudioService to update playback information
instead of updating it synchronously

Change-Id: I557aa687239f9acfe33a609f05876c67fa7eb967
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
ava/android/media/RemoteControlClient.java
987f4a504aa90a99bc4930fe9ee35c52907bca80 18-Jun-2012 Adam Powell <adamp@google.com> am 12c2fbd3: am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev

* commit '12c2fbd3b7e98132fe1388b065a5dd09c20ef390':
Restrict MediaRouter selection
12c2fbd3b7e98132fe1388b065a5dd09c20ef390 18-Jun-2012 Adam Powell <adamp@google.com> am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev

* commit 'eb2c1b21c6835399fa55227e498fb2930e533439':
Restrict MediaRouter selection
4ee1f55ce0f4909a7430ab44563a81852f335071 18-Jun-2012 Adam Powell <adamp@google.com> Restrict MediaRouter selection

Actually restrict the programmatic selection of routes by
type. (Oops.)

Change-Id: I91e837f7ecbcddb626c664fb470e8296d563498d
ava/android/media/MediaRouter.java
0be17da62000996318ecc50e2563bfd9be3fd052 18-Jun-2012 Adam Powell <adamp@google.com> am c92aa2e7: am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev

* commit 'c92aa2e7c9112adafc5283921efe25574a95b7a4':
Volume control in MediaRouter dialogs
9471faf5dcc3ebf88bbc1a01809eb7312e65f829 18-Jun-2012 Adam Powell <adamp@google.com> am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev

* commit '8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb':
Make MediaRouter UI more robust around route count changes
7e8aac14c3a930dea0ca7a1d1e0e8a384fbf8916 18-Jun-2012 Adam Powell <adamp@google.com> am bb20575f: am 130b4572: ActionProvider API update

* commit 'bb20575f85ada8ccdacefc53f0da7e00fdf12a16':
ActionProvider API update
5ded10982c46c0f13cb8eeb4cc9ebec16baa3760 18-Jun-2012 Dianne Hackborn <hackbod@google.com> am acae5bd3: am 87959cdd: Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev

* commit 'acae5bd34923a79115ad24687558a6ab2ce780ec':
Add new callback for MediaRouter to found out about device changes.
2c0044410ee30bdba19870931374338b36c33ce9 18-Jun-2012 Eric Laurent <elaurent@google.com> am 9686f24c: am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev

* commit '9686f24ce3d13446393a468fb3f52283bf2bc80d':
AudioManager: back to old setBluetoothA2dpOn()
c92aa2e7c9112adafc5283921efe25574a95b7a4 18-Jun-2012 Adam Powell <adamp@google.com> am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev

* commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505':
Volume control in MediaRouter dialogs
8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb 18-Jun-2012 Adam Powell <adamp@google.com> am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev

* commit '706a8699008ce416a7fbd9a4215726fdb00ee803':
Make MediaRouter UI more robust around route count changes
bb20575f85ada8ccdacefc53f0da7e00fdf12a16 18-Jun-2012 Adam Powell <adamp@google.com> am 130b4572: ActionProvider API update

* commit '130b4572d1f3df702e5b296a655d15a41f6d4c66':
ActionProvider API update
acae5bd34923a79115ad24687558a6ab2ce780ec 18-Jun-2012 Dianne Hackborn <hackbod@google.com> am 87959cdd: Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev

* commit '87959cdd8560e743956a71bb687799e94053e086':
Add new callback for MediaRouter to found out about device changes.
9686f24ce3d13446393a468fb3f52283bf2bc80d 18-Jun-2012 Eric Laurent <elaurent@google.com> am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev

* commit 'c4f4b0f0a4905180314d1a681ddf5767ed1070ed':
AudioManager: back to old setBluetoothA2dpOn()
4599696591f745b3a546197d2ba7e5cfc5562484 16-Jun-2012 Adam Powell <adamp@google.com> Volume control in MediaRouter dialogs

MediaRouter dialogs now intercept the volume keys for altering the
current volume. The status icon indicates if the slider/buttons are
currently controlling the local device volume or a remote device's
volume.

Group volume for user routes is handled by using the
RemoteControlClient supplied by the first route in the group.

Change-Id: I40a0d054847ed5acce7a4c3b669487841b4dca15
ava/android/media/MediaRouter.java
39d5c6172503620ac3761148adac5fd7fa20d02d 16-Jun-2012 Adam Powell <adamp@google.com> Make MediaRouter UI more robust around route count changes

Improve the API around ActionProvider visibility overriding. Allow the
application to notify whatever is hosting the ActionProvider that
visibility has changed in a way that is friendly to alternate support
library-style reimplementations of MenuItem.

Allow MediaRouter.Callback implementations to add or remove themselves
or other Callbacks during dispatch of callback events.

Make MediaRouteActionProvider track the visibility of corresponding
menu items more accurately.

Change-Id: Ic7ddb6a87c3637904750d2661e4a9fa323b09ea0
ava/android/media/MediaRouter.java
130b4572d1f3df702e5b296a655d15a41f6d4c66 16-Jun-2012 Adam Powell <adamp@google.com> ActionProvider API update

* Add ActionProvider#overridesItemVisibility and isVisible.
These methods allow an ActionProvider to override the
visibility of a MenuItem that it is bound to. If a MenuItem
has been explicitly hidden by the application, it will not
be visible.

* Change MediaRouteActionProvider to not require a MediaRouter
callback, to avoid extra lifecycle management headaches.

Change-Id: I606fa98b3a6a3e60a953dd024274f9bf9c67acdd
ava/android/media/MediaRouter.java
87959cdd8560e743956a71bb687799e94053e086 15-Jun-2012 Dianne Hackborn <hackbod@google.com> Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev
c4f4b0f0a4905180314d1a681ddf5767ed1070ed 15-Jun-2012 Eric Laurent <elaurent@google.com> Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev
632ca417f0a33e3fa9ccece531afa2db3f0d4a30 15-Jun-2012 Dianne Hackborn <hackbod@google.com> Add new callback for MediaRouter to found out about device changes.

The AudioService now has an API to call to get the currently
connected devices, and later reports of changes in connection
state. The information includes the name of the bluetooth
device if one is connected for display to the user, and states
for all of the pluggable devices. No longer requires a Bluetooth
permission to keep the routes updated.

Change-Id: I81ca421c60592fbc1592477d59bf1c9d1b64954a
ava/android/media/AudioRoutesInfo.aidl
ava/android/media/AudioRoutesInfo.java
ava/android/media/AudioService.java
ava/android/media/IAudioRoutesObserver.aidl
ava/android/media/IAudioService.aidl
ava/android/media/MediaRouter.java
d1e57d78863b032cc647f6abeabb443dc512841d 15-Jun-2012 Adam Powell <adamp@google.com> am 15635728: am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev

* commit '15635728a4ff00da6cc3d6468c02d39e5631f124':
Update MediaRouteChooserDialog grouping UI
15635728a4ff00da6cc3d6468c02d39e5631f124 15-Jun-2012 Adam Powell <adamp@google.com> am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev

* commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824':
Update MediaRouteChooserDialog grouping UI
242b33870b51ea962a1d5c077d71c648eccc2b7a 15-Jun-2012 Eric Laurent <elaurent@google.com> AudioManager: back to old setBluetoothA2dpOn()

Come back to old versions of setBluetoothA2dpOn() and isBluetoothA2dpOn().

MediaRouter will call methods on IAudioService directly.

Change-Id: I18f0a3106bad78715ed11a6b7b4ec1d656cdae41
ava/android/media/AudioManager.java
b5e2af5919351486a385effe77409d2a91ae9c19 15-Jun-2012 Adam Powell <adamp@google.com> Update MediaRouteChooserDialog grouping UI

Move UserRouteInfo tag support to RouteInfo

Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
ava/android/media/MediaRouter.java
2f115bc007b24144f3f673395bc83ac0bc3814c7 15-Jun-2012 Adam Powell <adamp@google.com> am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev

* commit '13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2':
API updates for MediaRouter
13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2 15-Jun-2012 Adam Powell <adamp@google.com> am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev

* commit '90b9f84c43145c51180c7253cd3a3f59862c2611':
API updates for MediaRouter
0d03c042f90bf62d5bad7c64e77028a5f9f8fae0 15-Jun-2012 Adam Powell <adamp@google.com> API updates for MediaRouter

* Accept a Context when fetching the names of routes and
categories. This lets string resources resolve at time of access
with the correct configuration. The older versions remain available
that will use the static resources from the application. (There are
enough cases where applications will populate this from external
data that requiring it each time even when it was not initialized
from a resource doesn't seem reasonable.)

* Remove the ability for apps to programmatically select non-user
routes.

* Make MediaRouter.Callback an abstract class instead of an interface.
This will make further extensions easier to keep compatible in the
future.

Change-Id: If981c511dfbdfaf41ef0d1cfe4a377fc14bb5600
ava/android/media/MediaRouter.java
a587b449c463ac996b8cb05b2888abe92a8d16b4 14-Jun-2012 Adam Powell <adamp@google.com> am 0f03d771: am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev

* commit '0f03d771b29ff0fc6919a514c56128de9a5ecd5e':
Support route grouping in the MediaRouter dialog UI.
0f03d771b29ff0fc6919a514c56128de9a5ecd5e 14-Jun-2012 Adam Powell <adamp@google.com> am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev

* commit 'f9b7f9f5080100043df3c8868bca4df84becf5a1':
Support route grouping in the MediaRouter dialog UI.
f9b7f9f5080100043df3c8868bca4df84becf5a1 14-Jun-2012 Adam Powell <adamp@google.com> Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev
664020369d9c3c00b83bc61f3dfd8ec51619a11d 14-Jun-2012 Ruei-sung Lin <rslin@google.com> am be4e1ea4: am 0a4cbc32: Merge "Add property to override backdropper effect threshold." into jb-dev

* commit 'be4e1ea4f1e8b032ae37e9eb4919e6339ed7dc2d':
Add property to override backdropper effect threshold.
cf815b56bf475bc9593a057edb234578e4abfcf1 14-Jun-2012 Adam Powell <adamp@google.com> am 6c143590: am 4b4a947b: Merge "MediaRouter dialog" into jb-dev

* commit '6c14359074ff5a93695ed37083c9178a4ca2d1f1':
MediaRouter dialog
be4e1ea4f1e8b032ae37e9eb4919e6339ed7dc2d 14-Jun-2012 Ruei-sung Lin <rslin@google.com> am 0a4cbc32: Merge "Add property to override backdropper effect threshold." into jb-dev

* commit '0a4cbc3267c12fb4f5831ea70286b0664f90891a':
Add property to override backdropper effect threshold.
0a4cbc3267c12fb4f5831ea70286b0664f90891a 14-Jun-2012 Ruei-sung Lin <rslin@google.com> Merge "Add property to override backdropper effect threshold." into jb-dev
d6d0bddee363e0c7fe61f63bd9d9864a71d887d6 14-Jun-2012 Adam Powell <adamp@google.com> Support route grouping in the MediaRouter dialog UI.

Change-Id: Idcae12cedfb7ca13950e7fa45441fba2029a9f68
ava/android/media/MediaRouter.java
4239373aedb5f95e7edcc3c75920eb3e265b667c 08-Jun-2012 Eino-Ville Talvala <etalvala@google.com> Add property to override backdropper effect threshold.

Also, change the default background mean to be the first incoming frame.

Bug: 6600585
Change-Id: I2181e75711d48d01f48e3fb1d604eb467f08fda4
ca/filterpacks/java/android/filterpacks/videoproc/BackDropperFilter.java
6c14359074ff5a93695ed37083c9178a4ca2d1f1 13-Jun-2012 Adam Powell <adamp@google.com> am 4b4a947b: Merge "MediaRouter dialog" into jb-dev

* commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f':
MediaRouter dialog
70e11e50eecfc8f1dfb76316d099e4331ebd28f7 13-Jun-2012 Adam Powell <adamp@google.com> MediaRouter dialog

Add the dialog behavior for MediaRouteActionProvider/MediaRouteButton.

Still TODO:

* Switch audio icon based on source; speaker/bt/user

* Rig up volume slider

* Rig up item icons

* Rig up group button for groupable categories

* Make grouping work

Change-Id: I3f992516b184d5ae940ddb7bbb7f94ff58914589
ava/android/media/MediaRouter.java
0b1d806188f50491dc543b14ed9af42e0b2b5118 12-Jun-2012 James Dong <jdong@google.com> am 05fee7bd: am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev

* commit '05fee7bddba9a00ed33392e78fddefbebf79b0b4':
Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so
05fee7bddba9a00ed33392e78fddefbebf79b0b4 12-Jun-2012 James Dong <jdong@google.com> am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev

* commit '085c4825897bbbfa0f8564c2de45f74d7bea4029':
Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so
085c4825897bbbfa0f8564c2de45f74d7bea4029 12-Jun-2012 James Dong <jdong@google.com> Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev
c6693f6fee01f0694230c0078f5a2136f99c380e 12-Jun-2012 James Dong <jdong@google.com> Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so

Change-Id: Ibe37c2e6ede6143dc4e27c6072867bc58aa1c08a
related-to-bug: 6647465
ni/mediaeditor/MODULE_LICENSE_APACHE2
ni/mediaeditor/NOTICE
49a0b01bdc89059da49c807ae5d132534d55a773 12-Jun-2012 Adam Powell <adamp@google.com> am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev

* commit '0d637d6f888cdddba554174284fb96f8354a15e4':
MediaRouter work
16e7127948286f1cbf73534dcc2822e4fa9c6fe4 12-Jun-2012 Eric Laurent <elaurent@google.com> am 2e1f18b9: am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev

* commit '2e1f18b9ba9af40d5e1f0874e091b8f487a2d50d':
Made IAudioService.setBluetoothA2dpOn() not oneway
ca415c8529bd0268f58d7b8c1ba5906cd3d0fe54 12-Jun-2012 Adam Powell <adamp@google.com> am 345a3835: am f958732b: Merge "Fix docs" into jb-dev

* commit '345a3835aafd01e837741aa6ea733d8dc1b7dd2b':
Fix docs
0c9c063179c4d27e2bc9190dc49f08cfe25fd663 12-Jun-2012 Adam Powell <adamp@google.com> am a20d99b1: am ae20ae1a: More MediaRouter features.

* commit 'a20d99b17906cb371203be8ec4dc92d9a104f8dd':
More MediaRouter features.
d4a0c49ffa5fb6d2a44e7727c54fdfc5a8ed4d1a 12-Jun-2012 Dianne Hackborn <hackbod@google.com> am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev

* commit '007f2b40f952eab8951c6b22302a59a955a20561':
Rework media router to be per-context with global process state.
ea99d9af2db8c9490be3de750987969a2b31cfd1 12-Jun-2012 Adam Powell <adamp@google.com> am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev

* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
Further work on MediaRouter
0d637d6f888cdddba554174284fb96f8354a15e4 12-Jun-2012 Adam Powell <adamp@google.com> am 579ec308: Merge "MediaRouter work" into jb-dev

* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
MediaRouter work
2e1f18b9ba9af40d5e1f0874e091b8f487a2d50d 12-Jun-2012 Eric Laurent <elaurent@google.com> am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev

* commit 'dcf33b73159fe864f80514919775598e797e37d2':
Made IAudioService.setBluetoothA2dpOn() not oneway
345a3835aafd01e837741aa6ea733d8dc1b7dd2b 12-Jun-2012 Adam Powell <adamp@google.com> am f958732b: Merge "Fix docs" into jb-dev

* commit 'f958732bd3924205d9f8bda94f4f6e3bb4045b28':
Fix docs
a20d99b17906cb371203be8ec4dc92d9a104f8dd 12-Jun-2012 Adam Powell <adamp@google.com> am ae20ae1a: More MediaRouter features.

* commit 'ae20ae1a8aaa013813c356ae1d9541ca7ff020ae':
More MediaRouter features.
007f2b40f952eab8951c6b22302a59a955a20561 12-Jun-2012 Dianne Hackborn <hackbod@google.com> am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev

* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
Rework media router to be per-context with global process state.
bee681a1d54062dc0833cc9a45aac7b20725c1bb 12-Jun-2012 Adam Powell <adamp@google.com> am fbce66cb: Merge "Further work on MediaRouter" into jb-dev

* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
Further work on MediaRouter
579ec3086c9ce3616735bc3cf63246f052973a7f 12-Jun-2012 Adam Powell <adamp@google.com> Merge "MediaRouter work" into jb-dev
b35c445f34e1a18e17aef3e3dfbc1c39b4d1815c 12-Jun-2012 Adam Powell <adamp@google.com> MediaRouter work

Fix a bug where MediaRouter would crash on creation

Add click listener for app-supplied extended settings on the route
selection dialog.

Change-Id: I2991db1720b5c574148e250526984592f4dc3c44
ava/android/media/MediaRouter.java
dcf33b73159fe864f80514919775598e797e37d2 12-Jun-2012 Eric Laurent <elaurent@google.com> Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev
71c69897ad0a55d590698bfa399bfe99c763b9db 12-Jun-2012 Adam Powell <adamp@google.com> Fix docs

Change-Id: If0215c02abf419d14f28574b751c9dfc2f27bcbe
ava/android/media/MediaRouter.java
ae20ae1a8aaa013813c356ae1d9541ca7ff020ae 12-Jun-2012 Adam Powell <adamp@google.com> More MediaRouter features.

Add RemoteControlClient to user routes. This will allow the UI layered
on top to access info about the remote volume channel associated with
a user route.

Add icons for user routes and route groups.

Change-Id: I438aa60fc8c93f878ec7638897225738155f0746
ava/android/media/MediaRouter.java
4ab22bb7d0aafce1be200153d71d432c9d54e04a 12-Jun-2012 Eric Laurent <elaurent@google.com> Made IAudioService.setBluetoothA2dpOn() not oneway

IAudioService.setBluetoothA2dpOn() should not be one way as
IAudioService.isBluetoothA2dpOn() will return inconsistent results
if called just after.

Bug 6572651.

Change-Id: Ib03ae49e6c0041b1b37dcac9e198cd93a4794030
ava/android/media/IAudioService.aidl
b58b8f832d06b0ffa8886eba5a4916578a3b8743 12-Jun-2012 Dianne Hackborn <hackbod@google.com> Rework media router to be per-context with global process state.

Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
ava/android/media/MediaRouter.java
d0d2cda9d414da73773285d7fee9e13aef3495e9 08-Jun-2012 Adam Powell <adamp@google.com> Further work on MediaRouter

Remove volume control and tracking. This will be handled by extensions
to existing audio and media APIs for now.

Tweak/refine other aspects of the API. Pass the router to callbacks for
easier future-proofing. Add group/ungroup callback methods.

Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
ava/android/media/MediaRouter.java
92f4c7bc49f035bb2672356db5baf30b20240353 08-Jun-2012 Marco Nelissen <marcone@google.com> Merge "Bypass emulated storage for metadata extraction"
c861411d4bae0912054ff54c3efee90ae2db6db9 25-May-2012 Marco Nelissen <marcone@google.com> Bypass emulated storage for metadata extraction

b/6543148

Change-Id: Ic65957870199a2592ebe53b32517166f96e48ef2
ava/android/media/MediaScanner.java
fa30e18083e2c3a27154440149513d42b37b2829 08-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 0237d04b: am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension"

* commit '0237d04b9564b9ef3e443091a4bce7dc5a2f1826':
Added mpga as valid MediaFile extension
0237d04b9564b9ef3e443091a4bce7dc5a2f1826 08-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension"

* commit '644e43e06ffa5b493ca3682c24b8db606deed664':
Added mpga as valid MediaFile extension
644e43e06ffa5b493ca3682c24b8db606deed664 08-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 3e3d641c: Merge "Added mpga as valid MediaFile extension"

* commit '3e3d641c612fc6bacd367be696ae6125009d18d3':
Added mpga as valid MediaFile extension
7edef088e39c148ac398617fe96b632fb11522a4 08-Jun-2012 Keun young Park <keunyoung@google.com> am 765d3d13: am fca9ff38: Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev

* commit '765d3d13c93c0c8b3d6a46db656328d61682acdb':
rename exif to exif_jni due to refactoring in external/jhead
bc35b34a7ca0d3fddccd0c6f4e488cf228b42149 08-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am dbb9e386: am 6a5f9f6d: Merge "Configuration for lock and UI sound levels" into jb-dev

* commit 'dbb9e38673bd133fa61a10d874ca325d23f3b5e3':
Configuration for lock and UI sound levels
fca9ff387178b4d3c4205427e2d52ef4a5996fe2 08-Jun-2012 Keun young Park <keunyoung@google.com> Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev
6a5f9f6ddbfcb97a25436ad34be39fc7b3b45168 08-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Configuration for lock and UI sound levels" into jb-dev
bb52c49c9aab2357100b18e72395c1dc3539dfa7 07-Jun-2012 Keun young Park <keunyoung@google.com> rename exif to exif_jni due to refactoring in external/jhead

- also pull libexif_jni from media_jni

Bug: 6623618
Change-Id: I4f06a4614c5fddcf98d95caff16a2c40f345dade
ava/android/media/ExifInterface.java
ni/Android.mk
a061ef6c5f8d85818f057022533b9a8597de75ab 07-Jun-2012 Marco Nelissen <marcone@google.com> am f9800a01: am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev

* commit 'f9800a01fe3690bac64bff0ba734a39f8a7f8ada':
Ensure we compute display name when needed
81e85bbf671f228600fba059e30cb22565bcfe9d 06-Jun-2012 Marco Nelissen <marcone@google.com> Ensure we compute display name when needed

Since the media scanner no longer uses an in memory cache, it always
found an entry for files inserted via MTP, which made it follow a
different code path than before, which in turn made the media
provider skip computing the display name column.
By clearing the row id in the media scanner when handling an mtp
request, we steer it back to the correct code path.
b/6297105
b/6525450

Change-Id: I624522b176a0057d246ce3040598af255b00a141
ava/android/media/MediaScanner.java
bab1ae4ce66296d230d145d542e63bf9f5ff5fbe 06-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am b8da1c90: am 88a89b29: Merge "Always queue A2DP connection state message with wakelock held" into jb-dev

* commit 'b8da1c90c42ffb15b967915986ec2f59d40d3185':
Always queue A2DP connection state message with wakelock held
e12c39bb9cedb8b363658979872694eb55b1386e 06-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> Always queue A2DP connection state message with wakelock held

Messages for changes to A2DP connection state are intended to be
queued in AudioService after acquiring a wake lock, which is
released after the message has been handled.
This was correctly done for connection messages when the system
is up and running, but wasn't when the BluetoothProfile service
listener gets an onServiceConnected() event, which is the case
the the device boots.
This change correctly uses the queueMsgUnderWakeLock() method
whenever a MSG_SET_A2DP_CONNECTION_STATE is to be sent.

Bug 6616292

Change-Id: Ie337a4641a89c522e2d233bccaac4e08ce324117
ava/android/media/AudioService.java
b85afc25d5d4ef3aab378691d8df306c99f7ab96 06-Jun-2012 Adam Powell <adamp@google.com> resolved conflicts for merge of 1178569b to master

Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
690ffb4e1f735148a15f2036d9a3c1962fba188c 05-Jun-2012 Adam Powell <adamp@google.com> More fun with MediaRouter

Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.

Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.

Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
ava/android/media/MediaRouter.java
c55b393efd462490cd5e27fc373bceafdd25662e 05-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> Configuration for lock and UI sound levels

Define two integers in the platform configuration to
define the sound level for lock/unlock sounds, and
UI sound effects.
Use the corresponding value in KeyguardViewMediator for the lock sounds.
Use the corresponding value in AudioService when playing sound effects.

Bug 6448481

Change-Id: Ie238f5eb1645e395412864d93447ac4049f7e54b
ava/android/media/AudioService.java
481a714a57ba0a9135e8c3a614c7dd149fc031c6 05-Jun-2012 Jack Palevich <jackpal@google.com> am 1d340500: am 0c01222f: Merge "Don\'t crash when scaling Bitmaps with private Bitmap.Configs" into jb-dev

* commit '1d34050087b5e134719f7a917c7ded3de090d0b2':
Don't crash when scaling Bitmaps with private Bitmap.Configs
2fe37b7005776c50fbb3a3661f5823fb6c890b81 28-Sep-2010 Mathias Franzén <mathias.franzen@sonyericsson.com> Added mpga as valid MediaFile extension

Added mpga as a valid media file extension, it is treated as mp3.

Change-Id: Ie39036d61b6ca50439861fa10be0d824dcc65ed3
ava/android/media/MediaFile.java
05c66cc5cc6357be19fdef0fc131731368c38646 04-Jun-2012 Jack Palevich <jackpal@google.com> Don't crash when scaling Bitmaps with private Bitmap.Configs

Bug: 6526197
Change-Id: I89f008f90888f0a679274c00293342ab0fb0e28e
ava/android/media/RemoteControlClient.java
a55a94bfb3a6de5f203224d75fcbfa40694c8d01 03-Jun-2012 Adam Powell <adamp@google.com> am 58e29c06: am 7c86958d: Merge "Add MediaRouter API." into jb-dev

* commit '58e29c06610054419339bb0a75c44ab30d6fe89a':
Add MediaRouter API.
7c86958d73e7216a92bdfd84fce4440e1def7eaa 03-Jun-2012 Adam Powell <adamp@google.com> Merge "Add MediaRouter API." into jb-dev
4a01bce39a9b619d5c9daa818ca5d38d7e1040f6 02-Jun-2012 Ruei-sung Lin <rslin@google.com> am 0b5f8ac1: am 56f6c7ff: Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev

* commit '0b5f8ac125d4e16071df8a47083edc8fa7a1f63b':
Fix b/6575950 make shader program to support different precisions.
56f6c7ff0989ec45ca8639899208054b6c21d979 02-Jun-2012 Ruei-sung Lin <rslin@google.com> Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev
9a1de308cea2d160778fd977825f10a07b49d738 22-May-2012 Adam Powell <adamp@google.com> Add MediaRouter API.

This is just the initial state tracking. Still to go is
actually triggering Bluetooth A2DP correctly and tracking
process state in the system server.

Change-Id: I33031d52799d6e2d7208910da833831085cc3677
ava/android/media/MediaRouter.java
2b6340a25753f383c196bb51864676f03ab1bab3 01-Jun-2012 Jean-Michel Trivi <jmtrivi@google.com> am c7d8d370: am b40c0b5a: Merge "Handle wakelocks for device connection intents from AudioService" into jb-dev

* commit 'c7d8d37051ba46e37a586f4ea5f4e662a347171a':
Handle wakelocks for device connection intents from AudioService
2d8dab5a549b25b6f36df4614d7c0166d4d099e2 31-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Handle wakelocks for device connection intents from AudioService

Now that AudioService handles the device connection intents itself,
those need to be sent under wakelock.
The wake lock is acquired when AudioService is notified of the
device connection, and released when the corresponding message
has been handled.
This change only covers the device connection messages, and doesn't
affect the handling of the other AudioService messages.

Bug 6485897

Change-Id: I2d35f5404f097b5adde8af21fd81347bdd5576a6
ava/android/media/AudioService.java
846890957deb38463acdc98112ed90b44290aa0c 31-May-2012 Eric Laurent <elaurent@google.com> am c383b407: am cee7203f: Merge "Send device connection intents from AudioService" into jb-dev

* commit 'c383b407ad24474b87de68f93ea95de495f6d2c1':
Send device connection intents from AudioService
cee7203f9ac3e54f39b5f528e014f2d3583f60dc 31-May-2012 Eric Laurent <elaurent@google.com> Merge "Send device connection intents from AudioService" into jb-dev
f517b048894e7cd7e06d5cc932c76ea012e9073d 31-May-2012 James Dong <jdong@google.com> am 9ff7d5db: am 7b996d19: Fix a test case failure when there is no back-facing camera on a device

* commit '9ff7d5db8805255429ebf8a308e352f98c1981d0':
Fix a test case failure when there is no back-facing camera on a device
7b996d19afcc7030400b515a665d28523a44bb18 31-May-2012 James Dong <jdong@google.com> Fix a test case failure when there is no back-facing camera on a device

Change-Id: I427b2e03b266ff2d92c6fe64f732a256d285020e
related-to-bug: 6538628
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
b1fbaaccb656ef09a8770c28df15e3e91a452e64 29-May-2012 Eric Laurent <elaurent@google.com> Send device connection intents from AudioService

AudioService is currently notified of wired headset and A2DP
sink connection states via broadcast intents from WiredAccessoryObserver
and BluetoothA2dpService. This is a problem as there is no guaranty that
AudioService can take actions upon the change before other apps are notified.
For instance, the Play On feature requires the UI to be refreshed when a device
is inserted/removed and we must guaranty that the UI component can read
new A2DP enable state from AudioManager after it receives a device connection state
change intent.

- Added hidden methods to AudioManager so that WiredAccessoryObserver
and BluetoothA2dpService can notify AudioService of device connection directly.
- The wired accessories connection intents are now sent by AudioService.
- The A2DP state change intent is delayed by BluetoothA2DPService when
ACTION_AUDIO_BECOMING_NOISY is sent by AudioService
- ACTION_AUDIO_BECOMING_NOISY intent is not sent when disconnecting A2DP
while a wired headset is present and vice versa.

Bug 6485897.

Change-Id: Ie160b3ee5f451132065530772b868593c90afd94
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
4d3588f012ca562deac08f280837f0dfef8124d1 30-May-2012 James Dong <jdong@google.com> am affa374b: am fb910e8f: Merge "Fixed a buffer overflow issue" into jb-dev

* commit 'affa374bae25042ecd5a0a67acd6cd981133cb14':
Fixed a buffer overflow issue
54c40e033e487b96ff3356d29ab02cc1304f4117 30-May-2012 James Dong <jdong@google.com> Fixed a buffer overflow issue

The allocated array has one byte less than the required length. Allocating the size one byte larger fixes the issue.
contribution was originally from teng.hong@nxp.com

Change-Id: I3aa2e6b995fd18e30649a34f201646082aab44ee
related-to-bug: 6347465
ni/mediaeditor/VideoEditorMain.cpp
0a1013229254cdc146d4ce2f4b4aef301b018f09 15-May-2012 Ruei-sung Lin <rslin@google.com> Fix b/6575950 make shader program to support different precisions.

1. In shade code of Vignette and Fisheye, change from
pixel coordinates to texture coordinates to avoid overflow.

2. Fix bug in ColorTemperature shader code

3. Revise shader code pseudo random number generator (used by
BlackWhite, Grain, Lomo, Documentary filters) to ensure
it produces no artifacts among devices with different precisions.

Change-Id: Ifb67f12f114bc9cd7fbfa74f7782f130c5244e5d
ca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ColorTemperatureFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/FisheyeFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/VignetteFilter.java
fc11edb05a74ed36d774ac64e975dde67c59ab9e 27-May-2012 Bryan Mawhinney <bryanmawhinney@google.com> am 592a3f54: am c3a5cf9a: Actually set the video scaling mode :-)

* commit '592a3f544745f19d9901692700a1b439b9f8c57b':
Actually set the video scaling mode :-)
c3a5cf9aab3d409445accb2a93c09e6b4140d196 27-May-2012 Bryan Mawhinney <bryanmawhinney@google.com> Actually set the video scaling mode :-)

Change-Id: Ia3e77b68a07651861e9be268ab77cac808b3be79
ava/android/media/MediaPlayer.java
c0ed6efe5f9b3c06a1297592647bd52a0f84215a 25-May-2012 Christopher Tate <ctate@google.com> am 115284bc: Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah

* commit '115284bc124ce2874f32ad36956f475959513388':
Support volume-changed sounds on master-volume-only configs
115284bc124ce2874f32ad36956f475959513388 25-May-2012 Christopher Tate <ctate@google.com> Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah
735470d202cd42fe8b65f0fb0d6c38aff2be967e 25-May-2012 Jean-Baptiste Queru <jbq@google.com> am 23cad6eb: Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"

* commit '23cad6eb2b42f023a8f2197cd358de87f9084b99':
stagefright aacenc: Fix reading out of bounds in pow2_xy
23cad6eb2b42f023a8f2197cd358de87f9084b99 25-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy"
9af8cfa60f7c0d51e667d62465b6f9eb7d425e1d 25-May-2012 Martin Storsjo <martin@martin.st> 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
ibstagefright/codecs/aacenc/basic_op/oper_32b.c
03f2fb3cb9b045545d9a9abbaa37cf98a25cb67e 25-May-2012 John Grossman <johngro@google.com> AAH_RX: Add the ability to control volume and stream type.

DO NOT MERGE

Change the AAH_RX player so that it implements MediaPlayerHWInterface
(instead of just MediaPlayerInterface) so the app level can control
the rendering volume of individual RX player instances as well as the
stream type of the audio tracks created by the RX player.

Change-Id: Ieff1ea774f7981227546744883ee4b4e87a2cd2a
Signed-off-by: John Grossman <johngro@google.com>
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_decoder_pump.h
ibaah_rtp/aah_rx_player.cpp
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_rx_player_substream.cpp
c4b78d206ffcdccac01e3436a4a3462bef9672ed 22-May-2012 Christopher Tate <ctate@google.com> Support volume-changed sounds on master-volume-only configs

Some products manipulate only the master volume, and the existing
code does not play volume-change tones when the master volume
is adjusted. This CL includes some config-driven behavior that
will play those tones (via the system stream) if desired.

Bug 6498986

Change-Id: I2415773325d0a0039efc67897bc371b1f2e18063
ava/android/media/AudioManager.java
aa5481214f01b9e9cb4fa8ad25f68abedde785f3 24-May-2012 Eric Laurent <elaurent@google.com> am dcc752a8: am 90fb2dd6: Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev

* commit 'dcc752a8984361ba23da00bf2adeec4161b67af2':
AudioManager: restore setBluetoothA2dpOn() method
90fb2dd6738792ebead64c5f03a4f407d36420de 24-May-2012 Eric Laurent <elaurent@google.com> Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev
c30d1ad8f3f6343c6071a32f08ea21251e82194c 24-May-2012 Fabrice Di Meglio <fdimeglio@google.com> am 07e28d1e: am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev

* commit '07e28d1e9bd7373c83cb66d5d9e93ae9af1f090d':
Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
0100625bb316ecbd99873b72756ffba8613c3456 24-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
f75b6052132f1f748ae77891f6fedd1957508811 24-May-2012 Jean-Baptiste Queru <jbq@google.com> am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"

* commit '55536138cc0febbe83608ee0103aaa9a5202e31f':
libstagefright/matroska: Fix build with gcc 4.7
55536138cc0febbe83608ee0103aaa9a5202e31f 24-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "libstagefright/matroska: Fix build with gcc 4.7"
fe34006d6f2a3c984bcade2cbeb9aaaaef8cc29a 24-May-2012 Jean-Baptiste Queru <jbq@google.com> am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"

* commit '05cd296e713377c216a4ac5b2d421f4ca0343cda':
libmedia: Fix build with gcc 4.7
05cd296e713377c216a4ac5b2d421f4ca0343cda 24-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "libmedia: Fix build with gcc 4.7"
dd850c7903aba425b4c5d2d57c0c3c2a5d4c48b8 24-May-2012 Wu-cheng Li <wuchengli@google.com> am a039119e: am c1cabdfb: Merge "Fix bad aspect ratios for recorded effects" into jb-dev

* commit 'a039119e6806d17e0cc9d0e0e249f66525853935':
Fix bad aspect ratios for recorded effects
c1cabdfbbb5de2c286fc9a4fe995b7b630a74a0d 24-May-2012 Wu-cheng Li <wuchengli@google.com> Merge "Fix bad aspect ratios for recorded effects" into jb-dev
58acf44b9f16d5154e6d3a0e5f7a7a7a3c7b423f 22-May-2012 Pannag Sanketi <psanketi@google.com> Fix bad aspect ratios for recorded effects

Fix b/6530189
Fix b/6535207
Change-Id: I6ef09bd619acc31af53d9991335cda33b7c08908
ca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java
13fe2a5330a5df662d7b1b136e7b08fe34c94a42 19-May-2012 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)

- use an ID instead of a String for StorageVolume description
- use this ID for getting the correct localized version of the description string

Change-Id: I30f3080fce2c889be38bfdf9f5121dffcf8a99e8
ava/android/mtp/MtpStorage.java
738342b1dc3dddf618025240b42dceba51f00184 23-May-2012 Marco Nelissen <marcone@google.com> am ec1d16bf: am 101fb9fe: Merge "Handle _ and % in paths" into jb-dev

* commit 'ec1d16bf72d68604e7dc86309f13d909a6d88321':
Handle _ and % in paths
b4b847866fbee31ba146ba7ebca2d2346a3a0b8f 23-May-2012 Marco Nelissen <marcone@google.com> Handle _ and % in paths

When doing a "like" match on a path, add a second non-like constraint
so that sqlite wildcard characters don't match arbitrary other characters.
b/6501408

Change-Id: I21f9b1c2d8e7c7ef27c0ad5fe24c3e01cd67fb61
ava/android/media/MediaScanner.java
ava/android/mtp/MtpDatabase.java
7847211fb4699bf6018e29d214a918ed6657319b 21-May-2012 Eric Laurent <elaurent@google.com> AudioManager: restore setBluetoothA2dpOn() method

Remove deprecation on setBluetoothA2dpOn() method so that applications
can override the default audio policy which is to use A2DP
for media whenever connected.

The request is not persistent and the default policy is restored when a
new A2DP i ro wired headset connection occurs.

Bug 6485897.

Change-Id: I2a4b6b6bdba55f7b133e64f86d27c03eb86acfa4
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/IAudioService.aidl
16353830e6712870b3b6daa69a6d026afc670ad0 22-May-2012 Jean-Michel Trivi <jmtrivi@google.com> am 483ef81e: am fca91a8e: Merge "Type of search on headset key long press must depend on device state" into jb-dev

* commit '483ef81e0e6fdd6965ad18e44a5347a85e7db4cb':
Type of search on headset key long press must depend on device state
fca91a8e6aa7f35b2144697c6adf5934da2600b2 22-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Type of search on headset key long press must depend on device state" into jb-dev
ce5b506ef7a9dde769056419e40c67f96cfad6a7 21-May-2012 Jean-Baptiste Queru <jbq@google.com> am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"

* commit '64f77c5e312ff0b45a91853f782f112a99df758f':
stagefright avcenc: Use intptr_t for casting pointers to integers
7bce428ccc41210d9271b32f1ea94af0ef6bff7d 21-May-2012 Jean-Baptiste Queru <jbq@google.com> am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"

* commit '6fd507b92746481f63922059697226c8ec6ad72b':
stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
7ed2b1ffb218b962687fc857aeadb1cfbff559b4 21-May-2012 Pannag Sanketi <psanketi@google.com> am 2b876783: am 850c2c36: Merge "Fixing the weird preview size w/ effects on camera" into jb-dev

* commit '2b8767837b19edd49999572e1979f0cde09d6544':
Fixing the weird preview size w/ effects on camera
64f77c5e312ff0b45a91853f782f112a99df758f 21-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"
6fd507b92746481f63922059697226c8ec6ad72b 21-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"
fbc616474b5486b5fc9eba25da043cb244c61f9d 21-May-2012 Bryan Mawhinney <bryanmawhinney@google.com> am c6bbc4e7: am 9de61ae0: Merge "Fix video scaling mode validity check." into jb-dev

* commit 'c6bbc4e70f8fe41dd31de3c8a0e9be0f24961593':
Fix video scaling mode validity check.
bb4811be3cba7e91adfe0c94da0d9c326dbaa81e 21-May-2012 Jeff Brown <jeffbrown@google.com> am 031ffb15: am 7852a59d: Merge "Use FLAG_LONG_PRESS for headset long press interactions." into jb-dev

* commit '031ffb15acb6db931488f20dc8af86864c5d5ca7':
Use FLAG_LONG_PRESS for headset long press interactions.
eafa73e4dce655bf63da4a43cbb395efea31aafe 21-May-2012 Jean-Michel Trivi <jmtrivi@google.com> am 1644f0d9: am 0a95ce9f: Merge "Handle media button events during phone calls and when ringing" into jb-dev

* commit '1644f0d9ee72cf37f0b92a7b5ef44bfac1421bab':
Handle media button events during phone calls and when ringing
87ba92fa3996d02638becc7a8fd910cf36a6db6b 21-May-2012 Marco Nelissen <marcone@google.com> am ec733f09: am d88404d0: Merge "Fix .pls playlist parsing" into jb-dev

* commit 'ec733f094b48882b78ccf00b0ade5a46229c41c3':
Fix .pls playlist parsing
3c2711fc2853394324b044632b79ca67388df8f4 20-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Type of search on headset key long press must depend on device state

When the user long presses on the headset key, the type of search
that will launched must depend on the state of the device. The
following logic is implemented:
- screen on and device unlocked: action is ACTION_WEB_SEARCH,
- device locked or screen off: action is ACTION_VOICE_SEARCH_HANDS_FREE
with EXTRA_SECURE set to true if the device is securely locked.

Bug 6518222

Change-Id: I318770346b8d83e44dfcd4154bcdb517ea7098b5
ava/android/media/AudioService.java
850c2c36de89ceb4c2c7c1cc73c2aed52b493fa5 21-May-2012 Pannag Sanketi <psanketi@google.com> Merge "Fixing the weird preview size w/ effects on camera" into jb-dev
853d8c7f088c6b680b676716bbcb6d1f1798f3a1 19-May-2012 Jason Simmons <jsimmons@google.com> Seek to the beginning if start() is called on an AAH_TXPlayer that has completed playback

Bug: 6486022
Change-Id: I4daaf0f1feb1047a12480397598af6c52f54a6b6
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
b5af71f2b108607149032ce9817c5897b67b4032 18-May-2012 Pannag Sanketi <psanketi@google.com> Fixing the weird preview size w/ effects on camera

The aspect ratio sent from the camera app to the SurfaceTextureTarget
filter does not really matter now since the camera app handles
the re-sizing. Hence, the SurfaceTextureTarget filter needs to be render
in "stretch" mode all the time even though the aspect ratio sent to the
filter might indicate otherwise. The filter still needs the correct
frame size for things other than determining aspect ratio.

Fix b/6430124

Change-Id: Ie7fa5cd2adf2a8d41e6e005418f6c6fd738ed85d
ca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java
ca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java
9de61ae0ed40fcb147e09797bfb22dcea0b89df6 18-May-2012 Bryan Mawhinney <bryanmawhinney@google.com> Merge "Fix video scaling mode validity check." into jb-dev
79a9cd40f5ebb2453cb982bc17d9797a1cbdf8d8 18-May-2012 Bryan Mawhinney <bryanmawhinney@google.com> Fix video scaling mode validity check.

Change-Id: Ib7adead2758d50cae67741364801e966a82ad5ba
ava/android/media/MediaPlayer.java
ab624c2fd4f0fad6ba7f422a960942e5a7035cea 17-May-2012 Jeff Brown <jeffbrown@google.com> Use FLAG_LONG_PRESS for headset long press interactions.

Handle canceled key events correctly and don't synthesize
key events in that case.

Unfortunately, the state machine was confused by some sequences
of key events that it might receive from the input dispatcher
when new activities take focus during a long-press on the headset key.
The audio service may receive a cancel event intended for the old
window, followed by a repeated down and finally an up for the new window.
Simplified this down to just two booleans.

Bug: 6484717
Change-Id: I9587d0a5e282419ef4d7c17665940682aacea96a
ava/android/media/AudioService.java
0a95ce9ffbfa39def9186c736f6b135d251bc810 17-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Handle media button events during phone calls and when ringing" into jb-dev
722b808662eb20fa91151f1e3aa05fd911d1d226 16-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Handle media button events during phone calls and when ringing

Add functionality in AudioManager/AudioService to register a
media button receiver for telephony that, when registered, gets
priority for media button key events during a phone call or
when ringing.

Bug 6484717

Change-Id: I0835fc02cb24d06ca59af5a32c3ba0ae93e54442
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
d88404d0a1991a13cce9d5e55e4314828839311d 17-May-2012 Marco Nelissen <marcone@google.com> Merge "Fix .pls playlist parsing" into jb-dev
538d4925b36067dc89ad0625a69dafeaa364bd2e 17-May-2012 Marco Nelissen <marcone@google.com> Fix .pls playlist parsing

b/6508278

Change-Id: I015ecf3fa599601ba4e9d018be24d0685e153239
ava/android/media/MediaScanner.java
6cd0fde78d68fc3fe37400adebda9ef6780f00a9 16-May-2012 James Dong <jdong@google.com> am 62c51779: am 5ddb19e5: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine

* commit '62c517792d4e3b0f95aa1b76a6aaf7addffc0a0d':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
5ddb19e5305365d23ffd46751d8963d9b739b49d 15-May-2012 James Dong <jdong@google.com> Remove dependency of libvideoeditor_jni.so on static libs from video editor engine

related-to-bug: 6502980

Change-Id: I77aa67dac73ecb6200cfc885c426c23d70929e5d
ni/mediaeditor/Android.mk
2fd30eed37a02a374b8ce6d756ce8a944bd4644e 15-May-2012 James Dong <jdong@google.com> am 7840dfaf: am 5301a56c: Merge "Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"" into jb-dev

* commit '7840dfaf1545e7299521c892b3281e64f4eb8dcf':
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
f20e4f4b1a31c2103efdff01e2bf1a3b6f8d503e 15-May-2012 James Dong <jdong@google.com> Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"

This reverts commit cbaa821b7f286a54767cc8bc549504ea2ed86e4d.
ni/mediaeditor/Android.mk
22b25b185fce96fcb5bc83bf4bcab032cb87db84 15-May-2012 James Dong <jdong@google.com> am 1fb01d9a: am 6387c8a9: Merge "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" into jb-dev

* commit '1fb01d9a48dcb1dcdd6a4feca9f51213f50df94f':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
50e8a1649aae26db0986e3967fede71ab7383d85 15-May-2012 Eric Laurent <elaurent@google.com> am dd99f70a: am dfae6db0: Merge "Implement new volume display policy." into jb-dev

* commit 'dd99f70a3f8e661799ecda271d31fc385a80ecb5':
Implement new volume display policy.
cbaa821b7f286a54767cc8bc549504ea2ed86e4d 15-May-2012 James Dong <jdong@google.com> Remove dependency of libvideoeditor_jni.so on static libs from video editor engine

related-to-bug: 6328360

Change-Id: Ifc9ffc671f454135db31590805c38f9635e5c815
ni/mediaeditor/Android.mk
ba128896f389212109b04a8712f96207f2b2ff5f 15-May-2012 Jean-Michel Trivi <jmtrivi@google.com> am 45274f72: am 2411c336: Merge "Verify AudioTrack only uses a valid multichannel configuration" into jb-dev

* commit '45274f729e9d9d1d9bee3007a949d531abdb31a2':
Verify AudioTrack only uses a valid multichannel configuration
8c78752f2bf786ca3e6f45b9dc6955d3b4bba59c 14-May-2012 Eric Laurent <elaurent@google.com> Implement new volume display policy.

Whenever a stream type is muted, the progress bar in volume panel
is at 0.
If a stream is muted by ringer mode and does not control ringer mode,
the progress bar is disabled.
Pressing VOL- when in vibrate or silent mode resets the last audible
volume of ringtone stream (music strem on tablets) to 0.

VolumePanel implementation:
- Always prefer AudioManager APIs over AudioService APIs when available on both.
- Do not use AudioManager.shouldVibrate() (deprecated).

Change-Id: I57fcb19ada4e8d729b6b41d668496562ebe340c3
ava/android/media/AudioService.java
d9e587137b926a56e6e339f11da6a91624df515a 12-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Verify AudioTrack only uses a valid multichannel configuration

Enforce the same rules as for HDMI output:
- FL/FR must be present
- paired channels must be used in pairs (e.g. no rear left
without rear right)

Bug 6392126

Change-Id: I0a39e474dcf509cb7eabd8edd1f0e44852d72b51
ava/android/media/AudioTrack.java
d8be1b9e67b0ecc3a626716eb0b779d72616bb77 14-May-2012 Jean-Michel Trivi <jmtrivi@google.com> am 3d486406: am 2d97a70f: Merge "Start voice-based interactions from headsethook key" into jb-dev

* commit '3d486406ab510dfab0e4b6913de90be9486074ad':
Start voice-based interactions from headsethook key
16ff4fbab7d64196b952d8211a3dfadc1b9697ff 14-May-2012 James Dong <jdong@google.com> am f4513bb9: am 909c4b85: Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev

* commit 'f4513bb95b6c8b831b747bf08accd74f96ce712b':
Improve notifying TimedText by reducing marshall/unmarshalling.
2d97a70ff8bbac5ea807003d65b64e3b255e82bc 12-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Start voice-based interactions from headsethook key" into jb-dev
909c4b855a372dbc70ce6777df64d12ae93ad2d5 12-May-2012 James Dong <jdong@google.com> Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev
4294b83927f51e5c115ebaafd2e185ba5de91436 01-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Start voice-based interactions from headsethook key

Implement the interception of long-press on keys that
can be used to trigger voice-based interactions (here
only HEADSETHOOK) only if the long-press hasn't been
trapped by the foreground application:
- if the key is not one that is used for voice input, handle
the event as before.
- if the key press wasn't long enough, simulate a delayed
key press.
- if long press is detected, send
RecognizerIntent.ACTION_WEB_SEARCH. Long press duration
is set to 300ms (a typical key press is under 100ms).

Bug 3225090

Change-Id: I5b3adeb91d3c41ccd54d23fdb93d7eaec496eee7
ava/android/media/AudioService.java
e3f70c6545e5943bbc1a9fd657dcb0fe33062db9 11-May-2012 Mike Lockwood <lockwood@google.com> am f61adad3: am 8d8176d4: Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev

* commit 'f61adad3a7aab104b8c98625fa0e986341ada0d2':
AudioService: Fix problem handling USB audio disconnect
8d8176d41b8b8f08435e727f03e43e27a542dcc2 11-May-2012 Mike Lockwood <lockwood@google.com> Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev
9841818b9a0280abf59343c9e00a2976dbc084fa 11-May-2012 Mike Lockwood <lockwood@google.com> AudioService: Fix problem handling USB audio disconnect

Also broadcast ACTION_AUDIO_BECOMING_NOISY on USB audio disconnect

Change-Id: I46dfcc744df880066aea6bf651334a081c14af0f
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
91812e43050fd4f643a68f136e122b405393a11a 11-May-2012 Eric Laurent <elaurent@google.com> am d2261486: am 304521b7: Merge "AudioService: fix various volume issues." into jb-dev

* commit 'd2261486fa7c789cce5642034d294220f13f6cb0':
AudioService: fix various volume issues.
244820185269991186d07068b92985624cede4a5 10-May-2012 Eric Laurent <elaurent@google.com> AudioService: fix various volume issues.

Fix various issues in adjustStreamVolume() related to stream type aliases
using different ranges.

Always Update last audible index on all streams sharing the same alias.

Add check on setRingerMode() to prevent setting mode to VIBRATE when no
vibrator is present.

Issue 6455831.

Change-Id: Id110e05d2f16e208e1e398922617bf31967b62db
ava/android/media/AudioService.java
98d8fcf646241d5610e81a1723a24c91a95e2c09 11-May-2012 Eric Laurent <elaurent@google.com> am faf23358: am 24938df9: Merge "AudioService: synchronized access to volume index" into jb-dev

* commit 'faf233585b5f3338cb39ab1aeb97891c0e25b273':
AudioService: synchronized access to volume index
24938df9e44dbed2ea9c72370907fe403674ee00 11-May-2012 Eric Laurent <elaurent@google.com> Merge "AudioService: synchronized access to volume index" into jb-dev
3172d5e3e7520a745fa37b71fc1c7bf244b57085 09-May-2012 Eric Laurent <elaurent@google.com> AudioService: synchronized access to volume index

Add synchronization to prevent concurrent accesses to
volume indexes HashMap in VolumeStreamState.

Use ConcurrentHashMap for VolumeStreamState mIndex and
mLastAudibleIndex.

Issue 6421841.

Change-Id: I6dee805a79aa5e2cd0ba4072014a2fcdda4ed507
ava/android/media/AudioService.java
15ad6fe94d94c189df4b52e2ee54b9bfb26e21c3 10-May-2012 Andreas Huber <andih@google.com> am b2725f7c: am 1bc1b8a5: Merge "Make sure crop rect information is visible from java." into jb-dev

* commit 'b2725f7c7e30dd547a81a8d057bbeab75f35616e':
Make sure crop rect information is visible from java.
745e7f25c107622f54ea74b0e4b209c05f4a1219 10-May-2012 Pannag Sanketi <psanketi@google.com> am b53bc725: am 1870c696: Merge "Adding disconnect call to the SurfaceTextureTarget" into jb-dev

* commit 'b53bc725655056ac275e745bfeeffeaf1479ea38':
Adding disconnect call to the SurfaceTextureTarget
a2172c4403d83cc453748e7c696a27103f815ac1 10-May-2012 Ruei-sung Lin <rslin@google.com> am af9eb5a0: am c2e393f8: Merge "pseudo random number generator in shader with limited precisions" into jb-dev

* commit 'af9eb5a05b7770fb5fb0901f0a1289951e24664e':
pseudo random number generator in shader with limited precisions
1bc1b8a5b8a0c5fbcd670d1963235de27a5ccec4 10-May-2012 Andreas Huber <andih@google.com> Merge "Make sure crop rect information is visible from java." into jb-dev
d293b4b33949b38b0d2fb1898351202c354c2a1b 10-May-2012 Dianne Hackborn <hackbod@google.com> am 1ccc8953: am e2c7e2ad: Merge "Add compression level key for FLAC encoding" into jb-dev

* commit '1ccc8953a0ef17076fc2f8088159556c70fbb9c5':
Add compression level key for FLAC encoding
b842599e51e2d3611503c3c7db1111358f99186d 10-May-2012 Andreas Huber <andih@google.com> Make sure crop rect information is visible from java.

Change-Id: Ib914de3d42349efcd7af301d43bec82a21d24ce5
related-to-bug: 6471684
ni/android_media_Utils.cpp
1870c69693d655b101fcc221eb14b1cd7592059d 10-May-2012 Pannag Sanketi <psanketi@google.com> Merge "Adding disconnect call to the SurfaceTextureTarget" into jb-dev
c2e393f86c39e710a06a1d452a410014295fb6e4 10-May-2012 Ruei-sung Lin <rslin@google.com> Merge "pseudo random number generator in shader with limited precisions" into jb-dev
08fb063f078d34e66ff697163de5797a83fb1ded 10-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Add compression level key for FLAC encoding

Change-Id: Ic4c32694841b6f37ca44061d14bb81fc267696cc
ava/android/media/MediaFormat.java
b939760679caa9fdd06c862cf8218cc8f4a90ef1 08-May-2012 Pannag Sanketi <psanketi@google.com> Adding disconnect call to the SurfaceTextureTarget

Related to b/5873421.
When an app using the SurfaceTextureTarget filter and the activity goes
out of focus such as onPause(), the underlying surfacetexture might not
be available anymore to the filter. The filter needs to be told about
that so that it does try to render into the surface corresponding to the
surfacetexture. For example, in Camera app, the VideoCamera activity has
to let the underlying effects graph know about the disconnect in the
onPause() method.

Change-Id: Iee3af16715432d84fef4438d1671f4d6d261b3d7
ca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java
a75c7bbc633a6ebd35a0651be5c7a79b83d0c5c0 04-May-2012 Ruei-sung Lin <rslin@google.com> pseudo random number generator in shader with limited precisions

Change-Id: I3289155824bf71b274c00d1b16366bb319588831
ca/filterpacks/java/android/filterpacks/imageproc/BitmapOverlayFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java
610ac933fca53322c78f3bdf985bbc99703f1bb5 09-May-2012 Andreas Huber <andih@google.com> am 039495d3: am ea86b36f: Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev

* commit '039495d3dc19b96e3953fde81b74c44d0ac5c2f0':
Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
f86374adec8bd77af7b012f788ea59575296facb 09-May-2012 Andreas Huber <andih@google.com> Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no

sense for the java API.

Change-Id: I3f2eabb5ca5ffb6c1f03141bfd303310111e8774
related-to-bug: 6276111
ava/android/media/MediaExtractor.java
ni/android_media_MediaExtractor.cpp
dc8967edf047c0d829619a5ea8d31814e0c58c3a 09-May-2012 James Dong <jdong@google.com> am 4c2a7bdf: am 3b5fdf51: Merge "Fix: Missed parcel recycling in MediaPlayer." into jb-dev

* commit '4c2a7bdf21ae2f1cba8abfbffa1ea749e2eaaa39':
Fix: Missed parcel recycling in MediaPlayer.
ec9323509d8bd1841f7146e2ef0c205833aafc38 09-May-2012 Eric Laurent <elaurent@google.com> am 776339fe: am c8ade15d: Merge "Silent and Vibrate mode clean up" into jb-dev

* commit '776339fe4c6254fd8e344496a793ce4a11b6f450':
Silent and Vibrate mode clean up
de8fe04ca5e572975a9454977c6ad65b917742f9 09-May-2012 Andreas Huber <andih@google.com> am 10ae406f: am eb194d5d: Merge "Return codec buffers that are marked as having host endianness." into jb-dev

* commit '10ae406f00dc51d6462116f1ac7fca103fd27288':
Return codec buffers that are marked as having host endianness.
c34df8ba52cad444236f6f57d04c8636e2025fae 09-May-2012 Andreas Huber <andih@google.com> am 17b3420f: am c2182c67: Merge "Clarification of MediaCodec behaviour when codec specific data is included" into jb-dev

* commit '17b3420f4e1edcf4a0e5460fbe9f4fb3cd49faca':
Clarification of MediaCodec behaviour when codec specific data is included
8902097bb686752ff207e3bda12713be1a8c74eb 01-May-2012 Insun Kang <insun@google.com> Improve notifying TimedText by reducing marshall/unmarshalling.

o Removes mParcel from TimedText class.
o Converts native parcel into java parcel object directly without
copying to an intermediate byte array.
o JNIMediaPlayerListener::notify checks for Java exceptions, logs them,
and clears the exception state.

related-to-bug: 6405934

Change-Id: I8b82d3cd5b9b3ef8cad27e805202a0e445a88a45
ava/android/media/MediaPlayer.java
ava/android/media/TimedText.java
ni/android_media_MediaPlayer.cpp
3b5fdf510b8660be44121008e6c9dded8c86020c 09-May-2012 James Dong <jdong@google.com> Merge "Fix: Missed parcel recycling in MediaPlayer." into jb-dev
c8ade15dadd680c5e4b201f3b7b0823a13dedb3e 09-May-2012 Eric Laurent <elaurent@google.com> Merge "Silent and Vibrate mode clean up" into jb-dev
bffc3d1bd33eb2d8e00a9f8b6261d815db503311 08-May-2012 Eric Laurent <elaurent@google.com> Silent and Vibrate mode clean up

Clean up related to new Vibration policy.
The vibrate behavior is now only derived from:
- presence of a vibrator on the device
- current ringer mode selected: NORMAL, VIBRATE or SILENT
If no vibrator is present the ringer mode can only be NORMAL or SILENT.

The control of ringer mode via volume keys when volume keys control the "master"
stream type (RING on phones, MUSIC on tablets) is as follows:
If a vibrator is present:
VOL- and volume equals 1: NORMAL => VIBRATE
VOL- and volume equals 0 and not continuous press: VIBRATE => SILENT
VOL+ and in SILENT mode: SILENT => VIBRATE
VOL+ and in VIBRATE mode: VIBRATE => NORMAL, volume = 1
If no vibrator is present:
VOL- and volume equals 0 and not continuous press: NORMAL => SILENT
VOL+ and in SILENT mode: SILENT => NORMAL, volume = 0

VIBRATE_ON and VIBRATE_IN_SILENT settings are not stored/retreived any more.

AudioService checks and corrects ringer mode and stream volumes if necessary when reading from
DB at boot time.

Also:
Added dump for stream volumes in AudioService.
Added device names missing in AudioSystem for USB accessory and USB device.

Issue: 6036529
Issue: 6414950
Issue: 6448163

Change-Id: I77fb821ec63e4e566320cac2701b4ac466e86aef
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
3dd7fd08a8a1d658b0aac8590f1fd922e056f689 08-May-2012 Andreas Huber <andih@google.com> Return codec buffers that are marked as having host endianness.

Change-Id: Iedfd829d108e65ee368909af14ace68b63e0e168
related-to-bug: 6364139
ni/android_media_MediaCodec.cpp
8aa735f71e8921b93f2bb6fa5506d8ff414698a0 08-May-2012 Andreas Huber <andih@google.com> Clarification of MediaCodec behaviour when codec specific data is included

in the format passed to configure().

Change-Id: I150f52e8092c0f7d897891f02ba6b1d89b6230f4
related-to-bug: 6364139
ava/android/media/MediaCodec.java
54cb5592b65a06743750e0a38ac34f01539b2e9b 08-May-2012 Jeff Sharkey <jsharkey@android.com> am 83abfb3c: am 476b03b0: Merge "Handle silent ringtone, title without permission." into jb-dev

* commit '83abfb3cab53314fd5a7601e427b4b8b714f6f06':
Handle silent ringtone, title without permission.
1d8e5c588035550293ecd2558a2e285ee2789d38 07-May-2012 Jeff Sharkey <jsharkey@android.com> Handle silent ringtone, title without permission.

Silent ringtones have a valid Uri, but isn't openable by MediaPlayer,
so treat as no-op playback instead of throwing. Also handle missing
permissions when resolving title.

Bug: 6448074, 6447538
Change-Id: I656675d7fc2e78a6ba05824e13bdd43193fcfdf2
ava/android/media/Ringtone.java
be0ea968bf8b3f92f6975ccd14031aec23a2c47f 04-May-2012 Insun Kang <insun@google.com> Fix: Missed parcel recycling in MediaPlayer.

Change-Id: I2c99f771b33bf627af10e8baea455181558360e6
related-to-bug: 6405934
ava/android/media/MediaPlayer.java
2f81ea26f1742042af14cc883f87c96d85cc7fc1 07-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Update notice files for libstagefright codecs."
4b27a9133e4ec9857e37688c3b2e7d8d96677ebb 04-May-2012 Andreas Huber <andih@google.com> am 9d8aa0e4: am c52c957c: Merge "Various changes to Media* APIs requested by the api council." into jb-dev

* commit '9d8aa0e4ac0498e2a139bd60342d986c42251e2b':
Various changes to Media* APIs requested by the api council.
c52c957c450ded6ecf2444595ea6ddfc9546c786 04-May-2012 Andreas Huber <andih@google.com> Merge "Various changes to Media* APIs requested by the api council." into jb-dev
f131611d038cdcfb441f99516672fdd175a68476 04-May-2012 Christopher Tate <ctate@google.com> resolved conflicts for merge of b89ce434 to master

Change-Id: Ida7ef25adc2f4b9f22d8662c9f0e8a1ec9df0d55
60d610bf103379277a4b29a7ead4f013f6128e4e 03-May-2012 Andreas Huber <andih@google.com> Various changes to Media* APIs requested by the api council.

Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340
related-to-bug: 6432753
ava/android/media/MediaCodec.java
ava/android/media/MediaCodecInfo.java
ava/android/media/MediaCodecList.java
ava/android/media/MediaCrypto.java
ava/android/media/MediaCryptoException.java
ava/android/media/MediaExtractor.java
ava/android/media/MediaFormat.java
ni/android_media_MediaCodec.cpp
ni/android_media_MediaCodecList.cpp
ni/android_media_MediaCrypto.cpp
ni/android_media_MediaExtractor.cpp
b89ce434993cca883818ab38f98c0b29d77e7aa2 04-May-2012 Christopher Tate <ctate@google.com> Add streamlined config-based path for no volume key sounds

This lets us avoid a Binder roundtrip to the system process during
volume changes. Previously volume change would be staged at key-down,
then applied at key up in tandem with playback of the sonic feedback
about volume key presses. The reason for this two-stage handling was
to defer playback of the sound [at the target volume] while the volume
key was being held for repeat.

On some devices volume is always sent as key down/up pairs rather than
down-repeat-up sequences. On these devices it is more efficient to
apply the new volume immediately during down handling, and have the
up handling be a no-op. This CL adds a configuration resource item
selecting this new fast path.

Bug 6433943

Change-Id: Icffa56e958243b841d514e2fe4609ba3a7b20f14
ava/android/media/AudioManager.java
cd9adbcea06d84115ffe38da1fc15b8b80b99dc1 04-May-2012 Jean-Baptiste Queru <jbq@google.com> am 00f94e88: Merge "Enable chromium http stack for x86"

* commit '00f94e88f96ed87c95ea65563396609c61e72dca':
Enable chromium http stack for x86
c919816155f18e2cf395abc31fc3e1c3923bde76 04-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Make AudioService aware of device orientation changes" into jb-dev
cc6475e1732ae5ad4df480fccf44e1cb3ddce153 03-May-2012 Ruei-sung Lin <rslin@google.com> Fix b/5974573 Please increase intensity of film grain effect

Change-Id: Ia984aa91bf3ae8aef47e24a0074b1b0f1624c1a0
ca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java
f4b403159f8a89eb2158bbb6c314de3bc90fee73 03-May-2012 Ruei-sung Lin <rslin@google.com> Fix b/5974247

Change-Id: I8c5cf035f195142607875739604d163c7a43e305
ca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java
f26f01784e1c733c53cad3ed31918e73448ce369 26-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Make AudioService aware of device orientation changes

If the "ro.audio.monitorOrientation" system property is
defined and true, monitor device configuration changes
and see if the device orientation changed. If it did,
set the "orientation" audio system parameter to one
of "landscape", "portrait", "square" or "undefined".
Set orientation when starting AudioService, and
when media server restarts.

Change-Id: Idce548f93abf3aab30149e5952daaa7051630232
ava/android/media/AudioService.java
ba71cdcba41c68914ad0327ce8ae75719f41e1eb 02-May-2012 Jun Tian <jun.j.tian@intel.com> Enable chromium http stack for x86

Use chromium http stack as the online media http stack for x86 platform.

Change-Id: I16a7a8697127a51fab8105833f7463911852f0b3
ibstagefright/Android.mk
f3afe15754a3ffbc41955476081c3a29adaf32f3 02-May-2012 Eric Laurent <elaurent@google.com> Merge "AudioManager: deprecate vibrate settings" into jb-dev
cd1cd73baec1f93d21f67fdded5466e507431eba 01-May-2012 Eric Laurent <elaurent@google.com> AudioManager: deprecate vibrate settings

Deprecate methods, intent and constants related to vibrate
settings management: getVibrateSetting(), setVibrateSetting(),
shouldVibrate() ...

According to new vibrate/notification policy, applications should
maintain their own vibrate settings.

Issue 6036529.

Change-Id: I99bcef2c5f602131f1d9b0222f7fb39f3bbef823
ava/android/media/AudioManager.java
78821e8e22930214c4cd79192f988ca2266fa8cc 02-May-2012 Jean-Baptiste Queru <jbq@google.com> am 1b34c1bc: Merge "stagefright: Remove useless declarations"

* commit '1b34c1bc240e6c2e085eee2b03c728b56b049e23':
stagefright: Remove useless declarations
1b34c1bc240e6c2e085eee2b03c728b56b049e23 01-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright: Remove useless declarations"
cb6662ac532beeba0d3adb85fa37d307838b4325 01-May-2012 James Dong <jdong@google.com> Merge "Add video scaling mode support with a new public method in MediaPlayer.java class" into jb-dev
48dc91b514844b04f1d8dec18a480f9591a2f989 01-May-2012 Andreas Huber <andih@google.com> Make java constants consistent with native counterparts.

Change-Id: I481dfc18c170b4c60682ef1b38b57e10fb73d004
ava/android/media/MediaCodec.java
454014e55fe5a0d9a4b47080f8017b5297d016a8 29-Apr-2012 James Dong <jdong@google.com> Add video scaling mode support with a new public method in MediaPlayer.java class

o related-to-bug: 5454345

Change-Id: I379b679eb6dd87f47f87a58791a5d0c7251b3a74
ava/android/media/MediaPlayer.java
94affdd80e20c334dd5bfff170aee878992195ad 01-May-2012 Eric Laurent <elaurent@google.com> Merge "fix unmute from volume panel on tablets" into jb-dev
f740664cd808bebfc35ded46da6002bdc97a1a16 01-May-2012 Eric Laurent <elaurent@google.com> fix unmute from volume panel on tablets

Changing STREAM_MUSIC from volume panel on tablets should exit silent
mode as does changing STREAM_RING on phones.

Issue 5970208.

Change-Id: Ia8ed62033da07a5d4dfcfa84b0b47b27414bdd9a
ava/android/media/AudioService.java
8ccfbdddabf3387a1ac9d46bd057bea64eb30ef3 01-May-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Optimize how AudioService receives media button events" into jb-dev
56ce3c00fb120133dbd706da8f550bc6ed9c3722 01-May-2012 Ruei-sung Lin <rslin@google.com> Merge "Fix b/5821633: Could not activate GLEnvironment" into jb-dev
c68022258ebd3dd97a5079ba99f4f3cd12b223b0 30-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Optimize how AudioService receives media button events

AudioService maintains a stack of registered media button event
receivers.
This change modifies the broadcasters of ACTION_MEDIA_BUTTON intents
let AudioService directly handle the corresponding key event instead
of trapping the intent sent by PhoneWindowManager, KeyguardViewBase
and PhoneFallbackEventHandler.
Because the key event may be sent through a PendingIntent,
AudioService now also implements the OnFinished interface to be
notified when the event was consumed so it can release the wake
lock held if it was held when the key event needed to be sent
(see where PassHeadsetKey was instanciated in PhoneWindowManager).

Change-Id: I2e8614df94af9d54edbf714ef443cc372d21827a
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
22edf6b2e4e75195b83ae1c4da61e3bf623802b0 01-May-2012 Ruei-sung Lin <rslin@google.com> Fix b/5821633: Could not activate GLEnvironment

Change-Id: I35a05eb24299b85a869b973599a091381369aac2
ca/filterfw/java/android/filterfw/core/GLEnvironment.java
b12a5390694e8525ac61d7377e266e31d124c815 30-Apr-2012 Andreas Huber <andih@google.com> New API to set the video rendering mode on a MediaCodec instance.

Change-Id: I6d765bb4cab7bcf29f09364293c24e8a6930078b
related-to-bug: 6364139
ava/android/media/MediaCodec.java
ni/android_media_MediaCodec.cpp
ni/android_media_MediaCodec.h
ec3f31f6215cb380bba5ab36c9e4c21b13f046a1 29-Apr-2012 Dave Burke <daveburke@google.com> Added support for HE-AAC recording.

Not unhiding HE-AACv2 since that requires stereo mics.

Bug: 6275957

Change-Id: I953a6d21e615c8fd23f9390e3c86d63089f5fb75
ava/android/media/MediaRecorder.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
6d6f233a62fc6d3aceb74966a7f38b0917dc790e 28-Apr-2012 James Dong <jdong@google.com> Merge "Unhide APIs for timed text and multiple audio track switch APIs" into jb-dev
7a9734d769d97470ce6fac0594dd007804d33432 19-Apr-2012 James Dong <jdong@google.com> Unhide APIs for timed text and multiple audio track switch APIs

o made all the member variables in helper classes for TimedText to be public and final
since they are read-only
o removed Text and TextPos helper classes
o added two public methods in TimedText class: getText() and getBounds()
o cleaned up the javadoc of related methods in MediaPlayer.java and TimedText.java classes
o make the inner classes of TimedText static and final
o change invoke and let it throw RuntimeException on failure (thus a test class needs to be
modified also).

o related-to-bug: 6110705,5542712

Change-Id: Ia1dd1fd5eb8e9fd1b61c6c0d67405edb627a3002
ava/android/media/MediaPlayer.java
ava/android/media/TimedText.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java
098d580cc2bb6c0891c756a4e5230c6c6b0d2376 27-Apr-2012 Jeff Sharkey <jsharkey@android.com> Migrate ringtone playback to SystemUI.

Introduce IRingtonePlayer, which handles playback for both Ringtone
objects and Notifications. SystemUI now hosts this player, which it
registers with AudioService. It also keeps MediaPlayer instances
warm, and cleans them up after stop() or Binder death.

Move both Ringtone and NotificationManagerService to play back audio
through this new interface.

Bug: 6376128, 6350773
Change-Id: I1dcb86d16ee3c4f07cdb2248d33dcff4ead3609a
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
ava/android/media/IRingtonePlayer.aidl
ava/android/media/Ringtone.java
ava/android/media/RingtoneManager.java
f5d70fd2add31cdb2e4ca1e931b47db95fa4b3e0 27-Apr-2012 Jeff Sharkey <jsharkey@android.com> Merge "Protect system services with DUMP permission." into jb-dev
c098198eb37974ef117d3d5f0d07fb19ead036dc 27-Apr-2012 Eric Laurent <elaurent@google.com> Merge "system and UI sounds volume policy" into jb-dev
b33c34cc25263647e0270ab92cb7fdb5af79416c 27-Apr-2012 Pannag Sanketi <psanketi@google.com> Merge "Resolving the black screen / crash in effects" into jb-dev
6d5176638c2189595cede38fb92c3e7e8700e221 24-Apr-2012 Eric Laurent <elaurent@google.com> system and UI sounds volume policy

Implement a more consistent policy for system and UI sounds (key clicks, lock/unlock,
camera shutter, DTMF, low battery...):
- All system sounds are played over STREAM_SYSTEM stream type.
- The STREAM_SYSTEM volume that was previously fixed now tracks the volume of a "master"
stream type. This "master" stream type is STREAM_RING for phones and STREAM_MUSIC for
tablets which corresponds to the stream whose volume is modified by default by the volume
keys.
- The STREAM_SYSTEM volume ranges from -24dB to -6dB (-24dB to -12dB over headphones) when the
"master" stream volume ranges from its min to its max.
- DTMF tones are played over STREAM_DTMF that tracks the "master" stream volume in the same
manner with the following exception: when in call, DTMF stream tracks STREAM_VOICE_CALL volume.
- Camera shutter sound is played over STREAM_SYSTEM_ENFORCED stream that tracks the "master"
stream volume except in countries where regulation enforces this sound. In this case
its volume is fixed and cannot be muted.
- Low battery sound is played over STREAM_SYSTEM and therefore has a tunable volume and is
heard while in call.

Issue 6344620.
Issue 6069229.
Issue 6213100.

Change-Id: I53a237878ead596e706c5dbbb1420e62cde32bd7
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
eb4cc492c93ab9635dde78b958a834120412e72a 27-Apr-2012 Jeff Sharkey <jsharkey@android.com> Protect system services with DUMP permission.

Change-Id: I5e53859f8b8e5473e54eca43ebd7de841f1a05ff
ava/android/media/AudioService.java
f18222da3cdfd3b052361369b70a4d22396039c1 27-Apr-2012 Yu Shan Emily Lau <yslau@google.com> Merge "Fix the test cases which fail to launch the camera in the device which only has one camera." into jb-dev
e35b3e052dab756113304cb394980e9f271b1613 27-Apr-2012 Yu Shan Emily Lau <yslau@google.com> Fix the test cases which fail to launch the camera
in the device which only has one camera.

Change-Id: Ia34087715e49f1aa3e86f3f85cb4e77168323321
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
2f708ce9cc7fc2e4d498bcc20a095bdf8e9c803d 26-Apr-2012 Pannag Sanketi <psanketi@google.com> Resolving the black screen / crash in effects

b:/6278826
The SurfaceTextureTarget Filter was not unregistering the surface
on closing leading to crashes and blank screens.

Change-Id: Ia9f6fc69b92d5a5e2e1e3803969152d11528aa3d
ca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java
2996cf03a2fd419bc91a45d7db733e2e81bf84f4 26-Apr-2012 Dave Burke <daveburke@google.com> Merge "Unhide new AAC-ELD audio record type." into jb-dev
129a6ccbb8037ab36259329f702d12a225f75510 26-Apr-2012 Andreas Huber <andih@google.com> Merge "The MediaExtractor can now unselect tracks and has more control over seeking." into jb-dev
f2855b3df5994e165b29025c4c49d8e7d634c034 26-Apr-2012 Andreas Huber <andih@google.com> The MediaExtractor can now unselect tracks and has more control over seeking.

Change-Id: I12c28bf31fe9fb4057352999fa38213ae289a417
related-to-bug: 6276111
ava/android/media/MediaExtractor.java
ni/android_media_MediaExtractor.cpp
ni/android_media_MediaExtractor.h
8037cad6c19cacc55f0e25a2d41e15599666973c 26-Apr-2012 Eric Laurent <elaurent@google.com> Merge "Fix AudioManager.forceVolumeControlStream()" into jb-dev
6644a826a12babfb88aadc65c29e8bf3d4d8c1d3 26-Apr-2012 Dave Burke <daveburke@google.com> Unhide new AAC-ELD audio record type.

Change-Id: Ibb9d3cd797c0b14c495776dc172ff7dadf6df7d6
ava/android/media/MediaRecorder.java
45c90cefd13a03b852bb4b8da4be218876cbbb32 25-Apr-2012 Eric Laurent <elaurent@google.com> Fix AudioManager.forceVolumeControlStream()

AudioManager.forceVolumeControlStream() is used by VolumePanel to temporarily force the
stream type which volume is controlled by volume keys.

Current implementation is not working if the VolumePanel is not executed by the same process
as the one receiving the volume key events.

Issue 6302421.

Change-Id: I2700587a027ffb962429b42083312cd92fe79215
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
0b718392c1f50f45760b198a5d9e8df2cf2b5080 25-Apr-2012 Marco Nelissen <marcone@google.com> Further speed up playlist processing

Previously when processing playlists, the entire audio table would be read for
every line in a playlist file. While there would be only one query, a lot of
data was being moved from sqlite to java over and over again, and if the data
didn't all fit in a CursorWindow, additional queries would be done under the
hood.
With this change, playlists are first cached in memory. Then the audio table
is queried, and for every row in the audio table, the best match from the
playlist cache is found. This way the audio table is only traversed once,
so each row is only fetched once. Once the entire audio table has been read,
the in-memory playlist cache contains the best matching entry for each line,
and the playlists are written out to the database. Currently, the audio table
is traversed once for each playlist. This could be further optimized in the
future by processing all playlists at the same time.

b/6346786

Change-Id: Iead3f9ae838d600d085e8e6d3c4874d42314468e
ava/android/media/MediaScanner.java
d7a2a428db781b3fae5df395dccac1bcab867bd5 26-Apr-2012 Jeff Sharkey <jsharkey@android.com> Merge "Move RINGTONE_PICKER to handle external storage." into jb-dev
6dcf382b1b1dde5e6303a51a27f8d3b928072415 18-Apr-2012 Jeff Sharkey <jsharkey@android.com> Move RINGTONE_PICKER to handle external storage.

To give RINGTONE_PICKER external storage access, move it from system
to MediaProvider. Fix OOBE when getRingtoneUri() kicked requery().

Bug: 6346701
Change-Id: I837002eef0580b8cdd8920a27b068c745995a8a3
ava/android/media/RingtoneManager.java
1b8f499a14a4340d3422d95c7f6fdc8c0c72b3a4 25-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Allow multichannel configurations in android.media.AudioTrack

Compare the channel configuration against a mask of the public
channel masks in AudioFormat for up to 5.1 with back channels,
and allow combinations within this mask.

Change-Id: I84b72dfd88d4490f0c67bf10d13151a9eb06f6a8
ava/android/media/AudioTrack.java
d6bdbb8da14f0162281ce18ce7573a6c5a15b04e 24-Apr-2012 Dianne Hackborn <hackbod@android.com> am b4781b9b: am ea8ceca8: am 90577af7: Merge "use utf8_length() instead of local function, isValidUtf8()"

* commit 'b4781b9b489bc8b0049e1e92b7ab00e32b02b12c':
use utf8_length() instead of local function, isValidUtf8()
08f70fa5b82faa00d4d536b5a220d7ce8dd8f932 23-Apr-2012 Marco Nelissen <marcone@google.com> Speed up playlist processing

When matching entries in playlists, only consider audio files.

b/6346786

Change-Id: Ia744d002c2821a81840303b9409593da48a08b73
ava/android/media/MediaScanner.java
74a78b0f6e8c07cfc7da8f043987f6de0648bc05 20-Apr-2012 Andreas Huber <andih@google.com> Add the ability to query the amount of cached data to MediaExtractor.

Change-Id: I47ae60bc6fb8d88979c1f0d650b6ac528e811371
related-to-bug: 6364341
ava/android/media/MediaExtractor.java
ni/android_media_MediaExtractor.cpp
ni/android_media_MediaExtractor.h
f3dbb59f1d199b6db539c84d371a2e55c7a6bd05 19-Apr-2012 James Dong <jdong@google.com> Merge "Update javadoc for timed text / multiple audio track APIs"
0d1ba1505695815907c34339c6f80c95d6fc6b40 19-Apr-2012 Andreas Huber <andih@google.com> Merge "DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clients"
831f0a90cad923ec6b00c5c598ac4356e5849431 19-Apr-2012 James Dong <jdong@google.com> Update javadoc for timed text / multiple audio track APIs

o Throw runtime exception when selectTrack, unselectTrack, getTrackInfo fails
o remove redundant code for selectTrack and unselectTrack methods

o related-to-bug: 6110705,5542712

Change-Id: I59f0ed638e93d0365eccab1e33c9d50354a9c1ba
ava/android/media/MediaPlayer.java
bfc56f497de0d18125366a02a93e61cdc0891be4 19-Apr-2012 Andreas Huber <andih@google.com> DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clients

through a custom exception "MediaCodec.CryptoException".

Change-Id: I30215e9e13bab68abad23e27dcead7c1accd07f1
related-to-bug: 6365261
ava/android/media/MediaCodec.java
ni/android_media_MediaCodec.cpp
ni/android_media_MediaCodec.h
c9496495baa031d1e6af9fd438c7d007a5d59b4e 19-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Unhide Visualizer scaling mode definitions and methods"
951794616f0d275faa077b25cb5979e401b0324d 19-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Unhide Visualizer scaling mode definitions and methods

Unhide Visualizer set/get methods, and associated constant
definitions.

Change-Id: Iaafe5f7a2f1273f72c3f7f842b416b93614dfa65
ava/android/media/audiofx/Visualizer.java
6db653355bbf79f4bfe666fb96262c0df2ec34aa 19-Apr-2012 Eric Laurent <elaurent@google.com> Merge "unhide API for synchronous audio capture."
125c32ebe701bb4c366f4efe35afa72c67990206 19-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add functional tests for Visualizer volume scaling mode"
997592b3ce5492e500aebb87066bbeab6c4e4599 17-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Add functional tests for Visualizer volume scaling mode

Add test to set/get the volume scaling mode.

Add test to verify that volume decreases diminish the commputed
energy.

Change-Id: I0a5d45d064a46a18e5c4b9d7a304c9572f100cdf
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java
5cef554cc857b2b542d2c62f8cd0c36d62e1bb9b 19-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add support for scaling mode parameter in Visualizer effect"
ff2577da370f15b8288f547575c28393477d57b1 04-Apr-2012 Eric Laurent <elaurent@google.com> unhide API for synchronous audio capture.

unhide MediaSyncEvent class and AudioRecord.startRecording() method with synchronization
event allowing to start audio capture upon occurence of a specific event.
So far the only event defined is playback presentation complete but more events and synchronized
playback/capture methods could be defined in the future.

Change-Id: If05fc6cd125dd9afad451727f792a3fd9e916bef
ava/android/media/AudioRecord.java
ava/android/media/MediaSyncEvent.java
ava/android/media/ToneGenerator.java
ea8ceca869e5293ba6caeadaaa13c8369df09109 19-Apr-2012 Dianne Hackborn <hackbod@android.com> am 90577af7: Merge "use utf8_length() instead of local function, isValidUtf8()"

* commit '90577af796cd526f842d6f07c2d95ed4fcc2f6d8':
use utf8_length() instead of local function, isValidUtf8()
8dfc10571a83389593fc11b92fbf9fc1f22c9f21 11-Apr-2012 Eric Laurent <elaurent@google.com> unhide audio pre processing API.

Unhide APIs for Noise Suppressor(NS), Acoustic Echo Canceler (AEC) and
Automatic Gain Control (AGC) audio pre processings.

Also unhide getAudioSessionId() method on AudioRecord.

Change-Id: I788f7a0724b152cc98c8167d9434e64c12bada95
ava/android/media/AudioRecord.java
ava/android/media/audiofx/AcousticEchoCanceler.java
ava/android/media/audiofx/AutomaticGainControl.java
ava/android/media/audiofx/NoiseSuppressor.java
ab57d03bdb3010d4957fb88c8acb30575ca02ec9 19-Apr-2012 Andreas Huber <andih@google.com> Fix a typo and choose a reasonable default for crypto-mode (0 would be unencrypted)

Change-Id: Ia46a7d7dd405bd569f319a64e43123d802c867d3
related-to-bug: 6275919
ni/android_media_MediaExtractor.cpp
91befdc0c4710234840cdfd853e7d30e8f9de62c 18-Apr-2012 Andreas Huber <andih@google.com> Information required to decrypt buffers is now packaged into MediaCodec.CryptoInfo

New API on MediaExtractor to retrieve a CryptoInfo structure where applicable.

Change-Id: I18edfc9ac56a4544c8f17cba24401b96dacbff7d
related-to-bug: 6275919
ava/android/media/MediaCodec.java
ava/android/media/MediaExtractor.java
ni/android_media_MediaCodec.cpp
ni/android_media_MediaExtractor.cpp
ni/android_media_MediaExtractor.h
f7d3bdfc22058439c1ec84165c91460a0f0850a2 18-Apr-2012 James Dong <jdong@google.com> Merge "AddExternalSource(String path) needs to turn the path to fd if it is a file"
c4c0284e45e1b69a03309cd55f937bcc638c0bec 13-Apr-2012 James Dong <jdong@google.com> AddExternalSource(String path) needs to turn the path to fd if it is a file

o related-to-bug: 5542712

Change-Id: Iea32012996ca9de4c86f144de916df64fcab3c52
ava/android/media/MediaPlayer.java
2b9d6bd092ef1d0cc142bf16f671648d1c84c307 18-Apr-2012 Andreas Huber <andih@google.com> Make seekTo not throw exceptions.

Change-Id: I9d0469962364b86fbab920e9ac65f468fc630737
related-to-bug: 6276111
ni/android_media_MediaExtractor.cpp
e1123e7f36723a8b888501c9a22a589297849ca2 16-Apr-2012 Jean-Michel Trivi <jmtrivi@google.com> Add support for scaling mode parameter in Visualizer effect

Add set/get methods to set how the Visualizer scales the captured
data.

Change-Id: Ia1da00fd5474dd3484b59caf7d1d0a812d0347de
ava/android/media/audiofx/Visualizer.java
ni/audioeffect/android_media_Visualizer.cpp
2952c5d03c26aec8f2aa2d69f20b47a7cc8f39e1 17-Apr-2012 Andreas Huber <andih@google.com> MediaCrypto's constructor can throw RuntimeException.

Change-Id: I5718e9abab0d1465882580e826747d6a78bdefb5
related-to-bug: 6275919
ava/android/media/MediaCrypto.java
ni/android_media_MediaCrypto.cpp
07ea426e3ae8915ca6bf67135f523f42cd920af0 11-Apr-2012 Andreas Huber <andih@google.com> Unhide new media related java APIs.

Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
ava/android/media/Crypto.java
ava/android/media/MediaCodec.java
ava/android/media/MediaCodecList.java
ava/android/media/MediaCrypto.java
ava/android/media/MediaExtractor.java
ni/Android.mk
ni/android_media_Crypto.cpp
ni/android_media_Crypto.h
ni/android_media_MediaCodec.cpp
ni/android_media_MediaCodecList.cpp
ni/android_media_MediaCrypto.cpp
ni/android_media_MediaCrypto.h
ni/android_media_MediaExtractor.cpp
ni/android_media_MediaExtractor.h
ni/android_media_Utils.cpp
e1efcca84622ce9f26f3adf8c31bc8e3168e877c 16-Apr-2012 Martin Storsjo <martin@martin.st> 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
ibstagefright/codecs/common/Android.mk
6e868a5865c2bde5dc9609c7944f9088f830f7c5 13-Apr-2012 Martin Storsjo <martin@martin.st> 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
ibstagefright/codecs/avc/common/src/deblock.cpp
ibstagefright/codecs/avc/enc/src/motion_comp.cpp
3befb246b4d61bf0b066e40d86c0e9be837d2671 13-Apr-2012 Martin Storsjo <martin@martin.st> 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
ibstagefright/codecs/avc/enc/src/avcenc_api.cpp
ibstagefright/codecs/avc/enc/src/motion_comp.cpp
ibstagefright/codecs/avc/enc/src/sad_inline.h
1a8b6c29aaa5a1591097daca0876808cc029cbda 05-Apr-2012 Homin Lee <suapapa@insignal.co.kr> 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>
ni/android_media_MediaScanner.cpp
f3d9f5d097dffec33f416d0907d4a6e0dae43f69 12-Apr-2012 James Dong <jdong@google.com> Merge "Fix failure from setDataSource(String path) when path is a local file"
e00b6f3a57d4b480ce674468de93555269bbd71a 12-Apr-2012 James Dong <jdong@google.com> Fix failure from setDataSource(String path) when path is a local file

o the failure was because the mediaserver does not have read permission to sdcard
o related-to-bug: 6325960,6322913

Change-Id: I4feec01b8165c78563eee8aab69cb24df3244d03
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
0041b5c561a48ed8f63c4fe8ae3bff5196f68d0f 11-Apr-2012 James Dong <jdong@google.com> Fix thumbnail generation failure

o Change the impl of MediaMetadataRetriever.setDataSource(String).
It opens and passes an fd to the media framework
rather than pass the file path directly to the media server. The change is needed since media
server does not have read permission to sdcard
o Remove the unnecessary jni method

Change-Id: I5a2f47dde804523d264b588f855ba2575a99c179
ava/android/media/MediaMetadataRetriever.java
ni/android_media_MediaMetadataRetriever.cpp
855255d89fe0a14abe796355bebb64031ec6ff47 09-Apr-2012 Eric Laurent <elaurent@google.com> audio preprocessing: added static factory method

Added static methods to check availability and create audio preprocessing
effects.

Change-Id: I945e97fe41912ff8880befacaba162a08b5a1267
ava/android/media/audiofx/AcousticEchoCanceler.java
ava/android/media/audiofx/AudioEffect.java
ava/android/media/audiofx/AutomaticGainControl.java
ava/android/media/audiofx/NoiseSuppressor.java
079f09c6ca4148d8e640e34ec03a3eb4fb3507cc 09-Apr-2012 Eric Laurent <elaurent@google.com> Merge "Added support for USB audio devices"
59f482764e346a5c5ac118ee1f7b24da645c2559 06-Apr-2012 Eric Laurent <elaurent@google.com> Added support for USB audio devices

Two types of USB audio devices are defined:
- USB audio device: the audio device in USB device mode while
the Android device is in USB host mode.
- USB audio accessory: the audio device in USB host mode while
the Android device is in USB device mode.

Renamed intents for analog and digital docks to avoid confusion:
- ACTION_USB_ANLG_HEADSET_PLUG to ACTION_ANALOG_AUDIO_DOCK_PLUG
- ACTION_USB_DGTL_HEADSET_PLUG to ACTION_DIGITAL_AUDIO_DOCK_PLUG

Factorized code in AudioService broadcast receiver.

Change-Id: I1b6d0257a9d68ecb9495c78c98bac8c67fec7891
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
9e6bcce17d13bd4f7bba5f8fbcc2e6a0d695274b 06-Apr-2012 Andreas Huber <andih@google.com> New JAVA API to support submitting encrypted buffers of input data.

Change-Id: Ib0df9a9427b4580946179860495b26f743558597
related-to-bug: 6275919
ava/android/media/MediaCodec.java
ni/android_media_MediaCodec.cpp
ni/android_media_MediaCodec.h
1c35d117f01b5a6f66b82c57eb29350f16694070 05-Apr-2012 Justin Koh <justinkoh@google.com> am db9b114b: Merge "Adds flag argument to setMasterMute." into ics-aah

* commit 'db9b114b2e1f9c2034c3cd6df00245b039d90c28':
Adds flag argument to setMasterMute.
8fa23393e9f9de1c65a45f49463e745de498c557 05-Apr-2012 Yu Shan Emily Lau <yslau@google.com> Merge "Insert the 2 seconds before test start to workaround the race conditon for requesting the surface."
a79edb72333ceda76c73166acef139c8668ee829 05-Apr-2012 Yu Shan Emily Lau <yslau@google.com> Insert the 2 seconds before test start to
workaround the race conditon for requesting
the surface.

Change-Id: Ic8ba358400492860b0d38fc71468ea4bb4d3d7bd
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediaplayback/MediaPlayerApiTest.java
0273af55cf68d54d26d154b44d105d40fed79701 05-Apr-2012 Justin Koh <justinkoh@google.com> Adds flag argument to setMasterMute.

Adds flag argument to setMasterMute. This allows third parties to edit it
without showing the UI, for example.

TESTED = runs on Tungsten.

Change-Id: Idfd99a2476e60059cd93c9dfe07d03a389c3f5f5
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
75cf9e19a575c28c200c02c0ab6f83bb79f5c50d 05-Apr-2012 Justin Koh <justinkoh@google.com> Fix the build.

Change-Id: Ibe818df8f360837688f12533cf0ac22ef89a8439
ava/android/media/AudioService.java
5ac69a23e07abdc848d14d9a4ea9bf8054b88730 04-Apr-2012 Justin Koh <justinkoh@google.com> Merge "resolved conflicts for merge of bff6a514 to master"
6a8096d7d56ce4c65318f283ef666993f3020745 04-Apr-2012 Justin Koh <justinkoh@google.com> resolved conflicts for merge of bff6a514 to master

Change-Id: I741d5ab8ed0ce25a27330ffb55ba210534d11c3d
e313f721ad97ad44666dd066a891acb4ddfa8ab3 04-Apr-2012 Marco Nelissen <marcone@google.com> Store video width/height when scanning

b/5820120

Change-Id: If2faf554bbf49b341d2634915ba98c1efd70574e
ava/android/media/MediaScanner.java
8240d9239d9aabed75c49f9d4d69fd8a5fe4c899 04-Apr-2012 Andreas Huber <andih@google.com> New Crypto JAVA class to facilitate decryption via MediaCodec.

Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034
related-to-bug: 6275919
ava/android/media/Crypto.java
ava/android/media/MediaCodec.java
ava/android/media/MediaExtractor.java
ni/Android.mk
ni/android_media_Crypto.cpp
ni/android_media_Crypto.h
ni/android_media_MediaCodec.cpp
ni/android_media_MediaCodec.h
ni/android_media_MediaPlayer.cpp
bff6a514da978644f1cdf6e5bdd6f93353b74572 04-Apr-2012 Justin Koh <justinkoh@google.com> Merge "Persists the master mute volume setting." into ics-aah
57978ed86286a33d5b1a0fd000ca3406ba9d87b3 04-Apr-2012 Justin Koh <justinkoh@google.com> Persists the master mute volume setting.

Persists the master mute volume setting across reboots.

TESTED = runs on Tungsten.

Change-Id: I9628b9369ca528b22413f62a9e7d697bae61d8ac
ava/android/media/AudioService.java
c0c4a20c0fe56c2b64e4adb2df3f30d7eb62abaf 04-Apr-2012 Jason Noguchi <jnoguchi@google.com> am a72a06f3: am f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test.

* commit 'a72a06f37ecdd615fb2a29faed99c7f128196211':
Fix build break introduced by missing parenthesis in camera stress test.
f5693a6a50d2806ef5a4fd30929539e941dfa069 04-Apr-2012 Jason Noguchi <jnoguchi@google.com> 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.
f499a0722b329fd8954c43cb39ab6fbba23cfee4 04-Apr-2012 Jason Noguchi <jnoguchi@google.com> 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.
a784b3dea15dd0dfedfe25552b87fbb92a5eea52 04-Apr-2012 Jason Noguchi <jnoguchi@google.com> Fix build break introduced by missing parenthesis in camera stress test.

Change-Id: I8da9321a7674dbbe48cc0c214c0b043fbce8eeab
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java
b7cc80d8f3f60f0e1f645e6487913aa2d6a32d0b 04-Apr-2012 Jason Noguchi <jnoguchi@google.com> am a5408a8c: am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit 'a5408a8c75a2839f1b0704f024cc4e523830c128':
Adding camera zoom test to mediaframework stress suite.
34a4e519b298941760c1d6797142a9ebca003627 04-Apr-2012 Jason Noguchi <jnoguchi@google.com> am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
Adding camera zoom test to mediaframework stress suite.
e371ed8de54c42d2e0b8aa3fb7196670ff5ae9ee 04-Apr-2012 Jason Noguchi <jnoguchi@google.com> am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1

* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
Adding camera zoom test to mediaframework stress suite.
6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8 04-Apr-2012 Jason Noguchi <jnoguchi@google.com> Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
991c8733c3b990b88edf5cf223aebe3d1c71b7f0 03-Apr-2012 Andreas Huber <andih@google.com> Merge "More DRM/crypto support."
0e97fc248eaea7b4c95053618ddedf0af638110e 03-Apr-2012 Andreas Huber <andih@google.com> More DRM/crypto support.

related-to-bug: 6275919
Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
ava/android/media/MediaCodec.java
ni/android_media_MediaCodec.cpp
b5f2088c8ebc3d880dac2141df19a57053b7bae0 03-Apr-2012 Mike Lockwood <lockwood@google.com> Merge commit '7f71d01'
3e29718d34eba7c6c455fa6bb622856fe651876e 03-Apr-2012 Mike Lockwood <lockwood@google.com> Merge commit '830ad08'
4a727e342134f409c2cf7cf2f77dbe9c15128337 03-Apr-2012 Marco Nelissen <marcone@google.com> Merge "Support audio/ogg mimetype"
dc912ed9c6f1a0812bd07e5a24600c5b438a54bb 03-Apr-2012 Marco Nelissen <marcone@google.com> Support audio/ogg mimetype

audio/ogg has been the official mimetype for ogg vorbis audio for
a while now, so we should support it.

b/5824157

Change-Id: Ica86bdb3099a10785f1da9c3413284f3e11dc27e
ava/android/media/MediaFile.java
3caba517253d1703fc29b50740c4567b932279fb 03-Apr-2012 Justin Koh <justinkoh@google.com> Broadcast mastervolume regardless of change.

Broadcast mastervolume intents regardless of whether the system changed the
volume. This fixes the bug where the volume LEDs stop getting updates.

TESTED = runs on Tungsten.

Change-Id: Id363da3f825934fd7785ed3d3e436f74e657b7e6
ava/android/media/AudioService.java
5a04bf395514a9342dd26af519b88f4b3e309eb9 30-Mar-2012 Andreas Huber <andih@google.com> New API to query available codecs and their capabilities.

Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
ava/android/media/MediaCodecList.java
ni/Android.mk
ni/android_media_MediaCodecList.cpp
ni/android_media_MediaPlayer.cpp
3d275af3c3996f80816142628c380f79a9606c51 31-Mar-2012 Eric Laurent <elaurent@google.com> Merge "implemented synchronous audio capture"
18a38b9f41fa818cccc50a7fd372c694a9c8149a 31-Mar-2012 James Dong <jdong@google.com> Merge "Removed obsolete opencore related comments"
6ef1eedac77977a4979a293499767e17ed3a4e03 30-Mar-2012 Chih-Chung Chang <chihchung@google.com> Merge "Fix b/5353417 Images downloaded from browser are showing incorrect details (Time is shown as dec 31 1969)"
505e5c8859f596ed58489be565d6e029314b2ac8 30-Mar-2012 Eric Laurent <elaurent@google.com> implemented synchronous audio capture

Added the infrastructure to support the synchronization of playback and
capture actions on specific events.
The first requirement for this feature is to synchronize the audio capture
start with the full rendering of a given audio content.
The applications can further be extended to other use cases
(synchronized playback start...) by adding new synchronization events and
new synchronous control methods on player or recorders.

Also added a method to query the audio session from a ToneGenerator.

Change-Id: I4e47f5108c7cbbd3bd334a7fad9b3b6c5ba55d88
ava/android/media/AudioRecord.java
ava/android/media/AudioSystem.java
ava/android/media/MediaSyncEvent.java
ava/android/media/ToneGenerator.java
7ae82ce1fd54103bb87b8a0593a4228c94b1d6f9 29-Mar-2012 James Dong <jdong@google.com> Removed obsolete opencore related comments

Change-Id: Ia05a889ea54a8f38d126508ffdcd09fe2a263538
ava/android/media/MediaPlayer.java
ava/android/media/MediaScanner.java
943347cf16ebb2d9ef5a631fafa3f9effa6b1d11 29-Mar-2012 Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> 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>
ibstagefright/matroska/MatroskaExtractor.cpp
0bd12c1f86e44ab2deebd543bb830eae92d4eaa4 29-Mar-2012 Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> 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>
ibmedia/MediaProfiles.cpp
830ad08fe4a8a63ada0f6b6cbb9d76e4762e61c7 29-Mar-2012 RoboErik <epastern@google.com> Merge "b/6232528 Reduce volume persist delay to 500ms" into ics-aah
ba4d0433319393d626d2169683209e4956a087e2 28-Mar-2012 James Dong <jdong@google.com> frameworks base Android.mk file changes

Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
ni/Android.mk
ni/soundpool/Android.mk
ni/soundpool/android_media_SoundPool.cpp
d927a1d99630c05ff773f0e9e8791ca9a965e020 28-Mar-2012 James Dong <jdong@google.com> Deleted the media, camera, drm related files since they are relocated

Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
ibaah_rtp/Android.mk
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_decoder_pump.h
ibaah_rtp/aah_rx_player.cpp
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_rx_player_ring_buffer.cpp
ibaah_rtp/aah_rx_player_substream.cpp
ibaah_rtp/aah_tx_packet.cpp
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibaah_rtp/aah_tx_sender.cpp
ibaah_rtp/aah_tx_sender.h
ibaah_rtp/pipe_event.cpp
ibaah_rtp/pipe_event.h
ibeffects/data/audio_effects.conf
ibeffects/downmix/Android.mk
ibeffects/downmix/EffectDownmix.c
ibeffects/downmix/EffectDownmix.h
ibeffects/factory/Android.mk
ibeffects/factory/EffectsFactory.c
ibeffects/factory/EffectsFactory.h
ibeffects/lvm/lib/Android.mk
ibeffects/lvm/lib/Bass/lib/LVDBE.h
ibeffects/lvm/lib/Bass/src/LVDBE_Coeffs.h
ibeffects/lvm/lib/Bass/src/LVDBE_Control.c
ibeffects/lvm/lib/Bass/src/LVDBE_Init.c
ibeffects/lvm/lib/Bass/src/LVDBE_Private.h
ibeffects/lvm/lib/Bass/src/LVDBE_Process.c
ibeffects/lvm/lib/Bass/src/LVDBE_Tables.c
ibeffects/lvm/lib/Bass/src/LVDBE_Tables.h
ibeffects/lvm/lib/Bundle/lib/LVM.h
ibeffects/lvm/lib/Bundle/src/LVM_API_Specials.c
ibeffects/lvm/lib/Bundle/src/LVM_Buffers.c
ibeffects/lvm/lib/Bundle/src/LVM_Coeffs.h
ibeffects/lvm/lib/Bundle/src/LVM_Control.c
ibeffects/lvm/lib/Bundle/src/LVM_Init.c
ibeffects/lvm/lib/Bundle/src/LVM_Private.h
ibeffects/lvm/lib/Bundle/src/LVM_Process.c
ibeffects/lvm/lib/Bundle/src/LVM_Tables.c
ibeffects/lvm/lib/Bundle/src/LVM_Tables.h
ibeffects/lvm/lib/Common/lib/AGC.h
ibeffects/lvm/lib/Common/lib/BIQUAD.h
ibeffects/lvm/lib/Common/lib/CompLim.h
ibeffects/lvm/lib/Common/lib/Filter.h
ibeffects/lvm/lib/Common/lib/InstAlloc.h
ibeffects/lvm/lib/Common/lib/LVM_Common.h
ibeffects/lvm/lib/Common/lib/LVM_Macros.h
ibeffects/lvm/lib/Common/lib/LVM_Timer.h
ibeffects/lvm/lib/Common/lib/LVM_Types.h
ibeffects/lvm/lib/Common/lib/Mixer.h
ibeffects/lvm/lib/Common/lib/ScalarArithmetic.h
ibeffects/lvm/lib/Common/lib/VectorArithmetic.h
ibeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.c
ibeffects/lvm/lib/Common/src/Abs_32.c
ibeffects/lvm/lib/Common/src/Add2_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Add2_Sat_32x32.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.c
ibeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/CompLim_private.h
ibeffects/lvm/lib/Common/src/Copy_16.c
ibeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.c
ibeffects/lvm/lib/Common/src/DelayMix_16x16.c
ibeffects/lvm/lib/Common/src/DelayWrite_32.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/Filters.h
ibeffects/lvm/lib/Common/src/From2iToMS_16x16.c
ibeffects/lvm/lib/Common/src/From2iToMono_16.c
ibeffects/lvm/lib/Common/src/From2iToMono_32.c
ibeffects/lvm/lib/Common/src/InstAlloc.c
ibeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.c
ibeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.c
ibeffects/lvm/lib/Common/src/JoinTo2i_32x32.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.c
ibeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Mixer.h
ibeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_Init.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_Private.h
ibeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.c
ibeffects/lvm/lib/Common/src/LVM_FO_HPF.c
ibeffects/lvm/lib/Common/src/LVM_FO_LPF.c
ibeffects/lvm/lib/Common/src/LVM_GetOmega.c
ibeffects/lvm/lib/Common/src/LVM_Mixer_FilterCoeffs.h
ibeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.c
ibeffects/lvm/lib/Common/src/LVM_Polynomial.c
ibeffects/lvm/lib/Common/src/LVM_Power10.c
ibeffects/lvm/lib/Common/src/LVM_Timer.c
ibeffects/lvm/lib/Common/src/LVM_Timer_Init.c
ibeffects/lvm/lib/Common/src/LVM_Timer_Private.h
ibeffects/lvm/lib/Common/src/LoadConst_16.c
ibeffects/lvm/lib/Common/src/LoadConst_32.c
ibeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.c
ibeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.c
ibeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Mixer_private.h
ibeffects/lvm/lib/Common/src/MonoTo2I_16.c
ibeffects/lvm/lib/Common/src/MonoTo2I_32.c
ibeffects/lvm/lib/Common/src/Mult3s_32x16.c
ibeffects/lvm/lib/Common/src/NonLinComp_D16.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.c
ibeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.c
ibeffects/lvm/lib/Common/src/dB_to_Lin32.c
ibeffects/lvm/lib/Common/src/mult3s_16x16.c
ibeffects/lvm/lib/Eq/lib/LVEQNB.h
ibeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Coeffs.h
ibeffects/lvm/lib/Eq/src/LVEQNB_Control.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Init.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Private.h
ibeffects/lvm/lib/Eq/src/LVEQNB_Process.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Tables.c
ibeffects/lvm/lib/Reverb/lib/LVREV.h
ibeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
ibeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.c
ibeffects/lvm/lib/Reverb/src/LVREV_Private.h
ibeffects/lvm/lib/Reverb/src/LVREV_Process.c
ibeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.c
ibeffects/lvm/lib/Reverb/src/LVREV_Tables.c
ibeffects/lvm/lib/Reverb/src/LVREV_Tables.h
ibeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.c
ibeffects/lvm/lib/StereoWidening/lib/LVCS.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Headphone_Coeffs.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Private.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Process.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Tables.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h
ibeffects/lvm/wrapper/Android.mk
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.h
ibeffects/preprocessing/Android.mk
ibeffects/preprocessing/PreProcessing.cpp
ibeffects/testlibs/Android.mk_
ibeffects/testlibs/AudioBiquadFilter.cpp
ibeffects/testlibs/AudioBiquadFilter.h
ibeffects/testlibs/AudioCoefInterpolator.cpp
ibeffects/testlibs/AudioCoefInterpolator.h
ibeffects/testlibs/AudioCommon.h
ibeffects/testlibs/AudioEqualizer.cpp
ibeffects/testlibs/AudioEqualizer.h
ibeffects/testlibs/AudioFormatAdapter.h
ibeffects/testlibs/AudioHighShelfFilterCoef.inl
ibeffects/testlibs/AudioLowShelfFilterCoef.inl
ibeffects/testlibs/AudioPeakingFilter.cpp
ibeffects/testlibs/AudioPeakingFilter.h
ibeffects/testlibs/AudioPeakingFilterCoef.inl
ibeffects/testlibs/AudioShelvingFilter.cpp
ibeffects/testlibs/AudioShelvingFilter.h
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/testlibs/EffectReverb.h
ibeffects/testlibs/EffectsMath.c
ibeffects/testlibs/EffectsMath.h
ibeffects/visualizer/Android.mk
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/Android.mk
ibmedia/AudioEffect.cpp
ibmedia/AudioParameter.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IAudioPolicyService.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/ICrypto.cpp
ibmedia/IEffect.cpp
ibmedia/IEffectClient.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/IMediaRecorderClient.cpp
ibmedia/IOMX.cpp
ibmedia/IStreamSource.cpp
ibmedia/JetPlayer.cpp
ibmedia/MODULE_LICENSE_APACHE2
ibmedia/MediaProfiles.cpp
ibmedia/MediaScanner.cpp
ibmedia/MediaScannerClient.cpp
ibmedia/MemoryLeakTrackUtil.cpp
ibmedia/Metadata.cpp
ibmedia/NOTICE
ibmedia/SoundPool.cpp
ibmedia/SoundPool.h
ibmedia/SoundPoolThread.cpp
ibmedia/SoundPoolThread.h
ibmedia/ToneGenerator.cpp
ibmedia/Visualizer.cpp
ibmedia/autodetect.cpp
ibmedia/autodetect.h
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmedia_native/Android.mk
ibmediaplayerservice/Android.mk
ibmediaplayerservice/Crypto.cpp
ibmediaplayerservice/Crypto.h
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/MidiMetadataRetriever.cpp
ibmediaplayerservice/MidiMetadataRetriever.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibmediaplayerservice/TestPlayerStub.cpp
ibmediaplayerservice/TestPlayerStub.h
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
ibmediaplayerservice/nuplayer/NuPlayerStreamListener.h
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/RTSPSource.h
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.h
ibstagefright/AACExtractor.cpp
ibstagefright/AACWriter.cpp
ibstagefright/ACodec.cpp
ibstagefright/AMRExtractor.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/AVIExtractor.cpp
ibstagefright/Android.mk
ibstagefright/AudioPlayer.cpp
ibstagefright/AudioSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/DataSource.cpp
ibstagefright/ESDS.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/FileSource.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/JPEGSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/MediaBufferGroup.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/MediaCodecList.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/MediaSource.cpp
ibstagefright/MetaData.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuMediaExtractor.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/SkipCutBuffer.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/ThrottledSource.cpp
ibstagefright/TimeSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/Utils.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/VideoSourceDownSampler.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/XINGSeeker.cpp
ibstagefright/avc_utils.cpp
ibstagefright/chromium_http/Android.mk
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/chromium_http/DataUriSource.cpp
ibstagefright/chromium_http/support.cpp
ibstagefright/chromium_http/support.h
ibstagefright/codecs/Android.mk
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacdec/SoftAAC.h
ibstagefright/codecs/aacdec/aac_mem_funcs.h
ibstagefright/codecs/aacdec/analysis_sub_band.cpp
ibstagefright/codecs/aacdec/analysis_sub_band.h
ibstagefright/codecs/aacdec/apply_ms_synt.cpp
ibstagefright/codecs/aacdec/apply_ms_synt.h
ibstagefright/codecs/aacdec/apply_tns.cpp
ibstagefright/codecs/aacdec/apply_tns.h
ibstagefright/codecs/aacdec/bit_reversal_swap.h
ibstagefright/codecs/aacdec/buf_getbits.cpp
ibstagefright/codecs/aacdec/buf_getbits.h
ibstagefright/codecs/aacdec/buffer_normalization.h
ibstagefright/codecs/aacdec/byte_align.cpp
ibstagefright/codecs/aacdec/calc_auto_corr.cpp
ibstagefright/codecs/aacdec/calc_auto_corr.h
ibstagefright/codecs/aacdec/calc_gsfb_table.cpp
ibstagefright/codecs/aacdec/calc_sbr_anafilterbank.cpp
ibstagefright/codecs/aacdec/calc_sbr_anafilterbank.h
ibstagefright/codecs/aacdec/calc_sbr_envelope.cpp
ibstagefright/codecs/aacdec/calc_sbr_envelope.h
ibstagefright/codecs/aacdec/calc_sbr_synfilterbank.cpp
ibstagefright/codecs/aacdec/calc_sbr_synfilterbank.h
ibstagefright/codecs/aacdec/chans.h
ibstagefright/codecs/aacdec/check_crc.cpp
ibstagefright/codecs/aacdec/check_crc.h
ibstagefright/codecs/aacdec/dct16.cpp
ibstagefright/codecs/aacdec/dct16.h
ibstagefright/codecs/aacdec/dct64.cpp
ibstagefright/codecs/aacdec/dct64.h
ibstagefright/codecs/aacdec/decode_huff_cw_binary.cpp
ibstagefright/codecs/aacdec/decode_noise_floorlevels.cpp
ibstagefright/codecs/aacdec/decode_noise_floorlevels.h
ibstagefright/codecs/aacdec/deinterleave.cpp
ibstagefright/codecs/aacdec/digit_reversal_tables.cpp
ibstagefright/codecs/aacdec/digit_reversal_tables.h
ibstagefright/codecs/aacdec/dst16.cpp
ibstagefright/codecs/aacdec/dst16.h
ibstagefright/codecs/aacdec/dst32.cpp
ibstagefright/codecs/aacdec/dst32.h
ibstagefright/codecs/aacdec/dst8.cpp
ibstagefright/codecs/aacdec/dst8.h
ibstagefright/codecs/aacdec/e_adif_const.h
ibstagefright/codecs/aacdec/e_blockswitching.h
ibstagefright/codecs/aacdec/e_coupling_mode.h
ibstagefright/codecs/aacdec/e_elementid.h
ibstagefright/codecs/aacdec/e_huffmanconst.h
ibstagefright/codecs/aacdec/e_infoinitconst.h
ibstagefright/codecs/aacdec/e_invf_mode.h
ibstagefright/codecs/aacdec/e_maskstatus.h
ibstagefright/codecs/aacdec/e_mp4ff_const.h
ibstagefright/codecs/aacdec/e_progconfigconst.h
ibstagefright/codecs/aacdec/e_rawbitstreamconst.h
ibstagefright/codecs/aacdec/e_sbr_element_id.h
ibstagefright/codecs/aacdec/e_sbr_error.h
ibstagefright/codecs/aacdec/e_sbr_header_status.h
ibstagefright/codecs/aacdec/e_sbr_master_status.h
ibstagefright/codecs/aacdec/e_sbr_sync_state.h
ibstagefright/codecs/aacdec/e_sr_mode.h
ibstagefright/codecs/aacdec/e_tmp4audioobjecttype.h
ibstagefright/codecs/aacdec/e_tns_const.h
ibstagefright/codecs/aacdec/e_window_sequence.h
ibstagefright/codecs/aacdec/e_window_shape.h
ibstagefright/codecs/aacdec/esc_iquant_scaling.cpp
ibstagefright/codecs/aacdec/esc_iquant_scaling.h
ibstagefright/codecs/aacdec/extractframeinfo.cpp
ibstagefright/codecs/aacdec/extractframeinfo.h
ibstagefright/codecs/aacdec/fft_rx4.h
ibstagefright/codecs/aacdec/fft_rx4_long.cpp
ibstagefright/codecs/aacdec/fft_rx4_short.cpp
ibstagefright/codecs/aacdec/fft_rx4_tables_fxp.cpp
ibstagefright/codecs/aacdec/find_adts_syncword.cpp
ibstagefright/codecs/aacdec/find_adts_syncword.h
ibstagefright/codecs/aacdec/fwd_long_complex_rot.cpp
ibstagefright/codecs/aacdec/fwd_long_complex_rot.h
ibstagefright/codecs/aacdec/fwd_short_complex_rot.cpp
ibstagefright/codecs/aacdec/fwd_short_complex_rot.h
ibstagefright/codecs/aacdec/fxp_mul32.h
ibstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h
ibstagefright/codecs/aacdec/fxp_mul32_arm_v4.h
ibstagefright/codecs/aacdec/fxp_mul32_arm_v4_gcc.h
ibstagefright/codecs/aacdec/fxp_mul32_arm_v5.h
ibstagefright/codecs/aacdec/fxp_mul32_c_equivalent.h
ibstagefright/codecs/aacdec/fxp_mul32_c_msc_evc.h
ibstagefright/codecs/aacdec/fxp_mul32_c_msc_evc_armv5.h
ibstagefright/codecs/aacdec/fxp_mul32_pentium.h
ibstagefright/codecs/aacdec/gen_rand_vector.cpp
ibstagefright/codecs/aacdec/gen_rand_vector.h
ibstagefright/codecs/aacdec/get_adif_header.cpp
ibstagefright/codecs/aacdec/get_adif_header.h
ibstagefright/codecs/aacdec/get_adts_header.cpp
ibstagefright/codecs/aacdec/get_adts_header.h
ibstagefright/codecs/aacdec/get_audio_specific_config.cpp
ibstagefright/codecs/aacdec/get_audio_specific_config.h
ibstagefright/codecs/aacdec/get_dse.cpp
ibstagefright/codecs/aacdec/get_dse.h
ibstagefright/codecs/aacdec/get_ele_list.cpp
ibstagefright/codecs/aacdec/get_ele_list.h
ibstagefright/codecs/aacdec/get_ga_specific_config.cpp
ibstagefright/codecs/aacdec/get_ga_specific_config.h
ibstagefright/codecs/aacdec/get_ics_info.cpp
ibstagefright/codecs/aacdec/get_ics_info.h
ibstagefright/codecs/aacdec/get_prog_config.cpp
ibstagefright/codecs/aacdec/get_prog_config.h
ibstagefright/codecs/aacdec/get_pulse_data.cpp
ibstagefright/codecs/aacdec/get_pulse_data.h
ibstagefright/codecs/aacdec/get_sbr_bitstream.cpp
ibstagefright/codecs/aacdec/get_sbr_bitstream.h
ibstagefright/codecs/aacdec/get_sbr_startfreq.cpp
ibstagefright/codecs/aacdec/get_sbr_startfreq.h
ibstagefright/codecs/aacdec/get_sbr_stopfreq.cpp
ibstagefright/codecs/aacdec/get_sbr_stopfreq.h
ibstagefright/codecs/aacdec/get_sign_bits.h
ibstagefright/codecs/aacdec/get_tns.cpp
ibstagefright/codecs/aacdec/get_tns.h
ibstagefright/codecs/aacdec/getbits.h
ibstagefright/codecs/aacdec/getfill.cpp
ibstagefright/codecs/aacdec/getfill.h
ibstagefright/codecs/aacdec/getgroup.cpp
ibstagefright/codecs/aacdec/getics.cpp
ibstagefright/codecs/aacdec/getmask.cpp
ibstagefright/codecs/aacdec/hcbtables.h
ibstagefright/codecs/aacdec/hcbtables_binary.cpp
ibstagefright/codecs/aacdec/huffcb.cpp
ibstagefright/codecs/aacdec/huffdecode.cpp
ibstagefright/codecs/aacdec/hufffac.cpp
ibstagefright/codecs/aacdec/huffman.h
ibstagefright/codecs/aacdec/huffspec_fxp.cpp
ibstagefright/codecs/aacdec/ibstream.h
ibstagefright/codecs/aacdec/idct16.cpp
ibstagefright/codecs/aacdec/idct16.h
ibstagefright/codecs/aacdec/idct32.cpp
ibstagefright/codecs/aacdec/idct32.h
ibstagefright/codecs/aacdec/idct8.cpp
ibstagefright/codecs/aacdec/idct8.h
ibstagefright/codecs/aacdec/imdct_fxp.cpp
ibstagefright/codecs/aacdec/imdct_fxp.h
ibstagefright/codecs/aacdec/infoinit.cpp
ibstagefright/codecs/aacdec/init_sbr_dec.cpp
ibstagefright/codecs/aacdec/init_sbr_dec.h
ibstagefright/codecs/aacdec/intensity_right.cpp
ibstagefright/codecs/aacdec/intensity_right.h
ibstagefright/codecs/aacdec/inv_long_complex_rot.cpp
ibstagefright/codecs/aacdec/inv_long_complex_rot.h
ibstagefright/codecs/aacdec/inv_short_complex_rot.cpp
ibstagefright/codecs/aacdec/inv_short_complex_rot.h
ibstagefright/codecs/aacdec/iquant_table.cpp
ibstagefright/codecs/aacdec/iquant_table.h
ibstagefright/codecs/aacdec/long_term_prediction.cpp
ibstagefright/codecs/aacdec/long_term_prediction.h
ibstagefright/codecs/aacdec/long_term_synthesis.cpp
ibstagefright/codecs/aacdec/long_term_synthesis.h
ibstagefright/codecs/aacdec/lt_decode.cpp
ibstagefright/codecs/aacdec/lt_decode.h
ibstagefright/codecs/aacdec/lt_prediction.h
ibstagefright/codecs/aacdec/ltp_common_internal.h
ibstagefright/codecs/aacdec/mdct_fxp.cpp
ibstagefright/codecs/aacdec/mdct_fxp.h
ibstagefright/codecs/aacdec/mdct_tables_fxp.cpp
ibstagefright/codecs/aacdec/mdst.cpp
ibstagefright/codecs/aacdec/mdst.h
ibstagefright/codecs/aacdec/mix_radix_fft.cpp
ibstagefright/codecs/aacdec/mix_radix_fft.h
ibstagefright/codecs/aacdec/ms_map_mask.h
ibstagefright/codecs/aacdec/ms_synt.cpp
ibstagefright/codecs/aacdec/ms_synt.h
ibstagefright/codecs/aacdec/pns_corr.cpp
ibstagefright/codecs/aacdec/pns_corr.h
ibstagefright/codecs/aacdec/pns_intensity_right.cpp
ibstagefright/codecs/aacdec/pns_intensity_right.h
ibstagefright/codecs/aacdec/pns_left.cpp
ibstagefright/codecs/aacdec/pns_left.h
ibstagefright/codecs/aacdec/ps_all_pass_filter_coeff.cpp
ibstagefright/codecs/aacdec/ps_all_pass_filter_coeff.h
ibstagefright/codecs/aacdec/ps_all_pass_fract_delay_filter.cpp
ibstagefright/codecs/aacdec/ps_all_pass_fract_delay_filter.h
ibstagefright/codecs/aacdec/ps_allocate_decoder.cpp
ibstagefright/codecs/aacdec/ps_allocate_decoder.h
ibstagefright/codecs/aacdec/ps_applied.cpp
ibstagefright/codecs/aacdec/ps_applied.h
ibstagefright/codecs/aacdec/ps_bstr_decoding.cpp
ibstagefright/codecs/aacdec/ps_bstr_decoding.h
ibstagefright/codecs/aacdec/ps_channel_filtering.cpp
ibstagefright/codecs/aacdec/ps_channel_filtering.h
ibstagefright/codecs/aacdec/ps_constants.h
ibstagefright/codecs/aacdec/ps_decode_bs_utils.cpp
ibstagefright/codecs/aacdec/ps_decode_bs_utils.h
ibstagefright/codecs/aacdec/ps_decorrelate.cpp
ibstagefright/codecs/aacdec/ps_decorrelate.h
ibstagefright/codecs/aacdec/ps_fft_rx8.cpp
ibstagefright/codecs/aacdec/ps_fft_rx8.h
ibstagefright/codecs/aacdec/ps_hybrid_analysis.cpp
ibstagefright/codecs/aacdec/ps_hybrid_analysis.h
ibstagefright/codecs/aacdec/ps_hybrid_filter_bank_allocation.cpp
ibstagefright/codecs/aacdec/ps_hybrid_filter_bank_allocation.h
ibstagefright/codecs/aacdec/ps_hybrid_synthesis.cpp
ibstagefright/codecs/aacdec/ps_hybrid_synthesis.h
ibstagefright/codecs/aacdec/ps_init_stereo_mixing.cpp
ibstagefright/codecs/aacdec/ps_init_stereo_mixing.h
ibstagefright/codecs/aacdec/ps_pwr_transient_detection.cpp
ibstagefright/codecs/aacdec/ps_pwr_transient_detection.h
ibstagefright/codecs/aacdec/ps_read_data.cpp
ibstagefright/codecs/aacdec/ps_read_data.h
ibstagefright/codecs/aacdec/ps_stereo_processing.cpp
ibstagefright/codecs/aacdec/ps_stereo_processing.h
ibstagefright/codecs/aacdec/pulse_nc.cpp
ibstagefright/codecs/aacdec/pulse_nc.h
ibstagefright/codecs/aacdec/pv_audio_type_defs.h
ibstagefright/codecs/aacdec/pv_div.cpp
ibstagefright/codecs/aacdec/pv_div.h
ibstagefright/codecs/aacdec/pv_log2.cpp
ibstagefright/codecs/aacdec/pv_log2.h
ibstagefright/codecs/aacdec/pv_normalize.cpp
ibstagefright/codecs/aacdec/pv_normalize.h
ibstagefright/codecs/aacdec/pv_pow2.cpp
ibstagefright/codecs/aacdec/pv_pow2.h
ibstagefright/codecs/aacdec/pv_sine.cpp
ibstagefright/codecs/aacdec/pv_sine.h
ibstagefright/codecs/aacdec/pv_sqrt.cpp
ibstagefright/codecs/aacdec/pv_sqrt.h
ibstagefright/codecs/aacdec/pvmp4audiodecoder_api.h
ibstagefright/codecs/aacdec/pvmp4audiodecoderconfig.cpp
ibstagefright/codecs/aacdec/pvmp4audiodecoderframe.cpp
ibstagefright/codecs/aacdec/pvmp4audiodecodergetmemrequirements.cpp
ibstagefright/codecs/aacdec/pvmp4audiodecoderinitlibrary.cpp
ibstagefright/codecs/aacdec/pvmp4audiodecoderresetbuffer.cpp
ibstagefright/codecs/aacdec/pvmp4setaudioconfig.cpp
ibstagefright/codecs/aacdec/q_normalize.cpp
ibstagefright/codecs/aacdec/q_normalize.h
ibstagefright/codecs/aacdec/qmf_filterbank_coeff.cpp
ibstagefright/codecs/aacdec/qmf_filterbank_coeff.h
ibstagefright/codecs/aacdec/s_adif_header.h
ibstagefright/codecs/aacdec/s_bit_buffer.h
ibstagefright/codecs/aacdec/s_bits.h
ibstagefright/codecs/aacdec/s_ch_info.h
ibstagefright/codecs/aacdec/s_crc_buffer.h
ibstagefright/codecs/aacdec/s_elelist.h
ibstagefright/codecs/aacdec/s_frameinfo.h
ibstagefright/codecs/aacdec/s_hcb.h
ibstagefright/codecs/aacdec/s_huffman.h
ibstagefright/codecs/aacdec/s_hybrid.h
ibstagefright/codecs/aacdec/s_lt_pred_status.h
ibstagefright/codecs/aacdec/s_mc_info.h
ibstagefright/codecs/aacdec/s_mixdown.h
ibstagefright/codecs/aacdec/s_patch.h
ibstagefright/codecs/aacdec/s_progconfig.h
ibstagefright/codecs/aacdec/s_ps_dec.h
ibstagefright/codecs/aacdec/s_pulseinfo.h
ibstagefright/codecs/aacdec/s_sbr_channel.h
ibstagefright/codecs/aacdec/s_sbr_dec.h
ibstagefright/codecs/aacdec/s_sbr_element_stream.h
ibstagefright/codecs/aacdec/s_sbr_frame_data.h
ibstagefright/codecs/aacdec/s_sbr_header_data.h
ibstagefright/codecs/aacdec/s_sbrbitstream.h
ibstagefright/codecs/aacdec/s_sectinfo.h
ibstagefright/codecs/aacdec/s_sr_info.h
ibstagefright/codecs/aacdec/s_tdec_int_chan.h
ibstagefright/codecs/aacdec/s_tdec_int_file.h
ibstagefright/codecs/aacdec/s_tns_frame_info.h
ibstagefright/codecs/aacdec/s_tnsfilt.h
ibstagefright/codecs/aacdec/s_wnd_shape.h
ibstagefright/codecs/aacdec/sbr_aliasing_reduction.cpp
ibstagefright/codecs/aacdec/sbr_aliasing_reduction.h
ibstagefright/codecs/aacdec/sbr_applied.cpp
ibstagefright/codecs/aacdec/sbr_applied.h
ibstagefright/codecs/aacdec/sbr_code_book_envlevel.cpp
ibstagefright/codecs/aacdec/sbr_code_book_envlevel.h
ibstagefright/codecs/aacdec/sbr_constants.h
ibstagefright/codecs/aacdec/sbr_crc_check.cpp
ibstagefright/codecs/aacdec/sbr_crc_check.h
ibstagefright/codecs/aacdec/sbr_create_limiter_bands.cpp
ibstagefright/codecs/aacdec/sbr_create_limiter_bands.h
ibstagefright/codecs/aacdec/sbr_dec.cpp
ibstagefright/codecs/aacdec/sbr_dec.h
ibstagefright/codecs/aacdec/sbr_decode_envelope.cpp
ibstagefright/codecs/aacdec/sbr_decode_envelope.h
ibstagefright/codecs/aacdec/sbr_decode_huff_cw.cpp
ibstagefright/codecs/aacdec/sbr_decode_huff_cw.h
ibstagefright/codecs/aacdec/sbr_downsample_lo_res.cpp
ibstagefright/codecs/aacdec/sbr_downsample_lo_res.h
ibstagefright/codecs/aacdec/sbr_envelope_calc_tbl.cpp
ibstagefright/codecs/aacdec/sbr_envelope_calc_tbl.h
ibstagefright/codecs/aacdec/sbr_envelope_unmapping.cpp
ibstagefright/codecs/aacdec/sbr_envelope_unmapping.h
ibstagefright/codecs/aacdec/sbr_extract_extended_data.cpp
ibstagefright/codecs/aacdec/sbr_extract_extended_data.h
ibstagefright/codecs/aacdec/sbr_find_start_andstop_band.cpp
ibstagefright/codecs/aacdec/sbr_find_start_andstop_band.h
ibstagefright/codecs/aacdec/sbr_generate_high_freq.cpp
ibstagefright/codecs/aacdec/sbr_generate_high_freq.h
ibstagefright/codecs/aacdec/sbr_get_additional_data.cpp
ibstagefright/codecs/aacdec/sbr_get_additional_data.h
ibstagefright/codecs/aacdec/sbr_get_cpe.cpp
ibstagefright/codecs/aacdec/sbr_get_cpe.h
ibstagefright/codecs/aacdec/sbr_get_dir_control_data.cpp
ibstagefright/codecs/aacdec/sbr_get_dir_control_data.h
ibstagefright/codecs/aacdec/sbr_get_envelope.cpp
ibstagefright/codecs/aacdec/sbr_get_envelope.h
ibstagefright/codecs/aacdec/sbr_get_header_data.cpp
ibstagefright/codecs/aacdec/sbr_get_header_data.h
ibstagefright/codecs/aacdec/sbr_get_noise_floor_data.cpp
ibstagefright/codecs/aacdec/sbr_get_noise_floor_data.h
ibstagefright/codecs/aacdec/sbr_get_sce.cpp
ibstagefright/codecs/aacdec/sbr_get_sce.h
ibstagefright/codecs/aacdec/sbr_inv_filt_levelemphasis.cpp
ibstagefright/codecs/aacdec/sbr_inv_filt_levelemphasis.h
ibstagefright/codecs/aacdec/sbr_open.cpp
ibstagefright/codecs/aacdec/sbr_open.h
ibstagefright/codecs/aacdec/sbr_read_data.cpp
ibstagefright/codecs/aacdec/sbr_read_data.h
ibstagefright/codecs/aacdec/sbr_requantize_envelope_data.cpp
ibstagefright/codecs/aacdec/sbr_requantize_envelope_data.h
ibstagefright/codecs/aacdec/sbr_reset_dec.cpp
ibstagefright/codecs/aacdec/sbr_reset_dec.h
ibstagefright/codecs/aacdec/sbr_update_freq_scale.cpp
ibstagefright/codecs/aacdec/sbr_update_freq_scale.h
ibstagefright/codecs/aacdec/set_mc_info.cpp
ibstagefright/codecs/aacdec/set_mc_info.h
ibstagefright/codecs/aacdec/sfb.cpp
ibstagefright/codecs/aacdec/sfb.h
ibstagefright/codecs/aacdec/shellsort.cpp
ibstagefright/codecs/aacdec/shellsort.h
ibstagefright/codecs/aacdec/stereo_2_mono.h
ibstagefright/codecs/aacdec/synthesis_sub_band.cpp
ibstagefright/codecs/aacdec/synthesis_sub_band.h
ibstagefright/codecs/aacdec/tns_ar_filter.cpp
ibstagefright/codecs/aacdec/tns_ar_filter.h
ibstagefright/codecs/aacdec/tns_decode_coef.cpp
ibstagefright/codecs/aacdec/tns_decode_coef.h
ibstagefright/codecs/aacdec/tns_inv_filter.cpp
ibstagefright/codecs/aacdec/tns_inv_filter.h
ibstagefright/codecs/aacdec/trans4m_freq_2_time_fxp.cpp
ibstagefright/codecs/aacdec/trans4m_time_2_freq_fxp.cpp
ibstagefright/codecs/aacdec/unpack_idx.cpp
ibstagefright/codecs/aacdec/unpack_idx.h
ibstagefright/codecs/aacdec/window_block_fxp.h
ibstagefright/codecs/aacdec/window_tables_fxp.cpp
ibstagefright/codecs/aacdec/write_output.h
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
ibstagefright/codecs/aacenc/SampleCode/Android.mk
ibstagefright/codecs/aacenc/SoftAACEncoder.cpp
ibstagefright/codecs/aacenc/SoftAACEncoder.h
ibstagefright/codecs/aacenc/basic_op/basic_op.h
ibstagefright/codecs/aacenc/basic_op/basicop2.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.h
ibstagefright/codecs/aacenc/basic_op/typedef.h
ibstagefright/codecs/aacenc/basic_op/typedefs.h
ibstagefright/codecs/aacenc/doc/voAACEncoderSDK.pdf
ibstagefright/codecs/aacenc/inc/aac_rom.h
ibstagefright/codecs/aacenc/inc/aacenc_core.h
ibstagefright/codecs/aacenc/inc/adj_thr.h
ibstagefright/codecs/aacenc/inc/adj_thr_data.h
ibstagefright/codecs/aacenc/inc/band_nrg.h
ibstagefright/codecs/aacenc/inc/bit_cnt.h
ibstagefright/codecs/aacenc/inc/bitbuffer.h
ibstagefright/codecs/aacenc/inc/bitenc.h
ibstagefright/codecs/aacenc/inc/block_switch.h
ibstagefright/codecs/aacenc/inc/channel_map.h
ibstagefright/codecs/aacenc/inc/config.h
ibstagefright/codecs/aacenc/inc/dyn_bits.h
ibstagefright/codecs/aacenc/inc/grp_data.h
ibstagefright/codecs/aacenc/inc/interface.h
ibstagefright/codecs/aacenc/inc/line_pe.h
ibstagefright/codecs/aacenc/inc/memalign.h
ibstagefright/codecs/aacenc/inc/ms_stereo.h
ibstagefright/codecs/aacenc/inc/pre_echo_control.h
ibstagefright/codecs/aacenc/inc/psy_configuration.h
ibstagefright/codecs/aacenc/inc/psy_const.h
ibstagefright/codecs/aacenc/inc/psy_data.h
ibstagefright/codecs/aacenc/inc/psy_main.h
ibstagefright/codecs/aacenc/inc/qc_data.h
ibstagefright/codecs/aacenc/inc/qc_main.h
ibstagefright/codecs/aacenc/inc/quantize.h
ibstagefright/codecs/aacenc/inc/sf_estim.h
ibstagefright/codecs/aacenc/inc/spreading.h
ibstagefright/codecs/aacenc/inc/stat_bits.h
ibstagefright/codecs/aacenc/inc/tns.h
ibstagefright/codecs/aacenc/inc/tns_func.h
ibstagefright/codecs/aacenc/inc/tns_param.h
ibstagefright/codecs/aacenc/inc/transform.h
ibstagefright/codecs/aacenc/patent_disclaimer.txt
ibstagefright/codecs/aacenc/src/aac_rom.c
ibstagefright/codecs/aacenc/src/aacenc.c
ibstagefright/codecs/aacenc/src/aacenc_core.c
ibstagefright/codecs/aacenc/src/adj_thr.c
ibstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
ibstagefright/codecs/aacenc/src/band_nrg.c
ibstagefright/codecs/aacenc/src/bit_cnt.c
ibstagefright/codecs/aacenc/src/bitbuffer.c
ibstagefright/codecs/aacenc/src/bitenc.c
ibstagefright/codecs/aacenc/src/block_switch.c
ibstagefright/codecs/aacenc/src/channel_map.c
ibstagefright/codecs/aacenc/src/dyn_bits.c
ibstagefright/codecs/aacenc/src/grp_data.c
ibstagefright/codecs/aacenc/src/interface.c
ibstagefright/codecs/aacenc/src/line_pe.c
ibstagefright/codecs/aacenc/src/memalign.c
ibstagefright/codecs/aacenc/src/ms_stereo.c
ibstagefright/codecs/aacenc/src/pre_echo_control.c
ibstagefright/codecs/aacenc/src/psy_configuration.c
ibstagefright/codecs/aacenc/src/psy_main.c
ibstagefright/codecs/aacenc/src/qc_main.c
ibstagefright/codecs/aacenc/src/quantize.c
ibstagefright/codecs/aacenc/src/sf_estim.c
ibstagefright/codecs/aacenc/src/spreading.c
ibstagefright/codecs/aacenc/src/stat_bits.c
ibstagefright/codecs/aacenc/src/tns.c
ibstagefright/codecs/aacenc/src/transform.c
ibstagefright/codecs/amrnb/Android.mk
ibstagefright/codecs/amrnb/common/Android.mk
ibstagefright/codecs/amrnb/common/include/abs_s.h
ibstagefright/codecs/amrnb/common/include/add.h
ibstagefright/codecs/amrnb/common/include/az_lsp.h
ibstagefright/codecs/amrnb/common/include/basic_op.h
ibstagefright/codecs/amrnb/common/include/basic_op_arm_gcc_v5.h
ibstagefright/codecs/amrnb/common/include/basic_op_arm_v5.h
ibstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h
ibstagefright/codecs/amrnb/common/include/basicop_malloc.h
ibstagefright/codecs/amrnb/common/include/bitno_tab.h
ibstagefright/codecs/amrnb/common/include/bitreorder_tab.h
ibstagefright/codecs/amrnb/common/include/bits2prm.h
ibstagefright/codecs/amrnb/common/include/bytesused.h
ibstagefright/codecs/amrnb/common/include/cnst.h
ibstagefright/codecs/amrnb/common/include/cnst_vad.h
ibstagefright/codecs/amrnb/common/include/copy.h
ibstagefright/codecs/amrnb/common/include/d_gain_c.h
ibstagefright/codecs/amrnb/common/include/d_gain_p.h
ibstagefright/codecs/amrnb/common/include/d_plsf.h
ibstagefright/codecs/amrnb/common/include/div_32.h
ibstagefright/codecs/amrnb/common/include/div_s.h
ibstagefright/codecs/amrnb/common/include/dtx_common_def.h
ibstagefright/codecs/amrnb/common/include/extract_h.h
ibstagefright/codecs/amrnb/common/include/extract_l.h
ibstagefright/codecs/amrnb/common/include/frame.h
ibstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
ibstagefright/codecs/amrnb/common/include/gc_pred.h
ibstagefright/codecs/amrnb/common/include/gmed_n.h
ibstagefright/codecs/amrnb/common/include/gsm_amr_typedefs.h
ibstagefright/codecs/amrnb/common/include/int_lpc.h
ibstagefright/codecs/amrnb/common/include/int_lsf.h
ibstagefright/codecs/amrnb/common/include/inv_sqrt.h
ibstagefright/codecs/amrnb/common/include/l_abs.h
ibstagefright/codecs/amrnb/common/include/l_add.h
ibstagefright/codecs/amrnb/common/include/l_add_c.h
ibstagefright/codecs/amrnb/common/include/l_comp.h
ibstagefright/codecs/amrnb/common/include/l_deposit_h.h
ibstagefright/codecs/amrnb/common/include/l_deposit_l.h
ibstagefright/codecs/amrnb/common/include/l_extract.h
ibstagefright/codecs/amrnb/common/include/l_mac.h
ibstagefright/codecs/amrnb/common/include/l_msu.h
ibstagefright/codecs/amrnb/common/include/l_mult.h
ibstagefright/codecs/amrnb/common/include/l_negate.h
ibstagefright/codecs/amrnb/common/include/l_shl.h
ibstagefright/codecs/amrnb/common/include/l_shr.h
ibstagefright/codecs/amrnb/common/include/l_shr_r.h
ibstagefright/codecs/amrnb/common/include/l_sub.h
ibstagefright/codecs/amrnb/common/include/log2.h
ibstagefright/codecs/amrnb/common/include/log2_norm.h
ibstagefright/codecs/amrnb/common/include/lsfwt.h
ibstagefright/codecs/amrnb/common/include/lsp.h
ibstagefright/codecs/amrnb/common/include/lsp_az.h
ibstagefright/codecs/amrnb/common/include/lsp_lsf.h
ibstagefright/codecs/amrnb/common/include/lsp_tab.h
ibstagefright/codecs/amrnb/common/include/mac_32.h
ibstagefright/codecs/amrnb/common/include/mode.h
ibstagefright/codecs/amrnb/common/include/mpy_32.h
ibstagefright/codecs/amrnb/common/include/mpy_32_16.h
ibstagefright/codecs/amrnb/common/include/mult.h
ibstagefright/codecs/amrnb/common/include/mult_r.h
ibstagefright/codecs/amrnb/common/include/n_proc.h
ibstagefright/codecs/amrnb/common/include/negate.h
ibstagefright/codecs/amrnb/common/include/norm_l.h
ibstagefright/codecs/amrnb/common/include/norm_s.h
ibstagefright/codecs/amrnb/common/include/oper_32b.h
ibstagefright/codecs/amrnb/common/include/p_ol_wgh.h
ibstagefright/codecs/amrnb/common/include/pow2.h
ibstagefright/codecs/amrnb/common/include/pred_lt.h
ibstagefright/codecs/amrnb/common/include/pvgsmamr.h
ibstagefright/codecs/amrnb/common/include/q_plsf.h
ibstagefright/codecs/amrnb/common/include/q_plsf_3_tbl.h
ibstagefright/codecs/amrnb/common/include/q_plsf_5_tbl.h
ibstagefright/codecs/amrnb/common/include/qgain475_tab.h
ibstagefright/codecs/amrnb/common/include/qua_gain.h
ibstagefright/codecs/amrnb/common/include/qua_gain_tbl.h
ibstagefright/codecs/amrnb/common/include/reorder.h
ibstagefright/codecs/amrnb/common/include/residu.h
ibstagefright/codecs/amrnb/common/include/reverse_bits.h
ibstagefright/codecs/amrnb/common/include/round.h
ibstagefright/codecs/amrnb/common/include/set_zero.h
ibstagefright/codecs/amrnb/common/include/shl.h
ibstagefright/codecs/amrnb/common/include/shr.h
ibstagefright/codecs/amrnb/common/include/shr_r.h
ibstagefright/codecs/amrnb/common/include/sqrt_l.h
ibstagefright/codecs/amrnb/common/include/sub.h
ibstagefright/codecs/amrnb/common/include/syn_filt.h
ibstagefright/codecs/amrnb/common/include/typedef.h
ibstagefright/codecs/amrnb/common/include/vad.h
ibstagefright/codecs/amrnb/common/include/vad1.h
ibstagefright/codecs/amrnb/common/include/vad2.h
ibstagefright/codecs/amrnb/common/include/weight_a.h
ibstagefright/codecs/amrnb/common/include/window_tab.h
ibstagefright/codecs/amrnb/common/include/wmf_to_ets.h
ibstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h
ibstagefright/codecs/amrnb/common/src/add.cpp
ibstagefright/codecs/amrnb/common/src/az_lsp.cpp
ibstagefright/codecs/amrnb/common/src/bitno_tab.cpp
ibstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp
ibstagefright/codecs/amrnb/common/src/bits2prm.cpp
ibstagefright/codecs/amrnb/common/src/bytesused.cpp
ibstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp
ibstagefright/codecs/amrnb/common/src/copy.cpp
ibstagefright/codecs/amrnb/common/src/div_32.cpp
ibstagefright/codecs/amrnb/common/src/div_s.cpp
ibstagefright/codecs/amrnb/common/src/extract_h.cpp
ibstagefright/codecs/amrnb/common/src/extract_l.cpp
ibstagefright/codecs/amrnb/common/src/gains_tbl.cpp
ibstagefright/codecs/amrnb/common/src/gc_pred.cpp
ibstagefright/codecs/amrnb/common/src/gmed_n.cpp
ibstagefright/codecs/amrnb/common/src/gray_tbl.cpp
ibstagefright/codecs/amrnb/common/src/grid_tbl.cpp
ibstagefright/codecs/amrnb/common/src/int_lpc.cpp
ibstagefright/codecs/amrnb/common/src/inv_sqrt.cpp
ibstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp
ibstagefright/codecs/amrnb/common/src/l_abs.cpp
ibstagefright/codecs/amrnb/common/src/l_deposit_h.cpp
ibstagefright/codecs/amrnb/common/src/l_deposit_l.cpp
ibstagefright/codecs/amrnb/common/src/l_shr_r.cpp
ibstagefright/codecs/amrnb/common/src/log2.cpp
ibstagefright/codecs/amrnb/common/src/log2_norm.cpp
ibstagefright/codecs/amrnb/common/src/log2_tbl.cpp
ibstagefright/codecs/amrnb/common/src/lsfwt.cpp
ibstagefright/codecs/amrnb/common/src/lsp.cpp
ibstagefright/codecs/amrnb/common/src/lsp_az.cpp
ibstagefright/codecs/amrnb/common/src/lsp_lsf.cpp
ibstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp
ibstagefright/codecs/amrnb/common/src/lsp_tab.cpp
ibstagefright/codecs/amrnb/common/src/mult_r.cpp
ibstagefright/codecs/amrnb/common/src/negate.cpp
ibstagefright/codecs/amrnb/common/src/norm_l.cpp
ibstagefright/codecs/amrnb/common/src/norm_s.cpp
ibstagefright/codecs/amrnb/common/src/overflow_tbl.cpp
ibstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp
ibstagefright/codecs/amrnb/common/src/pow2.cpp
ibstagefright/codecs/amrnb/common/src/pow2_tbl.cpp
ibstagefright/codecs/amrnb/common/src/pred_lt.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_3.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_3_tbl.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_5.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp
ibstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp
ibstagefright/codecs/amrnb/common/src/reorder.cpp
ibstagefright/codecs/amrnb/common/src/residu.cpp
ibstagefright/codecs/amrnb/common/src/round.cpp
ibstagefright/codecs/amrnb/common/src/set_zero.cpp
ibstagefright/codecs/amrnb/common/src/shr.cpp
ibstagefright/codecs/amrnb/common/src/shr_r.cpp
ibstagefright/codecs/amrnb/common/src/sqrt_l.cpp
ibstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp
ibstagefright/codecs/amrnb/common/src/sub.cpp
ibstagefright/codecs/amrnb/common/src/syn_filt.cpp
ibstagefright/codecs/amrnb/common/src/vad1.cpp
ibstagefright/codecs/amrnb/common/src/weight_a.cpp
ibstagefright/codecs/amrnb/common/src/window_tab.cpp
ibstagefright/codecs/amrnb/dec/Android.mk
ibstagefright/codecs/amrnb/dec/SoftAMR.cpp
ibstagefright/codecs/amrnb/dec/SoftAMR.h
ibstagefright/codecs/amrnb/dec/include/pvamrnbdecoder_api.h
ibstagefright/codecs/amrnb/dec/src/a_refl.cpp
ibstagefright/codecs/amrnb/dec/src/a_refl.h
ibstagefright/codecs/amrnb/dec/src/agc.cpp
ibstagefright/codecs/amrnb/dec/src/agc.h
ibstagefright/codecs/amrnb/dec/src/amrdecode.cpp
ibstagefright/codecs/amrnb/dec/src/amrdecode.h
ibstagefright/codecs/amrnb/dec/src/b_cn_cod.cpp
ibstagefright/codecs/amrnb/dec/src/b_cn_cod.h
ibstagefright/codecs/amrnb/dec/src/bgnscd.cpp
ibstagefright/codecs/amrnb/dec/src/bgnscd.h
ibstagefright/codecs/amrnb/dec/src/c_g_aver.cpp
ibstagefright/codecs/amrnb/dec/src/c_g_aver.h
ibstagefright/codecs/amrnb/dec/src/d1035pf.cpp
ibstagefright/codecs/amrnb/dec/src/d1035pf.h
ibstagefright/codecs/amrnb/dec/src/d2_11pf.cpp
ibstagefright/codecs/amrnb/dec/src/d2_11pf.h
ibstagefright/codecs/amrnb/dec/src/d2_9pf.cpp
ibstagefright/codecs/amrnb/dec/src/d2_9pf.h
ibstagefright/codecs/amrnb/dec/src/d3_14pf.cpp
ibstagefright/codecs/amrnb/dec/src/d3_14pf.h
ibstagefright/codecs/amrnb/dec/src/d4_17pf.cpp
ibstagefright/codecs/amrnb/dec/src/d4_17pf.h
ibstagefright/codecs/amrnb/dec/src/d8_31pf.cpp
ibstagefright/codecs/amrnb/dec/src/d8_31pf.h
ibstagefright/codecs/amrnb/dec/src/d_gain_c.cpp
ibstagefright/codecs/amrnb/dec/src/d_gain_p.cpp
ibstagefright/codecs/amrnb/dec/src/d_plsf.cpp
ibstagefright/codecs/amrnb/dec/src/d_plsf_3.cpp
ibstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp
ibstagefright/codecs/amrnb/dec/src/dec_amr.cpp
ibstagefright/codecs/amrnb/dec/src/dec_amr.h
ibstagefright/codecs/amrnb/dec/src/dec_gain.cpp
ibstagefright/codecs/amrnb/dec/src/dec_gain.h
ibstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp
ibstagefright/codecs/amrnb/dec/src/dec_lag3.cpp
ibstagefright/codecs/amrnb/dec/src/dec_lag3.h
ibstagefright/codecs/amrnb/dec/src/dec_lag6.cpp
ibstagefright/codecs/amrnb/dec/src/dec_lag6.h
ibstagefright/codecs/amrnb/dec/src/dtx_dec.cpp
ibstagefright/codecs/amrnb/dec/src/dtx_dec.h
ibstagefright/codecs/amrnb/dec/src/ec_gains.cpp
ibstagefright/codecs/amrnb/dec/src/ec_gains.h
ibstagefright/codecs/amrnb/dec/src/ex_ctrl.cpp
ibstagefright/codecs/amrnb/dec/src/ex_ctrl.h
ibstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
ibstagefright/codecs/amrnb/dec/src/if2_to_ets.cpp
ibstagefright/codecs/amrnb/dec/src/if2_to_ets.h
ibstagefright/codecs/amrnb/dec/src/int_lsf.cpp
ibstagefright/codecs/amrnb/dec/src/lsp_avg.cpp
ibstagefright/codecs/amrnb/dec/src/lsp_avg.h
ibstagefright/codecs/amrnb/dec/src/ph_disp.cpp
ibstagefright/codecs/amrnb/dec/src/ph_disp.h
ibstagefright/codecs/amrnb/dec/src/post_pro.cpp
ibstagefright/codecs/amrnb/dec/src/post_pro.h
ibstagefright/codecs/amrnb/dec/src/preemph.cpp
ibstagefright/codecs/amrnb/dec/src/preemph.h
ibstagefright/codecs/amrnb/dec/src/pstfilt.cpp
ibstagefright/codecs/amrnb/dec/src/pstfilt.h
ibstagefright/codecs/amrnb/dec/src/pvgsmamrdecoder.cpp
ibstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp
ibstagefright/codecs/amrnb/dec/src/sp_dec.cpp
ibstagefright/codecs/amrnb/dec/src/sp_dec.h
ibstagefright/codecs/amrnb/dec/src/wmf_to_ets.cpp
ibstagefright/codecs/amrnb/enc/Android.mk
ibstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.cpp
ibstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.h
ibstagefright/codecs/amrnb/enc/src/amrencode.cpp
ibstagefright/codecs/amrnb/enc/src/amrencode.h
ibstagefright/codecs/amrnb/enc/src/autocorr.cpp
ibstagefright/codecs/amrnb/enc/src/autocorr.h
ibstagefright/codecs/amrnb/enc/src/c1035pf.cpp
ibstagefright/codecs/amrnb/enc/src/c1035pf.h
ibstagefright/codecs/amrnb/enc/src/c2_11pf.cpp
ibstagefright/codecs/amrnb/enc/src/c2_11pf.h
ibstagefright/codecs/amrnb/enc/src/c2_9pf.cpp
ibstagefright/codecs/amrnb/enc/src/c2_9pf.h
ibstagefright/codecs/amrnb/enc/src/c3_14pf.cpp
ibstagefright/codecs/amrnb/enc/src/c3_14pf.h
ibstagefright/codecs/amrnb/enc/src/c4_17pf.cpp
ibstagefright/codecs/amrnb/enc/src/c4_17pf.h
ibstagefright/codecs/amrnb/enc/src/c8_31pf.cpp
ibstagefright/codecs/amrnb/enc/src/c8_31pf.h
ibstagefright/codecs/amrnb/enc/src/calc_cor.cpp
ibstagefright/codecs/amrnb/enc/src/calc_cor.h
ibstagefright/codecs/amrnb/enc/src/calc_en.cpp
ibstagefright/codecs/amrnb/enc/src/calc_en.h
ibstagefright/codecs/amrnb/enc/src/cbsearch.cpp
ibstagefright/codecs/amrnb/enc/src/cbsearch.h
ibstagefright/codecs/amrnb/enc/src/cl_ltp.cpp
ibstagefright/codecs/amrnb/enc/src/cl_ltp.h
ibstagefright/codecs/amrnb/enc/src/cod_amr.cpp
ibstagefright/codecs/amrnb/enc/src/cod_amr.h
ibstagefright/codecs/amrnb/enc/src/convolve.cpp
ibstagefright/codecs/amrnb/enc/src/convolve.h
ibstagefright/codecs/amrnb/enc/src/cor_h.cpp
ibstagefright/codecs/amrnb/enc/src/cor_h.h
ibstagefright/codecs/amrnb/enc/src/cor_h_x.cpp
ibstagefright/codecs/amrnb/enc/src/cor_h_x.h
ibstagefright/codecs/amrnb/enc/src/cor_h_x2.cpp
ibstagefright/codecs/amrnb/enc/src/cor_h_x2.h
ibstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp
ibstagefright/codecs/amrnb/enc/src/dtx_enc.cpp
ibstagefright/codecs/amrnb/enc/src/dtx_enc.h
ibstagefright/codecs/amrnb/enc/src/enc_lag3.cpp
ibstagefright/codecs/amrnb/enc/src/enc_lag3.h
ibstagefright/codecs/amrnb/enc/src/enc_lag6.cpp
ibstagefright/codecs/amrnb/enc/src/enc_lag6.h
ibstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp
ibstagefright/codecs/amrnb/enc/src/ets_to_if2.cpp
ibstagefright/codecs/amrnb/enc/src/ets_to_if2.h
ibstagefright/codecs/amrnb/enc/src/ets_to_wmf.cpp
ibstagefright/codecs/amrnb/enc/src/ets_to_wmf.h
ibstagefright/codecs/amrnb/enc/src/g_adapt.cpp
ibstagefright/codecs/amrnb/enc/src/g_adapt.h
ibstagefright/codecs/amrnb/enc/src/g_code.cpp
ibstagefright/codecs/amrnb/enc/src/g_code.h
ibstagefright/codecs/amrnb/enc/src/g_pitch.cpp
ibstagefright/codecs/amrnb/enc/src/g_pitch.h
ibstagefright/codecs/amrnb/enc/src/gain_q.cpp
ibstagefright/codecs/amrnb/enc/src/gain_q.h
ibstagefright/codecs/amrnb/enc/src/gsmamr_enc.h
ibstagefright/codecs/amrnb/enc/src/hp_max.cpp
ibstagefright/codecs/amrnb/enc/src/hp_max.h
ibstagefright/codecs/amrnb/enc/src/inter_36.cpp
ibstagefright/codecs/amrnb/enc/src/inter_36.h
ibstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp
ibstagefright/codecs/amrnb/enc/src/inter_36_tab.h
ibstagefright/codecs/amrnb/enc/src/l_comp.cpp
ibstagefright/codecs/amrnb/enc/src/l_extract.cpp
ibstagefright/codecs/amrnb/enc/src/l_negate.cpp
ibstagefright/codecs/amrnb/enc/src/lag_wind.cpp
ibstagefright/codecs/amrnb/enc/src/lag_wind.h
ibstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp
ibstagefright/codecs/amrnb/enc/src/lag_wind_tab.h
ibstagefright/codecs/amrnb/enc/src/levinson.cpp
ibstagefright/codecs/amrnb/enc/src/levinson.h
ibstagefright/codecs/amrnb/enc/src/lpc.cpp
ibstagefright/codecs/amrnb/enc/src/lpc.h
ibstagefright/codecs/amrnb/enc/src/ol_ltp.cpp
ibstagefright/codecs/amrnb/enc/src/ol_ltp.h
ibstagefright/codecs/amrnb/enc/src/p_ol_wgh.cpp
ibstagefright/codecs/amrnb/enc/src/pitch_fr.cpp
ibstagefright/codecs/amrnb/enc/src/pitch_fr.h
ibstagefright/codecs/amrnb/enc/src/pitch_ol.cpp
ibstagefright/codecs/amrnb/enc/src/pitch_ol.h
ibstagefright/codecs/amrnb/enc/src/pre_big.cpp
ibstagefright/codecs/amrnb/enc/src/pre_big.h
ibstagefright/codecs/amrnb/enc/src/pre_proc.cpp
ibstagefright/codecs/amrnb/enc/src/pre_proc.h
ibstagefright/codecs/amrnb/enc/src/prm2bits.cpp
ibstagefright/codecs/amrnb/enc/src/prm2bits.h
ibstagefright/codecs/amrnb/enc/src/q_gain_c.cpp
ibstagefright/codecs/amrnb/enc/src/q_gain_c.h
ibstagefright/codecs/amrnb/enc/src/q_gain_p.cpp
ibstagefright/codecs/amrnb/enc/src/q_gain_p.h
ibstagefright/codecs/amrnb/enc/src/qgain475.cpp
ibstagefright/codecs/amrnb/enc/src/qgain475.h
ibstagefright/codecs/amrnb/enc/src/qgain795.cpp
ibstagefright/codecs/amrnb/enc/src/qgain795.h
ibstagefright/codecs/amrnb/enc/src/qua_gain.cpp
ibstagefright/codecs/amrnb/enc/src/s10_8pf.cpp
ibstagefright/codecs/amrnb/enc/src/s10_8pf.h
ibstagefright/codecs/amrnb/enc/src/set_sign.cpp
ibstagefright/codecs/amrnb/enc/src/set_sign.h
ibstagefright/codecs/amrnb/enc/src/sid_sync.cpp
ibstagefright/codecs/amrnb/enc/src/sid_sync.h
ibstagefright/codecs/amrnb/enc/src/sp_enc.cpp
ibstagefright/codecs/amrnb/enc/src/sp_enc.h
ibstagefright/codecs/amrnb/enc/src/spreproc.cpp
ibstagefright/codecs/amrnb/enc/src/spreproc.h
ibstagefright/codecs/amrnb/enc/src/spstproc.cpp
ibstagefright/codecs/amrnb/enc/src/spstproc.h
ibstagefright/codecs/amrnb/enc/src/ton_stab.cpp
ibstagefright/codecs/amrnb/enc/src/ton_stab.h
ibstagefright/codecs/amrnb/patent_disclaimer.txt
ibstagefright/codecs/amrwb/Android.mk
ibstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h
ibstagefright/codecs/amrwb/patent_disclaimer.txt
ibstagefright/codecs/amrwb/src/agc2_amr_wb.cpp
ibstagefright/codecs/amrwb/src/band_pass_6k_7k.cpp
ibstagefright/codecs/amrwb/src/dec_acelp_2p_in_64.cpp
ibstagefright/codecs/amrwb/src/dec_acelp_4p_in_64.cpp
ibstagefright/codecs/amrwb/src/dec_alg_codebook.cpp
ibstagefright/codecs/amrwb/src/dec_gain2_amr_wb.cpp
ibstagefright/codecs/amrwb/src/deemphasis_32.cpp
ibstagefright/codecs/amrwb/src/dtx.h
ibstagefright/codecs/amrwb/src/dtx_decoder_amr_wb.cpp
ibstagefright/codecs/amrwb/src/e_pv_amrwbdec.h
ibstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp
ibstagefright/codecs/amrwb/src/get_amr_wb_bits.h
ibstagefright/codecs/amrwb/src/highpass_400hz_at_12k8.cpp
ibstagefright/codecs/amrwb/src/highpass_50hz_at_12k8.cpp
ibstagefright/codecs/amrwb/src/homing_amr_wb_dec.cpp
ibstagefright/codecs/amrwb/src/interpolate_isp.cpp
ibstagefright/codecs/amrwb/src/isf_extrapolation.cpp
ibstagefright/codecs/amrwb/src/isp_az.cpp
ibstagefright/codecs/amrwb/src/isp_isf.cpp
ibstagefright/codecs/amrwb/src/lagconceal.cpp
ibstagefright/codecs/amrwb/src/low_pass_filt_7k.cpp
ibstagefright/codecs/amrwb/src/median5.cpp
ibstagefright/codecs/amrwb/src/mime_io.cpp
ibstagefright/codecs/amrwb/src/mime_io.h
ibstagefright/codecs/amrwb/src/noise_gen_amrwb.cpp
ibstagefright/codecs/amrwb/src/normalize_amr_wb.cpp
ibstagefright/codecs/amrwb/src/normalize_amr_wb.h
ibstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
ibstagefright/codecs/amrwb/src/phase_dispersion.cpp
ibstagefright/codecs/amrwb/src/pit_shrp.cpp
ibstagefright/codecs/amrwb/src/pred_lt4.cpp
ibstagefright/codecs/amrwb/src/preemph_amrwb_dec.cpp
ibstagefright/codecs/amrwb/src/pv_amr_wb_type_defs.h
ibstagefright/codecs/amrwb/src/pvamrwb_math_op.cpp
ibstagefright/codecs/amrwb/src/pvamrwb_math_op.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder.cpp
ibstagefright/codecs/amrwb/src/pvamrwbdecoder.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_acelp.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_cequivalent.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_cnst.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_mem_funcs.h
ibstagefright/codecs/amrwb/src/q_gain2_tab.cpp
ibstagefright/codecs/amrwb/src/q_pulse.h
ibstagefright/codecs/amrwb/src/qisf_ns.cpp
ibstagefright/codecs/amrwb/src/qisf_ns.h
ibstagefright/codecs/amrwb/src/qisf_ns_tab.cpp
ibstagefright/codecs/amrwb/src/qpisf_2s.cpp
ibstagefright/codecs/amrwb/src/qpisf_2s.h
ibstagefright/codecs/amrwb/src/qpisf_2s_tab.cpp
ibstagefright/codecs/amrwb/src/scale_signal.cpp
ibstagefright/codecs/amrwb/src/synthesis_amr_wb.cpp
ibstagefright/codecs/amrwb/src/synthesis_amr_wb.h
ibstagefright/codecs/amrwb/src/voice_factor.cpp
ibstagefright/codecs/amrwb/src/wb_syn_filt.cpp
ibstagefright/codecs/amrwb/src/weight_amrwb_lpc.cpp
ibstagefright/codecs/amrwbenc/Android.mk
ibstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
ibstagefright/codecs/amrwbenc/SampleCode/Android.mk
ibstagefright/codecs/amrwbenc/SoftAMRWBEncoder.cpp
ibstagefright/codecs/amrwbenc/SoftAMRWBEncoder.h
ibstagefright/codecs/amrwbenc/doc/voAMRWBEncoderSDK.pdf
ibstagefright/codecs/amrwbenc/inc/acelp.h
ibstagefright/codecs/amrwbenc/inc/basic_op.h
ibstagefright/codecs/amrwbenc/inc/bits.h
ibstagefright/codecs/amrwbenc/inc/cnst.h
ibstagefright/codecs/amrwbenc/inc/cod_main.h
ibstagefright/codecs/amrwbenc/inc/dtx.h
ibstagefright/codecs/amrwbenc/inc/grid100.tab
ibstagefright/codecs/amrwbenc/inc/ham_wind.tab
ibstagefright/codecs/amrwbenc/inc/homing.tab
ibstagefright/codecs/amrwbenc/inc/isp_isf.tab
ibstagefright/codecs/amrwbenc/inc/lag_wind.tab
ibstagefright/codecs/amrwbenc/inc/log2.h
ibstagefright/codecs/amrwbenc/inc/log2_tab.h
ibstagefright/codecs/amrwbenc/inc/main.h
ibstagefright/codecs/amrwbenc/inc/math_op.h
ibstagefright/codecs/amrwbenc/inc/mem_align.h
ibstagefright/codecs/amrwbenc/inc/mime_io.tab
ibstagefright/codecs/amrwbenc/inc/oper_32b.h
ibstagefright/codecs/amrwbenc/inc/p_med_o.h
ibstagefright/codecs/amrwbenc/inc/p_med_ol.tab
ibstagefright/codecs/amrwbenc/inc/q_gain2.tab
ibstagefright/codecs/amrwbenc/inc/q_pulse.h
ibstagefright/codecs/amrwbenc/inc/qisf_ns.tab
ibstagefright/codecs/amrwbenc/inc/qpisf_2s.tab
ibstagefright/codecs/amrwbenc/inc/stream.h
ibstagefright/codecs/amrwbenc/inc/typedef.h
ibstagefright/codecs/amrwbenc/inc/typedefs.h
ibstagefright/codecs/amrwbenc/inc/wb_vad.h
ibstagefright/codecs/amrwbenc/inc/wb_vad_c.h
ibstagefright/codecs/amrwbenc/patent_disclaimer.txt
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
ibstagefright/codecs/amrwbenc/src/autocorr.c
ibstagefright/codecs/amrwbenc/src/az_isp.c
ibstagefright/codecs/amrwbenc/src/bits.c
ibstagefright/codecs/amrwbenc/src/c2t64fx.c
ibstagefright/codecs/amrwbenc/src/c4t64fx.c
ibstagefright/codecs/amrwbenc/src/convolve.c
ibstagefright/codecs/amrwbenc/src/cor_h_x.c
ibstagefright/codecs/amrwbenc/src/decim54.c
ibstagefright/codecs/amrwbenc/src/deemph.c
ibstagefright/codecs/amrwbenc/src/dtx.c
ibstagefright/codecs/amrwbenc/src/g_pitch.c
ibstagefright/codecs/amrwbenc/src/gpclip.c
ibstagefright/codecs/amrwbenc/src/homing.c
ibstagefright/codecs/amrwbenc/src/hp400.c
ibstagefright/codecs/amrwbenc/src/hp50.c
ibstagefright/codecs/amrwbenc/src/hp6k.c
ibstagefright/codecs/amrwbenc/src/hp_wsp.c
ibstagefright/codecs/amrwbenc/src/int_lpc.c
ibstagefright/codecs/amrwbenc/src/isp_az.c
ibstagefright/codecs/amrwbenc/src/isp_isf.c
ibstagefright/codecs/amrwbenc/src/lag_wind.c
ibstagefright/codecs/amrwbenc/src/levinson.c
ibstagefright/codecs/amrwbenc/src/log2.c
ibstagefright/codecs/amrwbenc/src/lp_dec2.c
ibstagefright/codecs/amrwbenc/src/math_op.c
ibstagefright/codecs/amrwbenc/src/mem_align.c
ibstagefright/codecs/amrwbenc/src/oper_32b.c
ibstagefright/codecs/amrwbenc/src/p_med_ol.c
ibstagefright/codecs/amrwbenc/src/pit_shrp.c
ibstagefright/codecs/amrwbenc/src/pitch_f4.c
ibstagefright/codecs/amrwbenc/src/pred_lt4.c
ibstagefright/codecs/amrwbenc/src/preemph.c
ibstagefright/codecs/amrwbenc/src/q_gain2.c
ibstagefright/codecs/amrwbenc/src/q_pulse.c
ibstagefright/codecs/amrwbenc/src/qisf_ns.c
ibstagefright/codecs/amrwbenc/src/qpisf_2s.c
ibstagefright/codecs/amrwbenc/src/random.c
ibstagefright/codecs/amrwbenc/src/residu.c
ibstagefright/codecs/amrwbenc/src/scale.c
ibstagefright/codecs/amrwbenc/src/stream.c
ibstagefright/codecs/amrwbenc/src/syn_filt.c
ibstagefright/codecs/amrwbenc/src/updt_tar.c
ibstagefright/codecs/amrwbenc/src/util.c
ibstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
ibstagefright/codecs/amrwbenc/src/voicefac.c
ibstagefright/codecs/amrwbenc/src/wb_vad.c
ibstagefright/codecs/amrwbenc/src/weight_a.c
ibstagefright/codecs/avc/Android.mk
ibstagefright/codecs/avc/common/Android.mk
ibstagefright/codecs/avc/common/include/avc_types.h
ibstagefright/codecs/avc/common/include/avcapi_common.h
ibstagefright/codecs/avc/common/include/avcint_common.h
ibstagefright/codecs/avc/common/include/avclib_common.h
ibstagefright/codecs/avc/common/src/deblock.cpp
ibstagefright/codecs/avc/common/src/dpb.cpp
ibstagefright/codecs/avc/common/src/fmo.cpp
ibstagefright/codecs/avc/common/src/mb_access.cpp
ibstagefright/codecs/avc/common/src/reflist.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/avc/enc/Android.mk
ibstagefright/codecs/avc/enc/src/avcenc_api.cpp
ibstagefright/codecs/avc/enc/src/avcenc_api.h
ibstagefright/codecs/avc/enc/src/avcenc_int.h
ibstagefright/codecs/avc/enc/src/avcenc_lib.h
ibstagefright/codecs/avc/enc/src/bitstream_io.cpp
ibstagefright/codecs/avc/enc/src/block.cpp
ibstagefright/codecs/avc/enc/src/findhalfpel.cpp
ibstagefright/codecs/avc/enc/src/header.cpp
ibstagefright/codecs/avc/enc/src/init.cpp
ibstagefright/codecs/avc/enc/src/intra_est.cpp
ibstagefright/codecs/avc/enc/src/motion_comp.cpp
ibstagefright/codecs/avc/enc/src/motion_est.cpp
ibstagefright/codecs/avc/enc/src/rate_control.cpp
ibstagefright/codecs/avc/enc/src/residual.cpp
ibstagefright/codecs/avc/enc/src/sad.cpp
ibstagefright/codecs/avc/enc/src/sad_halfpel.cpp
ibstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
ibstagefright/codecs/avc/enc/src/sad_inline.h
ibstagefright/codecs/avc/enc/src/sad_mb_offset.h
ibstagefright/codecs/avc/enc/src/slice.cpp
ibstagefright/codecs/avc/enc/src/vlc_encode.cpp
ibstagefright/codecs/avc/patent_disclaimer.txt
ibstagefright/codecs/common/Android.mk
ibstagefright/codecs/common/Config.mk
ibstagefright/codecs/common/cmnMemory.c
ibstagefright/codecs/common/include/cmnMemory.h
ibstagefright/codecs/common/include/voAAC.h
ibstagefright/codecs/common/include/voAMRWB.h
ibstagefright/codecs/common/include/voAudio.h
ibstagefright/codecs/common/include/voIndex.h
ibstagefright/codecs/common/include/voMem.h
ibstagefright/codecs/common/include/voType.h
ibstagefright/codecs/g711/Android.mk
ibstagefright/codecs/g711/dec/Android.mk
ibstagefright/codecs/g711/dec/SoftG711.cpp
ibstagefright/codecs/g711/dec/SoftG711.h
ibstagefright/codecs/m4v_h263/Android.mk
ibstagefright/codecs/m4v_h263/dec/Android.mk
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
ibstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
ibstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h
ibstagefright/codecs/m4v_h263/dec/include/visual_header.h
ibstagefright/codecs/m4v_h263/dec/src/adaptive_smooth_no_mmx.cpp
ibstagefright/codecs/m4v_h263/dec/src/bitstream.cpp
ibstagefright/codecs/m4v_h263/dec/src/bitstream.h
ibstagefright/codecs/m4v_h263/dec/src/block_idct.cpp
ibstagefright/codecs/m4v_h263/dec/src/cal_dc_scaler.cpp
ibstagefright/codecs/m4v_h263/dec/src/chv_filter.cpp
ibstagefright/codecs/m4v_h263/dec/src/chvr_filter.cpp
ibstagefright/codecs/m4v_h263/dec/src/combined_decode.cpp
ibstagefright/codecs/m4v_h263/dec/src/conceal.cpp
ibstagefright/codecs/m4v_h263/dec/src/datapart_decode.cpp
ibstagefright/codecs/m4v_h263/dec/src/dcac_prediction.cpp
ibstagefright/codecs/m4v_h263/dec/src/dec_pred_intra_dc.cpp
ibstagefright/codecs/m4v_h263/dec/src/deringing_chroma.cpp
ibstagefright/codecs/m4v_h263/dec/src/deringing_luma.cpp
ibstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp
ibstagefright/codecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp
ibstagefright/codecs/m4v_h263/dec/src/get_pred_outside.cpp
ibstagefright/codecs/m4v_h263/dec/src/idct.cpp
ibstagefright/codecs/m4v_h263/dec/src/idct.h
ibstagefright/codecs/m4v_h263/dec/src/idct_vca.cpp
ibstagefright/codecs/m4v_h263/dec/src/max_level.h
ibstagefright/codecs/m4v_h263/dec/src/mb_motion_comp.cpp
ibstagefright/codecs/m4v_h263/dec/src/mb_utils.cpp
ibstagefright/codecs/m4v_h263/dec/src/mbtype_mode.h
ibstagefright/codecs/m4v_h263/dec/src/motion_comp.h
ibstagefright/codecs/m4v_h263/dec/src/mp4dec_lib.h
ibstagefright/codecs/m4v_h263/dec/src/mp4def.h
ibstagefright/codecs/m4v_h263/dec/src/mp4lib_int.h
ibstagefright/codecs/m4v_h263/dec/src/packet_util.cpp
ibstagefright/codecs/m4v_h263/dec/src/post_filter.cpp
ibstagefright/codecs/m4v_h263/dec/src/post_proc.h
ibstagefright/codecs/m4v_h263/dec/src/post_proc_semaphore.cpp
ibstagefright/codecs/m4v_h263/dec/src/pp_semaphore_chroma_inter.cpp
ibstagefright/codecs/m4v_h263/dec/src/pp_semaphore_luma.cpp
ibstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
ibstagefright/codecs/m4v_h263/dec/src/scaling.h
ibstagefright/codecs/m4v_h263/dec/src/scaling_tab.cpp
ibstagefright/codecs/m4v_h263/dec/src/vlc_dec_tab.h
ibstagefright/codecs/m4v_h263/dec/src/vlc_decode.cpp
ibstagefright/codecs/m4v_h263/dec/src/vlc_decode.h
ibstagefright/codecs/m4v_h263/dec/src/vlc_dequant.cpp
ibstagefright/codecs/m4v_h263/dec/src/vlc_tab.cpp
ibstagefright/codecs/m4v_h263/dec/src/vop.cpp
ibstagefright/codecs/m4v_h263/dec/src/zigzag.h
ibstagefright/codecs/m4v_h263/dec/src/zigzag_tab.cpp
ibstagefright/codecs/m4v_h263/enc/Android.mk
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/codecs/m4v_h263/enc/include/cvei.h
ibstagefright/codecs/m4v_h263/enc/include/mp4enc_api.h
ibstagefright/codecs/m4v_h263/enc/src/bitstream_io.cpp
ibstagefright/codecs/m4v_h263/enc/src/bitstream_io.h
ibstagefright/codecs/m4v_h263/enc/src/combined_encode.cpp
ibstagefright/codecs/m4v_h263/enc/src/datapart_encode.cpp
ibstagefright/codecs/m4v_h263/enc/src/dct.cpp
ibstagefright/codecs/m4v_h263/enc/src/dct.h
ibstagefright/codecs/m4v_h263/enc/src/dct_inline.h
ibstagefright/codecs/m4v_h263/enc/src/fastcodemb.cpp
ibstagefright/codecs/m4v_h263/enc/src/fastcodemb.h
ibstagefright/codecs/m4v_h263/enc/src/fastidct.cpp
ibstagefright/codecs/m4v_h263/enc/src/fastquant.cpp
ibstagefright/codecs/m4v_h263/enc/src/fastquant_inline.h
ibstagefright/codecs/m4v_h263/enc/src/findhalfpel.cpp
ibstagefright/codecs/m4v_h263/enc/src/m4venc_oscl.h
ibstagefright/codecs/m4v_h263/enc/src/me_utils.cpp
ibstagefright/codecs/m4v_h263/enc/src/motion_comp.cpp
ibstagefright/codecs/m4v_h263/enc/src/motion_est.cpp
ibstagefright/codecs/m4v_h263/enc/src/mp4def.h
ibstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp
ibstagefright/codecs/m4v_h263/enc/src/mp4enc_lib.h
ibstagefright/codecs/m4v_h263/enc/src/mp4lib_int.h
ibstagefright/codecs/m4v_h263/enc/src/rate_control.cpp
ibstagefright/codecs/m4v_h263/enc/src/rate_control.h
ibstagefright/codecs/m4v_h263/enc/src/sad.cpp
ibstagefright/codecs/m4v_h263/enc/src/sad_halfpel.cpp
ibstagefright/codecs/m4v_h263/enc/src/sad_halfpel_inline.h
ibstagefright/codecs/m4v_h263/enc/src/sad_inline.h
ibstagefright/codecs/m4v_h263/enc/src/sad_mb_offset.h
ibstagefright/codecs/m4v_h263/enc/src/vlc_enc_tab.h
ibstagefright/codecs/m4v_h263/enc/src/vlc_encode.cpp
ibstagefright/codecs/m4v_h263/enc/src/vlc_encode.h
ibstagefright/codecs/m4v_h263/enc/src/vlc_encode_inline.h
ibstagefright/codecs/m4v_h263/enc/src/vop.cpp
ibstagefright/codecs/m4v_h263/patent_disclaimer.txt
ibstagefright/codecs/mp3dec/Android.mk
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/mp3dec/SoftMP3.h
ibstagefright/codecs/mp3dec/include/mp3_decoder_selection.h
ibstagefright/codecs/mp3dec/include/pvmp3_audio_type_defs.h
ibstagefright/codecs/mp3dec/include/pvmp3decoder_api.h
ibstagefright/codecs/mp3dec/patent_disclaimer.txt
ibstagefright/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_dct_9_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_dct_9_gcc.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_wm.asm
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_wm.asm
ibstagefright/codecs/mp3dec/src/mp3_mem_funcs.h
ibstagefright/codecs/mp3dec/src/pv_mp3_huffman.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm_gcc.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_msc_evc.h
ibstagefright/codecs/mp3dec/src/pvmp3_alias_reduction.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_alias_reduction.h
ibstagefright/codecs/mp3dec/src/pvmp3_crc.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_crc.h
ibstagefright/codecs/mp3dec/src/pvmp3_dct_16.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_dct_16.h
ibstagefright/codecs/mp3dec/src/pvmp3_dct_6.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_dct_9.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_dec_defs.h
ibstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_decode_header.h
ibstagefright/codecs/mp3dec/src/pvmp3_decode_huff_cw.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_decode_huff_cw.h
ibstagefright/codecs/mp3dec/src/pvmp3_dequantize_sample.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_dequantize_sample.h
ibstagefright/codecs/mp3dec/src/pvmp3_equalizer.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_equalizer.h
ibstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_framedecoder.h
ibstagefright/codecs/mp3dec/src/pvmp3_get_main_data_size.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_get_main_data_size.h
ibstagefright/codecs/mp3dec/src/pvmp3_get_scale_factors.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_get_scale_factors.h
ibstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_get_side_info.h
ibstagefright/codecs/mp3dec/src/pvmp3_getbits.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_getbits.h
ibstagefright/codecs/mp3dec/src/pvmp3_huffman_decoding.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_huffman_parsing.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_imdct_synth.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_imdct_synth.h
ibstagefright/codecs/mp3dec/src/pvmp3_mdct_18.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mdct_18.h
ibstagefright/codecs/mp3dec/src/pvmp3_mdct_6.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mdct_6.h
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.h
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.h
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.h
ibstagefright/codecs/mp3dec/src/pvmp3_normalize.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_normalize.h
ibstagefright/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.h
ibstagefright/codecs/mp3dec/src/pvmp3_polyphase_filter_window.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_polyphase_filter_window.h
ibstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_reorder.h
ibstagefright/codecs/mp3dec/src/pvmp3_seek_synch.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_seek_synch.h
ibstagefright/codecs/mp3dec/src/pvmp3_stereo_proc.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_stereo_proc.h
ibstagefright/codecs/mp3dec/src/pvmp3_tables.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_tables.h
ibstagefright/codecs/mp3dec/src/s_huffcodetab.h
ibstagefright/codecs/mp3dec/src/s_mp3bits.h
ibstagefright/codecs/mp3dec/src/s_tmp3dec_chan.h
ibstagefright/codecs/mp3dec/src/s_tmp3dec_file.h
ibstagefright/codecs/on2/Android.mk
ibstagefright/codecs/on2/dec/Android.mk
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/dec/SoftVPX.h
ibstagefright/codecs/on2/h264dec/Android.mk
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.h
ibstagefright/codecs/on2/h264dec/inc/H264SwDecApi.h
ibstagefright/codecs/on2/h264dec/inc/basetype.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/ARM_DELIVERY.TXT
ibstagefright/codecs/on2/h264dec/omxdl/arm11/ARM_MANIFEST.TXT
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_BitDec_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCTTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCT_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_MaskTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_Version.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/omxtypes.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/omxtypes_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/arm11/filelist_vc.txt
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_IDCTTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_MaskTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/armVCCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/omxVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/omxVC_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_Copy16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_Copy8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DequantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_QuantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Clip8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/src/armVC_Version.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/ARM_DELIVERY.TXT
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/ARM_MANIFEST.TXT
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_BitDec_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCTTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCT_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_MaskTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Version.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/filelist_vc.txt
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_IDCTTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_MaskTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/armVCCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DequantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_QuantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingChroma_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingLuma_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Align_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Copy_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_QuantTables_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_TransformResidual4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_UnpackBlock4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DeblockLuma_I.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_InterpolateLuma_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Clip8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/src/armVC_Version.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/ARM_DELIVERY.TXT
ibstagefright/codecs/on2/h264dec/omxdl/reference/ARM_MANIFEST.TXT
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM_Version.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/omxtypes.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/reference/filelist_vc.txt
ibstagefright/codecs/on2/h264dec/omxdl/reference/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/api/omxVC.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_Average.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_SAD.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock_SAD.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ExpandFrame_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_LimitMVToRect.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CompareMotionCostToMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DeBlockPixel.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DequantTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_FwdTransformResidual4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfDiag_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfHor_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfVer_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Chroma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_PredictIntraDC4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_QuantTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_SADQuar.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_TransformResidual4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock2x2.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_Average_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Half.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Integer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Quarter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_GetVLCInfo.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfHor_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfVer_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateLuma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_ChromaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_LumaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformResidualAndAdd.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEGetBufSize.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEInit.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MotionEstimationMB.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SAD_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SATD_4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SubAndTransformQDQResidual.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_ChromaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_LumaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_DCT_Table.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_ACDCPredict.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Half.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Integer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CheckVLCEscapeMode.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CompareMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DCT_Table.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_EncodeVLCZigzag_intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLCBuffer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLDBuffer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_GetVLCBits.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_PutVLCBits.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_SetPredDir.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DCT8x8blk.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraACVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraDCVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_FindMVpred.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_IDCT8x8blk.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MCReconBlock.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEGetBufSize.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEInit.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MotionEstimationMB.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInter_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantIntra_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvInter_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/src/armVC_Version.c
ibstagefright/codecs/on2/h264dec/source/DecTestBench.c
ibstagefright/codecs/on2/h264dec/source/EvaluationTestBench.c
ibstagefright/codecs/on2/h264dec/source/H264SwDecApi.c
ibstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor_ver.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_ver.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_half.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_quarter.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_ver_quarter.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_mid_hor.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_half.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_quarter.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/win_asm.bat
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdClearMbLayer.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdCountLeadingZeros.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdFillRow7.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdFlushBits.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdWriteMacroblock.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/asm_common.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdClearMbLayer.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdCountLeadingZeros.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFillRow7.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFlushBits.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdWriteMacroblock.S
ibstagefright/codecs/on2/h264dec/source/h264bsd_byte_stream.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_byte_stream.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_cavlc.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_cavlc.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_cfg.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_conceal.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_conceal.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_container.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_deblocking.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_deblocking.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_decoder.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_dpb.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_dpb.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_image.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_image.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_inter_prediction.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_inter_prediction.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_macroblock_layer.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_macroblock_layer.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_nal_unit.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_nal_unit.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_neighbour.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_neighbour.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_pic_order_cnt.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_pic_order_cnt.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_pic_param_set.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_pic_param_set.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_reconstruct.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_reconstruct.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_sei.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_sei.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_seq_param_set.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_seq_param_set.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_data.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_data.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_group_map.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_group_map.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_header.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_header.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_storage.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_storage.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_stream.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_stream.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_transform.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_transform.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_util.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_util.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_vlc.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_vlc.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_vui.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_vui.h
ibstagefright/codecs/vorbis/Android.mk
ibstagefright/codecs/vorbis/dec/Android.mk
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.h
ibstagefright/colorconversion/Android.mk
ibstagefright/colorconversion/ColorConverter.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/foundation/AAtomizer.cpp
ibstagefright/foundation/ABitReader.cpp
ibstagefright/foundation/ABuffer.cpp
ibstagefright/foundation/AHandler.cpp
ibstagefright/foundation/AHierarchicalStateMachine.cpp
ibstagefright/foundation/ALooper.cpp
ibstagefright/foundation/ALooperRoster.cpp
ibstagefright/foundation/AMessage.cpp
ibstagefright/foundation/AString.cpp
ibstagefright/foundation/Android.mk
ibstagefright/foundation/base64.cpp
ibstagefright/foundation/hexdump.cpp
ibstagefright/httplive/Android.mk
ibstagefright/httplive/LiveDataSource.cpp
ibstagefright/httplive/LiveDataSource.h
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/id3/Android.mk
ibstagefright/id3/ID3.cpp
ibstagefright/id3/testid3.cpp
ibstagefright/include/AACEncoder.h
ibstagefright/include/AACExtractor.h
ibstagefright/include/AMRExtractor.h
ibstagefright/include/AVCEncoder.h
ibstagefright/include/AVIExtractor.h
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/ChromiumHTTPDataSource.h
ibstagefright/include/DRMExtractor.h
ibstagefright/include/DataUriSource.h
ibstagefright/include/ESDS.h
ibstagefright/include/FLACExtractor.h
ibstagefright/include/HTTPBase.h
ibstagefright/include/ID3.h
ibstagefright/include/LiveSession.h
ibstagefright/include/M3UParser.h
ibstagefright/include/M4vH263Encoder.h
ibstagefright/include/MP3Extractor.h
ibstagefright/include/MP3Seeker.h
ibstagefright/include/MPEG2PSExtractor.h
ibstagefright/include/MPEG2TSExtractor.h
ibstagefright/include/MPEG4Extractor.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/include/OggExtractor.h
ibstagefright/include/SampleIterator.h
ibstagefright/include/SampleTable.h
ibstagefright/include/SimpleSoftOMXComponent.h
ibstagefright/include/SoftOMXComponent.h
ibstagefright/include/SoftwareRenderer.h
ibstagefright/include/StagefrightMetadataRetriever.h
ibstagefright/include/ThrottledSource.h
ibstagefright/include/TimedEventQueue.h
ibstagefright/include/VBRISeeker.h
ibstagefright/include/WAVExtractor.h
ibstagefright/include/WVMExtractor.h
ibstagefright/include/XINGSeeker.h
ibstagefright/include/avc_utils.h
ibstagefright/matroska/Android.mk
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/MatroskaExtractor.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/Android.mk
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXMaster.cpp
ibstagefright/omx/OMXMaster.h
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/SimpleSoftOMXComponent.cpp
ibstagefright/omx/SoftOMXComponent.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
ibstagefright/omx/SoftOMXPlugin.h
ibstagefright/omx/tests/Android.mk
ibstagefright/omx/tests/OMXHarness.cpp
ibstagefright/omx/tests/OMXHarness.h
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/AAMRAssembler.h
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AAVCAssembler.h
ibstagefright/rtsp/AH263Assembler.cpp
ibstagefright/rtsp/AH263Assembler.h
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.h
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/APacketSource.h
ibstagefright/rtsp/ARTPAssembler.cpp
ibstagefright/rtsp/ARTPAssembler.h
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPConnection.h
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTPSession.h
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTPSource.h
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARTPWriter.h
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
ibstagefright/rtsp/ARawAudioAssembler.cpp
ibstagefright/rtsp/ARawAudioAssembler.h
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/ASessionDescription.h
ibstagefright/rtsp/Android.mk
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/MyTransmitter.h
ibstagefright/rtsp/UDPPusher.cpp
ibstagefright/rtsp/UDPPusher.h
ibstagefright/rtsp/VideoSource.h
ibstagefright/rtsp/rtp_test.cpp
ibstagefright/tests/Android.mk
ibstagefright/tests/DummyRecorder.cpp
ibstagefright/tests/DummyRecorder.h
ibstagefright/tests/SurfaceMediaSource_test.cpp
ibstagefright/timedtext/Android.mk
ibstagefright/timedtext/TextDescriptions.cpp
ibstagefright/timedtext/TextDescriptions.h
ibstagefright/timedtext/TimedText3GPPSource.cpp
ibstagefright/timedtext/TimedText3GPPSource.h
ibstagefright/timedtext/TimedTextDriver.cpp
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/timedtext/TimedTextPlayer.h
ibstagefright/timedtext/TimedTextSRTSource.cpp
ibstagefright/timedtext/TimedTextSRTSource.h
ibstagefright/timedtext/TimedTextSource.cpp
ibstagefright/timedtext/TimedTextSource.h
ibstagefright/yuv/Android.mk
ibstagefright/yuv/YUVCanvas.cpp
ibstagefright/yuv/YUVImage.cpp
ediaserver/Android.mk
ediaserver/main_mediaserver.cpp
tp/Android.mk
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.h
tp/MtpDebug.cpp
tp/MtpDebug.h
tp/MtpDevice.cpp
tp/MtpDevice.h
tp/MtpDeviceInfo.cpp
tp/MtpDeviceInfo.h
tp/MtpEventPacket.cpp
tp/MtpEventPacket.h
tp/MtpObjectInfo.cpp
tp/MtpObjectInfo.h
tp/MtpPacket.cpp
tp/MtpPacket.h
tp/MtpProperty.cpp
tp/MtpProperty.h
tp/MtpRequestPacket.cpp
tp/MtpRequestPacket.h
tp/MtpResponsePacket.cpp
tp/MtpResponsePacket.h
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/MtpStorageInfo.cpp
tp/MtpStorageInfo.h
tp/MtpStringBuffer.cpp
tp/MtpStringBuffer.h
tp/MtpTypes.h
tp/MtpUtils.cpp
tp/MtpUtils.h
tp/mtp.h
45edba1b8b0377dfe70a4f2b0afb0f04dd8e1ee9 28-Mar-2012 RoboErik <epastern@google.com> b/6232528 Reduce volume persist delay to 500ms

Change-Id: I45c32da0a1089ce8bc865e12b51c069a6db28fd4
ava/android/media/AudioService.java
65953da4636fbf5f0a24b8f5f2b5fa7d76ff13d9 27-Mar-2012 Marius Renn <renn@google.com> Multi-Project Commit: Move of filterfw out of system/media (2 of 7)

This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I9f42be5a12a9e8157512be11f04e38e4548970be
ca/Android.mk
ca/effect/java/android/media/effect/Effect.java
ca/effect/java/android/media/effect/EffectContext.java
ca/effect/java/android/media/effect/EffectFactory.java
ca/effect/java/android/media/effect/EffectUpdateListener.java
ca/effect/java/android/media/effect/FilterEffect.java
ca/effect/java/android/media/effect/FilterGraphEffect.java
ca/effect/java/android/media/effect/SingleFilterEffect.java
ca/effect/java/android/media/effect/SizeChangeEffect.java
ca/effect/java/android/media/effect/effects/AutoFixEffect.java
ca/effect/java/android/media/effect/effects/BackDropperEffect.java
ca/effect/java/android/media/effect/effects/BitmapOverlayEffect.java
ca/effect/java/android/media/effect/effects/BlackWhiteEffect.java
ca/effect/java/android/media/effect/effects/BrightnessEffect.java
ca/effect/java/android/media/effect/effects/ColorTemperatureEffect.java
ca/effect/java/android/media/effect/effects/ContrastEffect.java
ca/effect/java/android/media/effect/effects/CropEffect.java
ca/effect/java/android/media/effect/effects/CrossProcessEffect.java
ca/effect/java/android/media/effect/effects/DocumentaryEffect.java
ca/effect/java/android/media/effect/effects/DuotoneEffect.java
ca/effect/java/android/media/effect/effects/FillLightEffect.java
ca/effect/java/android/media/effect/effects/FisheyeEffect.java
ca/effect/java/android/media/effect/effects/FlipEffect.java
ca/effect/java/android/media/effect/effects/GrainEffect.java
ca/effect/java/android/media/effect/effects/GrayscaleEffect.java
ca/effect/java/android/media/effect/effects/IdentityEffect.java
ca/effect/java/android/media/effect/effects/LomoishEffect.java
ca/effect/java/android/media/effect/effects/NegativeEffect.java
ca/effect/java/android/media/effect/effects/PosterizeEffect.java
ca/effect/java/android/media/effect/effects/RedEyeEffect.java
ca/effect/java/android/media/effect/effects/RotateEffect.java
ca/effect/java/android/media/effect/effects/SaturateEffect.java
ca/effect/java/android/media/effect/effects/SepiaEffect.java
ca/effect/java/android/media/effect/effects/SharpenEffect.java
ca/effect/java/android/media/effect/effects/StraightenEffect.java
ca/effect/java/android/media/effect/effects/TintEffect.java
ca/effect/java/android/media/effect/effects/VignetteEffect.java
ca/effect/java/android/media/effect/package-info.java
ca/effect/java/android/media/effect/package.html
ca/filterfw/Android.mk
ca/filterfw/java/android/filterfw/FilterFunctionEnvironment.java
ca/filterfw/java/android/filterfw/GraphEnvironment.java
ca/filterfw/java/android/filterfw/MffEnvironment.java
ca/filterfw/java/android/filterfw/core/AsyncRunner.java
ca/filterfw/java/android/filterfw/core/CachedFrameManager.java
ca/filterfw/java/android/filterfw/core/FieldPort.java
ca/filterfw/java/android/filterfw/core/Filter.java
ca/filterfw/java/android/filterfw/core/FilterContext.java
ca/filterfw/java/android/filterfw/core/FilterFactory.java
ca/filterfw/java/android/filterfw/core/FilterFunction.java
ca/filterfw/java/android/filterfw/core/FilterGraph.java
ca/filterfw/java/android/filterfw/core/FilterPort.java
ca/filterfw/java/android/filterfw/core/FilterSurfaceView.java
ca/filterfw/java/android/filterfw/core/FinalPort.java
ca/filterfw/java/android/filterfw/core/Frame.java
ca/filterfw/java/android/filterfw/core/FrameFormat.java
ca/filterfw/java/android/filterfw/core/FrameManager.java
ca/filterfw/java/android/filterfw/core/GLEnvironment.java
ca/filterfw/java/android/filterfw/core/GLFrame.java
ca/filterfw/java/android/filterfw/core/GenerateFieldPort.java
ca/filterfw/java/android/filterfw/core/GenerateFinalPort.java
ca/filterfw/java/android/filterfw/core/GenerateProgramPort.java
ca/filterfw/java/android/filterfw/core/GenerateProgramPorts.java
ca/filterfw/java/android/filterfw/core/GraphRunner.java
ca/filterfw/java/android/filterfw/core/InputPort.java
ca/filterfw/java/android/filterfw/core/KeyValueMap.java
ca/filterfw/java/android/filterfw/core/MutableFrameFormat.java
ca/filterfw/java/android/filterfw/core/NativeAllocatorTag.java
ca/filterfw/java/android/filterfw/core/NativeBuffer.java
ca/filterfw/java/android/filterfw/core/NativeFrame.java
ca/filterfw/java/android/filterfw/core/NativeProgram.java
ca/filterfw/java/android/filterfw/core/OneShotScheduler.java
ca/filterfw/java/android/filterfw/core/OutputPort.java
ca/filterfw/java/android/filterfw/core/Program.java
ca/filterfw/java/android/filterfw/core/ProgramPort.java
ca/filterfw/java/android/filterfw/core/ProgramVariable.java
ca/filterfw/java/android/filterfw/core/ProtocolException.java
ca/filterfw/java/android/filterfw/core/RandomScheduler.java
ca/filterfw/java/android/filterfw/core/RoundRobinScheduler.java
ca/filterfw/java/android/filterfw/core/Scheduler.java
ca/filterfw/java/android/filterfw/core/SerializedFrame.java
ca/filterfw/java/android/filterfw/core/ShaderProgram.java
ca/filterfw/java/android/filterfw/core/SimpleFrame.java
ca/filterfw/java/android/filterfw/core/SimpleFrameManager.java
ca/filterfw/java/android/filterfw/core/SimpleScheduler.java
ca/filterfw/java/android/filterfw/core/StopWatchMap.java
ca/filterfw/java/android/filterfw/core/StreamPort.java
ca/filterfw/java/android/filterfw/core/SyncRunner.java
ca/filterfw/java/android/filterfw/core/VertexFrame.java
ca/filterfw/java/android/filterfw/core/package-info.java
ca/filterfw/java/android/filterfw/format/ImageFormat.java
ca/filterfw/java/android/filterfw/format/ObjectFormat.java
ca/filterfw/java/android/filterfw/format/PrimitiveFormat.java
ca/filterfw/java/android/filterfw/format/package-info.java
ca/filterfw/java/android/filterfw/geometry/Point.java
ca/filterfw/java/android/filterfw/geometry/Quad.java
ca/filterfw/java/android/filterfw/geometry/Rectangle.java
ca/filterfw/java/android/filterfw/geometry/package-info.java
ca/filterfw/java/android/filterfw/io/GraphIOException.java
ca/filterfw/java/android/filterfw/io/GraphReader.java
ca/filterfw/java/android/filterfw/io/PatternScanner.java
ca/filterfw/java/android/filterfw/io/TextGraphReader.java
ca/filterfw/java/android/filterfw/io/package-info.java
ca/filterfw/jni/Android.mk
ca/filterfw/jni/jni_gl_environment.cpp
ca/filterfw/jni/jni_gl_environment.h
ca/filterfw/jni/jni_gl_frame.cpp
ca/filterfw/jni/jni_gl_frame.h
ca/filterfw/jni/jni_init.cpp
ca/filterfw/jni/jni_native_buffer.cpp
ca/filterfw/jni/jni_native_buffer.h
ca/filterfw/jni/jni_native_frame.cpp
ca/filterfw/jni/jni_native_frame.h
ca/filterfw/jni/jni_native_program.cpp
ca/filterfw/jni/jni_native_program.h
ca/filterfw/jni/jni_shader_program.cpp
ca/filterfw/jni/jni_shader_program.h
ca/filterfw/jni/jni_util.cpp
ca/filterfw/jni/jni_util.h
ca/filterfw/jni/jni_vertex_frame.cpp
ca/filterfw/jni/jni_vertex_frame.h
ca/filterfw/native/Android.mk
ca/filterfw/native/base/logging.h
ca/filterfw/native/base/utilities.h
ca/filterfw/native/core/geometry.cpp
ca/filterfw/native/core/geometry.h
ca/filterfw/native/core/gl_buffer_interface.h
ca/filterfw/native/core/gl_env.cpp
ca/filterfw/native/core/gl_env.h
ca/filterfw/native/core/gl_frame.cpp
ca/filterfw/native/core/gl_frame.h
ca/filterfw/native/core/native_frame.cpp
ca/filterfw/native/core/native_frame.h
ca/filterfw/native/core/native_program.cpp
ca/filterfw/native/core/native_program.h
ca/filterfw/native/core/shader_program.cpp
ca/filterfw/native/core/shader_program.h
ca/filterfw/native/core/statistics.cpp
ca/filterfw/native/core/statistics.h
ca/filterfw/native/core/time_util.cpp
ca/filterfw/native/core/time_util.h
ca/filterfw/native/core/value.cpp
ca/filterfw/native/core/value.h
ca/filterfw/native/core/vertex_frame.cpp
ca/filterfw/native/core/vertex_frame.h
ca/filterfw/native/libfilterfw.mk
ca/filterpacks/Android.mk
ca/filterpacks/java/android/filterpacks/base/CallbackFilter.java
ca/filterpacks/java/android/filterpacks/base/FrameBranch.java
ca/filterpacks/java/android/filterpacks/base/FrameFetch.java
ca/filterpacks/java/android/filterpacks/base/FrameSource.java
ca/filterpacks/java/android/filterpacks/base/FrameStore.java
ca/filterpacks/java/android/filterpacks/base/GLTextureSource.java
ca/filterpacks/java/android/filterpacks/base/GLTextureTarget.java
ca/filterpacks/java/android/filterpacks/base/InputStreamSource.java
ca/filterpacks/java/android/filterpacks/base/NullFilter.java
ca/filterpacks/java/android/filterpacks/base/ObjectSource.java
ca/filterpacks/java/android/filterpacks/base/OutputStreamTarget.java
ca/filterpacks/java/android/filterpacks/base/RetargetFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/AlphaBlendFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/AutoFixFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/BitmapOverlayFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/BitmapSource.java
ca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/BlendFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/BrightnessFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ColorTemperatureFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ContrastFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/CropFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/CropRectFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/CrossProcessFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/DrawOverlayFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/DrawRectFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/DuotoneFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/FillLightFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/FisheyeFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/FixedRotationFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/FlipFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ImageCombineFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ImageEncoder.java
ca/filterpacks/java/android/filterpacks/imageproc/ImageSlicer.java
ca/filterpacks/java/android/filterpacks/imageproc/ImageStitcher.java
ca/filterpacks/java/android/filterpacks/imageproc/Invert.java
ca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/NegativeFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/PosterizeFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ResizeFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/RotateFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/SaturateFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/SepiaFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/SharpenFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/SimpleImageFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/StraightenFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/TintFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ToGrayFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ToPackedGrayFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ToRGBAFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/ToRGBFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/VignetteFilter.java
ca/filterpacks/java/android/filterpacks/imageproc/package-info.java
ca/filterpacks/java/android/filterpacks/numeric/SinWaveFilter.java
ca/filterpacks/java/android/filterpacks/numeric/package-info.java
ca/filterpacks/java/android/filterpacks/performance/Throughput.java
ca/filterpacks/java/android/filterpacks/performance/ThroughputFilter.java
ca/filterpacks/java/android/filterpacks/performance/package-info.java
ca/filterpacks/java/android/filterpacks/text/StringLogger.java
ca/filterpacks/java/android/filterpacks/text/StringSource.java
ca/filterpacks/java/android/filterpacks/text/ToUpperCase.java
ca/filterpacks/java/android/filterpacks/text/package-info.java
ca/filterpacks/java/android/filterpacks/ui/SurfaceRenderFilter.java
ca/filterpacks/java/android/filterpacks/ui/SurfaceTargetFilter.java
ca/filterpacks/java/android/filterpacks/ui/package-info.java
ca/filterpacks/java/android/filterpacks/videoproc/BackDropperFilter.java
ca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java
ca/filterpacks/java/android/filterpacks/videosink/MediaRecorderStopException.java
ca/filterpacks/java/android/filterpacks/videosrc/CameraSource.java
ca/filterpacks/java/android/filterpacks/videosrc/MediaSource.java
ca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureSource.java
ca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java
ca/filterpacks/java/android/filterpacks/videosrc/package-info.java
ca/filterpacks/native/base/geometry.cpp
ca/filterpacks/native/base/geometry.h
ca/filterpacks/native/base/time_util.cpp
ca/filterpacks/native/base/time_util.h
ca/filterpacks/native/base/utilities.h
ca/filterpacks/native/base/vec_types.h
ca/filterpacks/native/imageproc/brightness.c
ca/filterpacks/native/imageproc/contrast.c
ca/filterpacks/native/imageproc/invert.c
ca/filterpacks/native/imageproc/to_rgba.c
ca/samples/Android.mk
ca/samples/CameraEffectsRecordingSample/Android.mk
ca/samples/CameraEffectsRecordingSample/AndroidManifest.xml
ca/samples/CameraEffectsRecordingSample/java/android/media/filterfw/samples/CameraEffectsRecordingSample.java
ca/samples/CameraEffectsRecordingSample/res/drawable/android.jpg
ca/samples/CameraEffectsRecordingSample/res/layout/main.xml
ca/samples/CameraEffectsRecordingSample/res/raw/cameraeffectsrecordingsample.graph
ca/samples/CameraEffectsRecordingSample/res/values/strings.xml
ca/structgen.py
ca/tests/Android.mk
ca/tests/AndroidManifest.xml
ca/tests/src/android/camera/mediaeffects/tests/functional/EffectsVideoCapture.java
be587b52c73ab01c115feca4710a219b2eb42a18 27-Mar-2012 Jason Simmons <jsimmons@google.com> Merge "Do not call stop() on the MediaSource if it hasn't been started." into ics-aah
872e7b7073fad8295e6314c73b87d7cb3f85d39c 27-Mar-2012 Ray Chen <raychen@google.com> Fix b/5353417 Images downloaded from browser are showing incorrect details (Time is shown as dec 31 1969)

MediaScanner sets DATE_TAKEN with EXIF's datetime tag value. When this information is not available,
ExifInterface will simply return -1 which is accidentally used by MediaScanner.

Adding a check to avoid it so MediaProvider can calculate the date taken from last modified time instead.

Change-Id: I305b93a6c5602cbb9f97c3bbd384d358bda030c6
ava/android/media/MediaScanner.java
1f763f7c72ee1d9688f30ff3ddd5e930f01597fb 27-Mar-2012 Jason Simmons <jsimmons@google.com> Do not call stop() on the MediaSource if it hasn't been started.

The MediaSource's destructor will take care of stopping the source.

Bug: 6232094
Change-Id: Iace6c11ded666e7ac7066aa9d493d1b644e4b92d
ibaah_rtp/aah_tx_player.cpp
0821013609e39587e433cc22ab7aab9fb810d3a7 24-Mar-2012 Colin Cross <ccross@android.com> stagefright: compile without chromium for pdk builds

Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
ibstagefright/Android.mk
ibstagefright/chromium_http/Android.mk
b3e2e24f789d41d6c38b8ad4c252cf9f6e2122d8 26-Mar-2012 Andreas Huber <andih@google.com> Merge "Provisional support for secure decryption of media streams."
61bf87428c0f3366d0c4ec203ff96331b7ec3546 26-Mar-2012 James Dong <jdong@google.com> Merge "Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h"
a561965842d0737d0781dc03b72d88802025cd1c 26-Mar-2012 Eric Laurent <elaurent@google.com> Merge "fix visualizer inactivity detection"
9b8e496f4d143280deff137c5f30ca8907bc28db 26-Mar-2012 Andreas Huber <andih@google.com> Provisional support for secure decryption of media streams.

Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
ava/android/media/MediaCodec.java
ava/android/media/MediaExtractor.java
ni/android_media_MediaExtractor.cpp
ni/android_media_MediaExtractor.h
ni/android_media_Utils.cpp
ibmedia/Android.mk
ibmedia/ICrypto.cpp
ibmedia/IMediaPlayerService.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/Crypto.cpp
ibmediaplayerservice/Crypto.h
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/NuMediaExtractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacdec/SoftAAC.h
ibstagefright/foundation/AString.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
383c4b3e63b02dfb348db7504af0efefa7b6a682 26-Mar-2012 Eric Laurent <elaurent@google.com> Merge "reorganize SoundPool and JetPlayer code."
56ca534e65427bdefb7674060f5faa94539b6995 26-Mar-2012 Colin Cross <ccross@android.com> Merge changes Ib4d0e0c0,Iea8f4a23

* changes:
libmedia: remove skia include
stagefright: remove dependency on skia
6e43c1b51b567e7628a4442dc76e7a0e691a67ba 26-Mar-2012 James Dong <jdong@google.com> Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h

o related-to-bug: 6214141

Change-Id: I548d84a9888be884d3903dc9dea9235258792165
ibstagefright/TimedEventQueue.cpp
b4605663882a9472b2e8915c851de899b14a27a5 23-Mar-2012 Eric Laurent <elaurent@google.com> fix visualizer inactivity detection

Current method implemented by the visualizer to detect that audioflinger has
stopped providing audio buffers does not work if the application
reads pcm captures too fast.

The fix consist in implementing a method based on real time measurement only.
One drawback is that the new method makes use of system calls that add some
overhead to the process and capture functions.

Change-Id: I53bd596b856f1cc7f0f47e08413af3335227100b
ibeffects/visualizer/EffectVisualizer.cpp
f5e18125498b768d4528e4d1c19533c2b16f338b 26-Mar-2012 Eric Laurent <elaurent@google.com> reorganize SoundPool and JetPlayer code.

Reorganize SoundPool and JetPlayer code to be ready for the
creation of libmedia_native.

Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation).
Remove dependencies on nativehelper/jni.h from JetPlayer.

Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
ni/soundpool/Android.mk
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/SoundPoolThread.cpp
ni/soundpool/SoundPoolThread.h
ni/soundpool/android_media_SoundPool.cpp
ibmedia/Android.mk
ibmedia/JetPlayer.cpp
ibmedia/SoundPool.cpp
ibmedia/SoundPool.h
ibmedia/SoundPoolThread.cpp
ibmedia/SoundPoolThread.h
7061b5ffb37ea15f235effa1faaf22bb1750c7f5 26-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Speed up playlist processing"
39581f92482e000af2fe0575843d0752d164f9ae 26-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "IAudioFlinger::createTrack and openRecord flags"
fe6ecdae580efef872df6f1d6b4e22db70afee20 25-Mar-2012 Colin Cross <ccross@android.com> libmedia: remove skia include

skia is not used in this file, remove the unnecessary include.

Change-Id: Ib4d0e0c0090c6b37ff8cfb816c0d8ba82a9638a4
ibmedia/IMediaMetadataRetriever.cpp
209cfdf4f6daf9c2959a3d1eef5544121c79c664 24-Mar-2012 James Dong <jdong@google.com> Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.

o related-to-bug: 6214141

Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
ibmedia/Android.mk
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
ibstagefright/chromium_http/Android.mk
ibstagefright/httplive/Android.mk
ibstagefright/matroska/Android.mk
ibstagefright/mpeg2ts/Android.mk
ibstagefright/omx/Android.mk
ibstagefright/omx/tests/Android.mk
ibstagefright/rtsp/Android.mk
ibstagefright/timedtext/Android.mk
ests/omxjpegdecoder/Android.mk
3b3a5b100b2ec63d8f6511b655c74f629b7d1981 24-Mar-2012 James Dong <jdong@google.com> Merge "VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted."
6e3bceef9c0fcc82881fd88e98b299ce0371bbfa 24-Mar-2012 James Dong <jdong@google.com> VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted.

o this is to resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni
o related-to-bug: 6214141

Change-Id: I62d08a7789ecb34d35cd22d2e6f68c3510c9bd90
ni/mediaeditor/VideoEditorMain.h
660b014daa639424e1a0bca299c5a8abfa14411c 24-Mar-2012 Yu Shan Emily Lau <yslau@google.com> Merge "Insert 2 seconds wait in each test case setup. This is the work around for the surface request race condition."
003a7569745640d700c318a463385ca5feb08728 23-Mar-2012 Yu Shan Emily Lau <yslau@google.com> Insert 2 seconds wait in each test case setup.
This is the work around for the surface request race
condition.

Change-Id: Iaf8be12cfe4eb70d0a309ad875f38427181ac4b4
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
c164faa8314c110d417b653b9926de4803bb2dda 24-Mar-2012 Marco Nelissen <marcone@google.com> Speed up playlist processing

The recent removal of the cache from MediaScanner (commit 58ef68905d67e356eb)
slowed down processing of playlists, in some cases significantly, due to every
line in a playlist prompting a query that looped over the entire audio table.

With this change, the query is only done once instead of for every line,
and the code starts iterating over the Cursor starting near the point of
the last match, instead of from the start. The latter is especially helpful
when the entire query result is too large to fit in a CursorWindow, since
it reduces the number of times that sqlite has to perform an offset query
under the hood to refil the window.

Change-Id: I9fea990b3b8c86571384de2122708fb7e809c355
ava/android/media/MediaScanner.java
a945aad739fbe8b3c212ce5aa0bbc5d8c021612d 23-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Revert "Split libmedia into libmedia and libmedia_native""
eb3be2d8c543168bf6daa97e8187a62678e6be11 23-Mar-2012 Glenn Kasten <gkasten@google.com> Revert "Split libmedia into libmedia and libmedia_native"

This reverts commit 0a3edd38df0743dcc7091bb7ebf29e7e7dadc7cb
ibmedia/Android.mk
ibmedia_native/Android.mk
0f6cb4500209adaa446656d39d8a625ac969893b 23-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Release TX Group on error.

Immedately release any TX group a player is holding upon entering the
error state. Once in the error state, the only way out for a media
player it to be completely reset (destroying the player at the
tx_player level of things). There is really no point in holding on to
a tx group once the player is in the error state.

Change-Id: If5442a32e012b5596789078b0790ed73fa842629
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
2b16bf6bdbae150a3aa0da51361e3ea9e63fd3c2 22-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Fix handling of PCM format changes.

When an audio decoder signals a format change, we were destroying our
renderer so that a new one could be created with the new format, but
we were not updating our internal format state variables with the new
format information.

This fixes issues with AAC audio with SBR extensions; in particular
content coming from Pandora. Pandora audio is currently being
delivered as AAC-LC decoding to 22.05 KHz, but with an SBR layer which
gives 44.1 KHz. Whether or not you are going to get 22.05 or 44.1
depends on if your decoder supports SBR ("High Efficiency" profile).
Stagefright does not parse the extension sample rate present in the
ESDS; instead it reports the sample rate of the base stream (22050 in
this case). Its only when the decoder decides it can handle SBR that
you get a chance to discover that the content is actually 44.1,
information it delivers via a format change status code during read.

Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I78fb89b4356004d7834629ccc82ca99c4cc7954a
ibaah_rtp/aah_decoder_pump.cpp
6f64c90c84483d108da2d2572e3be44377e6a79e 23-Mar-2012 Andreas Huber <andih@google.com> Fix the file mimetype reported by the mpeg4 extractor.

Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b
related-to-bug: 6217289
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaDefs.cpp
798cda73e173d69f7be51aa9123cd1917bfd5d59 23-Mar-2012 James Dong <jdong@google.com> Change Android.mk file to use the new location after /frameworks/media/libvideoeditor source files are moved

o related-to-bug: 6214141

Change-Id: Ic9f07a8558e944237ccaba4f756fcab59f84e78f
ni/mediaeditor/Android.mk
41d88d5f58ede432c7574c55b388dc390b08dc3b 22-Feb-2012 Jason Noguchi <jnoguchi@google.com> Adding camera zoom test to mediaframework stress suite.

Change-Id: I3ee72156f42cf189ff1d0bd469f83b938a6b87ff
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/CameraStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/CameraStressTest.java
6c798970ccb8759d1e613b57111daa8da0ab44c7 02-Mar-2012 Lei Zhang <rzhang@google.com> Add batch volume adjust support to adjustMasterVolume() in AudioManager and
AudioService.

Change-Id: I09b1dfc93f14ca836e1ba2a400c00caed01fd541
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
24b082f87e96c00d5c17d60c735423900be40e70 24-Feb-2012 RoboErik <epastern@google.com> Fix Audio ramping code

The audio ramping was being ignored and we were always adjusting
by the same amount.

Change-Id: Id4a6587fd488132816ae26776c0f798782470b1d
ava/android/media/AudioService.java
4355b001cb736d4aa312231ce129506a3c7f6808 22-Mar-2012 Andreas Huber <andih@google.com> Merge "Use NuPlayer for media playback everywhere"
8686938aa51a8c0005120f242cb187c25fe7bcb2 21-Sep-2011 Andreas Huber <andih@google.com> Use NuPlayer for media playback everywhere

if media.stagefright.use-nuplayer is set to true.

Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/GenericSource.cpp
ibmediaplayerservice/nuplayer/GenericSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
6becc5a811c74a20e72eb8e81fdc5d21361d2d7f 22-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Fix an issue which crept in during code review.

Fix a mistake which came in as part of a merge conflict resolution
during code review of the recent unicast mode refactor of LibAAH_RTP.
Nop packet which were supposed to carry TS transformations for the
pause state accidentally got flagged as Flush operations. The flush
packet successfully carried the TS transformation, but also had the
undesired side effect of constantly flushing the stream.

Change-Id: I4c6aa0043fc274a1d7e880ed1d19cf277f22194b
Signed-off-by: John Grossman <johngro@google.com>
ibaah_rtp/aah_tx_player.cpp
bf30911bf1894506793fccea24deca2e9208b3b4 22-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Remove enforceFrameCount"
da9deca7bab75f39a236d04b9e43d9da833ce4a0 21-Mar-2012 Marco Nelissen <marcone@google.com> Support gapless playback for mp3 and m4a

Gapless playback for appropriately tagged mp3 and m4a files.
Currently this is implemented in OMXCodec, which most players
use, but should be easy to support in other players as well by
using the SkipCutBuffer utility class.

Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/SkipCutBuffer.cpp
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/mp3dec/SoftMP3.h
222dfc784e5c5b4eb6a4770b9f46fe96eecbd65d 22-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Split libmedia into libmedia and libmedia_native"
0a3edd38df0743dcc7091bb7ebf29e7e7dadc7cb 21-Mar-2012 Glenn Kasten <gkasten@google.com> Split libmedia into libmedia and libmedia_native

This is still in the old location

Change-Id: Ic1be549b5b607cfd519cb4cecc581624510a4ee1
ibmedia/Android.mk
ibmedia_native/Android.mk
2333a27ee528e97400d41838696258f29aa48688 19-Mar-2012 Glenn Kasten <gkasten@google.com> Remove enforceFrameCount

It was only used to decide whether to issue a warning.
The warning was issued the first time track was created but
not at re-creation. Now it is a verbose message every time,
not a warning since it happens all the time with key clicks on A2DP.

Change-Id: I9d39f53c0a7eb84b666e55b1b76ff830cf8f37ba
ibmedia/AudioTrack.cpp
3e6792232aa0ce3e650eaa03529c9eb2fe023ca9 21-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Add MetaData::dumpToLog"
d0a524fb5946dbe4f27df2c235435e6f1bf805ae 21-Mar-2012 Marco Nelissen <marcone@google.com> Add MetaData::dumpToLog

Utility method for dumping the content of a MetaData object to the log.

Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
ibstagefright/MetaData.cpp
092bae63f14eac9538a5d4e60a528af255471a6f 20-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Properly handle EOS conditions.

EOS was being treated as a flush operation which was causing problems.
In particular, the transmitter was delcaring that playback was
complete early (by the clock lead time of the system, which was 1
second in this case). Also, the receiver was treating the EOS message
just like the flush message, immediately destroying the substreams
associated with the program without letting them play out first.

Change the transmitter to send the EOS message like it always does,
but have it wait until the media time of the last sample has arrived
before reporting playback complete to the app level of things.

On the receiver side of things, don't treat the EOS message like the
flush message. Instead, have the EOS message simply put the substream
into EOS mode, allowing it to signal EOS to its decoder and shut off
the isAboutToUnderflow hack.

Change-Id: Ibe3ac01044373f83edb7a5f4b70478bd78c16d11
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_rx_player_substream.cpp
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
fa9ea48ddf0d75ff9e8556299fa0e0c1fe436f6d 19-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Get rid of PipeEvent

Bionic/Android support eventfd, so there is really no reason to have
PipeEvent around any more. This change gets rid of it in LibAAH_RTP
and replaces it with eventfds.

Change-Id: I841fcb71bf5015d521d7517c69f44eac0ea92278
Signed-off-by: John Grossman <johngro@google.com>
ibaah_rtp/Android.mk
ibaah_rtp/aah_rx_player.cpp
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_tx_group.cpp
ibaah_rtp/aah_tx_group.h
ibaah_rtp/pipe_event.cpp
ibaah_rtp/pipe_event.h
ibaah_rtp/utils.h
2921612dc827073c8484316f9abd21e67285ee00 19-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Add unicast mode support to the RXPlayer

Add support for unicast mode to the AAH RXPlayer. At the API level,
things should be pretty simple. To use unicast mode, instead of
passing the multicast address and port in the data source URL, just
pass the unicast address and port of the transmitters command and
control port. For example, instead of

aahRX://224.128.60.5:8867

one might instead pass

aahRX://192.168.63.5:55476

Change-Id: I7b40716983d7a91def86dcf40f093dda4255aae3
Signed-off-by: John Grossman <johngro@google.com>
ibaah_rtp/aah_rx_player.cpp
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_tx_group.cpp
ibaah_rtp/aah_tx_group.h
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/utils.h
06938878d3fd9f66d87518f690f1770d1e7a33da 18-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Fix a stuttering audio bug.

Fix a bug discovered while working on adding unicast mode to the TX/RX
players. Also some general cleanup/consolidation regarding timeout
code.

The bug went like this. When a TX player had hit EOS, it would send
an EOS command payload to its receivers. Later, when application
level code shutdown and cleaned up the player, it would send another.
In situations where there is massive packet loss, there is a chance
that not only did both of the EOS packets get dropped, but that they
never got filled in by the retry algorithm because the receiver gave
up on the RTP gap due to an aboutToUnderflow situation in at least one
of its active substreams.

When this happens, there are two major problems. First, all of the
substreams associated with the TX player which has now gone away have
become effectively leaked. They will only get cleaned up if the
entire RTP stream (the TX Group) goes away for 10 seconds or more, or
when the RX Player itself is reset by application level code or a
fatal error. These substreams are holding decoder and renderer
resources which are probably in very short supply, which is a Bad
Thing.

Second, there is now at least one substream in the RX player which is
never going to receive another payload (its TX player source is gone),
but is still considered to be active by the rx player. Assuming that
this substream's program was in the play state when the track ended,
there is now at least one substream which is always
"aboutToUnderflow". From here on out, when the retry algorithm is
attempting to decide whether or not it has the time to attempt to fill
in a gap in the muxed RTP sequence, it always decides that it does not
have the time because of the orphaned substream which is stuck in its
about to underflow state. This effectively means that the retry
algorithm is completely shut off until the rx player gets reset
somehow (something which does not happen during normal operation).
Since the environment had to be extremely lossy to trigger this chain
of events in the first place, and its probably no better now, your
playback is just going to be chock full of gaps which produces
horrible stuttering in the presentation stage of the system.

Two new failsafes have been introduced to keep the double EOS drop
from causing this. First, a timeout has been introduced on the
substream level, in addition to the already existing RTP level
timeout. If a substream fails to receive an activity for 10 seconds
(same timeout as the master RTP timeout), it will be automatically
flushed and purged.

Second, the nature of the master RTP timeout on the transmitter side
has been changed. Instead of just sending an empty NOP command packet
to indicate that the main RTP stream is still alive, the transmitter
now sends a new time of command packet; the Active Program Update
packet. This packet contains a list of all the active program ID
attached to this TX group. Upon receiving one of these APU packets,
RX players reset the inactivity timers for all substreams which are
members of the programs listed in the packet, but they also
immediately purge any substreams associated with programs not present
in the APU.

Between the two of these, no matter how nasty and selective the packet
smashing gremlins in your system happen to be, substreams will always
eventually clean up and avoid getting stuck in a perma-stutter
situation.

Also in this CL:
+ Extract some common utility code into a utils.cpp file so that it
can be shared across the library.
+ Stop using custom timeout logic in the RXPlayer. Instead, use the
common Timeout helper class in utils.cpp.

Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I350869942074f2cae020f719c2911d9092ba8055
ibaah_rtp/Android.mk
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_rx_player_ring_buffer.cpp
ibaah_rtp/aah_rx_player_substream.cpp
ibaah_rtp/aah_tx_group.cpp
ibaah_rtp/aah_tx_group.h
ibaah_rtp/aah_tx_packet.cpp
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibaah_rtp/utils.cpp
ibaah_rtp/utils.h
42a6382f1e318fab8a4ee2cd3a8e77fc158a5744 15-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Refactor TXGroup code, add unicast mode.

Significantly refactor the TXGroup code to allow transmit groups to
operate in a unicast fanout mode in addition to the traditional pure
multicast mode. Important changes include...

+ Each transmit group active in the system now has its own socket to
send and receive traffic on. In the past, this socket was used to
listen for retry requests from clients. Now it is also used to
listen for group membership reports (IGMPv3 style) from unicast
clients. Having an individual socket per transmit group allows
unicast clients to join the group needing only the IP address and
port of the transmitters socket, and not needing any additional
"group id" to be sent to the client beforehand.
+ Setup for the transmitter is now slightly different. As before, to
setup for multicast mode, a user can call setRetransmitEndpoint
passing an IPv4 multicast address and specific port to transmit to.
It used to also be the case that a user could pass a specific
unicast address and port to transmit to as well. This is no longer
allowed. Instead, to operate in unicast mode, a user passes 0.0.0.0
(IPADDR_ANY) as the IP address. In addition, they need to pass
either 0 for a port to create a new unicast mode TX group, or they
need to pass a specific port to cause the player to attempt to use
an existing unicast mode TX group. The specific port should be the
command and control port of the TX group which was bound to when the
group was originally created.
+ A magic invoke was added to allow clients to fetch the command and
control port on which a TX Player's TX Group is listening.

The API described above is most likely temporary and should eventually
be replaced with one where TX groups are formal top level objects with
their own independent interface and life-cycle management.

Signed-off-by: John Grossman <johngro@google.com>
Change-Id: Ib4e9737c10660d36c50f1825c9824fff5390b1c7
ibaah_rtp/Android.mk
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_tx_group.cpp
ibaah_rtp/aah_tx_group.h
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ceb0909bc2c9427f4b5a2c8cad219cdb73577956 21-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Parse gapless info from mp4 files"
79314de091b2845b2678c3c166a0014f3976d865 13-Mar-2012 John Grossman <johngro@google.com> LibAAH_RTP: Change names to prepare for refactor.

Rename AAH_TXSender to AAH_TXGroup in preparation for refactoring to
support unicast retransmission.

Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I3984db27d1c61c6155d5d7cb9c38eead421b9249
ibaah_rtp/Android.mk
ibaah_rtp/aah_tx_group.cpp
ibaah_rtp/aah_tx_group.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibaah_rtp/aah_tx_sender.cpp
ibaah_rtp/aah_tx_sender.h
eb473f3627b8ae3e658e2e68849776967413a033 20-Mar-2012 Marco Nelissen <marcone@google.com> Parse gapless info from mp4 files

Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/MPEG4Extractor.h
652e18d896870c6733412b63c4c99657cc60946e 21-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Update comments"
32d72b2f538673466f6e0ebf01886412e803dc4f 21-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Whitespace"
abcc868f3a21b3f6f228b8580212848658ef4c2f 21-Mar-2012 James Dong <jdong@google.com> Merge "Handling end times of subtitles."
56aeeb8d7a7abf0b1d14a4191bc01cf63c7fc9ff 14-Mar-2012 Insun Kang <insun@google.com> Handling end times of subtitles.

Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
ibstagefright/timedtext/TimedText3GPPSource.cpp
ibstagefright/timedtext/TimedText3GPPSource.h
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/timedtext/TimedTextPlayer.h
ibstagefright/timedtext/TimedTextSRTSource.cpp
ibstagefright/timedtext/TimedTextSRTSource.h
ibstagefright/timedtext/TimedTextSource.h
dd5bd2981d6c45bf24ac949474819171ef406f13 20-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Move COM tag parsing to constructor"
7306a388cbb961154e534f37d8f5126112df6cab 20-Mar-2012 Marco Nelissen <marcone@google.com> Move COM tag parsing to constructor

Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
ibstagefright/MP3Extractor.cpp
54fa7254838748c4149f4e340f479fc4e3b2357d 20-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Parse mp3 encoder padding/delay"
2ed77701f908f63e072abd0e7eb1c4af61f9347f 19-Mar-2012 Marco Nelissen <marcone@google.com> Parse mp3 encoder padding/delay

Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag.

Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
ibstagefright/MP3Extractor.cpp
ibstagefright/XINGSeeker.cpp
ibstagefright/id3/ID3.cpp
ibstagefright/include/ID3.h
ibstagefright/include/XINGSeeker.h
485932f6afa1541caa9429835ef44a928e7ddfb1 20-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Do not set camera preview display if the surface is null."
f743e1f6abdb018fc58c467cdf35cbb8b81cf8c4 14-Mar-2012 Glenn Kasten <gkasten@google.com> Whitespace

Fix indentation, and add blank lines in key places for clarity

Change-Id: I57a0a8142394f83203161aa9b8aa9276abf3ed7c
ibmedia/AudioTrack.cpp
4d3f82e8d99558551b876ad075ad999cb92f5327 20-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Add libmedia_native"
76b6c0c1f57f5b6b5b5d46f0a835a3c36f48b7f3 14-Feb-2012 Glenn Kasten <gkasten@google.com> Update comments

Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibmedia/AudioTrack.cpp
ibmedia/JetPlayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
84569cc4e106ff4d6c6855b46e546572c5dda6b2 06-Mar-2012 Glenn Kasten <gkasten@google.com> IAudioFlinger::createTrack and openRecord flags

createTrack and openRecord don't need the "old" flags parameter,
which was either audio_policy_output_t or audio_in_acoustics_t
shifted left by 16 bits. But they do need "new" flags, which
are defined by the application use case. Initially, the only
application use case flag is timed output, but others are planned.

For output, the audio_policy_output_t flags are passed to
AudioSystem::getOutput, which returns an audio_io_handle_t, and that
handle is then passed to createTrack. So createTrack doesn't need the
old flags parameter.

For input, the audio_in_acoustics_t flags are passed to
AudioSystem::getInput, which returns an audio_io_handle_t, and that
handle is then passed to openRecord. So openRecord doesn't need the
old flags parameter.

Change-Id: I18a9870911846cca69d420c19fe6a9face2fe8c4
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
f6b8f7b34f5fe94cd1d8753ec356b967293f1f9c 19-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "audio_channel_in/out_mask_from_count"
c59d1a8f0ccbf8d95c8f29cfe9d955d081807fc9 14-Mar-2012 Wu-cheng Li <wuchengli@google.com> Do not set camera preview display if the surface is null.

MediaRecorder.setPreviewDisplay() is not required if applications
use MediaRecorder.setCamera(). Besides, this causes a problem when
apps use Camera.setPreviewTexture. Camera service thinks the
surface texture from Camera.setPreviewTexture and the surface from
MediaRecorder.setPreviewDisplay are different.

bug:5988937

Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
ava/android/media/MediaRecorder.java
ibstagefright/CameraSource.cpp
eaa08d35154b0b9d62098c80c75f2deeadf72b9e 17-Mar-2012 Eric Laurent <elaurent@google.com> am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1

* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
b388138ff2986d6883fa9331fa91ae5e18ae81a0 17-Mar-2012 Eric Laurent <elaurent@google.com> resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp

Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
c182e36c8c70a7d25965aa2d0c7ed458900f3159 16-Mar-2012 Eric Laurent <elaurent@google.com> am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1

* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
0615baffd3a1ef42cbf58058cef1d84f8d3c2f29 16-Mar-2012 Eric Laurent <elaurent@google.com> am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1

* commit '3fe7ee651db0aae9485ead227c89db1e24b9e245':
AudioTrack: relax check on minimum buffer size
4108fbc299bb0c02293ff53fa670308ed81607f7 16-Mar-2012 Andreas Huber <andih@google.com> Merge "ACodec is a little more aggressive in its error checking now."
dc63f3fe40a242c70d84c492c8c5f945b2269762 06-Mar-2012 Eric Laurent <elaurent@google.com> 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
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/AudioPlayer.cpp
0df689495a02c4a34943330099404bd8860981c9 06-Mar-2012 Eric Laurent <elaurent@google.com> 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
ibmedia/AudioTrack.cpp
ad3e7e223309ba1c1b485d722517bc1be10e27c0 16-Mar-2012 Andreas Huber <andih@google.com> ACodec is a little more aggressive in its error checking now.

Update components to do the right thing.

Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/amrnb/dec/SoftAMR.cpp
ibstagefright/codecs/g711/dec/SoftG711.cpp
ae75f994cc50837afe79d3bfbc576811e3602fef 16-Mar-2012 Glenn Kasten <gkasten@google.com> Add libmedia_native

Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
ni/Android.mk
ni/audioeffect/Android.mk
ni/soundpool/Android.mk
ibaah_rtp/Android.mk
ibmedia/Android.mk
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
996598bf30b65d5bc099f3315a8da80368e74961 16-Mar-2012 Andreas Huber <andih@google.com> Merge "Remove obsolete software codec header files and amr encoders."
949a0640d40774a9494e8aad6777d4ce223d7d7a 16-Mar-2012 Andreas Huber <andih@google.com> Remove obsolete software codec header files and amr encoders.

Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrnb/enc/Android.mk
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
ibstagefright/codecs/amrwbenc/Android.mk
ibstagefright/include/AACDecoder.h
ibstagefright/include/AMRNBDecoder.h
ibstagefright/include/AMRNBEncoder.h
ibstagefright/include/AMRWBDecoder.h
ibstagefright/include/AMRWBEncoder.h
ibstagefright/include/AVCDecoder.h
ibstagefright/include/G711Decoder.h
ibstagefright/include/M4vH263Decoder.h
ibstagefright/include/MP3Decoder.h
ibstagefright/include/VPXDecoder.h
ibstagefright/include/VorbisDecoder.h
2833eaf03acda755995b4f15a87458b153478176 16-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Skip XING/VBRI frame when decoding"
3e6038ddc935866a84b442b9be2ed4db6377637f 16-Mar-2012 Glenn Kasten <gkasten@android.com> am 97824b70: am aa1bd6de: am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location"

* commit '97824b706d8865b50faf2f09d0cf969bec0874e3':
Add empty libmedia_native in old location
aa1bd6dec676ab81e14ca428427d2b8c627c83fa 16-Mar-2012 Glenn Kasten <gkasten@android.com> am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location"

* commit 'd8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
Add empty libmedia_native in old location
f3f67bdb91e6fea8355382f565a13b4d71e4315d 16-Mar-2012 Andreas Huber <andih@google.com> Merge "Remove obsolete OMXComponentBase class"
19eb86dcbce1a9051e847d0be70ae13016d3efa8 16-Mar-2012 Andreas Huber <andih@google.com> Remove obsolete OMXComponentBase class

Change-Id: I701ff5a57b0ab49cc772c4f82d03b5005e54ec6f
ibstagefright/omx/Android.mk
ibstagefright/omx/OMXComponentBase.cpp
ibstagefright/omx/OMXComponentBase.h
4fc769e9dfd1e859a960b49102e48ed9f0d8ff38 16-Mar-2012 Marco Nelissen <marcone@google.com> Skip XING/VBRI frame when decoding

Don't send the XING/VBRI frame to the decoder, as it will result in
extra data being output. Also clean up the XING seeker code a bit.

Change-Id: I714a94180edae9bedc1bc0c96bf382fe6f928ac6
ibstagefright/MP3Extractor.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/XINGSeeker.cpp
f08cdd7fd6ffc6bab80b741b1f67884c7663ab27 15-Mar-2012 Insun Kang <insun@google.com> Fix a bug in MediaPlayer's addExternalSource().

Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
ibstagefright/AwesomePlayer.cpp
ibstagefright/timedtext/TimedTextDriver.cpp
d8cc14211a3d5597d6b5807d6c79a4631e36ba2d 16-Mar-2012 Glenn Kasten <gkasten@android.com> am 42c6d163: Merge "Add empty libmedia_native in old location"

* commit '42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
Add empty libmedia_native in old location
8d3c318b2d6690a156cc22ef6599a73bee7ed482 16-Mar-2012 Wu-cheng Li <wuchengli@google.com> Merge "Add a new camera open API that allows taking the ownership."
e6aa25bb8e29af5e3fb0a20e3b5a13896a3b0093 15-Mar-2012 Glenn Kasten <gkasten@android.com> 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
ibmedia_native/Android.mk
94a36440ba11f7e9d6d444e985a7510cb56f886b 14-Mar-2012 Glenn Kasten <gkasten@google.com> audio_channel_in/out_mask_from_count

and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count

Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_decoder_pump.h
ibeffects/preprocessing/PreProcessing.cpp
ibmedia/JetPlayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/AudioPlayer.cpp
ibstagefright/AudioSource.cpp
4513bc0f28d210a970166f6ce35c3bbab1e49522 15-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Remove dependency on audio_* location"
a1c41e13b521cdd611a8fc46e43b5ae0a2c00238 24-Feb-2012 Wu-cheng Li <wuchengli@google.com> Add a new camera open API that allows taking the ownership.

The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.

bug:5584464

Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
ibstagefright/CameraSource.cpp
77cda104ac0d2ddfff037d8166f36764e9fbc8cb 15-Mar-2012 James Dong <jdong@google.com> Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks."
4e42c5f41fdb67ec62fbecc48038c8fe30b57bcd 13-Mar-2012 Glenn Kasten <gkasten@google.com> Remove dependency on audio_* location

Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
ni/audioeffect/Android.mk
ibeffects/downmix/Android.mk
ibeffects/factory/Android.mk
ibeffects/lvm/wrapper/Android.mk
ibeffects/preprocessing/Android.mk
ibeffects/testlibs/Android.mk_
ibeffects/visualizer/Android.mk
ibmedia/Android.mk
b4115796677af33b5271d518b3e2d736b1ce7973 15-Mar-2012 Marco Nelissen <marcone@google.com> Fix Xing seeking when TOC[0] == 0

A file purchased from the Amazon mp3 store had two 0 entries at the
start of the TOC (presumably because there was a lot of silence at
the beginning, which compresses well), which made TOC based seeking
think the TOC was not valid.
b/6170518

Change-Id: Ie7135b4af06ebb925f63a374be780cf3a9404347
ibstagefright/XINGSeeker.cpp
ibstagefright/include/XINGSeeker.h
41f3f716b07265fb355ef70e89b9d7e1ad5f0a6f 16-Feb-2012 Insun Kang <insun@google.com> Defines MediaPlayer APIs to support multiple audio/video/timedtext
tracks.

o Newly introduced APIs are (MediaPlayer):
getTrackInfo() / addExternalSource() / enableTrack() / disableTrack().

o Timed text tracks are supported only, for now.

o TODOs:
- Define the audio/video behavior for enableTrack and disableTrack.
- Refactoring AwesomePlayer / TimedTextDriver so that all types of
track index can be managed in the correct order and be ready for
supporting audio/video tracks.
(MediaExtractor and MediaSource for text file might be necessary.)

Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
ava/android/media/MediaPlayer.java
ibmediaplayerservice/StagefrightPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/timedtext/TimedText3GPPSource.cpp
ibstagefright/timedtext/TimedText3GPPSource.h
ibstagefright/timedtext/TimedTextDriver.cpp
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/timedtext/TimedTextPlayer.h
ibstagefright/timedtext/TimedTextSRTSource.cpp
ibstagefright/timedtext/TimedTextSRTSource.h
ibstagefright/timedtext/TimedTextSource.cpp
ibstagefright/timedtext/TimedTextSource.h
467ec7eda8ad754d6a92d32040738b797ba5e994 14-Mar-2012 Marco Nelissen <marcone@google.com> Unhide MediaPlayer.setNextMediaPlayer

The Music apps are unbundled, so this needs to be unhidden for them to use it.

Change-Id: I24330a2d6cfa2f5fb5f9c282d28f5431b6165095
ava/android/media/MediaPlayer.java
9d4136163479a3301f9db67c733c21ccee8da97b 14-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Prepare frameworks/native/services/audioflinger"
6940484150b9ef96c93ddfb4b2dfedcaa373cb34 14-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Use correct syntax for #include <> """
58c932674c1a711136c2e921b7713a744ee62ec1 06-Mar-2012 David Deephanphongs <dpanpong@google.com> Update notice files for libstagefright codecs.
ibstagefright/codecs/aacdec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/aacdec/NOTICE
ibstagefright/codecs/aacenc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/aacenc/NOTICE
ibstagefright/codecs/aacenc/SampleCode/MODULE_LICENSE_APACHE2
ibstagefright/codecs/aacenc/SampleCode/NOTICE
ibstagefright/codecs/amrnb/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrnb/NOTICE
ibstagefright/codecs/amrnb/common/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrnb/common/NOTICE
ibstagefright/codecs/amrnb/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrnb/dec/NOTICE
ibstagefright/codecs/amrnb/enc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrnb/enc/NOTICE
ibstagefright/codecs/amrwb/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrwb/NOTICE
ibstagefright/codecs/amrwbenc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrwbenc/NOTICE
ibstagefright/codecs/amrwbenc/SampleCode/MODULE_LICENSE_APACHE2
ibstagefright/codecs/amrwbenc/SampleCode/NOTICE
ibstagefright/codecs/avc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/avc/NOTICE
ibstagefright/codecs/avc/common/MODULE_LICENSE_APACHE2
ibstagefright/codecs/avc/common/NOTICE
ibstagefright/codecs/avc/enc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/avc/enc/NOTICE
ibstagefright/codecs/common/MODULE_LICENSE_APACHE2
ibstagefright/codecs/common/NOTICE
ibstagefright/codecs/g711/MODULE_LICENSE_APACHE2
ibstagefright/codecs/g711/NOTICE
ibstagefright/codecs/g711/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/g711/dec/NOTICE
ibstagefright/codecs/m4v_h263/MODULE_LICENSE_APACHE2
ibstagefright/codecs/m4v_h263/NOTICE
ibstagefright/codecs/m4v_h263/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/m4v_h263/dec/NOTICE
ibstagefright/codecs/m4v_h263/enc/MODULE_LICENSE_APACHE2
ibstagefright/codecs/m4v_h263/enc/NOTICE
ibstagefright/codecs/mp3dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/mp3dec/NOTICE
ibstagefright/codecs/on2/MODULE_LICENSE_APACHE2
ibstagefright/codecs/on2/NOTICE
ibstagefright/codecs/on2/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/on2/dec/NOTICE
ibstagefright/codecs/vorbis/MODULE_LICENSE_APACHE2
ibstagefright/codecs/vorbis/NOTICE
ibstagefright/codecs/vorbis/dec/MODULE_LICENSE_APACHE2
ibstagefright/codecs/vorbis/dec/NOTICE
c81d31c3f801ba3d559a22c27b926ace38a7ab49 13-Mar-2012 Glenn Kasten <gkasten@google.com> Use correct syntax for #include <> ""

Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ediaserver/main_mediaserver.cpp
bd3d4dfc5bf27af400fe9586f41cea3adceecfb9 14-Mar-2012 Glenn Kasten <gkasten@google.com> Prepare frameworks/native/services/audioflinger

Part of this change will be reverted after the move is complete.

Change-Id: Ie7f6355368258f2b1344f4ef754da9151a06e41d
ediaserver/Android.mk
2e76c992bfa955cb637417005941e3e93810a99d 23-Feb-2012 Daniel Lam <dalam@google.com> SurfaceTexture: Fully refactored from BufferQueue

Cleaning up camera and media interactions as part of SurfaceTexture refactoring

Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
1c1d1e7ed7ed2673b22642c6701659146ceaa602 13-Mar-2012 Marco Nelissen <marcone@google.com> Merge "Gapless playback, step 1."
84b832054552e00257bb04997143ca33d6d100be 29-Feb-2012 Marco Nelissen <marcone@google.com> Gapless playback, step 1.

Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.

Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/AudioPlayer.cpp
7cd59760be0f2eb3127b375d5c8e06abfb0dd151 13-Mar-2012 James Dong <jdong@google.com> Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base"
18db49a46259020387c40fff36d92edc1087a366 13-Mar-2012 Glenn Kasten <gkasten@google.com> Whitespace and indentation

Fix indentation to be multiple of 4.
Make it easier to search:
sp< not sp < to
"switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.

Use git diff -b or -w to verify.

Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
ibmedia/AudioEffect.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IAudioPolicyService.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/IEffect.cpp
ibmedia/IEffectClient.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/IMediaRecorderClient.cpp
ibmedia/JetPlayer.cpp
ibmedia/MediaProfiles.cpp
ibmedia/MediaScanner.cpp
ibmedia/MediaScannerClient.cpp
ibmedia/Metadata.cpp
ibmedia/ToneGenerator.cpp
ibmedia/Visualizer.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
d59e4e2b05d40b1b8729eb1180f98c81d2d66692 13-Mar-2012 Insun Kang <insun@google.com> Fixing coding style : Indentation

Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
ibstagefright/timedtext/TimedText3GPPSource.h
ibstagefright/timedtext/TimedTextSRTSource.h
e1dea48f92fd087573ac76c6acd03f5a19181ece 12-Mar-2012 James Dong <jdong@google.com> Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base

o related-to-bug: 6044887

Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
ni/Android.mk
ni/mediaeditor/Android.mk
ibaah_rtp/Android.mk
ibmedia/Android.mk
ibmedia/MediaProfiles.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/nuplayer/Android.mk
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/chromium_http/Android.mk
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/amrnb/dec/Android.mk
ibstagefright/codecs/amrnb/enc/Android.mk
ibstagefright/codecs/amrwbenc/Android.mk
ibstagefright/codecs/avc/enc/Android.mk
ibstagefright/codecs/g711/dec/Android.mk
ibstagefright/codecs/m4v_h263/dec/Android.mk
ibstagefright/codecs/m4v_h263/enc/Android.mk
ibstagefright/codecs/mp3dec/Android.mk
ibstagefright/codecs/on2/dec/Android.mk
ibstagefright/codecs/on2/h264dec/Android.mk
ibstagefright/codecs/vorbis/dec/Android.mk
ibstagefright/colorconversion/Android.mk
ibstagefright/httplive/Android.mk
ibstagefright/matroska/Android.mk
ibstagefright/mpeg2ts/Android.mk
ibstagefright/omx/Android.mk
ibstagefright/omx/OMXMaster.h
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/SoftOMXPlugin.h
ibstagefright/omx/tests/Android.mk
ibstagefright/rtsp/Android.mk
ibstagefright/tests/Android.mk
ests/omxjpegdecoder/Android.mk
b9e8d86b74efe014945e8dd57d0d3fb52aa766f1 13-Mar-2012 James Dong <jdong@google.com> Merge "Removed the include header path since it is not needed."
4d367c54d1b7394a470849c4c86e80ebc491f388 12-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "MediaPlayer doc for setDataSource by file pathname"
b8f8809472e075a5b0318cf43b86e3dfb1bab082 12-Mar-2012 Andreas Huber <andih@google.com> Merge "Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec."
c52b980277f08aee7981b1fdbca7a89464cf66d9 12-Mar-2012 Andreas Huber <andih@google.com> Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.

and MediaExtractor.readSampleData now works with a non-direct byte buffer.

Change-Id: Ifbe5c152d9550c34d3b1d493e12a223eb98e8b4e
ava/android/media/MediaCodec.java
ava/android/media/MediaExtractor.java
ni/android_media_MediaCodec.cpp
ni/android_media_MediaExtractor.cpp
1b5fa0f811c939cf9db4318ca7de5cdece1398fd 12-Mar-2012 James Dong <jdong@google.com> Removed the include header path since it is not needed.

o related-to-bug: 6044894

Change-Id: I15aec441dc0c75804aa33fc3e7ef977f7490922d
ni/mediaeditor/Android.mk
029d7e15f38cdd3c1941a16186c5941edc85bc3d 12-Mar-2012 James Dong <jdong@google.com> Hide deprecated MediaRecorder.java APIs

o related-to-bug: 6085208

Change-Id: I6d4d2c20756b317661c94ebe35752a040ece8283
ava/android/media/MediaRecorder.java
e94434712b32316b91ddf5fd74b26cce4ae24b5f 12-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Extend WAV extractor for multichannel"
55d1eea69451ee246a41e12a14be42878773e3cb 09-Mar-2012 Glenn Kasten <gkasten@google.com> MediaPlayer doc for setDataSource by file pathname

Change-Id: Icb5acbf75242ca2df62ccda5185f8841217653a0
ava/android/media/MediaPlayer.java
63ffeeb6b3a4d2f733c3cb1da1d8458b55bc2923 09-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Extend WAV extractor for multichannel

Support multichannel (more than 2) audio in WAV.
Support WAV_EXT format.

Change-Id: If0e6cf28cb3096f4f148ff6583f7e01db8f8a901
ibstagefright/WAVExtractor.cpp
ibstagefright/include/WAVExtractor.h
28b269f3418c27275bbf635e524ed501bfac6518 07-Mar-2012 Glenn Kasten <gkasten@google.com> Use audio_policy_output_flags_t consistently

This affects:
- IAudioFlinger::openOutput
- AudioTrack::AudioTrack
- AudioTrack::set
- apps that call these

Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
ni/soundpool/SoundPool.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/JetPlayer.cpp
ibmedia/ToneGenerator.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/AudioPlayer.cpp
df0d3ab4d03d8738a606b35bf9673950844aef4a 10-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Use AudioRecord::record_flags consistently"
c2a4a106d3a0131d5c93f8f512fc02f2a6e8b184 10-Mar-2012 Conley Owens <cco3@android.com> am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit 'ea374096511f92206c264f3f1eb0551a05a34cd5':
stagefright amrwbenc: Simplify the definition of static_vo
8f3ca6347650aa17ca06452e5ae1a76921bd2f22 10-Mar-2012 Conley Owens <cco3@android.com> am 3557654c: am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '3557654c95bae7754dcd1951ec10742b895817e2':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
c24f5ba4ee2873d6fd980229f0d24c80104d3558 10-Mar-2012 Conley Owens <cco3@android.com> am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
stagefright amrwbenc: Simplify the definition of static_vo
66da3fdce4dc61f7d1c125eda9b2e065658cc0e5 10-Mar-2012 Conley Owens <cco3@android.com> am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '972efafb90b543eea51aa5b23104d469a1bcc1fb':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
9a3f3b9db63e7e109a417c0959b8bc589ab70e04 10-Mar-2012 Conley Owens <cco3@android.com> am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
stagefright amrwbenc: Simplify the definition of static_vo
972efafb90b543eea51aa5b23104d469a1bcc1fb 10-Mar-2012 Conley Owens <cco3@android.com> am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '6db6ea02b999e86dfbddd08780eeab0034389f93':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
27fa14dfb8c2a1058980201632527e33d5e80dd1 09-Mar-2012 Andreas Huber <andih@google.com> Merge "Fix memory leak when carrying ABuffer* in AMessages."
6d679e02e4a21c9352d005aff396e12465818ef2 09-Mar-2012 Andreas Huber <andih@google.com> Fix memory leak when carrying ABuffer* in AMessages.

Change-Id: Icb4770ca238d316e6dd2d89159357a8fdb504ea9
ibstagefright/foundation/AMessage.cpp
1eb0e4a26059f2fe9bd353f04d1b646edbf38473 09-Mar-2012 Marco Nelissen <marcone@google.com> Improve AudioPlayer position reporting

The latency was not taken into account when updating mPositionTimeRealUs
inside of the fillBuffer hook, contrary to what the getRealTimeUsLocked()
method does. This caused the realTimeOffset calculated in the
getMediaTimeUs to always be negative, causing the reported position to
always be equal to mPositionTimeMediaUs, which is updated infrequently.
With this change, the reported position is updated more frequently, allowing
apps to perform smoother UI updates.

Change-Id: I61e05c1a8b53d46b9091afb0d18a6289d13a7a5e
ibstagefright/AudioPlayer.cpp
67cf093d86539d4f3db7e2a2b168c9a250c0a5b8 09-Mar-2012 Conley Owens <cco3@android.com> Merge "stagefright amrwbenc: Simplify the definition of static_vo"
6db6ea02b999e86dfbddd08780eeab0034389f93 09-Mar-2012 Conley Owens <cco3@android.com> Merge changes I00c852e4,Ib31bf028

* changes:
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
f60a5d7162e22b565e5977b5f4032b9334618269 07-Mar-2012 Glenn Kasten <gkasten@google.com> Use AudioRecord::record_flags consistently

Change-Id: I6f369a2b99eb515603bc7d5629a07db2b96783fe
ibmedia/AudioRecord.cpp
ibstagefright/AudioSource.cpp
8ac70c42507560bf6df7114e96f788c03a18bd6a 09-Mar-2012 Jeff Sharkey <jsharkey@android.com> Merge "Split Parcel JNI details away from Binder."
d10a5992f90bf915a5534de24751ca40ef2919e6 09-Mar-2012 Eric Laurent <elaurent@google.com> Merge "audio policy: use audio_devices_t when appropriate"
62ee80873b7a18525f86fb85f7a607d9bc094fb8 09-Mar-2012 Jeff Tinker <jtinker@google.com> Merge "Fix videos app bandwidth accounting for 4G streaming"
d84e1ce0b535128f03416145554fb405f9fade3e 07-Mar-2012 Jeff Sharkey <jsharkey@android.com> Split Parcel JNI details away from Binder.

This is purely a refactoring, with no change to the underlying
functionality.

Change-Id: I41b59f14e57d1cc144274a01f77658d99a1bfe02
ni/android_media_MediaPlayer.cpp
c9ab9f5c2cd1726a3b9e4176ce0504991cce2c70 08-Mar-2012 Eric Laurent <elaurent@google.com> audio policy: use audio_devices_t when appropriate

Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
a4fd93751d2dd29febfc3022319e7f250fd6b732 08-Mar-2012 Eino-Ville Talvala <etalvala@google.com> Allow multiple releases to be called on MediaActionSound.

Bug: 6136088
Change-Id: I80ff09a90cd65d874ae016d450c4cc8c6a56d387
ava/android/media/MediaActionSound.java
0de2ed3bf355fd92bcb3c169895a29c9c3db745a 08-Mar-2012 James Dong <jdong@google.com> Merge "Changed 480p and 1080p resolution documentation"
97d0ae391d9c472331301a276f2d82742bf3678f 08-Mar-2012 Dirk Dougherty <ddougherty@google.com> Merge "resolved conflicts for merge of 532679a5 to master"
e61cad321d2888f2b6b7e0322158211e3b3e0c46 08-Mar-2012 Dirk Dougherty <ddougherty@google.com> resolved conflicts for merge of 532679a5 to master

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
7ef97435971de244b37e02a2cb1be654048c2609 08-Mar-2012 Eric Laurent <elaurent@google.com> Merge "AudioService: fix system stream muted by restore"
78c914f37a9891bc24f335fcf8c628beeb9310f5 08-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "IAudioFlingerClient::ioConfigChanged param2 const"
9ac8d0c445a3ccde40c05f0f3ad0ec4e8265d4c6 07-Mar-2012 Eric Laurent <elaurent@google.com> AudioService: fix system stream muted by restore

Releases prior ICS (included) would persist the stream volumes in the
database when muted by silent mode. If the DB was backed up while in
silent mode, stream volume was backed up at 0.
When restored on a new device, the volume was restored at 0 which was
a problem for SYSTEM stream because it would never be corrected as
this stream volume is fixed.

Added a check on valid volume values when reading settings from the DB
and correct the DB if this happens.

Change-Id: Ie3b98eb74e10413c22aab7568b83ac3ace5bfc07
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
d5f07990822db3531c84755f406c1e12083aee37 07-Mar-2012 Eino-Ville Talvala <etalvala@google.com> Merge "NEW_API: Rework CameraSound into MediaActionSound, and unhide it."
e8bacb4ea0bb6b3ec3d3ff5488f3eb1c768b5f90 07-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Effect for multichannel PCM downmix to stereo"
64143abe1f4e548c66eb1df65483501d8b4498d0 02-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Effect for multichannel PCM downmix to stereo

First pass at implementing an audio effect whose role is to
downmix multichannel PCM buffers to stereo.
The effect is not handling volume changes.
The effect code here handles quad, 4.0, 5.1 and 7.1 input configurations,
to optimize the most commom configurations, and does not yet handle
generic multichanel configurations.

Change-Id: I74d04bd961348f3f0e4ae7714b70e620808a0829
ibeffects/downmix/Android.mk
ibeffects/downmix/EffectDownmix.c
ibeffects/downmix/EffectDownmix.h
ffed04ac3c1dd01d66b3e96ec1314173309e7415 01-Mar-2012 Glenn Kasten <gkasten@google.com> IAudioFlingerClient::ioConfigChanged param2 const

The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged
is used as an input. So changed it from void * to const void *.
It is then cast to const OutputDescriptor *
or const audio_stream_type_t * depending on the event.

Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlingerClient.cpp
e69095869c1b324aa20991ed1805c492c3f731e8 01-Mar-2012 Eino-Ville Talvala <etalvala@google.com> NEW_API: Rework CameraSound into MediaActionSound, and unhide it.

MediaActionSound is a helper class for applications that use the
camera, or include camera-like behavior such as taking
screenshots. This class helps applications match the sound-playing
behavior of the Camera.takePicture, MediaRecorder.start, and
MediaRecorder.stop methods.

This is useful for applications that don't use the above methods, but
still logically capture images or video, such as the panorama capture
feature and the video effects in the platform camera application.

Bug: 5029099
Change-Id: I829f6e2941f167f91f9cb506215b7232cb054958
ava/android/media/MediaActionSound.java
d1f0023ddf1633eb5d9aa98995086b0fe3080a85 06-Mar-2012 Eric Laurent <elaurent@google.com> Merge "MediaPlayerService: fix AudioSink latency"
54682583ba809a315ac1e5437d7f74483e6c7ab8 06-Mar-2012 Eric Laurent <elaurent@google.com> Merge "AudioTrack: relax check on minimum buffer size"
b7fdddab0d1cfa666747a0295fcea4bfea709737 06-Mar-2012 James Dong <jdong@google.com> Merge "Remove unused code - MediaSourceSplitter"
46c92df26d22954f91ff5afc271c1f3b690965cf 06-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Remove references to sched_policy.h"
a00c2939c7263fe421c33364a17e489c7c3a4d1f 06-Mar-2012 James Dong <jdong@google.com> Changed 480p and 1080p resolution documentation

o related-to-bug: 6041794

Change-Id: I01c52ec68c715c46c3ce9e778dbc6ac1f74685b6
ava/android/media/CamcorderProfile.java
56bab8bd83c4f54f876fdd76fc241197920129db 06-Mar-2012 Dirk Dougherty <ddougherty@google.com> am 4d7bc655: Doc change: String changes for Android Market

* commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
cd83bf9420a7c4c25d562b197438f532ad897c90 06-Mar-2012 Dirk Dougherty <ddougherty@google.com> am 4d7bc655: Doc change: String changes for Android Market

* commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219 28-Jan-2012 Dirk Dougherty <ddougherty@google.com> Doc change: String changes for Android Market

Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
ibstagefright/codecs/m4v_h263/dec/src/vop.cpp
5fe705796026a174cb20bee840e03186a3eef7de 06-Mar-2012 James Dong <jdong@google.com> Remove unused code - MediaSourceSplitter

Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
ibstagefright/Android.mk
ibstagefright/MediaSourceSplitter.cpp
5298321df2f3d0b3e9747f0841ef565d3524134c 06-Mar-2012 Glenn Kasten <gkasten@google.com> Remove references to sched_policy.h

As part of scheduling policy cleanup, remove obsolete
references to sched_policy.h and its APIs.

Change-Id: Id957d11dd645cdf9d53dd6c02e568369aef23243
ibstagefright/TimedEventQueue.cpp
380b70592458ebab017c6521e4b6738955ba48ba 06-Mar-2012 Eric Laurent <elaurent@google.com> 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
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/AudioPlayer.cpp
bd6b74ce4626c6738bec3d59f7cca95655d1288f 06-Mar-2012 Eric Laurent <elaurent@google.com> 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
ibmedia/AudioTrack.cpp
4ed260feda32f6c51dd018e1c012e39aa63e61d4 02-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Add channel mask in AudioSink

Add support for specifying a channel mask when opening an AudioSink.
This parameter does not replace the channel count parameter in order
to not have to duplicate the logic to derive a mask from the
channel count everywhere an AudioSink is used without a known mask.

A mask of 0 (CHANNEL_MASK_USE_CHANNEL_ORDER) means a mask will
be automatically derived from the number of channels.

Update existing AudioSink implementations to use the channel mask,
and users of AudioSink to specify the mask if available, and
CHANNEL_MASK_USE_CHANNEL_ORDER otherwise.

Change-Id: Ifa9bd259874816dbc25ead2b03ea52e873cff474
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/AudioPlayer.cpp
d674dd50b7caf57aa8c9e7e4bc75c92d5f576167 02-Mar-2012 Lei Zhang <rzhang@google.com> Add batch volume adjust support to adjustMasterVolume() in AudioManager and
AudioService.

Change-Id: I34382839622a5cc5f2a8768aed011e8224cadff9
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ae0b36f93f48bdf4f54e42a2ee25e99741f3c966 02-Mar-2012 Jean-Michel Trivi <jmtrivi@google.com> Correct GUID errors in audio effect configuration

Correct erroneous spaces that were present in some audio effect GUIDs.

Change-Id: Ide3a1552b2f8976f96ee980f1341f935555656d9
ibeffects/data/audio_effects.conf
d9c3217eff69f58f644bb80862dddc0cd8ac3881 02-Mar-2012 Andreas Huber <andih@google.com> Merge "Remove hacks that worked around issues in OMX components several releases back."
8790b57588171126fbdaba1a65ba9269be2a5baf 02-Mar-2012 Yu Shan Emily Lau <yslau@google.com> 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.
a4c8511218c223a1b1d07c014cf9f778108ccd82 02-Mar-2012 Jean-Baptiste Queru <jbq@google.com> 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
adbe671920f2f7f346bbcb3d06ad1fba7403a455 02-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '715c78b933f8dec04882ebb73acd61fdd42c6c64':
stagefright aacenc: Safeguard against overwriting bits
9154f2d90287a2eb5fe02b0b35475bd0046f6a4a 02-Mar-2012 Andreas Huber <andih@google.com> Remove hacks that worked around issues in OMX components several releases back.

Change-Id: I89bb3d0be4d2c1824de382aedfdd4f9bd2547dbc
ibstagefright/OMXCodec.cpp
720aa282791ef9405d39a15f419a41ab24f11e30 23-Feb-2012 John Grossman <johngro@google.com> 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>
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibaah_rtp/aah_tx_sender.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
d630f593d70b26018bb1cf6940fda5abb45e4395 19-Feb-2012 John Grossman <johngro@google.com> 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>
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_rx_player_ring_buffer.cpp
ibaah_rtp/aah_rx_player_substream.cpp
ibaah_rtp/aah_tx_packet.cpp
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibaah_rtp/aah_tx_sender.cpp
3d3864fff49715fe528b6c4a919ef75f4c2f90e2 01-Mar-2012 Andreas Huber <andih@google.com> Instead of hardcoding OMX component names in our code, support

a config file instead.

Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
ibstagefright/ACodec.cpp
ibstagefright/Android.mk
ibstagefright/MediaCodecList.cpp
ibstagefright/OMXCodec.cpp
0ddfe24a19882bb355313b6c5c14dcb0c6608365 01-Mar-2012 Yu Shan Emily Lau <yslau@google.com> 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.
e5feb487dc1f9927510081aeb75601a66a688a93 01-Mar-2012 Yu Shan Emily Lau <yslau@google.com> 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.
eb4f3256b77fe7fd783297a550a64ea441c41169 01-Mar-2012 Yu Shan Emily Lau <yslau@google.com> Set the video encoding bit rate for the media
recorder stress test.

Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
4f9063622415ea083bbd639af06e98065ce7176d 01-Mar-2012 Jean-Baptiste Queru <jbq@google.com> 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
225eec8d2a1b63dfb57bcdcf3a72ab755f0e5525 01-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
stagefright aacenc: Safeguard against overwriting bits
9734843102c074c56ac72e221db0f51ae2fa79ec 01-Mar-2012 Jean-Baptiste Queru <jbq@google.com> 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
f9d4ba77f45d8f0efe97abb28247cbca12836dca 01-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '69aae36e900cf7114c5895618747906951a11730':
stagefright aacenc: Safeguard against overwriting bits
f79760b4aa83913e37a538a2a0a42d34a9dcf2b8 29-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Shorten thread names"
d67f2cf9430810eb2bdc7b6c38b45e1ef6e1b824 29-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "AudioRecord const methods"
704131cb7e4f9cc682ea57ed569375f9f289368e 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
69aae36e900cf7114c5895618747906951a11730 29-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Safeguard against overwriting bits"
0c9aa1b6fca0210353af8a153cbb0380dc83ed2d 29-Feb-2012 Andreas Huber <andih@google.com> Merge "Separate the notion of "stop" from that of "release", i.e."
ee31e56a16324058025ee3090452c72901977d8a 29-Feb-2012 James Dong <jdong@google.com> Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."
86e3362f1589eda1b1604f9d0fa31b3a78ef8aec 28-Feb-2012 Glenn Kasten <gkasten@google.com> 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
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
4484bdd2f99a753b0801f0c13ca8a2b7bc38695a 29-Feb-2012 Andreas Huber <andih@google.com> 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
ni/android_media_MediaCodec.cpp
ibstagefright/ACodec.cpp
ibstagefright/MediaCodec.cpp
eb5698a6b98b73d6b3cc136af6eb1ad235e2420f 28-Feb-2012 Jason Noguchi <jnoguchi@google.com> 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.
743aceec4289508a8c514dae7319659cf7f278c4 28-Feb-2012 Jason Noguchi <jnoguchi@google.com> am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1

* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
365a4ca780aef550e9389f87d109c67279b93f30 28-Feb-2012 Jason Noguchi <jnoguchi@google.com> am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1

* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
bd714b6cbe8b21ed88ef37218ab18643bdf76932 25-Feb-2012 Glenn Kasten <gkasten@google.com> AudioRecord const methods

Change-Id: Ifae4fd7820b650aaca2b13c8658c292db1c46c0f
ibmedia/AudioRecord.cpp
9bb891faf47e9613bf94c3f24cb8171313ae340b 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
021df141ed8fdc0bc73b8bcb17106e2c7512b372 28-Feb-2012 Mathias Agopian <mathias@google.com> remove dependency on unneeded headers

Change-Id: I890f40c430beca055bedd95c878eb68b42f232c2
ibstagefright/colorconversion/SoftwareRenderer.cpp
f016dc1bd7f9a67adac13b0b564692dab8723392 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
b39a159392cc6408dc6ec503461b2a515de4c5cf 28-Feb-2012 Eric Laurent <elaurent@google.com> Merge "audio preprocessing: fix multiple enable problem"
f881fa517978adc7ea610a1982e0d071f1fd3425 28-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
e912404f85f9b4e10d2ba4123de5098bd6b9b0d3 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
308eb8f51f430e851c672fe5a034693995c7e95d 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
930b3c0b22341f887a2cf84c6cf65b915056660f 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
e3463238ed19a0db0b0086ea333938b4d35dac78 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
b8a098b28768bb5140ed1a66bd74d0256cd8dc3f 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
64d2ca5e21efae5c6a227e7e253642c5d51e7073 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 6b4d7bad: am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"

* commit '6b4d7bada0b1d34f93149211cb179b71c864d5d3':
stagefright amrwbenc: Remove a useless check
0b8525c9a1adad91b9ec8b9e61b18fd188716509 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 2bf76b98: am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"

* commit '2bf76b983da1d1730d685f9907d5d4fa6ea46fcd':
stagefright aacenc: Remove a stray semicolon
2ba0804164f6f288c8a863fc795c0fea08ef18a9 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
cfef1d0ac0dfd425091e4684138174d42ef4f151 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"

* commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0':
stagefright amrwbenc: Change keyword ordering
8eb14828f1cab9797539e81605e2a53e52c1386e 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
faf38b24c0255ea7492277b0aa03a401dbdbb2b8 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
163777b8be102a10f6e4a4a6c5be90eed2a479d2 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 354ac772: Merge "stagefright amrwb: Make local const arrays static"

* commit '354ac772eca0afea25dd12d233e5cdee9677888b':
stagefright amrwb: Make local const arrays static
ded8e6818dbec3f1a6589345f0d8d6b189e1ea2b 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
d91b744dedaa19a42ea9d878cfa5925cb15b2698 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
4f74be57e72cb2fbee05184f5bc00e716d0b95b3 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"

* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
stagefright aacenc: Simplify the definition of __inline
7346d73cac355f2b05051450eb1059d5e11e4ffb 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"

* commit '77576ff487e227092cdaf09db163e21f1e07604a':
stagefright amrwbenc: Remove a useless check
32901b397b590cc9133d21caab20b5ef01f0dd04 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"

* commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7':
stagefright aacenc: Remove a stray semicolon
716a051719993cae576590f6a43620697e50b3b5 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"

* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
stagefright amrwb: Make a global const array static
c1da1e1b2f18896c65df85de93a07680175c5277 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"

* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
stagefright amrwbenc: Change keyword ordering
6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
8335f1ccccedb6655d96d9d5b697a7f0938235dd 26-Feb-2012 Mathias Agopian <mathias@google.com> fix libgui header location

Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
ni/android_media_MediaCodec.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/mediaeditor/VideoEditorMain.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/IOMX.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibstagefright/ACodec.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
9e3d957599c76ba19e23fd25b75ccc02d54efe3e 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
354ac772eca0afea25dd12d233e5cdee9677888b 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwb: Make local const arrays static"
695cfe1e1e189f176fdf994f72d05a0129a66394 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
b08414134218f9013c2187bbee54d0816bffff05 23-Jun-2011 Martin Storsjo <martin@martin.st> stagefright amr: Avoid C++/C99 for loops with variable declaration

This makes the code compileable in C89 mode, too.

Change-Id: I9b76f8bfca148d1aec6081b8db139f351d64cfed
ibstagefright/codecs/amrnb/enc/src/ton_stab.cpp
ibstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp
ibstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
f7f1280e0c71d64098efb42b58a922d056164b5e 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
1a864db7723a7947b72d24e6008ba48341d0feff 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Simplify the definition of __inline"
77576ff487e227092cdaf09db163e21f1e07604a 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwbenc: Remove a useless check"
be9a705586edafcedc9fabb94d3259f882b7cbd7 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Remove a stray semicolon"
fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwb: Make a global const array static"
94ee1bf232d1f1cc97902dab1e4148eb478cd304 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwbenc: Change keyword ordering"
5aff259c61e54e441ed04bf77e3cc69a0374432d 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
3008f0329bb5a3e4ce93ec7b597893a318b5bd11 27-Feb-2012 Insun Kang <insun@google.com> Moves TimedTextDriver.h into include/media/stagefright/timedtext.

So that other players can include TimedTextDriver.h properly.

Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/timedtext/Android.mk
ibstagefright/timedtext/TimedTextDriver.cpp
ibstagefright/timedtext/TimedTextDriver.h
ibstagefright/timedtext/TimedTextPlayer.cpp
af01feafc30152baf8e0a5cfddbf02bd14731fd2 25-Feb-2012 Mathias Agopian <mathias@google.com> remove dependency on android_native{s_priv|buffer}.h

Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/SoftwareRenderer.h
1918d4353cb05fdfc59bf6244f06c5bb25102b3f 24-Feb-2012 RoboErik <epastern@google.com> Fix Audio ramping code

The audio ramping was being ignored and we were always adjusting
by the same amount.

Change-Id: I1dc122e033c382f556844c5acadcfb698c8d2092
ava/android/media/AudioService.java
3be5aad4d9560f94241d66a50a247a2f3060183b 24-Feb-2012 Andreas Huber <andih@google.com> Merge "Make sure we return input/output buffers to the codec not just while"
b5ef6e5d9466842246741a01e1592e1c11d2ab50 24-Feb-2012 Andreas Huber <andih@google.com> Make sure we return input/output buffers to the codec not just while

flushing but also while stopping.

Change-Id: I23534008b93654c9b9c022c0b1d204c2b546d566
ibstagefright/MediaCodec.cpp
dafebd6bfca7b5e5ed606661c5bacc42f12c8748 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Remove extern from table definitions

Local prototype declarations are added where no suitable ones are
available in headers.

This fixes warnings when compiling as C - while the source
files are named .cpp, they actually are compileable as pure C.

This was committed on the master branch of the opencore
repository in commit a0acb494ea6682ca966b5ebbd3676c89c56d63a6,
based on AOSP contribution 10303.

Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
ibstagefright/codecs/amrnb/common/src/bitno_tab.cpp
ibstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp
ibstagefright/codecs/amrnb/common/src/bytesused.cpp
ibstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp
ibstagefright/codecs/amrnb/common/src/gains_tbl.cpp
ibstagefright/codecs/amrnb/common/src/gray_tbl.cpp
ibstagefright/codecs/amrnb/common/src/grid_tbl.cpp
ibstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp
ibstagefright/codecs/amrnb/common/src/log2_tbl.cpp
ibstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp
ibstagefright/codecs/amrnb/common/src/lsp_tab.cpp
ibstagefright/codecs/amrnb/common/src/overflow_tbl.cpp
ibstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp
ibstagefright/codecs/amrnb/common/src/pow2_tbl.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp
ibstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp
ibstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp
ibstagefright/codecs/amrnb/common/src/window_tab.cpp
ibstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp
ibstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp
ibstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp
ibstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp
ibstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp
ibstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp
9cb864de440f3f3bc48b58eaf57c16270dfa1f6a 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Add includes for prototype declarations of tables

This was committed on the master branch of the opencore
repository in commit da3d0463c999871ee584a0d750be65be65d19b00,
based on AOSP contribution 10302.

Change-Id: I4ad5526634efecc2d2bb3d2169184b8d4d4d7671
ibstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp
ibstagefright/codecs/amrnb/common/src/grid_tbl.cpp
ibstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp
ibstagefright/codecs/amrnb/common/src/log2_tbl.cpp
ibstagefright/codecs/amrnb/common/src/lsp_tab.cpp
ibstagefright/codecs/amrnb/common/src/pow2_tbl.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp
ibstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp
ibstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp
ibstagefright/codecs/amrnb/common/src/window_tab.cpp
ibstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp
ibstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp
ibstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp
ibstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp
ibstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp
67d536a971e68ccb4aaa12b5c86438c79e421902 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Add missing const qualifier to table declarations in headers

This was committed on the master branch of the opencore
repository in commit 5ce7a6fdf125116ffce2e692e14eafef1c807628,
based on AOSP contribution 10301.

Change-Id: Ie32b32c7407f449e382c0b4fd2d60a664e0daa33
ibstagefright/codecs/amrnb/common/include/az_lsp.h
ibstagefright/codecs/amrnb/common/include/inv_sqrt.h
ibstagefright/codecs/amrnb/common/include/log2_norm.h
ibstagefright/codecs/amrnb/common/include/pow2.h
ibstagefright/codecs/amrnb/common/include/sqrt_l.h
7a60831412d6c3e9474db74aa0226aba87825427 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrwb: Make a global const array static

This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C. Prior to this,
this table produced multiple definitions of the same symbol.

This was committed on the master branch of the opencore
repository in commit a803bd49a631317e0d52ff060cf1799f7741a47e,
based on AOSP contribution 10017.

Change-Id: Id76274964242b119ab61b8181e557477df1e1521
ibstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h
b3094e4a0ea10c31643acd6422c2b214d4c14f80 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrwb: Make local const arrays static

Some of these tables exist in both the amrnb and amrwb libraries,
but with different content.

This avoids some cases of multiple definitions of symbols, if
linking in both libraries statically into the same executable,
if the libraries are built as C. (As C++, the local symbols
get mangled so they don't conflict with the external C symbols
in amrnb, that are unmangled.)

Most of this was committed on the master branch of the opencore
repository in commit 0cd4b3ac412dd0a8370ce339e89cf346c6cfe395,
based on AOSP contribution 10016.

Change-Id: I5387e699ce54a56dc43fcfa0396dee5c99280fd9
ibstagefright/codecs/amrwb/src/homing_amr_wb_dec.cpp
ibstagefright/codecs/amrwb/src/isp_isf.cpp
ibstagefright/codecs/amrwb/src/phase_dispersion.cpp
ab0149852b0d315633304856840bd0e8ae45af45 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrwb: Change a C++ style cast into a C style cast

This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C (except for this
cast).

This was committed on the master branch of the opencore
repository in commit ae27d9b2ef68c4e6fc383a8cab93d6baa235ff6b,
based on AOSP contribution 10014.

Change-Id: I4f533313be041ad3e0a03ffc5f4207480894ddd1
ibstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
6b48f088b1e0bed242118422c88fea8d714307e0 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"

* commit 'ed7e1e830165678421ee7d1b3dac044214a6e635':
stagefright aacenc: Make the bits to write in WriteBits unsigned
26d9944e3f75123708ef0cfb158f48709348a361 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"

* commit '6a300a5413898ff8b728e77c5a23290cae60e9b5':
stagefright aacenc: Make the bits to write in WriteBits unsigned
a9e1747f9eeb9df24975e117510994351f1579da 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Remove a stray semicolon

This avoids warnings about an empty body in an if statement.

mem_free does the same null check, so the accidental extra
semicolon was harmless, and the whole if statement actually
is needless. But if removing the if statements, all the
other ones should be removed too, for consistency.
(This could be done as a separate change).

Change-Id: I1b6064dedd15ffa949043bb5396148aaed9b43f6
ibstagefright/codecs/aacenc/src/qc_main.c
e3c3499468551f6b19da44db199448563992ad45 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Add prototypes for arm specific implementations of functions

The arm specific functions are implemented in .s files,
without any function declarations in headers.

This fixes compiler warnings about implicit declarations
of these functions.

Change-Id: I1512560b6740c1879f378886e05aaad2e3a6c869
ibstagefright/codecs/aacenc/src/transform.c
4a12db6d4eed3da17a0a872f6818051e6a65bf2d 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Change keyword ordering

This avoids warnings about 'static' not being at the beginning
of the declarations.

Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
ibstagefright/codecs/amrwbenc/inc/isp_isf.tab
30b0bb41f5c1565ab43af6d049fa1d44fa5af777 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Remove a useless check

Since the Length field is unsigned, the comparison will always
be false. The corresponding code in the aac encoder doesn't have
any check for Length.

This avoids a warning about comparison always being false.

Change-Id: I57c28ff9d09cb9ac4effeaeb40db608ab976acc6
ibstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
126d0ce0cba5ee32210f7573c5def40136f5ebb8 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 70450553: am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"

* commit '70450553f8f1e6ec4967f86a4b811db2940e8772':
stagefright aacenc: Fix an inline asm constraint
0f7f115a5ac2fed6c92f42663de3795bea70282f 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 78fc0c0b: am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74

* commit '78fc0c0bfae913a4a44011225396ae525b335fb1':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
6a300a5413898ff8b728e77c5a23290cae60e9b5 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
2accfc110a71add56f5e4c35228e88dfa3024676 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"

* commit 'd6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
c4aa19a578b8a11bea225994c58116b407e63a69 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> 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
d6a25154d94c48ab2ef12641c789458ab14ca94f 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix an inline asm constraint"
64c2263428e1a2a49cd48e79389c6aebc1c9e49f 24-Feb-2012 Andreas Huber <andih@google.com> Merge "Small fix to MediaCodec"
ea227787253e29da2d688399b097e05708d3bf73 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge changes I903353c5,I822dcc74

* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
46f465c25f258ea49a1071e0e12d520f8b038a91 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 15278119: am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"

* commit '1527811984557ee0b5d6e476e84ed147e073cb45':
stagefright aacenc: Zero-initialize a struct
5f83b95705fa84b87b498d67f3b1b8dc34038474 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"

* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
ff7629263be1d7c3b0364df3df6a67c4598f7d4a 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

* commit '4de803c76d4afd0f542c086b555b71729b3c5796':
stagefright aacenc: Avoid warnings about incompatible pointer types
bf45bbf3b4a54976b81234ffc8ac41520bc052fc 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Zero-initialize a struct"
e7650c327980f15c6cd53ad0081a54d78c3248f0 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
394906170cbee383aef01acf17dfffece3de1cae 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 307f47aa: am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"

* commit '307f47aa5def85d0c0bb4af725ff557707c5be86':
stagefright aacenc: Add const declarations to some pointers
7ffa4546de0b9e22b4896731cdfd1655f61a0b6c 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"

* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
e5bdd24b69c4033163d478d721247691e11cea36 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
364ac60cb098f6bbed83c645b142019c38c14321 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"

* commit '5c2f1220f90ae68a064195ba3c94f1319813f32c':
stagefright aacenc: Fix inline asm
51656aa9b57f609e4879e99063a9a4e6a837e69a 24-Feb-2012 Andreas Huber <andih@google.com> Small fix to MediaCodec

Change-Id: I6bcbfd35fdf5a2b0260b8f07a630a5b380e139a0
ibstagefright/MediaCodec.cpp
47b56c5a46287ea226c05e3c0238a91f4702491a 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Add const declarations to some pointers"
aa86aa60dc5d89caf7d7edc545bc96fa133d64e8 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 1b704610: Merge "stagefright aacenc: Fix inline asm"

* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
1b7046108c0f381fa8b7efaebae02c1a2b3099b3 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix inline asm"
0862a56caeb3c6b5bdc7b658dbdd3df89993e076 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 0c96e869: am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"

* commit '0c96e8690408e3cfc12eee521a442c52f1c10b27':
stagefright aacenc: Fix inline asm constraints
d7ab4e0c42a34331620c63c8c58d0dabc658eb1a 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"

* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
bf1e85bfc8293646d57f0017afbfb0e09a1a41d7 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix inline asm constraints"
edb948b877504d19d0e603a77d87297f2c834c4f 24-Feb-2012 James Dong <jdong@google.com> Merge "Changed TimedTextInBandSource to TimedText3GPPSource."
ca88e35764e71d2cae154591e1f163fb2ef8681c 23-Feb-2012 James Dong <jdong@google.com> Fix memory leakage due to unreleased MuxOMX objects after disconnection

o related-to-bug: 5984232

Change-Id: I20cbeff6ae865e995d02342549f1e09320543740
ibstagefright/OMXClient.cpp
4aea858564c616ca2fa0ac0f881cd9d536f8d632 23-Feb-2012 John Grossman <johngro@google.com> Switch the way we configure for MediaPlayer retransmission.

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: I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibaah_rtp/aah_tx_sender.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
fa4a191d0d68c5f83fff5024d383f6a8dcd136c9 21-Feb-2012 John Grossman <johngro@google.com> Revert "Add a way to play file descriptor data sources using the A@H transmitter media player."

This reverts commit 64006cb1642b2ec0ee74c66007d869b884391fd1.

Back out this change in order to get ready to implement a longer term,
more media-team approved way of selecting a retransmit player.

Change-Id: I97b68b9859a174eab858598cb00d4445a14fbc17
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
05e8074eaa5773ca8aba1ba4f99f54ecf79f4106 23-Feb-2012 Andreas Huber <andih@google.com> Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass"
2eb7309388644db2ad3be18986804422611fd90e 23-Feb-2012 Steve Block <steveblock@google.com> Merge "Drop support for Android HTTP stack"
0de4783ae06fce301ad959f5a4a014b381f34db3 23-Feb-2012 Insun Kang <insun@google.com> Changed TimedTextInBandSource to TimedText3GPPSource.

Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
ibstagefright/timedtext/Android.mk
ibstagefright/timedtext/TimedText3GPPSource.cpp
ibstagefright/timedtext/TimedText3GPPSource.h
ibstagefright/timedtext/TimedTextInBandSource.cpp
ibstagefright/timedtext/TimedTextInBandSource.h
ibstagefright/timedtext/TimedTextSource.cpp
27c8d9ba169aa85127fac65d6df25e4335ee2fca 18-Feb-2012 Jason Noguchi <jnoguchi@google.com> Adding time lapse test to mediaframework stress suite.

Change-Id: Ia244352cd16f77c090c4f1dad6f9b09a8b3e8f47
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
5c850396b39a57baabd37a9c0c8324f1bee408ca 21-Feb-2012 Andreas Huber <andih@google.com> Add new APIs AMessage::(set|find)Buffer to make it safer to pass

ABuffer objects through messages.

Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
ni/android_media_Utils.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibstagefright/ACodec.cpp
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/MediaCodec.cpp
ibstagefright/NuMediaExtractor.cpp
ibstagefright/foundation/AMessage.cpp
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AH263Assembler.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARawAudioAssembler.cpp
ibstagefright/rtsp/MyHandler.h
0ae6b481e470877c71508292925528ff308ce415 23-Feb-2012 Andreas Huber <andih@google.com> Merge "Implementation of a java media codec interface and associated tools."
88572f7a3e9d7ef85c26865a0150f3c2041561c2 21-Feb-2012 Andreas Huber <andih@google.com> Implementation of a java media codec interface and associated tools.

Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
ava/android/media/MediaCodec.java
ava/android/media/MediaExtractor.java
ni/Android.mk
ni/android_media_MediaCodec.cpp
ni/android_media_MediaCodec.h
ni/android_media_MediaExtractor.cpp
ni/android_media_MediaExtractor.h
ni/android_media_MediaPlayer.cpp
ni/android_media_Utils.cpp
ni/android_media_Utils.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/ACodec.cpp
ibstagefright/Android.mk
ibstagefright/MediaCodec.cpp
ibstagefright/NuMediaExtractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/foundation/AMessage.cpp
be3835c64dc782c1c40ebf75badd1db47aff7b1a 22-Feb-2012 James Dong <jdong@google.com> Merge "Removed out-of-date TODO in video editor performance/stress test cases"
8c5ecd6af53ba13846d7ca9671a72c905f280f1c 22-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Fix build warning"
d5ade1364b2c9bd452400fbee52273a3826ec105 22-Feb-2012 James Dong <jdong@google.com> Removed out-of-date TODO in video editor performance/stress test cases

o also fixed a typo

Change-Id: I4f11265da77658f642e382cdfe76862d90a3b548
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java
a352d1e2418f2f43d0e0a82f73799027e304fd96 22-Feb-2012 James Dong <jdong@google.com> Merge "Allow to record time lapse videos without using setProfile()"
175b2be791a70d5b8a8535f6287dc8c60fe37221 18-Feb-2012 Glenn Kasten <gkasten@google.com> Fix build warning

warning: pointer of type 'void *' used in arithmetic
warning: enumeral and non-enumeral type in conditional expression

Change-Id: I7b8d626a636145ef648e3b5d0e77068216dd012e
ibmedia/AudioEffect.cpp
a4d205d02c0c69fd2a783ef86747058fa00e066e 22-Feb-2012 James Dong <jdong@google.com> Allow to record time lapse videos without using setProfile()

o also added a check on whether capture rate was set before starting time lapse video recording.

o related-to-bug: 6045507

Change-Id: I8e1fdc8e8931e2684ab3822dc6260db44658e87d
ava/android/media/MediaRecorder.java
ibmediaplayerservice/StagefrightRecorder.cpp
c28baf55a3501ed211a2031a4dff5f2e8808d161 22-Feb-2012 Marco Nelissen <marcone@google.com> Merge "Eliminate scanner file cache"
0acb1c32fa002a648c8090f622b0094f406d5411 16-Feb-2012 Steve Block <steveblock@google.com> Drop support for Android HTTP stack

All future releases will use the Chromium HTTP stack and maintaining two HTTP
stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we
now use V8 in all build targets (b/5495373), so we can safely drop the Android
HTTP stack.

LoadListener, HttpAuthHandlerImpl, Network, SslErrorHandlerImpl, WebViewWorker
- Android-stack specific, removed
StreamLoader, FrameLoader
- Require LoadListener, removed
CacheLoader, ContentLoader, DataLoader, FileLoader
- Extend StreamLoader, removed

BrowserFrame
- Removed methods that create LoadListener
- BrowserFrame.startLoadingResource() is called from native
CallbackProxy, WebView
- Removed calls to Network methods
CacheManager, CookieManager, CookieSyncManager, WebViewCore, WebResourceResponse
- Removed other Android-stack specific code
JniUtlil
- Removed useChromiumHttpStack()
WebViewDatabase
- Removed all code to create cookies and cache databases for Android HTTP stack

See corresponding WebKit change https://android-git.corp.google.com/g/166327.

Bug: 5495616
Change-Id: If491675516f6eb187077af4220214bb6e6a8d045
ibstagefright/Android.mk
58ef68905d67e356eb6a05176863cacfbdca75c6 15-Feb-2012 Marco Nelissen <marcone@google.com> Eliminate scanner file cache

Get rid of the file cache, since it tends to run out of memory for large
numbers of files. This slows down the scanner somewhat, but recent
optimizations more than make up for that.

With this change, the postscan phase of the media scan now only processes
playlists. Removal of entries for files that no longer exist is done as
part of the prescan.
Lookups in the file cache are replaced by simple queries, which are still
reasonably fast because of a new index recently added to the media provider
database. Note that there was a bug in the case-insensitive matching for
file cache entries, in that e.g. an uppercase a-accent-aigue would be mapped
to its lowercase version, whereas the underlying case-insensitive filesystem
treats them as different characters. Getting rid of the file cache also fixes
this issue.

Bug: 4474617
Change-Id: I39c6f1a35bb518ef7ab912e9b9401663821ef48e
ava/android/media/MediaScanner.java
13bca89cd5d78b8a6d6eca4a9a67ce2ae682de83 19-Feb-2012 John Grossman <johngro@google.com> LibAAH_RTP: Add support for AAC in MP4.

Change-Id: Ie8298eb9d253fc6ede448da87660a60d23170987
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_substream.cpp
ibaah_rtp/aah_tx_packet.cpp
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
f65934a7213b39859966a7054ea5ae1a7530dcbe 21-Feb-2012 James Dong <jdong@google.com> Merge "Limit the amount of audio record data in each buffer"
c6389e5d93ce97c0399117a7cc8afc062ed6258b 17-Feb-2012 Steve Block <steveblock@google.com> Update stagefright makefile after dropping support for JSC

Bug: 5495373
Change-Id: Ibb81196edd3a6eaa4999cf0e30a78368afb66360
ibstagefright/Android.mk
27bd8da964055446a5f0d1696f412c854aaf7b70 19-Feb-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Avoid overflows when calculating normFactor

normFactor is calculated using the saturating L_add function,
but if the value added (*psfbPeFactors) is negative, the sum
can end up negative.

*psfbPeFactors can end up negative if redThrExp is less than
*psfbNActiveLines.

In cases where *psfbPeFactors ended up negative, normFactor
became INT_MIN, causing division by zero later.

Change-Id: I00c852e457b22f7eef4d6ed1887629828057206b
ibstagefright/codecs/aacenc/src/adj_thr.c
23d3628628e4d3a89a41b6429a40745b304de8e2 19-Feb-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Avoid a division by zero

In rare cases, the result of normFactor * (*psfbNActiveLines)
could be zero, leading to a division by zero in pow2_xy.

In these cases, normFactor was INT_MIN, and if *psfbNActiveLines
was 2, the product was zero.

normFactor being INT_MIN is a bug in itself though.

Change-Id: Ib31bf02889615a7be3bd1bc028da8a7651a8dbee
ibstagefright/codecs/aacenc/src/adj_thr.c
8293e19d47376c3fb2444c942275a2876f5763c3 18-Feb-2012 Eric Laurent <elaurent@google.com> audio preprocessing: fix multiple enable problem

Do not set the effect state back to configured when a configuration
command is received while the effect is enabled. Instead just check that
the new config is the same as current config.

It is normal to receive a config command from the framework while enabled
if a new effect is added on the same session.

Change-Id: I93aa38bf60a3d7cc7729934e87ddd69bf1112cd6
ibeffects/preprocessing/PreProcessing.cpp
d72031cee315438c4728fd3f0cce1971a9f00717 10-Feb-2012 John Grossman <johngro@google.com> Upintegreate AAH TX and RX players from ICS_AAH

Upintegrate the android at home TX and RX players developed in the
ICS_AAH branch.

Change-Id: I8247d3702e30d8b0e215b31a92675d8ab28dccbb
Signed-off-by: John Grossman <johngro@google.com>
ibaah_rtp/Android.mk
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_decoder_pump.h
ibaah_rtp/aah_rx_player.cpp
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_rx_player_ring_buffer.cpp
ibaah_rtp/aah_rx_player_substream.cpp
ibaah_rtp/aah_tx_packet.cpp
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibaah_rtp/aah_tx_sender.cpp
ibaah_rtp/aah_tx_sender.h
ibaah_rtp/pipe_event.cpp
ibaah_rtp/pipe_event.h
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
3540a0197f56c4bcd7d7419f4502bfca34257de2 11-Jan-2012 John Grossman <johngro@google.com> Enhance Visualizer behavior in the case of mediaserver death.

Bring the Visualizer class into line with the SDK documentation by
returning ERROR_DEAD_OBJECT instead of ERROR_INVALID_OPERATION when
the Visualizer loses its binder connection to the mediaserver because
of a mediaserver restart.

Also add a new callback interface to allow clients to be
asynchronously notified in the case of server death. Right now, the
interface definition and the registration method are flagged as hidden
pending API council review/approval.

See http://b/issue?id=5717519 for details.

Change-Id: Ic15856f27ed5a950a583ac11ca81f79bd7e9b1a0
Signed-off-by: John Grossman <johngro@google.com>
ava/android/media/audiofx/Visualizer.java
ni/audioeffect/android_media_Visualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/IEffect.cpp
ibmedia/Visualizer.cpp
449725f9aa67136a38c7554ba76ac4e27e5e3bd3 10-Jan-2012 John Grossman <johngro@google.com> Reuse callback buffers in the Visualizer.

Don't re-allocate buffers used by Visualizer callbacks as this causes an
unacceptable amount of GC thrash. Instead, lazily allocate the buffers and only
reallocate them when the required size changes.

See http://b/issue?id=5717519 for details.

Change-Id: Ibd157ed51f30687ce7c4ef0b4003258a484e0f5d
Signed-off-by: John Grossman <johngro@google.com>
ava/android/media/audiofx/Visualizer.java
ni/audioeffect/android_media_Visualizer.cpp
d8cf2960d0828121d67ad0234c648f193a90c86a 09-Feb-2012 John Grossman <johngro@google.com> Upintegrate Audio Flinger changes from ICS_AAH

Bring in changes to audio flinger made to support timed audio tracks
and HW master volume control.

Change-Id: Ide52d48809bdbed13acf35fd59b24637e35064ae
Signed-off-by: John Grossman <johngro@google.com>
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioTrack.cpp
98ad9b9d6fd34aad487933170f50b5519313df61 16-Feb-2012 Eric Laurent <elaurent@google.com> Fix music volume regression on tablets

A regression was introduced by the change enabling per device volume:
music volume will not be completely silenced even if volume is shown at 0.

The problem is that when media volume goes to zero, silent mode is entered and
AudioService sends one message per stream/per connected device to the audiosystem
handler to mute volume on each stream. As those messages were sent with the
SENDMSG_NOOP attribute, some of them where lost.

Change-Id: Ic665b1e9dcaf09506a4ec19bf3fe6997d4b071fd
ava/android/media/AudioService.java
745fcc0571f2143dd0c1f45309bae47788612999 14-Feb-2012 James Dong <jdong@google.com> Limit the amount of audio record data in each buffer

o The size of each input buffer should be less than or equal to kMaxBufferSize
o related-to-bug: 5977032

Change-Id: I04343169aac3df56694aad4ba7967ec45337ad7e
ibstagefright/AudioSource.cpp
9ad23f7daa26c5c8aea9b122193e0c9bb7c8ced6 14-Feb-2012 Jeff Tinker <jtinker@google.com> Fix videos app bandwidth accounting for 4G streaming

Register the app uid with the WV extractor so it can
attribute bandwidth usage to the proper process.

Multi-repository commit, also changes in vendor/widevine

Change-Id: I42395fd08bf0bfc7e224745f820a714400066456
related-to-bug: 5434244
ibstagefright/AwesomePlayer.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/include/WVMExtractor.h
4f7adcf76a6f97076c05720d9c20a221a57692cb 14-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Update comments"
b3db213eb55acb661e4b9ea40bcc00af4b76fab9 19-Jan-2012 Glenn Kasten <gkasten@google.com> Update comments

We no longer put the filename at start of file.

Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
ni/soundpool/SoundPool.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioTrack.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediaplayer.cpp
f4e1bdc13e0c9bb6352e458bef283dfc7165e23f 14-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Remove dead code AudioTrack::getLoop"
6a20b26d99d40b32a711e6fd5da51da73949aa73 02-Feb-2012 Glenn Kasten <gkasten@google.com> AudioRecord and AudioTrack client tid

Inform AudioFlinger of the tid of the callback thread.

Change-Id: I670df92dd06749b057238b48ed1094b13aab720b
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
2e0f67159afa03133772d89f2d346b69a352a6eb 14-Feb-2012 Marco Nelissen <marcone@google.com> Merge "Further optimize media scanner."
d121cfcbb45cb9ca734e702861f0bdd422999cf5 13-Feb-2012 Marco Nelissen <marcone@google.com> Further optimize media scanner.

Inserts of directories can be done in bulk as long as they're inserted before
the files contained within. Extend MediaInserter to accommodate giving priority
treatment to directories.
Bulk deleting of entries can be further sped up (by a factor of ~3 in my tests)
by deleting entries in database order. Switch the file cache to use
LinkedHashMap instead of HashMap to allow iterating over the cache in database
order. Also use bindArgs to allow for better caching of sql statements.

Change-Id: Ieb9ffc4e866c6cd505bf795eb80ff5d03ffc56bd
ava/android/media/MediaInserter.java
ava/android/media/MediaScanner.java
e901a5c29b81ace1c7f185ca4e62404f03c4c43d 02-Feb-2012 Jean-Michel Trivi <jmtrivi@google.com> Playback rate on MediaPlayer

Add support for modifying the playback rate of a MediaPlayer
by altering the sample rate of its AudioTrack.
The playback rate is expressed in permille, where 1000 is the
playback at normal speed.

Change-Id: I981d060ab32f7bae7a767e82c60c88ae635dceed
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
65b8bbd3c9842588702ac3a7860851f0496ed33c 13-Feb-2012 Eric Laurent <elaurent@google.com> Merge "Fix audio preprocessing library wrapper"
f96901f8ccf7e5bdb05bb22ca1b522c381f05043 11-Feb-2012 Mike Lockwood <lockwood@google.com> Merge "Add support for non-linear ramping of master volume adjustment"
8fdaf785e2624f355c525c1370fe0837969e5072 11-Feb-2012 James Dong <jdong@google.com> Merge "Change the signature of method addTextSource() in AwesomePlayer"
9760647dd0ee67e7c20f3e9d661d2006b1df0b54 09-Feb-2012 Mike Lockwood <lockwood@google.com> Add support for non-linear ramping of master volume adjustment

Bug: 5472584

Change-Id: I1227007d1563eca739fb78b6d9595febc04a3f03
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
1ce5b26d707e0086e09af3cd0428f1b441145261 02-Feb-2012 Jason Simmons <jsimmons@google.com> Only send master volume or mute updates if the settings have changed
ava/android/media/AudioService.java
e3f5979307fa52898459d9d09ee11bc1d65a4f7f 25-Jan-2012 Jason Simmons <jsimmons@google.com> Make AudioManager.adjustMasterVolume public and hidden
ava/android/media/AudioManager.java
9063154a793b0ab38b3c5992cbaed046427b4a82 06-Jan-2012 Mike Lockwood <lockwood@google.com> Restore persisted master volume if the media server restarts

Bug: 5755071

Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
b7bd88a3b6d4a34f8dd59c41fb8ed55135840069 05-Jan-2012 Mike Lockwood <lockwood@google.com> Don't allow changing master volume when muted

Bug: 5793021

Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
5c55a051ad7d86a464fb91426f1ea3c0250e38b3 15-Dec-2011 Mike Lockwood <lockwood@google.com> Defer persisting master data to avoid excessive database writes

Bug: 5705192

Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
3194ea94348bce8e7ee9f803698d877f46f8279a 07-Dec-2011 Mike Lockwood <lockwood@google.com> Remove reference counting and client death notification for master mute

The use case for master mute is to toggle it on and off from a
KEYCODE_VOLUME_MUTE event, so this was unnecessary and prevented unmuting
in certain cases

Bug: 5724755

Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
0dc37cce9d564ae43883c8dc8672b9266b881e63 01-Dec-2011 Mike Lockwood <lockwood@google.com> AudioService: Send broadcasts when master volume and mute state change

Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
fa7b06147c2d0f0c64fa334ed5a971cbad7cdbe5 16-Nov-2011 Mike Lockwood <lockwood@android.com> AudioManager: Add wrapper methods for master volume support

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ce952c8e13c535bedde77bcdb94dfcc7508475aa 14-Nov-2011 Mike Lockwood <lockwood@android.com> AudioManager: Add support for master mute

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
4767690f09ea3447b8c5c32fb28d27650aa18e00 08-Nov-2011 Mike Lockwood <lockwood@android.com> AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.

This allows Music2 and other media apps to control master volume without changing their code

Bug: 5567694

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
385f1cafa6e55d2f4b8846746fe7fe4e8755aedd 10-Feb-2012 James Dong <jdong@google.com> Merge "Move away from MediaDebug and use ADebug instead"
1137be1a686fdfc9f02c3aca7c33f28006df4742 09-Feb-2012 Glenn Kasten <gkasten@google.com> Follow raw pointer and sp<> conventions

Unconditional delete for raw pointers.
Use "if (sp != 0)" not "if (sp.get() != 0)" or "if (sp != NULL)".
Use "if (raw != NULL)" not "if (raw)".

Change-Id: I531a8da7c37149261ed2f34b862ec4896a4b785b
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ibmedia/IAudioFlinger.cpp
ibmedia/JetPlayer.cpp
ibmedia/ToneGenerator.cpp
5dd4754f58e5e99f893749ab3bb3eda1de4cfbe7 10-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "No newline or space at end of ALOG format string"
8e9d67a1356881d7dce75c83d8c6639a562d1a7a 07-Feb-2012 James Dong <jdong@google.com> Move away from MediaDebug and use ADebug instead

Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
ibmedia/MediaProfiles.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/AACExtractor.cpp
ibstagefright/AMRExtractor.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/FileSource.cpp
ibstagefright/JPEGSource.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/MediaBufferGroup.cpp
ibstagefright/MediaSourceSplitter.cpp
ibstagefright/MetaData.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/ThrottledSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/VideoSourceDownSampler.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/colorconversion/ColorConverter.cpp
ibstagefright/id3/Android.mk
ibstagefright/id3/ID3.cpp
ibstagefright/id3/testid3.cpp
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXComponentBase.cpp
ibstagefright/omx/OMXMaster.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/tests/Android.mk
ibstagefright/omx/tests/OMXHarness.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
ibstagefright/timedtext/TimedTextInBandSource.cpp
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/yuv/YUVCanvas.cpp
ibstagefright/yuv/YUVImage.cpp
ests/omxjpegdecoder/Android.mk
ests/omxjpegdecoder/SkOmxPixelRef.cpp
ests/omxjpegdecoder/StreamSource.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.cpp
8dc1dabd254249b7ddb8743e88fdb96580ffc585 27-Oct-2011 Mike Lockwood <lockwood@android.com> VolumePanel: Add support for master volume

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
8517e46f3d3c2ce11de09aa849a8533ffc1a2026 25-Oct-2011 Mike Lockwood <lockwood@android.com> Save and restore master volume in the settings provider

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioService.java
cbdb49dc5e1b993a0bc5c68dbfb9486bfa0cd762 20-Oct-2011 Mike Lockwood <lockwood@android.com> Simple master volume support

Still needs integration with Settings (for persistence) and VolumePanel UI.

Change-Id: I9eca92c4b1ef2df2564411006a35753ab9618dce
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/IAudioService.aidl
459f40dfb3ee67ff0f0b75f5a2a7b195f62cd63c 10-Feb-2012 James Dong <jdong@google.com> move away from MediaDebug and use ADebug instead for video editor engine

Change-Id: I2c0ad6c64f1bd03bd3dfe2c87792f8089dcbc101
ni/mediaeditor/Android.mk
23cc716cc52984a926de7643cfbae0a629913436 10-Feb-2012 James Dong <jdong@google.com> Change the signature of method addTextSource() in AwesomePlayer

o avoid a unnecessary copy constructor call

Change-Id: Ib598bbe42d42a835549e2d29502c6f196f859874
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
9975229a73bfa0fcb8a189d9256add5ac7d318ee 09-Feb-2012 James Dong <jdong@google.com> Finish up B frame support in MPEG4Writer

o optimize to reduce the size of the size of the ctts box
o change the type for the time offset field in ctts table entry from int32_t to uint32_t according to the mp4 file spec
o also moved away from MediaDebug and used ADebug instead.

o related-to-bug: 4232183

Change-Id: I19364303728da64359c63169eec7487508c1d0f8
ibstagefright/MPEG4Writer.cpp
8f0f10a80a89b2071b949f13ac6ff23514366d23 09-Feb-2012 Andreas Huber <andih@google.com> Merge "Experiment with seeking to closest frame instead of closest syncframe"
713f90f3ca03b9c41bcedf1caa729e471fc3964e 09-Feb-2012 Andreas Huber <andih@google.com> Experiment with seeking to closest frame instead of closest syncframe

Also supports SEEK_CLOSEST mode in the Matroska/Webm extractor.

Change-Id: I257771648dfe41392a4cf8932f625489dcb9f234
ibstagefright/AwesomePlayer.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
e7eeace594861365b4b5de08eee2cb4c0abf06b2 09-Feb-2012 Scott Main <smain@google.com> am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit 'ec12ae9933e463181338834387caa7c58b330635':
docs: fix misc doc bugs from external issue tracker
dfa926f54bc4a8a154eb5a0a928234073da7d3fd 09-Feb-2012 Scott Main <smain@google.com> am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
79cfde69fdd9952d51d4d9915c8b7fca98331e2c 09-Feb-2012 Scott Main <smain@google.com> am 52bfc243: docs: fix misc doc bugs from external issue tracker

* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
52bfc243684b2f340da326aaa38e9021e4e3b2e6 09-Feb-2012 Scott Main <smain@google.com> docs: fix misc doc bugs from external issue tracker

Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
ava/android/media/CamcorderProfile.java
0e8392e1dc1c023cb4d14a10778ae9cca44aac86 09-Feb-2012 Mike Lockwood <lockwood@google.com> Add support for non-linear ramping of master volume adjustment

Bug: 5472584

Change-Id: Id75f8835f6693ae3fcb7ca451ada01f22faba1aa
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
0765c448ab7d51355a7b1e82d359acfcf169f481 28-Jan-2012 Glenn Kasten <gkasten@google.com> No newline or space at end of ALOG format string

Change-Id: I0bef580cbc818cb7c87aea23919d26f1446cec32
ibmedia/AudioEffect.cpp
ibmedia/MediaProfiles.cpp
ibmedia/MediaScanner.cpp
ibmedia/MediaScannerClient.cpp
ibmedia/ToneGenerator.cpp
6c9ddd2cbbdf59eaa1bdd83e7b6b0bc7d32bf7ca 08-Feb-2012 Glenn Kasten <gkasten@google.com> Remove dead code AudioTrack::getLoop

Change-Id: I868329c52f31bc20125f068500d8f892b4ec9796
ibmedia/AudioTrack.cpp
e1a409ba68087c66238c986b270c17932e39f0ba 08-Feb-2012 James Dong <jdong@google.com> Merge "Enable B frame support in MPEG4Writer"
8e0cc398e348f2c75498f813560bc73be6640371 08-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_io_handle_t consistently instead of int"
b3f04a656907abb0d89485edb24517249a0a9142 08-Feb-2012 Marco Nelissen <marcone@google.com> Merge "Delete entries in bulk"
9ff4774cac499a376a59373d5bfb5112c9a2a004 08-Feb-2012 Marco Nelissen <marcone@google.com> Delete entries in bulk

Deleting entries from the database in bulk greatly speeds up the media
scanner in some cases; removing 31k entries used to take about 2 hours,
now it takes about 15 minutes.

Change-Id: Ia8f3fd6d828289e3d67178e9ad10399ded8d70d2
ava/android/media/MediaScanner.java
39d00cb442985723295540468610b5c612d251c9 17-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_io_handle_t consistently instead of int

Other:
- add a comment to nextUniqueId
- made ThreadBase::mId const, since it is only assigned in constructor.

Change-Id: I4e8b7bec4e45badcde6274d574b8a9aabd046837
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
6731333584b3065b30a371519a14ea005057061a 30-Jan-2012 Glenn Kasten <gkasten@google.com> Effect UUID inputs passed by pointer are const

Change-Id: I1f5c338bcb7368e3dd8cd5f804b2e6d9fbe087f8
ibeffects/factory/EffectsFactory.c
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/preprocessing/PreProcessing.cpp
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/testlibs/EffectReverb.h
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/IAudioFlinger.cpp
1e3a8d3090f2a33562201f95f736949a8d2df576 08-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
09b9ba0db29aaebe682b7391d93ae179b8bd8ee8 08-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "AudioTrack declare more methods const"
16d64ad699b2dc91d5e1f149a3de645cf83ec965 08-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Declare more IAudioFlinger methods const"
7251673821202960b38742f14d8bfa122a1843d2 07-Feb-2012 James Dong <jdong@google.com> Enable B frame support in MPEG4Writer

This patch allows us to automatically detect whether ctts box is needed in MPEG4Writer.
MPEG4Writer uses ctts version 0 (non-negative offset value) store the composition time
offset on a needed basis.

Currently, the size of the ctts box is not optimized. Optimization will be addressed
in a subsequent patch.

o also changed the private method retrieveDecodingTime(bool) in OMXCodec
to getDecodingTime()

o related-to-bug: 4232183

Change-Id: Ic6dc7b25ecd258c2506ca4b9c25156e922456e51
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
8320e70fbee26dc72a23aaad498f57e2252cc7c8 07-Feb-2012 Andreas Huber <andih@google.com> Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
f047c14f23abd94b3fb04f56dded13b66236ca53 07-Feb-2012 Marco Nelissen <marcone@google.com> Merge "Make media scanner use new delete-parameter"
ac259f17a0a6ba9e363bbf0c268c5942aab392c1 07-Feb-2012 Marco Nelissen <marcone@google.com> Make media scanner use new delete-parameter

This speeds up the media scan case where many files were deleted or moved.

Change-Id: I86e6fc6d0968eebf24923c0b5587b90d309721bb
ava/android/media/MediaScanner.java
36d372fb6a35c65a441123ef31e14c086b3b4db8 05-Feb-2012 John Grossman <johngro@google.com> Explicitly manage common clock client lifetimes.

Change the CCHelper class to be an instanced instead of a static
pattern. The CCHelper instances all share an interface to the common
clock service and register/unregister a callback handler in response
to there being CCHelper instance in the system or not. This brings
usage of the CCHelper into like with the new auto-disable
functionality of the common time service. For any given process,
whenever there are CCHelper instances active, the process will
maintain a callback target to the common clock service and will be
considered to be an active client.

Also change all of the users of the CCHelper interface to manage the
lifecycle of their new CCHelper instances.

Change-Id: I7c28c5d70d9b07ba7407b4ac706e7e7d7253001b
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_decoder_pump.h
ibaah_rtp/aah_rx_player.cpp
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
c857958e8aa948809b2ddfcd322d08c87cfaa2c4 06-Feb-2012 Eric Laurent <elaurent@google.com> Fix audio preprocessing library wrapper

Fixed bug in EFFECT_CMD_GET_CONFIG command handler in
webRTC audio processing library wrapper.

Change-Id: I1d2cefa00930e549607af8dc2cf27555da8d313f
ibeffects/preprocessing/PreProcessing.cpp
f5a9f439b6560f286a9326212c8cd44034cc6d78 04-Feb-2012 James Dong <jdong@google.com> Don't call virtual function in destructor of SurfaceMediaSource

Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec
ibstagefright/SurfaceMediaSource.cpp
cea2c396c5846a77c1427b9301e712beabe3f13d 04-Feb-2012 James Dong <jdong@google.com> Merge "Don't call virtual functions in the destructor for audio and camera source classes"
232f869c99b8b33276ddad8054fc3e89e44852e5 18-Jan-2012 John Grossman <johngro@google.com> De-AAH-ify the common time service.

Bulk name change to remove references to Android@Home from the common time
service in preparation for cleanup and up-integration into the master
branch. Basically, aah_timesrv is now common_time.

Change-Id: I3d3db212f96e8ba171aa36b9c58e27e4a336cb0a
ibaah_rtp/Android.mk
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_rx_player.cpp
ibaah_rtp/aah_tx_player.cpp
7c2e37dd32d42f1398a48d2ca6a51cf2e96b9893 04-Jan-2012 Glenn Kasten <gkasten@google.com> AudioTrack declare more methods const

Change-Id: I4999e984460893961d0d8092cff17f3cf07d7214
ibmedia/AudioTrack.cpp
3f6d83a68a2d95905904b3352db677e55363591c 27-Jan-2012 Glenn Kasten <gkasten@google.com> Declare more IAudioFlinger methods const

This is just documentation, as C++ method const-ness doesn't mean anything
for a binder API. Instead, here const means "no side effects".

Change-Id: Iaa9cd2fe477db10ae9a40cac4f79f0faa9b4e5e6
ibmedia/AudioEffect.cpp
ibmedia/IAudioFlinger.cpp
4651c0ea80d0b64f8c689d8257b86414628daf9d 04-Feb-2012 James Dong <jdong@google.com> Merge "Don't call virtual functions in destructors for the writer classes"
6004df9408eee0118fa67b4cf2d7ff15b04c481f 03-Feb-2012 James Dong <jdong@google.com> Merge "Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine"
9989f3cfbbfcbde68163b2e01cd67325fe5390b6 03-Feb-2012 James Dong <jdong@google.com> Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine

o this should be reverted after the problem is fixed.
o related-to-bug: 5947347

Change-Id: Iaec4b59d2c99c975e83f0588a813e9a4bfcb7ee2
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
f55bc56490660e8eff92ff1f97607d6e78826629 03-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_in_acoustics_t consistently"
191c849283e8045a64a8f2c3472798c029416086 03-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Use ToneGenerator::tone_type consistently"
3694ec1f19070e49480afefc52b8f0a50cedcc20 28-Jan-2012 Glenn Kasten <gkasten@google.com> Use NULL not 0 for raw pointers

Use if (p != NULL) instead of if (ptr)

Change-Id: Iaec3413a59ccbf233c98fcd918cc7d70ac5da9fa
ibmedia/AudioEffect.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/ToneGenerator.cpp
08d5eb9885a9c0e7ed5c3b6ae436af15b9cf3b54 03-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "Make AudioTrack control block volume field private"
946ab0ff302608f3209a3aa50d811d54932c3d8e 03-Feb-2012 James Dong <jdong@google.com> Don't call virtual functions in the destructor for audio and camera source classes

Change-Id: Ia74ffc1c0cbd7971697f5e3c476e340ec5c7727a
ibstagefright/AudioSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
874d1f1f65a989405b3c1f692014ef2072e09f5e 02-Feb-2012 James Dong <jdong@google.com> Unhide AAC_ADTS file format

o also actually decprecated RAW_AMR file format

Change-Id: Ic8ef5b0dca6f793fddf9e79d431e79f5083f7bff
ava/android/media/MediaRecorder.java
c2240b127b6651968e51b5209a9826645009b872 03-Feb-2012 James Dong <jdong@google.com> Don't call virtual functions in destructors for the writer classes

Have not found any concrete bugs related to these calls yet, but we should avoid
calling virtual functions in destructors, regardless.

Change-Id: I2d47b79d3fb2d29f418619bee83aa147d232a5d4
ibstagefright/AACWriter.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/MPEG4Writer.cpp
72a52e7bb77efb6132e0ba81a0e19fb19af1c678 02-Feb-2012 James Dong <jdong@google.com> Merge "Removed a loop for buffer lookup"
91a7b145dfc677fa511c1aea44c1ef8b09a77e96 02-Feb-2012 Glenn Kasten <gkasten@google.com> Merge "More audio_stream_type_t"
a477bab9c3aec3cd48b633c321dcefb0d7d3f400 02-Feb-2012 Jason Simmons <jsimmons@google.com> Only send master volume or mute updates if the settings have changed

Change-Id: If12ec3b7a4b4bf5165d7538013759f07a845d8c4
ava/android/media/AudioService.java
4b80abcdd5e28deb6991bd50a208b66162f90024 02-Feb-2012 Glenn Kasten <gkasten@google.com> Remove dead mutex in AudioTrack/AudioRecord thread

The client callback threads had mutexes called AudioTrackThread::mLock
and ClientRecordThread::mLock. These mutexes were only used by start()
and stop(), and were unused by the thread itself. But start() and
stop() already have their own protection provided by AudioTrack::mLock
and AudioRecord::mLock. So the thread mutexes can be removed.

Change-Id: I098406d381645d77fba06a15511e179a327848ef
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
8ca8a69d5801ad4b809e7b9dbf53bd728820924b 02-Feb-2012 Marco Nelissen <marcone@google.com> Merge "Enable media scanner bulk inserts"
d6b3e0cc36cbe28c8d194b63227df37c76af7efa 02-Feb-2012 Marco Nelissen <marcone@google.com> Enable media scanner bulk inserts

Change-Id: I357162d0fe498a182ccb14630fe565daaa8bb0c1
ava/android/media/MediaScanner.java
99b252a4405d18bd84272582f47fd9a1ace3903e 02-Feb-2012 James Dong <jdong@google.com> Removed a loop for buffer lookup

o used the nInputPortIndex and nOutputPortIndex from header instead
of assuming that the # of ports == 2

Change-Id: I4b615912b088b4e2bac9c00e89986e811a5c58bb
ibstagefright/omx/SimpleSoftOMXComponent.cpp
175df1156154dcb889eb36c446cabed351e873db 02-Feb-2012 Eric Laurent <elaurent@google.com> Merge "modifications for new webrtc modules"
26daa02bdb0c62f8162ad8d4d771cabce8644b4a 02-Feb-2012 James Dong <jdong@google.com> Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation"
5a043534a55b9b6b0823ffb6c76d907f2a7d6023 01-Feb-2012 James Dong <jdong@google.com> Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation

o simply applying the change in commit a161af9d1e2baa3f23e32634ef7dd9b4bbce9a6c to other formats
o related-to-bug: 5947196

Change-Id: I95de10263b8ad9ec941f1d6b907fca6aeff0a90f
ibstagefright/colorconversion/ColorConverter.cpp
ca97d6b6aed346e5d2db239d5b751080794d4ba3 01-Feb-2012 Andreas Huber <andih@google.com> The AMR WB software encoder is now an OMX component.

Change-Id: Iebfb2696783a0163369ba4e8ef72e19ee76ad893
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/amrwbenc/Android.mk
ibstagefright/codecs/amrwbenc/SoftAMRWBEncoder.cpp
ibstagefright/codecs/amrwbenc/SoftAMRWBEncoder.h
ibstagefright/omx/SoftOMXPlugin.cpp
5a1f97c007db4a0c8f60453ca127944588dcc18e 31-Jan-2012 Eric Laurent <elaurent@google.com> modifications for new webrtc modules

Adapt include files path in makefile and source to new
directory structure in webrtc library.

Also changed the default AGC parameters to less extreme settings.

Change-Id: Ia6a41c816dc44645f8f867937b722eede88c06ea
ibeffects/preprocessing/Android.mk
ibeffects/preprocessing/PreProcessing.cpp
9dd295af25cb28d61ae8d7113b8342090be58362 31-Jan-2012 Andreas Huber <andih@google.com> The software AMR NB encoder is now an OMX component.

Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
ni/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/amrnb/enc/Android.mk
ibstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.cpp
ibstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.h
ibstagefright/omx/SoftOMXPlugin.cpp
324e93fcf633c577031e406e3f240faa7e4f0a25 01-Feb-2012 James Dong <jdong@google.com> Merge "add tests module tag to omx_tests"
23098685bd1bf645e3b5d426cf03a64503692330 31-Jan-2012 James Dong <jdong@google.com> add tests module tag to omx_tests

Change-Id: I5dcb5187f09a7ae980ac5857b7ade81001d459f8
ibstagefright/omx/tests/Android.mk
81bf15ac36c27f068fe770d32c247673bd98a068 31-Jan-2012 James Dong <jdong@google.com> Merge "First step of refactoring 'timedtext' code."
f6b4ca408e6690cebfd52badd6f73c01b3c45037 31-Jan-2012 Andreas Huber <andih@google.com> Slighly improve the API to discover if the OMX stack is running in the local

process.

Change-Id: Idd3c2f0d4a9542af01a3fdfd3b0bfab90e083505
ibmedia/IOMX.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/OMX.h
ibstagefright/omx/OMX.cpp
f4e98bac0ff1e43cf2f789f717ea903e9e2a3511 20-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Safeguard against overwriting bits

Previously, if bits above the lowest noBitsToWrite were
set, they would be ORed into the previous cache word,
setting unrelated bits erroneously.

This doesn't noticeably affect the performance of the
codec as a whole.

Change-Id: Ie9935533c4299b8f07cb14485f039a9be9c84016
ibstagefright/codecs/aacenc/src/bitbuffer.c
7c81e52a67a0784fd818ebb94a8bd4a2662477e0 11-Jan-2012 Insun Kang <insun@google.com> First step of refactoring 'timedtext' code.

Goal
1. Removed dependency of TimedTextPlayer on AwsomePlayer.
2. Generalized TimedTextParser to TimedTextSource and its subclasses.

Summary
1. Introduced TimedTextDriver, TimedTextPlayer (new implementation),
TimedTextSource (and its subclasses).
2. Removed TimedTextParser.

Remaining TODOs
1. Revise VideoVidew, Gallery3D app, AwesomePlayer to check if
'pause' and 'resume' works well.
2. Consider revising MediaPlayer APIs such as setParameter() ->
addTextSource(). Need more thoughts.

Change-Id: Ie0c4f15b9690102de755cef6940f8c31ccf78e27
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/timedtext/Android.mk
ibstagefright/timedtext/TimedTextDriver.cpp
ibstagefright/timedtext/TimedTextDriver.h
ibstagefright/timedtext/TimedTextInBandSource.cpp
ibstagefright/timedtext/TimedTextInBandSource.h
ibstagefright/timedtext/TimedTextParser.cpp
ibstagefright/timedtext/TimedTextParser.h
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/timedtext/TimedTextPlayer.h
ibstagefright/timedtext/TimedTextSRTSource.cpp
ibstagefright/timedtext/TimedTextSRTSource.h
ibstagefright/timedtext/TimedTextSource.cpp
ibstagefright/timedtext/TimedTextSource.h
4882355d8cff1d501ba24631eef415e5c9112d8f 31-Jan-2012 Andreas Huber <andih@google.com> Make sure our aac decoder handles this parameter.

Change-Id: I212ef0c21776b99d0c6662b118ca0ec16b1d3d5e
ibstagefright/codecs/aacdec/SoftAAC.cpp
e372593cfb973c8f8bdc46858dece9fcae9e178c 30-Jan-2012 Andreas Huber <andih@google.com> Merge "Instantiate software codecs locally whenever possible."
18ffe40289734ce5f85d9f8ab574f6792746ed5a 30-Jan-2012 Andreas Huber <andih@google.com> Instantiate software codecs locally whenever possible.

Change-Id: I58d5c30b9de9873a239e91955a8900e2c72518a7
ibstagefright/Android.mk
ibstagefright/OMXClient.cpp
f3a3b9ec9ce6cb087dd3f4358684c00be23feec1 30-Jan-2012 Marco Nelissen <marcone@google.com> Merge "Handle adding/removing/renaming nomedia paths"
62b4d5b0ca06b8075a9c79f325176e431a0fb979 22-Jun-2011 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Simplify the definition of static_vo

For GCC, all of inline, __inline and __inline__ work fine.
For MSVC, only __inline works. (__inline should also be accepted
by RVCT.)

Change-Id: Ifbb1c848b200a8c4080624a3d3bd8b6ee498edb2
ibstagefright/codecs/amrwbenc/inc/basic_op.h
832dc8f79428f11ccc1709db5bef540b87e2b4c2 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright aacenc: Avoid warnings about incompatible pointer types

Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
ibstagefright/codecs/aacenc/inc/aacenc_core.h
ibstagefright/codecs/aacenc/src/aacenc_core.c
64006cb1642b2ec0ee74c66007d869b884391fd1 30-Jan-2012 Jason Simmons <jsimmons@google.com> Add a way to play file descriptor data sources using the A@H transmitter media player.

* Added a MediaPlayer.setMediaPlayerType API that be called to specify the
desired media player implementation before calling setDataSource
* Implemented setDataSource(fd) in the AAH_TxPlayer

Change-Id: I359075d9c7d6fd699dda14eb85ec50da19307639
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
2d2d7d6f42fe22ecc2b1dc8bb96a19e503a61a20 28-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Implement a cancelation mechanism for queries."
75ea64fc54f328d37b115cfb1ded1e45c30380ed 26-Jan-2012 Jeff Brown <jeffbrown@google.com> Implement a cancelation mechanism for queries.

Added new API to enable cancelation of SQLite and content provider
queries by means of a CancelationSignal object. The application
creates a CancelationSignal object and passes it as an argument
to the query. The cancelation signal can then be used to cancel
the query while it is executing.

If the cancelation signal is raised before the query is executed,
then it is immediately terminated.

Change-Id: If2c76e9a7e56ea5e98768b6d4f225f0a1ca61c61
ava/android/media/MediaScanner.java
ava/android/mtp/MtpDatabase.java
ava/android/mtp/MtpPropertyGroup.java
b7cffb41400a3ecba1a68705a51e9127ff6b8fef 20-Jan-2012 Glenn Kasten <gkasten@google.com> More audio_stream_type_t

Change-Id: I1260259efe0aa3fc1ef13de69758aaa592e1f815
ibmedia/AudioSystem.cpp
30c918ce7fbe171944b28fc91b3f22b3d631872d 11-Nov-2011 Glenn Kasten <gkasten@google.com> Use final on new member variables

Use final for member fields initialized to a new and that are never modified.

Change-Id: I042352c7bc21879613e7a50b1205b6923f8083cf
ava/android/media/AmrInputStream.java
ava/android/media/AsyncPlayer.java
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/ExifInterface.java
ava/android/media/MediaFile.java
ava/android/media/MediaInserter.java
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerConnection.java
ava/android/media/MiniThumbFile.java
ava/android/media/RemoteControlClient.java
ava/android/media/RingtoneManager.java
23f7ad39ef52c0ac0a94934a71b6802c0a806b7f 28-Jan-2012 Glenn Kasten <gkasten@google.com> Use ToneGenerator::tone_type consistently

Also remove defaults in startToneCommand(), they're not needed and the
default for tone type was nonsense.

Change-Id: I70fa8cee4f3dbb8c66ceb3719c8d3d2f447f05b9
ibmedia/ToneGenerator.cpp
ca78f3d9aff78c35bc065b0c35a0b3c917f56435 27-Jan-2012 Marco Nelissen <marcone@google.com> Handle adding/removing/renaming nomedia paths

b/5849015
Change-Id: I3ec7419498d1ecc83db6d4605b3d7610349231f7
ava/android/media/MediaScanner.java
ava/android/mtp/MtpDatabase.java
11001c344a37ac515328133f46b80a2c92e61b6c 27-Jan-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5567648 disassociate audio mode and audio focus"
4dd3674e517051f130fef36d2eb201c68ff61094 24-Jan-2012 Jean-Michel Trivi <jmtrivi@google.com> Bug 5567648 disassociate audio mode and audio focus

Don't automatically change the audio focus when
the audio mode changes. This is best handled by the
applications that change the audio mode so they
can address their usecases as they please (for
instance to define the behavior when switching calls).
Replaced the implicit "mode to focus" behavior with
two methods to request and abandon audio focus. These
methods are only to be used by the framework, and maintain
the logic in AudioService to prevent other apps to request
audio focus during a call.
A susequent change will update com.android.internal.telephony.CallManager
to take advantage of these two methods.

Change-Id: If84ebd508e985083e8cac82ece44940c72b5c669
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
882c0a20c5ff34e320e0dd5a30b441954335adae 27-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_in_acoustics_t consistently

Change-Id: I0a9dd668fb2e57b1c3ece3190588194974b99062
ibmedia/IAudioFlinger.cpp
c14639a9a1dfda34f828e2a6d774edfe5c3c6919 27-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_source_t consistently"
0f0fbd9441f40c6f99470b89774e397f99bf61eb 23-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_source_t consistently

Was a mix of audio_source_t, uint8_t, and int.

Related fixes:
- fix comments in MediaRecorder.java
- AudioPolicyService server side was not checking source parameter at
all, so if the client wrapper was bypassed, invalid values could be
passed into audio HAL
- JNI android_media_AudioRecord_setup was checking source for positive
values, but not negative values. This test is redundant, since already
checked at Java and now checked by AudioPolicyService also, but might
as well make it correct.

Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
ava/android/media/MediaRecorder.java
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
ibstagefright/AudioSource.cpp
4bc8bfaf11839b12d88fcb40e57a1eea456aef7c 27-Jan-2012 Andreas Huber <andih@google.com> Merge "The software AAC encoder is now an OMX component."
afe02df45e6c58aa2d6779f7b51a05bf9d413446 26-Jan-2012 Andreas Huber <andih@google.com> The software AAC encoder is now an OMX component.

Yay.

Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/aacenc/SoftAACEncoder.cpp
ibstagefright/codecs/aacenc/SoftAACEncoder.h
ibstagefright/omx/SoftOMXPlugin.cpp
44094486b04d5e3c4174aa7ab5711a41d6689166 25-Jan-2012 Ben Cheng <bccheng@google.com> Preserve NEON callee-save registers d8-d15.

BUG:5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
ibstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
61bd33968f5df9e67b60ef75e271ad6f4a7702a1 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
64085d03efcd2abf3b8cd64f4e6344a1ece014c3 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
171070d25ee35fbd38cdbb989dab7a62df8ff8cf 25-Jan-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update AudioTrack.stop() javadoc"
12045502c49bfee40d7d3cb806d9b70d3b5d3ed3 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
d452520464c5a8cdd7a8d0d09b2fdb92cea1eefb 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"

* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
28091796a651b19fed6eb291cef041f08d27f886 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"

* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
a701da8ebabb3d63ac57b7718055698abb21804a 25-Jan-2012 Jean-Michel Trivi <jmtrivi@google.com> Update AudioTrack.stop() javadoc

Add more information on the behavior of
android.media.AudioTrack.stop()

Change-Id: Id0f968e6bb8fe38765a86c43fc065908ee84edf1
ava/android/media/AudioTrack.java
db8b292b6d83e360d944fd8342c82d8b7bd1facd 25-Jan-2012 Jason Simmons <jsimmons@google.com> Make AudioManager.adjustMasterVolume public and hidden

Change-Id: Ied4d07c2f67f24d1e1963f4ff30650042334d563
ava/android/media/AudioManager.java
6de8b47b54c31ef22f454e66ec5d8dc5358d59c3 25-Jan-2012 Jean-Michel Trivi <jmtrivi@google.com> Merge "More AudioManager tests"
4cd2b343272429adae1fc68e0ec0628c69e88e6d 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> 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
fc2ea24b024f7a015d67054adb7bb09ff3a0a97b 25-Jan-2012 Jean-Baptiste Queru <jbq@google.com> 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
98539a4eba7677c0b1ddc12f800c7075851ef302 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
d80cbb8c7b13203704c00e2f5941588811c15665 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Add missing newlines at the end of files"
7dd65078f6a40ed98ae8cddc5d7976d4fe629a29 17-Jan-2012 Jean-Michel Trivi <jmtrivi@google.com> More AudioManager tests

Add tests for AudioFocus:
- create a looper for AudioManager to use so listener callbacks can be used
- test each type of audio focus gain causes the expected type of focus loss
- stress test audio focus request and abandon, with and without a listener

Change-Id: I7d9c84ccd8ea49cf20ede57b1245899a81e99ab0
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioManagerTest.java
adbbf7a791599cf13494525f7a1359b0cc2dd2f9 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '10c4641c2e2f747f8fef7d217d550b7f9a6de588':
stagefright aacenc: Properly terminate a comment
2ae5805cf18ad6bdbea5def03a488e14c1a8804c 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
164a984224f5d430757628028f2522329987350f 24-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "stagefright aacenc: Properly terminate a comment"
bc4de888c12f1ad9aec8c9b2a0addaaa73dceae9 17-Jan-2012 Glenn Kasten <gkasten@google.com> Make AudioTrack control block volume field private

This is part of the process of abstracting the control block
to make it easier to maintain.

Change-Id: Idb8f461e68dab3bcf268159cc0781651c6fb7094
ibmedia/AudioTrack.cpp
865534a0e30982b0e669006509b9590fad129295 21-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix warning for redundant typedef"
0a204ed0f58a9baaac5630864cd75495486c6cbe 12-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_format_t consistently, continued

Was int or uint32_t.

When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.

Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.

Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioPolicyService.cpp
e8bb6fef58dfa94346d8a72c1eb9046d5d1f2da1 20-Jan-2012 Andreas Huber <andih@google.com> Merge "Starhub RTSP apparently does not establish time on all tracks"
475334f7bd190127fce5141960bf141f2e59e7df 20-Jan-2012 Andreas Huber <andih@google.com> Starhub RTSP apparently does not establish time on all tracks

i.e. the "SR" RTCP packet is sent for only one of the two tracks.

fake timestamps if that's the case, previously we'd only fake timestamps
if we didn't receive _any_ "SR" packets.

Change-Id: Id63d4940d453ba6c04c62e02ab9a0ad843936bc1
related-to-bug: 5669027
ibstagefright/rtsp/MyHandler.h
c79e413911d48ebf14621304655029f6cd2c7959 20-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix typos in string constants"
ea46649a1cce7447ece812e60168f2bb3db47122 20-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Remove redundant get()"
5ecff094f4df499f997bc9406c6e1a76a899aa12 20-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Move memcpy_to_i16_from_u8 to audio_utils"
70ed6b744d23dec8ec726fa86d559e8c6a2a32d6 10-Jan-2012 Glenn Kasten <gkasten@google.com> Remove redundant get()

get() is almost always unnecessary, except in a LOG.
Also no need to check for != 0 before calling get().

Change-Id: Ib06e7a503f86cf102f09acc1ffb2ad085025516d
ibmedia/AudioSystem.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/mediametadataretriever.cpp
5eaa0f6ddab911889714b60cee1fc1999fabc7be 20-Jan-2012 Glenn Kasten <gkasten@google.com> Fix warning for redundant typedef

frameworks/base/media/libmedia/autodetect.cpp:22: warning: 'typedef' was ignored in this declaration

Change-Id: I8c7404b9f5aa515c0fe92a5a46f24248d6fe96bf
ibmedia/autodetect.cpp
7524a592526a14d20ec3f3acffd61fe18afaa4b4 20-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Remove dead setRingerMode(mode, mask)"
8592baa347f5874b4f36713b6ca2edcedbb3f071 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Merge "Don't need to link to libsqlite from media JNI library."
05bd7b5dafd97bf1eb69a2b031eefa4d0ae2b2e5 20-Jan-2012 Jeff Brown <jeffbrown@google.com> Don't need to link to libsqlite from media JNI library.

Media JNI library doesn't actually use libsqlite.

Change-Id: If8017444d259779d459ef2da83119814e31454c2
ni/Android.mk
c3c36b4fe5863c8ac0ea5470be633e8fade9c483 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"

* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
Rename LOG_ASSERT to ALOG_ASSERT
12b7da69957ef894ce5134989e38479c64308ea1 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
f3f650db96d40014a0203393c585c368b0dd7a9a 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"

* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"

* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
7ae84204c14b4abff70fcc19c3c33de2591df34b 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"

* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
97aa8ee81198234aedffceaf71ad216b96323393 20-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge ee4618bc

Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
e1103cfc781b09d1a227f448374473093a451d6f 20-Jan-2012 James Dong <jdong@google.com> Remove obsolete TODO comments

Change-Id: Ie2353f11c4bbea5699cf9b824bb4b6aa113e3472
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaItemThumbnailTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaPropertiesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorAPITest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorExportTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java
f68633da3ced654a9344b5c3b82f4d1c79b6bd09 09-Jan-2012 Steve Block <steveblock@google.com> Rename LOG_ASSERT to ALOG_ASSERT

Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
ibmediaplayerservice/TestPlayerStub.cpp
c6aacce37191e1cc79cfeba13b39899f59c68c3b 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/android_media_Utils.cpp
ni/android_mtp_MtpDatabase.cpp
ni/android_mtp_MtpDevice.cpp
ni/android_mtp_MtpServer.cpp
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ni/mediaeditor/VideoEditorMain.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/android_media_SoundPool.cpp
ibeffects/preprocessing/PreProcessing.cpp
ibmedia/AudioEffect.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/JetPlayer.cpp
ibmedia/MediaProfiles.cpp
ibmedia/MediaScannerClient.cpp
ibmedia/Metadata.cpp
ibmedia/ToneGenerator.cpp
ibmedia/Visualizer.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiMetadataRetriever.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/TestPlayerStub.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/AACWriter.cpp
ibstagefright/ACodec.cpp
ibstagefright/AMRExtractor.cpp
ibstagefright/AVIExtractor.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/FileSource.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/dec/SoftAMR.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/g711/dec/SoftG711.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/foundation/AMessage.cpp
ibstagefright/httplive/LiveDataSource.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/id3/ID3.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/omx/OMXMaster.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
ibstagefright/omx/tests/OMXHarness.cpp
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/UDPPusher.cpp
ibstagefright/rtsp/rtp_test.cpp
ibstagefright/tests/DummyRecorder.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/yuv/YUVImage.cpp
tp/MtpDataPacket.cpp
tp/MtpDevice.cpp
tp/MtpPacket.cpp
tp/MtpProperty.cpp
tp/MtpServer.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.cpp
a51f0e707f1f3142358aa919ea60ad2842803139 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
ni/android_media_MediaPlayer.cpp
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPoolThread.cpp
ibeffects/factory/EffectsFactory.c
ibeffects/preprocessing/PreProcessing.cpp
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/IOMX.cpp
ibmedia/MediaProfiles.cpp
ibmedia/MediaScanner.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/ACodec.cpp
ibstagefright/AVIExtractor.cpp
ibstagefright/AudioSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/ESDS.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/foundation/AHierarchicalStateMachine.cpp
ibstagefright/foundation/ALooperRoster.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/MyHandler.h
933e85615059b85a87747da57288384541cc56da 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)

Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
ni/android_media_MediaRecorder.cpp
ni/mediaeditor/VideoEditorLogging.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleTable.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/avc_utils.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/foundation/hexdump.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
ibstagefright/omx/tests/OMXHarness.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/UDPPusher.cpp
ediaserver/main_mediaserver.cpp
tp/MtpDevice.cpp
tp/MtpProperty.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.cpp
1afd5bab4e0eaba8b5bc2ab5c7b556cd602cf2e7 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
ni/android_mtp_MtpDevice.cpp
ibdrm/mobile1/src/parser/parser_dm.c
ibmedia/AudioSystem.cpp
ibmedia/MediaScanner.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/MPEG4Writer.cpp
tp/MtpDevice.cpp
tp/MtpObjectInfo.cpp
tp/MtpServer.cpp
tp/MtpStorageInfo.cpp
ests/players/invoke_mock_media_player.cpp
06ade6ae1bd015e8b8ad0685847911213c93cc5b 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaProfiles.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ni/mediaeditor/VideoEditorMain.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPoolThread.cpp
ni/soundpool/android_media_SoundPool.cpp
ibeffects/factory/EffectsFactory.c
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/preprocessing/PreProcessing.cpp
ibeffects/testlibs/AudioEqualizer.cpp
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/AudioParameter.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IEffect.cpp
ibmedia/IEffectClient.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/JetPlayer.cpp
ibmedia/MediaProfiles.cpp
ibmedia/MediaScanner.cpp
ibmedia/ToneGenerator.cpp
ibmedia/Visualizer.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiMetadataRetriever.cpp
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibstagefright/AACWriter.cpp
ibstagefright/ACodec.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/AVIExtractor.cpp
ibstagefright/AudioPlayer.cpp
ibstagefright/AudioSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/ESDS.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/MediaSourceSplitter.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/VideoSourceDownSampler.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/avc_utils.cpp
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/id3/ID3.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/SimpleSoftOMXComponent.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARawAudioAssembler.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
ibstagefright/tests/DummyRecorder.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
tp/MtpDevice.cpp
tp/MtpDeviceInfo.cpp
tp/MtpPacket.cpp
tp/MtpServer.cpp
tp/MtpStorage.cpp
ests/players/invoke_mock_media_player.cpp
efbeb9b4023b28ad4fea5f1a611e503336d2f419 19-Jan-2012 Andreas Huber <andih@google.com> Make sure the ThrottledSource reports the proper mime type

of the underlying source.

Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
ibstagefright/include/ThrottledSource.h
24c255acc6dc492ee91d0f3a9538f29e1d8977ba 19-Jan-2012 Glenn Kasten <gkasten@google.com> Fix typos in string constants

These were copy/paste errors in code that was copied from AudioTrack.

Change-Id: I64a04d6026667884ddb1fefba67a71d69c691d62
ibmedia/Visualizer.cpp
92ecdd63033a53b3c6301a9dc94c2438e498f27b 19-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix incorrect includes of AudioTrack.h"
adf10837719627e725187e26a2e3654ba97245c8 19-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Simplify range check for audio_mode_t (continued)"
a6dafea172ac344f38cf4255c8896766f10b7b55 18-Jan-2012 Glenn Kasten <gkasten@google.com> Fix incorrect includes of AudioTrack.h

Remove unnecessary includes of AudioTrack.h.
Use forward declaration of class names in preference to #include when possible.

Change-Id: I12982811fa75c2c7695d8bbfa595a7aaec047dc0
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MidiFile.h
8f397cdd4c53e1a2a96bc4bdaeded59a007c85b8 18-Jan-2012 Glenn Kasten <gkasten@google.com> Simplify range check for audio_mode_t (continued)

Missed one place in earlier CL of same name

Change-Id: I0dd25364d0b8d5d731c02d352f139a0c8d4df1a8
ibmedia/AudioSystem.cpp
ee7fea9f2fd536107450204c9c2058bbe215f713 18-Jan-2012 Glenn Kasten <gkasten@google.com> Remove dead setRingerMode(mode, mask)

Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
ava/android/media/AudioSystem.java
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
b2d81fead90f556279d611b6f15881c663558ad5 18-Jan-2012 Andreas Huber <andih@google.com> Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
28ea013f25626ca2a24600b5916ebe0dfc9e46cf 18-Jan-2012 Andreas Huber <andih@google.com> Temporarily restore AudioSystem/AudioTrack APIs with their former signatures

until we get updated prebuilts from vendor.

Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
70a957cef141437cdf84e19c2eaeabdfb85c6542 18-Jan-2012 Andreas Huber <andih@google.com> Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
f429b6a9011bd5408fb0ecba2a1f9b0167178134 18-Jan-2012 Bryan Mawhinney <bryanmawhinney@google.com> Merge "Make sure seek triggers a reconnect if needed."
540c35f7aa01f7eba849148ea8b22eff351ce16d 18-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Track volume cleanup"
c14cc179729a4504db23d49301ec30fc0cfcbb1c 18-Jan-2012 Bryan Mawhinney <bryanmawhinney@google.com> Make sure seek triggers a reconnect if needed.

Previously, if we had disconnected at the high watermark,
the read immediately following a seek would fail, and would
not be retried, resulting in an error.

Change-Id: I45a53563fe17d6b54893815abc7750a7dfb0a124
ibstagefright/NuCachedSource2.cpp
4054856dad0952bc849453bd631dd3135532f328 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright aacenc: Add const declarations to some pointers

This avoids some compilation warnings.

Change-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36
ibstagefright/codecs/aacenc/inc/psy_configuration.h
ibstagefright/codecs/aacenc/src/dyn_bits.c
ibstagefright/codecs/aacenc/src/interface.c
ibstagefright/codecs/aacenc/src/psy_configuration.c
ibstagefright/codecs/aacenc/src/psy_main.c
ibstagefright/codecs/aacenc/src/quantize.c
1be4afecb752559092654c0e9f4ca302b6d04e9c 18-Jan-2012 Eric Laurent <elaurent@google.com> Merge "audio framework: manage stream volume per device"
0632bad8bad41bc44184596478ec2d203d52096f 17-Jan-2012 Glenn Kasten <gkasten@google.com> Track volume cleanup

Always read and write track volumes atomically. In most places this was
already being done, but there were a couple places where the left and
right channels were read independently.

Changed constant MAX_GAIN_INT to be a uint32_t instead of a float.
It is always used as a uint32_t in comparisons and assignments.
Use MAX_GAIN_INT in more places.

Now that volume is always accessed atomically, removed the union
and alias for uint16_t volume[2], and kept only volumeLR.

Removed volatile as it's meaningless.

In AudioFlinger, clamp the track volumes read from shared memory
before applying master and stream volume.

Change-Id: If65e2b27e5bc3db5bf75540479843041b58433f0
ibmedia/AudioTrack.cpp
cc2302d82e56ec038c7917105d6d601829c717c7 11-Jan-2012 Glenn Kasten <gkasten@google.com> Move memcpy_to_i16_from_u8 to audio_utils

This will make it easier for this kind of code to be optimized
for each target architecture.

Change-Id: I9efd27d6c0175b00b9a784353244805cec63c0b8
ibmedia/AudioTrack.cpp
9bc8358ddaa01c3490f9709991989633a6a3dd42 19-Nov-2011 Eric Laurent <elaurent@google.com> audio framework: manage stream volume per device

Improve volume management by keeping track of volume for each type
of device independently.
Volume for each stream (MUSIC, RINGTONE, VOICE_CALL...) is now maintained
per device.

The main changes are:
- AudioService now keeps tracks of stream volumes per device:
volume indexes are kept in a HashMap < device , index>.
active device is queried from policy manager when a volume change request
is received
initalization, mute and unmute happen on all device simultaneously
- Settings: suffixes is added to volume keys to store each device
volume independently.
- AudioSystem/AudioPolicyService/AudioPolicyInterface: added a device argument
to setStreamVolumeIndex() and getStreamVolumeIndex() to address each
device independently.
- AudioPolicyManagerBase: keep track of stream volumes for each device
and apply volume according to current device selection.

Change-Id: I61ef1c45caadca04d16363bca4140e0f81901b3f
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
aa967521c392d3f718e59eb3e3aa75814e4e1d0f 16-Jan-2012 Glenn Kasten <gkasten@google.com> Move fixed_fft to system/media/audio_utils

Change-Id: If8a03911434862a872539c313f54825ffb2cc672
ibmedia/Android.mk
ibmedia/Visualizer.cpp
ibmedia/fixedfft.cpp
fb6b5bdcea04c1fa6ccd046373f5ad3a62784713 17-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_mode_t consistently"
55fa4fb4a7926a4cae07b725f01d6498cbeabb4f 17-Jan-2012 Glenn Kasten <gkasten@google.com> Rename Visualizer::mLock

This avoids confusion with parent class AudioEffect's mLock which is
protected.

Change-Id: I2ae0b0869fe3c606f682252973795b34477951d0
ibmedia/Visualizer.cpp
8c17a2f0884527c3ce42a2c6dbd073014d179b53 17-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use size_t for frame size"
3c6b9cca79c872427599a325bcbb5d4a00113d80 17-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_stream_type_t consistently"
dd3ca2e268bc638fb57092a4e12df84cf2c5a6a9 17-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "AudioTrack and AudioFlinger send level cleanup"
a8854b2b749482095315e79a568b6f7a1b071641 15-Jan-2012 Dongwon Kang <dwkang@google.com> MatroskaExtractor: to support MPEG4 and MP3 codec.

Change-Id: Ic7ffb3ed394b233336fbf2a7b2627ee27033a59e
ibstagefright/matroska/MatroskaExtractor.cpp
33faba0ac3c7ec61d63257954392ccb421d85986 14-Jan-2012 Dongwon Kang <dwkang@google.com> AVIExtractor: adding a H264 fourCC which is also specified in the reference.
(H264 code can be found avi file which is encoded with FFmpeg.)

Change-Id: Id9eccd4580443f42b2afa491c94ac2c2faa37f87
ibstagefright/AVIExtractor.cpp
4790bd8be850235e9c6f1acf1e1e6146ef2996b3 03-Jan-2012 Glenn Kasten <gkasten@google.com> AudioTrack and AudioFlinger send level cleanup

Add an API to control block for getting/setting send level.
This allow us to make the mSendLevel field private.

Document the lack of barriers.

Use 0.0f to initialize floating-point values (for doc only).

Change-Id: I59f83b00adeb89eeee227e7648625d9a835be7a4
ibmedia/AudioTrack.cpp
faf354dc7f8065a90174adb6e725603176f0044f 11-Jan-2012 Glenn Kasten <gkasten@google.com> Use size_t for frame size

except in the control block, where we don't have room.

In AudioFlinger::ThreadBase::TrackBase::getBuffer,
read the frame size from control block only once.

Change-Id: Id6c4bccd4ed3e07d91df6bbea43bae45524f9f4e
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
d615f34b565bce98e202397240448845b934e596 13-Jan-2012 David 'Digit' Turner <digit@google.com> Merge "media/mtp: Add missing LOCAL_C_INCLUDES"
134a68356534951f5a6792e30f61db518c6b6ad8 13-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit 'c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
stagefright aacenc/amrwbenc: Remove trailing whitespace
c0ef548c748f0c3bc917eff7b50941f9cbe1df86 13-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
d7bbc3d41a6998e9370bf86feff960cd0c04892d 12-Jan-2012 Martin Storsjo <martin@martin.st> stagefright aacenc: Properly terminate a comment

This avoids a warning about /* within a comment.

Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
ibstagefright/codecs/aacenc/src/adj_thr.c
5ab5e003b736d925b3400afffaaefccb27030e09 12-Jan-2012 Martin Storsjo <martin@martin.st> 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
ibstagefright/codecs/aacenc/basic_op/oper_32b.h
2757ab24b8552f6a33073e2ee960d1deaffb9927 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc: Use QDADD/QDSUB instructions

Change-Id: I46c81dba0486d515f1f2b89a13fae27f6ab1e122
ibstagefright/codecs/aacenc/basic_op/basic_op.h
2ec6c483fcf569a3c085b595de6c3818d38ef344 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc: Remove useless inline asm for simple right shift

Change-Id: If1f40e9c16952182e974af1c86a14995259c2ade
ibstagefright/codecs/aacenc/basic_op/basic_op.h
d55da5d452fa20c7c4c4172884e0983bbeb79b6d 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc: Use ARMv6 SSAT instruction

Change-Id: I652eaaa54e7766d9dca80fd8cc156ca481359471
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/aacenc/basic_op/basic_op.h
ibstagefright/codecs/aacenc/basic_op/typedefs.h
5433616a0e44ac374b5d3cad9f3e1cc0fc9ad97a 05-Apr-2011 Mans Rullgard <mans@mansr.com> 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
ibstagefright/codecs/aacenc/basic_op/basic_op.h
e7e3c5c2728c8f7a776519563276954cdad78b5c 05-Apr-2011 Mans Rullgard <mans@mansr.com> 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
ibstagefright/codecs/aacenc/basic_op/basic_op.h
84b5a370e3f2584b5092290c3a27e51b5db91ac0 05-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Zero-initialize a struct

This avoids using uninitialized data in some cases, according
to valgrind.

Change-Id: I2eb5242b93c4d83a1cf6a15f022ec9579e0742a4
ibstagefright/codecs/aacenc/src/adj_thr.c
75261fa1504e80284553f38f08e8dea93f0fb4bd 05-Apr-2011 Martin Storsjo <martin@martin.st> 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
ibstagefright/codecs/aacenc/basic_op/typedefs.h
51a50f01b598c538fc415b00f488827724f6668e 22-Dec-2010 Martin Storsjo <martin@martin.st> 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
ibstagefright/codecs/aacenc/src/sf_estim.c
656bb978b3b85eb68849c0bc4170af1bc63fc442 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Make the mem_malloc function 64-bit safe

Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
ibstagefright/codecs/amrwbenc/src/mem_align.c
d24a8f7c0a833fcb4aa7d794ad4656e662e91be9 20-Apr-2011 Martin Storsjo <martin@martin.st> 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
ibstagefright/codecs/aacenc/inc/bitbuffer.h
ibstagefright/codecs/aacenc/src/bitbuffer.c
17510c1b4ea9f851c2fc8c5e0bcb55e330cc0f25 31-Aug-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Add missing newlines at the end of files

This avoids compiler warnings about missing newlines.

Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
ibstagefright/codecs/aacenc/basic_op/oper_32b.c
ibstagefright/codecs/aacenc/inc/config.h
ibstagefright/codecs/aacenc/inc/sf_estim.h
ibstagefright/codecs/aacenc/inc/transform.h
ibstagefright/codecs/aacenc/src/aac_rom.c
ibstagefright/codecs/aacenc/src/aacenc.c
ibstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
ibstagefright/codecs/aacenc/src/band_nrg.c
9f26d4c4d1e3b9de6c41f50b0be73fc6553cad1a 05-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Simplify the definition of __inline

This reduces the amount of ifdefs needed, into something that
works on both gcc and MSVC. This removes one occurrance of the
LINUX ifdef, simplifying compiling on various platforms.

Change-Id: I1e2af6c2517410dc280197ba922df877cf7afbd5
ibstagefright/codecs/aacenc/basic_op/typedefs.h
bc1d77b6cbce23fbe25f7231651037ae195bc90e 13-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_stream_type_t consistently

At native level it was a mixture of audio_stream_type_t, int, uint32_t,
and uint8_t. Java is still int. Also fixed a couple of hard-coded -1
instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0
instead of AUDIO_STREAM_VOICE_CALL.

Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
ni/android_media_MediaPlayer.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/android_media_SoundPool.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioPolicyService.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.h
3203f2af9425f13ce2c4d99233a5fcdce6a0989c 13-Jan-2012 David 'Digit' Turner <digit@google.com> media/mtp: Add missing LOCAL_C_INCLUDES

One of the source files here is including <cutils/tztime.h> which
itself includes <bionic_time.h>, a private C library header used
to define the strftime_tz() extension (which used to be declared
in <time.h> but was moved there instead).

Add a missing C include path to let our code compile as usual.

Change-Id: I6aac2f1d3d15ad182679c81ff3f4febff74eb671
tp/Android.mk
b5c6ff59930a4f7b7efbcfac143fd4aed4315cb9 13-Jan-2012 James Dong <jdong@google.com> Merge "Separate sniffing from session initialization"
d1ba6ed94543b6d2af666e01f4ffd29412511400 10-Jan-2012 James Dong <jdong@google.com> Separate sniffing from session initialization

This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened

o The change is backward compatibile in that no update is required
for existing drm plug-ins if they do not plan to provide separate
sniffer/extractor

related-to-bug: 5725548

Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/DataSource.cpp
ibstagefright/FileSource.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/ChromiumHTTPDataSource.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/WVMExtractor.h
881186c322a0aba2ab1d3860e434c253504bce0c 11-Jan-2012 John Grossman <johngro@google.com> Enhance Visualizer behavior in the case of mediaserver death.

Bring the Visualizer class into line with the SDK documentation by
returning ERROR_DEAD_OBJECT instead of ERROR_INVALID_OPERATION when
the Visualizer loses its binder connection to the mediaserver because
of a mediaserver restart.

Also add a new callback interface to allow clients to be
asynchronously notified in the case of server death. Right now, the
interface definition and the registration method are flagged as hidden
pending API council review/approval.

See http://b/issue?id=5717519 for details.

Change-Id: Id428fb946d6d7676bffd2a597366e8444ebe24f2
Signed-off-by: John Grossman <johngro@google.com>
ava/android/media/audiofx/Visualizer.java
ni/audioeffect/android_media_Visualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/IEffect.cpp
ibmedia/Visualizer.cpp
595d76ee825c9953a995974072abe538022589f8 10-Jan-2012 John Grossman <johngro@google.com> Reuse callback buffers in the Visualizer.

Don't re-allocate buffers used by Visualizer callbacks as this causes an
unacceptable amount of GC thrash. Instead, lazily allocate the buffers and only
reallocate them when the required size changes.

See http://b/issue?id=5717519 for details.

Change-Id: I50458961992a64d9b3c46db7e5e8e6414a92228f
Signed-off-by: John Grossman <johngro@google.com>
ava/android/media/audiofx/Visualizer.java
ni/audioeffect/android_media_Visualizer.cpp
1c66547ba25be6a1893df0ae26857f649474843a 12-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use audio_format_t consistently"
accb114e59ca51f2a7d370f64de8e98bde158c51 04-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_mode_t consistently

It was int or uint32_t.
Also make getMode() const.

Change-Id: Ibe45aadbf413b9158e4dd17f2b3bcc6355288d37
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioPolicyService.cpp
3fbc0b20627ec3fa74e4c13c151f1c03b92f2af2 12-Jan-2012 Marco Nelissen <marcone@google.com> Merge "MediaScanner: Disable bulk insert for settings"
62a62ef415bd1db5f5862e5ef1cc127ccd6465b8 05-Apr-2011 Mans Rullgard <mans@mansr.com> 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
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
ibstagefright/codecs/aacenc/basic_op/basic_op.h
ibstagefright/codecs/aacenc/basic_op/basicop2.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.h
ibstagefright/codecs/aacenc/basic_op/typedef.h
ibstagefright/codecs/aacenc/basic_op/typedefs.h
ibstagefright/codecs/aacenc/inc/aac_rom.h
ibstagefright/codecs/aacenc/inc/aacenc_core.h
ibstagefright/codecs/aacenc/inc/adj_thr.h
ibstagefright/codecs/aacenc/inc/adj_thr_data.h
ibstagefright/codecs/aacenc/inc/bitenc.h
ibstagefright/codecs/aacenc/inc/interface.h
ibstagefright/codecs/aacenc/inc/line_pe.h
ibstagefright/codecs/aacenc/inc/psy_const.h
ibstagefright/codecs/aacenc/inc/psy_main.h
ibstagefright/codecs/aacenc/inc/qc_main.h
ibstagefright/codecs/aacenc/inc/quantize.h
ibstagefright/codecs/aacenc/inc/sf_estim.h
ibstagefright/codecs/aacenc/inc/stat_bits.h
ibstagefright/codecs/aacenc/inc/tns_param.h
ibstagefright/codecs/aacenc/inc/transform.h
ibstagefright/codecs/aacenc/src/aac_rom.c
ibstagefright/codecs/aacenc/src/aacenc.c
ibstagefright/codecs/aacenc/src/aacenc_core.c
ibstagefright/codecs/aacenc/src/adj_thr.c
ibstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
ibstagefright/codecs/aacenc/src/band_nrg.c
ibstagefright/codecs/aacenc/src/bit_cnt.c
ibstagefright/codecs/aacenc/src/bitbuffer.c
ibstagefright/codecs/aacenc/src/bitenc.c
ibstagefright/codecs/aacenc/src/block_switch.c
ibstagefright/codecs/aacenc/src/channel_map.c
ibstagefright/codecs/aacenc/src/dyn_bits.c
ibstagefright/codecs/aacenc/src/grp_data.c
ibstagefright/codecs/aacenc/src/interface.c
ibstagefright/codecs/aacenc/src/line_pe.c
ibstagefright/codecs/aacenc/src/memalign.c
ibstagefright/codecs/aacenc/src/ms_stereo.c
ibstagefright/codecs/aacenc/src/pre_echo_control.c
ibstagefright/codecs/aacenc/src/psy_configuration.c
ibstagefright/codecs/aacenc/src/psy_main.c
ibstagefright/codecs/aacenc/src/qc_main.c
ibstagefright/codecs/aacenc/src/quantize.c
ibstagefright/codecs/aacenc/src/sf_estim.c
ibstagefright/codecs/aacenc/src/stat_bits.c
ibstagefright/codecs/aacenc/src/tns.c
ibstagefright/codecs/aacenc/src/transform.c
ibstagefright/codecs/amrwbenc/Android.mk
ibstagefright/codecs/amrwbenc/inc/basic_op.h
ibstagefright/codecs/amrwbenc/inc/homing.tab
ibstagefright/codecs/amrwbenc/inc/isp_isf.tab
ibstagefright/codecs/amrwbenc/inc/log2.h
ibstagefright/codecs/amrwbenc/inc/mime_io.tab
ibstagefright/codecs/amrwbenc/inc/stream.h
ibstagefright/codecs/amrwbenc/inc/typedef.h
ibstagefright/codecs/amrwbenc/inc/typedefs.h
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
ibstagefright/codecs/amrwbenc/src/autocorr.c
ibstagefright/codecs/amrwbenc/src/az_isp.c
ibstagefright/codecs/amrwbenc/src/bits.c
ibstagefright/codecs/amrwbenc/src/c2t64fx.c
ibstagefright/codecs/amrwbenc/src/c4t64fx.c
ibstagefright/codecs/amrwbenc/src/convolve.c
ibstagefright/codecs/amrwbenc/src/cor_h_x.c
ibstagefright/codecs/amrwbenc/src/decim54.c
ibstagefright/codecs/amrwbenc/src/deemph.c
ibstagefright/codecs/amrwbenc/src/dtx.c
ibstagefright/codecs/amrwbenc/src/g_pitch.c
ibstagefright/codecs/amrwbenc/src/gpclip.c
ibstagefright/codecs/amrwbenc/src/hp400.c
ibstagefright/codecs/amrwbenc/src/hp50.c
ibstagefright/codecs/amrwbenc/src/hp6k.c
ibstagefright/codecs/amrwbenc/src/hp_wsp.c
ibstagefright/codecs/amrwbenc/src/int_lpc.c
ibstagefright/codecs/amrwbenc/src/isp_az.c
ibstagefright/codecs/amrwbenc/src/isp_isf.c
ibstagefright/codecs/amrwbenc/src/levinson.c
ibstagefright/codecs/amrwbenc/src/log2.c
ibstagefright/codecs/amrwbenc/src/lp_dec2.c
ibstagefright/codecs/amrwbenc/src/math_op.c
ibstagefright/codecs/amrwbenc/src/mem_align.c
ibstagefright/codecs/amrwbenc/src/p_med_ol.c
ibstagefright/codecs/amrwbenc/src/pitch_f4.c
ibstagefright/codecs/amrwbenc/src/pred_lt4.c
ibstagefright/codecs/amrwbenc/src/preemph.c
ibstagefright/codecs/amrwbenc/src/q_gain2.c
ibstagefright/codecs/amrwbenc/src/q_pulse.c
ibstagefright/codecs/amrwbenc/src/qisf_ns.c
ibstagefright/codecs/amrwbenc/src/qpisf_2s.c
ibstagefright/codecs/amrwbenc/src/residu.c
ibstagefright/codecs/amrwbenc/src/scale.c
ibstagefright/codecs/amrwbenc/src/stream.c
ibstagefright/codecs/amrwbenc/src/syn_filt.c
ibstagefright/codecs/amrwbenc/src/updt_tar.c
ibstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
ibstagefright/codecs/amrwbenc/src/voicefac.c
ibstagefright/codecs/amrwbenc/src/wb_vad.c
ibstagefright/codecs/amrwbenc/src/weight_a.c
ibstagefright/codecs/common/Config.mk
ibstagefright/codecs/common/include/voAMRWB.h
ibstagefright/codecs/common/include/voAudio.h
ibstagefright/codecs/common/include/voIndex.h
80f3fc2cb61c9a86b04dcd0941fa8896d56673c5 04-Jan-2012 Glenn Kasten <gkasten@google.com> libmedia new can't fail on Android

Change-Id: Ie79dd5abb8078b35474bf0f1b3a6ff994a3a3360
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/JetPlayer.cpp
ibmedia/MediaScannerClient.cpp
ibmedia/ToneGenerator.cpp
ibmedia/Visualizer.cpp
a89226c786ab9df95554472d2ae85b531f1d8a88 11-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix race in AudioSystem::getInputBufferSize"
c57b0631925c0dc00a023216027037a7f7db682f 11-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix bug in JetPlayer::loadFromFile"
1eac460122c94455d28d4189ce12e23794b04148 11-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Simplify range check for audio_mode_t"
cc598b2b8b78df6576ac3c653daca82699625218 11-Jan-2012 Eric Laurent <elaurent@google.com> am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1

* commit '05985a2e2ae5c21fbf69d2884c59ea475fce7f6d':
stagefright: limit audio gap for looped playback
87ebdf6e01bdd64c8260a813582e6c3aa78f553f 11-Jan-2012 Eric Laurent <elaurent@google.com> am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1

* commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029':
stagefright: limit audio gap for looped playback
f733831fc735ec9bdf7465dd64f861ffb7f42924 11-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Declare IAudioTrack methods in binder opcode order"
1ea8a351979194d5ffd27ee21df399349773ad30 11-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix missing tag in mediaserver ServiceManager: log"
6c4c15569674e6a5eda0565b501b600a50d4ca6e 26-Sep-2011 Sungsoo Lim <sungsoo@google.com> MediaScanner: Disable bulk insert for settings

Since the settings (notifications, ringtones, and alarms) request
rowId after inserting into DB, do not use bulk insert for them.
(Bulk insert does not return the rowId)

Change-Id: I8faf993f8ac2da96672594a1c92ddc917f964d6f
ava/android/media/MediaScanner.java
81801adc14efdd0aecb1a8bb624a83e43b585af0 10-Jan-2012 Glenn Kasten <gkasten@google.com> Fix race in AudioSystem::getInputBufferSize

It was caching the recording parameters without a mutex.

Change-Id: Ic4b9f621cbc080d224c2233cf3ca3454fc0f19bd
ibmedia/AudioSystem.cpp
77b6aaf62d9f4ba4c653090e4d79b46228cdcdef 10-Jan-2012 Glenn Kasten <gkasten@google.com> Fix bug in JetPlayer::loadFromFile

A long pathname would corrupt the heap due to incorrect use of strncpy.

Also was using hard-coded constant 256 instead of PATH_MAX.

Change-Id: Iba382bbb38624fbc41fec91449f9814f77d4ac0d
ibmedia/JetPlayer.cpp
01aaf2c4010cc7b36e4125256357ec1cb0c29452 07-Jan-2012 Glenn Kasten <gkasten@google.com> Simplify range check for audio_mode_t

AudioSystem::setMode previously allowed negative modes, but these were
then rejected by AudioFlinger.

Now negative modes (including AUDIO_MODE_INVALID and AUDIO_MODE_CURRENT)
are explicitly disallowed.

Change-Id: I0bac8fea737c8eb1f5b6afbb893e48739f88d745
ibmedia/AudioSystem.cpp
38e90751a25606459a9e571aa1b6c992d4c64151 10-Jan-2012 Steve Block <steveblock@google.com> Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"
577d6ccb7bff1e102bb4c9fe987ea13745cf5de0 09-Jan-2012 Eric Laurent <elaurent@google.com> 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
ibstagefright/AwesomePlayer.cpp
ec193dec4d9ca2cfc8295c4becfe950a906a15ed 09-Jan-2012 Steve Block <steveblock@google.com> Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE

See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
ibmediaplayerservice/TestPlayerStub.cpp
b282e08ab641d4fc74d0324b7a0ce30926638dd5 09-Jan-2012 Glenn Kasten <gkasten@google.com> Fix build

Change-Id: Ia140af1a61edf124ef3d48b60351f850a3475af1
ava/android/media/AudioTrack.java
625d40a9206a6cd8df7bf5de7c12764465c03fb1 09-Jan-2012 John Grossman <johngro@google.com> libaah_rtp: address http://b/issue?id=5755419

Introduce a heartbeat timeout for TX senders. If none of the TX
sender's clients send any packets for this timeout period (10 minutes
right now), then the sender will stop sending keep-alive heartbeats.
This should cause RX clients to release any held media resources,
including any timed audio track. Releasing timeed audio tracks allows
the audio system to go into its idle state, which allows the power amp
in Tungsten to power all of the way down, saving both heat and power.

Change-Id: Ib7a96d334e1064ddea3f07a6b21e6efedefc549a
Signed-off-by: John Grossman <johngro@google.com>
ibaah_rtp/aah_tx_sender.cpp
ibaah_rtp/aah_tx_sender.h
5c17a820f9e46e0756c11795b3e6f89105f2f539 30-Nov-2011 Glenn Kasten <gkasten@google.com> Audio Java doc comment typos and minor changes

Change-Id: Id6ea6dccb8054c9f05db9a9c045387ce813659e6
ava/android/media/AudioFormat.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/AudioTrack.java
13f94dc5bdea85608cb2f9bded4e390389d40c0c 09-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Fix race conditions related to ringer mode"
8cf6d6f1480e760e6953bdea9fe9ab29f1e03aa8 09-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Clean up AudioTrack::mActive and stopped()"
3762c311729fe9f3af085c14c5c1fb471d994c03 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/android_media_Utils.cpp
ni/android_mtp_MtpDatabase.cpp
ni/android_mtp_MtpDevice.cpp
ni/android_mtp_MtpServer.cpp
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ni/mediaeditor/VideoEditorMain.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/android_media_SoundPool.cpp
ibeffects/preprocessing/PreProcessing.cpp
ibmedia/AudioEffect.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/JetPlayer.cpp
ibmedia/MediaProfiles.cpp
ibmedia/MediaScannerClient.cpp
ibmedia/Metadata.cpp
ibmedia/ToneGenerator.cpp
ibmedia/Visualizer.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiMetadataRetriever.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/TestPlayerStub.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/AACWriter.cpp
ibstagefright/ACodec.cpp
ibstagefright/AMRExtractor.cpp
ibstagefright/AVIExtractor.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/FileSource.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/dec/SoftAMR.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/g711/dec/SoftG711.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/foundation/AMessage.cpp
ibstagefright/httplive/LiveDataSource.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/id3/ID3.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/omx/OMXMaster.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
ibstagefright/omx/tests/OMXHarness.cpp
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/UDPPusher.cpp
ibstagefright/rtsp/rtp_test.cpp
ibstagefright/tests/DummyRecorder.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/yuv/YUVImage.cpp
tp/MtpDataPacket.cpp
tp/MtpDevice.cpp
tp/MtpPacket.cpp
tp/MtpProperty.cpp
tp/MtpServer.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.cpp
97a2d174e6cd3e0b82ed42cb138937ac047daa5f 19-Dec-2011 Glenn Kasten <gkasten@google.com> Fix missing tag in mediaserver ServiceManager: log

Change-Id: I2d5525ffee0b66c0bc361a02b313ec4dd61e6552
ediaserver/main_mediaserver.cpp
798ef8e882957e3edada7539c471ecc9c3721809 03-Jan-2012 Glenn Kasten <gkasten@google.com> Declare IAudioTrack methods in binder opcode order

This makes it easier to match up the declarations.

Change-Id: I0996c20b2903b778b356dfe52b07b0ec634855dd
ibmedia/IAudioTrack.cpp
f4c2294b0156ca5a6919479142aa319963fdb727 06-Jan-2012 Steve Block <steveblock@google.com> Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"
0b8afdac736fcbc0b2ef7f39264fe5077d88b996 06-Jan-2012 Mike Lockwood <lockwood@google.com> Restore persisted master volume if the media server restarts

Bug: 5755071

Change-Id: I6934276049b4a9d713bb4754aa3bb2cd3b898604
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
18c6afa0c57074e08b8856dde306d3302834b1a9 06-Jan-2012 Marco Nelissen <marcone@google.com> Merge "Also accept non-parenthesized genre numbers"
8564c8da817a845353d213acd8636b76f567b234 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
ni/android_media_MediaPlayer.cpp
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPoolThread.cpp
ibeffects/factory/EffectsFactory.c
ibeffects/preprocessing/PreProcessing.cpp
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/IOMX.cpp
ibmedia/MediaProfiles.cpp
ibmedia/MediaScanner.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/ACodec.cpp
ibstagefright/AVIExtractor.cpp
ibstagefright/AudioSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/ESDS.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/foundation/AHierarchicalStateMachine.cpp
ibstagefright/foundation/ALooperRoster.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/MyHandler.h
ad35f9165e7f2641812a5069de9c3cd3fdd16923 06-Jan-2012 Marco Nelissen <marcone@google.com> Also accept non-parenthesized genre numbers

b/5790684

Change-Id: Ia13feebeaadd45d9196486c012538c5b80840163
ava/android/media/MediaScanner.java
4b4d00e7149f11c84614d8cc98ae7bff21dbd960 05-Jan-2012 Marco Nelissen <marcone@google.com> Merge "ThumbnailUtils: To fix misuse of FileInputStream."
bd47cac4dfc8440a848b33107cba1d6773f3e124 05-Jan-2012 Steve Block <steveblock@google.com> Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
1c5a89d4af193e3ce9be9992ffee0ab0a4d8da5a 04-Jan-2012 Glenn Kasten <gkasten@google.com> Use audio_format_t consistently

Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield.
Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by
AUDIO_FORMAT_PCM_16_BIT.

Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ibmedia/AudioTrack.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/JetPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
e6810ffaa19c6ad747d6f3ae7a38c7f572e9281e 03-Jan-2012 Glenn Kasten <gkasten@google.com> Clean up AudioTrack::mActive and stopped()

mActive is protected by mLock; volatile is meaningless on SMP.

Fixed a couple of places where mActive was accessed without a lock:
- stopped()
- processAudioBuffer()

Added stopped_l() for cases where we already hold the lock.

Made mActive a bool not int.

Moved down a lock in setPosition that was being acquired too early.

Change-Id: I73ff368e991c0db9f9472df0b3f96fd33fcc7311
ibmedia/AudioTrack.cpp
d10a663be6e7f88fe855a0a9266af85f5a07d146 05-Jan-2012 Mike Lockwood <lockwood@google.com> Don't allow changing master volume when muted

Bug: 5793021

Change-Id: If93a41c4e61f1bc730759e77ee5b5f8165025c42
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
a8719ad9d53d3fe51e8031b2471e9558b8ef727f 05-Jan-2012 Glenn Kasten <gkasten@google.com> Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
e80a4ccd2bac7bf121441e257044f5813e85180f 15-Dec-2011 Glenn Kasten <gkasten@google.com> Use the standard CC_LIKELY and CC_UNLIKELY macros

Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose. So rename the private
uses to use the standard names.

In addition, AudioFlinger was relying on the macro expanding to extra ( ).

Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
ibeffects/testlibs/AudioBiquadFilter.cpp
ibeffects/testlibs/AudioCoefInterpolator.cpp
ibeffects/testlibs/AudioCommon.h
ibeffects/testlibs/AudioPeakingFilter.cpp
ibeffects/testlibs/AudioShelvingFilter.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
399381868992c68abefa5dde62bfdc0a7e33e5e5 05-Jan-2012 Dongwon Kang <dwkang@google.com> ThumbnailUtils: To fix misuse of FileInputStream.

We need to close it explicitly after using it. Without this, fd will be closed
non-deterministically, and that will break the decode procedure.

Bug: 5808889
Change-Id: Icf9ff9abd6e327b122c6916df9750016b3d1b616
ava/android/media/ThumbnailUtils.java
6215d3ff4b5dfa52a5d8b9a42e343051f31066a5 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
ni/android_media_MediaRecorder.cpp
ni/mediaeditor/VideoEditorLogging.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleTable.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/avc_utils.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/foundation/hexdump.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
ibstagefright/omx/tests/OMXHarness.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/UDPPusher.cpp
ediaserver/main_mediaserver.cpp
tp/MtpDevice.cpp
tp/MtpProperty.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.cpp
5baa3a62a97544669fba6d65a11c07f252e654dd 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
ni/android_mtp_MtpDevice.cpp
ibdrm/mobile1/src/parser/parser_dm.c
ibmedia/AudioSystem.cpp
ibmedia/MediaScanner.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/MPEG4Writer.cpp
tp/MtpDevice.cpp
tp/MtpObjectInfo.cpp
tp/MtpServer.cpp
tp/MtpStorageInfo.cpp
ests/players/invoke_mock_media_player.cpp
afbb047c3945e9c2b7e9bc6b25098d5fb80bba4e 15-Dec-2011 Eric Laurent <elaurent@google.com> AudioService: simplified handler messages.

For historical reasons, messages to the AudioSystem
handler in AudioService have a complex identifier combining several information.
Messages for a particular stream contain the stream type as part of the message type.
This complexity is not needed as the stream messages also carry a reference to the
VolumeStreamState object which contains all necessary information, including the stream type.

Also grouped parameters of MSG_PERSIST_VOLUME message into a single bit field to make room for
further needs.

Change-Id: Ia27af626b3447541e8f9eaceba21389a824d88e2
ava/android/media/AudioService.java
0ca16d6ba6a2e952bf39961abd7c6f720871ef01 20-Dec-2011 Eric Laurent <elaurent@google.com> Merge "audio effects: rename configure command"
4abf88244b73e80df5901d4e7508f879d80758c2 17-Dec-2011 Eric Laurent <elaurent@google.com> audio effects: rename configure command

Renamed audio effect library interface command for audio format
configuration from EFFECT_CMD_CONFIGURE to EFFECT_CMD_SET_CONFIG.
This makes the naming more consistent with other exixsting commands
and allow adding a new command to get the configuration (EFFECT_CMD_GET_CONFIG).
Same change for reverse channel configuration renamed from
EFFECT_CMD_CONFIGURE_REVERSE to EFFECT_CMD_SET_CONFIG_REVERSE.

Implemented EFFECT_CMD_GET_CONFIG in exisitng effect libraries.

Change-Id: Ia7b1c620f13797fe5aceb3b0b4acbacce09fb067
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/preprocessing/PreProcessing.cpp
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/testlibs/EffectReverb.h
ibeffects/visualizer/EffectVisualizer.cpp
f15784a5efc3e615621db8efd0053a83bfb7c253 17-Dec-2011 Hong Teng <hongteng@google.com> Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed."
d9de2d21efd4679f17ff1b25081f0462649810e4 17-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Extract out audio DSP code to utility library"
a76f6262c9835e603a664a42bde568d81372f278 16-Dec-2011 Hong Teng <hongteng@google.com> Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.

-Fix the index is out of sync frame array boundary when seeking to end of a 3gp file.
Validation only were done for video editor cts test and Movie Studio application.
Futher validation may include media player, youtube application,.etc.

Change-Id: Ib01314f1768cfab702dbe25c307553ace0b85e77
ibstagefright/SampleTable.cpp
490909d2c057f348c0a6c69e5e6e9ab48fa8ea07 15-Dec-2011 Glenn Kasten <gkasten@google.com> Extract out audio DSP code to utility library

Change-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0
ni/mediaeditor/Android.mk
c239379c0ce19bf1cbd8aaea9faacbbffeccb984 16-Dec-2011 Mike Lockwood <lockwood@google.com> AudioService: remove logging from adjustMasterVolume that was left in by mistake

Change-Id: I75c430d2c50c4cab3b6207efab5a6f11aed728d2
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
2dd9135822137c91982b4736ba5ddbd1cee3912a 16-Dec-2011 Mike Lockwood <lockwood@google.com> Merge "Defer persisting master data to avoid excessive database writes" into ics-aah
2b6449bbbce5808685c48d9b878008487b045956 16-Dec-2011 Dave Burke <daveburke@google.com> am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1

* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
SurfaceMediaSource: use the HW_TEXTURE usage bit
e0361e27218281a3113b1d38ae302b715d524df2 16-Dec-2011 Dave Burke <daveburke@google.com> am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1

* commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
SurfaceMediaSource: use the HW_TEXTURE usage bit
09fc76664add0d2aa776d0fa410950be9bc8f973 16-Dec-2011 Jamie Gennis <jgennis@google.com> 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
ibstagefright/SurfaceMediaSource.cpp
f9113d311b33a14b324a02e3310185af582a7882 15-Dec-2011 Mike Lockwood <lockwood@google.com> Defer persisting master data to avoid excessive database writes

Bug: 5705192

Change-Id: I252bd72ff72ef4a40174d4597059e89691acb34f
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
d9a723bc922a8fabf5c2df5d6cf838623266c63b 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Fix build error when verbose logging is enabled"
16dabac224c403a31693b83ae94a87fb7db75e9b 15-Dec-2011 Glenn Kasten <gkasten@google.com> Fix build error when verbose logging is enabled

Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
2e7cfe4a2f75059ab509135378b171b6c3625d9e 15-Dec-2011 Joe Onorato <joeo@google.com> Merge "logging" into ics-aah
25adf474775acb3eea260cb0a6251cf43ff798ce 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Fix indentation and whitespace"
da7923ac2932769e6d64508376a449c9dcd2889e 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Audio C++ comments"
fb2ab9efc3805c81521afb9ff91a58ff5097a36e 12-Dec-2011 Glenn Kasten <gkasten@google.com> Fix indentation and whitespace

Use git diff -w to verify.

Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
ava/android/media/AudioTrack.java
ibmedia/AudioTrack.cpp
ad2ac95d06e1b283c625cc4bb9f0ab581d98dda3 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Remove unnecessary this->"
ef2b0caf533d09404e7f593ee3067e5f90c84427 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Fix typo in error message, missing space"
5bdc60c968a372672afd72c46dc13ef37ef9d58b 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Delete obsolete includes"
46f54359b6adf4e7a7134bd495c69c035bdc382f 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Remove redundant clear()"
30cca7ecbe725108de98294660223a81752e2d17 15-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "AudioTrack::setVolume check range"
e5fb263a3625c0e6b4a9aefa86067bb9463dd06d 14-Dec-2011 Glenn Kasten <gkasten@google.com> Audio C++ comments

Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
ibmedia/AudioTrack.cpp
29e97f169d87490e4755e8b7608e6324367e752f 14-Dec-2011 James Dong <jdong@google.com> am 3f6a7d1e: am d70c64db: 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.

* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
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.
d7ea1105f511e90d3be5b943c2855e72469ccffd 14-Dec-2011 James Dong <jdong@google.com> am d70c64db: 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.

* commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526':
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.
51e445f701b2173c44db70d5af0861351b6f69b9 13-Dec-2011 Glenn Kasten <gkasten@google.com> Remove redundant clear()

Change-Id: Ie5e4e63cbc8fa85ef50451dddf8f149fa864b132
ibmedia/AudioTrack.cpp
5bb8f80fc4a72ad70d7d38cdc9f7988edce476e4 24-Jul-2011 Glenn Kasten <gkasten@google.com> Fix typo in error message, missing space

Change-Id: Icdddbf2fddb81a1db538dd94fb25cf859e44bfbd
ava/android/media/audiofx/AudioEffect.java
db298a4c66b0e3e12e5d73e82aef2c49c40913f8 13-Dec-2011 Glenn Kasten <gkasten@google.com> Remove unnecessary this->

Change-Id: I72038f5d4568f0633d3e4ab90f4b67e2dd22c332
ibmedia/AudioTrack.cpp
1c50a789ca2039abbcd073b6e0b7247eb7eae413 30-Nov-2011 Glenn Kasten <gkasten@google.com> AudioTrack::setVolume check range

Change-Id: Ie182bf0f741f1f49f68c02a1e7437a2a34d34fc5
ibmedia/AudioTrack.cpp
d70c64db9f67dbe8f888de6b1bdcc835226ec526 14-Dec-2011 James Dong <jdong@google.com> 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
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/DataSource.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/include/WVMExtractor.h
b782e8d71e693984cc5236f1cf08e0c3c11a4050 13-Dec-2011 Joe Onorato <joeo@google.com> logging

Change-Id: I6fde5617365f479884937615e0d3f0f4ecc2dc14
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
2b9e2da8934a9d0aac40247d9d84cf8e483f7841 13-Dec-2011 Andreas Huber <andih@google.com> am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1

* commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
9a023f1f8e27dc9cae9066bd94a417e15e42b270 10-Dec-2011 Andreas Huber <andih@google.com> 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
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ba195ebc76f23b6679443724ab58c9dc9f2df884 13-Dec-2011 Glenn Kasten <gkasten@google.com> Fix race conditions related to ringer mode

Consistently protect all reads and writes of mRingerMode by mSettingsLock.

Change-Id: I72675ff9009880cc212616f0f79f809a28eb6bff
ava/android/media/AudioService.java
a6e549455a17970b5e7b75686d6cc1c7169d59c3 13-Dec-2011 Jeff Tinker <jtinker@google.com> am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1

* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
Fix drm flag setting missed in false drm recognition fix.
b7e0281900db002e9aed8dff0e2fbcd8b22bf91d 13-Dec-2011 James Dong <jdong@google.com> am 406dd5d1: am aadbd80b: Fixed the false drm recognition.

* commit '406dd5d1e48752177753666867403542e1f400ca':
Fixed the false drm recognition.
e1b908f52dcee4440821c6d269ca5e92d51ac8c5 30-Nov-2011 Glenn Kasten <gkasten@google.com> Delete obsolete includes

Change-Id: I960a179a026ff8d710b43b64cb358f18ee04de16
ediaserver/main_mediaserver.cpp
2fc93533d2689d510c93931bc02ad602fa0e46f2 12-Dec-2011 Andreas Huber <andih@google.com> Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"
130f62ab014ad95e6dc03ff219a581c8b93c82e4 12-Dec-2011 Owen Lin <owenlin@google.com> Fix the build. (Change LOGV to ALOGV)

Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
ibmediaplayerservice/nuplayer/RTSPSource.cpp
1f7817e1461f4af304d60cc3849d532288e4d2de 10-Dec-2011 Andreas Huber <andih@google.com> am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1

* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
Don't perform RTSP seeks right away but queue them for 200ms
61a8b5301b9cf3abef9f1b9fa5af55912cb9d9c7 10-Dec-2011 Andreas Huber <andih@google.com> am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1

* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
9f62e15f40eafa55bb46bc3cd7b80d03e606b5fb 10-Dec-2011 Andreas Huber <andih@google.com> Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler

contributed by Samsung (untested).

Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
aac2f9c66ccb181544f822a1af7397a8e25455e7 09-Dec-2011 Jeff Tinker <jtinker@google.com> am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1

* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
e1378605bc8061e5e8bfa76136312cd8c2442304 09-Dec-2011 Jeff Tinker <jtinker@google.com> am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1

* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
Fix drm flag setting missed in false drm recognition fix.
a069128f2c23f0ae675dfc1e18ebc4dbd460e6ca 09-Dec-2011 Mike Lockwood <lockwood@google.com> Merge "Remove reference counting and client death notification for master mute" into ics-aah
9f704f6c46a171357e49c411c83458b9d4565f3b 09-Dec-2011 Jeff Tinker <jtinker@google.com> Fix drm flag setting missed in false drm recognition fix.

Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug: 5732033
ibstagefright/AwesomePlayer.cpp
8089d76690e73969a36d573cdd0367ff5a59bd3a 09-Dec-2011 James Dong <jdong@google.com> am aadbd80b: Fixed the false drm recognition.

* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
Fixed the false drm recognition.
aadbd80b307c817698ce5110ff8e002804d1b230 09-Dec-2011 James Dong <jdong@google.com> Fixed the false drm recognition.

Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1

related-to-bug: 5732033
ibstagefright/AwesomePlayer.cpp
ibstagefright/MediaExtractor.cpp
66b401c80b022e3eeeeb647dede683f42d5c24fb 08-Dec-2011 Andreas Huber <andih@google.com> am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1

* commit '68f592a8210af27df4339089bbee47fb602cae6a':
Don't perform RTSP seeks right away but queue them for 200ms
191eacb37d42d34f8c28ebb79e9d1c8413070cfc 08-Dec-2011 Andreas Huber <andih@google.com> am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1

* commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
68f592a8210af27df4339089bbee47fb602cae6a 08-Dec-2011 Andreas Huber <andih@google.com> Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
21902a8a489140902ff868f5957a16cacd11a7a3 08-Dec-2011 Andreas Huber <andih@google.com> Don't perform RTSP seeks right away but queue them for 200ms

and only execute the last one.

Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000
related-to-bug: 5732960
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/RTSPSource.h
f6ae711450581d248e646b8d8d6b0bf75c4d19ea 08-Dec-2011 Andreas Huber <andih@google.com> Fix Bitreader "putBits" implementation, make sure we emulate timestamps

if we don't receive npt time mapping from the rtsp server (i.e. live stream)

Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c
related-to-bug: 5660357
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/RTSPSource.h
ibstagefright/foundation/ABitReader.cpp
ibstagefright/rtsp/MyHandler.h
44e73eee08b045eab2e519684d6edb0091457529 08-Dec-2011 Jeff Tinker <jtinker@google.com> am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1

* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
a693a4b5553584a01b8b6b3640dc0393d2d88f28 08-Dec-2011 Jeff Tinker <jtinker@google.com> Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
1321bc1fa3e6dcafcf3185b4efe2f9721ecdfef1 08-Dec-2011 James Dong <jdong@google.com> Merge "Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0."
d0d19db1ca1c289b069db33f4665bcb9386064e9 08-Dec-2011 Jeff Tinker <jtinker@google.com> Fix ANRs due to Widevine DRM plugin sniff taking too long.

Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug: 5725548
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/DataSource.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/include/WVMExtractor.h
71087709aad07cc6492f64444acf9acc48495003 08-Dec-2011 Eric Laurent <elaurent@google.com> Merge "Fix audio effect tests"
7554c57c173352c0b3e9026b54fdda9fad101f8b 07-Dec-2011 Dave Burke <daveburke@google.com> am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1

* commit '6727a43f6d8ff193b86ca90b2daa761c47157638':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
fa5fc7263580e6f42ea1d6f1b933e3f609cc5983 07-Dec-2011 Dave Burke <daveburke@google.com> am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1

* commit '54a53841a9ff48ba4cd004469ae4ff77caed900a':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
7dea9aaff5ce855df1ac2ede4eb9520f506603a8 07-Dec-2011 Andreas Huber <andih@google.com> Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.

Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug: 5666532
ibstagefright/AwesomePlayer.cpp
a8f4e8359531a2bbfd0ff7db86676937fdf20a65 07-Dec-2011 Mike Lockwood <lockwood@google.com> Remove reference counting and client death notification for master mute

The use case for master mute is to toggle it on and off from a
KEYCODE_VOLUME_MUTE event, so this was unnecessary and prevented unmuting
in certain cases

Bug: 5724755

Change-Id: I041a112cd39e1c00dcae27e2266a95ce225e9b64
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioService.java
ff1e877a8d18259ef09f9b7767c4c2440a4eaa5d 07-Dec-2011 Hong Teng <hongteng@google.com> am 6db79c35: Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." int

* commit '6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
52cb1da2c6567be55274ef2d9035e29ae27a31aa 07-Dec-2011 Amith Yamasani <yamasani@google.com> am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1

* commit 'f336408000c4be36045401fb4df89528249e7383':
New and improved silent mode on lockscreen.
b300003a14100a583043bc5fae35e6eb5b3066b1 07-Dec-2011 James Dong <jdong@google.com> am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1

* commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
1b4c8bf69754d9abb3cd4f7b28f31912cf515b91 07-Dec-2011 Andreas Huber <andih@google.com> am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1

* commit '05d630691127c022befd071b2bede87c707112a9':
DO NOT MERGE: Remove the AVI extractor.
b808af7daf74d27d3c745cd6d62007f344d37e53 07-Dec-2011 Narayan Kamath <narayan@google.com> Merge "Allow data uris to be data sources"
ca402cdcacfdcd2978a22d59f446c93aad34c75e 07-Dec-2011 James Dong <jdong@google.com> Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed
to the callback could be 0.

Change-Id: Ie921f0af8284eccfd02c4a5826ed41fe19f9676f
related-to-bug: 5613451
ava/android/media/MediaPlayer.java
2fe9130f227b31e3d24987f442c3374f2299d9f5 07-Dec-2011 Hong Teng <hongteng@google.com> am 2be608f8: am 6db79c35: Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray an

* commit '2be608f88cd469b40a472551f22a9d40903beede':
Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
9c316f3c6ac785fd27be97a119dfe8f1303a8ed4 07-Dec-2011 Amith Yamasani <yamasani@google.com> am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1

* commit 'd49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
New and improved silent mode on lockscreen.
6db79c35c0cb4e26c6aff4a913777fd21069fd3c 07-Dec-2011 Hong Teng <hongteng@google.com> Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1
f336408000c4be36045401fb4df89528249e7383 07-Dec-2011 Amith Yamasani <yamasani@google.com> Merge "New and improved silent mode on lockscreen." into ics-mr1
6243edd818b84adfbe712d5d233d6414b33653ac 06-Dec-2011 Amith Yamasani <yamasani@google.com> New and improved silent mode on lockscreen.

3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
ava/android/media/AudioService.java
f998922f3043586e74b34c4dc9c6370a07b707eb 06-Dec-2011 John Grossman <johngro@google.com> Tungsten: Improve RX player error handling.

First, clear an issue which was causing an assert to fire. Basically,
once a decoder pump had entered the error state and was shutdown, it
was not clearing its status, and when a substream attempt to recycle
the pump, startup was failing an assert (no thread had been created,
meaning that the system was not initialized, yet status indicated an
error). This was a small one-liner in aah_decoder_pump.cpp.

Second, try to become a little nuanced about how we handle errors in
the decoder pump. A comment in the code pretty much says it all, but
the summary is that we don't want to completely abort playback because
a single chunk of ES failed to decode, but if nothing is decoding and
we are making no progress at all, we probably need to put the
MediaPlayer instance into the fatal Error state and signal the app
level so that further action can be taken (automatic recovery attempts
followed by bug reports and signalling the user if those fail).

This is to address the fallout of http://b/issue?id=5498460, where
something at the OMX decoder level becomes unhappy about not being
able to obtain an output buffer which eventually unwinds to this
assert which results in a dead mediaserver. After this change, the
mediaserver will no longer crash, and may even recover (depending on
whether or not the OMX unhappiness is transient or not), but the
primary issue (unhappy OMX) is probably still around. It is quite
difficult to reproduce, I will probably need to open a different bug
to track that issue.

Change-Id: I5b65b818378a5ae9c915e91b7db7129f0bda6837
Signed-off-by: John Grossman <johngro@google.com>
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_decoder_pump.h
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_rx_player_substream.cpp
6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3 06-Dec-2011 James Dong <jdong@google.com> Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
96bea6a5e9a362c21fbdb98f0e67212de7dffdc6 06-Dec-2011 Hong Teng <hongteng@google.com> Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails
-Correct the invalid filename, which contains control character.
And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.

Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java
92f604c4d465572efccfd7b1572080f48dc972c1 06-Dec-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Remove the AVI extractor.

Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MediaExtractor.cpp
6b67215235d6c419f22fb1cfc6768d35147c9607 16-Nov-2011 Narayan Kamath <narayan@google.com> Allow data uris to be data sources

bug:5571010
Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
ibstagefright/DataSource.cpp
ibstagefright/chromium_http/Android.mk
ibstagefright/chromium_http/DataUriSource.cpp
ibstagefright/include/DataUriSource.h
ad67a2639beac2d7b09a1792b93d0ce1b54fa1e9 06-Dec-2011 Eric Laurent <elaurent@google.com> Merge "AudioService: Send broadcasts when master volume and mute state change" into ics-aah
3309386a1b62095ab91b5efe4e8aa5dbd8ea5066 01-Dec-2011 Mike Lockwood <lockwood@google.com> AudioService: Send broadcasts when master volume and mute state change

Change-Id: I7eb5041f0c14f419317e29ea6fa7faa9159cf165
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
cb064917cf070aaac48a3a04e0179638801e6565 05-Dec-2011 James Dong <jdong@google.com> DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames

The current logic does not check the I-frame at zeroeth position and therefore
for the files with only 1 I-Frame at zeroeth postion does not play.

Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com>

Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.

Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94
related-to-bug: 5711942
ibstagefright/SampleTable.cpp
68d2f95328f262e88bccc02621c3ae5c56128aee 05-Dec-2011 Andreas Huber <andih@google.com> resolved conflicts for merge of 07bacabe to master

Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
384612d13ec9ec1331246144984ad9888eed48a2 05-Dec-2011 Andreas Huber <andih@google.com> am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1

* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
b8e651a6757c8e55fc3d9e5e86a13ead7326e91d 05-Dec-2011 Andreas Huber <andih@google.com> Properly identify how much metadata we need to cache in order to instantiate

the extractor without blocking (and therefore be able to abort).

Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug: 5666532
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/SampleTable.cpp
89972657bd7fdd9def17fe75e2529865b2369722 03-Dec-2011 Amith Yamasani <yamasani@google.com> am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1

* commit 'f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4':
Further volume improvements.
29f1c32eea12ab33547af73fb0e5dcf432e6979c 02-Dec-2011 Hong Teng <hongteng@google.com> am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification,

* commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c':
Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
15cf022c702cd6cd75d8baa7dedc0368e4d4a86f 02-Dec-2011 Mike Lockwood <lockwood@google.com> am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1

* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
d562cbf6f893498f8667fd049112ae689a4336a6 02-Dec-2011 Mike Lockwood <lockwood@google.com> am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1

* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
7944c1b19f04583c595732695d63f333cd051eb4 01-Dec-2011 Mike Lockwood <lockwood@google.com> MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE

Bug: 5527220

Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/mtp/MtpDatabase.java
tp/MtpServer.cpp
7a1ad63d16ac42482b3e043ef7a8474452aa057c 02-Dec-2011 Mike Lockwood <lockwood@google.com> MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE

This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K

Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800
Signed-off-by: Mike Lockwood <lockwood@google.com>
tp/MtpDataPacket.cpp
54a796259055a633ec74afed0dce2327e5a86d51 02-Dec-2011 Amith Yamasani <yamasani@google.com> am afd01086: Merge "Further volume improvements." into ics-mr1

* commit 'afd01086795c7c1f6950a709180b2361625b8b6a':
Further volume improvements.
afd01086795c7c1f6950a709180b2361625b8b6a 02-Dec-2011 Amith Yamasani <yamasani@google.com> Merge "Further volume improvements." into ics-mr1
d62da2d0da976ea5590471c3b70ebf013e41ce8b 02-Dec-2011 Jean-Michel Trivi <jmtrivi@google.com> Remove unused variable and imports in AudioManager

Remove unused imports.
Remove private mHandler variable: it was assigned a new Handler
object but was never accessed.

Change-Id: I63cd08aa38701ea157fef7d3185a58a6e2a95822
ava/android/media/AudioManager.java
1109fe9d81294b1a2049aad7d2d70c4bf3f1e092 02-Dec-2011 Hong Teng <hongteng@google.com> am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the applicati

* commit '613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0':
Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0 02-Dec-2011 Hong Teng <hongteng@google.com> Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly." into ics-mr1
6a5c1a9574e857a80c8e4ca13f3b5f0439d331c9 02-Dec-2011 Mike Lockwood <lockwood@google.com> Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage"
09bd918c5d710cf500a3f16bc4021348c1677507 02-Dec-2011 Mike Lockwood <lockwood@google.com> Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver"
73e56d935e7c9b8a06e4781c4995e407e118f93d 01-Dec-2011 Mike Lockwood <lockwood@google.com> MTP: Add support for restricting PTP to only certain subdirectories of the storage

Bug: 5527220

Change-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/mtp/MtpDatabase.java
tp/MtpServer.cpp
ee07e110d92005f9dbd317a23721d9b7c9a5ed37 02-Dec-2011 Eric Laurent <elaurent@google.com> am 6cfa9e6c: am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1

* commit '6cfa9e6c507a721f647518569c89db9560056079':
AudioService: strengthen A2DP device detection
c1f069bb40f45b38684997fcfceb35be6e037665 02-Dec-2011 Eric Laurent <elaurent@google.com> am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1

* commit '0d3a2e93394efa4729e5c29ff4515f9f2644b8c3':
AudioService: strengthen A2DP device detection
0d3a2e93394efa4729e5c29ff4515f9f2644b8c3 02-Dec-2011 Eric Laurent <elaurent@google.com> Merge "AudioService: strengthen A2DP device detection" into ics-mr1
1958dc27c952da3a590750023e391e0d481a4328 02-Dec-2011 Mike Lockwood <lockwood@google.com> MTP: Don't attempt to read more than 16K at a time from the MTP driver

This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K

Change-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5
Signed-off-by: Mike Lockwood <lockwood@google.com>
tp/MtpDataPacket.cpp
2ef6f1bb5603c2e221191117695725237f49a5d5 01-Dec-2011 Amith Yamasani <yamasani@google.com> Further volume improvements.

- Remove silent mode from Power menu
- Show volume dialog on lockscreen
- Allow beeps when adjusting volume in lockscreen

Bug: 5586083
Change-Id: I93052a8ec5004c784f20e04488af9382d495e711
ava/android/media/AudioService.java
d01d261183a4b832c2575ae0d82f68125605b21e 01-Dec-2011 Glenn Kasten <gkasten@google.com> Merge "Add README for media "automated" tests"
a54a06b3f0533f7287456ab35c4d88049156d91e 01-Dec-2011 Glenn Kasten <gkasten@google.com> Add README for media "automated" tests

Change-Id: I92e611fb6df2d870ded9e246963277ecc35b0d15
ests/README.txt
f8ebb32d1fa8fc521f47d83ffa77e20ded066c45 01-Dec-2011 Andreas Huber <andih@google.com> am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit '10526a0bfe070ac4d1e550a81ed68be35d261b16':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
a1b97a8a4e1f9dbbb263bd334a807bdd1e09dab9 01-Dec-2011 Andreas Huber <andih@google.com> am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
1fc2e60d59abfe1c4d7f9611c685c894ad1a383f 01-Dec-2011 Andreas Huber <andih@google.com> Fixes a typo in AVIExtractor that would advertise the wrong video dimensions

Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab
related-to-bug: 5696324
ibstagefright/AVIExtractor.cpp
63149c81adf79f43c6508647614247277f8052e2 01-Dec-2011 Hong Teng <hongteng@google.com> Fixd for 5490443 Native crash while exporting a video
- Add new onError callback to PreviewProgressListener, which is
used to indicate video editor application for the error that has occurred during
priviewing.
With this modification, the application must implement the onError method,
and then VideoEditorPreviewTest.java is changed accordingly.

Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/VideoEditor.java
ni/mediaeditor/VideoEditorMain.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java
6bc7f2cd30b6bd90806942b0722e22daa2108493 30-Nov-2011 Eric Laurent <elaurent@google.com> AudioService: strengthen A2DP device detection

If the intent BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED is broadcast
before AudioService is started, The A2DP device connection is never detected
by the audio framework resulting in audio not being routed to A2DP unless the device
is rebooted or the A2DP headset reconnected.

Make sure that A2DP device connection state is sampled when
boot completed event is received.

Issue 5665159

Change-Id: I04d82020afc00af28c5ea0bb9879ed55bcc9b6f3
ava/android/media/AudioService.java
df96385b9acf9ec74c62edc34ffa9c8d9dae1c03 30-Nov-2011 Jamie Gennis <jgennis@google.com> am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1

* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
SurfaceMediaSource: use the vid enc usage bit
db85b54395c2866f07178558079cbc1813ff420c 30-Nov-2011 Andreas Huber <andih@google.com> resolved conflicts for merge of 3d630e86 to master

Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
44ddd1ff887395d747ded17f1f6b52f059320fcd 30-Nov-2011 James Dong <jdong@google.com> Fix the broken build

Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
ibstagefright/ACodec.cpp
c8f8263e357011d605bfa7c43d64fcc5e56cd3d4 30-Nov-2011 Jamie Gennis <jgennis@google.com> am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1

* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
6f1dd757cb158d17c76baeb170f7db2271802ef8 30-Nov-2011 Jamie Gennis <jgennis@google.com> Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
e7b3e09a5ed21dab938a7efdc215bb20d2769702 30-Nov-2011 Andreas Huber <andih@google.com> am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1

* commit '52607c5364446df6ac5b2f55cb50e146e6023a4f':
If an error occurs that prevents us from reallocating buffers during a format change
848bffd8fa07f0e16d0ac5eed95085288ff43d9f 30-Nov-2011 Andreas Huber <andih@google.com> am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1

* commit '074133b260f8d12e484e93b9aa5a33a4983b7349':
Updated (internal) API for IStreamSource to signal discontinuities
a3f887bd30bb5f79751f52c13e68f75b8195ccf1 30-Nov-2011 Andreas Huber <andih@google.com> resolved conflicts for merge of 998a929a to master

Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
92f05b90203efb42caf11db12433ed58cc7859a5 29-Nov-2011 Andreas Huber <andih@google.com> am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1

* commit '564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
34fe2f4a7f68f4eed6150a0c03b509919c2280a1 29-Nov-2011 Andreas Huber <andih@google.com> am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1

* commit 'd12dc28460f622ab29e83fa688ad83a8263e9417':
If an error occurs that prevents us from reallocating buffers during a format change
bcb0588af56767c7ca114dc71e5552153d047e8f 29-Nov-2011 Andreas Huber <andih@google.com> am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1

* commit '351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
1dd8ea4e4c7c45ebc24caac5f7ab0e805716680e 29-Nov-2011 Andreas Huber <andih@google.com> am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1

* commit '405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
564fee36667e2699c59a29102136220dc2f65862 29-Nov-2011 Andreas Huber <andih@google.com> Merge "Make sure we can properly shutdown even if" into ics-mr1
d12dc28460f622ab29e83fa688ad83a8263e9417 29-Nov-2011 Andreas Huber <andih@google.com> Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
351143fb0e2fcfb7dc2ef1045d693c71eb0ea329 29-Nov-2011 Andreas Huber <andih@google.com> Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
405a4e34032f8a07028138266fe9f79f6753b466 29-Nov-2011 Andreas Huber <andih@google.com> Merge "Finer granularity discontinuity support." into ics-mr1
a10613fea8e9d8a73385d37ad92f9c56d8828ce6 29-Nov-2011 Andreas Huber <andih@google.com> Updated (internal) API for IStreamSource to signal discontinuities

Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug: 5553055
ibmedia/IStreamSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
aa2892edc7bb2b915771679d9811ec54a26db366 29-Nov-2011 Mathias Agopian <mathias@google.com> Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8

* changes:
Add support for sending VSYNC events to the framework
BitTube::read now handles EAGAIN
split ComposerService out of SurfaceComposerClient.h
rewrite SF's message loop on top of Looper
9a8246c8d1ea324b6704bf4fe0b77ade1c2f3639 29-Nov-2011 Yu Shan Emily Lau <yslau@google.com> am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

* commit '77d1ebbd7bd42d849911e680a63eec02e8b444db':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
5d6b956341ee821e2c5a848430f75b4d496342e5 29-Nov-2011 Yu Shan Emily Lau <yslau@google.com> am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

* commit '4e5d3f2ca05b513640d3163155756e01ae577d54':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
99b4523b753f35122e23e90c95f57399c3f8bb10 24-Nov-2011 Yu Shan Emily Lau <yslau@google.com> Add the min fps option to set
the min fps in the media recorder test.
Add the procmem log to the media
memory stress test.

Change-Id: Icf82f12adeca7072a171991d1d6a994e4bb7764a
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
66a051af37c3d7a610802c0c58906dc0faefa6be 28-Nov-2011 Andreas Huber <andih@google.com> Finer granularity discontinuity support.

No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.

Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug: 5553055
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
551aeac336b426ae962e232d5223e7b994aaf1e1 29-Nov-2011 Andreas Huber <andih@google.com> Make sure we can properly shutdown even if

a) one of the two decoders has a pending discontinuity
b) the renderer holds on to all output buffers for that decoder
c) the renderer is paused

if all three conditions are met the decoder won't ask for more input data
and therefore never see the discontinuity.

To avoid this we briefly resume the renderer just before shutting down.

Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a
related-to-bug: 5655016
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
3f15700a012b1ab0097eaf90caf0540ba6caa529 18-Nov-2011 Mathias Agopian <mathias@google.com> split ComposerService out of SurfaceComposerClient.h

Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
ibstagefright/SurfaceMediaSource.cpp
d03e7d62d5a5eda07e19b0bbc1eaa6ed82d860c5 28-Nov-2011 Andreas Huber <andih@google.com> If an error occurs that prevents us from reallocating buffers during a format change

we need to transition to executing state anyway to be able to properly flush/shutdown
in the future.

Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f
related-to-bug: 5655016
ibstagefright/ACodec.cpp
f53453d59615e3709e683215ea4ddaf6daf9bc91 23-Nov-2011 James Dong <jdong@google.com> Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."
55cadf7eca8dffa981054d3521fd279fefe9b6f4 22-Nov-2011 dujin.cha <dujin.cha@samsung.com> am 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue

* commit '4d592c59e684ed3e6f0db4b05c37ba8774b8d410':
[Prime K] Fix gabage character issue
b31783b1429ebce7cc65d655df97c78c75fa17d7 22-Nov-2011 dujin.cha <dujin.cha@samsung.com> am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue

* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
[Prime K] Fix gabage character issue
eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0 22-Nov-2011 dujin.cha <dujin.cha@samsung.com> am fe464a76: [Prime K] Fix gabage character issue

* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
[Prime K] Fix gabage character issue
fe464a76d8fc858be971dbb5e67b1d22fd925347 21-Nov-2011 dujin.cha <dujin.cha@samsung.com> [Prime K] Fix gabage character issue

Korean characters show up as gabage characters in Music player.
Reason : MTP service does not set the locale for the MediaScanner
Solution : Set locale when MtpDatabase creates MediaScanner.

Bug ID : 5567433
Signed-off-by: dujin.cha <dujin.cha@samsung.com>

Change-Id: I4bfe5f603c113170d45bd57a8709c21c665e260b
ava/android/mtp/MtpDatabase.java
72a845d53900048c13edf4a4ac33386f3332e838 22-Nov-2011 Andreas Huber <andih@google.com> am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1

* commit '31626b3075335f4cf579342e99436bb45870cf55':
Report a runtime error instead of asserting on malformed avc configuration data.
1d72b75006eeabdb93470704a684f7e5f7abbe9b 22-Nov-2011 Andreas Huber <andih@google.com> am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1

* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
Report a runtime error instead of asserting on malformed avc configuration data.
cb6fbc89c25298643ab342b4a228e772b0e56978 22-Nov-2011 Andreas Huber <andih@google.com> Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
7e6265e0d216e0b872a5f103af1c7bb022ade06e 22-Nov-2011 Insun Kang <insun@google.com> Fix a subtitle bug: multiple blank lines in SubRip(srt) file.

TimedTextParser should handle multiple blank lines between subtitles
in SRT format.

Change-Id: Id81e0a14d9984141f68b9f0919942c85562301b3
ibstagefright/timedtext/TimedTextParser.cpp
4e2ecdd8a78f25f4c234877d5321ebd4e4c0e8f7 22-Nov-2011 James Dong <jdong@google.com> am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1

* commit 'd0a254566f5f0be5607b4d64839a575c888c94f6':
Fix log spamming during time lapse video recording
56627252778d55d7b8392752a72c61db9b1aa22c 22-Nov-2011 James Dong <jdong@google.com> am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1

* commit '02740dc49df86fc94c872454aa9db98737d5e8c8':
Fix log spamming during time lapse video recording
6deb4b538ecf5cbd4418492bfb6b79df67eedfb7 22-Nov-2011 Jamie Gennis <jgennis@google.com> SurfaceMediaSource: use the vid enc usage bit

This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.

Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
ibstagefright/SurfaceMediaSource.cpp
96af14d9b013496accf40a85a66fefcba3ac0111 20-Nov-2011 James Dong <jdong@google.com> Fix log spamming during time lapse video recording

Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f

related-to-bug: 5626569
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
c81e0ad9bd438575389623f523a28e2e6ca69236 19-Nov-2011 Eric Laurent <elaurent@google.com> Fix audio effect tests

Make sure that audio effect tests relying on audio to actually play on
the music stream are not affected by current ringer mode. Silent mode
can mute music stream on tablets.

Issue 5638685.

Change-Id: Icdf14696986145ae3f50fc15d358335487d3525f
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java
5b381ec95f03592021c98dc6a78fc6fd0b4b53d4 19-Nov-2011 Marco Nelissen <marcone@google.com> am 7ff7821a: am d4b22ab4: status_t != bool

* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
7ff7821a601a39fffb318e29873957b4a3703c46 19-Nov-2011 Marco Nelissen <marcone@google.com> am d4b22ab4: status_t != bool

* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
d4b22ab4889f9b1885bfc0dc45667c846a171a98 18-Nov-2011 Marco Nelissen <marcone@google.com> status_t != bool

b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
ibmedia/MediaScannerClient.cpp
ibstagefright/StagefrightMediaScanner.cpp
1cad15207df78babcd5871effa63604f78f597ac 18-Nov-2011 Marco Nelissen <marcone@google.com> status_t != bool

b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
ibmedia/MediaScannerClient.cpp
ibstagefright/StagefrightMediaScanner.cpp
0ba8660ea6d88a1809508c31bd3b1da8e8dfabd3 18-Nov-2011 Andreas Huber <andih@google.com> Report a runtime error instead of asserting on malformed avc configuration data.

Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug: 5641069
ibstagefright/OMXCodec.cpp
aa25761114b143ed3182d97004ec1366c2ae850e 17-Nov-2011 Andreas Huber <andih@google.com> am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

* commit '624efe45671131903fb5165f6133ba39486092ab':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
412dd05c09988f351d6bfa368966104d928ec22d 17-Nov-2011 Andreas Huber <andih@google.com> am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

* commit 'c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
7418e385f4523b94662d3fef614dac26d8a36885 17-Nov-2011 Glenn Kasten <gkasten@google.com> Merge "MidiFile uses C++ Thread not createThreadEtc"
b447e9ce1d3dc603a8879340f36a4ca4f22d6b62 17-Nov-2011 Glenn Kasten <gkasten@google.com> Merge "JetPlayer uses C++ Thread not createThreadEtc"
376c393039451e572ce60e0da933fbd70ae12a4a 24-Jun-2011 Glenn Kasten <gkasten@google.com> MidiFile uses C++ Thread not createThreadEtc

This permits leveraging future improvements to Thread.

Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiFile.h
9c0227a63c9903cf407da4a713ff619e49c6bc73 24-Jun-2011 Glenn Kasten <gkasten@google.com> JetPlayer uses C++ Thread not createThreadEtc

This permits leveraging future improvements to Thread.

Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
ibmedia/JetPlayer.cpp
99d544332a6e79d9f4fa6d981f95e8ba6c037ab7 23-Jun-2011 Glenn Kasten <gkasten@google.com> Bug 4903178 Restore priority and cgroup on stop

On AudioTrack and AudioRecord stop or failed start, restore the priority
and cgroup of the caller to their previous values, rather than forcing
to NORMAL. Dependent on new thread APIs.

Also fixes bug where priority was set to AUDIO but cgroup not set.

Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
b0e6d4f87fc727469af6d0fc76420e989304872c 16-Nov-2011 Mike Lockwood <lockwood@android.com> Merge "AudioManager: Add wrapper methods for master volume support" into ics-aah
c614df96507229eda13c029176ecc8f424a9854b 16-Nov-2011 Mike Lockwood <lockwood@android.com> AudioManager: Add wrapper methods for master volume support

Change-Id: Ibfc24f052d05824175f71c2138ba041c94c3def7
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
22cf4b0c5f76c9bcf9103af21b29c9b532ea52c2 16-Nov-2011 Andreas Huber <andih@google.com> Make sure not to cancel pending seek/EOS notifications on a cache underrun...

or they are lost for good.

Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62
related-to-bug: 5544907
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
47a0a8832f819b3b55c503aa787d615f036b7100 16-Nov-2011 Mike Lockwood <lockwood@android.com> Merge "AudioManager: Add support for master mute" into ics-aah
0e7d85fa93a5f5975b437277439b3c65f86cf275 16-Nov-2011 James Dong <jdong@google.com> am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1

* commit '4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
Document that release() should be called with onPause() and onStop() for media objects
541e2e6695a7a332c9e1dc0785fb2bd5d2926fc0 16-Nov-2011 James Dong <jdong@google.com> am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1

* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
Document that release() should be called with onPause() and onStop() for media objects
4fdc36e6d6003cdce911678f0b233697554f8dbf 16-Nov-2011 James Dong <jdong@google.com> Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
29270da5f7dee7e81b9d69446c7d2030aea6ff74 16-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> am 4978c1a5: am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1

* commit '4978c1a5b07782d622ca9e3eedd649a5927d226f':
Fix 5623252 unlink to death of audio focus client early
08b2d32628d6c6230493dfcfdeafa219248f2ee5 16-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1

* commit '0ddb0143895b816d4ff5c174b346390e07f26556':
Fix 5623252 unlink to death of audio focus client early
89ca6983eb2be21848f5ac884a2c118f152c83e6 15-Nov-2011 James Dong <jdong@google.com> Document that release() should be called with onPause() and onStop() for media objects

Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug: 5616833
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
e7edc868538e83152e7bc35c830fee0d629baefc 16-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix 5623252 unlink to death of audio focus client early

When removing an entry in the audio focus stack, don't wait for
this object's finalizer to unlink to the death of the associated
client, and unlink right away.
The FocusStackEntry.unlinkToDeath() method is made safe to call
by catching the exception it can throw inside its body.

Change-Id: Id347a933d72dcb41531adff2854fb00277032cc9
ava/android/media/AudioService.java
cc6c20f5321e39ee75172f329450dd60a69c980f 15-Nov-2011 Hong Teng <hongteng@google.com> am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1

* commit '716747f7cb29b45e41c2870f12d39095f4ed80c8':
Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
eb80b31b5548650675c078ccfffc3091402a9382 15-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> am 87597d9c: am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1

* commit '87597d9ce00691f05703f728c17548df2bbc9cc2':
Fix 5615747 Don't leak remote control client death handlers
cfbcd3bf21c8453e9afd7740fdb7fc272c362389 14-Nov-2011 Mike Lockwood <lockwood@android.com> AudioManager: Add support for master mute

Change-Id: I98e87d1e266e0523c4aacb23cc5c4b3fdc7a1eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
3f84160e95f08a217b8f1233031fe4da109738b2 15-Nov-2011 Hong Teng <hongteng@google.com> am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1

* commit '481ffa505bb1d8f5089ea98e3b5960d409b6819c':
Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
481ffa505bb1d8f5089ea98e3b5960d409b6819c 15-Nov-2011 Hong Teng <hongteng@google.com> Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
0dba46f9b295ad1ec1cbeda0fd28d90624028816 15-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1

* commit '538dc6acfd14ea59f0b294531f9417ca04ca621f':
Fix 5615747 Don't leak remote control client death handlers
a9509736c85c19fe4ad4ba97a0545f0422a3dfc1 15-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix 5615747 Don't leak remote control client death handlers

Whenever a remote control stack entry is GC'd or removed from
the stack, unlink its death handler.

Change-Id: Ia4ed6667351849fd388272591e24ffc16959beaf
ava/android/media/AudioService.java
f1ec32db686586eddd023583e1c5978005c06d58 14-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> am 9d36a995: am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1

* commit '9d36a99582518ed1a7fb005382e0128479b43e18':
Fix 5607938 AudioFocusDeathHandler leaks GREF
09d936feb886502c5dd78497dc0c5fd578751a9d 14-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1

* commit '258576a82c2293c3a988bf2dc6744fd8082421f9':
Fix 5607938 AudioFocusDeathHandler leaks GREF
7eb531970305f938c8e3bdc564bed6156fbd8f06 10-Nov-2011 Hong Teng <hongteng@google.com> Fix for issue 5309336
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.

Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
ibmedia/MediaProfiles.cpp
527c44e8a455dd0fdef1aeb6d7d8f99bb0839295 14-Nov-2011 Glenn Kasten <gkasten@google.com> Merge "Don't check return value of new for being == null"
de1f065be109e1c313d8330c8e34210fedaac74e 12-Nov-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix 5607938 AudioFocusDeathHandler leaks GREF

The AudioFocus death handler was correctly updating the audio
focus stack when an audio focus client dies, but the death handler
was leaking GREF if unlinkToDeath() is not called.
The fix consists in making sure unlinkToDeath() is always called
by calling it in its finalizer.

Change-Id: I0c5343b4986ab582cadbf171fc53816952dc16f5
ava/android/media/AudioService.java
c512fd065c2bb4f5d39bb13f45d3fb32370f6880 11-Nov-2011 James Dong <jdong@google.com> am 9a176507: am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1

* commit '9a176507a96ceb3640a56a5449e96fc3e406a765':
Unhide the key to retriever location information in 3gp/mp4 files
3dc44d9afe72fc1975dcf7d8b883fc101047b2be 11-Nov-2011 Andreas Huber <andih@google.com> am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1

* commit '8a0654231ff36d938bc3451190cf67231195f1d0':
Didn't mean to check this in...
ff1fa5ef933a7e3c5e00f39b196fc6d480e5c27d 11-Nov-2011 Eric Laurent <elaurent@google.com> am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1

* commit '2c29a5cf1658532bca4e34f816fa30312241a336':
visualizer: reset buffer if playback is idle
d8ad2fab90b4f6eb50ba9c45e140811bad848384 11-Nov-2011 Andreas Huber <andih@google.com> am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1

* commit '40461ee70161d8568663332f72be2353b04c34e7':
Instead of asserting, signal a runtime error if the session doesn't contain
ff0bd468d8cf0f51c07927c758563a3f696c32a4 11-Nov-2011 Andreas Huber <andih@google.com> am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1

* commit '9c981cd3d53238f10842368c1cd82d625b701a47':
Disconnect on socket error on the RTSP control connection.
0997fcb6db8789057b8840e02b9fb55d0791fdd8 11-Nov-2011 James Dong <jdong@google.com> am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1

* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
Unhide the key to retriever location information in 3gp/mp4 files
f86639183db54378fcc45247a2c8adaa15f76434 11-Nov-2011 Andreas Huber <andih@google.com> am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1

* commit '23217182743521063655c6fb1b1580d3558cfbe7':
Didn't mean to check this in...
9b5b5858e0b43ac16157d1b7dff025f69b74bcd9 11-Nov-2011 Eric Laurent <elaurent@google.com> am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1

* commit '1f8c621279ddb163ee3d63bf32d79955679db0c5':
visualizer: reset buffer if playback is idle
fa0da0e5a50bf36c611333d7f8e896e71ad3ec56 11-Nov-2011 Andreas Huber <andih@google.com> am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1

* commit 'cd556b82fd12dceb49e9d6543f80212721b220ec':
Instead of asserting, signal a runtime error if the session doesn't contain
9a2bdea328b3e61eb131ea1578a6f46deaf3093b 11-Nov-2011 Andreas Huber <andih@google.com> am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1

* commit '5d42075e450a49af2bb37ca3a9610921df7607f2':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
1a85af68fc1920412f76ba00c08b8f987ae624e9 11-Nov-2011 Andreas Huber <andih@google.com> am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1

* commit 'd9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
Disconnect on socket error on the RTSP control connection.
d9245e17dc97efb06ac4b26bd1dbfd97f87208d9 11-Nov-2011 James Dong <jdong@google.com> am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1

* commit '08e42967b9e459b7beb22e859f1f1eba0546741b':
Add support for retrieving location information in mp4/3gpp files
b7a000a6fb84ae75847e730332bae62ba1234999 11-Nov-2011 James Dong <jdong@google.com> Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
23217182743521063655c6fb1b1580d3558cfbe7 11-Nov-2011 Andreas Huber <andih@google.com> Merge "Didn't mean to check this in..." into ics-mr1
54c7efa4dd7300a2ab008d392a83bfbdf97cdfad 11-Nov-2011 Andreas Huber <andih@google.com> Didn't mean to check this in...

Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
ibstagefright/rtsp/MyHandler.h
1f8c621279ddb163ee3d63bf32d79955679db0c5 11-Nov-2011 Eric Laurent <elaurent@google.com> Merge "visualizer: reset buffer if playback is idle" into ics-mr1
cd556b82fd12dceb49e9d6543f80212721b220ec 11-Nov-2011 Andreas Huber <andih@google.com> Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
5d42075e450a49af2bb37ca3a9610921df7607f2 11-Nov-2011 Andreas Huber <andih@google.com> Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
d9f25bc941746f268ab978e6b2af7b7c4ec2ea89 11-Nov-2011 Andreas Huber <andih@google.com> Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
f4c3cc06cb5d748e804a81e693175e00ccf06051 11-Nov-2011 James Dong <jdong@google.com> am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1

* commit '510180f162dee3ae5416a98caa07f58a754f4b3f':
Add support for retrieving location information in mp4/3gpp files
62b9aec7a0a4e1cf8cfec7e39ea3103ab510d72e 07-Nov-2011 Glenn Kasten <gkasten@google.com> Don't check return value of new for being == null

new either succeeds or throws an exception

Change-Id: I1615e10c4f6730495c49e56b64714a00141ea8ff
ava/android/media/AudioService.java
ava/android/media/SoundPool.java
ava/android/media/ThumbnailUtils.java
00aa51b355d2b9ae7604fe4c43f6e64193422dba 10-Nov-2011 James Dong <jdong@google.com> Unhide the key to retriever location information in 3gp/mp4 files

Change-Id: I71c651b403955c0f6f8df096e995a5f5f4e39130
related-to-bug: 5560253
ava/android/media/MediaMetadataRetriever.java
03466e35f2996fd3330452e38984f0012239305e 11-Nov-2011 James Dong <jdong@google.com> Merge "Adds handler type 'sbtl' to support subtitles in various containers."
58c94bf43410af4c2db835b056ec840b72bdab4e 10-Nov-2011 Andreas Huber <andih@google.com> Disconnect on socket error on the RTSP control connection.

Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
4d7dff1706b0fced0c912ebbb999aee4ede9bb1c 09-Nov-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Instead of asserting, remove active streams if their sockets

return failure

Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug: 5593654
ibstagefright/rtsp/ARTPConnection.cpp
57cc14fcc1642e0437b791ca3056e3728808092e 10-Nov-2011 Andreas Huber <andih@google.com> Instead of asserting, signal a runtime error if the session doesn't contain

any playable tracks at all.

Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
ibstagefright/rtsp/MyHandler.h
77c500c9a1f763b31fb5a03c803b3523fcb72310 09-Nov-2011 James Dong <jdong@google.com> Add support for retrieving location information in mp4/3gpp files

Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug: 5560253
ava/android/media/MediaMetadataRetriever.java
ibstagefright/MPEG4Extractor.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
62c0c3215d479b97a7538954e635f44a1c536100 10-Nov-2011 Andreas Huber <andih@google.com> am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1

* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
Send RTSP control connection keep-alive requests
58941d8dcb528ce82eb29ef76bedfb2e4d035590 10-Nov-2011 Andreas Huber <andih@google.com> am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1

* commit '2dff5cdc362ff6026e71d4b96faea8f2d7bd7063':
Don't believe the PV decoder's lies...
2276b1774ace0fd739fea20e9a6c430a0a0e758e 10-Nov-2011 Andreas Huber <andih@google.com> am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1

* commit 'ec04f4ac23e5fe8f90267d09ddda8c0aa684c147':
There's no point in trying to continue to decode after an error was signalled.
7707cd9920219bfb57b95c61bf0e3eb1ad83795d 10-Nov-2011 Eric Laurent <elaurent@google.com> am 58f3a712: am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1

* commit '58f3a7123d0da6d35424429f3c0bbfbd32c00117':
Fix problems in tablet silent mode.
df8ab51ca664a29cf6d9d9a169286de0f36e772b 10-Nov-2011 Eric Laurent <elaurent@google.com> visualizer: reset buffer if playback is idle

Visualizer capture buffer must be reset if audio framework has stopped
calling process for a given period of time to get read of residual
data from previous captures.

Issue 5571920.

Change-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb
ibeffects/visualizer/EffectVisualizer.cpp
4af012a790be8db476fc24fe5fb8fd4743d720f1 10-Nov-2011 Andreas Huber <andih@google.com> am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1

* commit '2375d16378e6f8b7694c5a2cd9e0622e382e6049':
Send RTSP control connection keep-alive requests
ed894a5860228a9b7ad4ce2aee21c5e20b039d04 10-Nov-2011 Andreas Huber <andih@google.com> am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1

* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
Don't believe the PV decoder's lies...
bb2194c898ac4407f3e62566cb1bd2f2992ba972 10-Nov-2011 Andreas Huber <andih@google.com> am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1

* commit '7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
There's no point in trying to continue to decode after an error was signalled.
2375d16378e6f8b7694c5a2cd9e0622e382e6049 10-Nov-2011 Andreas Huber <andih@google.com> Merge "Send RTSP control connection keep-alive requests" into ics-mr1
b42aea5b4c7cc7b2766f80f5ceda94b324d776e5 10-Nov-2011 Andreas Huber <andih@google.com> Merge "Don't believe the PV decoder's lies..." into ics-mr1
7c063cf9679a2ecdda5e1639cfdca3e1084019f9 10-Nov-2011 Andreas Huber <andih@google.com> Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1
43f7bbdfbb26f9938e74558f2c1bf2260ec50fdf 10-Nov-2011 Eric Laurent <elaurent@google.com> am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1

* commit '7c61fa70a50e15466f807dd194e530bc4fd3a96a':
Fix problems in tablet silent mode.
1bc76127afee16c851a100370d4bb2987e94b362 10-Nov-2011 Insun Kang <insun@google.com> Adds handler type 'sbtl' to support subtitles in various containers.

Change-Id: I16d2c5d9aeb087b958e28052f266ca0ef42ea7f1
ibstagefright/MPEG4Extractor.cpp
96a33d1caad2fab0bc28891cfbf553f4b050bf0b 08-Nov-2011 Eric Laurent <elaurent@google.com> Fix problems in tablet silent mode.

Do not enter silent mode when ALARM stream volume is changed
to 0 by volume down key: Only RING, NOTIFICATION and MUSIC
streams control silent mode.

Report correct volume (0) for NOTIFICATION stream when silent mode
is entered by changing NOTIFICATION stream volume to 0 with
volume down key.

Change-Id: I3e0816dfae40bc127cc30cca02cdca6ec19e30a4
ava/android/media/AudioService.java
b516b96d889f78345d81ce499e9258876bbf8014 09-Nov-2011 Andreas Huber <andih@google.com> Merge "Instead of asserting, remove active streams if their sockets return failure"
05079be1849df74d63e70153fe8b46b088e8cd74 09-Nov-2011 Andreas Huber <andih@google.com> Instead of asserting, remove active streams if their sockets return failure

Change-Id: Ic5cc786f718cf921876b181927cf1b03e8373ff1
related-to-bug: 5593654
ibstagefright/rtsp/ARTPConnection.cpp
714211068e77507baf227fad86ad88b9248b9236 09-Nov-2011 Glenn Kasten <gkasten@google.com> am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

* commit 'bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad':
Bug 5478024 drop after decode if can't drop before
a6e1ceefc6541065ab4a0eb3692d23ee52fd6161 09-Nov-2011 Glenn Kasten <gkasten@google.com> am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
Bug 5478024 drop after decode if can't drop before
3f99d953129a41d25b5f5f7b8341c67cf5198248 09-Nov-2011 Andreas Huber <andih@google.com> There's no point in trying to continue to decode after an error was signalled.

Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug: 5588658
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.h
977702929b085882aa7a748711cc3280f3195fbe 09-Nov-2011 Andreas Huber <andih@google.com> Don't believe the PV decoder's lies...

Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2 09-Nov-2011 Glenn Kasten <gkasten@google.com> am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

* commit '19998120f53caceb620f138c6eea182f1e693660':
Bug 5478024 drop after decode if can't drop before
bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad 09-Nov-2011 Glenn Kasten <gkasten@google.com> am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

* commit '19998120f53caceb620f138c6eea182f1e693660':
Bug 5478024 drop after decode if can't drop before
a1b3e3d49ea04cc42aadbd07a6304008fda1e515 09-Nov-2011 Andreas Huber <andih@google.com> Send RTSP control connection keep-alive requests

default to 60 secs unless overridden by server's session-id response.

Change-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c
related-to-bug: 5562303
ibstagefright/rtsp/MyHandler.h
6026b825de2594b08f3ecca68105ee44dda1a95e 08-Nov-2011 Mike Lockwood <lockwood@android.com> Merge "AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set." into ics-aah
ea427b0c87a52d5e770f50856401a81ff2658cc4 08-Nov-2011 Andreas Huber <andih@google.com> resolved conflicts for merge of 26f70db9 to master

Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
a2aa08e20cb4f1e302bb7ae05882cd1be8cfa0d2 08-Nov-2011 Mike Lockwood <lockwood@android.com> AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.

This allows Music2 and other media apps to control master volume without changing their code

Bug: 5567694

Change-Id: I48b6260b193b22c395be5a31cd1d270b2929a91e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
d6739fccfc3f97a94366c537797b7b9821e64e15 08-Nov-2011 Andreas Huber <andih@google.com> am 26f70db9: Merge "Remove surface legacy APIs and code." into ics-mr1

* commit '26f70db99f483be36caa7a4c84fec5de50bec034':
Remove surface legacy APIs and code.
26f70db99f483be36caa7a4c84fec5de50bec034 08-Nov-2011 Andreas Huber <andih@google.com> Merge "Remove surface legacy APIs and code." into ics-mr1
30885bd4799d16c4ffc0ab609e649dad8ed6119c 08-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 713c9a33: Merge "Fix 5509346: Resize the thumbnails if it\'s too large." into ics-mr1

* commit '713c9a331e226c970af57c59ff17be29b73025c1':
Fix 5509346: Resize the thumbnails if it's too large.
e271031f5b2da73bf8b7f9f43658a9f2df29b382 08-Nov-2011 Chih-Chung Chang <chihchung@google.com> am 713c9a33: Merge "Fix 5509346: Resize the thumbnails if it\'s too large." into ics-mr1

* commit '713c9a331e226c970af57c59ff17be29b73025c1':
Fix 5509346: Resize the thumbnails if it's too large.
977442c48740a1b2edd4e95a21afe1d0033f1ef4 08-Nov-2011 James Dong <jdong@google.com> am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1

* commit 'ee7ebb3257d9337627b175835dc3d08f9b8ab339':
Fix a hang issue where the first frame can be dropped for timelapse video recording.
713c9a331e226c970af57c59ff17be29b73025c1 08-Nov-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1
44e4983db403af8ec851dc07fb9265a2a12583e0 08-Nov-2011 James Dong <jdong@google.com> am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1

* commit 'ee7ebb3257d9337627b175835dc3d08f9b8ab339':
Fix a hang issue where the first frame can be dropped for timelapse video recording.
ee7ebb3257d9337627b175835dc3d08f9b8ab339 08-Nov-2011 James Dong <jdong@google.com> Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
014f69217d903234b4eaff8872b19a76d62860e3 08-Nov-2011 Andreas Huber <andih@google.com> Merge "Use binary search to discover closest sync sample index, replace"
43b28298a63d7aa3155353287f773df71cda3be4 07-Nov-2011 Andreas Huber <andih@google.com> Use binary search to discover closest sync sample index, replace

assertions with runtime errors in case the file's table of sync sample
indices is not sorted properly.

Change-Id: Ie4446a44e613a8d329ac680c37361d4407d22520
related-to-bug: 5549855
ibstagefright/SampleTable.cpp
b1224ff1c4ef8324c9d76b857463787aabd84707 07-Nov-2011 Chih-Chung Chang <chihchung@google.com> Fix 5509346: Resize the thumbnails if it's too large.

Change-Id: I805f37f22cc745cfbc788f594da704e7e634f122
ava/android/media/videoeditor/MediaImageItem.java
3a8f6bedc33f607875298699df96dae295404582 05-Nov-2011 Eric Laurent <elaurent@google.com> resolved conflicts for merge of 914972be to master

Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
f434fb50a6b4c3d7f14e480ec0976b5c072b7a4c 05-Nov-2011 Eric Laurent <elaurent@google.com> resolved conflicts for merge of 79178b8b to master

Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
f330986fa843c22304e1cfc42e55a050a7bfe556 05-Nov-2011 Glenn Kasten <gkasten@google.com> Bug 5478024 drop after decode if can't drop before

Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
9f71bb7ee603288528d2130eeac160e23ade0c45 04-Nov-2011 Eric Laurent <elaurent@google.com> am 914972be: Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1

* commit '914972be65bef1fd7e886825e7af27c29eff0a1e':
Fix device management in lvm effect bundle wrapper.
86a464557ddc297c4509cef72edd1d1620e4d03e 04-Nov-2011 Eric Laurent <elaurent@google.com> am 79178b8b: Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1

* commit '79178b8b3da8f69f34a72be13f2a374afbec4f40':
Fix problem in lvm effect bundle wrapper.
914972be65bef1fd7e886825e7af27c29eff0a1e 04-Nov-2011 Eric Laurent <elaurent@google.com> Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
79178b8b3da8f69f34a72be13f2a374afbec4f40 04-Nov-2011 Eric Laurent <elaurent@google.com> Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
efa4015ae3818cedeec7f4af65877a173b65d8e5 03-Nov-2011 Andreas Huber <andih@google.com> DO NOT MERGE Poll input data with a small timeout and don't consume a full core.

Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
ibmediaplayerservice/nuplayer/NuPlayer.cpp
a4e702c2da02975276a46303ec78554e0d952905 03-Nov-2011 Marco Nelissen <marcone@google.com> am f51f1bd9: Verify we actually have valid utf8 metadata

* commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
Verify we actually have valid utf8 metadata
8f5de069c85877982f46096c4ea39dcdc6b15d83 03-Nov-2011 Marco Nelissen <marcone@google.com> am f51f1bd9: Verify we actually have valid utf8 metadata

* commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
Verify we actually have valid utf8 metadata
f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca 02-Nov-2011 Marco Nelissen <marcone@google.com> Verify we actually have valid utf8 metadata

Before calling NewStringUTF, check that the metadata value is actually
valid utf-8, and replace the offending characters with "?" if it is not.
b/5534491

Change-Id: I43de4307e739ae0b7d4177937ed33aa1dfb90d98
ni/android_media_MediaScanner.cpp
57f2887c33080f9021a8aacce6a87db0214f5e29 03-Nov-2011 Andreas Huber <andih@google.com> am e395f645: Poll input data with a small timeout and don\'t consume a full core.

* commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617':
Poll input data with a small timeout and don't consume a full core.
28db4fe0510205ed25da01b2bed8333e29027481 03-Nov-2011 Andreas Huber <andih@google.com> am e395f645: Poll input data with a small timeout and don\'t consume a full core.

* commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617':
Poll input data with a small timeout and don't consume a full core.
e395f645aa4c30a4fad8beb3da6f8fad72338617 03-Nov-2011 Andreas Huber <andih@google.com> Poll input data with a small timeout and don't consume a full core.

Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
ibmediaplayerservice/nuplayer/NuPlayer.cpp
70fc06ebfe4b9ee466f21a64613075ff7e5a8a96 03-Nov-2011 Eric Laurent <elaurent@google.com> am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1

* commit '1f85f1dc6ebe3c79ce753f0f9c2f9fa7f29f493d':
Remove unreliable effect tests.
4aebcaaa8590dbb80fcb55e323e971a23a24b13f 03-Nov-2011 Eric Laurent <elaurent@google.com> am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1

* commit '1f85f1dc6ebe3c79ce753f0f9c2f9fa7f29f493d':
Remove unreliable effect tests.
be5fc40fe720e684bc6a976f0b1f4ccbf83847c2 03-Nov-2011 Eric Laurent <elaurent@google.com> Remove unreliable effect tests.

Remove automated tests checking that audio effects are actually processing
the signal based on visualizer captures.
This method is too unreliable when used to measure energy at given frequencies and
often gives false negatives.

Issue 5542879.

Change-Id: Ib31158fd84ff9edc85712ec03c0c9957370c8f84
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaBassBoostTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEqualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVirtualizerTest.java
8b4529e50b754a94628b4e349dfc4dfb939ffaa1 01-Nov-2011 Eric Laurent <elaurent@google.com> Fix problem in lvm effect bundle wrapper.

When an effect is disabled, the process function should either
copy or accumulate the content of the input buffer to the output buffer
depending on the behavior requested by the framework.
Current implementation is copying the input buffer unconditionally.

Related to issue 5433942.

Change-Id: Ic488ca97eadcc4c763de570d7e6c6f5b7a979415
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
19774dda20959c43f1539a134467f5050b694fd2 01-Nov-2011 Eric Laurent <elaurent@google.com> am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0

* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
Fix volume indication in vibrate mode.
fe5f0aae6546ff673a6f01298f427bcd568bdd1a 01-Nov-2011 Andreas Huber <andih@google.com> Properly decode ADTS files with ID3 headers.

Change-Id: I55247e79ac9cc9547e3e0f6fe048bcbdc9b639d1
ibstagefright/AACExtractor.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/include/AACExtractor.h
b0c6e3bcf1443f9e185e92dc3833e60158b1197e 01-Nov-2011 Eric Laurent <elaurent@google.com> Fix device management in lvm effect bundle wrapper.

The virtualizer and bass boost effects should be disabled when
not playing throught headsets or headphones.

There is a bug in current wrapper implementation that makes that those
effects are not disabled if the effect is enabled by the user after
the headset has been removed (current logic only works if the device selection
occurs while the effect is enabled).

Change-Id: I7c66b15a0339d95fb9ed13c8320d66379725d3b6
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
688ff9a7d6c42d4b26f1a72f963d09203f774c3f 01-Nov-2011 Andreas Huber <andih@google.com> Merge "Support new HLS byte-range extensions"
4528548a06224382ee4c9cb575c8b10ae9f02f1e 01-Nov-2011 Eric Laurent <elaurent@google.com> am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0

* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
Fix volume indication in vibrate mode.
cd84197ac1226432de2e13c8fd678a4c88511e0f 01-Nov-2011 Eric Laurent <elaurent@google.com> am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0

* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
Fix volume indication in vibrate mode.
468825f60a722dba0961a97b851e4f951e38929e 31-Oct-2011 Amith Yamasani <yamasani@google.com> am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0

* commit '18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
796da70392a6e84ea01bf4d5f08850bbcd104816 08-Aug-2011 Andreas Huber <andih@google.com> Support new HLS byte-range extensions

Change-Id: Ic767ddea93ffcb87d83b8fbc20837486648da3d7
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/include/LiveSession.h
ibstagefright/include/M3UParser.h
8ca9a1cf350bde9a429b8a6fe7c673b964048a54 31-Oct-2011 Eric Laurent <elaurent@google.com> Fix volume indication in vibrate mode.

The latest change in silent/vibrate mode selection via volume keys
was such that ringtone volume was not showing 0 when entering vibrate mode
by continuous press on vol down.

Issue 5530217.

Change-Id: I9ba817648e5dca40e0d19f5f606d7763ae61b1c6
ava/android/media/AudioService.java
92537e6ff21d4b20738fae851c2174ea568eb843 31-Oct-2011 Ed Heyl <ed@google.com> merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
eba186448ff048f8fc1ba596c9779e8069a93128 31-Oct-2011 Joe Fernandez <joefernandez@google.com> am 74b2b954: am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0

* commit '74b2b9547329a0b05e0bd5701057696007b854bb':
docs: add developer guide cross references, Project ACRE, round 3
18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb 30-Oct-2011 Amith Yamasani <yamasani@google.com> am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0

* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
74b2b9547329a0b05e0bd5701057696007b854bb 29-Oct-2011 Joe Fernandez <joefernandez@google.com> am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0

* commit '09848bc89de999416e2de82a7693b2deec6bf802':
docs: add developer guide cross references, Project ACRE, round 3
69e640ee84fc218d6318acaf73a1c1841d7fba6b 29-Oct-2011 Amith Yamasani <yamasani@google.com> Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
c696a53d1fe4d61373c5dc64dd057d322da90c8f 29-Oct-2011 Amith Yamasani <yamasani@google.com> Bring back the old-style Ring/Vibrate/Silent states when using volume keys.

In order to completely mute the ringer (no vibrate), introduce an extra
state beyond mute, which mutes the vibrator as well, if it was enabled.

Bug: 5530217

Change-Id: Ib1f299ee6bbca56c1aa7e1100662591362d08307
ava/android/media/AudioService.java
09848bc89de999416e2de82a7693b2deec6bf802 29-Oct-2011 Joe Fernandez <joefernandez@google.com> Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
61fd1e8d8c3ccf2d6b7d4af1c19e8f0988d5a1ec 26-Oct-2011 Joe Fernandez <joefernandez@google.com> docs: add developer guide cross references, Project ACRE, round 3

Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
ava/android/media/JetPlayer.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
95be24585f46229f551c529104b5e92fa4316b38 25-Oct-2011 Andreas Huber <andih@google.com> Remove surface legacy APIs and code.

All surfaces are now supported through surface textures.

Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/TestPlayerStub.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
ests/players/invoke_mock_media_player.cpp
e10d9126e5b54d5310c7b7f87d46de5b680faf1e 28-Oct-2011 Andreas Huber <andih@google.com> am 27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1

* commit '27ed12492dfbec6ec67b66ff3cf60febce370b01':
Properly report that we're no longer playing after receiving event
27ed12492dfbec6ec67b66ff3cf60febce370b01 28-Oct-2011 Andreas Huber <andih@google.com> Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
5020e7e2d37865da862846b97d9959e83244a35e 27-Oct-2011 Mike Lockwood <lockwood@android.com> VolumePanel: Add support for master volume

Change-Id: I3119eb2b7d3b5e7ce87f1660b50c10ab79c7bbdf
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
619f06444bc828c6cf5c3fa4f4a309c9497dab45 25-Oct-2011 Mike Lockwood <lockwood@android.com> Save and restore master volume in the settings provider

Change-Id: I135c48155c41735c870e3934469c47f05bd74973
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioService.java
dff25597a9a862143c69e70e6ed86790538c23c1 25-Oct-2011 Mike Lockwood <lockwood@android.com> Simple master volume support

Still needs integration with Settings (for persistence) and VolumePanel UI.

Change-Id: I9eca92c4b1ef2df2564411006a35753ab9618dce
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/IAudioService.aidl
14d21d9bd9b65ad29e863a20cfa71190fbab1119 16-Sep-2011 Jason Simmons <jsimmons@google.com> Configure the A@H TX media player with one string

Music2 would prefer a configuration interface that takes a single
blob of data passed in from the RPC client and then passes it
opaquely to the media player. This eliminates the need for Music2
to rev their application if we add more configuration options to
the TX player.

Change-Id: Ia2daea3ff2502f91f8a5a82b898752c435279a0f
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
e066b8fce42f6c697c8808c8a1db9a7e471eefdc 15-Sep-2011 Jason Simmons <jsimmons@google.com> Ensure that the TRTP retry buffer has contiguous sequence numbers

Previously, sequence numbers for audio packets were assigned by the
TX player before packets were queued to the sender. This caused a
race between assignment of sequence numbers on audio packets and
sequence numbers on heartbeat packets. A heartbeat could get queued
and added to the retry buffer before an audio packet with an earlier
sequence number got queued.

This CL centralizes packet sequence number assignment and insertion
into the retry buffer inside AAH_TXSender::doSendPacket_l. It also
makes explicit what operations can be done on a TRTPPacket before
and after packing.

Change-Id: I6d02eae81061983e4def4f1b3dd7c1625467b151
ibaah_rtp/aah_tx_packet.cpp
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_sender.cpp
ibaah_rtp/aah_tx_sender.h
1ce5eb61471cbefd1fea4fa19f360057de2b7d02 13-Sep-2011 Jason Simmons <jsimmons@google.com> Hold the AAHDecoderPump ThreadWrapper in a ref-counting pointer

Change-Id: Iff840dbd9e1f79a07e62c1481b2b0797f30247cb
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_decoder_pump.h
ibaah_rtp/aah_rx_player_substream.cpp
c15a71e59aa4dffecbc66eea32510bf3ee65e1af 15-Aug-2011 Mike J. Chen <mjchen@google.com> MediaPlayer changes for Tungsten/Android@Home.

Squashed merge from master-tungsten of the following changes:

commit e8b156c6b224f0fe5b6a81d5f92bade36275027c
Author: Jason Simmons <jsimmons@google.com>
Date: Fri Aug 12 10:28:48 2011 -0700

Add a null check to handle failure of android::createPlayer

Change-Id: Iacbbc90369a825838d4374b1f774c8880b25753b

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date: Mon Jun 27 18:59:12 2011 -0700

Move libaah_rtp over from the vendor directory.

Also move factor PipeEvent out into utils.

Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

commit 17526eb3148c9c3d4365b6d5b47e8dc13bca71b6
Author: John Grossman <johngro@google.com>
Date: Mon Jun 27 17:06:49 2011 -0700

Name changes for the TRTP Players s/tungsten/aah/g

Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51

commit cbf2903ab6893b6e662514e2f6d670e268a419df
Author: John Grossman <johngro@google.com>
Date: Fri Apr 15 09:27:54 2011 -0700

Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.

Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502

Change-Id: I73f3be191cd974933acddf52892e5600d253cc03
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
ibmediaplayerservice/MediaPlayerService.cpp
06e04e4c17fe503b1caced9600ef31d6cb646bc7 15-Aug-2011 Mike J. Chen <mjchen@google.com> Add media/libaah_rtp

RTP library used to broadcast media from one device to a collection
of listeners. Handles failures/retries/etc.

This is a squashed merge from master-tungsten of the following changes:

commit e1a5101fe627d71739a7c4263bb3a65c7bc44385
Author: Jason Simmons <jsimmons@google.com>
Date: Fri Aug 12 13:24:21 2011 -0700

Hold ThreadWrapper in a ref-counting pointer

Change-Id: Iaf3343182e37bcc0ca99fbaf8f9bbb8c4984072a

commit 89b90d62e164ff3db27c9cba85255fc476d2dd96
Author: Jason Simmons <jsimmons@google.com>
Date: Wed Aug 10 13:08:25 2011 -0700

Update the Tungsten TX player to use HTTPBase

Change-Id: I9f7ecf1b4b496cec1815284dbcdb958a43284169

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date: Mon Jun 27 18:59:12 2011 -0700

Move libaah_rtp over from the vendor directory.

Also move factor PipeEvent out into utils.

Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

Change-Id: I5fe1ea941c09204d7b33f15f4e2b2ab320dc468b
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
Signed-off-by: Jason Simmons <jsimmons@google.com>
ibaah_rtp/Android.mk
ibaah_rtp/aah_decoder_pump.cpp
ibaah_rtp/aah_decoder_pump.h
ibaah_rtp/aah_rx_player.cpp
ibaah_rtp/aah_rx_player.h
ibaah_rtp/aah_rx_player_core.cpp
ibaah_rtp/aah_rx_player_ring_buffer.cpp
ibaah_rtp/aah_rx_player_substream.cpp
ibaah_rtp/aah_tx_packet.cpp
ibaah_rtp/aah_tx_packet.h
ibaah_rtp/aah_tx_player.cpp
ibaah_rtp/aah_tx_player.h
ibaah_rtp/aah_tx_sender.cpp
ibaah_rtp/aah_tx_sender.h
ibaah_rtp/pipe_event.cpp
ibaah_rtp/pipe_event.h
ibmediaplayerservice/Android.mk
7bce396226455ee22714c9e5967bae6cea7e4b23 15-Aug-2011 Mike J. Chen <mjchen@google.com> Media framework changes for Tungsten.

Squashed merge from master-tungsten of the following changes:

commit 73d09e18c4557e583a1684d44d598a1a02fd0cf2
Author: John Grossman <johngro@google.com>
Date: Mon Jun 20 13:57:44 2011 -0700

Remove TungstenMisc and rename LinearTransform

Change-Id: Ie8aa3e24e09fdbf6ef8996c26deb9c5640e20d1b

commit 3114aabe76ad733b59929d87e49c68229f5ae2e8
Author: John Grossman <johngro@google.com>
Date: Fri Jun 3 10:47:16 2011 -0700

Name changes and spelling fixes.

+ Replace the term TungstenTime with the Eugene-approved term CommonTime.
+ Fix a spelling error in a comment I noticed.

Change-Id: I8c10d618206826d16055f78c7724e24443bb03fd

commit cbf2903ab6893b6e662514e2f6d670e268a419df
Author: John Grossman <johngro@google.com>
Date: Fri Apr 15 09:27:54 2011 -0700

Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.

Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502

commit bc7c46aa629f9883e959ef23de8da297f9eb508b
Author: Jason Simmons <jsimmons@google.com>
Date: Mon Jun 20 13:59:17 2011 -0700

Create a separate class for timed AudioTracks

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date: Mon Jun 27 18:59:12 2011 -0700

Move libaah_rtp over from the vendor directory.

Also move factor PipeEvent out into utils.

Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

commit 17526eb3148c9c3d4365b6d5b47e8dc13bca71b6
Author: John Grossman <johngro@google.com>
Date: Mon Jun 27 17:06:49 2011 -0700

Name changes for the TRTP Players s/tungsten/aah/g

Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51

commit 423fc1bfc0fda799c421a650c83c4b9293b1a08c
Author: Jason Simmons <jsimmons@google.com>
Date: Mon Jun 20 17:56:09 2011 -0700

More timed AudioFlinger changes requested by code review:
* change trimTimedBufferQueue to trimTimedBufferQueue_l
* create one timed audio buffer heap per client process instead of one per track
* grow the silence buffer on demand
* some error handling fixes in timed getNextBuffer
* calculate the next output PTS in all mixer and track hooks

Change-Id: Ifc51a08b55029b7c48902ab2f22933ad7bafe1ad

commit a148e2674b1d3cb73289b82b85c333f0a66824a9
Author: John Grossman <johngro@google.com>
Date: Mon Jun 20 17:02:24 2011 -0700

Move the A@H time service into frameworks/base

Change-Id: I5c570cde70e8931e205516cb33517585804ce841

commit dfa438fa49bdaeeb2ec5fd0d17b30d881608b6b1
Author: John Grossman <johngro@google.com>
Date: Mon Jun 20 11:55:36 2011 -0700

Fix the build after Mike's code moving.

Change-Id: Ia883643ded252168bcc5a70584ab6ce97bb05266

commit 04489474ec8e73efe1bf52918831f41659033162
Author: John Grossman <johngro@google.com>
Date: Fri Jun 17 14:19:50 2011 -0700

Refactor the local/common clock services.

This change is one of a set of 5 changes made to different repositories. Look
for this comment in all of them.

Refactor the local/common clock services in tungsten to match android best
practice. Notable changes include

+ The kernel no longer knows anything about common time. Common time has been
moved completely up into user land. This has an impact on the accuracy of the
timesync debugging code, and the netfilter assisted approach to network based
timesync is going to have to be modified.
+ The timesync driver used by A@H is now just local time driver.
+ The kernel no longer needs access to the linear transform math code, and it
has been removed.
+ A new HAL has been introduced to expose the concept of local time to the
system.
+ A non-slewable stub implementation of the local time HAL based on
CLOCK_MONOTONIC has been added.
+ The TungstenTime library has been eliminated. Its functionality has been
distributed among the common time binder service, the local time hal and the
linear transform utility code.
+ All clients of the old TungstenTime library have been changed to be clients of
the binder service, the hal and the utility code.
+ The reset_tt utilities have been removed, they no longer have a purpose in the
system.
+ more progress has been made in eliminating the word "tungsten" from the code.

Things left to do include
+ Finish getting rid of tungsten from the time service.
+ Move the time service into the framework; AudioFlinger's new timed mode
depends on it and the service cannot continue to live in vendor tungsten.

Change-Id: I999b6cfb4a9d267818a86d747c35eecfc6693101

commit d48194545eed1116a84d81e2fb53315d2b0701a7
Author: Jason Simmons <jsimmons@google.com>
Date: Thu Jun 16 14:22:46 2011 -0700

Change the interface of the AudioMixer and AudioBufferProvider to accept a presentation timestamp

Change-Id: Ice2df5628d45a7f77100e7008103b35b3d3160a4

commit 02561419db82b01ffb28df38000716c612988427
Author: John Grossman <johngro@google.com>
Date: Tue May 10 14:00:21 2011 -0700

Put in a hack for controling master volume in the policy manager.
Fix initial master volume reporting.

Change-Id: Ia6caf2bbc6083c5f99fab852baa40fff10fc5fc7

commit 549cdc3ba115dc654cdade261fb055c72c6cdb79
Author: John Grossman <johngro@google.com>
Date: Wed May 4 11:46:17 2011 -0700

Make certain the logic for computing the output stream mixing point is hardened
against underflow and overflow when input and output sample rates don't match.

Change-Id: I5ebea07c9938107b435bec7413418622767e4e16

commit 8043d8ed63f51e76d452d22be7d453d4a7794530
Author: Jason Simmons <jsimmons@google.com>
Date: Wed Apr 27 18:06:27 2011 -0700

Add the patch for timed audio support to the mono resampler

Change-Id: I526f34ae9d1e8e3b0ed2fb05af3d024d5c5fe711

commit 2be89486ef23f0b0b0cc2dc25a4c0ee691043f00
Author: John Grossman <johngro@google.com>
Date: Wed Apr 27 10:38:57 2011 -0700

Extend the AudioHWInterface to allow it to specify the initial master volume used by AudioFlinger.

Change-Id: I8823330801c927494cf7ca31a6b8f9264fbfbb26

commit ff89a4d5e37e6a05a2b03f79ab4e97833dd66393
Author: John Grossman <johngro@google.com>
Date: Wed Apr 27 09:07:14 2011 -0700

Fix an issue with inconsistent volume reporting.

Changed masterVolume() to return the same value as the last call
to setMasterVolume when the HW layer is implementing master
volume control. The masterVolume/setMasterVolume API seems to be
an idea which was abandonded a long time ago; as of today the
system only ever sets it to 1.0 at startup and then never changes
it. Until we can figure out how the concept of external
amplifier gain control fits into the Android audio framework,
Tungsten is exposing this API via a hack-tastic invoke back door
in the TungstenRXPlayer and needs the getter/setter results to be
consistent.

Change-Id: I2ac730fa8fc9ee28c88f1a8e6f2e493eb5b65544

commit 086511b2d19cceb976747ac23e12b73fc7c28bea
Author: Jason Simmons <jsimmons@google.com>
Date: Mon Apr 25 16:07:19 2011 -0700

Add handling of timed audio tracks in the generic resampling mixer

Change-Id: Ic3be1d21b1117f1b233808be543c28a0dcec4792

Change-Id: I6ec5d2bca9b8ebc0acd395a7dd92e1a48fcdfa9b
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
Signed-off-by: Jason Simmons <jsimmons@google.com>
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioTrack.cpp
e396e993a55b93d2d69c78b21a5d4ce0b8c37805 28-Oct-2011 Jamie Gennis <jgennis@google.com> am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0

* commit 'fc9592f8a5f2f75207e5e532655ac294eb2b334b':
Stagefright: ANW::connect in MediaPlayerService
fc9592f8a5f2f75207e5e532655ac294eb2b334b 28-Oct-2011 Jamie Gennis <jgennis@google.com> am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0

* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
Stagefright: ANW::connect in MediaPlayerService
21122cb44eab043d3a6fde189a734def8586ecbf 28-Oct-2011 James Dong <jdong@google.com> am da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1

* commit 'da57c0e8cf7e5022dd927b51fab3c1a40a8adf54':
Report call status from AudioSource::start() to file writer
da57c0e8cf7e5022dd927b51fab3c1a40a8adf54 28-Oct-2011 James Dong <jdong@google.com> Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
b4a9fd9fafb0aa222b5a5e425d3335789cc93c04 27-Oct-2011 James Dong <jdong@google.com> am 17a5fb36: Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1

* commit '17a5fb36f88d90e30fd656d0d93b540ec2e2b84a':
Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.
17a5fb36f88d90e30fd656d0d93b540ec2e2b84a 27-Oct-2011 James Dong <jdong@google.com> Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
0a69dc071939e348cc5a99bbbfebae5d45e48686 27-Oct-2011 Andreas Huber <andih@google.com> am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1

* commit '1388aced2a5ce3aafa8b0ae922925efafb61a5e1':
Fix a reference to a stale pointer in AwesomePlayer.
1388aced2a5ce3aafa8b0ae922925efafb61a5e1 27-Oct-2011 Andreas Huber <andih@google.com> Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
33fe290ca33235d7e0988cace14de3319a9a83f1 27-Oct-2011 James Dong <jdong@google.com> Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.

Change-Id: I328d9fa83a381415d7648218a6fb93b3724bbcc6
related-to-bug: 5343832
ava/android/media/CamcorderProfile.java
ava/android/media/MediaRecorder.java
b888fd130616807ca40fd77279ad56db4394da3b 27-Oct-2011 James Dong <jdong@google.com> Fix a hang issue where the first frame can be dropped for timelapse video recording.

Change-Id: I04754f1005a983953a80a659ff13f8762d0e120c
related-to-bug: 5523502
ibstagefright/CameraSourceTimeLapse.cpp
02b32fc33aca18e6a91a6216ce5d932d348d184c 27-Oct-2011 James Dong <jdong@google.com> Report call status from AudioSource::start() to file writer

Change-Id: I5109dc87a92170dede4eaa58b039efe6d8b7c330
related-to-bug: 5514288
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
2fa0ac2e44f553e29b0d83a5dd87f7dda5422811 27-Oct-2011 Jamie Gennis <jgennis@google.com> Stagefright: ANW::connect in MediaPlayerService

This change moves the ANativeWindow connect and disconnect logic from
MediaPlayer to MediaPlayerService::Client.

Bug: 5502654
Change-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
e96e84b577244d74f79a449d720b0f8224b4b937 27-Oct-2011 Andreas Huber <andih@google.com> Properly report that we're no longer playing after receiving event

MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR.

Change-Id: I03eeba751d3728adb33d9c66de4c7444a91696f3
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
8b5c6efdbc605cd0d24495f5e46e71cec990c79d 26-Oct-2011 Jamie Gennis <jgennis@google.com> am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0

* commit '5ded5fc55f2da2af0a76a9ddc52d27948b227037':
Stagefright: push blank buffers when tearing down
5ded5fc55f2da2af0a76a9ddc52d27948b227037 26-Oct-2011 Jamie Gennis <jgennis@google.com> am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0

* commit 'b7b4eaaa05284634d50d581d924a250f1194f66d':
Stagefright: push blank buffers when tearing down
d2b76d707bcc93855336f0729697df9555c469fb 26-Oct-2011 Andreas Huber <andih@google.com> Fix a reference to a stale pointer in AwesomePlayer.

The pointer returned by MetaData::findCString may become stale if the metadata
object is modified. Make a copy of the returned mime type in order to prevent
MediaPlayer::dump log corruption.

Change-Id: I9077aee36c4316d83b37fb909bf91e6b3f75d5d2
ibstagefright/AwesomePlayer.cpp
71f2cf116aab893e224056c38ab146bd1538dd3e 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaProfiles.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ni/mediaeditor/VideoEditorMain.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPoolThread.cpp
ni/soundpool/android_media_SoundPool.cpp
ibeffects/factory/EffectsFactory.c
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/preprocessing/PreProcessing.cpp
ibeffects/testlibs/AudioEqualizer.cpp
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/AudioParameter.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IEffect.cpp
ibmedia/IEffectClient.cpp
ibmedia/IMediaDeathNotifier.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/JetPlayer.cpp
ibmedia/MediaProfiles.cpp
ibmedia/MediaScanner.cpp
ibmedia/ToneGenerator.cpp
ibmedia/Visualizer.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiMetadataRetriever.cpp
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibstagefright/AACWriter.cpp
ibstagefright/ACodec.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/AVIExtractor.cpp
ibstagefright/AudioPlayer.cpp
ibstagefright/AudioSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/ESDS.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/MediaSourceSplitter.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/VideoSourceDownSampler.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/avc_utils.cpp
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/id3/ID3.cpp
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/SimpleSoftOMXComponent.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARawAudioAssembler.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
ibstagefright/tests/DummyRecorder.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
tp/MtpDevice.cpp
tp/MtpDeviceInfo.cpp
tp/MtpPacket.cpp
tp/MtpServer.cpp
tp/MtpStorage.cpp
ests/players/invoke_mock_media_player.cpp
c0e4293794e9658da1ce9849a42c66ce19ef5f07 25-Oct-2011 Jamie Gennis <jgennis@google.com> Stagefright: push blank buffers when tearing down

This change makes OMXCodec push RGB 565 buffers filled with black to an
ANativeWindow when tearing down after decoding to protected gralloc
buffers. This allows the OMX tear down to zero out any protected
buffers that were used without the possibility that the buffer is still
being used by SurfaceFlinger or HWComposer.

Bug: 5483222
Change-Id: I8acedd81a7bb67dfdc2fd15733e3375b6ce8d560
ibstagefright/OMXCodec.cpp
149a14931e5aa4beb8c4263995f01437a8918465 20-Oct-2011 Dave Burke <daveburke@google.com> am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0

* commit '23d644202a44383bf008ff86f6faa3ea7e447290':
Stagefright: idle OMX after ANW errors
23d644202a44383bf008ff86f6faa3ea7e447290 20-Oct-2011 Dave Burke <daveburke@google.com> Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
6607b39baa05ee85a0857c3f95ff9224517b2abc 20-Oct-2011 Jamie Gennis <jgennis@google.com> Stagefright: idle OMX after ANW errors

This change fixes an issue in Stagefright where the state of an OMXCodec
object can get out of sync with the state of the OMX component. In
particular, if one of the ANativeWindow functions failed and put the
OMXCodec into the ERROR state, this would cause Stagefright to skip
doing the Executing -> Idle transition. Without this transition the
freeBuffersOnPort call would never be made, and the MediaBuffers would
end up being leaked (which would also leak the Gralloc buffers they
reference).

Bug: 5333695
Change-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34
ibmedia/IOMX.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
c7d927466e6314315743e5c98730b3a79c52e892 20-Oct-2011 James Dong <jdong@google.com> am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0

* commit 'b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
Check whether media recorder client exists before dumping.
e68a6936c7b3d3a041feeff9661b234a25e56e73 19-Oct-2011 Marco Nelissen <marcone@google.com> Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."
dc8bbe79b83c7f4a4cc7e557639079385097cc00 19-Oct-2011 James Dong <jdong@google.com> Check whether media recorder client exists before dumping.

Change-Id: I1f3a644a958975e4cf6c02099c53e30cc4d2fd82
related-to-bug: 5477177
ibmediaplayerservice/MediaPlayerService.cpp
3c563ce672e6b1827b33ab4ce0f0c28e894214d5 19-Oct-2011 James Dong <jdong@google.com> am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0

* commit '5264f6003bbcb8ca70df034379154914260cc322':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
5a37afa87cce44e265d33b3d2ff159253d5f593f 19-Oct-2011 James Dong <jdong@google.com> Bail out after kMaxColorFormatSupported calls to OMX_GetParameter().
Avoid infinite loop in querying omx component about the supported color format.

Change-Id: I4997efd36462c792a6d8b5e04c79a80966a559fe
related-to-bug: 5466057
ibstagefright/OMXCodec.cpp
46c8f1535a884a77137c294cad94f811a33f07aa 18-Oct-2011 Eric Laurent <elaurent@google.com> am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0

* commit 'c0a87dc10cc74918518457e96b48f16bcc0ea2cd':
Fix issue 5462427: Volume should never be 0 ...
c0a87dc10cc74918518457e96b48f16bcc0ea2cd 18-Oct-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0
499e2522455440e7e68c2df8b30a727aa9ef46b3 18-Oct-2011 Dave Burke <daveburke@google.com> am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0

* commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4':
Don't hold onto the lock while reconnecting to the server
6f13adb22afcb47a1cd45a90eaa3c154522089d4 18-Oct-2011 Dave Burke <daveburke@google.com> Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0
96e35f2e57d9813e46bfc35d4fe3402cd14b4eb4 18-Oct-2011 Andreas Huber <andih@google.com> Don't hold onto the lock while reconnecting to the server

to avoid stalling the readers.

Change-Id: I73b646587c8a654a73ff7d800c0f17bd78001855
ibstagefright/NuCachedSource2.cpp
29fe8cb941648cbd9d684680f2660a95c565ad51 17-Oct-2011 Jamie Gennis <jgennis@google.com> am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0

* commit 'c4de6f81d4533acbfc162d051de480d474b72e76':
MediaPlayer: properly handle released surfaces
f76afc80d229cf0c918e849acf5d8c4f5d4ffd07 15-Oct-2011 Jamie Gennis <jgennis@google.com> MediaPlayer: properly handle released surfaces

Bug: 5396571
Change-Id: I6af87cb04f09f9ae6ea77cd7ba31108a3e93d24a
ni/android_media_MediaPlayer.cpp
b024c30a80684ac08daef3137b7ba0d347fe3ce5 15-Oct-2011 Eric Laurent <elaurent@google.com> Fix issue 5462427: Volume should never be 0 ...

Make sure that ring or notification volume index
never reaches 0 unless in silent mode.
Conversely, enter silent mode when this volume is set to 0.

Change-Id: Iff5e5e972b607f4736e7a704b26b2dadb40074b0
ava/android/media/AudioService.java
e04783ccde79730f239d739ad515224245683f22 14-Oct-2011 Eric Laurent <elaurent@google.com> am 615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0

* commit '615858a8ebb12b3541fd709e6e965ac814880261':
Indicate screen off condition to audio framework.
950e8cb40a6d826af4cc2eef9d3908c1b70486e6 13-Oct-2011 Eric Laurent <elaurent@google.com> Indicate screen off condition to audio framework.

Add a mechanism for AudioService to notify audio framework and audio HAL
that screen is turned on or off. This indication can be used by lower
audio layers to trigger low power audio playback mode.
Current implementaiton based on setParameters() method is experimental
and will be replaced by a different interface when ready.

Change-Id: Ie72ada0a8edec3d71b47681b9f51cb5bc839d45b
ava/android/media/AudioService.java
414b74c564d29da933a650d5193bb2152b704c06 14-Oct-2011 Jean-Michel Trivi <jmtrivi@google.com> am e48440d5: Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0

* commit 'e48440d59a52c0f13166da2fd32023356d9215d9':
Fix 5153611 remove remote control client/display log from AudioService
7ff866e8cf43afc64111e98863dab549b57447b4 14-Oct-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix 5153611 remove remote control client/display log from AudioService

Do not log debug messages for the RemoteControlClient and
IRemoteControlDisplay related features.

Change-Id: I81bfeec1770f81b78b679dc03fb40806393b170a
ava/android/media/AudioService.java
a6be6dcd03fbcce8999d495abdd2ae209a06b4c9 12-Oct-2011 Andreas Huber <andih@google.com> NuPlayer is now taking on the task of streaming over RTSP.

Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibmediaplayerservice/nuplayer/RTSPSource.cpp
ibmediaplayerservice/nuplayer/RTSPSource.h
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/ARTSPController.h
ibstagefright/include/AwesomePlayer.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/APacketSource.h
ibstagefright/rtsp/ARTSPController.cpp
ibstagefright/rtsp/Android.mk
ibstagefright/rtsp/MyHandler.h
0eb6ef1798362d15696618debdb2478b386398c5 13-Oct-2011 Andreas Huber <andih@google.com> Merge "Support for an MPEG2 Program Stream extractor."
8334038f9ed367186845f76fce061c46984da660 13-Oct-2011 Mike Lockwood <lockwood@android.com> MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size

Bug: 5432487

Change-Id: Ie86e72d9d85476941eab6a9d271948b8fdde6926
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
33d94067adec48eee6e406b7d849df2018e4c3c2 12-Oct-2011 Andreas Huber <andih@google.com> Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS

Change-Id: I3b31f08428fb7195b98f145ae0675006c8756de1
related-to-bug: 5450187
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
09b4d99822678e57ba6ed1568832980ba64be330 11-Oct-2011 Jean-Michel Trivi <jmtrivi@google.com> DO NOT MERGE Fix 5389442 RemoteControlClient javadoc

Extend RemoteControlClient class description with an example
of instance creation showing how the PendingIntent is created
and how it uses the same ComponentName as the one used
in AudioManager.registerMediaButtonEventReceiver()

Change-Id: I1af61ddbf5cfb9160ea5b814bed7b881d51b7eff
ava/android/media/RemoteControlClient.java
8e2ed8d512ade2ea481b3a292556782b17a74674 11-Oct-2011 Dongwon Kang <dwkang@google.com> Refactor FileInserter in MediaScanner and adding unit tests for the newly added class.

Change-Id: Ia0e8c95239916fd4c21cb5bf10ac94201e6eb6f1
ava/android/media/MediaInserter.java
ava/android/media/MediaScanner.java
ests/MediaFrameworkTest/Android.mk
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkUnitTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java
50c31024e30f26720321bbd5adeb46a554beca7e 11-Oct-2011 James Dong <jdong@google.com> Merge "Support AMR as a file type so that it can be imported into movie studio"
7f3259403df63043575c150653ee6e6019cb0733 07-Oct-2011 Andreas Huber <andih@google.com> YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater

through the use of pseudo http headers specified in the setDataSource call.

x-cache-config: -1/-1/0
x-disconnect-at-highwatermark: 1

turns off keep-alives and disconnects every time the cache is full (will attempt
to reconnect once it run below lowwater mark)

related-to-bug: 5433309

Change-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/NuCachedSource2.h
f58ba6506959947d2e646833789c859ae50e6767 10-Oct-2011 James Dong <jdong@google.com> Support AMR as a file type so that it can be imported into movie studio

Change-Id: I3fc4f49ae0a210f53b1bab68716f4e558b3d91c5
related-to-bug: 5419452
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaProperties.java
b987d875c6e66ea30b4a443b17ba44b977efe0c2 07-Oct-2011 Andreas Huber <andih@google.com> Specifying -1 for both low and highwater marks would not actually do the right thing

before this change. Also make it more consistent in that specifying -1 for the
keepalive settings specifies the default.

Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
ibstagefright/NuCachedSource2.cpp
59797e6bece0ac2d649d8d93d02ed81979950145 07-Oct-2011 Andreas Huber <andih@google.com> Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
f3c00568163b186202cab8d79b2f11eeacb88646 07-Oct-2011 James Dong <jdong@google.com> Merge "Fix an issue where we should allow negative values but did not"
594f0ba996ec04218f758458ae62182f98d58ac5 05-Oct-2011 Andreas Huber <andih@google.com> Allow a system property "media.stagefright.cache-params" to override cache/prefetcher

default parameters. To override specify a property

adb shell setprop media.stagefright.cache-params "4096/20480/15" to
set the low water threshold to 4096 KB, the high water threshold to 20 MB
and the keepalive interval to 15 secs.

if high and/or lowwater mark are negative, the default values are used for
the respective value.

if keep-alive interval is 0, keep-alives are disabled.

Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/NuCachedSource2.h
90ba107fcf36ce6df111a594b2cc27163b36793d 06-Oct-2011 Andreas Huber <andih@google.com> Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.

Change-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749
related-to-bug: 5418914
ibstagefright/MPEG4Extractor.cpp
56f71d7dfaff2127724fe848d7c2d702eef7d396 06-Oct-2011 James Dong <jdong@google.com> Fix an issue where we should allow negative values but did not

Change-Id: Ia8d718b4e6aec4c17db86e30134132f767fd72c5
related-to-bug: 5419527
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
db62a245f968159ea5ff8ad99afb4cd035e2304d 30-Sep-2011 Lakshman Gowda <lakshman79@ti.com> Set crop params to ANative Window during Initialization.

The native_window_set_crop() is called when port reconfig event callback comes from decoder's and
crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values.
Since the default crop params are same as port reconfig crop params, the native_window_set_crop()
is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight).
By calling native_window_set_crop() during initilaization of output port of decoder ensures
in setting up ANative window to crop region.

Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688
Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
ibstagefright/OMXCodec.cpp
bc554956128d69d8d2e60365fb6cffe6facf659b 08-Sep-2011 Andreas Huber <andih@google.com> Support for an MPEG2 Program Stream extractor.

Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
ava/android/media/MediaFile.java
ibstagefright/ACodec.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/include/MPEG2PSExtractor.h
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/Android.mk
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2PSExtractor.cpp
ce0a7ade96ddbdcb342e0b382e9d3ea43962cafd 30-Sep-2011 Marco Nelissen <marcone@google.com> Merge "Remove Ringtone.setWakeMode, it's not needed."
cb52d012e910b86d3562d4cad32d66e17986e286 30-Sep-2011 Andreas Huber <andih@google.com> Merge "Gracefuly return on detecting wrong AAC format from corrupted files"
9a6ed36ba55a206934937cfafca7e797e8c6ea00 16-Sep-2011 Gilles-Arnaud Bleu-Laine <gilles@ti.com> Gracefuly return on detecting wrong AAC format from corrupted files

Return BAD_VALUE error upon detection of wrongly formatted files.
The client should abort the initialization upon error detection.

The current CHECK() interrupts the configurecodec() preventing a graceful
exit.

Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
ibstagefright/OMXCodec.cpp
627f445a23b6c1188e366c0eec52abc488668bec 30-Sep-2011 Gloria Wang <gwang@google.com> Wait for some time before stopping the media recorder.
Fix for bug 5239001.

Change-Id: Ifa18a404e8568cced88a93b8d1a7125875aadb15
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
b741c604861ddbafcacaa452e31bd19337a19705 30-Sep-2011 Marco Nelissen <marcone@google.com> Remove Ringtone.setWakeMode, it's not needed.

This partially reverts commit e47e8520fa48bd014287eda94ea39927de73d6bc.
(the other part of that change was already removed as part of a different
change)

Change-Id: Ica7c196ab1f74f96237e64d07580832f0d50022f
ava/android/media/Ringtone.java
d94a7b60ccbd748752d4babd9fc79252c71bb1c2 29-Sep-2011 Marco Nelissen <marcone@google.com> Merge "Release MediaPlayer before letting it go out of scope."
e1bd048cf2af24cbd93e549875c875239e5f4829 29-Sep-2011 Marco Nelissen <marcone@google.com> Release MediaPlayer before letting it go out of scope.

Change-Id: Ib2b727146f6cba91b131e66d218251f5a3206fac
ava/android/media/Ringtone.java
cc3fbb7b699083518340cfd57334d3798d881a49 29-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 5357295 NPE on display when remote control client dies"
0044a15eb92588372e21fa56a02fbed396cb5e02 29-Sep-2011 Andreas Huber <andih@google.com> Merge "Support multiple NAL fragments per .mkv payload"
2378341174055957833e5af17dc32596c2996335 29-Sep-2011 Andreas Huber <andih@google.com> Support multiple NAL fragments per .mkv payload

Apparently the payload for an h.264 track in an .mkv file can contain multiple
NAL fragments, we used to discard everything after the first one before, now
we preserve them all.

Change-Id: Ic7187365309f3880a3256982879a45df50db697d
related-to-bug: 5337218
ibstagefright/matroska/MatroskaExtractor.cpp
5e28463dc4d12802d173018c572f73e13ba50722 28-Sep-2011 James Dong <jdong@google.com> Merge "Flush resets the count of played audio frames"
781ae92f11ff136b99acb56cc361ad662d9cb6b9 28-Sep-2011 Andreas Huber <andih@google.com> Merge "Support AMR, G.711 and vorbis audio in ACodec and friends."
0a6cd02b4824f9f974257362eddef0c5c5d46ab3 28-Sep-2011 Xia Wang <xiaw@google.com> am b2d17234: Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom

* commit 'b2d17234b77cda555905e0da997f543708374246':
Reorganize media framework functional tests. Group tests into sub-packages
3e408f39ef1c0513908a3b73da5ce6f4164e85d9 28-Sep-2011 Andreas Huber <andih@google.com> Support AMR, G.711 and vorbis audio in ACodec and friends.

Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
26b3d1ff38998c7cb80a2950da0589ebd8510897 28-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 5357295 NPE on display when remote control client dies

When a IRemoteControlClient dies, that client is set to null
in the stack of remote control entries (mRCStack). This is done
by calling registerRemoteControlClient() with a null client.
The bug is that registerRemoteControlClient(), after storing
the new client, uses it to let it know what the current
remote control display is. When that display is non null, the
client is sent the current display. So when a client died
when there was a display, the client reference was accessed
in the part of the method where we haven't yet checked whether
it is null or not.
The fix consists in moving the setting of the display on the
client (method plugRemoteControlDisplay) only after having
checked that the client is non-null.

Change-Id: Ic74d6cba9e3a3a16e78cd80a1ae5901abfeb3905
ava/android/media/AudioService.java
8df38890d4634aec70c5d37bc90a3a2f836f8aa1 28-Sep-2011 Marco Nelissen <marcone@google.com> Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634"
8dc208476f1fbbf6cd0b8cc3d48487a62cb72883 28-Sep-2011 Marco Nelissen <marcone@google.com> Log a warning when a MediaPlayer is finalized without having being released.
b/5382634

Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
ni/android_media_MediaPlayer.cpp
dbf85120b8ca5e2bdc64f4085e9d6a036ac2ce5e 28-Sep-2011 James Dong <jdong@google.com> Flush resets the count of played audio frames

Change-Id: I0cda94646a71757fa113a199d29235e13efd7ac3
related-to-bug: 5331470
ibstagefright/AudioPlayer.cpp
db6028508c8eb31a0de1dcdfc410ddfe6df7c5ad 28-Sep-2011 Xia Wang <xiaw@google.com> Reorganize media framework functional tests.
Group tests into sub-packages

Change-Id: I878e14487142de495fc646037d5d0b51e39341bd
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioEffectTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioManagerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEnvReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPresetReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVisualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/SimTonesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorExportTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorPreviewTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioEffectTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioManagerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaBassBoostTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEqualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVirtualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/SimTonesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediaplayback/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaItemThumbnailTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/MediaPropertiesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorAPITest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorExportTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java
262d7e8e21625b520d9b60a230160a7ff1b295fd 28-Sep-2011 Andreas Huber <andih@google.com> Cut down on AwesomePlayer and OMXCodec's verbosity.

Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug: 5382014
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
d33b3881f7647e721181c46f9166ee139cec7e38 27-Sep-2011 Andreas Huber <andih@google.com> Merge "Signal an appropriate error even if there are no active streams yet."
7922619e9c755353effd0188779ebbd5c1372624 27-Sep-2011 Andreas Huber <andih@google.com> Signal an appropriate error even if there are no active streams yet.

Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49
related-to-bug: 5372901
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.h
53719fc4c5c441e8696f26bbfb9166b0bd19ef29 27-Sep-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 5373048: AudioCache decode errors"
9968a36f297e299578b4f4726832ac8323a08c6f 27-Sep-2011 Eric Laurent <elaurent@google.com> Fix issue 5373048: AudioCache decode errors

When decoding a file for the SoundPool, do not
reject the entire file in case of error but
return what was decoded so far instead.

Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
ibmediaplayerservice/MediaPlayerService.cpp
928baf1f5480f67c1916a933d691e38de4f0a575 26-Sep-2011 Andreas Huber <andih@google.com> Propagate error signalled by the source all the way to the output EOS notification.

Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7
related-to-bug: 5372901
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/ACodec.cpp
3bade9504a648ce7606b876dc7d71b4684e279c9 26-Sep-2011 Andreas Huber <andih@google.com> Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
bea34b942d1727934e4cd69c5e7b69679b4e8891 23-Sep-2011 Andreas Huber <andih@google.com> Support even more .avi files with .mp3 content not aligned to chunk boundaries

Change-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d
related-to-bug: 5349382
ibstagefright/AVIExtractor.cpp
ibstagefright/include/AVIExtractor.h
65837cede462b551742f900f2e2f5a1d5dd576a2 23-Sep-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 5355047: Automated effect tests fail."
5e7acae2c3e4cf345e3fa7bf10e3c62f9e69e6be 23-Sep-2011 Eric Laurent <elaurent@google.com> Fix issue 5355047: Automated effect tests fail.

Fixed several regressions in automated audio effect tests due
to changes in effect framework and visualizer FFT output range.

- Do not suspend Volume effect on session 0 when effects are
enabled on specific sessions.
- Adapt energy detection thresholds to new visualizer FFT range.
- Leave more time for BassBoost and Virtualizer effects to ramp up
before measuring the effect.
- Removed second insert reverb left by mistake on the player session
in preset reverb test.

Change-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEnvReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPresetReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVisualizerTest.java
91d34137903c278e5e077fa1edef9bbbcdd140f7 23-Sep-2011 Pannag Sanketi <psanketi@google.com> am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom

* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
Returning EOS in SurfaceMediaSource:read
a1849fceaf4b22d0a8ec7992c91bc416f78c9fd2 23-Sep-2011 Pannag Sanketi <psanketi@google.com> Returning EOS in SurfaceMediaSource:read

In SurfaceMediaSource::read, if disconnect has already been called, then
ERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it
sometimes leads to a crash in mediarecorder stop() call.

Related to FactoryROM bug: 5332812

Change-Id: I22132538ab2501d084e0283876817b1ec3f64a1d
ibstagefright/SurfaceMediaSource.cpp
dda868cd3383aecb45b42e39abfa2670101dde00 22-Sep-2011 Dianne Hackborn <hackbod@google.com> Merge "Keyguard sound needs to hold wake lock."
bfd1c9d93f47040bc52a1fbdc8ae81502a6f4b23 21-Sep-2011 Andreas Huber <andih@google.com> Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
e47e8520fa48bd014287eda94ea39927de73d6bc 21-Sep-2011 Dianne Hackborn <hackbod@google.com> Keyguard sound needs to hold wake lock.

We need to hold a wakelock while playing the keyguard lock sound,
so that it actually completes before the CPU goes to sleep.

Change-Id: I144c345383afeb911ea461b2eb17b31183b6d092
ava/android/media/Ringtone.java
3001e4721237af2754fc2ac57100dd4ea00c67cb 21-Sep-2011 Andreas Huber <andih@google.com> Support some .avi files containing H.264 video, log warnings if audio/video unsupported

Change-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677
related-to-bug: 5349382
ibstagefright/AVIExtractor.cpp
ibstagefright/avc_utils.cpp
ibstagefright/include/AVIExtractor.h
faa75f6146165016685291084ca79ddd377411b4 21-Sep-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 5234242 audio continues after discontinuity"
cd5c896381321d6986de0ec0acbd69e150405102 21-Sep-2011 Glenn Kasten <gkasten@google.com> Bug 5234242 audio continues after discontinuity

Reduce to 8 buffers of 10 packets from 16 buffers of 20 packets.

Change-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83
ibmediaplayerservice/nuplayer/NuPlayerStreamListener.h
eb060254a0b7aa42ab05ed6539156c3084ec1908 21-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> am 9c43016b: Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom

* commit '9c43016b52afa855156aac2dc81a2bbe1e4ab436':
Bug 5045498 Keep track of RemoteControlClient play state change time
28b9a063ad359d186cf69b235c5592eb308d2ac4 21-Sep-2011 Marco Nelissen <marcone@google.com> Merge "MediaScanner: To query row ids of music files when handling playlists."
68622396b62f9084781add1e12f4d513b633ab54 19-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 Keep track of RemoteControlClient play state change time

Store the time at which a RemoteControlClient changes it playback
state, and send that time to the IRemoteControlDisplay.
This change will enable displays to implement strategies such as
timeouts (e.g. to not display transport controls for clients which have
been paused or stopped for a certain amount of time).

Change-Id: I902882500565743d455d56f6000efaf612cbe0a9
ava/android/media/IRemoteControlDisplay.aidl
ava/android/media/RemoteControlClient.java
ed4cfe70ca165b6469d2c9fb1b5296afdff1faae 20-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5224359: Add width and height to media store."
e1bf8efaff42dc33b7a4663f3c9d50d12de81bcb 20-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5224359: Add width and height to media store.

Change-Id: I27376285a551e648eb0ea010dfdf6b8ed873cdd8
ava/android/media/MediaScanner.java
3907c79aebf8621a5a4880c9e66db3c49a44f359 20-Sep-2011 James Dong <jdong@google.com> am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom

* commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0 20-Sep-2011 James Dong <jdong@google.com> Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
07b9ae33127212fd9e15f96fa89b7d4cab81e55e 20-Sep-2011 James Dong <jdong@google.com> Add QVGA resolution to CamcorderProfile

Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
ava/android/media/CamcorderProfile.java
ni/android_media_MediaProfiles.cpp
ibmedia/MediaProfiles.cpp
e2bb99600e3a6eed97d2739f62c84998180a705d 19-Sep-2011 Andreas Huber <andih@google.com> Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams"
abc63e7f461fea0ff8a049b3590866f01aadd49f 19-Sep-2011 Andreas Huber <andih@google.com> Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams

containing B-frames.

Change-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642
related-to-bug: 5336497
ibstagefright/SampleTable.cpp
ibstagefright/include/SampleTable.h
b3e6eab16153c28a30525a7c26fb7a153a5548f4 19-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> am 2f153169: Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom

* commit '2f153169594249738d63aa6e2897d257f6b7d71e':
Bug 5300223 RemoteControlClient uses PendingIntent for media button events
c7342fbf992091cd37bb34b8fac2e6b6ca47fdf5 19-Sep-2011 Andreas Huber <andih@google.com> Merge "In order to recover from video lagging behind audio, drop avc frames"
950fc9d1159bfc38e2b58a2ccf4465c630573126 17-Sep-2011 Andreas Huber <andih@google.com> In order to recover from video lagging behind audio, drop avc frames

that are not referenced by other frames before feeding them into the decoder.

Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibstagefright/avc_utils.cpp
ibstagefright/include/avc_utils.h
607fb6dadab628c11ecbfd63642be5951e7287f0 17-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> am f79ec360: Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom

* commit 'f79ec360984011c49c52b7a19b96cbbc932df4be':
Fix bug 5327199 Recycle bitmaps in RemoteControlClient
f0cff0456258478ba768097f73d4367ab67fd7a3 15-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5300223 RemoteControlClient uses PendingIntent for media button events

Update the implementation of the RemoteControlClient / Display
feature rely on PendingIntent as provided in the construction
of the RemoteControlClient instance.
The ComponentName that describes the target of the media button
events is set as the target of the Intent from which
a PendingIntent is constructed.
This ComponentName is still saved in the stack for persisting
the last media button event receiver.

This CL also updates the lockscreen IRemoteControlDisplay
implementation to use the PendingIntent supplied by the
application when sending transport control events. A (good)
side effect of doing this is that intent will be directly
targeted at the application.

Restoration of the media button event receiver
after reboot is not fully functional yet.

Change-Id: I2be82f2839e9dee1de02512437b3fb41cc386cde
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
ava/android/media/IRemoteControlDisplay.aidl
ava/android/media/RemoteControlClient.java
34d0d300cac645b48cce5a1735f45e1102d4ef0e 16-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 5327199 Recycle bitmaps in RemoteControlClient

When applying the new bitmap from the editor to the client,
recycle the old bitmap, and set the reference to the editor
bitmap to null.

Change-Id: I7d79e4b8410e5035fa51b20be4b1ada391c84c28
ava/android/media/RemoteControlClient.java
115cac8131e9b2a599ac5f10f9e973487c8fd25c 15-Sep-2011 Andreas Huber <andih@google.com> Various improvements to nuplayer playback

- Drastically cut down the number of times we supply the AudioSink with data
by estimating the time until the sink would run out of data and then scheduling
a refill in advance of that.

- Use a dedicated looper for video decoders since they are currently taking
too long to return from OMX_FillThisBuffer (bug 5325201)

- Revise thread priorities for the OMX dispatcher and software codecs, instead
of running them at ANDROID_PRIORITY_AUDIO, they now only run at
ANDROID_PRIORITY_FOREGROUND

- Since threads created by pthread_create inherit all of the parent threads
attributes including thread priority, briefly reset thread priority to
ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then
restore it.

Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/ACodec.cpp
ibstagefright/chromium_http/support.cpp
ibstagefright/foundation/AMessage.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/SimpleSoftOMXComponent.cpp
152f7b3985a777403168722891b7941c16a0cfaa 16-Sep-2011 Gloria Wang <gwang@google.com> Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664."
81b37d8bde34ef3bb8eb8dfd7492761a39a8fd09 16-Sep-2011 Gloria Wang <gwang@google.com> If media player has died already, do not dec the old surface texture reference.
Otherwise segfault will occur.
For bug 5327664.
Do not merge.

Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
ni/android_media_MediaPlayer.cpp
e828beb3866e2275cd26acd2a58f9f8a3967ba30 16-Sep-2011 Gloria Wang <gwang@google.com> If media player has died already, do not dec the old surface texture reference.
Otherwise segfault will occur.
For bug 5327664.

Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
ni/android_media_MediaPlayer.cpp
c286b2cc26d57efa5fef42c085bb2eb330021114 14-Sep-2011 Gloria Wang <gwang@google.com> Cherry-pick from master. Do not merge.
Do not need to reset surface as NULL in MediaPlayer's _release.
Related to bug 5252296.

Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
ni/android_media_MediaPlayer.cpp
b107c628ba7387c5e0dff6020530ce47feba446a 15-Sep-2011 Gloria Wang <gwang@google.com> Merge "Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296."
1318864fa7ce6c85aaf629b1db08c79e4d0cf41e 15-Sep-2011 James Dong <jdong@google.com> Merge "Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications"
d59310d08637c8531dc7949fc166b0daeede53c0 14-Sep-2011 Gloria Wang <gwang@google.com> Do not need to reset surface as NULL in MediaPlayer's _release.
Related to bug 5252296.

Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
ni/android_media_MediaPlayer.cpp
2424c93d84cd4cd0936cd7a5d1d7323ce5dc4e96 14-Sep-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed"
3f43e7d37f8efb0a0c6c07d1d0dd5103e26922d3 14-Sep-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed

Change-Id: Ibd52a3bda8e1cb17f1c110cc219f2c71a46e5122
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
16066ec591d05830a925b34f966f8c552a81ca70 14-Sep-2011 Eric Laurent <elaurent@google.com> Merge "Issue 5044873: Pb with BT SCO AudioManager API"
e83f771f0ab8e1e72e1fd2147085223ac8a00ba2 14-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5300223 RemoteControlClient uses PendingIntent"
d7454be47f4111c0478a502353e11dea401378bd 14-Sep-2011 Eric Laurent <elaurent@google.com> Issue 5044873: Pb with BT SCO AudioManager API

Do not identify the SCO connection client by the binder interface
passed when starting the connection as this binder changes if the
AudioManager proxy changes. Use the client PID instead.

This solves an issue with gTalk starting a SCO connection from one
AudioManager proxy and then changing audio mode from another thus
terminating the previously started SCO connection.

Change-Id: Ia3067fecc551fc15df3bf75ce0c43d181859e4f0
ava/android/media/AudioService.java
6e920e6dac11c3ebf6c0c19402934834e9e491bf 14-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5300223 RemoteControlClient uses PendingIntent

API change so RemoteControlClient is given a PendingIntent in
its constructor, which will be used for receiving media button
events from remote controls.
Leave the old constructors (but hidden) to not break
current functionality until the AudioManager and AudioService
implementations have been updated.

Change-Id: Ifa12c8036c948931adc386a827dce2936788e1cd
ava/android/media/RemoteControlClient.java
3f0c821740305c352eb355ba3d72906a7a97751c 14-Sep-2011 Eric Laurent <elaurent@google.com> Merge "Issue 5298399: Lost speech after a crash in gTalk."
7e8626fd7580dc5e0d4b4e4ceef0988067b60037 14-Sep-2011 Eric Laurent <elaurent@google.com> Issue 5298399: Lost speech after a crash in gTalk.

Fixed problem in AudioTrack::restoreTrack_l() causing a permanent
failure if the IAudioTrack interface to AudioFlinger could not be
restored at the first attempt.

Change-Id: I039d4fe2dca8d3baf71f1a6c51119f27a67b6611
ibmedia/AudioTrack.cpp
48c5fb14933cba4dcf6ba401b895e59bac4a8420 13-Sep-2011 Dianne Hackborn <hackbod@google.com> API review: Metadata class not used.

The Metadata class doesn't actually seem to be used with anything
in the SDK, and the API probably needs some work, so hide it.

Change-Id: Ifecf49130b90cbb4c588ad8104f1e7957978f789
ava/android/media/Metadata.java
bf208ec91ec80fd2a3c2474c236b09b37c1a02c4 13-Sep-2011 Andreas Huber <andih@google.com> Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks"
63749954aa828b3f73b4738659eaea5eaeeca874 13-Sep-2011 Andreas Huber <andih@google.com> Support .avi tracks that have a sample size of 1, i.e. samples != chunks

Assume for now that all chunks are the same size, i.e. have the same number of
samples.

Change-Id: Ib8a7dfeb16cc3e5be199ff9d98b68dd0b9c23eb8
related-to-bug: 5279872
ibstagefright/AVIExtractor.cpp
ibstagefright/include/AVIExtractor.h
0209da1cb177888af6c58e9bcc13c5d9665d6354 13-Sep-2011 James Dong <jdong@google.com> Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications

Change-Id: I522a994981d86329ccc86c3b536b561dc6e40eeb
related-to-bug: 5300618
ibstagefright/OMXCodec.cpp
fa6dfdcfd741980ba1c1d1971b69fc6f8a34dfeb 13-Sep-2011 Andreas Huber <andih@google.com> Don't post position updates too frequently

i.e. don't hog my message queue.

related-to-bug: 5284760
Change-Id: I8e2d36a11dbee1567b18ed13dc5257a65c6eeda7
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
7fc8f515a0add6837d525b4f2b4baa7ebe37fc7f 12-Sep-2011 Andreas Huber <andih@google.com> Merge "Turn an another assertion into a runtime error in ACodec's implementation"
d41108c91fcf2f7a47b733c61ee5983cf22bd6a8 12-Sep-2011 Andreas Huber <andih@google.com> Turn an another assertion into a runtime error in ACodec's implementation

Change-Id: I6779b29f200b90d088273ab3204724ef3d8d59bd
related-to-bug: 5284760
ibstagefright/ACodec.cpp
f8c84b343488c29cc6ef224a7df751c94955e029 12-Sep-2011 Andreas Huber <andih@google.com> Increase the avi extractor's confidence slighly over mp3's

So that we don't accidentally identify a .avi file containing an mp3 track as
an mp3 file.

Change-Id: I73495b80cbb5bc1007bf810f2db453c9f175171b
related-to-bug: 5288189
ibstagefright/AVIExtractor.cpp
d8f7c2c2dcc9548bc8808e648904c918ecd1d1ba 09-Sep-2011 Devaraj Rangasamy <dev@ti.com> MTS Recorder Test: Use VideoFrameRate from Device Camcorder Profile

MTS tests have hardcoded video framerates.
MTS can query the video framerate supported by device via
Camcorder profiles and use.

Change-Id: I61666df6af58eaba46f7366521cc114184cb4ac5
Signed-off-by: Devaraj Rangasamy <dev@ti.com>
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
4cf9a3b857e78d7a9a71b104d8531aa18a150978 10-Sep-2011 James Dong <jdong@google.com> Merge "Fix another hardcoded frame rate in the media framework test"
973f553be4aabf9656d6c1596b47767896677b0a 08-Sep-2011 Guang Zhu <guangzhu@google.com> Make MediaScanner skip certain directories

The list of directories to skip are configurable via setprop.
The main motivation is that some test data folder takes long time
to scan, and media scanner may compete for CPU time against perf
tests therefore skewing the results.

Bug: 5263115
Change-Id: I568213e2a4babf6033021c1d336ef0347c0e3315
ibmedia/MediaScanner.cpp
6f84da50ad9a9fa044543fa5dde197f609b01a8f 09-Sep-2011 James Dong <jdong@google.com> Merge "Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation"
4a0c91fc50964d9836728c5e48887bfc0c09a841 09-Sep-2011 James Dong <jdong@google.com> Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation

Change-Id: Iee9b18449bce9d7565ab5cc7f9e999484051196c
related-to-bug: 5233843
ibstagefright/OMXCodec.cpp
02ea7d48773210fa0f29299269aca26b3201b1d0 09-Sep-2011 Marco Nelissen <marcone@google.com> Merge "Fix bug 5045498 Unhide Remote Control Client API"
ebf6478f557c20fc1c23f9537fcdc3f3c66decb4 09-Sep-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 4673378: switching from VoIP to GSM call"
a18886ca08b32c5c949a285f27c8713e05e3dd11 09-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5278371: OOM in MediaItemThumbnailTest

Because we request 400x240 thumbnails. 100 thumbnails needs 38M,
which is too much. Change it to 70 now.

Also handle the case if the thumbnail callback throws exception.

Change-Id: Iac4ee72f308b7c7a6ae860983197601cf89bee8f
ni/mediaeditor/VideoEditorMain.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java
9f103de83f2d5d472960dcf1401e95b2ab57a477 09-Sep-2011 Eric Laurent <elaurent@google.com> Fix issue 4673378: switching from VoIP to GSM call

The problem is that any app can change the audio mode and override
a mode previously set by another app. If two apps (gTalk and Phone) compete
for audio mode ownership, there is no mechanism to maintain coherency
in the actual audio mode selected.

Added a mechanism in AudioService to manage an audio mode request stack.
Any app requesting a mode different from NORMAL enters at the top of the stack
and the requested mode is applied. When an app sets mode back to NORMAL, it exits
the stack and the new mode corresponding to the request at the top of the
stack (if any) is applied.

Change-Id: I68d1755d0922f680df4a19bfc5ab924f5a5d8ccd
ava/android/media/AudioService.java
11e2e5dece7a92f50b73240dc0300343a7b495bf 09-Sep-2011 Eric Laurent <elaurent@google.com> Merge "AudioTrack: extend callback thread sleep time"
5303254cc944449d08c8489caf288516445f7af0 09-Sep-2011 Pannag Sanketi <psanketi@google.com> Merge "Always set geometry in queuebuffer"
f1d360ac86ec1f59eab0d01c606099278aa3ca1e 07-Sep-2011 Eric Laurent <elaurent@google.com> AudioTrack: extend callback thread sleep time

Do not force wake up the AudioTrack thread every 10ms if no timed
events (loop, markers..) have to be processed.
This will help reduce power consumption.

Change-Id: Icb425b13800690008dd07c27ffac84739e3dbba3
ibmedia/AudioTrack.cpp
e46fcef2785171597ee3ec75af33bbad60720280 08-Sep-2011 Pannag Sanketi <psanketi@google.com> Always set geometry in queuebuffer

The queuebuffer could return early due to timestamp issues. Need to set
the geometry even in that case.

Change-Id: I04d7cd1df3996d640c269285398c0042923ba920
ibstagefright/SurfaceMediaSource.cpp
84584471624775a849c880a50efc351e47c4a4af 08-Sep-2011 Andreas Huber <andih@google.com> Audio player must not be used as a timesource before it's started.

Otherwise it'll trigger a division-by-zero exception since the audio sample rate
is as yet unknown.

Change-Id: I0793aa7c1c348ffa2611272bb646eff6ecf6ff53
related-to-bug: 5242451
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
70ad1c378bce097f9f2dbb79cb8d5d225d4c14d7 08-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5156702: rotate thumbnails"
b05a600352dcd4517c62c7503edf9eea22359280 08-Sep-2011 James Dong <jdong@google.com> Fix another hardcoded frame rate in the media framework test

Change-Id: I7d7f9d0812a0228dbf924084a32dbede0338b421
related-to-bug: 5264298
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
7d92a22d9dec42a45cd55fd77d0a86b4b9c6e9df 18-Aug-2011 Dongwon Kang <dwkang@google.com> MediaScanner: To query row ids of music files when handling playlists.

Change-Id: I3c2a803618bfdaf4915f2487669952d5e3b4dd32
ava/android/media/MediaScanner.java
65e7815dd49a836e410bfa2817d9d48576547a9a 07-Sep-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 5270905 fix MediaPlayer with IStreamSource"
27f4bbb676d6486bb41ec8677b8c00708994b704 07-Sep-2011 Glenn Kasten <gkasten@google.com> Bug 5270905 fix MediaPlayer with IStreamSource

Change-Id: Ia8a6381a6c88b4a0a1378aab03f5275f0fa1125a
ibmedia/IMediaPlayer.cpp
166c1b2e7a1a48a39ecd2400b94f9f21c9868810 07-Sep-2011 Pannag Sanketi <psanketi@google.com> Merge "Fixing bug in SurfaceMediaSource_test"
089d3e3f14101140ff8baa3cc44f3dd8586ad285 07-Sep-2011 Andreas Huber <andih@google.com> Apparently keyframe status in audio tracks of .webm/.mkv files is unreliable

fortunately in all our supported audio encodings we can treat every frame as
a keyframe.

Change-Id: I32f21d0077bbae7ef9efe725dd351baf531179e2
related-to-bug: 5263837
ibstagefright/matroska/MatroskaExtractor.cpp
01dba603d7c74756126297b843aca0befed8810c 07-Sep-2011 Andreas Huber <andih@google.com> Merge "Stop metadata retriever from dereferencing a NULL pointer if"
4880a736dc518b60a199ac1d2a003dc6148991ea 07-Sep-2011 Marco Nelissen <marcone@google.com> Merge "Fix startBluetoothSco race"
47a52158d2df0eb818bf7d589d8ff9fd5c0daaa3 07-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5156702: rotate thumbnails

Change-Id: I97b51dadf129172d5b154e9dfd66da254e4559d7
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/VideoEditorImpl.java
ni/mediaeditor/VideoEditorMain.cpp
ccccb505abb1fb16d349e80d03edfde3c6775202 07-Sep-2011 James Dong <jdong@google.com> Merge "Use device-dependent frame rate in the media recorder performance test"
30856a76dcbc3983cfbe43466bdcf67cd76677f4 07-Sep-2011 James Dong <jdong@google.com> Revert "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."

This reverts commit 983ab88e117fcbda9370b8f4ba94271d37149672.

related-to-bug: 5231309
ibstagefright/MP3Extractor.cpp
a985135daa0d1706d8f62fa2d845590ce270e214 07-Sep-2011 James Dong <jdong@google.com> Use device-dependent frame rate in the media recorder performance test

Change-Id: I778eca69c4acb9842f600c6ae23e7a89fb2e55f4
related-to-bug: 5264298
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
671db6f3ba1fdb3c907e0735fe6d0d284f5c34de 07-Sep-2011 Marco Nelissen <marcone@google.com> Fix startBluetoothSco race

Change-Id: I8b711bd3c6b12f2e3e92144c0dadac72261bf914
ava/android/media/AudioService.java
612e16191a31758627dd039dec22f0b122c33ce6 07-Sep-2011 Andreas Huber <andih@google.com> Stop metadata retriever from dereferencing a NULL pointer if

the media extractor failed to initialize (malformed or unsupported content)

Change-Id: Icfad4e9eeb8d6713ad12eee7979ab30b696c06e0
related-to-bug: 5263840
ibstagefright/StagefrightMetadataRetriever.cpp
b6738fc6a5ab08c23ecc7c0d84316f5fa5e05064 06-Sep-2011 Eric Laurent <elaurent@google.com> Merge "Issue 5247986: Battery drain due to audio wakelock"
b0808f9c43529c586b71f6c76614b89dc28708cf 06-Sep-2011 Eric Laurent <elaurent@google.com> Issue 5247986: Battery drain due to audio wakelock

The problem occurs when activating or deactivating A2DP connection
while SoudPool has a channel active. This can happen quite frequently now
that the UI sound effects are enabled by default.
If PCM data is remaining in the AudioTrack buffer when it is restroyed and
re-created on the new AudioFlinger output thread, this data is flushed.
As a consequence, no underrun or request for new data callback is sent to
SoundPool and the sound channel remains active for ever as the end of the
sample is never detected.

Change-Id: I13e0c11e4ce3f83bff7f58d347ca814b6a86712b
ibmedia/AudioTrack.cpp
f12abaf40588615fa418fb711a4d754098b589f3 06-Sep-2011 Dave Burke <daveburke@google.com> Merge "Handle setDataSource failures properly. #5261671"
a28279be324ec824caf4e4d301411dc4ecb1b092 06-Sep-2011 Dave Burke <daveburke@google.com> Handle setDataSource failures properly. #5261671

Change-Id: Iea0aa474d1939db23da9aabdfae2081e834f30d9
ibmedia/mediaplayer.cpp
351f44af54f001ee67908f9e1f601f8ffa7905d2 06-Sep-2011 James Dong <jdong@google.com> Merge "Don't overwrite pending port setting change if there are more than one port setting change event."
2e6f49cc810ea8c4a23d88fdeb24267a18085556 05-Sep-2011 Jamie Gennis <jgennis@google.com> Merge "MediaPlayer: remove the setTexture method"
09bb20b5f6072f3202c4bfd7db9b557e05547c3b 05-Sep-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5240036: Generate a reasonable bitrate for intermediate clips."
3814ff4b17165e86d1893fde53025c69583599b4 03-Sep-2011 Pannag Sanketi <psanketi@google.com> Fixing bug in SurfaceMediaSource_test

The test was making EGL calls once disconnected. Instead of calling
"disconnect" directly on the Surface, and EGL calls should be made to that
effect.

Change-Id: I21468ac8cbc2cb3145a49269e32a884736cd452e
ibstagefright/tests/SurfaceMediaSource_test.cpp
dca56b9432e2cc851d1a58920071fed2e1e3d142 02-Sep-2011 Eric Laurent <elaurent@google.com> Fix issue 5252593: any app can restart the runtime

Replace null device address string by empty sting.

Change-Id: I285c35f3345334e6d2190493b1a8a5aca1a361a4
ava/android/media/AudioService.java
ibmedia/AudioSystem.cpp
83fb94d188e18a44458f903ff4baa6e8402a31ce 29-Aug-2011 Jamie Gennis <jgennis@google.com> MediaPlayer: remove the setTexture method

This change removes the MediaPlayer#setTexture method. It has been
replaced with MediaPlayer#setSurface.

Change-Id: Iaecbbac7629d7092883f270694c5c67391f4ed6c
ava/android/media/MediaPlayer.java
69a5f6c3e04aa0f3f87eed7578a32782c97bd48f 02-Sep-2011 Andreas Huber <andih@google.com> Properly serialize access to FileSource::getSize by acquiring the mutex

Both ::getSize and ::read call into lseek64, if this happens simultaneously
from multiple threads the results are undefined if not properly serialized.

Change-Id: I737cafebd836f3d8eb702beac557b4731f69c6f6
related-to-bug: 5196490
ibstagefright/FileSource.cpp
fc301b0bb5c635c6bb51b48c504a8db5f9010e5c 30-Aug-2011 Dave Burke <daveburke@google.com> Require INTERNET permission for network-based content.
Bug #1870981

Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
8b1f35099331746599298bda151eac56b041b746 02-Sep-2011 Chih-Chung Chang <chihchung@google.com> Fix 5240036: Generate a reasonable bitrate for intermediate clips.

Change-Id: I96bf9a7d0e2ce78fd19cce7bccbd4ac318748709
ava/android/media/videoeditor/MediaArtistNativeHelper.java
bd9d03010d3c01fb2684372c256253f5ceb7a99b 02-Sep-2011 James Dong <jdong@google.com> Don't overwrite pending port setting change if there are more than one port setting change event.

Change-Id: I3413f5235b191031252aa3785f5aaef00caef1ce
related-to-bug: 5122512
ibstagefright/OMXCodec.cpp
466ade5ad66e7bfb1814d5e5ac76a17f8a0bcd3a 01-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 5045498 Unhide Remote Control Client API

The RemoteControlClient API enables media application to have
information such as album art, current song, playback state
be displayed on "remote control displays", as well as be
controlled by "remote controls".
The new API consists in:
- a new class, RemoteControlClient
- new methods in AudioManager to register a RemoteControlClient
- a new class, RemoteControlClient.MetadataEditor to edit and
apply the information associated with a RemoteControlClient,
and which will be displayed on a "remote control display"

Change-Id: I5616085e4ad58ce0bbc1a5953b0a5a28d32f8703
ava/android/media/AudioManager.java
ava/android/media/RemoteControlClient.java
ae51008564a7a32199a144544a4ab57b976ffa9d 01-Sep-2011 Andreas Huber <andih@google.com> Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset."
67a041fa1f4b2e7143630a68db84af1e523375c5 01-Sep-2011 Andreas Huber <andih@google.com> Guard the audio notifications with a separate lock to avoid deadlocks during reset.

Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392
related-to-bug: 5179827
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
d38ecf8ce0c919a7e638a9b0eb1a664099a24048 01-Sep-2011 Andreas Huber <andih@google.com> Signal an error when encountering a malformed .ts stream.

Change-Id: I3ab0215419214b652573945403eb45eb09d41aff
related-to-bug: 5114811
ibstagefright/mpeg2ts/ATSParser.cpp
a6ec356d2f5d2829fd8eff315a37f49501eac842 01-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix 5243349 RemoteControlDisplay incorrectly updated"
b716f0b7b2d8e4b045843fc6a7004910eb344c19 01-Sep-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix 5243349 RemoteControlDisplay incorrectly updated

This fixes a case where the RCD would display transport control
for a RemoteControlClient that didn't have audio focus.
This was happening because registering an RCD was directly calling
the updateRemoteControlDisplay method, without first calling
the checkUpdateRemoteControlDisplay method which verifies the
conditions before updating the display. One of those conditions
is that the audio focus stack shouldn't be empty.

To verify this fix, several functions were also rename to clearly
indicate the lock order and verify we properly synchronize on
the right objects. In doing so, a missing synchronization on
audio focus was found.

Change-Id: If1baaac224ea676aeb83ac0aefcc53f87461c32e
ava/android/media/AudioService.java
270bcaa9d1b7e6cef723532692d82bb231ac7137 01-Sep-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for 5156702 Rotate video output for thumbnails and export"
9100473a7e908c7292008140f76ca5009a4335d4 01-Sep-2011 Andreas Huber <andih@google.com> Merge "I have one HLS stream that switches stream PIDs from one bandwidth to the next"
afbb70b48e348410279816639eeb61f8a33064d2 01-Sep-2011 Andreas Huber <andih@google.com> Merge "Discontinuities are only signalled on streams that have been identified, i.e."
eeddb0e504abf3575b71624d9453f4acfdc1d318 01-Sep-2011 Andreas Huber <andih@google.com> I have one HLS stream that switches stream PIDs from one bandwidth to the next

this change intends to support its very limited case and signals an error in
all other cases of unexpected PID changes that we cannot recover from.

Change-Id: Icbfdf9fe7461969e2a8781ed416f54d891dd789a
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
ea8c9b1bd9cd416b51b0040763af501004110fe7 01-Sep-2011 Andreas Huber <andih@google.com> Discontinuities are only signalled on streams that have been identified, i.e.

those that have a queue. This ensures that the player doesn't observe discontinuities
that don't match up across streams.

Also, make sure output buffers arriving from the decoder to be rendered are sent
back to the decoder if we started flushing.

Finally, don't parse TS packets for streams we don't support. And don't allocate
memory for them.

Change-Id: I708e0de4cba8110a62e4c8ceb1e5702430d5d2bb
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
d318b73e8e7832f257797ce08b3eea02780b7909 01-Sep-2011 Pannag Sanketi <psanketi@google.com> Merge "Update SurfaceMediaSource_test to not use pbuffer configs"
e3fb1cb1b1f333aadc780c85de0735143ad864b4 31-Aug-2011 James Dong <jdong@google.com> Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
b2c4f0bf11f38fd31d80f1256c89b9db043a2929 31-Aug-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Fix SurfaceMediaSource timestamp handling."
16b241a58f1ec4b317647b6fd0ad9b5cc3f7ba3d 31-Aug-2011 Eric Laurent <elaurent@google.com> Merge "Change condition to enter silent mode."
528e382f48681a2175a24e7403f63a4493d7c44b 31-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix 5242200 only update RemoteControlDisplay when a client is present"
338794576667745b060ac269b2c2b36e0c6964f2 31-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix 5242200 only update RemoteControlDisplay when a client is present

A precondition for updateRemoteControlDisplay_syncRcs() is that
mRCStack is not null. This condition was not verified when
registering a RemoteControlDisplay.

Change-Id: I0b152410e57c590114b387e9ab83f0c4d15d060d
ava/android/media/AudioService.java
3727e3d80d37fc8004ddaa4ec589bd8d9c304fad 31-Aug-2011 Gloria Wang <gwang@google.com> Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419."
e28857c125280a1fbeec570036b8d1c223e14db7 31-Aug-2011 Gloria Wang <gwang@google.com> Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL
and AudioPlayer was not started.
Fix for 5236419.

Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb
ibstagefright/AwesomePlayer.cpp
3d4c06f90726a85e89dab13c41ddc15b9c912a3f 16-Aug-2011 Eric Laurent <elaurent@google.com> Change condition to enter silent mode.

Previously, silent mode was entered if volume was already at 0 and
volume down key was pressed once.

The new volume management policy specifies that silent mode is entered when
volume is at last audible step and volume down key is pressed once.

Change-Id: Id3e75a99c522d8afe276868010b6e73495d23fde
ava/android/media/AudioService.java
49fb943db85c748fc7dd4f5ee4a461d7489fb1b0 31-Aug-2011 Andreas Huber <andih@google.com> Merge "ATSParser now supports a mode in which PTS is considered to be absolute time"
e753750a82a3dcffeb36c7661d1c7922fc082a35 31-Aug-2011 Pannag Sanketi <psanketi@google.com> Update SurfaceMediaSource_test to not use pbuffer configs

SurfaceMediaSource_test now does not use pbuffer configs
to create a surface. Always uses a window config.
Also, cleaned up the test a bit.

Change-Id: Idda40dcb8474249eccaa8d2dad20ee840d2dd484
ibstagefright/tests/SurfaceMediaSource_test.cpp
5ad4b9fb96089e460902ffac9f3649366afd3750 31-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> RemoteControlClient metadata: add method for metadata of long type

Update to the RemoteControlClient.Editor API:
- new method for setting metadata of type long
- methods for setting metadata throw an exception if using
the wrong key with the wrong method.

Note that this change will cause the Music2 application to
throw an exception when it tries to set the duration as a string.

Change-Id: I17cff86467851a0aff313c07653e752ae6b6180f
ava/android/media/RemoteControlClient.java
58c524ec03b4216587388bf0ce49318d91e4452b 31-Aug-2011 James Dong <jdong@google.com> Fix a crash where the EOS was signalled but some output buffer were still pending.

Change-Id: Ide111264501441b51bb10629ae2021accf9e1fb5
related-to-bug: 5234126
ibstagefright/OMXCodec.cpp
ebd266c0340583438886530e2d6f23717bbbf0d2 31-Aug-2011 Andreas Huber <andih@google.com> ATSParser now supports a mode in which PTS is considered to be absolute time

i.e. PTS 0 <=> media time 0

Change-Id: If10a0f98c129b95e8430dc419664b1def92e547e
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
2261c7d6456376ed10a97643fc74a1e4eb2c1c9f 31-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5045498 Force display update when display registers"
958bba6862c9540c528263686b0de044b4a7a5f6 30-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 Force display update when display registers

When an IRemoteControlDisplay registers, cause the
RemoteControlClient to send all its information to the newly
registered display.
The previous code was only sending a request for update: this
request didn't here cause the client to send the data because
a new client generation had not been synchronized among clients
and displays.
This CL uses the same code path to force an update as when audio
focus changes, or a new client registers, by calling the same
method that is called in those cases,
updateRemoteControlDisplay_syncRcs(flags).
Also in this CL: more method renames to indicate methods that
are called synchronized on mRCStack.

Change-Id: I54102f45ba1cd4812d958ecd883bec7bc45ae88f
ava/android/media/AudioService.java
8d102eb6720deccfb8b5872fde531ef6ca580077 30-Aug-2011 Jamie Gennis <jgennis@google.com> Merge changes I33f59705,Ia4c8c822,I2fb695ab,I2e587afc

* changes:
MediaDump: use the MediaPlayer#setSurface method
HTML5VideoView: switch to MediaPlayer#setSurface
MediaPlayer: unhide the setSurface method
Surface: unhide the SurfaceTexture ctor
c847b1a89df94dbff4c2f557f8c042ead5398c3f 30-Aug-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for 5156702 Rotate video output for thumbnails and export

This is part of a multi project submit.
This is the Java and Jni changes.

Change-Id: I8851f5d865e657b7846bcded38e752f388f95895
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorClasses.h
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorMain.h
ni/mediaeditor/VideoEditorPropertiesMain.cpp
0e35c78d25a8df8b3bde566ad6c474f9df242ea4 30-Aug-2011 Eric Laurent <elaurent@google.com> Merge "226483: A2DP connected, but music out to speaker"
728e08bc3fd99dc64f436270f53c22f3457204a8 30-Aug-2011 Eino-Ville Talvala <etalvala@google.com> Fix SurfaceMediaSource timestamp handling.

Was not basing timestamps on startTimeUs.
Now synchronizes properly with audio.

Bug: 4510826
Change-Id: I613db0aa91e51fc75d120e65540e742d8ab2ae43
ibstagefright/SurfaceMediaSource.cpp
05ce0941649c3cdd7f8034496719e607977fc005 30-Aug-2011 Eric Laurent <elaurent@google.com> 226483: A2DP connected, but music out to speaker

When the A2DP headset is connected, there is a possible
race condition when the audio tracks are moved from
the mixer thread attached to the speaker output to the thread
attached to A2DP output.
As the request to clear the stream type to output mapping cache in
the client process is asynchronous, it is possible that the flag
indicating to the client audio track to re-create the IAudioTrack
on the new thread is processed before the cache is invalidated.
In this case, the track will be attached to the old thread and
music will continue playing over the device speaker instead of being
redirected to A2DP headset.

Change-Id: Ib2ce1eb5320eaff83287b93779061bf4e7a330df
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
c5d0fac081c4c496b29586bff79dfff05755b716 30-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5156756 Fix AAC ADTS header size computation"
90200ee4e23b662e81a8d6fb6ef634ac6b378f5f 30-Aug-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "5106773 Can't export a movie - Error returned from OMX API in ducati"
8f7bf025067767313d4d012718ad7f7f8b9822cd 30-Aug-2011 Rajneesh Chowdury <rajneeshc@google.com> 5106773 Can't export a movie - Error returned from OMX API in ducati

Video Editor engine wrongly set the profile in place of level.
So level was always 1 (default value for Profile)

Change-Id: I202f866d32e81869d9692174d59d9d777a772282
ava/android/media/videoeditor/VideoEditorProfile.java
59fe406b3a475648828d4e44ca47427fa4829677 29-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5156756 Fix AAC ADTS header size computation

This previous frame size computation code had two incorrect
assumptions:
1/ the ADTS frame length value already contains the header size
2/ the ADTS header is not of fixed size: it is 2 bytes bigger
if it contains the CRC value.
For 1/, the code worked because when the header size was added
to the frame size, the + operator is of stronger precedence
than the ? operator, so the size added was always 0 (instead
of ADTS_HEADER_LENGTH.
For 2/, the code worked as long as there was no CRC in the ADTS
data.

The fix consists in:
- documenting what the frame length computation code returns
- fixing the frame length computation
- when computing the frame length, also returning the header
size so the correct data can be sent to the decoder.

Change-Id: I92df72a9e531f594f762e63d62f9dee7b0109904
ibstagefright/AACExtractor.cpp
2a45102186a25877df04404d591171b2b2e85626 30-Aug-2011 James Dong <jdong@google.com> Merge "The test application falsely reports that the test result even if the test failed."
4afbe2ec7560bfa2637841802cf01cfbd01187e3 29-Aug-2011 James Dong <jdong@google.com> The test application falsely reports that the test result even if the test failed.

Change-Id: Ia632f04da73642dc4c1e3147b16664b5672108bc
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
af4fccf0c029be1f6964de5a456ceb651f052ba4 29-Aug-2011 Jamie Gennis <jgennis@google.com> MediaDump: use the MediaPlayer#setSurface method

This change updates the MediaDump test to use the new
MediaPlayer#setSurface method in place of MediaPlayer#setTexture, which
will be removed.

Change-Id: I33f59705c728f0884452d45cf83cb5b80f66a95a
ests/MediaDump/src/com/android/mediadump/VideoDumpView.java
b283dc64bc97f53804108cebf5b904eb4fb77155 29-Aug-2011 Jamie Gennis <jgennis@google.com> MediaPlayer: unhide the setSurface method

Change-Id: I2fb695ab918d1099ad7cc51bfd436712a0b640d9
ava/android/media/MediaPlayer.java
499f36581c63579f24c3d9bbf95c7f8677cd1191 29-Aug-2011 Andreas Huber <andih@google.com> Merge "Return an error to the client instead of asserting if decoder instantiation fails"
07754c513fb0470c9ff1ee45afb5bbeb4033d5e3 29-Aug-2011 Andreas Huber <andih@google.com> Return an error to the client instead of asserting if decoder instantiation fails

after a surface change.

Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b
related-to-bug: 5212725
ibmediaplayerservice/StagefrightPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
2db44c5838fb0bb35092a19f31ee887892a451a1 29-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update IRemoteControlDisplay when it registers."
db8a361629f06f62b9e1c40d4413b3b5099bd124 27-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Update IRemoteControlDisplay when it registers.

When an IRemoteControlDisplay registers, it must receive information
from the current client.

Change-Id: Id845e7a87ac74c2db2c59e0281b28a45f8d20528
ava/android/media/AudioService.java
aca6d629e2e72742abc0f46d14b23252489e64ee 29-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Cannot compare Binder references for RC display to unregister"
b3c084af16dfd50c20c10320bf2b1e8d4d0cc5b8 29-Aug-2011 Andreas Huber <andih@google.com> Merge "Signal errors to the client instead of asserting in ACodec."
3451df1a5cc1547fe1061a482a50a639fcc0e8e4 28-Aug-2011 Pannag Sanketi <psanketi@google.com> Merge "Default W, H allowed in SurfaceMediaSource dequeue"
2b9c5d8a89065ab18e58d79ae65a81267b248e1c 27-Aug-2011 Pannag Sanketi <psanketi@google.com> Merge "Fixing small syntax error in MPEG4 logging"
5cfcfb22d6f4acf6a69ee8ed6b6c1fc097a08cd4 27-Aug-2011 Pannag Sanketi <psanketi@google.com> Fixing small syntax error in MPEG4 logging

Found that the build was breaking when the logging was enabled in
MPEG4Writer. Fixed.

Change-Id: I62c5e6d16b2ecf5644c8d46b9bbcca68a797b223
ibstagefright/MPEG4Writer.cpp
7309c83b95b36eac141680158df70ac1ce02a160 27-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Cannot compare Binder references for RC display to unregister

Cannot trust references to IRemoteControlDisplay to remain the
same when removing a RemoteControlDisplay, compare the
result of .asBinder() instead.

Change-Id: Ib2e82aa24bd4b12804bccff94a6a0090ff83bea8
ava/android/media/RemoteControlClient.java
28c5b96d840c24947fd29f2e65646ff37f5dc7ff 27-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Address multiple RemoteControlDisplay competing for registration"
18e7bce52318f00b5023f33933a571c477f2b61c 26-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Address multiple RemoteControlDisplay competing for registration

The RemoteControlClient / Display feature only supports one
display. If multiple displays are registered, this CL implements
the following policy:
- cannot unregister a display that is not the current one,
- registering a display when another is already registered
causes the old one to be unregistered.
This fixes a death handler leak where the previous display was
simply overwritten, without unlinking to its death.

Change-Id: I63f8a38093796e0960761936d7fc58d47b7589b3
ava/android/media/AudioService.java
6032a6018de7d3cd584e3f9fd66d329af17fc8bf 27-Aug-2011 Andreas Huber <andih@google.com> Signal errors to the client instead of asserting in ACodec.

Also make sure NuPlayer can properly shutdown in certain edge cases.

Change-Id: Iceb16d600d87ba66c802e60e95bf62f66487a453
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibstagefright/ACodec.cpp
fedd53b82b0e15c2678a9930a21957cf531da20b 26-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Don't try to rescale when no bitmap in RemoteControlClient"
539340fe2c3dfd33564c1ddc9ee5c2884aa56874 26-Aug-2011 Andreas Huber <andih@google.com> Merge "Support for posting messages and synchronously waiting for a response."
6e679d5a53091b348a2cdc0c76f4e8fa4ac52d4b 26-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Don't try to rescale when no bitmap in RemoteControlClient

If a RemoteControlClient has a null artwork, do no attempt to
rescale the bitmap, it's ok to send a null bitmap to the
IRemoteControlDisplay.

Change-Id: I8332ccfcf18107ea0b41d4e7fa232d7f68798efc
ava/android/media/RemoteControlClient.java
9ba16f6c5485d5384ed38df63c7d23e3d20e8d31 26-Aug-2011 Andreas Huber <andih@google.com> Properly reset the number of frames we think we've written to the audio sink

in order to compute the final delay before posting end-of-stream correctly.

Change-Id: I4ff6d7142fdf1ea2d19d12ec78c1e84322d22e5f
related-to-bug: 5216930
ibstagefright/AudioPlayer.cpp
2daf331e683d397f4968016144f4cb34188b8b98 26-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 4364249 Play position is 0 after flushing AudioTrack"
22cb204cbb9fadd0a909e0e918c0cb19c60da740 26-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 4364249 Play position is 0 after flushing AudioTrack

AudioTrack::stop() is not synchronous, so a stop() followed
by flush(), which is synchronous, will not always report
a playhead position of 0 after being called.
This CL adds a flag to mark a track as flushed, and report the
correct playhead position in this state.
Bug 5217011 has been created to address the real issue in the
future, where flush could be made synchronous, to properly
address bug 4364249.

Change-Id: Icf989d41a6bcd5985bb87764c287f3edb7e26d12
ibmedia/AudioTrack.cpp
e688257456c315cbd2d5fd4f32bd52eac0b98195 26-Aug-2011 Andreas Huber <andih@google.com> Support for posting messages and synchronously waiting for a response.

Change-Id: Id6c7a08c34fd5cb6c4632f78ece9e7898b29e52c
ibstagefright/foundation/ALooperRoster.cpp
ibstagefright/foundation/AMessage.cpp
463854bead24c951932d1d8c31e4f22cbce983fb 25-Aug-2011 Andreas Huber <andih@google.com> Merge "When encountering a discontinuity, flush(clear) all content enqueued up to that"
ced159b1d839b24775525ccb736876e7cb7e649d 25-Aug-2011 Andreas Huber <andih@google.com> When encountering a discontinuity, flush(clear) all content enqueued up to that

point except previously enqueued discontinuities.

Change-Id: Id04a559dc062fa4a5c80c599ad74bf81a543de01
related-to-bug: 5201378
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
5837dfaf654f1f824d8cc4ef12188d5a27556aa3 25-Aug-2011 Gloria Wang <gwang@google.com> Merge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug 5208736."
051f8908a3f6cb6f251f79267171b7a12597a98e 25-Aug-2011 Gloria Wang <gwang@google.com> Set mSeekNotificationSent as false for RTSP seeking.
Fix for bug 5208736.

Change-Id: Ib1d74608ec289509082d8dcad080769f48098853
ibstagefright/AwesomePlayer.cpp
b335a5a4e0cbbeaf295e28b670411a828fd7d229 25-Aug-2011 James Dong <jdong@google.com> Merge "When Camera is launched by media recording framework, stagefright controls the stop and release."
831227816bdcb360148615393e3e93ac379bf3ea 25-Aug-2011 James Dong <jdong@google.com> When Camera is launched by media recording framework, stagefright controls the stop and release.

Change-Id: Ic79a60dad0f617a845211d3fbe146c1648a71da3
related-to-bug: 5205804
ibstagefright/CameraSource.cpp
e9816475a6a3caadb7934fcde7b608b4a4fa8a1f 25-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix deadlock in AudioService"
3094d955b8321f01e50cb0c448ae1c4c461f41c9 25-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix deadlock in AudioService

Locks related to audio focus and remote control should always be
taken in the following order:
1/ audio focus lock
2/ remote control stack
3/ current remote control client generation

Change-Id: If8be11bfef92849957e692b2bd52adbd67a2ef0b
ava/android/media/AudioService.java
7096c4a0e249a62689a7e28cb6059af4c7af7f3d 25-Aug-2011 Chih-Chung Chang <chihchung@google.com> Merge "Port setting change should happen before receiving any filled frame."
886530788c423cffbfb7dd85d2bf46ff7429878b 25-Aug-2011 Pannag Sanketi <psanketi@google.com> Default W, H allowed in SurfaceMediaSource dequeue

The client does not have to send (w, h) = (0,0) in dequeuebuffer. It can
set the same w, h as the default width and height.

Change-Id: I8202f90261ccaebbd35ea28c153a7472f01912f1
ibstagefright/SurfaceMediaSource.cpp
25c18fe06bc56087b0c4bfd2459c51df5337db21 25-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "More information for RemoteControlDisplay about new client"
4b6df6a3dcbd9990e36438c529fa8c16b2580df9 24-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> More information for RemoteControlDisplay about new client

When the client gets cleared, let the display know the new
client generation ID is for a clear.
When a new client becomes current, let the display know
what the associated media button event receiver is.

Change-Id: I18e37a309b5b30ed361a68918379b60418409f1e
ava/android/media/AudioService.java
ava/android/media/IRemoteControlDisplay.aidl
409f95ff89653760af53bede1a8ec19e21ecc4b5 25-Aug-2011 Pannag Sanketi <psanketi@google.com> Merge "Testing the GL/ CPU encoding w/ Gralloc buffers"
557b7092cc9a1dfe766ac3d0421e1049c653c4ae 19-Aug-2011 Pannag Sanketi <psanketi@google.com> Testing the GL/ CPU encoding w/ Gralloc buffers

This is the test for Gralloc buffers based encoding.
contains a combination of two main changes:

1. GL based encoding tests added to SurfaceMediaSource_test

2. SurfaceMediaSource ::read() colorformat

The SurfaceMediaSource::getformat() sets it to OMX_COLOR_FormatAndroidOpaque.
The omx encoder needs to interpret that colorformat and reads the format
from the Gralloc buffers directly

Change-Id: Iee2fe8901384109a4952e1d6c528c59eb01eb5b1
ibstagefright/OMXCodec.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/tests/Android.mk
ibstagefright/tests/SurfaceMediaSource_test.cpp
2b0f795dd696319618342865b7cd5101af0ae7e1 24-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5045498 Single binder call when metadata and artwork are updated"
85a0a0576629e7675d87b95c089368dc4acd090e 24-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5045498 Implementation of RemoteControlClient.MetadataEditor"
44413e5b514a91806a4bb4c7780029ea43be6f81 24-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 Single binder call when metadata and artwork are updated

When metadata gets applied, optimize the artwork and metadata
update by doing it in a single call.

Add missing RemoteControlDisplay-related methods in AudioManager.

Change-Id: I97aa802cc480327bee5592ea8dfdbd414c0f037a
ava/android/media/AudioManager.java
ava/android/media/IRemoteControlDisplay.aidl
ava/android/media/RemoteControlClient.java
4da5eeffc92331b958eeb111aa2f3d938083954e 24-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 Implementation of RemoteControlClient.MetadataEditor

A MetadataEditor contains all the metadata and artwork to be applied
to a RemoteControlClient.
A MetadataEditor can only be applied once.

Change-Id: I3ce9d97f520cd9ab009fb1a92a2b399717511bd8
ava/android/media/RemoteControlClient.java
a8120ea311e298b61902b947a35876c173417770 24-Aug-2011 James Dong <jdong@google.com> Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
68e37ae87ad9932f2119c1b2fc361c1aed5841e4 23-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5045498 New implementation of remote control API"
4426e42ac6107bf6b09f7c4cdad39eb161d8b9ca 19-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 New implementation of remote control API

Remote control displays expose an IRemoteControlDisplay interface
which they register through AudioManager.
Remote control clients create a RemoteControlClient object, which
implicitely exposes an IRemoteControlClient interface registered
in AudioService through AudioManager.
AudioService tells all clients and displays when a new client
is the one that should be displayed.
A client's data gets sent to the display when it is valid, or
it sets new data (while being valid).

The implementation for setting metadata and album art is temporary,
and will migrate to the MetadataEditor API in future CLs.

Change-Id: Ibab6ea1d94c68f32482c760c6ae269541f885548
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
ava/android/media/IRemoteControlClient.aidl
ava/android/media/IRemoteControlClientDispatcher.aidl
ava/android/media/IRemoteControlDisplay.aidl
ava/android/media/RemoteControlClient.java
d109a7d428cfb6f2f8f504ea9a2b3185a2b46283 23-Aug-2011 Andreas Huber <andih@google.com> Merge "We were accidentally sending out an output buffer before the final port settings change"
887b7295dae903b7859026f0c14e642347aa934a 23-Aug-2011 Andreas Huber <andih@google.com> We were accidentally sending out an output buffer before the final port settings change

Change-Id: I4de0d3c377bb12e59524ed370ab3ed0b9a9b70a6
related-to-bug: 5122512
ibstagefright/codecs/aacdec/SoftAAC.cpp
cf56f1e7ad7586831faa5bacb537f71cdb227e61 23-Aug-2011 Eric Laurent <elaurent@google.com> Merge "Revert "Change condition to enter silent mode.""
73a56fe47720cc2659da6fc0a01fcc28940e7243 23-Aug-2011 Eric Laurent <elaurent@google.com> Revert "Change condition to enter silent mode."

This reverts commit c11c3ae4dd5d4054e5b44a7bdfe6b203bdb69976.
ava/android/media/AudioService.java
f1824a9762a28c1b664360cb1b6c354d937878bc 23-Aug-2011 Chih-Chung Chang <chihchung@google.com> Pass correct indices for thumbnails of MediaImageItem.

Change-Id: I8e52014ab76c63994385bc54106c19b425be8550
ava/android/media/videoeditor/MediaImageItem.java
e64966833191dd26f03706f4317741cd7555552e 22-Aug-2011 Chih-Chung Chang <chihchung@google.com> Port setting change should happen before receiving any filled frame.

Change-Id: I12a54b80e7ef958b6d451b7add110d38f05ec439
ibstagefright/OMXCodec.cpp
6e37cf90f90678a083eef57c62d47831fd208f48 22-Aug-2011 Andreas Huber <andih@google.com> The MatroskaExtractor will now publish a different mime-type "video/webm" if

the doctype of the matroska file indicates that it is a webm file.

Change-Id: I467f597690a841043ecd11d2a2cae93351820f1b
related-to-bug: 5042137
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/MatroskaExtractor.h
8598e575985759e27bd2c653d26c42f9cc9855a5 22-Aug-2011 Chih-Chung Chang <chihchung@google.com> Merge "Remove useAndroidNativeBuffer(2) warning message."
c0a2222552f48a2543a64a4cbe913d0b9ffc3cbf 20-Aug-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)"
c0ce60774cd9ec654d30d1ce6d670c69fa7bb9c5 19-Aug-2011 Jamie Gennis <jgennis@google.com> Merge "Stagefright: fix a compiler warning"
3ced044154945f9d60983032278e00fe28f4ab1b 13-Aug-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)

Also fixes 5118207 add other video codec support for video editor export.

Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorImpl.java
ava/android/media/videoeditor/VideoEditorProfile.java
ni/android_media_MediaProfiles.cpp
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorClasses.h
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorPropertiesMain.cpp
ibmedia/MediaProfiles.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorExportTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java
121e50c0669dc25347ff1d5c198875a8f213bcc9 19-Aug-2011 Andreas Huber <andih@google.com> Raise the maximum input buffer size for the vpx video decoder to 256KB

Change-Id: I0411763829bf186d1b3b679fa72c9051524506b4
related-to-bug: 5169641
ibstagefright/codecs/on2/dec/SoftVPX.cpp
7f639d33151be143f062274b0da0729c29391bdb 19-Aug-2011 Chih-Chung Chang <chihchung@google.com> Merge "Fix 5144356: Native crash while importing music"
0bf049c63584e3e1b7e1c079b39fd6744705fbc7 19-Aug-2011 Gloria Wang <gwang@google.com> Merge "When switching surface, do not set mSeekNotificationSent as true, because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug 5181272."
3c578f2d6ad0cd7a31e2f947f6bb41d05c15c1f2 18-Aug-2011 Gloria Wang <gwang@google.com> When switching surface, do not set mSeekNotificationSent as true,
because there could be a previous uncompleted seeking which needs
to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent
as true here, then mediaplayer.cpp will be waiting for message
MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return
the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp.
Fix for bug 5181272.

Change-Id: I290aff29b6d9ec8db67c66abbe1f352a43f57073
ibstagefright/AwesomePlayer.cpp
3d01812f5e147ab4e842fb5e61179ed5cd4313b8 18-Aug-2011 Andreas Huber <andih@google.com> Merge "Some decoders require more gentle treatment"
5bc53035bde27cd886dd7b31e6a07107422a723d 12-Aug-2011 James Dong <jdong@google.com> Some decoders require more gentle treatment

We sacrifice A/V sync to some extent to enable the decoder to recover from
temporary bottlenecks.

Change-Id: I16195091ad752bfad4c70869cdd7e9f28ca3a118
related-to-bug: 5180142
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
4960f3a67c93e2470d96fbcf765a55e4031aedf5 18-Aug-2011 Andreas Huber <andih@google.com> Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording.

Change-Id: I982e740e8488ff8717ca5f081db9def55aabc9ec
related-to-bug: 5179033
ibstagefright/AwesomePlayer.cpp
a91495d56dc10a57ed21490ffafae742b6411d6e 18-Aug-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for 5155561 During export, progress bar jumps from 0 to 50%"
b6769fc242b4a2ae76d0be29af440dcc47c7dd27 18-Aug-2011 Chih-Chung Chang <chihchung@google.com> Remove useAndroidNativeBuffer(2) warning message.

Change-Id: I3e9765e7271d80fda302e521501720bf8c13e5c7
ibstagefright/omx/OMXNodeInstance.cpp
176dde85a0ba838c1aed4148473743d964edbaec 18-Aug-2011 Chih-Chung Chang <chihchung@google.com> Fix 5144356: Native crash while importing music

1. Use the correct Get*Field functions according to the field type.
2. When we have exceptions, return.

Change-Id: I1878d806e26798a0977ff71a781551088e45f6fb
ni/mediaeditor/VideoEditorMain.cpp
983ab88e117fcbda9370b8f4ba94271d37149672 18-Aug-2011 Dongwon Kang <dwkang@google.com> To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams.

Note: current resync logic keeps searching mp3 frames until it meets a
valid one. This resync logic works well with seek() operation, but in
SniffMP3(), this may cause false-positive classification for the
following MPEG-PS file format.
A possible MPEG-PS video file:
[PS header]...[mp3 frame][mp3 frame] ...
MP3 files:
[ID3 tag][mp3 frame][mp3 frame] ...

BUG: 5104562
Change-Id: Idd5020723f7bdb2fefc2a63fc8651580fd644399
ibstagefright/MP3Extractor.cpp
8c60d89b3704164d5a13e80ace6bea4b51af37a3 18-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5045498 RemoteControlClient interface"
6721d33feff547e938aeba20073c9c0cc6a3390b 17-Aug-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for 5155561 During export, progress bar jumps from 0 to 50%

Change-Id: I5f5814a1212cd242535ae7cadec8a76f099e78ce
ni/mediaeditor/VideoEditorMain.cpp
8f6684144a617982763db3d2281e86f2a9d368db 17-Aug-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 5126270: Holding volume down vibrates"
5a9ffaa4cb58be595ba57d4078988d0496781063 17-Aug-2011 Andreas Huber <andih@google.com> Merge "Make sure we have all the sample table metadata before declaring a track valid."
987cb2ed4a3aebdb624088c38981b2409ab8f6b1 17-Aug-2011 Andreas Huber <andih@google.com> Make sure we have all the sample table metadata before declaring a track valid.

Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31
related-to-bug: 5178976
ibstagefright/MPEG4Extractor.cpp
ibstagefright/SampleTable.cpp
ibstagefright/include/SampleTable.h
cc11b1b8bb47aa6be23ff5c4caf683ff90074121 17-Aug-2011 Eric Laurent <elaurent@google.com> Fix issue 5126270: Holding volume down vibrates

Clear AudioManager.FLAG_VIBRATE in adjustStreamVolume() if
already in silent mode.

Change-Id: I8035a8cc713e1880799d9aaf053d8e4d12acad75
ava/android/media/AudioService.java
24ac9e1ec293fc8f7cde3eb79d34db86b5ef63c3 17-Aug-2011 James Dong <jdong@google.com> Merge "Don't time out prematurely for video encoding waiting for output buffers"
bc91ea6bfffde0dd55e6ed1a1677422da86e7462 17-Aug-2011 Eric Laurent <elaurent@google.com> Merge "Change condition to enter silent mode."
178889eff7fa3361a5cb08d6d43846a1baf5216b 16-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 RemoteControlClient interface

Define a RemoteControlClient interface that applications must
implement and register to be displayed on the lockscreen.

Change-Id: I67276ae653f203e76727432231f1d76535c31942
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
ava/android/media/IRemoteControlClient.aidl
ava/android/media/IRemoteControlClientDispatcher.aidl
ava/android/media/RemoteControlClient.java
d51b218b47c0941af8b6cbc3f2ffcaef58c6d007 17-Aug-2011 Chih-Chung Chang <chihchung@google.com> Merge "Display thumbnails one by one and cache them."
bd151dee646e3b476a8f8e494b7543526438a1eb 17-Aug-2011 Kristian Monsen <kristianm@google.com> Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
c5f9a42c50d79abec219870bd19009c260b062d6 17-Aug-2011 James Dong <jdong@google.com> Merge "Use camcorder profiles for MediaRecorderStressTest"
3b2d54a0e71526ed23b0cd385137b93f2572d09c 16-Aug-2011 Andreas Huber <andih@google.com> Merge "Error handling in ACodec and Nuplayer."
d84fd7927eaf70fb7b9a55dd6c2adccfa66009ac 16-Aug-2011 Andreas Huber <andih@google.com> Error handling in ACodec and Nuplayer.

Codec errors (and codec not found errors) now trigger a controlled shutdown
of playback and signal errors to the MediaPlayer client.

Change-Id: I2ee23ff2a1422d05a1a21e50ecb87d7c7ab958cc
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibstagefright/ACodec.cpp
bf0a0644fd15e96859092c33306431e6491a3d70 16-Aug-2011 Andreas Huber <andih@google.com> Properly initialize some instance variables.

Change-Id: I190b889be343dca14fe8109528be14cc3cdd4c34
ibstagefright/AwesomePlayer.cpp
c11c3ae4dd5d4054e5b44a7bdfe6b203bdb69976 16-Aug-2011 Eric Laurent <elaurent@google.com> Change condition to enter silent mode.

Previously, silent mode was entered if volume was already at 0 and
volume down key was pressed once.

The new volume management policy specifies that silent mode is entered when
volume is at last audible step and volume down key is pressed once.

Pressing volume down key continuously will decrease volume until
last audible step is reached, not 0.

Change-Id: Ib7b530668473d6a5af1e748f445d6185afed2158
ava/android/media/AudioService.java
92d6ea3e83f29047bef4fd8dcf378b757967dc00 15-Aug-2011 James Dong <jdong@google.com> Don't time out prematurely for video encoding waiting for output buffers

o For timelapse video encoding, the timelapse between two neighoring
input frames could be very long

Change-Id: I2b6f9c392f2237deae71c894efc7fc3692431796
related-to-bug: 5160548
ibstagefright/OMXCodec.cpp
b921608325840140802011d6c5c20ce95de3fa88 16-Aug-2011 Kristian Monsen <kristianm@google.com> Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2

Reenabling chromium as a shread lib

Change-Id: I5f7abe61624d812c5781c4a453f587e744bc082d
ibstagefright/Android.mk
1f5de3833daddfa1d0ebc7dee1f9e007d4ed36a0 15-Aug-2011 Chih-Chung Chang <chihchung@google.com> Display thumbnails one by one and cache them.

Change-Id: I10808f5bca475aea924817bf532dc5916438563a
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ni/mediaeditor/VideoBrowserInternal.h
ni/mediaeditor/VideoBrowserMain.c
ni/mediaeditor/VideoEditorMain.cpp
931e73946390b43fc08f5ae66770fba0efba5345 16-Aug-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 5131056: key beeps when screen is locked"
96f218e0b9834b959f1acf34b51d325bb1c33a0d 16-Aug-2011 Eric Laurent <elaurent@google.com> Fix issue 5131056: key beeps when screen is locked

Clear AudioManager.FLAG_PLAY_SOUND in AudioService adjustSuggestedStreamVolume()
if keyguard is locked.

Change-Id: I2effb9cab8d946845e948b28899b17d7f24c1282
ava/android/media/AudioService.java
c9b9cbc76e22615886bf91596badef7f4a3d32a5 16-Aug-2011 James Dong <jdong@google.com> Use camcorder profiles for MediaRecorderStressTest

related-to-bug: 5167351

Change-Id: Ia21ca39a404484b2dda25c6101780d2ff11c4623
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
59df720668938be62e6cff6df781c88f23ea42c7 16-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5045498 javadoc for the remote control client API"
837da7153f8ff144bbb02d68d37833f7dc106a0f 16-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 5045498 Send media button event receiver to remote control"
fcd693a21d862ea765006f8987b8dd4b125b28c5 11-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 javadoc for the remote control client API

Change-Id: I2a8aeffd94c4f9e93a1be459be8e45d595438f38
ava/android/media/AudioManager.java
ava/android/media/IRemoteControlClient.aidl
152abefccb6925fd1092ac6424d7720b43375fc8 16-Aug-2011 Eric Laurent <elaurent@google.com> Merge "Deprecate use of some audio effects on output mix."
0a9faa8cf934ef38319cd945b600825c6bb88b9c 15-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 Send media button event receiver to remote control

When notifying the remote controls of an update, also pass the
associated media button event receiver.

Change-Id: I9125378653ce21e3bd672b936df638c0c6154edb
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
62f3617f2f4016ad2f59635d5156d64872989880 14-Aug-2011 Eric Laurent <elaurent@google.com> Deprecate use of some audio effects on output mix.

The possibility for applications to apply insert audio effects
(Equalizer, BassBoost, Virtualizer) on global output mix has brought up
a number of issue.

This change updates the java doc for audio effects indicating that
application should not apply insert effects globaly anymore as this behavior
will soon be deprecated.

The audio framework will still allow global insert effects during an interim
period but will give the priority to effects inserted on particular player by
disabling global effects when both are present.

============

Change-Id: If87f1944a0409d45d8d2eee66ff331f95965ca89
ava/android/media/audiofx/AudioEffect.java
ava/android/media/audiofx/BassBoost.java
ava/android/media/audiofx/Equalizer.java
ava/android/media/audiofx/Virtualizer.java
cb04a1f3a31c252a0e3fda5e7eaa16f3257c9397 09-Aug-2011 Chih-Chung Chang <chihchung@google.com> Speed up thumbnail generation.

We don't need to have precise position for thumbnails, so we add
a tolerance parameter to the decoder. The decoder can return an
earlier frame within the tolerance time given.

Change-Id: I0a49ed6b03f8c3264606e4143dd5ecf48e9d0f62
ni/mediaeditor/VideoBrowserMain.c
ni/mediaeditor/VideoBrowserMain.h
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorThumbnailMain.cpp
ni/mediaeditor/VideoEditorThumbnailMain.h
70b5c66a2415cbe9864ad88ae23fb0a151376a18 15-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fail request for audio focus when linkToDeath fails"
baf674eedd5ecff9da0cf8cabe9868f7699b1695 15-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Fail request for audio focus when linkToDeath fails

When requesting audio focus and linkToDeath() threw a
RemoteException, AudioService was only logging a warning, and
was still changing the focus, with a non-null death handler.
The change first check that linkToDeath() didn't fail, and only
then proceeds to change the focus (dispatch focus change
notification, updates the focus stack, and updates the remote
controls).

Change-Id: I0b96dd3c6e924d93f419880349d49f8b360b110b
ava/android/media/AudioService.java
52727fc38aaf6821bac6adf33235f154139638d0 14-Aug-2011 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Clear file path before deleting records to avoid accidental file deletions"
5a586199cea242ea281744e8e35969ac342cbe80 14-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix leak of global references and AudioFocusDeathHandler objects."
061214bb71a4a4211e670001226c68f5e8036b84 14-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix leak of global references and AudioFocusDeathHandler objects.

Need to call unlinkToDeath() for the object to be garbage collected.
Save the object in the FocusStackEntry, unlink to death when we remove it from the stack.
See http://b/issue?id=5048400

Change-Id: I84c5ba46017d0a8744b5e7509a7c7a5c8dd918fb
author: olivier@google.com
ava/android/media/AudioService.java
f2e2b523dd333207107b50bc174f152e954dc371 14-Aug-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Clear file path before deleting records to avoid accidental file deletions

Bug: 5140112
See also http://code.google.com/p/android/issues/detail?id=3692

Change-Id: I971eea83a2f3986a0b0ea018b7211f2525b914ab
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
497b3fe7257d5bbee7762455c6988915bde21601 03-Aug-2011 Eric Laurent <elaurent@google.com> Issue 5081351: isWiredHeadsetOn() permission.

AudioManager.isWiredHeadsetOn() should not require permission MODIFY_AUDIO_SETTINGS.
Remove permission checks on all getters in audio policy manager as permission enforcement
is really usefull for setters.
Also deprecate AudioManager.isWiredHeadsetOn() which name and implementation are deceptive.

Change-Id: I38f8df7c26c0d417bf0e2b74e4c11c2d143f2ecd
ava/android/media/AudioManager.java
65de903a88d432044bfa78271dd3192856ff25b4 13-Aug-2011 James Dong <jdong@google.com> Merge "If release has been called before finalize, do not expect MediaPlayer still exists"
43ef913815ec84d04877a698614a31e129cd97e3 12-Aug-2011 James Dong <jdong@google.com> If release has been called before finalize, do not expect MediaPlayer still exists

o also, we should releae the surface object when release is called, not wait until finalize is called.

related-to-bug: 5157956

Change-Id: I0233ad61d8349c3e3800de68b752b9548ece1742
ni/android_media_MediaPlayer.cpp
d9792ac752f10a865efe2742b600b4448a821dca 12-Aug-2011 Jason Simmons <jsimmons@google.com> Add a null check to handle failure of android::createPlayer

Change-Id: Id56bd0c16104e46d8dc71f13d8a44aefe251fad4
ibmediaplayerservice/MediaPlayerService.cpp
c498ad6eac80981946a7e96637fe2a9d0b161789 12-Aug-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 5144429: CTS test fails for AudioEffects"
02bb0e4e3bccd0b5a87c46b248a8b05d3bb35844 12-Aug-2011 Andreas Huber <andih@google.com> Merge "Fix the software AAC decoder's AAC+ detection to ignore malformed frames"
f77493e6560765882e09f4199e7f295564bede05 12-Aug-2011 Andreas Huber <andih@google.com> Fix the software AAC decoder's AAC+ detection to ignore malformed frames

at the beginning of the stream.

Change-Id: Ib990848c696896e7d43c80dec8119dec35704b74
related-to-bug: 5122512
ibstagefright/codecs/aacdec/SoftAAC.cpp
bb049108939043ca78e0390471f155dd7d7a7f8e 12-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Pass flags on remote control client information change in intent"
1ee60119c4fa51ebfa781cf5fdc33f192e8551b8 26-Jul-2011 Ted Bonkenburg <tedbo@google.com> Remove ParcelSurfaceTexture and update MediaPlayer

This removes the ParcelSurfaceTexture class since that functionality has been
folded into Surface.java. The change also updates the MediaPlayer to get rid
of setParcelSurfaceTexture() and modifies setTexture() to use the new Surface
functionality in order to simplify the code.

Change-Id: Iafa75ea3188263928128325d8a726786971b4de4
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
09f1735fadf985f321abef5fe696d0b80c6b46c7 12-Aug-2011 Eric Laurent <elaurent@google.com> Fix issue 5144429: CTS test fails for AudioEffects

android_media_AudioEffect_native_setup() was not initializing
properly the effect descriptor for audio pre processings.

AudioEffect tests should create per processing effects on a valid
AudioRecord session.

Change-Id: Ia1862ca91c98e272f9374b9225a7d4ce7ef132fc
ni/audioeffect/android_media_AudioEffect.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioEffectTest.java
35c6ec2ebabcc5f017f8be5818f0240d30763b10 12-Aug-2011 Jamie Gennis <jgennis@google.com> Stagefright: fix a compiler warning

Change-Id: Ia6b2027dfe80960450156d918bdd7fe1567cafea
ibstagefright/omx/OMXNodeInstance.cpp
bcbddd9342ee5ef48617ce7dcca6c505df3fcf08 11-Aug-2011 Marco Nelissen <marcone@google.com> Only set the ringtones and such if this is the first media scan
b/5126979

Change-Id: Ibef2bd5a3a1a288fc1137694e858d87628d780c0
ava/android/media/MediaScanner.java
45bd6086cc112b2a2cf192af01c7f444867b7f75 11-Aug-2011 Eric Laurent <elaurent@google.com> Merge "Audio effects: track CPU and memory use separately"
6752ec80b25cb1f39507d18745c7e62323772cda 10-Aug-2011 Eric Laurent <elaurent@google.com> Audio effects: track CPU and memory use separately

Before this change, CPU and memory usage for an audio effect were
registered and checked against the limit by audio policy manager
upon effect instantiation. Even if an effect was not enabled
it would prevent another effect to be created if the CPU load budget
was exceeded, which was too restrictive.

This change adds a method to register/unregister CPU load only when
an effect is enabled or disabled.
It also adds a mechanism to place all effects on the global output mix
in suspend state (disabled) when an effect is enabled on a specific session.
This will allow applications using session effects to have the priority
over others using global effects.

Also fixes some issues with suspend/restore mechanism:
- avoid taking actions when an effect is disconnected and was not enabled.
- do not remove a session from the suspended sessions list when corresponding
effect chain is destroyed.

Change-Id: I5225278aba1ae13d0d0997bfe26a0c9fb46b17d3
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
b5f04d6dbf5106140df367ae07f0e7708e1b650e 10-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Pass flags on remote control client information change in intent

Pass the flags about what information changed in the remote
control client in the intent used by the remote control display.
Also pass the IRemoteControlClient to verify it is still current
before sending the intent.

Marked some logs as to be removed before release.

Change-Id: Ib3aa22d061e5dfaf80a9c4c78774c931a2cf0fbd
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
ef02abd50531952b263061eeff6003f2605e91d5 11-Aug-2011 Marco Nelissen <marcone@google.com> Add Bluetooth SCO test app

Change-Id: I6c0c267fbb546b6db544e5ddb03e65276895e0e0
ests/ScoAudioTest/Android.mk
ests/ScoAudioTest/AndroidManifest.xml
ests/ScoAudioTest/res/drawable/icon.png
ests/ScoAudioTest/res/drawable/record.png
ests/ScoAudioTest/res/drawable/stop.png
ests/ScoAudioTest/res/layout/scoaudiotest.xml
ests/ScoAudioTest/res/raw/sine440_mo_16b_16k.wav
ests/ScoAudioTest/res/values/strings.xml
ests/ScoAudioTest/src/com/android/scoaudiotest/ScoAudioTest.java
62b3503b22b2ba771518049b8ac1c4930034e5a1 11-Aug-2011 Kristian Monsen <kristianm@google.com> Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
a962544fce4bc00673dd1d4b234290855a1fbffb 11-Aug-2011 Marco Nelissen <marcone@google.com> Merge "Check pids instead of IBinders"
458a57210930dd3d95fdcb2ab7dffdfd434a12cf 10-Aug-2011 Gloria Wang <gwang@google.com> Merge "To reduce the bytes need to be buffered before start playing the streaming video. We might revert this change if too many spinnings were introduced. For bug 4448008."
f1ddd51f9cd2f92b922bc636c307210a8d587c25 10-Aug-2011 Marco Nelissen <marcone@google.com> Check pids instead of IBinders

There can be multiple AudioManagers per process (because each Context has
its own cache of services), so AudioService should protect SCO activation
based on whether the pids match, not whether the IBinders match.

b/5044873

Change-Id: Ibec81365f95fec11f34b47becd0e473762bf06ad
ava/android/media/AudioService.java
7096f5502b93df8f7989faa56ec7701332cbf34f 10-Aug-2011 Gloria Wang <gwang@google.com> To reduce the bytes need to be buffered before start playing the streaming video.
We might revert this change if too many spinnings were introduced.
For bug 4448008.

Change-Id: I3248bba9237d71c2bd99feebc9c73f7bd45260de
ibstagefright/AwesomePlayer.cpp
e963ebdb443e400161e01ae744bb3296c86a5483 10-Aug-2011 Andreas Huber <andih@google.com> Merge "When using "secure input buffer mode" we instantiate a different OMX component"
96d8a6f8ec2b28841ccfafcdf8813cd940d99f18 10-Aug-2011 Andreas Huber <andih@google.com> Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""
753fd9a3c7325798c62534f87ebf66e32a70c924 10-Aug-2011 Andreas Huber <andih@google.com> When using "secure input buffer mode" we instantiate a different OMX component

We form the new component name by appending the suffix ".secure".

Change-Id: I509848b50ae92edb179a941493ca611f923213ec
ibstagefright/OMXCodec.cpp
422e3f749697ee264ea377bf92e6b65912ba7978 10-Aug-2011 Andreas Huber <andih@google.com> Revert "Notify the OMX component that it's going to be used in "secure" mode."

This reverts commit 7616178271e95f009452a21ea45e7225997dc27a.
ibstagefright/OMXCodec.cpp
d1fe10cdb5d5a6eadc931d17cfda00cf753bc4dc 10-Aug-2011 James Dong <jdong@google.com> Merge "Fix initial 0 duration video sample in the recorded videos"
bdbe6939ff336d97f707c7d85be2eca114d3f6a0 10-Aug-2011 Mike Lockwood <lockwood@android.com> Merge "Use video/webm mime type for WEBM files"
b33e079aca275e2e08fa8e9840f2a9df72eb1933 10-Aug-2011 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Disable bulk inserts"
cd7f0d7f72b8b9cee2f1c92c11b82164620432c6 10-Aug-2011 Gloria Wang <gwang@google.com> Merge "To support for switching from a non-null surface/ surface texture to a null one, and vice versa. Fix for bug 5137445."
cbeb69ebb3d4a6e2c00d7c5527527ddd2f878d7b 10-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioService: don't use a soft reference on IRemoteControlClient"
ff535914825f63999648030a02f57767593462f0 10-Aug-2011 Mike Lockwood <lockwood@android.com> Use video/webm mime type for WEBM files

Bug: 5042137

Change-Id: I677af1b4f34c37c78f84229551a8d82f1a7bf245
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
3410b4656505673c72da558dcfec94d7b135e760 10-Aug-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Disable bulk inserts

We are still finding bugs related to the bulk insert support,
so lets disable it for now.

Bug: 5026233

Change-Id: I436cd8fc5dbe9fcf220a623f1c070cf901c6d38c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
578b50173a80a2f1bcc99ef2a3fa0cbffd2710a4 10-Aug-2011 Kristian Monsen <kristianm@google.com> Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2

Trying to build with static libchromium on the build server.

Change-Id: Ib88ce1803f3d36ef97a627c1454ed83239a3afee
ibstagefright/Android.mk
5414a1673aab5876e4e80c746f8166d2b975b998 10-Aug-2011 Ashish Sharma <ashishsharma@google.com> Merge "Network traffic accounting for chromium stack support in mediaserver."
17da769e987de40e113c5b2a3b867b25ba7ac0a2 10-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> AudioService: don't use a soft reference on IRemoteControlClient

In the remote control stack, don't use a SoftReference to the
IRemoteControlClient because the client live in a different
process, which causes the reference to become null at the
earliest opportunity.

Change-Id: I7f7733f9a1a043825cd5e8769282b535657dd82d
ava/android/media/AudioService.java
91784c996f95483e3041169215c0d6635e27ffcc 10-Aug-2011 Gloria Wang <gwang@google.com> To support for switching from a non-null surface/ surface texture to
a null one, and vice versa.
Fix for bug 5137445.

Change-Id: Ifca2997f8ad27a843abbdaa7e89a56329bc40fde
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibstagefright/AwesomePlayer.cpp
f6d08b95289ec9069fa2f3789dbfc4748dbb4883 10-Aug-2011 Mathias Agopian <mathias@google.com> Merge changes Ie06e73e5,I7ac6b5b0

* changes:
free all buffers when ANativeWindow::disconnect is called
return correct value from query after connecting a surface
2c8e8508d26c8be816e3cbc2d0d90471ea78c811 09-Aug-2011 James Dong <jdong@google.com> Fix initial 0 duration video sample in the recorded videos

o Patch suggested by pmehendale@nvidia.com

Change-Id: Ibf516ba83b721b0d0ab55bb7637fe9b7b2958214
related-to-bug: 5117434
ibstagefright/MPEG4Writer.cpp
0ed837a7a37a0bfadbfce98327033307780541e1 09-Aug-2011 James Dong <jdong@google.com> Merge "Do not release recording frames if camera is gone"
c74b93fdf3ddb6fdab7878edab4d304fb14917f9 02-Aug-2011 Marco Nelissen <marcone@google.com> Keep effects sessions active when the caller dies.

Don't remove effects until the session they are in goes away or all
AudioEffects have been explicitly released. This allows the control
panel process to die without stopping the effects.

Change-Id: I4496e5df080230ca1af149dec95c1309ab8ea888
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/mediaplayer.cpp
053b02df2d350466a2226a90709e50fedef54747 09-Aug-2011 Mathias Agopian <mathias@google.com> return correct value from query after connecting a surface

the first time a surface was connected, the values returned
by query NATIVE_WINDOW_DEFAULT_{WIDTH|HEIGHT} and
NATIVE_WINDOW_TRANSFORM_HINT were wrong until a call
to queueBuffer was performed.

Bug: 5137366, 5121607
Change-Id: I7ac6b5b0daa876638f6bed7c20f286a6e6d984f6
ibstagefright/SurfaceMediaSource.cpp
7616178271e95f009452a21ea45e7225997dc27a 09-Aug-2011 Andreas Huber <andih@google.com> Notify the OMX component that it's going to be used in "secure" mode.

Change-Id: Id87c4b295eb38f7d24045918e73df298d7b842f9
related-to-bug: 5137212
ibstagefright/OMXCodec.cpp
8d4ed0d8e1e0e0f4a8ed7fc1407a850dc2190040 08-Aug-2011 Neel Parekh <neel@google.com> Prevent NPE when registering a remote control client

Change-Id: Ia22b456b1cbdd89736118c7e68b7c68dd6e59c64
ava/android/media/AudioService.java
7b6198cacc3e7dd31ef91537d809857d826fb7fa 07-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 5045498 API for client to notify remote control info changed

Update to API for a client to notify what type of information
changed (e.g. playstate, metadata) to optimize small updates
without the remote control display having to do expensive
queries such as album art.

When the remote control display retrieves the flags about
what information changed, the flag gets cleared.

Change-Id: I7d3d8d3eecd1da44695d84905ed9e7b70fe38b86
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
5d4967884132647a75d05bcc2ca1f9ce490b372f 07-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Make retrieving remote control client go through binder interface"
0a5825edf5490588d730cae7d9bb7461ad0b29a5 06-Aug-2011 James Dong <jdong@google.com> Do not release recording frames if camera is gone

Change-Id: Ia6038c1a3ca17207e43a955ec47c42cdff1f5a76
related-to-bug: 5129465
ibstagefright/CameraSource.cpp
43b076bb75e86fbb34cbe36aa0298c7a647121ff 06-Aug-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Fix UnsupportedOperationException when scanning internal media

The media scanner was crashing while tring to insert genre data in the internal
media database, which does not support genres.
This resulted in some or all of the built in ringtones being unavailable

Bug: 5124718

Change-Id: Ib306348dd9808e59477b327b4adcb413957d8d24
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ced110ec5970c632f523dfc0350b6071461ea9bc 05-Aug-2011 Neel Parekh <neel@google.com> Make retrieving remote control client go through binder interface

The way the old way worked relied on the process retrieving the
current remote control client to be in the exact same process as
the AudioService. This removes that dependency.

Change-Id: I1ba8bf32b61ec1e979ef7eee9661ba801aa19690
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
d5a20d8d75718fda8a9435d7113f3d6bb8f79a33 08-Jul-2011 Ashish Sharma <ashishsharma@google.com> Network traffic accounting for chromium stack support in mediaserver.

- Atribute network activity to uid calling the mediaplayer
- Enables logging of chromium network stack in logcat

Change-Id: I2d28c8392248a056b3cee305dd4d4475ebba4337
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/chromium_http/support.cpp
ibstagefright/chromium_http/support.h
ibstagefright/include/HTTPBase.h
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/MyHandler.h
803b192ea2651fbf2be740cf91f52ab511f24a6c 05-Aug-2011 Gloria Wang <gwang@google.com> Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug 5015079."
1467ec343309821b215cb3e049a6746d07030c07 05-Aug-2011 Gloria Wang <gwang@google.com> Close the DRM session in the destructor of ChromiumHTTPDataSource.
Fix for bug 5015079.

Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
a9307bef532e806c1ca123068ed8d902cac564b0 05-Aug-2011 Andreas Huber <andih@google.com> Merge "Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer"
e38a2cba16f2161a3a41521c84325cc5c24d9668 05-Aug-2011 Andreas Huber <andih@google.com> Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer

Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug: 5122973
ibstagefright/MediaBuffer.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/rtsp/APacketSource.cpp
e83af902c4ed1f0f1afb1b4f6f26a8003aca4954 04-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Remove empty remote control client listener methods"
323e31754c3ba31e537e712e818f90381b8eb6d1 04-Aug-2011 Andreas Huber <andih@google.com> Restart HLS streaming from the bottom of the playlist if we miss the boat on the

next segment. This can happen if for whatever reason we playback video slower than
it is served.

Also removed some unnecessary verbosity from ChromiumHTTPDataSource.

Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79
related-to-bug: 5120425
ibstagefright/chromium_http/support.cpp
ibstagefright/httplive/LiveSession.cpp
a30a21cf2ef37b490e3790aad3105cda115124d6 04-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Remove empty remote control client listener methods

Remove non-implemented methods for registering IRemoteControlClient
listeners.

Rename refreshRemoteControlDisplay() method to follow framework
conventions.

Change-Id: I9254e8eeea9020a530c9a32f328f0ef7dbd9dd0c
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
6d899a61a8aa27662a7714c14c4e8e39f4a01598 04-Aug-2011 Gloria Wang <gwang@google.com> Merge "Check the syncword for each frame. Fix for bug 5117233."
3c10b01551057a21b502014ff984fdf8e1c90a43 04-Aug-2011 Gloria Wang <gwang@google.com> Check the syncword for each frame.
Fix for bug 5117233.

Change-Id: I714c9b671832c9606cabdfe6bb21697c08de2eff
ibstagefright/AACExtractor.cpp
045d179ff6568eaa30f66801e10fd888e2da0f9d 03-Aug-2011 Eric Laurent <elaurent@google.com> Merge "AudioService: ignore NOTIFICATIONS_USE_RING_VOLUME."
4415629112af2a62eb58a4daf1f2533c5089be53 03-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Remote control display API and implementation"
51812ec0207748b83951c47b9c3aa4ddae1ac6ca 02-Aug-2011 Sarthak Aggarwal <sarthak@ti.com> Removing hack for framerate setting in Stagefright for encoders.

Ducati binary starting to support frame-rate on i/p port rather than o/p port,
stagefright can start giving frame-rate frame rate on i/p port and 0 on o/p
port.

Change-Id: I70830747e43e6bfcac73f0fb01de0ab0235a7b28
Signed-Off-By: Sarthak Aggarwal<sarthak@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibstagefright/OMXCodec.cpp
8f619182cb759718f64ab95fd6d61c16138f6952 22-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Remote control display API and implementation

Extend the media button event registration AudioManager API to
enable applications to register as a client of "remote controls"
and let them provide information meant to be displayed
by the remotes.
AudioService sends a AudioManager.REMOTE_CONTROL_CLIENT_CHANGED
intent to let remote controls know when / from whom they can
retrieve the information to display.
Only application that own audio focus, are the currently
registered media button event receiver, and have registered
a remote control client, are eligible to appear on the
remote control.

To address in future CLs:
- change how a remote control client forces a refresh
- rename methods called under lock to ___Locked()
- make API public

Change-Id: Icca30ab05dac2605ee9246f8acb27a03dcea077a
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
ava/android/media/IRemoteControlClient.aidl
4eb5a5713877227374d7bac97719873b2c17e92a 03-Aug-2011 Eric Laurent <elaurent@google.com> AudioService: ignore NOTIFICATIONS_USE_RING_VOLUME.

Do not take NOTIFICATIONS_USE_RING_VOLUME setting into account now
that it has been deprecated. STREAM_NOTIFICATION and STREAM_RING
always use the same volume setting.

Change-Id: Ibf6e5f86133d3781fd9e66455be64582318d93e6
ava/android/media/AudioService.java
6311d0a079702b29984c0d31937345be105e1a5e 03-Aug-2011 Dianne Hackborn <hackbod@google.com> Clear the bitmap from the canvas in a lot of places.

Change-Id: I6b2071ac7b348c473b9bdd1b972d095aebbb4fb3
ava/android/media/ThumbnailUtils.java
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/OverlayFrame.java
245989df7a1290864fdeffb6c77255c60d9bcd97 02-Aug-2011 James Dong <jdong@google.com> Merge "Start thread pool for binder calls"
9f8e0153b28d7587d41ddd4a5308c74fdfb14101 02-Aug-2011 Gloria Wang <gwang@google.com> Merge "Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have called Resync() which changes mCurrentPos. For bug 4869063."
ba5ddf5cfc328ae372dbb7d88c3241051af1734c 02-Aug-2011 Gloria Wang <gwang@google.com> Merge "Fix ordering assumption of argument evaluation."
81d7035b9eb482ef6c0046a7c01ae9e3ef216751 02-Aug-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Replace the hard coded video recording properties with media profile."
bb1e275c0e684dd213f124da77110cdd9d6f090c 29-Jul-2011 Wu-cheng Li <wuchengli@google.com> Pass camera frame metadata from camera service to Java.

bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
ibstagefright/CameraSource.cpp
55c1ad99949a6011e82528adf0fc6fa162ab0fcd 02-Aug-2011 Yu Shan Emily Lau <yslau@google.com> Replace the hard coded video recording
properties with media profile.

Change-Id: I431838839f52431e68183eebe7ebce382a44bdb7
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
449eef989e3c4fe1c134926efe335617e8d12ae4 02-Aug-2011 James Dong <jdong@google.com> Start thread pool for binder calls

Change-Id: Ie67f54ba06d7fdb42bcb041c1e0a50d8477ae423
related-to-bug: 5095635
ibstagefright/tests/SurfaceMediaSource_test.cpp
34e1fb1ee229a7e033dcd42f4efd194e1614d5ce 02-Aug-2011 Mathias Agopian <mathias@google.com> Merge "connect/disconnect is now called from our EGL wrapper"
982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27 30-Jul-2011 Mathias Agopian <mathias@google.com> connect/disconnect is now called from our EGL wrapper

the original connect/disconnect hooks are deprecated
and replace by api_connect/api_disconnect. the original
hooks are no no-ops.
api_connect/api_disconnect is now only called from the
android framework.

Bug: 5057915
Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
ibmedia/mediaplayer.cpp
8f164fe847fad45e05c3bb28e61d906d92779bd4 01-Aug-2011 Gloria Wang <gwang@google.com> Fix ordering assumption of argument evaluation.

No specific order is specified in the C++ standard, but the order of
the calls to Parcel read commands matters. Move any calls with multiple
reads to local variables.

Fix for bug 5104979.

Change-Id: I709aa040e990d2659e7a3a089f7a42ae812de9ff
ibmedia/IMediaPlayer.cpp
5c31583c53ca7308f4ee74c6edc7c7ff19809cce 01-Aug-2011 Andreas Huber <andih@google.com> Merge "Fix NALU extraction of unit starts with a 0x00 nalType"
05ea63da2019bf1ed4847b41bda0b9725d3a76df 01-Aug-2011 Andreas Huber <andih@google.com> Fix NALU extraction of unit starts with a 0x00 nalType

by not backing up beyond the start of the nal unit.

Change-Id: I5fba9913202de416e634e5f39181be62b72b2469
related-to-bug: 4770290
ibstagefright/avc_utils.cpp
37e477c22730655ffb09485aeee18cff59f9edfb 22-Jul-2011 Andreas Huber <andih@google.com> Start playing live streaming HLS content from the first segment.

Also properly signal a "hard" discontinuity, i.e. a possible format change
when a discontinuity is signalled explicitly as part of the playlist.

Change-Id: Ic347d3d11d39b0411c3726a7c723bcf13092b8bc
related-to-bug: 5103155, 5103013
ibstagefright/httplive/LiveSession.cpp
e5d0495d5206167c597efcd81436a0f881f069f9 30-Jul-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Move genre table management to MediaProvider

Fixes problems introduced with bulk insert support

Bug: 5092877

Change-Id: If3c0c9054d5effe0a1d7a75e85635b41ba1591f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ad65b46d5f6c569b588556dcf85b64d59600b175 29-Jul-2011 Kristian Monsen <kristianm@google.com> Merge "Part of fix for bug 5065047 build libchromium as a shared lib"
43a5d6e541fef5983e967d9b67792c0a088418ea 27-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4599730 Get audio channel count on MediaPlayer"
7ffa1ea8cb810d3f4b8c9eb57e1941484d0c5bb9 27-Jul-2011 Gloria Wang <gwang@google.com> Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have
called Resync() which changes mCurrentPos.
For bug 4869063.

Change-Id: I5c5876ad81adf0ced1a6e6c18cda6905bf38f731
ibstagefright/MP3Extractor.cpp
6ff9b812abe388478bbaba118a580c3f4a30c863 25-Jul-2011 Glenn Kasten <gkasten@google.com> Bug 4599730 Get audio channel count on MediaPlayer

Related changes:
- Fix bug in get/setParameter* to recycle Parcels when done with them.

Change-Id: Iaff05e91bbd99a14fccb79d816dd873359b6ae65
ava/android/media/MediaPlayer.java
ibstagefright/AwesomePlayer.cpp
bbe9cb4f5f87e36b886ea3ba72dc514a081f3fe3 27-Jul-2011 Iliyan Malchev <malchev@google.com> libstagefright: add destroyOMXPlugin and use C linkage for symbols

Add a destroyOMXPlugin() to complemenet createOMXPlugin(). Since the latter is
an opaque call into a library, it is not safe to assume that the object thus
returned may be destroyed by calling delete. This patch will call
destroyOMXPlugin() in libstagefrighthw.so, if the symbol is defined there.
Otherwise, it will default to a delete as before.

Also, prefer C linkage for the symbol names. Using mangled C++ symbols is not
very safe and makes it hard to grep for those symbols through the code. We
attempt to locate createOMXPlugin as a C symbol then try it as a mangled C++
one. We only use C linkage for destroyOMXPlugin since this symbol is new.

Change-Id: Ied23c910486856a0f18056df049c871234797c5c
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibstagefright/omx/OMXMaster.cpp
e25e51f5fc279da619f6882b388316dcc5c39a9d 27-Jul-2011 Eric Laurent <elaurent@google.com> Merge "AudioRecord: Fix getInput()"
132b21899b96208dbae42d76628aa0d019705412 27-Jul-2011 Kristian Monsen <kristianm@google.com> Merge "Fix for bug 5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests"
678cc9590325cb30b4bede6f2a43fe6c25bae20b 27-Jul-2011 Eric Laurent <elaurent@google.com> AudioRecord: Fix getInput()

AudioRecord::getInput() was issuing a query to get a new input stream from
audio policy service instead of returning the cached input stream in AudioRecord.

Change-Id: Ice324b7c60bc0898149023797bcb56a72091b9d3
ibmedia/AudioRecord.cpp
17cfcbfa2920e2bd0576cce0b36fb72fbbd1e0e3 25-Jul-2011 Chih-Chung Chang <chihchung@google.com> Add dependencies for the YV12 color converter change.

Bug: 5061733
Change-Id: Id8227a4f634285323c37498604fe080d986bfb09
ni/mediaeditor/Android.mk
85a315b54797b05b4232eda426fdd60e255aa97d 27-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Fixing up Mediarecorder for MFF"
833bfd2ba5f875cb98bfbcc85ee3c64068947811 26-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Fix problem with duplicate directory entries in the database"
af20eacc2170a0641749bad822926d86161431c7 26-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 4319552 Java to native channel mask translation"
c6eaa713a3f5b9337eca60ba2ab570cf6e80c357 26-Jul-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Fix problem with duplicate directory entries in the database

Bug: 5078643

Change-Id: I8804ff5bbd729f57be7ff0b17a4b134cafe78c18
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
b33d46cc77b0e96a4d0ff39b85158c5c4eca3855 26-Jul-2011 Chih-Chung Chang <chihchung@google.com> Merge "Add filename and line number in the debug messages."
cac873bd4ad6ffc8587e3d77fece5abcf2804f4f 26-Jul-2011 Pannag Sanketi <psanketi@google.com> Fixing up Mediarecorder for MFF

For using the MediaRecorder in MFF (Mobile Filter Framework),
getMediaRecorder method in mediarecorder jni was earlier changed to
a non static method. Changed it back to a static method.

Also, added a new source type to MediaRecorder.VideoSource for recording
GRalloc buffers.

Change-Id: I031fad45c12b0ac9602d9e451d4767e95a86234d
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
d9ae1c573e37e245c7f4f0480a8fa925e57bd49d 25-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 4319552 Java to native channel mask translation

When creating a new AudioTrack instance, translate from a Java
channel mask as defined in android.media.AudioFormat to one
as defined in audio.h which matches industry-standard
channel mask definitions.

Change-Id: I7eeece8ec2a437977c31f6e82590f9591158144b
ava/android/media/AudioFormat.java
19f773bc96c141227fab3af68d9fcdf9a3c087cb 26-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Adding Metadata mode to SurfaceMediaSource"
234cef81299688db75edb6572e37374a67f79bbc 25-Jul-2011 Eric Laurent <elaurent@google.com> Merge "Added APIs for audio preprocessing"
0f7f4ece1b6b73caf608d533d833a8cdc11c8131 24-Jul-2011 Eric Laurent <elaurent@google.com> Added APIs for audio preprocessing

Added APIs to control pre processes applied on captured audio.
Those APIs are still hidden until reviewed by API council.

Three types of standard pre processes are supported:
- Automatic Gain Control (AGC) by AutomaticGainControl class
- Acoustic Echo Cancellation (AEC) by AcousticEchoCanceler class
- Noise Suppression (NS) by NoiseSuppressor class

A method is added to AudioEffect class to query audio pre processings
applied by default by the platform on a given AudioRecord session ID.

Change-Id: I0b9fceeb8c704dd06319c3b52b85c96fe871d51d
ava/android/media/audiofx/AcousticEchoCanceler.java
ava/android/media/audiofx/AudioEffect.java
ava/android/media/audiofx/AutomaticGainControl.java
ava/android/media/audiofx/NoiseSuppressor.java
ni/audioeffect/android_media_AudioEffect.cpp
ibmedia/AudioEffect.cpp
ibmedia/IAudioPolicyService.cpp
fb526513056eb275a8ad7ff7998e2e56be8fd467 25-Jul-2011 James Dong <jdong@google.com> Merge "Do not support still image capture mode for timelapse video recording"
d92eb588974556eff387dceecbaa36c3d3c69c5f 25-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 4211099 channel constants and 7.1 mask"
5518dd92d38edd5902482841413722aa654cc2e7 25-Jul-2011 Ted Bonkenburg <tedbo@google.com> Merge "Add support for creating a Surface from a a SurfaceTexture."
febf9fbd78d77b6ea1b52f38af7360366d182452 22-Jul-2011 Kristian Monsen <kristianm@google.com> Part of fix for bug 5065047 build libchromium as a shared lib

Building chromium as a shared lib, updating other libs that
use it.

Change-Id: Ia20749bb7fbec51b94adb314116503f62f41b782
ibstagefright/Android.mk
ff7656c9de4e6ca0ec13da2b99593be71dcfd796 25-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 4211099 channel constants and 7.1 mask

Add definitions for the side and elevated channels.

Add new (correct) definition for 7.1 mask which uses
the side channels rather than the front half-pan channels.

Change-Id: I13d93f99f3b453ce2ab5fdc2da66629ed7f337ef
ava/android/media/AudioFormat.java
e432a0005180ba9ac2c1d7822c4761b475fddc51 24-Jul-2011 James Dong <jdong@google.com> Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens"
d40e2c67ed6423355aeb1292b33c2f8a20b3c84d 24-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "QueryCodecs() signature change"
508e86e7577fabf528afe06ecc098f8e677ff48c 24-Jul-2011 Gloria Wang <gwang@google.com> Merge "Do not change the number of bytes while converting 8-bit samples to 16-bit, because this number will be used later to calculate mCurrentPos. Fix for bug 5063703."
83dd43f45aa3212239acfb35d799216e840c9e2f 30-Jun-2011 James Dong <jdong@google.com> Do not support still image capture mode for timelapse video recording

related-to-bug: 4973779

Change-Id: Ica665217ab10247b2242acc4e93d4fe9f83e3f45
ibmedia/IMediaRecorder.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSourceTimeLapse.cpp
b1f8c266e47554bc45632f021c9e409399e907e7 14-Jul-2011 Pannag Sanketi <psanketi@google.com> Adding Metadata mode to SurfaceMediaSource

SurfaceMediaSource operates in metadata mode only, i.e. just the
metadata is stored in videobuffers. SurfaceMediaSource passes the Gralloc
buffer handle along with a 4 byte 'type' (indicating that the metadata
is of type GrallocSource) to the encoder as opposed to the
GrallocBuffer itself.

Related to bug id: 4529323

Change-Id: I83aebc0dd10f317658cdf70be5802dfc35a1e72d
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
aba28e7fecb06adab8de51619b2929b640369e83 23-Jul-2011 James Dong <jdong@google.com> Merge "Deprecate two methods in MediaRecorder.java class"
65cdc2b7b6759c3d13f78b2a00ed1c11f840db4f 23-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Connect MediaRecorder Native to SurfaceMediaSource"
0de171b0d490a5928d54d2fb67c912d140aac643 16-Jul-2011 Ted Bonkenburg <tedbo@google.com> Add support for creating a Surface from a a SurfaceTexture.

The Surface is already using SurfaceTexture internally and it is parcelable. This
is intended to replace and phase out ParcelSurfaceTexture in favor of creating a
new Surface.java object from an existing SurfaceTexture.

Change-Id: I8e2dd86614523da6abed6403e1d705a68fa19fdf
ava/android/media/MediaPlayer.java
a05f099301ca9d5efd4db549295401ee00b439a0 22-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> QueryCodecs() signature change

Restore QueryCodecs() signature exactly as used by third-party libs.
Add an alternative function to select HW only codecs.

Change-Id: Ibb2cb4dd36fc0c6599eb93aa5751c216397e3b6f
ibstagefright/OMXCodec.cpp
75cfd5b87994a3c44cd4ad07a85a7fabf51f669a 22-Jul-2011 Gloria Wang <gwang@google.com> Do not change the number of bytes while converting 8-bit samples to 16-bit,
because this number will be used later to calculate mCurrentPos.
Fix for bug 5063703.

Change-Id: I75a78ef694482aa426d82a6c5f3d2ce570a9c19e
ibstagefright/WAVExtractor.cpp
5ef59bc764d6bcd0ccf0a266d7d9ab792668a3e9 19-Jul-2011 Jamie Gennis <jgennis@google.com> SurfaceTexture: add the abandon method.

This change adds the 'abandon' method to the SurfaceTexture C++ class.
This method may be used to put the SurfaceTexture in an abandoned state,
causing all ISurfaceTexture methods to fail.

Change-Id: Ibd261f7b73f44e2bec36a8508bf92113cfb7cf95
ibstagefright/SurfaceMediaSource.cpp
897e27bc75886e44d2f9f09155127f401c4173ea 02-Jul-2011 Pannag Sanketi <psanketi@google.com> Connect MediaRecorder Native to SurfaceMediaSource

Making a connection from MediaRecorder Native layer to the
SurfaceMediaSource for the purpose of encoding GL Frames. This will be
called from the java side inside the Mobile Filter Framework.

The mediarecorder native layer (client), when set the videosource to
option VIDEO_SOURCE_FRAMES, asks the StageFrightRecorder on the mediaserver
side to create a SurfaceMediaSource object and pass it back as a
sp<ISurfaceTexture> object. Using that, the client side will dequeue and
queue buffers. Connecting the GL Frames to the obtained
sp<ISurfaceTexture> is not part of this CL.

Related to bug id: 4529323

Change-Id: I651bec718dd5b935779e7d7a050b841c2d0b0fcd
ni/android_media_MediaRecorder.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/SurfaceMediaSource.cpp
e333d3c8243e11b094cec816cb9b41e2b8504582 22-Jul-2011 Jamie Gennis <jgennis@google.com> SurfaceMediaSource: remove getAllocator method

This change removes the getAllocator method from SurfaceMediaSource
because that method is no longer a part of the ISurfaceTexture
interface.

Change-Id: I0e2f0bc3bc1c8cd3c1b4b14246f07b9b4e3066c3
ibstagefright/SurfaceMediaSource.cpp
38eea1b800c7374382f83f30fec85d0f6b415f13 22-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Renaming SurfaceEncoder to SurfaceMediaSource"
67d7704bd2e4a7640d12a9d06ad5971b23b51ad5 22-Jul-2011 Pannag Sanketi <psanketi@google.com> Merge "Adding SurfaceEncoder for encoding FilterFrames"
3ff98beeafd271a65c1f824699431366882b04f6 21-Jul-2011 James Dong <jdong@google.com> Deprecate two methods in MediaRecorder.java class

Change-Id: I98fbe628fe77867b97c04f44458948ede2f49d22
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
23950920291b23f33e25477e627f8e3f7ad6bc73 22-Jul-2011 Andreas Huber <andih@google.com> Merge "Retry datasource fetches a few times before giving up (NuCachedSource2)."
8a42a55720b6b865fd907785915a81c10dd9288d 22-Jul-2011 James Dong <jdong@google.com> Merge "Log setVideoSurface() and setVideoSurfaceTexture() failures."
178e8eb5ddb06dca2f225df6f8df662ad0d15d26 18-Jul-2011 Andreas Huber <andih@google.com> Retry datasource fetches a few times before giving up (NuCachedSource2).

Change-Id: I147fc18ef55bc89d2e2fee69b7869c45abbfdd6b
related-to-bug: 3405354
ibstagefright/NuCachedSource2.cpp
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/include/ChromiumHTTPDataSource.h
ibstagefright/include/NuCachedSource2.h
3192e397afa1bb18e89f77498094dace48f5f86a 22-Jul-2011 Kristian Monsen <kristianm@google.com> Fix for bug 5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests

Cookies should be store between requests in memory with this.

Tell me if you want to store the cookies on disk as well.

Change-Id: I9afe5796a3d395afcf54d669c86cf7da432f8d9a
ibstagefright/chromium_http/support.cpp
ce78dc5baa8702be1df6c0753b18d6b6abe4cead 22-Jul-2011 James Dong <jdong@google.com> Log setVideoSurface() and setVideoSurfaceTexture() failures.

Change-Id: Iaea34e74a0cf569fc85b926949253dea6baa6142
related-to-bug: 5063370
ibmedia/mediaplayer.cpp
f48987db6711512173327bc6ec8d253ba914dab1 01-Jul-2011 Pannag Sanketi <psanketi@google.com> Renaming SurfaceEncoder to SurfaceMediaSource

Related to bug id: 4529323

Change-Id: Id820d45a536bd2c65e0a59def564eb5b3ea4a71c
ibstagefright/Android.mk
ibstagefright/SurfaceEncoder.cpp
ibstagefright/SurfaceMediaSource.cpp
ibstagefright/tests/Android.mk
ibstagefright/tests/SurfaceEncoder_test.cpp
ibstagefright/tests/SurfaceMediaSource_test.cpp
26a197120c1bad8797f35e9b43482f5466280f8c 11-Jun-2011 Pannag Sanketi <psanketi@google.com> Adding SurfaceEncoder for encoding FilterFrames

Adding SurfaceEncoder which can be used to encode
custom frame data. In a sense, it is reverse
of what SurfaceTexture does.

SurfaceEncoder takes in frames from a native window and
passes them to an encoder, thus acting like a MediaSource.
It uses GRAlloc buffers underneath for passing data.
The client side sets the geometry, format in the beginning,
which cannot be changed while the recording is going on.

Currently, there is no common pixel format that both
GRAlloc and HAL understand.
Also, the encoder cannot encode using the data from the GRAlloc
buffers.

The SurfaceEncoder_test examines mainly the buffer passage
since true encoding cannot be done at this point.
SimpleDummyRecorder 'reads' the frames in the same thread
as the start(), whereas DummyRecorder 'reads' in a separate
thread much like the MPEG4Writer. The test with DummyRecorder
is much closer to the real encoding implementation.

Related to bug id: 4529323

Change-Id: I58ec19a150f8fe4d6195196dc44f55002b46c7c8
ibstagefright/Android.mk
ibstagefright/SurfaceEncoder.cpp
ibstagefright/tests/Android.mk
ibstagefright/tests/DummyRecorder.cpp
ibstagefright/tests/DummyRecorder.h
ibstagefright/tests/SurfaceEncoder_test.cpp
25ba294d1f7f16d285a98d4a8ec2524ca2f860da 21-Jul-2011 Chih-Chung Chang <chihchung@google.com> Add filename and line number in the debug messages.

Change-Id: I0e19215cd6f26ccd97bcbff765194adda5faf940
ni/mediaeditor/VideoEditorJava.cpp
ni/mediaeditor/VideoEditorJava.h
432fb8ecbed402b06f7f92d829be544b317059be 21-Jul-2011 Hong Teng <hongteng@google.com> Merge "fix for issue 4142219 Don't hard code platform-specific limitations-jni/java part"
0eecc27714d10b640bd8d40af8d1fb20aa3d29a0 21-Jul-2011 Eric Laurent <elaurent@google.com> Merge "AudioRecord JAVA: expose audio session Id"
5da67f4f6918fccc4a89d4facd8642164c630c57 21-Jul-2011 Jeff Brown <jeffbrown@google.com> Merge "Untangle MediaScanner error handling. Bug: 5056917"
ae7c0926499491999fa5964d75fd05a1b5f4480d 21-Jul-2011 Eric Laurent <elaurent@google.com> Merge "Audio framework: support for audio pre processing"
2c70d4a372a8ce83163f19bbd6ae82483ffbe46b 21-Jul-2011 Jeff Brown <jeffbrown@google.com> Untangle MediaScanner error handling.
Bug: 5056917

Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
ni/android_media_MediaScanner.cpp
ibmedia/MediaScanner.cpp
ibmedia/MediaScannerClient.cpp
ibstagefright/StagefrightMediaScanner.cpp
600acf14ff12eaf139f0ac644fb7e17849af65fa 07-Jul-2011 Hong Teng <hongteng@google.com> fix for issue 4142219
Don't hard code platform-specific limitations-jni/java part

Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorImpl.java
ava/android/media/videoeditor/VideoEditorProfile.java
ni/android_media_MediaProfiles.cpp
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorPropertiesMain.cpp
ibmedia/MediaProfiles.cpp
0f4e81df9942dbea16f803bb795cae057fb085f5 21-Jul-2011 James Dong <jdong@google.com> Merge "Let the media recording framework release the Camera object when it is the owner"
e02802306d63d5209afed11cc609ed6f65d5de89 20-Jul-2011 James Dong <jdong@google.com> Let the media recording framework release the Camera object when it is the owner

related-to-bug: 5050535,5036813,5051707

Change-Id: I88e10f65f087931e7f95ab26a018d59f7361103e
ibstagefright/CameraSource.cpp
a331cdbb4082a391bf4f21cf6dffea770e31517f 20-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Do separate bulk inserts for different media types"
5531a3a3cfce0fe0dd279cdce2de30cf777f5227 20-Jul-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 5012047: silent mode mutes music"
e19572ccb5e7963eee9dd1cca150ee752a850e4a 20-Jul-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Do separate bulk inserts for different media types

This should fix a bunch of problems introduced in the original bulk insert implementation

Also reverted two changes that are no longer necessary:

Revert "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"

This reverts commit 92e1314ad9ddbacfb806405e9aceeea4a8aae19f.

Revert "MediaScanner: fix breakage in updates"

This reverts commit 45aaa2a345292bb6d600822db602f25e261c0e50.

Change-Id: Ibed66393467761c2c1ce48deb09bcac505b7d221
ava/android/media/MediaScanner.java
7f60a81a2a5fd03bc770611c9516986f7c194155 20-Jul-2011 Jamie Gennis <jgennis@google.com> Merge "MediaPlayer: add a disconnect from ANativeWindow"
85111ee50108e66254c6edbda76c7ed9676dc536 20-Jul-2011 Andreas Huber <andih@google.com> Merge "Content found in the wild violated the MPEG4 systems specs"
c3d84701e04a2ad15f16c7fe1ad181b97f410814 20-Jul-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 4499450: Unknown Ringer Mode"
80d9064a14b4172d18edd3a5a70e6c2459b59eb7 20-Jul-2011 Andreas Huber <andih@google.com> Content found in the wild violated the MPEG4 systems specs

but other players apparently worked around it as well, so we do to.

Change-Id: I8269d2344b010d1d704028c8a9c05bddab53828d
related-to-bug: 5049979
ibstagefright/ESDS.cpp
72668b2c040b581b298b069f3b5af5ed7f212d89 20-Jul-2011 Eric Laurent <elaurent@google.com> Fix issue 4499450: Unknown Ringer Mode

Added a validity check on ringer mode values in AudioManager.setRingerMode().

Change-Id: Ie780edc1d347009d90f000018a71520b04e0c4a1
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
6461c97331e9e672e2abd6a46eaaa7b948974484 20-Jul-2011 Andreas Huber <andih@google.com> Merge "More HLS fixes"
9073725c1b53eaa1930d28a4bffea8076ed2d314 20-Jul-2011 Andreas Huber <andih@google.com> More HLS fixes

properly expand URLs where the "new" URL is an absolute path.
properly include any extra headers even when fetching the key files.

Change-Id: I7cd8879015ea8e3d3e2334f4e7e16b8c1a5d48e9
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
5129b6838b1a4eac1134a5b0b280ce515a437111 19-Jul-2011 Jamie Gennis <jgennis@google.com> MediaPlayer: add a disconnect from ANativeWindow

This change makes MediaPlayer::disconnect disconnect from the
ANativeWindow once the player has been disconnected.

Change-Id: I6744559030d1edc520cf77402d1f5ce841742340
ibmedia/mediaplayer.cpp
c1d4166289ce016965d1147f7e8d37862ee347ec 19-Jul-2011 Eric Laurent <elaurent@google.com> Fix issue 5012047: silent mode mutes music

Implemented different silent mode behaviors for tablets and phones.
The behavior inherited from Honeycomb was for tablets only and
was muting music in silent mode.

Change-Id: Ib053e7b70ca02190debc87648ab8a163f9d39577
ava/android/media/AudioService.java
ff86f37b95327538b97b6b8ef5d3c6ed0cd7f902 19-Jul-2011 Mathias Agopian <mathias@google.com> use SurfaceTexture new scaling mode in SF

SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size

Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
8a08b0c5a19843d3c073712416d1b920522159b0 19-Jul-2011 James Dong <jdong@google.com> Merge "Remove PV AVC decoder"
d2a9852c137171b3d393269a51a8b4ef8b00ce64 19-Jul-2011 James Dong <jdong@google.com> Remove PV AVC decoder

Change-Id: Icf056c852f95b5d6a07473728ddbf5b641990381
ibstagefright/codecs/avc/dec/Android.mk
ibstagefright/codecs/avc/dec/SoftAVC.cpp
ibstagefright/codecs/avc/dec/SoftAVC.h
ibstagefright/codecs/avc/dec/include/avcdec_api.h
ibstagefright/codecs/avc/dec/include/pvavcdecoder.h
ibstagefright/codecs/avc/dec/include/pvavcdecoderinterface.h
ibstagefright/codecs/avc/dec/src/avc_bitstream.cpp
ibstagefright/codecs/avc/dec/src/avcdec_api.cpp
ibstagefright/codecs/avc/dec/src/avcdec_bitstream.h
ibstagefright/codecs/avc/dec/src/avcdec_int.h
ibstagefright/codecs/avc/dec/src/avcdec_lib.h
ibstagefright/codecs/avc/dec/src/header.cpp
ibstagefright/codecs/avc/dec/src/itrans.cpp
ibstagefright/codecs/avc/dec/src/pred_inter.cpp
ibstagefright/codecs/avc/dec/src/pred_intra.cpp
ibstagefright/codecs/avc/dec/src/residual.cpp
ibstagefright/codecs/avc/dec/src/slice.cpp
ibstagefright/codecs/avc/dec/src/vlc.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
06e0333c7eb50533cc6e0f7b61812d2840844296 19-Jul-2011 Narayan Kamath <narayan@google.com> Return the play stayed locked.

I believe the the synchronized block is required to allow
other threads to observe changes to mPlayState in a timely
manner.

Change-Id: I502b7401196c42932c9667ef73eb4cae16c3da16
ava/android/media/AudioTrack.java
9fd12cfb5667c2745df6c6fe5ae7d07a1ff5ab9e 19-Jul-2011 Conley Owens <cco3@android.com> am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
stagefright aacenc: Mark codeWord as UWord16
e5143d6c09f0e9a960661a2b0a5916c33fcafc4d 19-Jul-2011 Conley Owens <cco3@android.com> am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
stagefright aacenc: Mark codeWord as UWord16
a74774fd9146aa22801487d3652dc18e9e328b8e 19-Jul-2011 Conley Owens <cco3@android.com> am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
4d8f6a38e7268e29e189cb4173f42c7aa5b320a3 19-Jul-2011 Conley Owens <cco3@android.com> Merge "stagefright aacenc: Mark codeWord as UWord16"
2b15115fee072bf82e8d0b99c6cf2a2525c49a01 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
stagefright: Include stdlib.h for malloc/free
d1cada2ad82d0ff9ffdb747747361aeba72ed1b4 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"

* commit 'b32af642454f3113cb1539821eb3b0dbf4174974':
stagefright amrwbenc: Remove a duplicate, unused file
a09fe881489792452d5b33b0ccbc6dfc05c77ddf 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
stagefright aacenc: Make the mem_malloc function 64-bit safe
e1928190ffb5febd306ca90ae1f5e61864a58192 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"

* commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
3ab6ccda447c605c35c8854a2ec8c49c2a0653a6 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
stagefright: Include stdlib.h for malloc/free
b32af642454f3113cb1539821eb3b0dbf4174974 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"

* commit '31140598866c668047fc6dede7944e146aa21a0a':
stagefright amrwbenc: Remove a duplicate, unused file
d4dee1a57fdcd1bd1e7c621163e89039cf88d9f9 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
stagefright aacenc: Make the mem_malloc function 64-bit safe
b7f0d825c56dced10bb7df7cfc624ef9ebffe21c 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"

* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
89bac1820f3788d655ae293ec9a65c18226e09ee 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
stagefright: Include stdlib.h for malloc/free
16db83c26442f5e25b6aad77a37b612fa0be9862 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"

* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
stagefright amrwbenc: Remove a duplicate, unused file
80ef1745d00c235b117e389e56e58210cf88e5c8 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
stagefright aacenc: Make the mem_malloc function 64-bit safe
68e37dacc065eebb971d443722b7a8413ff403d6 19-Jul-2011 Deckard Autoverifier <deckard@android.com> am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"

* commit '55f115a3214343c826acf27fcbc4bf2927049083':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
88409911aebed6c3663e51d51fca67f527c0c2fb 19-Jul-2011 Deckard Autoverifier <deckard@android.com> Merge "stagefright: Include stdlib.h for malloc/free"
eb07c531498f4dc881ad2b4d1a32cacab25950ff 19-Jul-2011 Deckard Autoverifier <deckard@android.com> Merge "stagefright amrwbenc: Remove a duplicate, unused file"
c06c3603e09a85136eb97d1d8ba1a49fcebae93b 19-Jul-2011 Deckard Autoverifier <deckard@android.com> Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
55f115a3214343c826acf27fcbc4bf2927049083 19-Jul-2011 Deckard Autoverifier <deckard@android.com> Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
5a4ab16eba0a3c9749e0179b005475dfaaafacb5 19-Jul-2011 Jamie Gennis <jgennis@google.com> Merge "MediaPlayer: add ANativeWindow (dis)connect calls"
f139965e4acc8eadb57f1d18d34ea3a89ab622d0 18-Jul-2011 Conley Owens <cco3@android.com> am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit '45ddd42544167494cee7213ecddcb6f8057c86c0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
3edba93fd9bff8e2b22486271e6e816e3b233ae9 18-Jul-2011 Conley Owens <cco3@android.com> am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
98fcc4041d35831c7a65a6e2f0e61021e0fb37e2 18-Jul-2011 Conley Owens <cco3@android.com> Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
211f5af3bb47ba44c9714abbef0dec1b1a0ada51 18-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add option to query hardware decoders only"
56a37b052912d09c310f43ab1215ccc93f2dbda5 18-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Add option to query hardware decoders only

Add an option to OMXCodec::QueryCodecs() to filter out
software codecs.

Update stagefright command line tool to list the roles of codecs.

Change-Id: Icddb79118c30fe13cc3aea20f340174cc082c4e0
ibstagefright/OMXCodec.cpp
44ff4cd8be50768d5bd471bc6c034acefa0b59ca 18-Jun-2011 Eric Laurent <elaurent@google.com> AudioRecord JAVA: expose audio session Id

Added getAudioSessionId() method to AudioRecord class so that applications can
retrieve the AudioRecord's session ID and attach audio pre processes.

Change-Id: I1914770f0e54d97c9aef6a9eb36fff69b6d31552
ava/android/media/AudioRecord.java
464d5b3da21c84ba13dc69c611d40f6bed49badb 18-Jun-2011 Eric Laurent <elaurent@google.com> Audio framework: support for audio pre processing

Audio effect framework is extended to suport effects on
output and input audio path.

AudioFlinger: Support for audio effects and effect chains is
moved from PlaybackThread class to ThreadBase class so that
RecordThread can manage effects.
Effects of type pre processing are allowed on record thread
only. When a pre processing is enabled, the effect interface handle is
passed down to the input stream so that the audio HAL can call the
process function. The record thread loop calls the effect chain process
function that will only manage the effect state and commands and skip the
process function.

AudioRecord: The audio session is allocated before calling getInput() into
audio policy serice so that the session is known before the input theead is
created and pre processings can be created on the correct session.

AudioPolicyService: default pre processing for a given input source are
loaded from audio_effects.conf file.
When an input is created, corresponding effects are created and enabled.

Change-Id: Id17119e0979b4dcf189b5c7957fec30dc3478790
ibeffects/data/audio_effects.conf
ibeffects/factory/Android.mk
ibeffects/factory/EffectsFactory.c
ibeffects/factory/EffectsFactory.h
ibmedia/AudioEffect.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
919511a6da6a8d49857d7c0c5fa2e9d66d42efc2 18-Jul-2011 Andreas Huber <andih@google.com> Merge "Always consider playlists corresponding to different bandwidths different."
e16b2955292d7f1e596896cf80d8781d47ae9433 18-Jul-2011 Andreas Huber <andih@google.com> Merge "Fix seek behaviour at startup and teardown of media session that hasn't been started"
3bfa72b119f1e701aeb9a80c59ba1d8e65f263c6 18-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Use a single packet for the data phase"
484e320fe09fdc3ef195d9e28c26fad97c16be57 18-Jun-2011 Eric Laurent <elaurent@google.com> Audio preprocessing wrapper for webrtc.

This wrapper implements the interworking layer between the audio effect
interface defined by the effect framework for audio preprocessing
and the native interface of webrtc audio processing module.

Change-Id: I3f9319730c102599cdf0dda520a53d90b4165114
ibeffects/preprocessing/Android.mk
ibeffects/preprocessing/PreProcessing.cpp
de6d73acec2e0e2a4ac17dd452ddb4bb347c3f68 15-Jul-2011 Mike Lockwood <lockwood@android.com> MTP: Use a single packet for the data phase

instead of sending 12 byte header in a separate packet.
PTP on the Mac is much happier with this approach.

Change-Id: I7d1ca498f6346afd88876d24332187b466fc469c
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpServer.cpp
86806f75b49a18c4d7f7b2c986a628a0f7c1864f 16-Jul-2011 Andreas Huber <andih@google.com> Always consider playlists corresponding to different bandwidths different.

Change-Id: I07bb3023af5046db93b4f8785eb90c6a4fb15b95
ibstagefright/httplive/LiveSession.cpp
bd8fbfa956cff6b7c54af987cabdef2090c7219d 16-Jul-2011 Andreas Huber <andih@google.com> Fix seek behaviour at startup and teardown of media session that hasn't been started

Nuplayer specific.

Change-Id: I7b0be52c29bdb7032414d63c503d686df7844bf6
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
e3065f23a25b778c9fc718f01def2e1cb264aef8 16-Jul-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF"
d9ac621f590c51bdc38b46d5aabba2dbc84cbd58 16-Jul-2011 James Dong <jdong@google.com> Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens

o Deal with vendor codec hang bug

Change-Id: Ic8449afd43045f09a9e0bd3d1be9a320e59ccabe
ibstagefright/OMXCodec.cpp
aea7d6cdfbe7e60b5ac4071759c39bfb2b11af3f 15-Jul-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF

Change-Id: I1c7c32fee491871223ad12df4696363415902377
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
e1ea88c5735f30122d896ae961ccb360e8952fea 15-Jul-2011 Gloria Wang <gwang@google.com> Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail."
698a5e0806a061c3e9780a0fb89155ed8a6076c2 15-Jul-2011 Andreas Huber <andih@google.com> Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged"
c2e5ca3cac4f2b1e83f68a94eee50761783d5a63 15-Jul-2011 Gloria Wang <gwang@google.com> Use unsigned char to store table of contents retrieved from XING header.
Our compiler treats char default to unsigned (trygon-eng on master branch).
If I force "signed char" for the table of contents array, some MediaFramework
tests for VBR mp3 would fail.

Change-Id: I725e2d4dfe57ff36fdb1d65fe3184f7ab41ad695
ibstagefright/XINGSeeker.cpp
ibstagefright/include/XINGSeeker.h
cc0b9f139fd0552baf942f60d965d280f7b5af89 15-Jul-2011 Andreas Huber <andih@google.com> Refetch playlists according to the HLS specs, varying delay if playlists unchanged

since the previous fetch.

Change-Id: I75e167a650c65a23e284381db5203beba7be7420
related-to-bug: 4983546
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/LiveSession.h
2aa6c4b515d4bea0c0de53d6de5caeaca0964178 15-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 5031179 possible fix for assert in join"
92e1314ad9ddbacfb806405e9aceeea4a8aae19f 15-Jul-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files

Bug: 5025615

Change-Id: Ia910cd1c063292599a03b878755edb2e3cdbbb57
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
c85ca5d6b573e1a663a10950578220b4580c285c 13-Jul-2011 Jamie Gennis <jgennis@google.com> MediaPlayer: add ANativeWindow (dis)connect calls

This change makes MediaPlayer connect to the ANativeWindow to which it
is going to render video frames and disconnect when it is done.

Change-Id: I88ab5c2fe62493aabdc84a283ff31634f795d415
ibmedia/mediaplayer.cpp
8a65e1fb57076c0f3157787112db36c112d7f37d 15-Jul-2011 James Dong <jdong@google.com> Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
2c17f05a81e78690bc9f0a5ac7ececdc329fc321 15-Jul-2011 James Dong <jdong@google.com> Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."

This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844.

Conflicts:

media/libstagefright/AwesomePlayer.cpp

Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
2c751a8416b5941b94171bab685505ae553ac16c 15-Jul-2011 Glenn Kasten <gkasten@google.com> Bug 5031179 possible fix for assert in join

Change-Id: Id3a24c152579b8fdcfb9d66a11aa11579406a7ec
ibstagefright/omx/OMX.cpp
c1df573aedd20e9ac862765d068cc4e8fcdda953 14-Jul-2011 Andreas Huber <andih@google.com> Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error"
232d5f2aa248851a5ff0fb58f9fb1a92bb958a52 14-Jul-2011 Andreas Huber <andih@google.com> If audio startup fails while executing MediaPlayer::start() do NOT post an error

notification, the error returned by MediaPlayer::start() will suffice.

Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a
related-to-bug: 5020200
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
d1435e998b938e2d85b5ed24d83f3521452aaf81 14-Jul-2011 Narayan Kamath <narayan@google.com> Merge "Minor documentation updates for the AudioTrack class."
88bde0ce3799c47530ea42ae3665bfa12ae38d11 14-Jul-2011 Narayan Kamath <narayan@google.com> Minor documentation updates for the AudioTrack class.

Change-Id: I0c3c220aa433d1917d997a7b1bfa54e61acc26b2
ava/android/media/AudioTrack.java
ad07457ece56ba710d3a0334eb8e711646c7141a 14-Jul-2011 James Dong <jdong@google.com> Merge "Support profile and level query for SW video decoders"
1a541075622c5eacbef43c1134f7f9a2598b29b7 14-Jul-2011 Andreas Huber <andih@google.com> Merge "Remove legacy http support from stagefright, chromium is the new hotness."
d86934ae0f7409df7434f5d59bcb6732b1cadc0d 14-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "OMX CallbackDispatcher uses C++ Thread not pthread"
c1b9bbb21c8ad5109978a4e9e770cd18b0257434 13-Jul-2011 Mike Lockwood <lockwood@android.com> Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build

Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_mtp_MtpDatabase.cpp
ni/android_mtp_MtpDevice.cpp
c3119330a56c2dafa282b0b7450893c3f8cb5636 14-Jul-2011 Andreas Huber <andih@google.com> Remove legacy http support from stagefright, chromium is the new hotness.

Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
ibstagefright/Android.mk
ibstagefright/HTTPBase.cpp
ibstagefright/HTTPStream.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/ShoutcastSource.cpp
ibstagefright/include/HTTPBase.h
ibstagefright/include/HTTPStream.h
ibstagefright/include/NuHTTPDataSource.h
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/MyHandler.h
2d912dd5ea221ed160b12ac709aff5ec6a5b9e83 14-Jul-2011 Andreas Huber <andih@google.com> Merge "Remove old-style software decoders."
a8ccc50175d4a45a3fdbe0364d56eb680b40dad8 13-Jul-2011 Andreas Huber <andih@google.com> Remove old-style software decoders.

Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/ThreadedSource.cpp
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
ibstagefright/codecs/amrnb/dec/Android.mk
ibstagefright/codecs/amrwb/AMRWBDecoder.cpp
ibstagefright/codecs/amrwb/Android.mk
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/codecs/avc/dec/Android.mk
ibstagefright/codecs/g711/dec/Android.mk
ibstagefright/codecs/g711/dec/G711Decoder.cpp
ibstagefright/codecs/m4v_h263/dec/Android.mk
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
ibstagefright/codecs/mp3dec/Android.mk
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
ibstagefright/codecs/on2/dec/Android.mk
ibstagefright/codecs/on2/dec/VPXDecoder.cpp
ibstagefright/codecs/vorbis/dec/Android.mk
ibstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
ibstagefright/include/ThreadedSource.h
45aaa2a345292bb6d600822db602f25e261c0e50 13-Jul-2011 Mike Lockwood <lockwood@android.com> MediaScanner: fix breakage in updates

To facilitate bulk inserts, we changed the media scanner to use the file URI
instead of the audio, video or image media URIs.
However we should still use the media URIs for updating existing records

Bug: 5021925

Change-Id: I6143dc1d00350192170428a5e951b52ef9223734
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
67d464f47e842d5069e993408fd51ec122ad8019 13-Jul-2011 Andreas Huber <andih@google.com> Enable signalling of a stream discontinuity involving a format-change

through IStreamListener.

Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a
related-to-bug: 5022434
ibmedia/IStreamSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
9cba686366870b3a4c69bcec0eb4200352ce481d 13-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Clean up MtpServer initialization and threading:"
dcc31946f2b78be4bf95b1cace2e2c211f027e72 11-Jul-2011 Mike Lockwood <lockwood@android.com> MTP: Clean up MtpServer initialization and threading:

Move thread from native to Java code
Remove the stop() method (the thread will exit on its own)

Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
ava/android/mtp/MtpServer.java
ni/android_mtp_MtpServer.cpp
tp/MtpServer.cpp
d420b18c43b5a98691dfc09374f7005aae76c282 13-Jul-2011 Iliyan Malchev <malchev@google.com> Merge "Add support for TI H264 encoder"
e641dc502bb31d968856a022846414dd8e947e19 12-Jul-2011 Dandawate Saket <dsaket@ti.com> Add support for TI H264 encoder

Add support for TI H264 encoder and quirks for buffer allocation.
Temporary switching to baseline profile till ctts patch is defaulted
as per profile detection.

Change-Id: I1d56184b9c5d5f00d6c63aef7e058f3d56b84cef
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
8c55a9a57e4f13ec420c3de7b3abfdcf454f6633 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Merge "Remove the simulator target from all makefiles. Bug: 5010576"
d28848b5b6a06acbb3cf0b8f968b0fbd17f05584 24-Jun-2011 Glenn Kasten <gkasten@google.com> OMX CallbackDispatcher uses C++ Thread not pthread

This permits leveraging future improvements to Thread.

Change-Id: I45e25a309e7edd1d4f0dacc5ec987329afa497d9
ibstagefright/include/OMX.h
ibstagefright/omx/OMX.cpp
bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
ibeffects/factory/Android.mk
ibeffects/lvm/wrapper/Android.mk
ibeffects/visualizer/Android.mk
ibmedia/Android.mk
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
ibstagefright/chromium_http/Android.mk
ibstagefright/omx/Android.mk
tp/Android.mk
c478f13535f7bb3ea03aa9c01932290f9c13902c 12-Jul-2011 Eric Laurent <elaurent@google.com> Merge "Audio Effect API: process reverse stream function"
501c4671e73a484c1f01d94f4f5fff124c05f197 11-Jul-2011 Jeff Brown <jeffbrown@google.com> Merge "Eliminate single-process mode. Bug: 5010576"
9b40a61ce98b6adce4df046fce8d67d64630b379 11-Jul-2011 James Dong <jdong@google.com> Merge "Do not wait for unlaunched threads in stop()"
0e27fce92348bc765a13a94d31405069ec596426 09-Jul-2011 James Dong <jdong@google.com> Do not wait for unlaunched threads in stop()

Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
ibstagefright/MPEG4Writer.cpp
6e65a4a4ffea59ca3761bd1655ad4672c6d91000 11-Jul-2011 James Dong <jdong@google.com> Merge "Release camera if CameraSource::start() has not been called"
fbb170ca9cbbd0c87c71ac39ecbb36086bca5ee2 11-Jul-2011 James Dong <jdong@google.com> Support profile and level query for SW video decoders

Change-Id: I9c20db128be96cd36cf2083e08e8c21f5e6d1fdf
ibstagefright/codecs/avc/dec/SoftAVC.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
a59a1bad8586e79a863442fa5139658e50ce9dd7 11-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "Remove unnecessary locking from MediaScanner JNI code"
af16d0b30e89f31b7617424c8706553ff571d08d 10-Jul-2011 Mike Lockwood <lockwood@android.com> Remove unnecessary locking from MediaScanner JNI code

There is nothing in this file that requires a global lock.
Furthermore, the lock can cause timeouts in native_finalize if one instance
is being garbage collected while another is busy in processDirectory

Bug: 5002520

Change-Id: I8717f8edeb932200d9f76b3d98915cfbe18b6ec6
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ni/android_media_MediaScanner.cpp
325b8e83a6bc3842fda6230c11f4dfe1c41adbc1 18-Jun-2011 Eric Laurent <elaurent@google.com> Audio Effect API: process reverse stream function

Added function to audio effect interface for processing of
a reverse stream.
This is necessary for audio pre processes like echo cancellation.

Change-Id: I6e12d79dbbed6376acdfc79304b8c0ab3f705eae
ibeffects/factory/EffectsFactory.c
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/visualizer/EffectVisualizer.cpp
e6d24ab6a96549940cf832fe8c86710f2f07631c 11-Jul-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system"
7a59dd2ce33b46cbc73eef964ddb4272ea1da8d1 11-Jul-2011 Mike Lockwood <lockwood@android.com> MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system

Bug: 4561836

Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpPropertyGroup.java
ava/android/mtp/MtpStorage.java
ni/android_mtp_MtpServer.cpp
tp/MtpServer.cpp
tp/MtpStorage.cpp
tp/MtpStorage.h
bd682b040833fce9e212c00c395b32bec7050f87 11-Jul-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Use bulk inserts when in batch mode

To do this we need to move the logic for determining media type to MediaProvider
Make some things in MediaFile public so they can be used from MediaProvider

Bug: 4948188

Change-Id: I6ab168b6b4d45b2fc91ea8bd52ca58283b0efc14
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
ava/android/media/MediaScanner.java
8d19d3ae1e828e9189e2174e8ea88374af93f18e 09-Jul-2011 James Dong <jdong@google.com> Release camera if CameraSource::start() has not been called

Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
ibstagefright/CameraSource.cpp
10e89712863f5b91a2982dc1783fbdfe39c1485d 09-Jul-2011 Jeff Brown <jeffbrown@google.com> Eliminate single-process mode.
Bug: 5010576

Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
ava/android/media/MediaScanner.java
bc2861fdbbd94548513246f74f994cfc99f95004 09-Jul-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn"
559bb7951f283264e241df6845fef5bbe63b7f81 08-Jul-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn

Change-Id: Ic8b4360cdabb157fa7739552b73e3c3daab88129
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
be650872f8971218eb010569fcb66e4dc75e16ed 08-Jul-2011 James Dong <jdong@google.com> Use advertised h264 encoding parameters by default if the profile is not baseline

o Force to use AVC baseline profile for camcorder low quality videos

Change-Id: I3424c57dd0c55fc4991f5767b57695c8f3420ecb
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/OMXCodec.cpp
5cc05263399fea948c3b80f83f07ff7476ef0505 24-Jun-2011 Eric Laurent <elaurent@google.com> Moved and renamed effect API header files

Moved specific effect header files to
system/media/audio_effects/include/audio_effects
and renamed to lower case (effect_xxx.h).

Change-Id: Icfc2264bfd013cab0395d7e310ada636b9fe3621
ni/audioeffect/Android.mk
ibeffects/lvm/wrapper/Android.mk
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
ibeffects/lvm/wrapper/Reverb/EffectReverb.h
ibeffects/testlibs/Android.mk_
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.h
ibeffects/visualizer/Android.mk
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/Android.mk
ibmedia/Visualizer.cpp
2da9eb7175e59a4ad8b9cec185f9cfdf8e075859 06-Jul-2011 Gloria Wang <gwang@google.com> Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager"
7f61f5919d193d8ae158ce8a52ca69c9f2be8777 06-Jul-2011 Vikas Arora <vikasa@google.com> Associate WebP Mime-Type with FILE_TYPE_WEBP.

The last change for adding WEBP Mime-Type
(https://android-git.corp.google.com/g/#change,112919) had this bug.
Fixing the bug in this change.

Change-Id: I084b66de4aabb3892fb0e6fa36062a52d4dcc224
ava/android/media/MediaFile.java
82428a862f325238cfb5646bbd65de3f1a11e7cc 27-Jun-2011 Gloria Wang <gwang@google.com> - Retrieve is_drm in MediaMetadataRetriever.
- Add one more column in MediaStore to indicate whether a
media file is drm-protected.
- Remove old DRM code from Ringtone
- Use the new DRM code in RingtoneManager

Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaScanner.java
ava/android/media/RingtoneManager.java
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/include/MPEG4Extractor.h
03f9435273df3c8d6f342adfc391844a18535adf 02-Jul-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4571308 Provide correct video frame timestamps"
dfba1773c911c4d97838923334c5a879424387bf 01-Jul-2011 Andreas Huber <andih@google.com> Merge "Charge network traffic to the uid of the process using the MediaPlayer."
e02dd02bb8de073e03603df240d085267f014e5a 01-Jul-2011 Andreas Huber <andih@google.com> Merge "Ignore all flush-complete notifications with port == OMX_ALL"
603d739b5a444c52b63f1ec7cd2098034151ad25 01-Jul-2011 Andreas Huber <andih@google.com> Charge network traffic to the uid of the process using the MediaPlayer.

Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067
related-to-bug: 4517282
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibstagefright/AwesomePlayer.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/HTTPStream.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/ARTSPController.h
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/HTTPBase.h
ibstagefright/include/HTTPStream.h
ibstagefright/include/LiveSession.h
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
ibstagefright/rtsp/ARTSPController.cpp
ibstagefright/rtsp/MyHandler.h
919a7ae9b4b0ab14424336d1208772f2c33299bb 01-Jul-2011 Andreas Huber <andih@google.com> Ignore all flush-complete notifications with port == OMX_ALL

Use of this notification is not consistent across
implementations. We'll drop this notification and rely
on flush-complete notifications on the individual port
indices instead.

Change-Id: I76c0dfdcfc92a7c9acf57abf3027d2638d77efca
ibstagefright/ACodec.cpp
091b248538e78ed1c63ee6c6277179e3d4786db2 01-Jul-2011 Andreas Huber <andih@google.com> Merge "Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec."
42fb5d64b9a4f4be5163c67374cca5eaa7226791 30-Jun-2011 Andreas Huber <andih@google.com> Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec.

Change-Id: Ie03b285265099dbac9b12f3f41d9ad758d0b50ad
ibstagefright/OMXCodec.cpp
27ac0ac360af5c65f7455d7c768bb47d39440c1f 01-Jul-2011 Edwin Wong <edwinwong@google.com> Merge "Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.""
5367190fddc327135a39f26a7113faa659bb31b9 01-Jul-2011 James Dong <jdong@google.com> Merge "Return ERROR_END_OF_STREAM when the input source reaches eos"
5faaadffbfb272f6a5f686834dadaf5408cf0ed2 01-Jul-2011 Kristian Monsen <kristianm@google.com> Merge changes I7e8401a4,I412ddf36

* changes:
Merge Chromium at r11.0.696.0: New autofill strings
Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
73104111d65e6c2e486b31b05274c40a36a896e1 01-Jul-2011 Jeff Tinker <jtinker@google.com> Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video."

This reverts commit d63d947d406977c7c307f69369908b4342c98ef3
ibstagefright/WVMExtractor.cpp
ibstagefright/include/WVMExtractor.h
e9a418811957280bd4de1d16c77488fae2ff990f 01-Jul-2011 Andreas Huber <andih@google.com> Seeking/duration in HLS content is based on the individual segments' duration

not target-duration.

Change-Id: I294097daa84c25e4084a6fc4ea80e39a543f3d10
related-to-bug: 4983285
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
04deb7bb7bb1b8b833c219564873b7ba8bc6516c 30-Jun-2011 Andreas Huber <andih@google.com> Merge "Revert "Parse RTP-Info even for live streams.""
d4a6cac34d9e75dc708f894863d1870e456c93d6 30-Jun-2011 Andreas Huber <andih@google.com> Revert "Parse RTP-Info even for live streams."

This reverts commit d873413ff9f742f259c29d7d0b58265db6b24529.
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
4f0205f6a300484ea6d88c4fcee68da0ac5ef35e 30-Jun-2011 Andreas Huber <andih@google.com> Some (most) OMX decoders do not send a OMX_CmdComplete/Flush OMX_ALL notification

Change-Id: I1bdcc7be5f12dab301891a5f9ee5cc981e09ba82
ibstagefright/ACodec.cpp
ff90212a3c00e89b25399eb90cdce471cc8c8cc1 30-Jun-2011 Chih-Chung Chang <chihchung@google.com> Remove curtain effect (it's unused).

Change-Id: I2addf390aaa5aa514238b1f98eea67f27745cbf1
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorOsal.cpp
d39e8f4c2319087c439b456d3793109330f1c8b0 30-Jun-2011 James Dong <jdong@google.com> Return ERROR_END_OF_STREAM when the input source reaches eos

Change-Id: I334313b054dcf388d2e05d56efb10ceea4980638
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
2d700947dbdf46b030ec911d1347680906783e22 29-Jun-2011 Andreas Huber <andih@google.com> Merge "Fix a format string that triggered a compile-time warning in OMXCodec.cpp"
9fb64a250c5ea317490a569f5ce881c533642228 28-Jun-2011 Andreas Huber <andih@google.com> Fix a format string that triggered a compile-time warning in OMXCodec.cpp

Change-Id: Ib4b6cce1b4102034605da8edfb0dd8bc9a578168
ibstagefright/OMXCodec.cpp
2bcc183cabb76ac27cea99dcb6a561194a643e33 20-Jun-2011 Andreas Huber <andih@google.com> Instantiate a NetworkChangeNotifier to have chromium transparently handle interface

changes.

Change-Id: If48d2934ce29d68b9c31a1d120fe8f134f277a33
ibstagefright/chromium_http/support.cpp
d2a1ebc35616e9dbc95d2bb94e060de40686350d 27-Jun-2011 Kristian Monsen <kristianm@google.com> Merge Chromium at r11.0.696.0: Using setter instead of direct variable access

Members in UrlRequestContext was made private in upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165

Change-Id: I412ddf36b0818e59b9b3ae428407d562facd4785
ibstagefright/chromium_http/support.cpp
528b084be26ff6f5b5d8cf42007bf964857be8da 29-Jun-2011 Wu-cheng Li <wuchengli@google.com> Unlock the camera if media recorder fails to start recording.

bug:4965716

Change-Id: Icb1f7f18e9ea6c4f0427ade2ed338e7d56be5e01
ava/android/media/MediaRecorder.java
ibstagefright/CameraSource.cpp
068dbbf7ee7ed22a4595e7afaa2be6d57c2774f6 28-Jun-2011 Andreas Huber <andih@google.com> Support for writing output data to a provided callback function instead of a file

in MPEG2TSWriter

Change-Id: Ie54a5677c7b789a973aa50b7f197c6db238425bc
ibstagefright/MPEG2TSWriter.cpp
d11eccf3a861fdaa754907a28cc0da554b9aa7b7 28-Jun-2011 Andreas Huber <andih@google.com> Merge "Multiple changes to ACodec/codec tools:"
e366f52b1520f13306d5fef1c3c8a2b2c653d935 28-Jun-2011 Andreas Huber <andih@google.com> Multiple changes to ACodec/codec tools:

Make sure sf2 does not coalesce input buffers, generalize ACodec's codec
instantiation based on OMXCodec's list of eligible component names.

Some changes/additions to the "sf2" commandline tool

Make surface options consistent with stagefright tool, i.e. use '-S' instead of '-s'
New option '-R' renders surface-allocated buffers.

Also fixes a longstanding bug introduced when generalizing from surfaces to native windows that never used surface-allocated buffers in sf2 even when the option was specified.

Change-Id: I59fd533f0f6ef0337ebe2806ddc81a46878eb3ae
ibstagefright/ACodec.cpp
f65d59bdd34ac91d4aca22a8b75ea9dff3377f61 28-Jun-2011 Jeff Tinker <jtinker@google.com> Merge "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video."
88f7194f6d93b6bb5822ad3c45ae9e59395212b9 26-Jun-2011 James Dong <jdong@google.com> Add a testcase to test PNG files support for KenBurn effect.

Change-Id: I1d0b3ff7b5aa21c25c141b440521e64b4a82043d
related-to-bug: 4861071
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
d63d947d406977c7c307f69369908b4342c98ef3 27-Jun-2011 Jeff Tinker <jtinker@google.com> Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.

This change allows the WVM extractor to close and reopen when not in use which resolves
the issue with heap fragmentation between plays.

Change-Id: I160ee1e98aada2bfdd0818eeb6300ad50644fb75
ibstagefright/WVMExtractor.cpp
ibstagefright/include/WVMExtractor.h
b5cc1f1e21e9c8d4070b0c98370612aba71329d3 27-Jun-2011 Andreas Huber <andih@google.com> Merge "Fix the new color converter to respect the destination crop rect."
e67e99a9fb176348e7b008d37475786ef212374d 27-Jun-2011 Andreas Huber <andih@google.com> Merge "Log video dimensions and crop rectangle."
f7ee6692a56167e86c205355df4b3b7be1fae524 27-Jun-2011 Andreas Huber <andih@google.com> Merge "Update paths to test content used to run the omx_tests."
5c2faf3dc310b100707eb9e32e1e5ae8ceffd0c6 27-Jun-2011 Glenn Kasten <gkasten@google.com> Bug 4571308 Provide correct video frame timestamps

Change-Id: I0f726817fc02d3e2a4cf82ed801ef977994e6bcc
ava/android/media/MediaPlayer.java
ibstagefright/AwesomePlayer.cpp
654af6c57dec446f1047088ac954546d7188d962 27-Jun-2011 James Dong <jdong@google.com> Merge "Reduce the number of output buffers and force output buffers in display order for SoftAVC decoder"
cdfa6141d2f140a85c596bd42b86231b36ba00d6 24-Jun-2011 Andreas Huber <andih@google.com> Fix the new color converter to respect the destination crop rect.

Also fixes the SoftwareRenderer to request blitting the correct crop rectangles.

Change-Id: I38706cf9b42d96c6d5b35a9380f006ea4fbbf1ea
ibstagefright/colorconversion/ColorConverter.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/SoftwareRenderer.h
f167f503c942eb04770d7916ee1196bb975f49bb 24-Jun-2011 Andreas Huber <andih@google.com> Log video dimensions and crop rectangle.

Change-Id: Ia56b09df4f6e9a14c4dcc499a6637fc39f8e3bb5
ibstagefright/OMXCodec.cpp
1ef4c197a6b15f7db7503550adf3862c51602300 24-Jun-2011 Andreas Huber <andih@google.com> Update paths to test content used to run the omx_tests.

Change-Id: I23201ac1541df032426cb05b9dc872b28882f992
ibstagefright/omx/tests/OMXHarness.cpp
42419ce28a09eb63e29a8fef87e6f5534f41902f 01-Jun-2011 Wu-cheng Li <wuchengli@google.com> Add framework support for camcorder zoom.

The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to
allow applications using the camera during recording.

Camera service allows only one client at a time. Since camcorder application
needs to own the camera to do things like zoom, the media recorder cannot
access the camera directly during recording. So ICameraRecordingProxy is a proxy
of ICamera, which allows the media recorder to start/stop the recording and
release recording frames. ICameraRecordingProxyListener is an interface that
allows the recorder to receive video frames during recording.

ICameraRecordingProxy
startRecording()
stopRecording()
releaseRecordingFrame()

ICameraRecordingProxyListener
dataCallbackTimestamp()

The camcorder app opens the camera and starts the preview. The app passes
ICamera and ICameraRecordingProxy to the media recorder by
MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in
MediaRecorder::start(). After setup, the recorder disconnects from camera
service. The recorder calls ICameraRecordingProxy::startRecording() and
passes a ICameraRecordingProxyListener to the app. The app connects back to
camera service and starts the recording. The app owns the camera and can do
things like zoom. The media recorder receives the video frames from the
listener and releases them by ICameraRecordingProxy::releaseRecordingFrame.
The recorder calls ICameraRecordingProxy::stopRecording() to stop the
recording.

The call sequences are as follows:
1. The app: Camera.unlock().
2. The app: MediaRecorder.setCamera().
3. Start recording
(1) The app: MediaRecorder.start().
(2) The recorder: ICamera.unlock() and ICamera.disconnect().
(3) The recorder: ICameraRecordingProxy.startRecording().
(4) The app: ICamera.reconnect().
(5) The app: ICamera.startRecording().
4. During recording
(1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp()
(2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame().
5. Stop recording
(1) The app: MediaRecorder.stop()
(2) The recorder: ICameraRecordingProxy.stopRecording().
(3) The app: ICamera.stopRecording().

bug:2644213

Change-Id: I15269397defc25cbbcae16abc071c8349c123122
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
2db9a95bc5bf23a0dddff720493255a0e4b2bd54 18-Jun-2011 James Dong <jdong@google.com> Reduce the number of output buffers and force output buffers in display order for SoftAVC decoder

Change-Id: I9ec6d8205e7a56e42d5b5799a6c2e31076d24b81
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.h
3db9f38174b84404d31048dcdc6f84638a41ef37 22-Jun-2011 Anu Sundararajan <sanuradha@ti.com> Stagefright: add support for gralloc OMX_UseBuffer.

XXX: This change should go along with a documentation change to
HardwareAPI.h that describes the new extension.

This change adds support for passing a buffer_handle_t to OMX_UseBuffer
during OMXCodec initialization. This new way of passing the
buffer_handle_t's replaces the old OMX_SetParameter-based approach, and
this change deprecates that interface, but still supports it for OMX IL
implementations that do not support the new interface.

Change-Id: If9c1cb3c6c349c54dab094aeb8af13eae9f85271
Signed-off-by: Jamie Gennis <jgennis@google.com>
Signed-off-by: Sarthak Aggarwal <sarthak@ti.com>
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMXNodeInstance.cpp
d35df4412bc2218bb0d22522bd366123b8e6400c 22-Jun-2011 Anu Sundararajan <sanuradha@ti.com> Integrating TI OMAP4 Video Decoder

Added the video decoder component name to kDecoderInfo.
Set the quirks for the video decoder.
Add a new color format to OMX_IVCommon.h to denote TI OMAP4 NV12 color format.
Added a color conversion routine [ from NV12 to RGB ] for thumbnail generation.

Change-Id: I6b23c36441645ef65ec7406ba262d19f89cf64fd
Signed-off-by: Devaraj Rangasamy <dev@ti.com>
Signed-off-by: Sreenidhi Koti <sreenidhi@ti.com>
Signed-off-by: Anu Sundararajan <sanuradha@ti.com>
ibstagefright/OMXCodec.cpp
ibstagefright/colorconversion/ColorConverter.cpp
1e1b13e62e38d6efc7cef4b496b3119bd45ee2c2 23-Jun-2011 Gloria Wang <gwang@google.com> - Public part of the Metadata API.
- Modify the media framework test for Metadata.

Change-Id: Ib8fa4991f114e1bb88a17ca662844b9b8e1d0faf
ava/android/media/Metadata.java
ibmedia/Metadata.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java
5ecc4601ea2672e1e52bcd0860908d1cae7db4c2 23-Jun-2011 Andreas Huber <andih@google.com> Merge "Parse RTP-Info even for live streams."
db262e6cf072a0ebbf2b67aceb37ce9d5ba87b08 23-Jun-2011 Glenn Kasten <gkasten@google.com> Merge "Fix warnings for uninitialized local variables"
e2ac799dfcd01c9cbd9693890964b2bb5b8f4e88 23-Jun-2011 Eric Laurent <elaurent@google.com> Merge "Added audio_bytes_per_sample() helper function"
21fc9ad28ea6d186888694aba4fa9171423dd3f9 23-Jun-2011 Martin Storsjo <martin@martin.st> stagefright amrwbenc: Remove a duplicate, unused file

This file is identical to common/cmnMemory.c, and that's the
file that is used by all the makefiles, not this one.

Change-Id: I6a601c24a983285e55e5356bd5569853a1e2d7fe
ibstagefright/codecs/amrwbenc/src/cmnMemory.c
028ab996e50a3a6a5c6dde88f9b2cc5d2f354654 23-Jun-2011 Glenn Kasten <gkasten@google.com> Fix warnings for uninitialized local variables

Change-Id: Ic9b03b0fd215444e76c7b7bebb385f7831c557e0
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
31f8b6285529fd1deae93a3bb34d6c89d7926747 22-Jun-2011 Shailendra <shailendray@google.com> Merge "Fix for kenBurn Effect for PNG image is crashing (4861071 )"
019caf42c0df10c0ed0a0242ea7a39321a36f483 22-Jun-2011 Gloria Wang <gwang@google.com> Merge "Timed text display format support: 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata"
d7ed5992634596a53f32f66277de6d287ffb752f 22-Jun-2011 Shailendra <shailendray@google.com> Fix for kenBurn Effect for PNG image is crashing (4861071 )

Change-Id: I4b9905ca862a1f0eac0bed4c7f021e93f79ea592
ni/mediaeditor/VideoEditorClasses.cpp
842679beeab3dede5cae6427bae59716573625a1 22-Apr-2011 Martin Storsjo <martin@martin.st> stagefright: Only use __int64 on MSVC, not on all win32 compilers

Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
ibstagefright/codecs/common/include/voType.h
a9de2b598dbe13fb1e86607dffb1e090742f8330 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright aacenc: Make the mem_malloc function 64-bit safe

Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
ibstagefright/codecs/aacenc/src/memalign.c
5c8247f7307f1543127b7d12d5da122b85bc3d87 22-Dec-2010 Martin Storsjo <martin@martin.st> stagefright: Include stdlib.h for malloc/free

According to ANSI C, malloc/free are provided by stdlib.h.

Also, string.h is always available according to ANSI C, and provides
the memset function, so there's no need to include it conditionally
for linux only.

This makes the code buildable on OS X, too.

Change-Id: Ie5d1da02158797e7e45dea257cbe3e4996dde4db
ibstagefright/codecs/common/cmnMemory.c
eaa5d8f9c0117bdaa20fd0a57921156bb0c06345 01-Jun-2011 Gloria Wang <gwang@google.com> Timed text display format support:
1. Extract 3GPP global format descriptions
2. Extract 3GPP local format descriptions
3. Define data structure (TimedText) for applications to
retrieve the format metadata

Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
ava/android/media/MediaPlayer.java
ava/android/media/TimedText.java
ibstagefright/MPEG4Extractor.cpp
ibstagefright/timedtext/Android.mk
ibstagefright/timedtext/TextDescriptions.cpp
ibstagefright/timedtext/TextDescriptions.h
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/timedtext/TimedTextPlayer.h
032897470aa5df2400996ffa5d26a937803ea446 22-Jun-2011 James Dong <jdong@google.com> Merge "Add some error log messages to indicate the failure of a recording session"
0f5d8441ef3ee88855df71b15d81f4c14f12d63d 22-Jun-2011 James Dong <jdong@google.com> Merge "Switch to use MediaMetadataRetriever to generate the project thumbnail when the first media item is a MediaVideoItem"
839ba2c1834d125a27bbc8d9a85bcaa735894094 22-Jun-2011 James Dong <jdong@google.com> Add some error log messages to indicate the failure of a recording session

Change-Id: I8c5885200bcf6a59736076efc021f07f45a0fdac
ibstagefright/MPEG4Writer.cpp
e413899097e4849ae6f7caf4e2d1df5ea5018d32 22-Jun-2011 James Dong <jdong@google.com> Merge "Timestamp adjustment will not work well if we ask video encoder to produce B frames"
e67bb48b66f6003385a506966cb3314c1009afbe 04-Jun-2011 James Dong <jdong@google.com> Timestamp adjustment will not work well if we ask video encoder to produce B frames

Change-Id: Ic6a2235fefb6f15081091e1f2c1b12ee92fba5e0
ibstagefright/MPEG4Writer.cpp
274626469b716560d7539d0d830c41b83f3665a1 21-Jun-2011 Andreas Huber <andih@google.com> Log an error instead of asserting if the OMX plugin reports an error.

Change-Id: I2bae80706495c5c5d4257cd607c2141c070c5ff9
ibstagefright/omx/OMXMaster.cpp
24a38f1ab9ed3b7b9f8517b22dbf692a898117e3 21-Jun-2011 James Dong <jdong@google.com> Switch to use MediaMetadataRetriever to generate the project thumbnail when the first media item is a MediaVideoItem

o This patch allows us to use the logic from MediaMetadataRetriever to extract a thumbnail instead of extracting
the thumbnail from a fixed position (@500 ms).

Change-Id: I81e8378d9bed80894cc622479679021dce3d52e5
related-to-bug: 3485609
ava/android/media/videoeditor/VideoEditorImpl.java
157c74e7ace77ae026cb59f48e400fb4ffe3c529 21-Jun-2011 Andreas Huber <andih@google.com> Merge "Don't assert on malformed .mp4 content that contains fewer samples than"
bbf7c449e11258b676343a09463329c7cb6375c4 21-Jun-2011 James Dong <jdong@google.com> Merge "Boost software vp8 decoder performance using multi-threaded decoding if possible"
467bc257556a02a71164bcd03fec8b1ec99e460b 21-Jun-2011 Andreas Huber <andih@google.com> Parse the individual segment's duration as a floating point number which is now

allowed in later HLS specs.

Change-Id: I7c8296acb4e9b0f80022f3057769de0eea9ee0c6
related-to-bug: 4779022
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/include/M3UParser.h
727863d2de17ea121ad0bcccdf2227d13a3ec9ca 21-Jun-2011 Andreas Huber <andih@google.com> Don't assert on malformed .mp4 content that contains fewer samples than

described in the time-to-sample box.

Change-Id: Ic6f973212c15012a25f6e849759fd4f14d97e30f
related-to-bug: 4779053
ibstagefright/SampleTable.cpp
e2b801e5a437d75151d70a90e73f5f110d8732dd 21-Jun-2011 Andreas Huber <andih@google.com> Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error."
7d40d42a364f520da853b41956b0a18ed172491b 21-Jun-2011 Mike Lockwood <lockwood@android.com> MTP: Add support for PTP variant of GetDeviceInfo result.

Change-Id: I09f86fda768b7697665e401adb9516588859bf59
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpServer.java
ni/android_mtp_MtpServer.cpp
tp/MtpServer.cpp
tp/MtpServer.h
dabf22181d912de9f32b51b023ac4c0ee6ec7a17 21-Jun-2011 Andreas Huber <andih@google.com> Restore legacy soft-aac decoder behaviour. Substitute silence on decode error.

Change-Id: I680ccaabef32b1319819f723260cb3789585f09e
related-to-bug: 4579486
ibstagefright/codecs/aacdec/SoftAAC.cpp
02392b41de3577251683fb1e79a3c893275e6e0d 21-Jun-2011 Andreas Huber <andih@google.com> Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData()."
b2af97e9a11119a257289cb8c539b5de79093052 20-Jun-2011 James Dong <jdong@google.com> Merge "When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF."
32bb368a51e053823a9c3d95919f49acae7ddc87 20-Jun-2011 James Dong <jdong@google.com> When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF.

When this happens, default value of 0 will be used for the "decoding" time for these output buffers.
These buffers do not contain valid media data anyway.

related-to-bug: 4725803

Change-Id: I0eaf248bb2ac022ff072eaffd0ed3f21171f824e
ibstagefright/OMXCodec.cpp
c03f08e5c7acbb85637280f5ddc0fbace8ea2de0 18-Jun-2011 James Dong <jdong@google.com> Boost software vp8 decoder performance using multi-threaded decoding if possible

Change-Id: I7258c7d0cf91aa7c62444d03ed8bce96fb23d8ef
related-to-bug: 4539653
ibstagefright/codecs/on2/dec/SoftVPX.cpp
d873413ff9f742f259c29d7d0b58265db6b24529 01-Jun-2011 Andreas Huber <andih@google.com> Parse RTP-Info even for live streams.

Change-Id: Ib2c39ce8d5366f5ea350e71b7a54f5f7c2b510b9
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
df02afe8355e1e7a6f8f02549f41a166c3ee6932 20-Jun-2011 Glenn Kasten <gkasten@google.com> Merge "Remove unneeded #include <sys/resource.h>"
48810fdda5664e89f2efc2592a60c8d29d7bb7a5 17-Jun-2011 Dongwon Kang <dwkang@google.com> OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData().

BUG:4689872
Change-Id: I483bf230b5571a8d1815b954dce2c52e9a5f1f37
ibstagefright/OggExtractor.cpp
f4c043c2a8f987b9b179d2269a1c0dd90d10ea16 18-Jun-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands"
6acc90fc216530f0a5bbf7339066af9b415cbb02 17-Jun-2011 Mike Lockwood <lockwood@android.com> MTP: Fix some problems with GetObjectHandles and GetNumObjects commands

These calls did not correctly handle some variants of the arguments,
which showed up when running in PTP mode.

Change-Id: Iedbaefebfa39111c8bcaee7c6cc3820a65d6c98f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpDatabase.java
tp/MtpServer.cpp
d11f591b45008147cf0854b2af8712692cef6f03 18-Jun-2011 James Dong <jdong@google.com> Merge "Use system property to control whether we will enable B frame support in MPEG4Writer"
bf8116f28da187933a255ba3719b9265ecd1d98b 18-Jun-2011 James Dong <jdong@google.com> Use system property to control whether we will enable B frame support in MPEG4Writer

o This is to work around a bug in crespo's video encoder output timestamp

related-to-bug: 4600191,4724339

Change-Id: I485c1e044bd2f604b318692efd6433345cfc6487
ibstagefright/MPEG4Writer.cpp
c310dcbed66026fa548f9ec0821ec15f8c6a080d 17-Jun-2011 Eric Laurent <elaurent@google.com> Added audio_bytes_per_sample() helper function

Change-Id: Ibfcd75c4c241a53d5f052c25ada091904991048a
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
759c5b3d4964adba5a0c871799ec08f3c323b07a 17-Jun-2011 Eric Laurent <elaurent@google.com> Fix regression in audio effect factory

commit 0fb66c2 introduced a bug in EffectCreate() that prevents detection
of problems reported by the engine library upon effect creation.

Change-Id: I5bd2d42505ac29ab4a5768fd7f0c2ced135cf3e3
ibeffects/factory/EffectsFactory.c
0a4d51d581ac1f3fad1f63ffea07f2560b2788e3 16-Jun-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Add new open source test contents. Removed old test files. Updated the tests with new test contents."
c4fe54a2385e8e67dcfed6b2c365214ed020d245 14-Jun-2011 Yu Shan Emily Lau <yslau@google.com> Add new open source test contents.
Removed old test files.
Updated the tests with new test contents.

Change-Id: Id74f1aae391ef868843ab4058ae9a9328d98f868
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
ests/contents/media_api/goldenThumbnail.png
ests/contents/media_api/music/MP3_48KHz_128kbps_s_1_17.mp3
ests/contents/media_api/music/MP3_48KHz_128kbps_s_1_17_ABR.mp3
ests/contents/media_api/music/MP3_48KHz_128kbps_s_1_17_CBR.mp3
ests/contents/media_api/music/MP3_48KHz_128kbps_s_1_17_ID3V1.mp3
ests/contents/media_api/music/MP3_48KHz_128kbps_s_1_17_ID3V1_ID3V2.mp3
ests/contents/media_api/music/MP3_48KHz_128kbps_s_1_17_ID3V2.mp3
ests/contents/media_api/music/MP3_48KHz_128kbps_s_1_17_VBR.mp3
ests/contents/media_api/music/SHORTMP3.mp3
ests/contents/media_api/music/ants.mid
ests/contents/media_api/music/bzk_chic.wav
ests/contents/media_api/music/sine_200+1000Hz_44K_mo.wav
ests/contents/media_api/music/test_amr_ietf.amr
ests/contents/media_api/video/big-buck-bunny_trailer.webm
79cd8ba46b1ac15f75174beebc1411edea32c05b 15-Jun-2011 Glenn Kasten <gkasten@google.com> Remove unneeded #include <sys/resource.h>

Suggested in code review for previous change.

Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
ni/soundpool/SoundPool.cpp
ibmedia/ToneGenerator.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibstagefright/AACWriter.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/omx/OMX.cpp
30d71a05aaffadd0da1ff3c715a46dab5b645645 15-Jun-2011 Kristian Monsen <kristianm@google.com> Merge "Merge chromium to r11.0.672.0: Compile fix"
05be9531b6faf9313e7577284a547b89950d0d55 15-Jun-2011 James Dong <jdong@google.com> Second attempt to fix the broken build

o due to a link to a hidden method

Change-Id: Ia488743e9bff6854253696cc368facbd50d2d8f4
ava/android/media/MediaPlayer.java
d52ad9ca8d36afa76161c61b65a71d70977c0d3f 15-Jun-2011 James Dong <jdong@google.com> Fix broken build

Change-Id: Icf7e33a3a4d9b430cd8cbc97801df24a94f9e079
ava/android/media/MediaPlayer.java
370a71bcaf5bc4874f1b7daadc091adc256fe234 15-Jun-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4608375"
113543c909baadb911cfda6acef056137e16f191 15-Jun-2011 James Dong <jdong@google.com> Merge "Enforce the rule that the timestamp from timelapse video source monotically increases"
9ddb7888b4b8c7b1f9e352347d84ae530e47a77d 14-Jun-2011 James Dong <jdong@google.com> Update MediaPlayer and MediaRecorder javadoc

o Adding some description to the Looper requirement for receiving callbacks

Change-Id: I79e7014c521f2286e6c2ccea1097d7e7467eb9ee
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
114420f5315c72e9cbd41cd4ae7472ef24ef1b94 14-Jun-2011 tedbo <tedbo@google.com> Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink."
1d24aaa4b47ac005c0a673a06c373f85b1e43caf 14-Jun-2011 Glenn Kasten <gkasten@google.com> Bug 4608375

Update priority and policy together for audio threads

Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
ibstagefright/MPEG4Writer.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/omx/OMX.cpp
922261deab46b93641eadd9bc337fa72f8a5d734 14-Jun-2011 Dima Zavin <dima@android.com> Merge "audio: update for audio/audio_policy header names/locations"
21663e5dc761c4bfdb99e348e04b2ce1d1d9214c 14-Jun-2011 James Dong <jdong@google.com> Enforce the rule that the timestamp from timelapse video source monotically increases

Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e
ibstagefright/CameraSourceTimeLapse.cpp
290029d19a9d314e925b73e19453ab0497602f80 14-Jun-2011 Dima Zavin <dima@android.com> audio: update for audio/audio_policy header names/locations

Change-Id: I36c49352eee57559403cd1597f56a8485a360289
Signed-off-by: Dima Zavin <dima@android.com>
ibmedia/AudioTrack.cpp
4108b1edc61ef91c63bc94a699f9a95e65c3e684 08-Jun-2011 James Dong <jdong@google.com> Add B frame support for MPEG4Writer

o requires the support of negative ctts duration values (ctts version 1)

Change-Id: Ib14130c9359c3bff3c76f20a7380d468a065dcaf
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
cc5278a3e258b30903102b718fb1cd832e79bb2b 10-Jun-2011 tedbo <tedbo@google.com> Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.

This adds support for setting a SurfaceTexture as the MediaPlayer video
sink by using a ParcelSurfaceTexture object. The goal is to enable a
SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then
be set on the MediaPlayer.

Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
8aec83eb15a94b8027bbe7b6358cdf2468fd2b5c 11-Jun-2011 James Dong <jdong@google.com> Merge "Avoid duplicated code calculating the stts sample duration"
4bb506afeb40b24a41cfbc4f34032310f432985c 10-Jun-2011 Dianne Hackborn <hackbod@google.com> am 15e9d474: am 88748e6d: am d86302df: Quiet the log.

* commit '15e9d474d1033adbedc8632309df26c3d6dfaee3':
Quiet the log.
a7ea9f935e961fb0e6042453d09c7a170a63b56f 07-Jun-2011 James Dong <jdong@google.com> Avoid duplicated code calculating the stts sample duration

o This also speeds up the MediaRecorder.stop() call.
o Also fix incorrect start time compensation in stts box

Change-Id: I6392b8b980e0f786ddeeec0fe2c341de67208c6f
ibstagefright/MPEG4Writer.cpp
be674b18644cda56ba56a78ac7147711861e8dc8 10-Jun-2011 James Dong <jdong@google.com> Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition"
d24f94989fe5e78b82af261727d3c2ba11639772 10-Jun-2011 James Dong <jdong@google.com> Merge "Correctly handle crop rect event in SoftAVC.cpp"
c8841e2ef42276ab0bd1e8fea85c2da6ccc44e8b 10-Jun-2011 Andreas Huber <andih@google.com> Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it."
15e9d474d1033adbedc8632309df26c3d6dfaee3 10-Jun-2011 Dianne Hackborn <hackbod@google.com> am 88748e6d: am d86302df: Quiet the log.

* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
Quiet the log.
6b6091a14032c02ce2ba5600a651166ac0102290 10-Jun-2011 Marco Nelissen <marcone@google.com> am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds

* commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac':
Make sure we don't read from invalid fds
88748e6dc0151916f6bd19ffde8ba96fe8fd0a87 10-Jun-2011 Dianne Hackborn <hackbod@google.com> am d86302df: Quiet the log.

* commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867':
Quiet the log.
d86302df0eb5eb013f7521137eabdbfea4a3a867 10-Jun-2011 Dianne Hackborn <hackbod@google.com> Quiet the log.

Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
ibmedia/MediaScanner.cpp
a81fcadb9694e359d0c405e80cf3f2ef13ac06ea 10-Jun-2011 James Dong <jdong@google.com> Fix an issue in MPEG4Writer where the write of outstanding chunks in the last batch was missing

Change-Id: I93c9f6ae7ed098cdf828b2b11a9273c9e0c244e3
ibstagefright/MPEG4Writer.cpp
a65610a04cbb1594d0141a0797ebb8b777ce3a21 10-Jun-2011 James Dong <jdong@google.com> Merge "Add timestamp and data pointer checks in CameraSource"
dc03da0444803983aef4988475f2d5dcdf0283e9 09-Jun-2011 James Dong <jdong@google.com> am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2

* commit '2488a94350e0c0b088da2646557c9a0f3a0e9847':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
e668c0b69896996040f394e0a95f71dd4b9c6257 09-Jun-2011 Conley Owens <cco3@android.com> am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

* commit '644f36eab4eb9911ad897c9caae68b9c5a72388f':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
644f36eab4eb9911ad897c9caae68b9c5a72388f 09-Jun-2011 Conley Owens <cco3@android.com> am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"

* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
2488a94350e0c0b088da2646557c9a0f3a0e9847 09-Jun-2011 James Dong <jdong@google.com> am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2

* commit 'e3b80c838753fe8c9049950216c6379098465810':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
e3b80c838753fe8c9049950216c6379098465810 09-Jun-2011 James Dong <jdong@google.com> Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac 09-Jun-2011 Marco Nelissen <marcone@google.com> am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds

* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
Make sure we don't read from invalid fds
3731e1bdf697831a2d5e2f357bc1a24eef326c89 09-Jun-2011 James Dong <jdong@google.com> Correctly handle crop rect event in SoftAVC.cpp

Width and height of the video frame was incorrectly overwritten when a cropping need was detected. Using a separate
crop width and crop height resolves the problem.

Change-Id: I8a371c7fe7f8417a7995d7a7fe231120274ea0c8
related-to-bug: 4575591
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.h
d8b027b18f5a922ef729c6ee363eecb053358d47 09-Jun-2011 Conley Owens <cco3@android.com> Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f 09-Jun-2011 Marco Nelissen <marcone@google.com> am a02d9bf9: Make sure we don\'t read from invalid fds

* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
Make sure we don't read from invalid fds
a02d9bf9c3ff22cd449da21ff7c23170488ebd8e 09-Jun-2011 Marco Nelissen <marcone@google.com> Make sure we don't read from invalid fds

b/4580570

Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
ibstagefright/HTTPStream.cpp
fddf5d9f48d0864a30fcc2706616f6aa6cb06c61 08-Jun-2011 Andreas Huber <andih@google.com> Make dumpsys(media.player) more useful by having AwesomePlayer populate it.

Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
762b6d001af7c12864c2366f3487bd79d47d5dec 08-Jun-2011 Andreas Huber <andih@google.com> This device-specific workaround is no longer necessary.

We can now enable yuv->yuv blitting instead of converting to RGB565.

Change-Id: Ia6a94b706f20a0c9e6ef78a7325cff4f5bb216b8
related-to-bug: 4394005
ibstagefright/colorconversion/Android.mk
ibstagefright/colorconversion/SoftwareRenderer.cpp
7d6143a9f01418e84db285b0202d8b1657bb6e8e 08-Jun-2011 James Dong <jdong@google.com> Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition

This can potentially save lot of memory for video recording use case since the video encoder
can advertise a much smaller size of the input buffers which are allocated by SF by default.

Change-Id: I582a356cd02c7852e13f2713d90ad5f1eb43177d
ibstagefright/OMXCodec.cpp
aa48835ce9a84d9d587d7a4b10ee6ea7c00e00ec 08-Jun-2011 Mike Lockwood <lockwood@android.com> MTP: Remove obsolete setPtpMode support

PTP mode will be implemented as a separate USB function instead.

Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpServer.java
ni/android_mtp_MtpServer.cpp
d1d17b165139681dc66c000fdfe9e14fb1bc35c0 07-Jun-2011 Yu Shan Emily Lau <yslau@google.com> Cleaned up the old test cases and test media files.

Change-Id: Icc3c04c69b11b2bb91588a8bb916baf69594e8d3
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
7c37c1cf37a423db732000a007b196327627ea1c 07-Jun-2011 Kristian Monsen <kristianm@google.com> Merge chromium to r11.0.672.0: Compile fix

Cause by upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924

Change-Id: Iada1639b7a38cee963644437e8e3f4f5708d6136
ibstagefright/chromium_http/support.cpp
ibstagefright/chromium_http/support.h
6564c3c6abe25915f550e558bf681e0524722735 07-Jun-2011 James Dong <jdong@google.com> Merge "Fix the comment for the location box @xyz"
a093ca9c736fdbb58bb24636326370e257379add 06-Jun-2011 Glenn Kasten <gkasten@google.com> Merge "Remove dead code related to gettid"
5ca271efe9c0e81c964ed654337acc93f88e0ed2 06-Jun-2011 Marco Nelissen <marcone@google.com> Merge "Add WebP Mime-Type support in Android Media File"
d4c6a5be8068101870be473b4842f0ad9b87c598 04-Jun-2011 James Dong <jdong@google.com> Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"
b571a7a05338ef2c909917da9b53ddc4f4383f66 04-Jun-2011 James Dong <jdong@google.com> Merge "Initial-checkin for ON2 Software AVC/H264 decoder"
86f8b98e763b34e6a74e81bc9faa3a875c16e18c 04-Jun-2011 James Dong <jdong@google.com> Add timestamp and data pointer checks in CameraSource

Change-Id: I99e188f631df2257813aa7ec657d6ecfc8859d9e
ibstagefright/CameraSource.cpp
0741f0054d18b76dac79867fb2262b056125053e 04-Jun-2011 James Dong <jdong@google.com> Fix the comment for the location box @xyz

Change-Id: I5347e346eef40a8ba90e7a3fa786b4654d18606b
ibstagefright/MPEG4Writer.cpp
6af763bec7c3f4d50fee8dd0046409bb8a7fe8f6 05-May-2011 Glenn Kasten <gkasten@google.com> Remove dead code related to gettid

The gettid system call is always available now.

Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
ibmedia/AudioSystem.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/JetPlayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MidiFile.cpp
38c07129c42222a764d784327d0a63f4cfc1331b 03-Jun-2011 James Dong <jdong@google.com> Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h

Change-Id: I5cbc7246a63301fa7ff735fa3d6512e940608d2b
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/colorconversion/ColorConverter.cpp
bd24eb5507497c02484a353043f64868850633b2 02-Jun-2011 Andreas Huber <andih@google.com> Merge "Don't advertise the (old-style) software decoders unless they're actually present."
2541c5af179bc9e02ad5160ab773c53ff4086611 02-Jun-2011 Andreas Huber <andih@google.com> Don't advertise the (old-style) software decoders unless they're actually present.

Change-Id: I3753a21e1a7de86432c9c087be9d52028e3a1e1b
ibstagefright/OMXCodec.cpp
bebc99d6fa433c04139294a5057f8439d772dbd9 01-Jun-2011 James Dong <jdong@google.com> Initial-checkin for ON2 Software AVC/H264 decoder

o when neon is present, the performance gain of On2 AVC software decoder
over PV software decoder is more than 30%.

o In addition, it fixes some known PV software decoder issues like missing
output frames

o allow both pv and on2 software avc to be available for easy comparision

o change output frames from 8 to 16

Change-Id: I567ad1842025ead7092f0c47e3513d6d9ca232dd
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/on2/h264dec/Android.mk
ibstagefright/codecs/on2/h264dec/SoftAVC.cpp
ibstagefright/codecs/on2/h264dec/SoftAVC.h
ibstagefright/codecs/on2/h264dec/inc/H264SwDecApi.h
ibstagefright/codecs/on2/h264dec/inc/basetype.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/ARM_DELIVERY.TXT
ibstagefright/codecs/on2/h264dec/omxdl/arm11/ARM_MANIFEST.TXT
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_BitDec_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCTTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCT_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_MaskTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_Version.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/omxtypes.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/api/omxtypes_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/arm11/filelist_vc.txt
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_IDCTTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_MaskTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/armVCCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/omxVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/omxVC_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_Copy16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_Copy8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DequantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_QuantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Clip8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm11/vc/src/armVC_Version.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/ARM_DELIVERY.TXT
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/ARM_MANIFEST.TXT
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_BitDec_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCTTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCT_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_MaskTable.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Version.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/filelist_vc.txt
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_IDCTTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_MaskTable.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/armVCCOMM_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC_s.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DequantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_QuantTables_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingChroma_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingLuma_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Align_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Copy_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_QuantTables_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_TransformResidual4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_UnpackBlock4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DeblockLuma_I.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_InterpolateLuma_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Clip8_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
ibstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/src/armVC_Version.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/ARM_DELIVERY.TXT
ibstagefright/codecs/on2/h264dec/omxdl/reference/ARM_MANIFEST.TXT
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM_Bitstream.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM_Version.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/armOMX.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/api/omxtypes.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/build_vc.pl
ibstagefright/codecs/on2/h264dec/omxdl/reference/filelist_vc.txt
ibstagefright/codecs/on2/h264dec/omxdl/reference/src/armCOMM.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/src/armCOMM_Bitstream.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/api/armVC.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/api/omxVC.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_Average.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_SAD.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock_SAD.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ExpandFrame_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_LimitMVToRect.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/api/armVCM4P10_CAVLCTables.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CAVLCTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CompareMotionCostToMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DeBlockPixel.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DequantTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_FwdTransformResidual4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfDiag_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfHor_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfVer_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Chroma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_PredictIntraDC4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_QuantTables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_SADQuar.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_TransformResidual4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock2x2.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_Average_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Half.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Integer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Quarter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_GetVLCInfo.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfHor_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfVer_Luma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateLuma.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_ChromaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_LumaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformResidualAndAdd.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEGetBufSize.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEInit.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MotionEstimationMB.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_16x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_8x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SAD_4x.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SATD_4x4.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SubAndTransformQDQResidual.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_ChromaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_LumaDC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_DCT_Table.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_ACDCPredict.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Half.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Integer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CheckVLCEscapeMode.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CompareMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DCT_Table.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_EncodeVLCZigzag_intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLCBuffer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLDBuffer.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_GetVLCBits.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_PutVLCBits.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_SetPredDir.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_16x16.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_8x8.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DCT8x8blk.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeMV.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_Inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraACVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraDCVLC.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_FindMVpred.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_IDCT8x8blk.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MCReconBlock.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEGetBufSize.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEInit.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MotionEstimationMB.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInter_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantIntra_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvInter_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_inter.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_intra.c
ibstagefright/codecs/on2/h264dec/omxdl/reference/vc/src/armVC_Version.c
ibstagefright/codecs/on2/h264dec/source/DecTestBench.c
ibstagefright/codecs/on2/h264dec/source/EvaluationTestBench.c
ibstagefright/codecs/on2/h264dec/source/H264SwDecApi.c
ibstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor_ver.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_ver.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_half.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_quarter.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_ver_quarter.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_mid_hor.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_half.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_quarter.s
ibstagefright/codecs/on2/h264dec/source/arm11_asm/win_asm.bat
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdClearMbLayer.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdCountLeadingZeros.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdFillRow7.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdFlushBits.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdWriteMacroblock.s
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/asm_common.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdClearMbLayer.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdCountLeadingZeros.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFillRow7.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFlushBits.S
ibstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdWriteMacroblock.S
ibstagefright/codecs/on2/h264dec/source/h264bsd_byte_stream.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_byte_stream.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_cavlc.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_cavlc.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_cfg.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_conceal.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_conceal.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_container.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_deblocking.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_deblocking.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_decoder.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_dpb.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_dpb.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_image.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_image.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_inter_prediction.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_inter_prediction.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_macroblock_layer.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_macroblock_layer.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_nal_unit.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_nal_unit.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_neighbour.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_neighbour.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_pic_order_cnt.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_pic_order_cnt.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_pic_param_set.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_pic_param_set.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_reconstruct.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_reconstruct.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_sei.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_sei.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_seq_param_set.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_seq_param_set.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_data.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_data.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_group_map.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_group_map.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_header.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_slice_header.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_storage.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_storage.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_stream.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_stream.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_transform.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_transform.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_util.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_util.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_vlc.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_vlc.h
ibstagefright/codecs/on2/h264dec/source/h264bsd_vui.c
ibstagefright/codecs/on2/h264dec/source/h264bsd_vui.h
ibstagefright/omx/SoftOMXPlugin.cpp
d0881d95e2d4eceab37288f88f43f771e08eab65 02-Jun-2011 Vikas Arora <vikasa@google.com> Add WebP Mime-Type support in Android Media File

Change-Id: Ifaa64c8fc55d1f1ad14db3057821696b565e0c26
ava/android/media/MediaFile.java
6c2cb3061d031b5d8ccc095ecc038959d4489709 02-Jun-2011 James Dong <jdong@google.com> Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based"
443287068bec5ca73b76a08e499da6f0de3b670a 02-Jun-2011 James Dong <jdong@google.com> Do not call getEstimatedBandwidth if the streaming is not HTTP-based

Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/include/NuCachedSource2.h
8e97372913c9236ffdee175c6da99dc00c22b3e1 02-Jun-2011 Andreas Huber <andih@google.com> am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.

* commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
d3092e31570aa3a5ac3c190ff352ad584e0d56b7 02-Jun-2011 Glenn Kasten <gkasten@google.com> Merge "Remove unnecessary level of priority indirection"
993fccec5bd0355835f0457064a28c2c13eecc60 02-Jun-2011 Glenn Kasten <gkasten@google.com> Remove unnecessary level of priority indirection

Change-Id: I942d43973c20a7ace8b0d3f78b4da97e45e996c6
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
fa22e625896d0b1e0d02fce52fbdd88f2e11482d 02-Jun-2011 Yu Shan Emily Lau <yslau@google.com> Convert the video editor performance
test suite output from float to int.

Change-Id: I62fada18a4c34d06b8d0ed91885e5bd98f12523f
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java
8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d 26-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.

Change-Id: Iaee1821257a25a5257d93c9f5ba3976748cad619
related-to-bug: 3362836, 4439092
ibstagefright/HTTPStream.cpp
e46a86fcb6a0849fc05c4cade6cb94aad0325295 02-Jun-2011 Glenn Kasten <gkasten@google.com> Revert "Use AudioTrack::event_type not int in callback"

This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ibmedia/ToneGenerator.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/AudioPlayer.cpp
2225e4b7049fa3fb9d39a068b8268b63c952d7c1 05-May-2011 Glenn Kasten <gkasten@google.com> Use AudioTrack::event_type not int in callback

Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ibmedia/ToneGenerator.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/AudioPlayer.cpp
d0bbdb02b2c56b0227d82751a29ccd99d11ea12f 01-Jun-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Use channel mask instead of channel count for track creation"
5439223b5633679edcc255651e7062046004d75d 25-May-2011 Jean-Michel Trivi <jmtrivi@google.com> Use channel mask instead of channel count for track creation

Record and playback objects (resp AudioRecord and AudioTrack)
are created using a channel mask, but this information is lost
in the mixer because only the channel count is known to
AudioFlinger. A channel count can always be derived from a
channel mask.

The change consists in:
- disambiguiting variable names for channel masks and counts
- passing the mask information from the client to AudioFlinger
and the mixer.
- when using the DIRECT ouput, only verifying the format of
the track is compatible with the output's for PCM.

Change-Id: I50d87bfb7d7afcabdf5f12d4ab75ef3a54132c0e
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmediaplayerservice/MediaPlayerService.cpp
7c2cb0c58369d28610d72f5aba61c7898f492891 01-Jun-2011 James Dong <jdong@google.com> Merge "Send estimated bandwidth value as informational event when cache fetcher pauses"
a9d0febdd0f0502ec4f29f77b742e11ceae8a30e 26-May-2011 James Dong <jdong@google.com> Send estimated bandwidth value as informational event when cache fetcher pauses

o Application can make informed decision about the available network bandwidth
when cache fetcher pauses.

o Application can also adjust how frequently the bandwidth is estimated within
a range from one second to one minute.

Change-Id: I90068001343e79da1886de03c565537787e1580b
ibstagefright/AwesomePlayer.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/ChromiumHTTPDataSource.h
ibstagefright/include/HTTPBase.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/NuHTTPDataSource.h
c51e224b0ab40280e6022bd8c9c1cf1a255ab3b9 31-May-2011 James Dong <jdong@google.com> Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)"
8f18cf55747b8ab138661a841cbb1b2bd19f3d97 28-May-2011 Eric Laurent <elaurent@google.com> Removed interface to load audio effects libraries

Removed unused functions allowing dynamic loading of audio effects libraries
from effects factory API.

Change-Id: I06cc5a51dc10aca87c7a8687bbb874babd711eca
ibeffects/factory/EffectsFactory.c
ibmedia/AudioEffect.cpp
ibmedia/IAudioFlinger.cpp
c32c0093a4f1d9fd66c92690547edd722035c6f8 28-May-2011 Eric Laurent <elaurent@google.com> Merge "New effect library API"
0fb66c2b83084a16989afaf949d0101cb6505398 18-May-2011 Eric Laurent <elaurent@google.com> New effect library API

Moved and renamed media/EffectApi.h to hardware/audio_effect.h
Modified the effect library API to expose a library info structure
containing an interface functions table.
Also removed enums for audio channels, audio format and devices
from effect API and use values from system/audio.h instead.

Modified effects factory to support new library interface format and
load libraries and efffects listed in audio_effects.conf file.
The file audio_effects.conf is first loaded from /vendor/etc and
then from /system/etc/audio_effects.conf if not found.

Modified existing effect libraries to implement the new library interface.

Change-Id: Ie52351e071b6d352fa2fbc06c3846686f8c45df9
ibeffects/data/audio_effects.conf
ibeffects/factory/EffectsFactory.c
ibeffects/factory/EffectsFactory.h
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/testlibs/Android.mk_
ibeffects/testlibs/AudioFormatAdapter.h
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/testlibs/EffectReverb.h
ibeffects/visualizer/EffectVisualizer.cpp
22bf7a7ea768c2cdadc5faf643aba70aebafc0d5 26-May-2011 James Dong <jdong@google.com> Add some comment to MediaRecorder.stop() about the stop() failure (-1007)

o The intended failure happens if stop() call comes immediately after start() call
before any media data from the output of the encoder is received.

Change-Id: I62fad123ac67e2f566ba555e84c0c3faf2adfd99
ava/android/media/MediaRecorder.java
18773812cf84ac312ce9ff4c944084fafa23cdbd 27-May-2011 Huahui Wu <hwu@google.com> Merge "b/4452171 Dumping video playbacks to files."
03edf6b36469a504bd17a5010c788c8d4e44085c 26-May-2011 James Dong <jdong@google.com> Merge "Extract embedded cover art (aka poster frame) in mp4 files"
0be123918ed9711214b0f2e3106fdb7de0bcff13 26-May-2011 James Dong <jdong@google.com> am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
Revert "Use pread() to get the decrypted data for container based DRM file."
e8b26dcec7765786bbf063b3ae6b967b8b547ab6 26-May-2011 James Dong <jdong@google.com> Extract embedded cover art (aka poster frame) in mp4 files

Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
ava/android/media/MediaMetadataRetriever.java
ibstagefright/MPEG4Extractor.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
73a4b2b3be14255f87c4108d4e414b9137da6510 26-May-2011 Andreas Huber <andih@google.com> Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
98472cced0a66318a89ffe485bbebb80034f12be 26-May-2011 Gloria Wang <gwang@google.com> Merge "For out of band timed text support (timed text in a separate file)."
13bc8cde1c842bea1fa3000a48739a6e22f25a9c 11-May-2011 Gloria Wang <gwang@google.com> For out of band timed text support (timed text in a separate file).

Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
ava/android/media/MediaPlayer.java
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/TimedTextPlayer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/TimedTextPlayer.h
ibstagefright/timedtext/Android.mk
ibstagefright/timedtext/TimedTextParser.cpp
ibstagefright/timedtext/TimedTextParser.h
ibstagefright/timedtext/TimedTextPlayer.cpp
ibstagefright/timedtext/TimedTextPlayer.h
6662576d8faff84b4f68eb9b96df42b5826471f2 26-May-2011 Eric Laurent <elaurent@google.com> Merge "Issue 4364098: bluetooth SCO not working"
b06ac839dd2d0437fc8314f6deb7233af5af521e 26-May-2011 Eric Laurent <elaurent@google.com> Issue 4364098: bluetooth SCO not working

AudioService does not need to unconditionally stop virtual calls
when the audio mode is changed from normal. Only stop virtual calls
that have been started from AudioService.

Change-Id: I75992d3655661e5910536a62dc8a8e0256d835e8
ava/android/media/AudioService.java
eb2f9c193d74c005a0c78e6dbed874809d55fc81 19-May-2011 Andreas Huber <andih@google.com> Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.

Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/ACodec.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/avc_utils.cpp
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/include/MP3Extractor.h
ibstagefright/include/avc_utils.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
ibstagefright/rtsp/APacketSource.cpp
c004a0c925ea2c9c48bbf9670d2ebf96f432c90a 25-May-2011 James Dong <jdong@google.com> am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

* commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8':
Revert "Use pread() to get the decrypted data for container based DRM file."
05e13b9edd3ef6edb286ddc2d92bebecf6666bf8 25-May-2011 James Dong <jdong@google.com> am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
Revert "Use pread() to get the decrypted data for container based DRM file."
1b9b34adf704c2c059ca439ace0c0b67c8c272f3 25-May-2011 James Dong <jdong@google.com> Merge "Convert line breaks to Unix style"
64a23430f989f74afb766375ce8ea2601d34c4bc 25-May-2011 James Dong <jdong@google.com> Revert "Use pread() to get the decrypted data for container based DRM file."

This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09.
ibstagefright/NuHTTPDataSource.cpp
4ece6db47ec33ed439ae2177fbc0cc3e7e79cdca 25-May-2011 Kristian Monsen <kristianm@google.com> Merge "Merge chromium to 10.0.634.0: Compile fix"
dc03c61fe3cd8d0805480e48a974986439977a60 01-Apr-2011 Eric Laurent <elaurent@google.com> Bluetooth SCO audio API improvements.

The AudioManager API to control bluetooth SCO did not provide an easy way for
applications to handle SCO connection errors. When a request to activate SCO with
AudioManager.startBluetoothSco() failed, no state change was indicated via
AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED intent. The application had to
implement a timeout to handle connection failures.

The API change consists in defining a new intent AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED
and deprecate AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED. The new intent
will broacast a new state CONNECTING when the SCO connection is initiated.
The application can monitor changes from CONNECTING to either CONNECTED or DISCONNECTED
states to detect connection success or failure.
An extra indicating the previous state is also added to the new intent.

Also improved BluetoothHeadset service management in AudioService. A disconnection
from the service is not considered as a device or SCO link disconnection. Instead, if the
service interface is not present when a request to activate SCO is received, an
attempt is made to reconnect to the service.

Change-Id: I005fda1caaf74bb7de64fece44e9c7e628e828db
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
31d2cd2474013a9d7de5ca6ed3e888cf68592e28 25-May-2011 Kristian Monsen <kristianm@google.com> Merge chromium to 10.0.634.0: Compile fix

base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/6028009

Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd
ibstagefright/chromium_http/support.cpp
70fbd15af92bb2e76564c6cf5e08448a9415da99 25-May-2011 Andreas Huber <andih@google.com> Merge "Make sure all references to the decoder plugin are accounted for"
1b50fe2952f7deea23a0b75adedd10fa310bb9bf 25-May-2011 Andreas Huber <andih@google.com> Merge "Make sure the software mpeg4 decoder supports multiple input frames per input buffer"
54802de06cfd336c9232a5647b3310fef33d4d81 25-May-2011 Andreas Huber <andih@google.com> Make sure all references to the decoder plugin are accounted for

before calling dlunload().

Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de
related-to-bug: 4466387
ibstagefright/include/SimpleSoftOMXComponent.h
ibstagefright/include/SoftOMXComponent.h
ibstagefright/omx/SimpleSoftOMXComponent.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
60a3cb81c0123446093810bc8cbef6bc1fe37aa3 24-May-2011 Andreas Huber <andih@google.com> Make sure the software mpeg4 decoder supports multiple input frames per input buffer

to enable faster throughput in ACodec.

Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
4b4e3a0b216d146a78b2e2e5ab9593846e805bce 24-May-2011 Jeffrey Tinker <jtinker@google.com> am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2

* commit 'c41a17de2b2e80f246adeef4962073916dcfff0b':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
2646219aaac42913f9ee6c07b04140b0e6475bc0 24-May-2011 James Dong <jdong@google.com> resolved conflicts for merge of d5762583 to master

Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
c41a17de2b2e80f246adeef4962073916dcfff0b 24-May-2011 Jeffrey Tinker <jtinker@google.com> am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2

* commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa 24-May-2011 Jeffrey Tinker <jtinker@google.com> am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2

* commit 'ef89cc14957ab631346564801841190346632ac9':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
ef89cc14957ab631346564801841190346632ac9 24-May-2011 Jeffrey Tinker <jtinker@google.com> Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2
ea0bad0574451212591841ba84f477ecc216003a 19-May-2011 Huahui Wu <hwu@google.com> b/4452171 Dumping video playbacks to files.

MediaDump: a tool app to dump video playback into raw files and
a viewer to display the dumped files.

Change-Id: I7bf116e38bb1f9e85d5a1680ae92b5b72bc10ea8
ests/MediaDump/Android.mk
ests/MediaDump/AndroidManifest.xml
ests/MediaDump/res/layout/main.xml
ests/MediaDump/res/values/strings.xml
ests/MediaDump/src/com/android/mediadump/MediaDump.java
ests/MediaDump/src/com/android/mediadump/RgbPlayerActivity.java
ests/MediaDump/src/com/android/mediadump/VideoDumpActivity.java
ests/MediaDump/src/com/android/mediadump/VideoDumpView.java
8264641c983d5dc680598bc90312d73dda45b6c3 22-May-2011 Jeffrey Tinker <jtinker@google.com> Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038

Fix for b/4198446 HC - Support for Widevine Adaptive VOD

Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
ibstagefright/WVMExtractor.cpp
ibstagefright/include/WVMExtractor.h
d5762583bd1eb37da6c09461e8b2453c83a600a6 23-May-2011 James Dong <jdong@google.com> am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().

* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
Add some logging to track down where ANR happens during MediaPlayer._release().
ebae1923869ee71ab119f766ac01c5a320619290 23-May-2011 James Dong <jdong@google.com> am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().

* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
Add some logging to track down where ANR happens during MediaPlayer._release().
a5293d1ca4459293f4993ea39c09ea703a022844 20-May-2011 James Dong <jdong@google.com> Add some logging to track down where ANR happens during MediaPlayer._release().

o add a log message in AwesomePlayer::reset before acquiring the lock

Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
219e2627f1e062c10645664b0d2470d4dfaf5083 22-Apr-2011 Mans Rullgard <mans@mansr.com> Convert line breaks to Unix style

Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
ibstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
ibstagefright/codecs/aacenc/basic_op/basic_op.h
ibstagefright/codecs/aacenc/basic_op/basicop2.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.h
ibstagefright/codecs/aacenc/basic_op/typedef.h
ibstagefright/codecs/aacenc/basic_op/typedefs.h
ibstagefright/codecs/aacenc/inc/aac_rom.h
ibstagefright/codecs/aacenc/inc/aacenc_core.h
ibstagefright/codecs/aacenc/inc/adj_thr.h
ibstagefright/codecs/aacenc/inc/adj_thr_data.h
ibstagefright/codecs/aacenc/inc/band_nrg.h
ibstagefright/codecs/aacenc/inc/bit_cnt.h
ibstagefright/codecs/aacenc/inc/bitbuffer.h
ibstagefright/codecs/aacenc/inc/bitenc.h
ibstagefright/codecs/aacenc/inc/block_switch.h
ibstagefright/codecs/aacenc/inc/channel_map.h
ibstagefright/codecs/aacenc/inc/config.h
ibstagefright/codecs/aacenc/inc/dyn_bits.h
ibstagefright/codecs/aacenc/inc/grp_data.h
ibstagefright/codecs/aacenc/inc/interface.h
ibstagefright/codecs/aacenc/inc/line_pe.h
ibstagefright/codecs/aacenc/inc/memalign.h
ibstagefright/codecs/aacenc/inc/ms_stereo.h
ibstagefright/codecs/aacenc/inc/pre_echo_control.h
ibstagefright/codecs/aacenc/inc/psy_configuration.h
ibstagefright/codecs/aacenc/inc/psy_const.h
ibstagefright/codecs/aacenc/inc/psy_data.h
ibstagefright/codecs/aacenc/inc/psy_main.h
ibstagefright/codecs/aacenc/inc/qc_data.h
ibstagefright/codecs/aacenc/inc/qc_main.h
ibstagefright/codecs/aacenc/inc/quantize.h
ibstagefright/codecs/aacenc/inc/sf_estim.h
ibstagefright/codecs/aacenc/inc/spreading.h
ibstagefright/codecs/aacenc/inc/stat_bits.h
ibstagefright/codecs/aacenc/inc/tns.h
ibstagefright/codecs/aacenc/inc/tns_func.h
ibstagefright/codecs/aacenc/inc/tns_param.h
ibstagefright/codecs/aacenc/inc/transform.h
ibstagefright/codecs/aacenc/src/aac_rom.c
ibstagefright/codecs/aacenc/src/aacenc.c
ibstagefright/codecs/aacenc/src/aacenc_core.c
ibstagefright/codecs/aacenc/src/adj_thr.c
ibstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
ibstagefright/codecs/aacenc/src/band_nrg.c
ibstagefright/codecs/aacenc/src/bit_cnt.c
ibstagefright/codecs/aacenc/src/bitbuffer.c
ibstagefright/codecs/aacenc/src/bitenc.c
ibstagefright/codecs/aacenc/src/block_switch.c
ibstagefright/codecs/aacenc/src/channel_map.c
ibstagefright/codecs/aacenc/src/dyn_bits.c
ibstagefright/codecs/aacenc/src/grp_data.c
ibstagefright/codecs/aacenc/src/interface.c
ibstagefright/codecs/aacenc/src/line_pe.c
ibstagefright/codecs/aacenc/src/ms_stereo.c
ibstagefright/codecs/aacenc/src/pre_echo_control.c
ibstagefright/codecs/aacenc/src/psy_configuration.c
ibstagefright/codecs/aacenc/src/psy_main.c
ibstagefright/codecs/aacenc/src/qc_main.c
ibstagefright/codecs/aacenc/src/quantize.c
ibstagefright/codecs/aacenc/src/sf_estim.c
ibstagefright/codecs/aacenc/src/spreading.c
ibstagefright/codecs/aacenc/src/stat_bits.c
ibstagefright/codecs/aacenc/src/tns.c
ibstagefright/codecs/aacenc/src/transform.c
ibstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
ibstagefright/codecs/amrwbenc/inc/acelp.h
ibstagefright/codecs/amrwbenc/inc/basic_op.h
ibstagefright/codecs/amrwbenc/inc/bits.h
ibstagefright/codecs/amrwbenc/inc/cnst.h
ibstagefright/codecs/amrwbenc/inc/cod_main.h
ibstagefright/codecs/amrwbenc/inc/dtx.h
ibstagefright/codecs/amrwbenc/inc/grid100.tab
ibstagefright/codecs/amrwbenc/inc/ham_wind.tab
ibstagefright/codecs/amrwbenc/inc/homing.tab
ibstagefright/codecs/amrwbenc/inc/isp_isf.tab
ibstagefright/codecs/amrwbenc/inc/lag_wind.tab
ibstagefright/codecs/amrwbenc/inc/log2.h
ibstagefright/codecs/amrwbenc/inc/log2_tab.h
ibstagefright/codecs/amrwbenc/inc/main.h
ibstagefright/codecs/amrwbenc/inc/math_op.h
ibstagefright/codecs/amrwbenc/inc/mem_align.h
ibstagefright/codecs/amrwbenc/inc/mime_io.tab
ibstagefright/codecs/amrwbenc/inc/oper_32b.h
ibstagefright/codecs/amrwbenc/inc/p_med_o.h
ibstagefright/codecs/amrwbenc/inc/p_med_ol.tab
ibstagefright/codecs/amrwbenc/inc/q_gain2.tab
ibstagefright/codecs/amrwbenc/inc/q_pulse.h
ibstagefright/codecs/amrwbenc/inc/qisf_ns.tab
ibstagefright/codecs/amrwbenc/inc/qpisf_2s.tab
ibstagefright/codecs/amrwbenc/inc/stream.h
ibstagefright/codecs/amrwbenc/inc/typedef.h
ibstagefright/codecs/amrwbenc/inc/typedefs.h
ibstagefright/codecs/amrwbenc/inc/wb_vad.h
ibstagefright/codecs/amrwbenc/inc/wb_vad_c.h
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
ibstagefright/codecs/amrwbenc/src/autocorr.c
ibstagefright/codecs/amrwbenc/src/az_isp.c
ibstagefright/codecs/amrwbenc/src/bits.c
ibstagefright/codecs/amrwbenc/src/c2t64fx.c
ibstagefright/codecs/amrwbenc/src/c4t64fx.c
ibstagefright/codecs/amrwbenc/src/cmnMemory.c
ibstagefright/codecs/amrwbenc/src/convolve.c
ibstagefright/codecs/amrwbenc/src/cor_h_x.c
ibstagefright/codecs/amrwbenc/src/decim54.c
ibstagefright/codecs/amrwbenc/src/deemph.c
ibstagefright/codecs/amrwbenc/src/dtx.c
ibstagefright/codecs/amrwbenc/src/g_pitch.c
ibstagefright/codecs/amrwbenc/src/gpclip.c
ibstagefright/codecs/amrwbenc/src/homing.c
ibstagefright/codecs/amrwbenc/src/hp400.c
ibstagefright/codecs/amrwbenc/src/hp50.c
ibstagefright/codecs/amrwbenc/src/hp6k.c
ibstagefright/codecs/amrwbenc/src/hp_wsp.c
ibstagefright/codecs/amrwbenc/src/int_lpc.c
ibstagefright/codecs/amrwbenc/src/isp_az.c
ibstagefright/codecs/amrwbenc/src/isp_isf.c
ibstagefright/codecs/amrwbenc/src/lag_wind.c
ibstagefright/codecs/amrwbenc/src/levinson.c
ibstagefright/codecs/amrwbenc/src/log2.c
ibstagefright/codecs/amrwbenc/src/lp_dec2.c
ibstagefright/codecs/amrwbenc/src/math_op.c
ibstagefright/codecs/amrwbenc/src/oper_32b.c
ibstagefright/codecs/amrwbenc/src/p_med_ol.c
ibstagefright/codecs/amrwbenc/src/pit_shrp.c
ibstagefright/codecs/amrwbenc/src/pitch_f4.c
ibstagefright/codecs/amrwbenc/src/pred_lt4.c
ibstagefright/codecs/amrwbenc/src/preemph.c
ibstagefright/codecs/amrwbenc/src/q_gain2.c
ibstagefright/codecs/amrwbenc/src/q_pulse.c
ibstagefright/codecs/amrwbenc/src/qisf_ns.c
ibstagefright/codecs/amrwbenc/src/qpisf_2s.c
ibstagefright/codecs/amrwbenc/src/random.c
ibstagefright/codecs/amrwbenc/src/residu.c
ibstagefright/codecs/amrwbenc/src/scale.c
ibstagefright/codecs/amrwbenc/src/stream.c
ibstagefright/codecs/amrwbenc/src/syn_filt.c
ibstagefright/codecs/amrwbenc/src/updt_tar.c
ibstagefright/codecs/amrwbenc/src/util.c
ibstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
ibstagefright/codecs/amrwbenc/src/voicefac.c
ibstagefright/codecs/amrwbenc/src/wb_vad.c
ibstagefright/codecs/amrwbenc/src/weight_a.c
ibstagefright/codecs/common/Config.mk
ibstagefright/codecs/common/cmnMemory.c
ibstagefright/codecs/common/include/cmnMemory.h
ibstagefright/codecs/common/include/voAAC.h
ibstagefright/codecs/common/include/voAMRWB.h
ibstagefright/codecs/common/include/voAudio.h
ibstagefright/codecs/common/include/voIndex.h
ibstagefright/codecs/common/include/voType.h
850ae9acda0d062f9a1836d159bdce819e0f8066 21-May-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4184736 unhide MediaPlayer.setTexture"
24ff7fae02f5aac80c60f72b0e001c218565a316 20-May-2011 Gloria Wang <gwang@google.com> am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

* commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
4d8ceada09441f43a98f5c7dadde9192e7d6abf9 20-May-2011 Gloria Wang <gwang@google.com> am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
dbfd055d51b51b7a6f412155c2391666efbb638a 20-May-2011 Gloria Wang <gwang@google.com> am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.

* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
a6f1104b9d829c636b60b9387e379f9667b5df09 20-May-2011 Gloria Wang <gwang@google.com> Use pread() to get the decrypted data for container based DRM file.
For bug 4392094.

Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
ibstagefright/NuHTTPDataSource.cpp
56031fb1de9bb349a4009c42012d6b88793212ba 20-May-2011 Kristian Monsen <kristianm@google.com> Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"
817c161ef27b6087c496755768d65fcb4f78f04c 13-Apr-2011 Glenn Kasten <gkasten@google.com> Bug 4184736 unhide MediaPlayer.setTexture

Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
ava/android/media/MediaPlayer.java
cd454fa91e9e856bfa5dd161f8e1b4b9a9729eae 19-May-2011 James Dong <jdong@google.com> Revert "Add avg bandwidth estimate every 2 seconds - do not merge."

This reverts commit ec78f551b575b0274cbe796f8e08a9df1a706680.
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/NuHTTPDataSource.h
3c707256cf238354524a9cac2b539259328bb035 19-May-2011 James Dong <jdong@google.com> Merge "Publish setLocation() method as a public Java API"
612956c914e4dccf7438c0fa13621798fc9ce4fa 19-May-2011 Gloria Wang <gwang@google.com> Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463059."
f9cf277cda5d7cdf8383331892cca0734a850e19 19-May-2011 Gloria Wang <gwang@google.com> Add one more MIME type (audio/aac-adts) for aac file.
Fix for bug 4463059.

Change-Id: Ie2125349667e65b41871a228d87e4dce6b513398
ava/android/media/MediaFile.java
ba43d4282c82e55b5a5c01771f028e6266dbc781 19-May-2011 James Dong <jdong@google.com> resolved conflicts for merge of a8939e0d to master

Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
a8939e0d48c9bdda2e3dcb1b8c55aa23e8b78b40 19-May-2011 James Dong <jdong@google.com> am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2

* commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
Using widevine:// to stream adaptive bitrate wvm content no longer
380244e9d6c8016bc1a04691a3af0fd999ddf6b0 19-May-2011 James Dong <jdong@google.com> am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2

* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
Using widevine:// to stream adaptive bitrate wvm content no longer
d148a499c27145e0473f89ece0500ebed38f875f 19-May-2011 James Dong <jdong@google.com> Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
af3131fe2e20c7b5e080d098a3b6847c5414bcae 18-May-2011 James Dong <jdong@google.com> Publish setLocation() method as a public Java API

related-to-bug: 4260295

Change-Id: I91b923af8549127eb08f0d7e535cd53ad229e1f6
ava/android/media/MediaRecorder.java
9516aee4c1b116e7c9d227a894f257a6b782880a 18-May-2011 Andreas Huber <andih@google.com> Merge "Properly forward rotation information from input format to output format."
0920bca3ab01d9d47dde3e188d9bb05673cd90f9 18-May-2011 Andreas Huber <andih@google.com> Properly forward rotation information from input format to output format.

The software renderer would otherwise never rotate videos as it only has access to
the decoder's output format.

Change-Id: If893c0c23d0e85a3d9d4eb94390a114af5514b1c
ibstagefright/OMXCodec.cpp
8d161fe1eafe80e01d84d2be55ae47314f944721 18-May-2011 Gloria Wang <gwang@google.com> am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
fa1e5561cc65b932067919fcd5d39fda7032793e 18-May-2011 Mike Lockwood <lockwood@android.com> am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2

* commit '53b988ba1842f40e595bb85f2ca055c24787e6dc':
StorageVolume: Add getStorageId() accessor
5a6c3d491ccac07ef3f6a624a8a3e0c36959b661 18-May-2011 Gloria Wang <gwang@google.com> am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

* commit '07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
07e9267d33bb199d0a2b8de221c64541bdf2465a 18-May-2011 Gloria Wang <gwang@google.com> Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
3a8221c0ffd4309a9179cc777b15b2558a07bc4e 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Properly negate all values

Initially, input values -32768 weren't negated properly.

This was committed on the master branch of the opencore
repository in commit f532d145194e474cb30d8644b8eee83873ad24cc,
based on AOSP contribution 10906.

Change-Id: I903353c5539a8fe94b7fc5f26b95eaeac57df5f4
ibstagefright/codecs/amrnb/enc/src/set_sign.cpp
69c2edfaf71f5494ab7a3caf26e8ab782d49781d 17-May-2011 Martin Storsjo <martin@martin.st> stagefright amrnb: Fix a bug on architectures where long is 64 bit

Initially, this code gave a warning "comparison is always
false due to limited range of data type" if long was 64 bit.
Additionally, the output from the AMR encoder was mostly noise.

This was committed on the master branch of the opencore
repository in commit f532d145194e474cb30d8644b8eee83873ad24cc,
based on AOSP contribution 10904.

Change-Id: I822dcc74beeae548d3032ffda759de9c8cd1fcfe
ibstagefright/codecs/amrnb/common/src/az_lsp.cpp
f84e4a657f2f8b5af085bb9694f1fca837d7cd1f 18-May-2011 James Dong <jdong@google.com> Revert "Add const to the finders method in MetaData.cpp"

This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e.

Conflicts:

include/media/stagefright/MPEG4Writer.h

Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
ibstagefright/MPEG4Writer.cpp
ibstagefright/MetaData.cpp
53b988ba1842f40e595bb85f2ca055c24787e6dc 18-May-2011 Mike Lockwood <lockwood@android.com> am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2

* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
StorageVolume: Add getStorageId() accessor
5a79cfd7518defdce1911cecbc2441bb0a057e54 18-May-2011 Mike Lockwood <lockwood@android.com> am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2

* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
StorageVolume: Add getStorageId() accessor
fbfe55512596fd00c1fb51caa851e17dae60fd43 17-May-2011 Mike Lockwood <lockwood@android.com> StorageVolume: Add getStorageId() accessor

This ID is used for MTP as well as per volume querying in the media provider.

Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpStorage.java
0f32fb3ecfdfaa03acf880a356629d43da3fe2fe 14-May-2011 James Dong <jdong@google.com> Make track informational event optional, depending on system property

o also add a track informational event to return the encoded data in kilo-bytes

Change-Id: I7c383360d57048c8a3606d0b8141ba53e4f4b224
ava/android/media/MediaRecorder.java
ibstagefright/MPEG4Writer.cpp
c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42 17-May-2011 Andreas Huber <andih@google.com> am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2

* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
bf81d4be0514265875d7deffe50c31a344f6eac5 17-May-2011 Andreas Huber <andih@google.com> am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2

* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
c56e81c88706d79ce51a314b5bfd3e247ca6f86c 17-May-2011 Andreas Huber <andih@google.com> Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
708d908668b4c3d0ac2493dfc06385dfd8693dc9 17-May-2011 Andreas Huber <andih@google.com> Claim support for .3gpp2 A/B files.

Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8
related-to-bug: 4406745
ibstagefright/MPEG4Extractor.cpp
126a2cd6862630205b0ceb47e109475022fe1d7e 17-May-2011 Andreas Huber <andih@google.com> Disable yuv->yuv mode and external display support until various driver fixes are in.

Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
ibstagefright/colorconversion/Android.mk
ibstagefright/colorconversion/SoftwareRenderer.cpp
d6577a722a09e7a6da0cd6acc1f9c36514d5352c 17-May-2011 Andreas Huber <andih@google.com> Merge "Instead of using an RGB surface and conversion yuv420->rgb565"
e6f3f54e05ac773cacd146a9cc69d758d031271a 16-May-2011 Mike Lockwood <lockwood@android.com> resolved conflicts for merge of b107f4de to master

Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
f97ed771979162c4a2a75959c57fb793438a3a8b 16-May-2011 Dianne Hackborn <hackbod@google.com> am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2

* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
DO NOT MERGE. Integrate from master: Rework display size access.
d90a2c4d4463085155444efb07eba2d6579b444a 16-May-2011 Dianne Hackborn <hackbod@google.com> am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2

* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
DO NOT MERGE. Integrate from master: Rework display size access.
1e662c3294b740ff694ad98e4d9a366e1e4b5e62 16-May-2011 Dianne Hackborn <hackbod@google.com> Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
b107f4dec334b4c54584d4af21a7ceefc14947f2 16-May-2011 Mike Lockwood <lockwood@android.com> am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2

* commit 'e23639e0386735df50ad208078f638c38f662d42':
MTP: Have GetStorageInfo command return correct storage type for removable storage
fc4a3d37ef044b35450800235195401c4a54c712 16-May-2011 Mike Lockwood <lockwood@android.com> am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2

* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
StorageManager: Clean up and generalize storage configuration resources
e23639e0386735df50ad208078f638c38f662d42 16-May-2011 Mike Lockwood <lockwood@android.com> am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2

* commit '15afd076d6070374cbb4f9dcbe28dda67caa0718':
MTP: Have GetStorageInfo command return correct storage type for removable storage
b822d2464dc59056f736b0c49f0ac514c7cbb9d9 16-May-2011 Mike Lockwood <lockwood@android.com> am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2

* commit '0a93d875527c52183080b63a0b19d567856952af':
StorageManager: Clean up and generalize storage configuration resources
ac8dea12c17aa047e03a358110aeb60401d36aa2 21-Apr-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. Integrate from master: Rework display size access.

Applications now get the display size from the window manager. No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
ava/android/mtp/MtpDatabase.java
51690544aaeee82b1c50232cd57d50038b77f0c4 10-May-2011 Mike Lockwood <lockwood@android.com> MTP: Have GetStorageInfo command return correct storage type for removable storage

Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpStorage.java
ni/android_mtp_MtpServer.cpp
tp/MtpStorage.cpp
tp/MtpStorage.h
2f6a3885533a52758c2cd4f81f6123a712be8ae6 10-May-2011 Mike Lockwood <lockwood@android.com> StorageManager: Clean up and generalize storage configuration resources

Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.

Add android.os.storage.StorageVolume class

StorageManager.getVolumeList() now returns an array of StorageVolume

Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
9f4b95b92e4805a34570dcccd2210f7839c7bb3a 16-May-2011 Andreas Huber <andih@google.com> Merge "Fix module tags on stagefright software decoders."
6521ec7b9177dd4e8175a604c67aa75b4de893aa 16-May-2011 Andreas Huber <andih@google.com> Fix module tags on stagefright software decoders.

Change-Id: I8b3f60760e1e8eaa0f66eb6c7ce3df8e425638fb
related-to-bug: 4427361
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/amrnb/dec/Android.mk
ibstagefright/codecs/avc/dec/Android.mk
ibstagefright/codecs/g711/dec/Android.mk
ibstagefright/codecs/m4v_h263/dec/Android.mk
ibstagefright/codecs/mp3dec/Android.mk
ibstagefright/codecs/on2/dec/Android.mk
ibstagefright/codecs/vorbis/dec/Android.mk
13a33169b71f447e7dbb3e67bcf5c47f3cce8cce 10-May-2011 James Dong <jdong@google.com> Support platform and camera dependent recording start time offset

related-to-bug: 4390777

Change-Id: Icb52973ad4ac716f04fb103ef527915a966d06d5
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/MPEG4Writer.cpp
bfb6791934dae9888dc017f1057f5b9cf12f35d2 14-May-2011 James Dong <jdong@google.com> Merge "Add support for platform-specific recording start time offset"
987ab4833ecbafbdf750eb1b04e43693433c4783 12-May-2011 James Dong <jdong@google.com> Support for storing geo information in the recorded mp4/3gpp file.

o Geo data (latitude and longitude) is stored in udta box

Change-Id: I76e4aeb741c4b339f3753d3d28190151f3ea4919
related-to-bug: 4260295
ava/android/media/MediaRecorder.java
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/MPEG4Writer.cpp
331de5dd58b2115968d9fd2a9ce21a45db309d37 13-May-2011 Gloria Wang <gwang@google.com> DO NOT MERGE
For bug 4422428
Squashed commit of the following:

commit ae2e13783db2284f40d3891e70e152dab941edfc
Author: Gloria Wang <gwang@google.com>
Date: Fri May 13 11:43:11 2011 -0700

Add one more DRM error code. For bug 4422428.

Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6

commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2
Author: Gloria Wang <gwang@google.com>
Date: Fri Apr 29 10:44:46 2011 -0700

Add DRM errors in the DRM frameworks to MediaErrors also.
For bug 4350156.

Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394

Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
d295296a96f3e1057dc94d131f59977db910f1a5 13-May-2011 James Dong <jdong@google.com> Track id really starts with 1, not 0

Change-Id: I55dcfdc2dc2a64285dfa93024f7b885210cc827e
ibstagefright/MPEG4Writer.cpp
5694907e7f6717537abedfac15efc86824a75f1a 13-May-2011 Kristian Monsen <kristianm@google.com> Merge Chromium at 10.0.621.0: Fixes for libstagefreight

URLRequest is now a member of the net namespace.
HttpCache constructor has a new argument, which is a CertVerifier()

Change-Id: I21d524938868b2e37993838f4fbb8447b02c3606
ibstagefright/chromium_http/support.cpp
ibstagefright/chromium_http/support.h
34bb419e5946ab28112e9e27a4d1b3928d31e0e2 11-May-2011 Dima Zavin <dima@android.com> update for new audio.h header location

Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
ni/android_media_MediaRecorder.cpp
ni/soundpool/SoundPool.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioPolicyService.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
dbbb28d7193b98252cdd020dc6f7a994b517a123 12-May-2011 Andreas Huber <andih@google.com> Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."
0a6f09e4451a5ffc627be69df93d94cbe438c64d 12-May-2011 Andreas Huber <andih@google.com> A fix to the MPEG4Extractor to support 16-bit sample sizes.

Change-Id: Ic531f1ff0dd171f6f14aaad56aacbf3952a3aeae
ibstagefright/SampleTable.cpp
93c612e2e74c587e2056bab1826ea28c82a61c51 11-May-2011 Andreas Huber <andih@google.com> The decoder wrapper is no longer needed. Also disable building old-style decoders.

Change-Id: Ie022f1a6dffe619c1b0385aa13f63e097282cfe4
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/DecoderWrapper.cpp
ibmediaplayerservice/nuplayer/DecoderWrapper.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibstagefright/Android.mk
e4ba346f0f1bb153ec1f9da5c0a4fc96c301efda 12-May-2011 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
f605a5aae5856d0c6114f36659ff9e8c5f3b5c19 12-May-2011 James Dong <jdong@google.com> Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)"
e4e7b48e33fbdfc00f184c18c50e9f3d6335c5ac 12-May-2011 Andreas Huber <andih@google.com> Fix setDataSource(Context, Uri, Map<String,String> headers)

must not throw an exception if headers == null.

Change-Id: Ic8ddac597707129693874222fb2ebc5a84b8fff6
ava/android/media/MediaPlayer.java
4b3913a3e43d3180b21d77cc2f717b446350354f 11-May-2011 Andreas Huber <andih@google.com> Squashed commit of the following:

commit c80992e419ed567abef451042f09c4958534b90d
Author: Andreas Huber <andih@google.com>
Date: Wed May 11 14:00:07 2011 -0700

Support for the mp3 audio decoder as a software OMX component.

Change-Id: I66e10c4d0be4c3aecdef1c21b15a2c7359ceb807

commit a358d0e1bf2a88897887445f42ccdda0f5f2f528
Author: Andreas Huber <andih@google.com>
Date: Wed May 11 13:11:23 2011 -0700

Support for G.711 alaw and mulaw decoders as software OMX components

Change-Id: Ia5c76c02cb83a9f94ce39a27b2251e5880218f03

commit 79088b9c9a5c8b8c97ea66cb4f90a2b0f0d34553
Author: Andreas Huber <andih@google.com>
Date: Thu May 5 15:43:32 2011 -0700

Instead of using an RGB surface and conversion yuv420->rgb565

convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead.

Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5
related-to-bug: 4394005

commit 69469d3bd84425777b11b9fc938c5e0c61af26a7
Author: Andreas Huber <andih@google.com>
Date: Tue May 10 15:46:42 2011 -0700

voip mustn't link against libstagefright.so

Change-Id: I4d0ba9a8b9dc9380b792a1bd04bcda231964862c

commit 2a9a9eeeeeb36ae3a9e680469c3016d509ff08c3
Author: Andreas Huber <andih@google.com>
Date: Tue May 10 14:37:10 2011 -0700

Remove most non-OMX software decoders by default

Change-Id: Ic56514bc1b56b8fa952e8c4a164ea7379ecb69d0

commit a4de62c37b335c318217765403a9fb282b20a216
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 16:50:02 2011 -0700

Conditionally build the old-style software decoders.

Change-Id: I5de609e1d76c92d26d6eb81d1551462258f3f15f

commit 5d8b039f9449dc3dad1e77c42c80cc0b54b0c846
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 16:13:12 2011 -0700

Support for MPEG4 and H.263 video decoders as soft OMX components.

Change-Id: I5e3a4835afab89f98e3aa128d013628f5830eafe

commit b25a1bfbeb0ff6e62e1cc694ce2599c91489c7d0
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 11:49:10 2011 -0700

Boost Soft OMX thread priority, fix timestamp handling in vorbis Soft OMX decoder.

Change-Id: I68d26d4999f06fcc451d69e5303663fab0cba9e8

commit c0574362f8dc3319ce84d981097867062a698527
Author: Andreas Huber <andih@google.com>
Date: Mon May 9 11:28:53 2011 -0700

Support for the AMR decoders (NB and WB) as Soft OMX components.

Change-Id: Ia565f59833fb52653e23f26536e7e41fc329a754

commit 3e5575a8f0e27a490cb7bde77bd9456087837f08
Author: Andreas Huber <andih@google.com>
Date: Wed May 4 13:41:25 2011 -0700

Signal an error if the aac decoder failed to initialize from codec specific data.

Change-Id: I01da7831bdf722edd7d6dc5974486daa2cf2b209
related-to-bug: 4272179

commit f94aeaa9886e772ff4823e671ed237096649f4af
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 13:07:38 2011 -0700

Software OMX nodes don't (yet?) support native_window mode.

Change-Id: I7d9ca9164ef4abf66b573ca21dba12d672f8b12d

commit eefdfabac8dc659e00daa56da69aea705c49cb67
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 12:57:16 2011 -0700

Fixing the OMX tests to refer to appropriate files from test content.

Change-Id: I5b61c3498749bfb876abbd3946a5132356e3f6ff

commit f31b7326aef14b6a1b7946520a9688f092e844d5
Author: Andreas Huber <andih@google.com>
Date: Tue May 3 11:08:38 2011 -0700

Soft OMX components are now dynamiclly loaded/unloaded, not directly linked against.

Change-Id: I1e2ecfbfab67a8869886f738eaf0c7b3c948b6d9

commit b7f0343879e4df06f0a1c9bfece24df557954e2f
Author: Andreas Huber <andih@google.com>
Date: Mon May 2 15:58:36 2011 -0700

Support for the AVC software decoder as an OMX component.

Change-Id: I13c12df435ba4afbd968a9fc659f66b91c818bc2

commit 5bb9e616d6c8e1b13d531fe996b9a9affdfb2977
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:05:37 2011 -0700

Fix Vorbis OMX decoder's component role.

Change-Id: I5e871e5e11b3f951c93590210e63fd7987c467b5

commit 089c91f2333062e196c7afd5fb0ca914878aa474
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:05:18 2011 -0700

Support vorbis_decoder OMX testing.

Change-Id: I1985be178a12ae3f8768bc72067d9236238be170

commit 56e241fa36fc37219bc536b823bdc2ab82dc1fad
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 12:01:46 2011 -0700

SoftVorbis OMX component now respects the number of valid frames per page.

Change-Id: I82a117a064d9b083fc58a54ad900a987a763ef03

commit fcd618ec520c376fdb78f4cbb44b8d9f5d213e2b
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 10:59:38 2011 -0700

Support for the vorbis audio decoder as a soft OMX component.

Change-Id: Iaeb057e58ca306d3dce205c0445b74d5aefef492

commit d1fcc3203fc8003ad79c6e96b3a1fc4261743f16
Author: Andreas Huber <andih@google.com>
Date: Fri Apr 29 10:07:50 2011 -0700

VPX decoder now properly resizes buffers after a port settings change.

Change-Id: I110749a31b6cba087891d8e5dfe420830bdbf831

commit 35c7168243cb69849d88911144a2c7fdfed5c54e
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 13:23:34 2011 -0700

Support for the VPX video decoder as a Software OMX component.

Change-Id: Ic345add2d6d768d4af631160153f2e9b97fcea71

commit 923b2534b4211fc5405377b5190bfa6f2dd27f32
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 11:34:40 2011 -0700

Table-based registration of soft omx components.

Change-Id: I7f45f0fa5b3a7950776e69c66349731f7674e937

commit 04a88f3edb2266a463da9c4481b80178be460902
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 28 11:22:31 2011 -0700

Apparently OMX_GetParameter is valid in any state other than OMX_StateInvalid

OMX_SetParameter is still constrained to OMX_StateLoaded or a disabled port.

Change-Id: I1032d7cf4011982d306aa369d4158a82830d26fb

commit 9d70ca68445e7c40f5c9b2d12466e468f514de88
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 27 15:03:18 2011 -0700

Use the new soft OMX aac decoder for HTTP live playback.

Change-Id: Ifbcfb732a9edb855cb46b49f6d0ac942170ee28f

commit 213fe4a10ea93cce08e8622dc3908053f29878a1
Author: Andreas Huber <andih@google.com>
Date: Tue Apr 12 16:39:45 2011 -0700

Foundation for supporting software decoders as OMX components

Change-Id: I7fdab256563b35d1d090617abaea9a26b198d816

Change-Id: I83e9236beed4af985d10333c203f065df9e09a42
ibstagefright/ACodec.cpp
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/aacdec/SoftAAC.cpp
ibstagefright/codecs/aacdec/SoftAAC.h
ibstagefright/codecs/amrnb/dec/Android.mk
ibstagefright/codecs/amrnb/dec/SoftAMR.cpp
ibstagefright/codecs/amrnb/dec/SoftAMR.h
ibstagefright/codecs/amrwb/AMRWBDecoder.cpp
ibstagefright/codecs/amrwb/src/mime_io.cpp
ibstagefright/codecs/amrwb/src/pvamrwbdecoder.h
ibstagefright/codecs/avc/dec/Android.mk
ibstagefright/codecs/avc/dec/SoftAVC.cpp
ibstagefright/codecs/avc/dec/SoftAVC.h
ibstagefright/codecs/g711/dec/Android.mk
ibstagefright/codecs/g711/dec/SoftG711.cpp
ibstagefright/codecs/g711/dec/SoftG711.h
ibstagefright/codecs/m4v_h263/dec/Android.mk
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
ibstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
ibstagefright/codecs/mp3dec/Android.mk
ibstagefright/codecs/mp3dec/SoftMP3.cpp
ibstagefright/codecs/mp3dec/SoftMP3.h
ibstagefright/codecs/on2/dec/Android.mk
ibstagefright/codecs/on2/dec/SoftVPX.cpp
ibstagefright/codecs/on2/dec/SoftVPX.h
ibstagefright/codecs/vorbis/dec/Android.mk
ibstagefright/codecs/vorbis/dec/SoftVorbis.cpp
ibstagefright/codecs/vorbis/dec/SoftVorbis.h
ibstagefright/include/SimpleSoftOMXComponent.h
ibstagefright/include/SoftOMXComponent.h
ibstagefright/omx/Android.mk
ibstagefright/omx/OMXMaster.cpp
ibstagefright/omx/OMXMaster.h
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/OMXPVCodecsPlugin.cpp
ibstagefright/omx/OMXPVCodecsPlugin.h
ibstagefright/omx/SimpleSoftOMXComponent.cpp
ibstagefright/omx/SoftOMXComponent.cpp
ibstagefright/omx/SoftOMXPlugin.cpp
ibstagefright/omx/SoftOMXPlugin.h
ibstagefright/omx/tests/OMXHarness.cpp
9e836a7d2e4bb04a9c85dcb6b1f0cef50d5fd2e1 11-May-2011 James Dong <jdong@google.com> Expose the track informational event for testing

Change-Id: I0f12d62d4a36dde76823f7f39e075184c1916504
ava/android/media/MediaRecorder.java
4fbb31383004417b9e059ed9f51eb92c81c2773b 11-May-2011 Andreas Huber <andih@google.com> Merge "Leave the number of output buffers up to surface flinger and friends."
45179fae8dbf76154b817d667aa07c81e496d91a 11-May-2011 Andreas Huber <andih@google.com> Leave the number of output buffers up to surface flinger and friends.

Change-Id: Iebb90f45793793aeb08d1cf9706e29a7cefae792
ibstagefright/colorconversion/SoftwareRenderer.cpp
f5c9995dddd8f8fb83890673c33af1873b111c76 11-May-2011 Andreas Huber <andih@google.com> Make sure the ogg extractor returns appropriate error codes.

Change-Id: I36cbf58aa6fa9195e1cc052f91e1183f57069d03
ibstagefright/OggExtractor.cpp
77d8dc2b95701ea73cdcba261a88ed02c191f2cd 21-Apr-2011 Andreas Huber <andih@google.com> Using widevine:// to stream adaptive bitrate wvm content no longer

uses stagefright's http cache but defers caching to the WVMExtractor, which
now has the responsibility of reporting buffer status/duration.

Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2
related-to-bug: 4390283
ibstagefright/AwesomePlayer.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/WVMExtractor.h
5fd43e30516e490edb11ae3ad0795f069811dd7d 10-May-2011 Andreas Huber <andih@google.com> Properly honour any pending seek request when reading the first buffer after

starting the audio player.

Change-Id: Ibedc1804a8c444e4d0f5be4eb87b22ed5d2c367d
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
a403a938e9308b47f470815e49a33a7060abc69b 10-May-2011 James Dong <jdong@google.com> Add support for platform-specific recording start time offset

o This start time offset is used in the media framework to eliminate
the recording sound in the recorded file.

Change-Id: I97926a74f0743b8a4f985d51334e8d1486a318ea
related-to-bug: 4390777
ibmedia/MediaProfiles.cpp
3aea037dd8c47fd5906b0d8409da7e7243fcb7d4 06-May-2011 James Dong <jdong@google.com> Add send session recording summary report to application

Change-Id: I9c63ddae432f0c93486c39776ed0a058a8649602
ibstagefright/MPEG4Writer.cpp
78fed171d9d62b25aa846d7373a7040e3fd2241e 09-May-2011 James Dong <jdong@google.com> Add const to the finders method in MetaData.cpp

o also fixed the MPEG4Writer writeFtypBox() to take a const pointer to MetaData

Change-Id: Iaecdbe6aeab345f6dc72aac0d19f9704b6e0d28a
ibstagefright/MPEG4Writer.cpp
ibstagefright/MetaData.cpp
ed742306b3d24ba1c2ca3fea0cc2ada8534a18b0 06-May-2011 James Dong <jdong@google.com> Add end of recording summary track info

Change-Id: I2fcf589e70db225776ef7c8d0f28505ceb824c45
related-to-bug: 1854633
ibstagefright/MPEG4Writer.cpp
7a6cea40b256cfd2e903a1c13daa5698ae7ce348 07-May-2011 James Dong <jdong@google.com> Refactor MPEG4Writer::writeTrackHeader() method

o most of the mp4 file boxes has its own method now
TODO: remove some of the duplicated code for esds box, for instance.

Change-Id: Iae3dbb2410b79bc79aaee081b80569d339993c47
ibstagefright/MPEG4Writer.cpp
158e3582c03ab9e0221718da20fc8854bb9216d0 09-May-2011 The Android Automerger <android-build@android.com> Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
256764c92fbb0d8f2b868307b6c68a75ef4d0481 06-May-2011 Scott Main <smain@google.com> am 9603fdee: am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1

* commit '9603fdeecdf5417041aa68cc61a0373f33b74daa':
docs: add package description for mtp and a little more info to MtpDevice
9603fdeecdf5417041aa68cc61a0373f33b74daa 06-May-2011 Scott Main <smain@google.com> am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1

* commit '0d560d454b88d52a3b48cbc3c3be27e563b7f098':
docs: add package description for mtp and a little more info to MtpDevice
0d560d454b88d52a3b48cbc3c3be27e563b7f098 06-May-2011 Scott Main <smain@google.com> am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1

* commit '9f7054fea28e65ae1bf8bc1114090306979ba657':
docs: add package description for mtp and a little more info to MtpDevice
0cdd9f7def708a71a0d0722361f52c0416370dc6 06-May-2011 Scott Main <smain@google.com> docs: add package description for mtp and a little more info to MtpDevice

Change-Id: I44b3926c4a286f624de525a7f0cc896879582bf5
ava/android/mtp/MtpDevice.java
ava/android/mtp/package.html
bf0420ccd613dd5bfa47bc121e0cd09d17a68451 06-May-2011 Andreas Huber <andih@google.com> Merge "Color conversion now supports YUV420p->RGB565 conversion even if the width is odd."
07309bc0f0d7d5cb01106406308e69da49135a08 06-May-2011 Andreas Huber <andih@google.com> Instead of using an RGB surface and conversion yuv420->rgb565

convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead.

Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5
related-to-bug: 4394005
ibstagefright/colorconversion/SoftwareRenderer.cpp
a161af9d1e2baa3f23e32634ef7dd9b4bbce9a6c 06-May-2011 Andreas Huber <andih@google.com> Color conversion now supports YUV420p->RGB565 conversion even if the width is odd.

Change-Id: I1ef3ead94eab3811ead8830e104a9dad211ae3fd
related-to-bug: 4363071
ibstagefright/colorconversion/ColorConverter.cpp
79f407cc6c5ae34fc6f04d52fd034b49d1f002c4 05-May-2011 James Dong <jdong@google.com> Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI

Change-Id: Ib847213f566dee79126d7c14d00750a9a8dedeb9
ni/Android.mk
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_Utils.cpp
ni/android_media_Utils.h
17524dc0d296146c8ffb3f692dc8ab05fee5b1e0 04-May-2011 James Dong <jdong@google.com> Clean up JNI code

o Move the Set/Map/Iterator calls from JNI to Java
o The JNI function receives arrays instead of Maps
o Removed Set/Iterator calls from the Java code as suggested

Change-Id: I34068bf24b61abaf2833dad1f65abc733ed760dd
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
b1071331c01d2e2bcfb434a12da8241ba448fb54 04-May-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2

Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1
related-to-bug: 4381047
ibstagefright/matroska/MatroskaExtractor.cpp
325039ec5ca9edd5fa0b518bb831ae4e2aedfb5d 04-May-2011 James Dong <jdong@google.com> Merge "Initial check-in for AACWriter"
f84bfabe0d5d92956a1ba2896beb0e0d4e1e3106 21-Mar-2011 James Dong <jdong@google.com> Initial check-in for AACWriter

Change-Id: Ia21ca39a404484b2dda25c6101780d2ff11c4623

related-to-bug: 4211046
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/AACWriter.cpp
ibstagefright/Android.mk
ibstagefright/codecs/aacenc/AACEncoder.cpp
19127e716266880d80de70795c89fda692fa3572 04-May-2011 Andreas Huber <andih@google.com> Signal an error if aac decoding fails early.

Change-Id: I8b886a7642aaf83fa008fefb38cb4f92267ca948
related-to-bug: 4272179
ibstagefright/codecs/aacdec/AACDecoder.cpp
c016e0f8ebb414277839358fdc7923033b8ce89e 04-May-2011 Andreas Huber <andih@google.com> Merge "Fix potential memory corruption in NuCachedSource2."
13aa6c2d8a5df99a3a1999a1a89bd8c35c0c48e4 04-May-2011 Andreas Huber <andih@google.com> Fix potential memory corruption in NuCachedSource2.

Change-Id: Ia6bd2d4966287228a3ac1b067ee1f1ccad965dbb
related-to-bug: 4354845
ibstagefright/NuCachedSource2.cpp
65b96059766a12454236712931d66bffb311729c 04-May-2011 Andreas Huber <andih@google.com> Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2

Change-Id: I3dc50e6e447668ac8b8c2956329352635750a2cd
related-to-bug: 4381047
ibstagefright/matroska/MatroskaExtractor.cpp
4f55af7ba6b8c278352b05059976c13a90e75756 04-May-2011 Gloria Wang <gwang@google.com> Merge "Initial CL for the timed text support: - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever"
63de615ddb3cb81bbb5b548693faca971d182a6d 04-May-2011 Mike Lockwood <lockwood@android.com> am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()

* commit '36132a488b2974db9a90da809c2f3eeab99a4427':
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
0faefb72fb8917c9408f7b71c2bac5a9d5f264c2 04-May-2011 Mike Lockwood <lockwood@android.com> am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic

* commit '8b1c74f96f93195326907db1bb07a3787a1c1b45':
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
df8894486c246a8c4e47cc2b3547e9c173225f34 04-May-2011 Mike Lockwood <lockwood@android.com> am a792c804: DO NOT MERGE MTP: Implement GetThumb command

* commit 'a792c804025e25eb8a110d1db63f26bbd09e0e6b':
DO NOT MERGE MTP: Implement GetThumb command
af964a632dafed7d56d1faf0427b9b9056346e20 04-May-2011 Mike Lockwood <lockwood@android.com> am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions

* commit 'af50821bace87aa83c7faba7bf139cfcaccf317a':
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
eeaf48ca8572b2fcb3fe05a22eb6759027924197 04-May-2011 Mike Lockwood <lockwood@android.com> am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files

* commit 'fdb50e6f8eaac31010b64fc79a60dacb5f776613':
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
f6df5b41e145ee996ca4f94bec014ab3e41f0b21 04-May-2011 Mike Lockwood <lockwood@android.com> am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider

* commit 'fb6232635d339c83ca100e472b159f103dafb6e2':
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
863ee40964ef2a017a1116abe37c6b8ad466dd5e 04-May-2011 Marco Nelissen <marcone@google.com> am 7dd59229: DO NOT MERGE Fix media scanner uri handling.

* commit '7dd592298aefb7921afb86ced444d46cb30ac466':
DO NOT MERGE Fix media scanner uri handling.
21c0800f71c75d7bc38ca6dbc69fd8d10f175dcb 04-May-2011 Mike Lockwood <lockwood@android.com> am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:

* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
DO NOT MERGE MTP and media provider support for multiple storage devices:
36132a488b2974db9a90da809c2f3eeab99a4427 03-May-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()

This will prevent MediaProvider from adding these files to the images table

Change-Id: Ice4756b64a067f3aceff08ab2c5e91665109dde5
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
8b1c74f96f93195326907db1bb07a3787a1c1b45 02-May-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic

Don't let the "no media" status of one directory leak to the remaining files
and directories in the same parent.

Bug: 4364077

Change-Id: I2b04b872ece69441387c7fa579441a53f6f358d3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibmedia/MediaScanner.cpp
a792c804025e25eb8a110d1db63f26bbd09e0e6b 25-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MTP: Implement GetThumb command

This allows the PC to access thumbnails in JPEG files over MTP/PTP

Bug: 3219495

Change-Id: I565be1fb84e8a204f2be11342b5b952e8965afdf
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/Android.mk
ni/android_mtp_MtpDatabase.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpServer.h
af50821bace87aa83c7faba7bf139cfcaccf317a 25-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions

Change-Id: Ied2b60e4af5606cb405d048f416e8a7eb3c4d5b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
tp/MtpServer.h
fdb50e6f8eaac31010b64fc79a60dacb5f776613 22-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MTP: Add extended operations to support in-place editing of files

MTP does not support partial writes of files (the entire file must be transferred at once).
This makes it impossible to implement a FUSE file system for MTP
with acceptable performance.
To fix this problem, this change adds extended MTP operations to allow
partial writes to files:

SendPartialObject - allows writing a subset of a file, or appending to the end of a file

TruncateObject - allows changing the size of a file

BeginEditObject - must be called before using SendPartialObject and TruncateObject

EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject

We also add GetPartialObject64, which is the same as GetPartialObject
but has a 64 bit offset rather than 32.

Change-Id: I000930b787b00a2da0b57de9790053b2d71b86fd
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_mtp_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpDebug.cpp
tp/MtpServer.cpp
tp/MtpServer.h
tp/mtp.h
fb6232635d339c83ca100e472b159f103dafb6e2 24-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider

Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.

Bug: 3405327

Change-Id: Ib707f329be98878501952b6054998518a6eabbbd
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerClient.java
ni/android_media_MediaScanner.cpp
ibmedia/MediaScanner.cpp
7dd592298aefb7921afb86ced444d46cb30ac466 29-Mar-2011 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix media scanner uri handling.

If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: Ie589c9b52b436d73e295609d21238b2b3e829502
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
d3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa 05-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MTP and media provider support for multiple storage devices:

- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: I53d501fd4891ebe27408135fb598027e06b7e495
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpDatabase.java
ava/android/mtp/MtpPropertyGroup.java
ava/android/mtp/MtpServer.java
ava/android/mtp/MtpStorage.java
ni/android_mtp_MtpServer.cpp
tp/MtpServer.h
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/mtp.h
c56ad54bd93e34d5e6b90bd4f8090e85896a3bd0 03-May-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()

This will prevent MediaProvider from adding these files to the images table

Change-Id: Ibc4128762f221b370a00e331aca633aafae0ad70
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
71b3342a581e5962aa8f434060b582bef5ce2f46 02-May-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic

Don't let the "no media" status of one directory leak to the remaining files
and directories in the same parent.

Bug: 4364077

Change-Id: Ie756ccd06b1962b06143fc02a1a3927c3aba143a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibmedia/MediaScanner.cpp
710a2064450bee6da14a6bb94b964c2b1eee06d0 25-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MTP: Implement GetThumb command

This allows the PC to access thumbnails in JPEG files over MTP/PTP

Bug: 3219495

Change-Id: Id61f353ba70e896fae9a47338bf7871c0f185d3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/Android.mk
ni/android_mtp_MtpDatabase.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpServer.h
7fc3bebb5e57900d988fe8f681feedae30f81e7d 25-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions

Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
tp/MtpServer.h
371279f8026dc6cf41852cf09f4475d1caf6f589 22-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MTP: Add extended operations to support in-place editing of files

MTP does not support partial writes of files (the entire file must be transferred at once).
This makes it impossible to implement a FUSE file system for MTP
with acceptable performance.
To fix this problem, this change adds extended MTP operations to allow
partial writes to files:

SendPartialObject - allows writing a subset of a file, or appending to the end of a file

TruncateObject - allows changing the size of a file

BeginEditObject - must be called before using SendPartialObject and TruncateObject

EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject

We also add GetPartialObject64, which is the same as GetPartialObject
but has a 64 bit offset rather than 32.

Change-Id: Id5365e1c4dc55a2d819c16c9db0a3ac2260f9309
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_mtp_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpDebug.cpp
tp/MtpServer.cpp
tp/MtpServer.h
tp/mtp.h
9c112a86def2f5e21705b29f906aadcb7fafb067 24-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider

Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.

Bug: 3405327

Change-Id: Ibb37bb2856a0684ce9f685ed565ad35347622834
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerClient.java
ni/android_media_MediaScanner.cpp
ibmedia/MediaScanner.cpp
1cf74fb3c46f107d95a87c7c4ab88c421758f41e 29-Mar-2011 Marco Nelissen <marcone@google.com> DO NOT MERGE Fix media scanner uri handling.

If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: I25652a031b98d2ec2433263dd6f344ba90d2d112
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
7ae938be1b4fb8938f0f438cfd611cd9ed0da513 05-Apr-2011 Mike Lockwood <lockwood@android.com> DO NOT MERGE MTP and media provider support for multiple storage devices:

- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpDatabase.java
ava/android/mtp/MtpPropertyGroup.java
ava/android/mtp/MtpServer.java
ava/android/mtp/MtpStorage.java
ni/android_mtp_MtpServer.cpp
tp/MtpServer.h
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/mtp.h
c6091ddd3a22da98b5e83d4b5d864939b451b752 04-May-2011 Gloria Wang <gwang@google.com> Initial CL for the timed text support:
- Add support for MP4 timed text
- Add API for app to turn on/off a text track
- Add timed text metadata(language) in the MediaMetadataRetriever

Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/TimedTextPlayer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/TimedTextPlayer.h
b2a153adc9860616acdb96d7cdd64494d5a2a0f2 01-May-2011 Iliyan Malchev <malchev@google.com> frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

Change-Id: Idc2eabaa805bb6d308ebb315872623f28d428417
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ade06df0fe3499d66ee5cc29071d41445d1091fa 03-May-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Add special casing of WMP album art files to isNoMediaPath()

This will prevent MediaProvider from adding these files to the images table

Change-Id: I496a108b52a481c78dbf58c4e62996656b1fcbb9
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
214f9db054620357c60db48e48339c647a31597f 02-May-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Fix bug in "no media" handling logic

Don't let the "no media" status of one directory leak to the remaining files
and directories in the same parent.

Bug: 4364077

Change-Id: I30943222dc292818cff00ee8169be7a695eed174
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibmedia/MediaScanner.cpp
efc69d72c9208fe08eefb702f9047cc7242b61b9 30-Apr-2011 Gloria Wang <gwang@google.com> Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"
a1f6a09a86f4acd2147d4f1110eedc6643bbf80b 29-Apr-2011 James Dong <jdong@google.com> am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.

* commit 'f181e416ee3f104e79be2c2a76e9c1c25a214e17':
Add avg bandwidth estimate every 2 seconds - do not merge.
f181e416ee3f104e79be2c2a76e9c1c25a214e17 29-Apr-2011 James Dong <jdong@google.com> am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.

* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
Add avg bandwidth estimate every 2 seconds - do not merge.
f16e1ab0a90b1527a5c859a99f4e1dc39064f3b8 29-Apr-2011 Gloria Wang <gwang@google.com> Add DRM errors in the DRM frameworks to MediaErrors also.
For bug 4350156.

Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
d01ec6eab019e46398975202e9e4a198a603ad99 26-Apr-2011 Gloria Wang <gwang@google.com> Add setParameter/getParameter to MediaPlayer API.
for bug 1982947

Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/TestPlayerStub.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
ests/players/invoke_mock_media_player.cpp
c5505f6a150db8232cc275bedd400f7f5a593530 29-Apr-2011 Conley Owens <cco3@android.com> Merge "Improved conversion accuracy of exif geotag data"
ec78f551b575b0274cbe796f8e08a9df1a706680 28-Apr-2011 James Dong <jdong@google.com> Add avg bandwidth estimate every 2 seconds - do not merge.

This patch is meant for testing only.
We will remove this patch once we tracked down all those spinning issues.

related-to-bug: 4339075

Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/NuHTTPDataSource.h
058520e9eea39d01fc4dd640a15cb85090e30e81 28-Apr-2011 Dima Zavin <dima@android.com> Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73

* changes:
audioflinger: don't do work in constructor, instead do it in onFirstRef
audioflinger: enumerate all the possible audio interfaces
audio/media: convert to using the audio HAL and new audio defs
libmedia: move AudioParameter out of AudioSystem
audioflinger: move legacy audio hw/policy out to libhardware_legacy
e23a392f70b6f5bacbcfc47f0850801e0c590a89 28-Apr-2011 Andreas Huber <andih@google.com> Fix omx_tests to no longer refer to test files that are no longer available.

Also make sure that a seek beyond EOF does not just seek the final syncframe.

Change-Id: I0a58490ef719ce095a94f1d6909c60eb20074a0b
ibstagefright/SampleTable.cpp
ibstagefright/omx/tests/OMXHarness.cpp
24fc2fb1c541e954b83fd31ea9f786a5e9b45501 20-Apr-2011 Dima Zavin <dima@android.com> audio/media: convert to using the audio HAL and new audio defs

Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
ni/android_media_MediaRecorder.cpp
ni/soundpool/SoundPool.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioPolicyService.cpp
ibmedia/JetPlayer.cpp
ibmedia/ToneGenerator.cpp
ibmedia/Visualizer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/AudioPlayer.cpp
ibstagefright/AudioSource.cpp
4dc22e77cfd2a1c3671e5646ee87c5e4c15596a0 20-Apr-2011 Dima Zavin <dima@android.com> libmedia: move AudioParameter out of AudioSystem

Change-Id: I9eb7e002d141936258050d4fa4f0ccd8202bfc54
Signed-off-by: Dima Zavin <dima@android.com>
ibmedia/Android.mk
ibmedia/AudioParameter.cpp
ibmedia/AudioSystem.cpp
a277c4328f1490b69ce1f85214e80017d3593797 26-Apr-2011 James Dong <jdong@google.com> Merge "Give PSP and QuickTime compatible mp4 files a chance to play"
c89f22242b955ae748765b3465b819b40f70ee5f 25-Apr-2011 Mike Lockwood <lockwood@android.com> MTP: Implement GetThumb command

This allows the PC to access thumbnails in JPEG files over MTP/PTP

Bug: 3219495

Change-Id: I4964f8b4826dffb7f0f77464ec91bd2e97a2f007
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/Android.mk
ni/android_mtp_MtpDatabase.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpServer.h
466e3a22db283958a1da71cc60a23ce3976a3659 25-Apr-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix file descriptor leak in file editing extensions"
1003199cb8962688d7530ad802565671b4833299 25-Apr-2011 Mike Lockwood <lockwood@android.com> MTP: Fix file descriptor leak in file editing extensions

Change-Id: I6d0de5efe705d8060bbfd526c6880dc995a3aa30
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
tp/MtpServer.h
a13802d8805c2af2fae4d64e3dee99abd73ecfa9 25-Apr-2011 James Dong <jdong@google.com> Merge "Return status code from invoke()"
997354e4b4a9666cedd62282471e97822affced9 24-Apr-2011 Mike Lockwood <lockwood@android.com> MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider

Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.

Bug: 3405327

Change-Id: I2d7285bd32e06c1a5c4ef6a8a15f8f8b2c33b39b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerClient.java
ni/android_media_MediaScanner.cpp
ibmedia/MediaScanner.cpp
653935da6bfe45301bc362c92d4aa9b4f50277ca 24-Apr-2011 Mike Lockwood <lockwood@android.com> Remove log spam

Change-Id: I3182576158c7c0410c19036a580fd46c6ab079f9
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibstagefright/XINGSeeker.cpp
9eb5d31a68bbf41ebd4144cf71f762c26f558438 20-Apr-2011 Martin Storsjo <martin@martin.st> stagefright aacenc: Mark codeWord as UWord16

Without this, the codeword 0xffff will be expanded to
0xffffffff when passed as a Word32 parameter. All code words
set into this variable are UWord16 initially.

When it was expanded to 0xffffffff, it could accidentally
overwrite earlier cached bits in the bitstream writer.

Change-Id: Id91a2b8a4e934876d9cb39eaeeee323202ec8e40
ibstagefright/codecs/aacenc/src/bit_cnt.c
825e8716a6ddaf9c70767c5f7228d16da73f7573 23-Apr-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Add extended operations to support in-place editing of files"
b21611e5b0f1797e39e781d91ade023bac87637f 05-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc/amrwbenc: Remove trailing whitespace

Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
ibstagefright/codecs/aacenc/SampleCode/Android.mk
ibstagefright/codecs/aacenc/SampleCode/eclair/Makefile
ibstagefright/codecs/aacenc/SampleCode/ms.mk
ibstagefright/codecs/aacenc/Tools/doit.mk
ibstagefright/codecs/aacenc/Tools/eclair.mk
ibstagefright/codecs/aacenc/basic_op/basic_op.h
ibstagefright/codecs/aacenc/basic_op/basicop2.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.h
ibstagefright/codecs/aacenc/basic_op/typedef.h
ibstagefright/codecs/aacenc/basic_op/typedefs.h
ibstagefright/codecs/aacenc/build/eclair/ARMV5E/Makefile
ibstagefright/codecs/aacenc/build/eclair/ARMV7/Makefile
ibstagefright/codecs/aacenc/build/eclair/makefile
ibstagefright/codecs/aacenc/build/ms.mk
ibstagefright/codecs/aacenc/inc/aac_rom.h
ibstagefright/codecs/aacenc/inc/aacenc_core.h
ibstagefright/codecs/aacenc/inc/adj_thr.h
ibstagefright/codecs/aacenc/inc/adj_thr_data.h
ibstagefright/codecs/aacenc/inc/bitenc.h
ibstagefright/codecs/aacenc/inc/interface.h
ibstagefright/codecs/aacenc/inc/line_pe.h
ibstagefright/codecs/aacenc/inc/psy_const.h
ibstagefright/codecs/aacenc/inc/psy_main.h
ibstagefright/codecs/aacenc/inc/qc_main.h
ibstagefright/codecs/aacenc/inc/quantize.h
ibstagefright/codecs/aacenc/inc/sf_estim.h
ibstagefright/codecs/aacenc/inc/stat_bits.h
ibstagefright/codecs/aacenc/inc/tns_param.h
ibstagefright/codecs/aacenc/inc/transform.h
ibstagefright/codecs/aacenc/src/aac_rom.c
ibstagefright/codecs/aacenc/src/aacenc.c
ibstagefright/codecs/aacenc/src/aacenc_core.c
ibstagefright/codecs/aacenc/src/adj_thr.c
ibstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
ibstagefright/codecs/aacenc/src/band_nrg.c
ibstagefright/codecs/aacenc/src/bit_cnt.c
ibstagefright/codecs/aacenc/src/bitbuffer.c
ibstagefright/codecs/aacenc/src/bitenc.c
ibstagefright/codecs/aacenc/src/block_switch.c
ibstagefright/codecs/aacenc/src/channel_map.c
ibstagefright/codecs/aacenc/src/dyn_bits.c
ibstagefright/codecs/aacenc/src/grp_data.c
ibstagefright/codecs/aacenc/src/interface.c
ibstagefright/codecs/aacenc/src/line_pe.c
ibstagefright/codecs/aacenc/src/memalign.c
ibstagefright/codecs/aacenc/src/ms_stereo.c
ibstagefright/codecs/aacenc/src/pre_echo_control.c
ibstagefright/codecs/aacenc/src/psy_configuration.c
ibstagefright/codecs/aacenc/src/psy_main.c
ibstagefright/codecs/aacenc/src/qc_main.c
ibstagefright/codecs/aacenc/src/quantize.c
ibstagefright/codecs/aacenc/src/sf_estim.c
ibstagefright/codecs/aacenc/src/stat_bits.c
ibstagefright/codecs/aacenc/src/tns.c
ibstagefright/codecs/aacenc/src/transform.c
ibstagefright/codecs/amrwbenc/Android.mk
ibstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
ibstagefright/codecs/amrwbenc/SampleCode/Android.mk
ibstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile
ibstagefright/codecs/amrwbenc/SampleCode/ms.mk
ibstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile
ibstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile
ibstagefright/codecs/amrwbenc/build/eclair/makefile
ibstagefright/codecs/amrwbenc/build/eclair/ms.mk
ibstagefright/codecs/amrwbenc/inc/basic_op.h
ibstagefright/codecs/amrwbenc/inc/homing.tab
ibstagefright/codecs/amrwbenc/inc/isp_isf.tab
ibstagefright/codecs/amrwbenc/inc/log2.h
ibstagefright/codecs/amrwbenc/inc/mime_io.tab
ibstagefright/codecs/amrwbenc/inc/stream.h
ibstagefright/codecs/amrwbenc/inc/typedef.h
ibstagefright/codecs/amrwbenc/inc/typedefs.h
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
ibstagefright/codecs/amrwbenc/src/autocorr.c
ibstagefright/codecs/amrwbenc/src/az_isp.c
ibstagefright/codecs/amrwbenc/src/bits.c
ibstagefright/codecs/amrwbenc/src/c2t64fx.c
ibstagefright/codecs/amrwbenc/src/c4t64fx.c
ibstagefright/codecs/amrwbenc/src/convolve.c
ibstagefright/codecs/amrwbenc/src/cor_h_x.c
ibstagefright/codecs/amrwbenc/src/decim54.c
ibstagefright/codecs/amrwbenc/src/deemph.c
ibstagefright/codecs/amrwbenc/src/dtx.c
ibstagefright/codecs/amrwbenc/src/g_pitch.c
ibstagefright/codecs/amrwbenc/src/gpclip.c
ibstagefright/codecs/amrwbenc/src/hp400.c
ibstagefright/codecs/amrwbenc/src/hp50.c
ibstagefright/codecs/amrwbenc/src/hp6k.c
ibstagefright/codecs/amrwbenc/src/hp_wsp.c
ibstagefright/codecs/amrwbenc/src/int_lpc.c
ibstagefright/codecs/amrwbenc/src/isp_az.c
ibstagefright/codecs/amrwbenc/src/isp_isf.c
ibstagefright/codecs/amrwbenc/src/levinson.c
ibstagefright/codecs/amrwbenc/src/log2.c
ibstagefright/codecs/amrwbenc/src/lp_dec2.c
ibstagefright/codecs/amrwbenc/src/math_op.c
ibstagefright/codecs/amrwbenc/src/mem_align.c
ibstagefright/codecs/amrwbenc/src/p_med_ol.c
ibstagefright/codecs/amrwbenc/src/pitch_f4.c
ibstagefright/codecs/amrwbenc/src/pred_lt4.c
ibstagefright/codecs/amrwbenc/src/preemph.c
ibstagefright/codecs/amrwbenc/src/q_gain2.c
ibstagefright/codecs/amrwbenc/src/q_pulse.c
ibstagefright/codecs/amrwbenc/src/qisf_ns.c
ibstagefright/codecs/amrwbenc/src/qpisf_2s.c
ibstagefright/codecs/amrwbenc/src/residu.c
ibstagefright/codecs/amrwbenc/src/scale.c
ibstagefright/codecs/amrwbenc/src/stream.c
ibstagefright/codecs/amrwbenc/src/syn_filt.c
ibstagefright/codecs/amrwbenc/src/updt_tar.c
ibstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
ibstagefright/codecs/amrwbenc/src/voicefac.c
ibstagefright/codecs/amrwbenc/src/wb_vad.c
ibstagefright/codecs/amrwbenc/src/weight_a.c
ibstagefright/codecs/common/Config.mk
ibstagefright/codecs/common/include/voAMRWB.h
ibstagefright/codecs/common/include/voAudio.h
ibstagefright/codecs/common/include/voIndex.h
c290b590dbb5668c85591140032ac3ae860e294a 22-Apr-2011 Mans Rullgard <mans@mansr.com> stagefright aacenc/amrwbenc: Convert line breaks to Unix style

Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
ibstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
ibstagefright/codecs/aacenc/SampleCode/eclair/Makefile
ibstagefright/codecs/aacenc/SampleCode/ms.mk
ibstagefright/codecs/aacenc/basic_op/basic_op.h
ibstagefright/codecs/aacenc/basic_op/basicop2.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.h
ibstagefright/codecs/aacenc/basic_op/typedef.h
ibstagefright/codecs/aacenc/basic_op/typedefs.h
ibstagefright/codecs/aacenc/build/eclair/ARMV5E/Makefile
ibstagefright/codecs/aacenc/build/eclair/ARMV7/Makefile
ibstagefright/codecs/aacenc/build/ms.mk
ibstagefright/codecs/aacenc/inc/aac_rom.h
ibstagefright/codecs/aacenc/inc/aacenc_core.h
ibstagefright/codecs/aacenc/inc/adj_thr.h
ibstagefright/codecs/aacenc/inc/adj_thr_data.h
ibstagefright/codecs/aacenc/inc/band_nrg.h
ibstagefright/codecs/aacenc/inc/bit_cnt.h
ibstagefright/codecs/aacenc/inc/bitbuffer.h
ibstagefright/codecs/aacenc/inc/bitenc.h
ibstagefright/codecs/aacenc/inc/block_switch.h
ibstagefright/codecs/aacenc/inc/channel_map.h
ibstagefright/codecs/aacenc/inc/config.h
ibstagefright/codecs/aacenc/inc/dyn_bits.h
ibstagefright/codecs/aacenc/inc/grp_data.h
ibstagefright/codecs/aacenc/inc/interface.h
ibstagefright/codecs/aacenc/inc/line_pe.h
ibstagefright/codecs/aacenc/inc/memalign.h
ibstagefright/codecs/aacenc/inc/ms_stereo.h
ibstagefright/codecs/aacenc/inc/pre_echo_control.h
ibstagefright/codecs/aacenc/inc/psy_configuration.h
ibstagefright/codecs/aacenc/inc/psy_const.h
ibstagefright/codecs/aacenc/inc/psy_data.h
ibstagefright/codecs/aacenc/inc/psy_main.h
ibstagefright/codecs/aacenc/inc/qc_data.h
ibstagefright/codecs/aacenc/inc/qc_main.h
ibstagefright/codecs/aacenc/inc/quantize.h
ibstagefright/codecs/aacenc/inc/sf_estim.h
ibstagefright/codecs/aacenc/inc/spreading.h
ibstagefright/codecs/aacenc/inc/stat_bits.h
ibstagefright/codecs/aacenc/inc/tns.h
ibstagefright/codecs/aacenc/inc/tns_func.h
ibstagefright/codecs/aacenc/inc/tns_param.h
ibstagefright/codecs/aacenc/inc/transform.h
ibstagefright/codecs/aacenc/src/aac_rom.c
ibstagefright/codecs/aacenc/src/aacenc.c
ibstagefright/codecs/aacenc/src/aacenc_core.c
ibstagefright/codecs/aacenc/src/adj_thr.c
ibstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
ibstagefright/codecs/aacenc/src/band_nrg.c
ibstagefright/codecs/aacenc/src/bit_cnt.c
ibstagefright/codecs/aacenc/src/bitbuffer.c
ibstagefright/codecs/aacenc/src/bitenc.c
ibstagefright/codecs/aacenc/src/block_switch.c
ibstagefright/codecs/aacenc/src/channel_map.c
ibstagefright/codecs/aacenc/src/dyn_bits.c
ibstagefright/codecs/aacenc/src/grp_data.c
ibstagefright/codecs/aacenc/src/interface.c
ibstagefright/codecs/aacenc/src/line_pe.c
ibstagefright/codecs/aacenc/src/ms_stereo.c
ibstagefright/codecs/aacenc/src/pre_echo_control.c
ibstagefright/codecs/aacenc/src/psy_configuration.c
ibstagefright/codecs/aacenc/src/psy_main.c
ibstagefright/codecs/aacenc/src/qc_main.c
ibstagefright/codecs/aacenc/src/quantize.c
ibstagefright/codecs/aacenc/src/sf_estim.c
ibstagefright/codecs/aacenc/src/spreading.c
ibstagefright/codecs/aacenc/src/stat_bits.c
ibstagefright/codecs/aacenc/src/tns.c
ibstagefright/codecs/aacenc/src/transform.c
ibstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
ibstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile
ibstagefright/codecs/amrwbenc/SampleCode/ms.mk
ibstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile
ibstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile
ibstagefright/codecs/amrwbenc/build/eclair/ms.mk
ibstagefright/codecs/amrwbenc/inc/acelp.h
ibstagefright/codecs/amrwbenc/inc/basic_op.h
ibstagefright/codecs/amrwbenc/inc/bits.h
ibstagefright/codecs/amrwbenc/inc/cnst.h
ibstagefright/codecs/amrwbenc/inc/cod_main.h
ibstagefright/codecs/amrwbenc/inc/dtx.h
ibstagefright/codecs/amrwbenc/inc/grid100.tab
ibstagefright/codecs/amrwbenc/inc/ham_wind.tab
ibstagefright/codecs/amrwbenc/inc/homing.tab
ibstagefright/codecs/amrwbenc/inc/isp_isf.tab
ibstagefright/codecs/amrwbenc/inc/lag_wind.tab
ibstagefright/codecs/amrwbenc/inc/log2.h
ibstagefright/codecs/amrwbenc/inc/log2_tab.h
ibstagefright/codecs/amrwbenc/inc/main.h
ibstagefright/codecs/amrwbenc/inc/math_op.h
ibstagefright/codecs/amrwbenc/inc/mem_align.h
ibstagefright/codecs/amrwbenc/inc/mime_io.tab
ibstagefright/codecs/amrwbenc/inc/oper_32b.h
ibstagefright/codecs/amrwbenc/inc/p_med_o.h
ibstagefright/codecs/amrwbenc/inc/p_med_ol.tab
ibstagefright/codecs/amrwbenc/inc/q_gain2.tab
ibstagefright/codecs/amrwbenc/inc/q_pulse.h
ibstagefright/codecs/amrwbenc/inc/qisf_ns.tab
ibstagefright/codecs/amrwbenc/inc/qpisf_2s.tab
ibstagefright/codecs/amrwbenc/inc/stream.h
ibstagefright/codecs/amrwbenc/inc/typedef.h
ibstagefright/codecs/amrwbenc/inc/typedefs.h
ibstagefright/codecs/amrwbenc/inc/wb_vad.h
ibstagefright/codecs/amrwbenc/inc/wb_vad_c.h
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
ibstagefright/codecs/amrwbenc/src/autocorr.c
ibstagefright/codecs/amrwbenc/src/az_isp.c
ibstagefright/codecs/amrwbenc/src/bits.c
ibstagefright/codecs/amrwbenc/src/c2t64fx.c
ibstagefright/codecs/amrwbenc/src/c4t64fx.c
ibstagefright/codecs/amrwbenc/src/cmnMemory.c
ibstagefright/codecs/amrwbenc/src/convolve.c
ibstagefright/codecs/amrwbenc/src/cor_h_x.c
ibstagefright/codecs/amrwbenc/src/decim54.c
ibstagefright/codecs/amrwbenc/src/deemph.c
ibstagefright/codecs/amrwbenc/src/dtx.c
ibstagefright/codecs/amrwbenc/src/g_pitch.c
ibstagefright/codecs/amrwbenc/src/gpclip.c
ibstagefright/codecs/amrwbenc/src/homing.c
ibstagefright/codecs/amrwbenc/src/hp400.c
ibstagefright/codecs/amrwbenc/src/hp50.c
ibstagefright/codecs/amrwbenc/src/hp6k.c
ibstagefright/codecs/amrwbenc/src/hp_wsp.c
ibstagefright/codecs/amrwbenc/src/int_lpc.c
ibstagefright/codecs/amrwbenc/src/isp_az.c
ibstagefright/codecs/amrwbenc/src/isp_isf.c
ibstagefright/codecs/amrwbenc/src/lag_wind.c
ibstagefright/codecs/amrwbenc/src/levinson.c
ibstagefright/codecs/amrwbenc/src/log2.c
ibstagefright/codecs/amrwbenc/src/lp_dec2.c
ibstagefright/codecs/amrwbenc/src/math_op.c
ibstagefright/codecs/amrwbenc/src/oper_32b.c
ibstagefright/codecs/amrwbenc/src/p_med_ol.c
ibstagefright/codecs/amrwbenc/src/pit_shrp.c
ibstagefright/codecs/amrwbenc/src/pitch_f4.c
ibstagefright/codecs/amrwbenc/src/pred_lt4.c
ibstagefright/codecs/amrwbenc/src/preemph.c
ibstagefright/codecs/amrwbenc/src/q_gain2.c
ibstagefright/codecs/amrwbenc/src/q_pulse.c
ibstagefright/codecs/amrwbenc/src/qisf_ns.c
ibstagefright/codecs/amrwbenc/src/qpisf_2s.c
ibstagefright/codecs/amrwbenc/src/random.c
ibstagefright/codecs/amrwbenc/src/residu.c
ibstagefright/codecs/amrwbenc/src/scale.c
ibstagefright/codecs/amrwbenc/src/stream.c
ibstagefright/codecs/amrwbenc/src/syn_filt.c
ibstagefright/codecs/amrwbenc/src/updt_tar.c
ibstagefright/codecs/amrwbenc/src/util.c
ibstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
ibstagefright/codecs/amrwbenc/src/voicefac.c
ibstagefright/codecs/amrwbenc/src/wb_vad.c
ibstagefright/codecs/amrwbenc/src/weight_a.c
ibstagefright/codecs/common/Config.mk
ibstagefright/codecs/common/cmnMemory.c
ibstagefright/codecs/common/include/cmnMemory.h
ibstagefright/codecs/common/include/voAAC.h
ibstagefright/codecs/common/include/voAMRWB.h
ibstagefright/codecs/common/include/voAudio.h
ibstagefright/codecs/common/include/voIndex.h
ibstagefright/codecs/common/include/voType.h
34d76acc4edb359a8639ddb6ce537b5156deb760 22-Apr-2011 James Dong <jdong@google.com> Remove the assertion and report content malform error to application

Change-Id: I8e30c586048d38334fd4366959a124a99d8efe28
related-to-bug: 4267147
ibstagefright/MPEG4Extractor.cpp
2fb605a088d25037c66eae04f5d35ea1fe115390 22-Apr-2011 hongteng <hongteng@google.com> Fix for issue 3385135 "source code cleanup" engine part
- remove the unused header files

Change-Id: I78971f7a6ae9325ce96a474e448c6f3d586d7ba6
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorOsal.cpp
ni/mediaeditor/VideoEditorPropertiesMain.cpp
9df53fae3afd1c6b5278216be2fd33a255602aef 22-Apr-2011 Mike Lockwood <lockwood@android.com> MTP: Add extended operations to support in-place editing of files

MTP does not support partial writes of files (the entire file must be transferred at once).
This makes it impossible to implement a FUSE file system for MTP
with acceptable performance.
To fix this problem, this change adds extended MTP operations to allow
partial writes to files:

SendPartialObject - allows writing a subset of a file, or appending to the end of a file

TruncateObject - allows changing the size of a file

BeginEditObject - must be called before using SendPartialObject and TruncateObject

EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject

We also add GetPartialObject64, which is the same as GetPartialObject
but has a 64 bit offset rather than 32.

Change-Id: I4b110748b97ae05cdc8aab02ecdbbbeb263f7840
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_mtp_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpDebug.cpp
tp/MtpServer.cpp
tp/MtpServer.h
tp/mtp.h
c0125dd4f1f8bb03ad16138f86d55ed3305240c4 22-Apr-2011 Shyam Pallapothu <shyamp@google.com> Fix for issue 4133431 "Remove OSAL layer" in JNI part

Change-Id: I4d38454cdf32cb87dadeedcecd19261dd0b0b927
ni/mediaeditor/VideoBrowserInternal.h
ni/mediaeditor/VideoBrowserMain.c
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorOsal.cpp
ni/mediaeditor/VideoEditorThumbnailMain.cpp
4c1f4f7144ad6d73ca2a28eceb5a1c43664799c7 22-Apr-2011 Dianne Hackborn <hackbod@google.com> Merge "Rework display size access."
f50e54e64b2b5a269e1a88c511a57064a14bb51b 22-Apr-2011 Dianne Hackborn <hackbod@google.com> Remove config_caseSensitiveExternalStorage; no longer needed.

Change-Id: Id51c9e05be21d8087359cf918081109ba325569a
ava/android/media/MediaScanner.java
44bc17c6b517aef35a390c81b5aa79c4f284f744 21-Apr-2011 Dianne Hackborn <hackbod@google.com> Rework display size access.

Applications now get the display size from the window manager. No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I2958a6660895c1cba2b670509600014e55ee9273
ava/android/mtp/MtpDatabase.java
3feb41ff6f617768eb25c1b69c473d33f4f2f37b 21-Apr-2011 Shyam Pallapothu <shyamp@google.com> Fix for issue 4133431 "Remove OSAL layer" in JNI

Change-Id: I55f43989a8b89a3811468b30646fe1af0c87b386
ni/mediaeditor/VideoBrowserMain.c
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorOsal.cpp
ni/mediaeditor/VideoEditorThumbnailMain.cpp
7743fa64b11e9747d3ba8065a08a33ee9d90938f 12-Apr-2011 Dheeraj Sharma <dheerajs@google.com> Fix for issue 4133431 "Remove OSAL layer" in JNI part"

Fix for issue 4133431

Change-Id: I5879b740e7104abca7f4e1e831629997a6eec781
ni/mediaeditor/VideoEditorJava.cpp
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorPropertiesMain.cpp
72e738a428d7bb39a371da6105f7e2084e67e39d 20-Apr-2011 Andreas Huber <andih@google.com> Unhide MediaPlayer's setDataSource method that takes optional http headers to be

passed to the server.

Change-Id: I3c7ce140b2d9cd2483cf05c8aff9b374feff2f18
related-to-bug: 4315346
ava/android/media/MediaPlayer.java
508749401160a083ae02b6864c439f9b2f3068d6 19-Apr-2011 Andreas Huber <andih@google.com> Add extra headers specified in the media player's setDataSource call

to all http requests made by the http live implementation.

Change-Id: I9dd78bb261bc678ea98c82009ca2634b74f3cd58
related-to-bug: 4315346
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/LiveSession.h
bb32a94fb40779bb3e02dcdefc1294e6d7a73faa 19-Apr-2011 Andreas Huber <andih@google.com> Make sure a read restarts the prefetcher if necessary.

Change-Id: I87cac0e61e4dce7987ddf29c32f51e1672d1bbed
related-to-bug: 4286618
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/NuCachedSource2.h
d6309d688421c3d612f5f86219e69c4b21fbb6da 19-Apr-2011 Andreas Huber <andih@google.com> Merge "Remove streamability verification, it's taking too long. Also..."
5ce9eb9a34ffac3ff5aea0db81a902a380105d5b 19-Apr-2011 Andreas Huber <andih@google.com> am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

* commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
2c3bf8e93dd658fb5d9d9e348d6caa835571e369 18-Apr-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 2659754 ConcurrentModificationException in audio focus changes"
95814b0268ce3943930156afd3f423af8afed8e9 18-Apr-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 2724503 Persist media button receiver across reboots"
72843377d50a8f95cceaf33d316ab68d9b47f2eb 18-Apr-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2659754 ConcurrentModificationException in audio focus changes

While iterating over the audio focus stack or the media button
receiver stacks, do not modify the stack other than through the
iterator object.

Change-Id: Ice8827e7d29afed72b40c93edf7401cd54ba4b0c
ava/android/media/AudioService.java
d589fea865e90859324f00d21765fa7d7759e465 15-Apr-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2724503 Persist media button receiver across reboots

Whenever a new media button receiver is registered, save it
in the settings.

When the system audio settings are reloaded or when the
AudioService is created, the registered media button receiver
is restored.

Whenever a package is removed from the system, remove
any media button receiver from the same package that are in
the media button receiver stack. If this causes the currently
registered receiver to change (i.e. the top of the stack),
this will cause an update of the receiver stored in the
system settings.

Note that unregistering a media button receiver will not
cause the receiver saved in the settings to be updated,
this is ON PURPOSE. This is to prevent well behaved
application who unregister their receiver at the destruction
of their service, to not receive the intent after a reboot,
and to not encourage applications to never unregister
their receiver.

Change-Id: I941b777debaa56e88de93c3b03aec40331ea9ab1
ava/android/media/AudioService.java
44fdac0c62916ddcfac1fe887d867e7ff0cf446f 15-Apr-2011 Andreas Huber <andih@google.com> Remove streamability verification, it's taking too long. Also...

make sure that findSampleAtTime uses composition time instead of decoding time,
at the expense of extra memory.

Change-Id: I67d09389b3df7ed265f614bdd0b142ca7f19f86a
related-to-bug: 4294536
ibstagefright/MPEG4Extractor.cpp
ibstagefright/SampleTable.cpp
ibstagefright/include/MPEG4Extractor.h
ibstagefright/include/SampleTable.h
f0f1ceeb517ff226532a407da6d55602f195e5b5 14-Apr-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247
related-to-bug: 4286618
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/NuCachedSource2.h
966f9e558d714d9d41189e989b21e6d5fec35047 14-Apr-2011 Gloria Wang <gwang@google.com> Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."
3220d0a1dec028ae648cb4d89d7a6aa824b34225 13-Apr-2011 Glenn Kasten <gkasten@google.com> am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code

* commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a':
Bug 4167061 remove debugging code
8d2e14daa752d657b9747fc9734fbfd7b34c1f7a 13-Apr-2011 Glenn Kasten <gkasten@google.com> am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code

* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
Bug 4167061 remove debugging code
34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4 13-Apr-2011 Glenn Kasten <gkasten@google.com> am b0d6f10e: Bug 4167061 remove debugging code

* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
Bug 4167061 remove debugging code
b0d6f10eedeef099164995d51dbd076a6fcc5acc 13-Apr-2011 Glenn Kasten <gkasten@google.com> Bug 4167061 remove debugging code

Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
ibstagefright/AwesomePlayer.cpp
162ee49e1ce8800de80697fdd0e0e42ad7e9374e 12-Apr-2011 Gloria Wang <gwang@google.com> - Add another parameter in notify() to be able to send timed text sample
through listener during video playback.
- Add OnTimedTextListener in the MediaPlayer
For feature request 800939.

Change-Id: I65072c27acb4c0037109a72be38c73e9f667420f
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
dd66bcbf9d6ef0c50a18d9c4b1b39ce7ef7afcc4 12-Apr-2011 Elliott Hughes <enh@google.com> More native code cleanup.

Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.

Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
3f9659a096f79902fd846f84352ffe513decb0e1 12-Apr-2011 Andreas Huber <andih@google.com> Merge "Experimental support for changing the video surface/texture on an active mediaplayer"
dfad483298e01145dc40f48ba334ce7f87640647 12-Apr-2011 Andreas Huber <andih@google.com> Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."
a3804cf77f0edd93f6247a055cdafb856b117eec 12-Apr-2011 Elliott Hughes <enh@google.com> You don't need to poke around inside FileDescriptor manually.

We can help you with that.

Note also that getParcelFileDescriptorFD did no such thing. All its callers
were passing in a regular java.io.FileDescriptor and expecting the int. No
ParcelFileDescriptors involved.

Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/soundpool/android_media_SoundPool.cpp
4123211637dcc0155091016f0c0987b80e56ab7b 11-Apr-2011 Glenn Kasten <gkasten@google.com> am a7e8385c: am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit 'a7e8385cb34a19e47fb67bf8f632a8b47503242d':
Enable HDCP debugging in Stagefright (1 of 2)
a7e8385cb34a19e47fb67bf8f632a8b47503242d 11-Apr-2011 Glenn Kasten <gkasten@google.com> am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
Enable HDCP debugging in Stagefright (1 of 2)
87ee132ac5dd99564d4ad8f05631bbb021dbc0b0 11-Apr-2011 Glenn Kasten <gkasten@google.com> am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)
c6c2285b36e83b96056e2404371cdf6e6f7acaee 11-Apr-2011 Glenn Kasten <gkasten@google.com> Enable HDCP debugging in Stagefright (1 of 2)

Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
ibstagefright/AwesomePlayer.cpp
87312e9a810f31a3de76eb7b41165fc02f552cc3 11-Apr-2011 Andreas Huber <andih@google.com> If the media extractor specifies an invalid thumbnail time, default to the first frame.

Change-Id: I96514fa661d26726b4562872a5ebe87be88db71e
related-to-bug: 3447147
ibstagefright/StagefrightMetadataRetriever.cpp
6eb3c59cfed2993dad68fbd934c49009a1e6b47d 11-Apr-2011 Jason Simmons <jsimmons@google.com> Merge "In the MP3 extractor, compute timestamps based on sample count instead of byte count. This fixes timestamp accuracy on VBR streams."
7797e647fc8fcd5091b9449c0044f5cb70db5b47 09-Apr-2011 Elliott Hughes <enh@google.com> Merge "Tidy up exception throwing in the media native code."
0741b1ae22ecb5f6ac449bf85ef06e05c8d8f438 09-Apr-2011 Jamie Gennis <jgennis@google.com> am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
Stagefright: authenticate ANativeWindow.
15dd15fd572df6b6f785dff75f66e9b99f40322a 09-Apr-2011 Elliott Hughes <enh@google.com> Tidy up exception throwing in the media native code.

(I'm going through all of frameworks/base in multiple passes. This pass is just
for exception throwing.)

Change-Id: Ia14a5c720edae86ac780023be88e676aa1b3315d
ni/android_media_AmrInputStream.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_ResampleInputStream.cpp
ni/android_mtp_MtpDatabase.cpp
ibdrm/mobile1/Android.mk
ibdrm/mobile1/src/jni/drm1_jni.c
0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705 09-Apr-2011 Jamie Gennis <jgennis@google.com> am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.
3a9f5143efe63b4b94a1bd1312e0ba618a58674f 09-Apr-2011 Jamie Gennis <jgennis@google.com> am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
66380f768c0de8bde1f54ac6ab3f126b66928dad 08-Apr-2011 Jamie Gennis <jgennis@google.com> Stagefright: authenticate ANativeWindow.

This change adds a check to verify that the ANativeWindow to which
decoded video buffers are queued sends those buffers to SurfaceFlinger.
The check is done when the buffer content is flagged as protected. This
change also adds an error in the case where protected buffers are
needed, but an ANativeWindow is not being used as the video destination.

Change-Id: I107c9082d65ef0de4a13594e9535a2053ad5161b
Bug: 4269240
ibstagefright/OMXCodec.cpp
43a17654cf4bfe7f1ec22bd8b7b32daccdf27c09 07-Apr-2011 Joe Onorato <joeo@google.com> Remove the deprecated things from Config.java. These haven't been working since before 1.0.

Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
ava/android/media/AmrInputStream.java
ava/android/media/AudioManager.java
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerConnection.java
ava/android/media/ResampleInputStream.java
ests/SoundPoolTest/src/com/android/SoundPoolTest.java
5f3586e1ad21b011ff7d70ce26c2e0aa6d44a3ff 08-Apr-2011 James Dong <jdong@google.com> Give PSP and QuickTime compatible mp4 files a chance to play

Change-Id: I2618946b242b581fb8ed5de9a13ede23a4191b11
related-to-bug: 4173290
ibstagefright/MPEG4Extractor.cpp
293e03d8684663cc42f99735e6e4b4c1ae62cacd 07-Apr-2011 Jason Simmons <jsimmons@google.com> In the MP3 extractor, compute timestamps based on sample count instead of byte count.
This fixes timestamp accuracy on VBR streams.

Change-Id: I73a30309536919cbeb5e5163f2f1340e2b9fa4b1
ibstagefright/MP3Extractor.cpp
ibstagefright/include/MP3Extractor.h
c35f01dc0ebc8279811412edd3f31417b78b478b 07-Apr-2011 James Dong <jdong@google.com> Merge "Media JNI code cleanup"
c371a02e7cf504e9a926ca29c33e63b658c2cef7 06-Apr-2011 James Dong <jdong@google.com> Media JNI code cleanup

o Don't throw exception again because an exception was already thrown
o Check on return values from FindClass() and GetMethodID

Change-Id: Id92bb8228f1f0d2798d1cdf7de73cbb43816060b
related-to-bug: 4139926
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaScanner.cpp
b8da6cb5b2aa6d2f46c4c49e96fcbaa1a05f21e5 07-Apr-2011 Eric Laurent <elaurent@google.com> Do not disable effect in AudioEffect destructor.

Current implementation of AudioEffect class destructor disables
the effect before disconnecting from IAudioEffect interface.
This is problematic when more than one client has a handle on the same
effect engine as destroying one handle will disable the effect which is
not the intended behavior.

Change-Id: I10eacf981506469a7ef4eb9a1650813f0848de5d
ibmedia/AudioEffect.cpp
4edf1d10d44127484efe57f29c0204a29ad7e6ea 07-Apr-2011 James Dong <jdong@google.com> Return status code from invoke()

Change-Id: Ie64b418d2a1f44e07942399c285b460c68f8e14f
related-to-bug: 4199781
ibmedia/IMediaPlayer.cpp
ebabd09ae85bb20222537b08db3a5249c83707f4 07-Apr-2011 James Dong <jdong@google.com> Merge "Handle the failure from GetStringUTFChars()"
d07f6a7934d229e91d7ca23e83c664101f472312 06-Apr-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Bug 4231349 fix error in javadoc for android.media.MediaPlayer"
ea763069b1dca16193d32c6cf3ceab1c23743271 06-Apr-2011 Jean-Michel Trivi <jmtrivi@google.com> Bug 4231349 fix error in javadoc for android.media.MediaPlayer

In the javadoc for MediaPlayer.OnBufferingUpdateListener,
the percent parameter for onBufferingUpdate() is described as:
the percentage (0-100) of the buffer that has been filled thus far

This is incorrect. This percentage is the ratio of (current position
+ content buffered) relative to the total duration.
Also buffering updates are only sent for progressive HTTP download.

Change-Id: I9f346a150b39fa1f7b17126119ecc0d7d27fbfbe
ava/android/media/MediaPlayer.java
85b65f2008e7eb8ef492a63cba80555f58915769 06-Apr-2011 Glenn Kasten <gkasten@google.com> Merge "Miscellaneous code cleanup in audio framework"
3977472d9f3380a8323156dbc7d0090cf2f2d310 06-Apr-2011 James Dong <jdong@google.com> Handle the failure from GetStringUTFChars()

Change-Id: I9eb0f9f0fd2fa5116e7be80b1fa2ed4a95521b9d
related-to-bug: 4139926
ni/android_mtp_MtpDatabase.cpp
ni/android_mtp_MtpDevice.cpp
ni/android_mtp_MtpServer.cpp
ed0079ddddd4070f3369b13b274222da2e69f4b9 04-Apr-2011 Glenn Kasten <gkasten@google.com> Miscellaneous code cleanup in audio framework

Changes:
- Move declaration of kClassPathName to top of file so it can be used
in more than one place, instead of "android/media/AudioSystem".
- Make private methods static.
- Add comment to stream_type, audio_mode, force_use types that they must match
values in AudioSystem.java.
- Add comment about unused types mp3_sub_format and vorbis_sub_format.
- Fix typos.
- Use @ in javadoc comments.
- Delete dead APIs setMode, getMode, setRouting, getRouting in AudioSystem.java
(they are all hidden, deprecated, and unused by rest of framework)
- Delete unused private log method.
- Fix pathname for android_media_AudioSystem.cpp.
- Improve code formatting for space after == and !=.
- Add logging of delta for changing audio policy manager ref count.

Change-Id: I18037c7beb8ab76d1fda08c11e589f6e591d36e1
ava/android/media/AudioSystem.java
46e18c11d46a2bc1a46174f963d0ed1224d94cd2 06-Apr-2011 Brian Carlstrom <bdc@google.com> Don't use local ref for cached jclass reference in JNI code

Change-Id: Id45b2acb358a819f2fd332e99f3a095f6fc7299b
related-to-bug: 4241138
ni/android_media_MediaMetadataRetriever.cpp
b83dee77e20a1b7ac777debb3828e9d590aa895d 05-Apr-2011 Mike Lockwood <lockwood@android.com> Merge "MTP and media provider support for multiple storage devices:"
b239b683765f63d79e74b8ba2a8cc2855f236536 05-Apr-2011 Mike Lockwood <lockwood@android.com> MTP and media provider support for multiple storage devices:

- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
ava/android/mtp/MtpDatabase.java
ava/android/mtp/MtpPropertyGroup.java
ava/android/mtp/MtpServer.java
ava/android/mtp/MtpStorage.java
ni/android_mtp_MtpServer.cpp
tp/MtpServer.h
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/mtp.h
ae29b7632ecf2068698c0d121cff284dcc82f4ec 29-Mar-2011 Eric Laurent <elaurent@google.com> New fix for issue 4111672: control block flags

The first fix (commit 913af0b4) is problematic because it makes threads
in mediaserver process block on the cblk mutex. This is not permitted
as it can cause audio to skip or worse have a malicious application
prevent all audio playback by keeping the mutex locked.

The fix consists in using atomic operations when modifying the control
block flags.

Also fixed audio_track_cblk_t::framesReady() so that it doesn't block
when called from AudioFlinger (only applies when a loop is active).

Change-Id: Ibf0abb562ced3e9f64118afdd5036854bb959428
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0 04-Apr-2011 James Dong <jdong@google.com> am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread

* commit 'ea5d2c584490424be6bbc27dec58b4f9868d631e':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
dc5ba0451c6372b2579a2dcac1aa08d279a51c68 04-Apr-2011 Andreas Huber <andih@google.com> Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491"
c6e3b27fa1c2bf9863dcf017019c976ec98bce42 04-Apr-2011 Andreas Huber <andih@google.com> This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491

Instead of returning 0-filled buffers after EOS from AudioTrack we do this
work in AudioOutput instead. That way the EOS signal (0 frames returned)
is preserved in AudioCache which otherwise would lead to a heap size overflow
filling everything with zeroes.

Change-Id: I7e07429ba887957a4340dd4b21eef4bba76248cd
related-to-bug: 3514073
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/AudioPlayer.cpp
8e64c31f6c7aca87197976ee5e1b3359507e5e0f 04-Apr-2011 Andreas Huber <andih@google.com> Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock.

Change-Id: Idfea452ff661b264e013fe515bcd2a2762bd959c
related-to-bug: 4193552
ibmediaplayerservice/StagefrightPlayer.cpp
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
55311e8d13cd3925185d3db4f3f32f2afd615667 01-Apr-2011 James Dong <jdong@google.com> Merge "ISurfaceTexture does not have a method getIdentity()"
1aebc47141246510ab2629cc985aca3a4c32c130 01-Apr-2011 Andreas Huber <andih@google.com> Merge "Remove legacy hack to only drop frames every other late frame"
5e9c3de539ea255d9aaa1c141650005a37b1a3a3 01-Apr-2011 Andreas Huber <andih@google.com> Merge "Fix a webm-seek issue introduced when adding support for streaming webm"
21796929d37a290f069faad4bd04b356c5579296 01-Apr-2011 Andreas Huber <andih@google.com> Fix a webm-seek issue introduced when adding support for streaming webm

Change-Id: I52ec841832077603ee035f7a648316349513e978
related-to-bug: 4199894
ibstagefright/matroska/MatroskaExtractor.cpp
a93f84e067f02c319c69a114e219006507d1b4f4 01-Apr-2011 James Dong <jdong@google.com> ISurfaceTexture does not have a method getIdentity()

Change-Id: I81e6b0335747bd5c2c4b15c9f8c99100842a06c1
ni/android_media_MediaPlayer.cpp
2334d82073e7d5576ef66aa20ce6850b928db747 01-Apr-2011 Andreas Huber <andih@google.com> Remove legacy hack to only drop frames every other late frame

Change-Id: I197e568d292341c330efb394c41aa9af0e74b081
related-to-bug: 4203195
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
853814957293d0a891f374d1dc8950be866909c6 01-Apr-2011 Mike Lockwood <lockwood@android.com> am 1c56976a: am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.

* commit '1c56976a774434bd279b6181c4fc3c555c4648c2':
Improve Javadoc for USB Manager and MTP/PTP support.
1c56976a774434bd279b6181c4fc3c555c4648c2 01-Apr-2011 Mike Lockwood <lockwood@android.com> am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.

* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
Improve Javadoc for USB Manager and MTP/PTP support.
38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2 01-Apr-2011 Mike Lockwood <lockwood@android.com> am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.

* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
Improve Javadoc for USB Manager and MTP/PTP support.
11dd5ae97b1cd5889bb66862fd12718da62a9c75 01-Apr-2011 Mike Lockwood <lockwood@android.com> Improve Javadoc for USB Manager and MTP/PTP support.

Bug: 4091519

Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpDevice.java
ava/android/mtp/MtpStorageInfo.java
ea2c96541b2de51f8a4f37498f5d5733899b6056 31-Mar-2011 Glenn Kasten <gkasten@google.com> am 69250839: am 4ed59de6: am ffa670b5: Bug 4167061

* commit '69250839bb0ae94305ee1ac9a452b98d67acc5cf':
Bug 4167061
69250839bb0ae94305ee1ac9a452b98d67acc5cf 31-Mar-2011 Glenn Kasten <gkasten@google.com> am 4ed59de6: am ffa670b5: Bug 4167061

* commit '4ed59de640e46e42b5af3d79448be9da6e79667d':
Bug 4167061
4ed59de640e46e42b5af3d79448be9da6e79667d 31-Mar-2011 Glenn Kasten <gkasten@google.com> am ffa670b5: Bug 4167061

* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
Bug 4167061
ffa670b5b00b8b4c5a4296f9a1ac382c0e647894 31-Mar-2011 Glenn Kasten <gkasten@google.com> Bug 4167061

Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
ibstagefright/AwesomePlayer.cpp
6c3f60e3d5c569a46d1e3b1e080e13cf3dcfbe5d 31-Mar-2011 Andreas Huber <andih@google.com> am 399792b8: am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1

* commit '399792b83174a835840a4f47adcd34aed4e0b9ba':
When http streaming and Content-Length is unknown, make sure to return all
05e11b29b28006270a508e015723601eba5f4301 31-Mar-2011 Andreas Huber <andih@google.com> am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1

* commit '66ec90687f3579fe73f6baa2a188f8a4583167a3':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
36bafb0b7d3bcd1967799a0966eec74610613296 31-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 0ddcc8bc: am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"

* commit '0ddcc8bc60ffa00e103f420f95b7f8a7c77639b6':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
8a1a0fd1dc8c612f3ba7db955db11a18b5209ed4 31-Mar-2011 James Dong <jdong@google.com> When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.

Change-Id: I3a66fd0ed3f6b90350d706a608a39d8b4a398e32
related-to-bug: 4195127
ibstagefright/AudioSource.cpp
399792b83174a835840a4f47adcd34aed4e0b9ba 31-Mar-2011 Andreas Huber <andih@google.com> am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1

* commit '06ac039962c7f15938afc4bbb74c2f14de4dc505':
When http streaming and Content-Length is unknown, make sure to return all
06ac039962c7f15938afc4bbb74c2f14de4dc505 31-Mar-2011 Andreas Huber <andih@google.com> am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1

* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
When http streaming and Content-Length is unknown, make sure to return all
b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b 31-Mar-2011 Andreas Huber <andih@google.com> Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
45ad57aab33428575d7cde917e9477aac26beb71 30-Mar-2011 Andreas Huber <andih@google.com> When http streaming and Content-Length is unknown, make sure to return all

data that we successfully received before signalling the error.

Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
ibstagefright/NuHTTPDataSource.cpp
cabb7da7125a80c55233bd23959327424e9646cc 24-Mar-2011 Andreas Huber <andih@google.com> Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files

Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6
related-to-bug: 4192562
ava/android/media/MediaFile.java
ibstagefright/AVIExtractor.cpp
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/include/AVIExtractor.h
fc2143473ab560440e684d926661d53410e41af1 30-Mar-2011 Andreas Huber <andih@google.com> Merge "Stagefright DataSources now expose the underlying content mime type."
a2e57ca6504adfb3045c1d349d3abad796d8001f 30-Mar-2011 Andreas Huber <andih@google.com> Stagefright DataSources now expose the underlying content mime type.

Use that mime type to determine if we should do upfront buffering at the start of
playback and don't for audio streams to ensure playback starts fairly instantly.

Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42
related-to-bug: 4090916
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/chromium_http/support.cpp
ibstagefright/include/ChromiumHTTPDataSource.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/NuHTTPDataSource.h
4d3cdb5515f0dd25a56d161394e975089091d472 23-Mar-2011 James Dong <jdong@google.com> Check whether WAVE extractor can be initialized successfully in the sniffer for WAVE

bug - 3373994

Change-Id: I91c420815caae3b868fe9184ba48f37046b495fb
ibstagefright/WAVExtractor.cpp
66ec90687f3579fe73f6baa2a188f8a4583167a3 30-Mar-2011 Andreas Huber <andih@google.com> am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1

* commit '8de5df439244e77d7892deceb86520551ff0499c':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
8de5df439244e77d7892deceb86520551ff0499c 30-Mar-2011 Andreas Huber <andih@google.com> am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1

* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
0ddcc8bc60ffa00e103f420f95b7f8a7c77639b6 30-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"

* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
5c8eff3308c79f25bfe07d00c214f665581e5d7e 30-Mar-2011 James Dong <jdong@google.com> Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc"
30ec6c2bf587b1525ab4c2de66f31349b574641c 30-Mar-2011 Marco Nelissen <marcone@google.com> Merge "Fix media scanner uri handling."
35eebbab59414ad92d899eb719035bdcb1b8e676 29-Mar-2011 Andreas Huber <andih@google.com> Merge "Add a user-agent header to our RTSP requests."
b0e7381ccb2f1c8f472760b9b9f573068dc914cf 29-Mar-2011 Andreas Huber <andih@google.com> Add a user-agent header to our RTSP requests.

Change-Id: I02f8ff6a4a37fa59cc8c5fcfd3afb64ee11ba576
related-to-bug: 4173725
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
8fddd761f9eb628213fa7bbad059b8f31bd7c696 29-Mar-2011 Andreas Huber <andih@google.com> Merge "Adding support for the '.mxmf' MIDI file extension."
3e5e8055942ee8179675b8ed11d40ca12dbe42e6 29-Mar-2011 Marco Nelissen <marcone@google.com> Fix media scanner uri handling.

If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: Ifdf3a177750f1e71ca5a058fa534d272e1505653
ava/android/media/MediaScanner.java
eecadb9a84f357fb224592cc77603ff3e7c28f08 29-Mar-2011 Andreas Huber <andih@google.com> Adding support for the '.mxmf' MIDI file extension.

Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
ava/android/media/MediaFile.java
ibstagefright/StagefrightMediaScanner.cpp
c36b3c6956479f1a154fe1e08b679ff4657097e1 29-Mar-2011 James Dong <jdong@google.com> Fix missing cross-ref links in the MediaPlayer.java javadoc

Change-Id: Ie5fba234d226ff792661ec346ddf87f43b5a0dc7
ava/android/media/MediaPlayer.java
21e73bf25af7583121dc7ff57f88a7a5500d9e9f 29-Mar-2011 Andreas Huber <andih@google.com> Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread.

Change-Id: I669d589ab4521fe44a3e8f638c7ce8e79174d625
related-to-bug: 4179898
ibstagefright/foundation/ALooper.cpp
b13c4a9b6ce6a5a7430a27252058b75b20d0a7fa 29-Mar-2011 Andreas Huber <andih@google.com> Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.

Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
d2b1f29aa0c056a497e45634aabea360c7d231c9 29-Mar-2011 Iliyan Malchev <malchev@google.com> Merge "frameworks/base: some camera-interface cleanup"
40c364136f09e82602692f359bcf8aa9b0df18d3 29-Mar-2011 Iliyan Malchev <malchev@google.com> frameworks/base: some camera-interface cleanup

Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct
image_rect_struct are no longer used (instead, the necessary information is
passed through ANativeWindow.)

Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibstagefright/CameraSource.cpp
3a28b022bcf06da7d0019abe3d569322c7aaee82 28-Mar-2011 Andreas Huber <andih@google.com> Ignore OMX codec messages once we're in ERROR state.

Change-Id: I2bdf58ed705a641be1f3aec89fa41cada6acfc96
related-to-bug: 4175573
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ab13a89c997fafcfbbb10ed31008893863e39a37 28-Mar-2011 Andreas Huber <andih@google.com> am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1

* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
After a seek there's a brief period where audio time isn't reestablished.
b618b2ef8722964730d09a86a06a85ca34df6de4 28-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"

* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
e7cedad2b8408a13c610f3a7fcf13597a432a37d 28-Mar-2011 Andreas Huber <andih@google.com> am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1

* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
After a seek there's a brief period where audio time isn't reestablished.
2edbdcc6f2572e5f84253617b1850908344b3f8c 28-Mar-2011 Andreas Huber <andih@google.com> Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1
375fb9bfd29ea4480aa9582bf3956b435152c8d9 21-Mar-2011 Christer Fletcher <christer.fletcher@sonyericsson.com> Handle OutOfMemoryError when decoding images in ThumbnailUtils

Added handling of OutOfMemoryError handling to createImageThumbnail
method in ThumbnailUtils.java. During mediascanner run it would run
out of memory when trying to decode very large images. Now it handles
this error and returns null which is handled by the media scanner.

Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
ava/android/media/ThumbnailUtils.java
1b339099b91db107b8a3c4985125530de2babb23 26-Mar-2011 Mathias Agopian <mathias@google.com> Merge "merge libsurfaceflinger_client into libgui"
696257ccf315a1da042787c5b2d1f80c7146fc94 26-Mar-2011 Mathias Agopian <mathias@google.com> merge libsurfaceflinger_client into libgui

this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
ni/Android.mk
ni/mediaeditor/Android.mk
ibmedia/Android.mk
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
59529e1474a5e696e83955ccf0876992299bc86f 26-Mar-2011 Andreas Huber <andih@google.com> After a seek there's a brief period where audio time isn't reestablished.

Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.

Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
ibstagefright/AudioPlayer.cpp
e8ab51f5937d879e2fc0558b424d21d86446cd23 26-Mar-2011 Andreas Huber <andih@google.com> am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1

* commit 'e2cb08bd4c3bc7e7045e107af41f7228d780be04':
Make sure we post a video event when seeking after seeing video EOS before.
2fee96bcc057d9b5a9ac912af79fd838f5a42964 25-Mar-2011 Andreas Huber <andih@google.com> am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1

* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
Make sure we post a video event when seeking after seeing video EOS before.
16ede3c535283a0b492dc82d65616d78fe620457 25-Mar-2011 Andreas Huber <andih@google.com> Make sure we post a video event when seeking after seeing video EOS before.

Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug: 3316960
ibstagefright/AwesomePlayer.cpp
f4aa99aa562d8217421b5e91e615edd9b7006604 25-Mar-2011 James Dong <jdong@google.com> am 70a5b031: am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1

* commit '70a5b0317d5029b34be26a423c0ebeaa74b728ed':
Switch to use SF cached source
9fb98238e5837a68fb16bcb9a23469f27124c304 25-Mar-2011 James Dong <jdong@google.com> am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1

* commit '837430dd3440f6e71f68ef755399e22386dee084':
Switch to use SF cached source
3be159362891c810b24f2ebbc4b097b316ffb05c 25-Mar-2011 James Dong <jdong@google.com> Switch to use SF cached source

bug - 3500025

Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
ibstagefright/AwesomePlayer.cpp
7c06ac00e1f9847a8b8f45b97cd795ba63ecb5a9 24-Mar-2011 Glenn Kasten <gkasten@google.com> am 64233b86: am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1

* commit '64233b86f3a78d2c4a21092b242ad071a6b38bd5':
Bug 4159373 Use HDCP debug settings
503f4daf0113579e111d371dbfb6824cc8c311f1 24-Mar-2011 Glenn Kasten <gkasten@google.com> am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1

* commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
Bug 4159373 Use HDCP debug settings
0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4 24-Mar-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
1b11b64bb66b624f1bcfef89c4b6f6af75a06ff1 23-Mar-2011 Glenn Kasten <gkasten@google.com> Bug 4159373 Use HDCP debug settings

Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
ibstagefright/AwesomePlayer.cpp
88a14dcd1c60e5045223b1a5ed35f4f5f2179432 24-Mar-2011 shailendra <shailendray@google.com> am 6b49e9a8: am a450ef06: am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1

* commit '6b49e9a8829c87088dc7fbc0945237030e63327a':
Fix for Media Server memory leak
a450ef06689b44415a3bbbfb4aaad082189eb7ad 23-Mar-2011 shailendra <shailendray@google.com> am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1

* commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
Fix for Media Server memory leak
ac390b8cacc45c866ae2e60c0e492a914cf6ec78 23-Mar-2011 shailendra <shailendray@google.com> Merge "Fix for Media Server memory leak" into honeycomb-mr1
2d06aee09507252ba6703ecd2c4f9f356048e6ad 17-Mar-2011 shailendra <shailendray@google.com> Fix for Media Server memory leak

bug - 4081123

Change-Id: Ic88c13f8006227cff2c91a31f5d1828d007125af
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java
c8e14bf5d507923c3735a75411638db2d854d6a5 22-Mar-2011 Andreas Huber <andih@google.com> Merge "Delay signaling the end of audio playback until all frames have actually played."
4dc482daac5d484f338865cdddd57528276a7ca0 22-Mar-2011 Andreas Huber <andih@google.com> Delay signaling the end of audio playback until all frames have actually played.

Change-Id: I1fa07358a885a818fd0a5d7da425740f86095e10
related-to-bug: 3404000
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
3c111d7815b7e8f0b4db6406c7353cec24708d58 22-Mar-2011 James Dong <jdong@google.com> Merge "Fix AAC encoder test util and remove files that are not needed"
1056ec04cbf4e71128d2930a1fc179138c1eec60 22-Mar-2011 James Dong <jdong@google.com> Merge "Fix AMRWB test util and remove useless files"
35c654c3f587af787ddac276f69a2883e8bf1aca 22-Mar-2011 shailendra <shailendray@google.com> am 8e0f2d71: am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1

* commit '8e0f2d71a1d2353228ba04562c8189f4904a11d1':
Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
b819dcd49ddd4be8f102c99576bb42cd088caf1a 22-Mar-2011 shailendra <shailendray@google.com> am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1

* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
8483073ec21b5e2332deaad914eba1d087b1d1e3 22-Mar-2011 shailendra <shailendray@google.com> Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
8b17346a438cbb6ae7c8eb54d7611b32d43699e1 22-Mar-2011 Yu Shan Emily Lau <yslau@google.com> am 5460bb3e: am 112852b5: am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1

* commit '5460bb3e09766d45105dfb05f54f97da1dbc57a3':
Add the mem logging into test utility. Bug# 4108259
dce4a0f0d5f43ea3862503720fd4561f0c0cd33c 22-Mar-2011 Andreas Huber <andih@google.com> am 6834f061: am 970d7dd9: am e2c32e9f: If nothing is to be copied, return right away.

* commit '6834f0617aea626dfc0f306c9fa3610f32cee1f7':
If nothing is to be copied, return right away.
3da107288d5ae112073875ac10317def3c299818 22-Mar-2011 Andreas Huber <andih@google.com> am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1

* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
453c0d5f16a09473b0653566973bf8b6a867cf79 22-Mar-2011 Andreas Huber <andih@google.com> Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
bc40f9d27e521e5688c6626ea3353310890b8ba4 22-Mar-2011 James Dong <jdong@google.com> Fix AMRWB test util and remove useless files

Change-Id: Ia11a1ec053855c9e692070d23c7a690c39cb3d5e
ibstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
ibstagefright/codecs/amrwbenc/SampleCode/Android.mk
ibstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile
ibstagefright/codecs/amrwbenc/SampleCode/ms.mk
ibstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile
ibstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile
ibstagefright/codecs/amrwbenc/build/eclair/makefile
ibstagefright/codecs/amrwbenc/build/eclair/ms.mk
9cd48448191766732ed2ca019b0cf850091f85d7 22-Mar-2011 James Dong <jdong@google.com> Fix AAC encoder test util and remove files that are not needed

Change-Id: Ib6cbe78de9f85e4df357d53365a35d1f9f0bb1d3
ibstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
ibstagefright/codecs/aacenc/SampleCode/Android.mk
ibstagefright/codecs/aacenc/SampleCode/eclair/Makefile
ibstagefright/codecs/aacenc/SampleCode/ms.mk
ibstagefright/codecs/aacenc/Tools/doit.mk
ibstagefright/codecs/aacenc/Tools/eclair.mk
ibstagefright/codecs/aacenc/build/eclair/ARMV5E/Makefile
ibstagefright/codecs/aacenc/build/eclair/ARMV7/Makefile
ibstagefright/codecs/aacenc/build/eclair/makefile
ibstagefright/codecs/aacenc/build/ms.mk
112852b5770300a81d82f0ec06ad0553f286ed01 22-Mar-2011 Yu Shan Emily Lau <yslau@google.com> am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1

* commit '0210997218fc22b77c71a43a2396419cd0a39166':
Add the mem logging into test utility. Bug# 4108259
931b7f269c8673602477f387b9e1998071aa112a 22-Mar-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 3509396: AudioEffect.getParameter JAVA."
0210997218fc22b77c71a43a2396419cd0a39166 22-Mar-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
602b3286ffe7da6e70bf2d9e4861a5d74ff7c473 18-Mar-2011 Eric Laurent <elaurent@google.com> Fix issue 3509396: AudioEffect.getParameter JAVA.

Removed dead/buggy code in AudioEffect.getParameter() and
AudioEffect.command() that was meant to return the actual length of
meaningful data in the returned parameter or command reply.

This is replaced by the method return status indicating this length when
positive (negative return codes still indicate the same errors as before).

Modified automated AudioEffect tests accordingly.

Change-Id: Ie89617f912766b8dee73b81f92af9c48027c982d
ava/android/media/audiofx/AudioEffect.java
ni/audioeffect/android_media_AudioEffect.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioEffectTest.java
8505f2fe1e4fd94878d57169dd7fdc10c9633f62 22-Mar-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.

Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug: 4148291
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/httplive/M3UParser.cpp
554d0ea10f8ae13a2d71289ff1f4d8adf6a9e6dd 22-Mar-2011 Andreas Huber <andih@google.com> Enable http-live support for https:// urls, fix a parsing issue.

Change-Id: I2284e1d62babde7f739fba6a3cb4e2619f0e62f9
related-to-bug: 4148291
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/httplive/M3UParser.cpp
970d7dd95f704fb068c8add784f5b8c1c17ebd3c 22-Mar-2011 Andreas Huber <andih@google.com> am e2c32e9f: If nothing is to be copied, return right away.

* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
If nothing is to be copied, return right away.
f84433fb0a77c319319eb86522586b3fb6756493 21-Mar-2011 James Dong <jdong@google.com> Add read and write option in opening file for output in the writers

Change-Id: Ibfba0aacd3c8587c04a2e903b636de337cc30104
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
e2c32e9f966cf9f2c9ed94bf0703344a2cca284b 21-Mar-2011 Andreas Huber <andih@google.com> If nothing is to be copied, return right away.

This avoids a potential out-of-bounds problem in the code below.

Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug: 4139974
ibstagefright/NuCachedSource2.cpp
7a4b8bd58847e6334aaa45227a2512a8200c0812 21-Mar-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 3483718: audio streaming and A2DP."
5bb357f4ccdb573efbe1476a7f20e82f454b3a93 21-Mar-2011 Andreas Huber <andih@google.com> Fixing the build.

Change-Id: I89daa503029491e6f1a8321f7e45c9439315ad23
ni/android_media_MediaMetadataRetriever.cpp
6667ac33f4d7084fa240baf719282051f1e9ff25 21-Mar-2011 Eric Laurent <elaurent@google.com> Fix issue 3483718: audio streaming and A2DP.

The problem is that when switching from A2DP to device speakers or headset,
The AudioTrack binder interface to AudioFlinger must be destroyed and restored
to accomodate new buffer size requirements. Current AudioTrack implementation
did not restore properly the PCM buffer write index which caused a mismatch between
the written frame count in the mediaplayer renderer and the AudioTrack. The renderer
could then believe the AudioTrack buffer was full and stop writing data preventing the
AudioTrack to reach a bufffer full condition and resume playback.

The rendered was also modified to refresh the AudioTrack frame count (buffer size)
inside the write loop in NuPlayer::Renderer::onDrainAudioQueue() as this count can change
from one write to the next.

Also modified AudioTrack::obtainBuffer() to check for track invalidated status before
querying for available space in the buffer. This avoids writing to the old track's
buffer until full before detecting the invalidated condition and create a new track.

Change-Id: I16a857e464e466880847f52f640820aa271539ad
ibmedia/AudioTrack.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
14a80afa512c4d37b1e0dc4c4fe6281d74fc172e 21-Mar-2011 Andreas Huber <andih@google.com> Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"
5b7ced6a4ebcec34a36d0779773bc9e671732dbf 21-Mar-2011 Andreas Huber <andih@google.com> Support passing headers to MediaMetadataRetriever's setDataSource API

Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
ava/android/media/MediaMetadataRetriever.java
ni/android_media_MediaMetadataRetriever.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/mediametadataretriever.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ibmediaplayerservice/MidiMetadataRetriever.cpp
ibmediaplayerservice/MidiMetadataRetriever.h
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/include/StagefrightMetadataRetriever.h
9f2cde3cdb3e2de97f450d0f4e2b52aae86ce5a3 19-Mar-2011 James Dong <jdong@google.com> Scale the thumbnail if display dimension is different from the actual buffer size

bug - 3379293

Change-Id: I31c08010c97387716433da99d648bd364847b6aa
ni/android_media_MediaMetadataRetriever.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
c42faa1e6179fb1bb538698e581b6e1868d73b9c 19-Mar-2011 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
c8fcf9324902e71c0fb0a22afc7de365ade7cf11 18-Mar-2011 James Dong <jdong@google.com> Merge "Better organize media recorder error and information event and types"
8885e679fc65ff856898fccd6fca8a388f42a4e5 18-Mar-2011 Andreas Huber <andih@google.com> Squashed commit of the following:

commit ed615e2803839ef28e0eab50d17844c207083ad6
Author: Andreas Huber <andih@google.com>
Date: Fri Mar 18 12:38:30 2011 -0700

Support for live streaming of webm content over http.

Change-Id: Ie9ebd23d2c44d192d348b9fa3f3a0f3f28ac9e4c

commit 9c50b1392471a3d652b4a875c823bee854f8855b
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 17 13:33:22 2011 -0700

Upgrade to the latest version of libwebm.

Change-Id: Ic7965dda84131a38f9d3c72b6acd2025ace939ce

Change-Id: I3c993a89f749f05741594ef0ea47864e17ee783b
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/MatroskaExtractor.h
264990d2eae3044399584da85a1144214ea88f2a 18-Mar-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 4111672: AudioTrack control block flags"
01f20f6b378235c27bc161567390913ae179a94c 18-Mar-2011 James Dong <jdong@google.com> Merge "Handle display dimension scaling event due to SAR embedded in AVC videos"
7e91d91a4fe8ea62c07040d224615e4f823fccfb 18-Mar-2011 James Dong <jdong@google.com> Handle display dimension scaling event due to SAR embedded in AVC videos

bug - 3379293

Change-Id: I03cb548e61d31bc0a2fb40916d207aaf840fafce
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
75afb97c4d46e1c001986faca8a5ee7e68d7b82b 18-Mar-2011 Yu Shan Emily Lau <yslau@google.com> Add the mem logging into test utility.
Bug# 4108259

Change-Id: Ifc8091490beef1430a1a0ab297e514b605da56f6
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaTestUtil.java
7fc8b4f5ff88da7011f2d04c8f019008cc23bd0f 18-Mar-2011 James Dong <jdong@google.com> Better organize media recorder error and information event and types

Change-Id: I45f1f953596985494725525c1fabf57eccc19175
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
7af86edfe105211fa09469b8ad1a18ac4626d4dc 18-Mar-2011 Andreas Huber <andih@google.com> Merge "Signal a runtime error if the AVCDecoder encounters an invalid frame."
b8fdab2b709980650945cd04d8d000c619390e75 18-Mar-2011 Andreas Huber <andih@google.com> Signal a runtime error if the AVCDecoder encounters an invalid frame.

Instead of asserting.

Change-Id: I4c89f5fef92e5adb11d1ea6b564a67e99fc96595
related-to-bug: 4109304
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
0e898b59d8bcd7cf75ffb9cac1b83f00d2754ee4 18-Mar-2011 shailendra <shailendray@google.com> am e21bbd24: am a5eaf2ea: am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1

* commit 'e21bbd24a107c3286e8c6f3eca069ebb12ef13da':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
a5eaf2eae0d11c45d9167f7fcadaafdeefad645c 18-Mar-2011 shailendra <shailendray@google.com> am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1

* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
d0c281328903189b42585948054cfb14a1385d50 18-Mar-2011 shailendra <shailendray@google.com> Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)

Change-Id: I0a7081f901684ff7c7388b830afc6ae2f2ce7bcd
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776 18-Mar-2011 shailendra <shailendray@google.com> Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
913af0b48fbc9a1e4db8411c763b339f2b09c954 17-Mar-2011 Eric Laurent <elaurent@google.com> Fix issue 4111672: AudioTrack control block flags

Make sure that all read/modify/write operations on the AudioTrack
and AudioRecord control block flags field are protected by the
control block's mutex.

Also fix potential infinite loop in AudioTrack::write() if the
written size is not a multiple of frame size.

Change-Id: Ib3d557eb45dcc3abeb32c9aa56058e2873afee27
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ce06ebfda4bd7c511cef3d98aacf7291a743ea46 17-Mar-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Add support for timestamps into SurfaceTexture."
c8b4efdd743995219af494c5cdcb036591d8e06e 17-Mar-2011 shailendra <shailendray@google.com> Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)

Change-Id: Iab523e666c11b7f99aac71c761a4295d32ca026c
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
c5f94d8a4779050125145396ca83fbc862c7ed6b 18-Feb-2011 Eino-Ville Talvala <etalvala@google.com> Add support for timestamps into SurfaceTexture.

API addition: The timestamps are represented as nanoseconds from some
arbitrary time point. Like the SurfaceTexture transform matrix, the
timestamp retrieved by getTimestamp is for the last frame sent to the
GL texture using updateTexImage().

Camera HAL change: Expect vendors to set these timestamps using
native_window_set_buffers_timestamp(). For now, they are
autogenerated by SurfaceTextureClient if set_buffers_timestamp() is
never called, but such timing is likely not accurate enough to pass a
CTS test.

bug:3300707

Change-Id: Ife131a0c2a826ac27342e11b8a6c42ff49e1bea7
ava/android/media/MediaPlayer.java
be3c82f25d45ccd1600ec23bab80c2e8a35a0474 17-Mar-2011 James Dong <jdong@google.com> am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files

* commit '782ffe91da665c6b1fb9e297faa6e0dc6035f40c':
Fix missing AOSP copyright headers for a bunch of media framework files
9c0c5b5638fd2810b68e033963026cc1830b9ade 17-Mar-2011 James Dong <jdong@google.com> am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files

* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
Fix missing AOSP copyright headers for a bunch of media framework files
2f1f2248c8439adbd686810e306c55f9e6a5abc3 17-Mar-2011 James Dong <jdong@google.com> Fix missing AOSP copyright headers for a bunch of media framework files

bug - 4119349

Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
ibmedia/IOMX.cpp
ibmediaplayerservice/StagefrightPlayer.cpp
ibstagefright/ACodec.cpp
ibstagefright/codecs/avc/common/include/avc_types.h
ibstagefright/foundation/AHierarchicalStateMachine.cpp
ibstagefright/include/MPEG2TSExtractor.h
630e6d7d26fea26abcaaa8c4dabe1fda5d817a41 17-Mar-2011 Mike Lockwood <lockwood@android.com> am 132b23f8: am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1

* commit '132b23f84905060163be6a30d718074cd4e1770d':
MtpServer: Do not attempt to stop MTP if it has not been started
c97022e7acc6da71e558e9137036622b4c77ca46 17-Mar-2011 Mike Lockwood <lockwood@android.com> am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1

* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
MtpServer: Do not attempt to stop MTP if it has not been started
a3f8514492cb4bc8fa7c36e2c0f720342796ada7 17-Mar-2011 Mike Lockwood <lockwood@android.com> MtpServer: Do not attempt to stop MTP if it has not been started

Fixes an ANR that occurred if we got a USB disconnected event
before the MTP service had started.

Bug: 4118033

Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpServer.java
f916a5537c53b19f0b54a179c3b0954919ae322a 17-Mar-2011 Yu Shan Emily Lau <yslau@google.com> am 0af00ebc: am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into ho

* commit '0af00ebc178a90d53a2aba92b8f8c11cfca8c1f4':
Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
797f5b0c00895c21ff755ec7f6974e1d2e763b13 17-Mar-2011 Yu Shan Emily Lau <yslau@google.com> am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1

* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
fd5c1f7c575451cf3566d1a8290b0b001bddfa39 17-Mar-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
9dab78470592be7542b9c0f9090603ed0dc80949 16-Mar-2011 Yu Shan Emily Lau <yslau@google.com> Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit.
Add the media test util for capturing the memory usage.
Bug# 4108259
Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaTestUtil.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorExportTest.java
0b8fe2012debcc3a274797ff4d405906fd30be8e 17-Mar-2011 Rajneesh Chowdury <rajneeshc@google.com> am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1

* commit 'ce254e8613ddc4d57a8a5a8a2763b22690f451a4':
Fix for 4087846 Crash reported by monkey report (Java/Jni)
69d05490345e96e1155e3b33eb5e36761b07a314 17-Mar-2011 Rajneesh Chowdury <rajneeshc@google.com> am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1

* commit '0edefea88e975613bca9f0227614de91434ade11':
Fix for 4087846 Crash reported by monkey report (Java/Jni)
93668dfdd6d66ec390c94f9959088ac46ed21850 17-Mar-2011 Andreas Huber <andih@google.com> Merge "Don't send the seek-complete notification twice."
0edefea88e975613bca9f0227614de91434ade11 17-Mar-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
9fe05b7bc1e010dbb98bf92e23390cd311214e88 16-Mar-2011 James Dong <jdong@google.com> resolved conflicts for merge of 1cbf8493 to master

Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4
f8a5b5574030e48c6b6c289132a0009aca0a609e 16-Mar-2011 Andreas Huber <andih@google.com> Don't send the seek-complete notification twice.

Change-Id: Ie994de2d57e20dde12b8d59af4968d03569c7efa
related-to-bug: 3489432
ibstagefright/AwesomePlayer.cpp
28fc2037bffd1593b56fe1e1522de544a7d49120 16-Mar-2011 James Dong <jdong@google.com> am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1

* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
6ec0ca9e8eb78faeae198a67978ce630cc128946 16-Mar-2011 James Dong <jdong@google.com> Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.

bug - 4109530

Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
ibmedia/MediaProfiles.cpp
7532ae7f79d6d849faae1a9bee171c66bd534d97 16-Mar-2011 Andreas Huber <andih@google.com> am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1

* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
5bd3bb46b1f1576cfece8e462c46cca00ddd1351 16-Mar-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.

Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7
related-to-bug: 4039068
ibstagefright/AwesomePlayer.cpp
498422f4a2f8481e48b280a59a903ff60d3d6508 16-Mar-2011 Andreas Huber <andih@google.com> Fix a race condition when playing an audio-only stream and seeking before starting.

Change-Id: Id3883293caf316ce492f5eb16428c15ced82da38
related-to-bug: 4039068
ibstagefright/AwesomePlayer.cpp
8e7991a52edb3eb8bd1a44ceb7f6d97108748c8c 16-Mar-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for 4087846 Crash reported by monkey report (Java/Jni)

Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
ava/android/media/videoeditor/VideoEditorImpl.java
ni/mediaeditor/VideoEditorMain.cpp
005de48cfbce35d1f2914ed7d975fa1ed6e702ba 15-Mar-2011 James Dong <jdong@google.com> Fix an issue where the timestamp provided by WAVExtractor does not start with 0

Change-Id: Ie8eb86e26f026c07a3c3be43e35027b19de4a2c3
ibstagefright/WAVExtractor.cpp
ed73246b32a725d00b0b7d7e171e5817d9f27a80 15-Mar-2011 James Dong <jdong@google.com> Add memory leak tracking/debugging code to drm server

bug - 4099038

Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
ibmedia/Android.mk
ibmedia/MemoryLeakTrackUtil.cpp
ibmediaplayerservice/MediaPlayerService.cpp
0660c7d04892f3e84e5a3a3ec42cf4c704b9d689 15-Mar-2011 James Dong <jdong@google.com> Merge "Add a release() method to MediaScanner"
6c256d125e465d651cf7f44323113bd8e93f90d5 15-Mar-2011 Shailendra Yadav <shailendray@google.com> am e987cbaf: am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1

* commit 'e987cbafc2a6c19cae1ccf50658fb6320bda084a':
Fix for Don't allow adding 64-bit files(4086708)
e987cbafc2a6c19cae1ccf50658fb6320bda084a 15-Mar-2011 Shailendra Yadav <shailendray@google.com> am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1

* commit '3fabad87f6cade6ccf7dc6d716e8b91675982088':
Fix for Don't allow adding 64-bit files(4086708)
3fabad87f6cade6ccf7dc6d716e8b91675982088 15-Mar-2011 Shailendra Yadav <shailendray@google.com> Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1
60fdca229f79a9d7e41054feab797a2aa01762b9 15-Mar-2011 Iliyan Malchev <malchev@google.com> Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"
4d0ec22aa91428030ae9ef1ead6f1b1d769745ac 12-Mar-2011 Shailendra Yadav <shailendray@google.com> Fix for Don't allow adding 64-bit files(4086708)

Change-Id: I880c89b565dd8172fdf077a514d5b3d03eab7d9e
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorImpl.java
f20dcbcba976b22a6c860be24c955ef5bf69869a 14-Mar-2011 James Dong <jdong@google.com> Merge "libstagefright: Add error handling in AMRNB deooder"
3070af08821ee86f06a9cc6b58dbb79c82946b94 14-Mar-2011 Iliyan Malchev <malchev@google.com> frameworks/base: remove LOCAL_PRELINK_MODULE

Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
ni/mediaeditor/Android.mk
ibeffects/lvm/lib/Android.mk
ibeffects/lvm/wrapper/Android.mk
ibeffects/visualizer/Android.mk
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/amrwbenc/Android.mk
ibstagefright/codecs/common/Android.mk
ibstagefright/foundation/Android.mk
ibstagefright/yuv/Android.mk
ests/players/Android.mk
14e974af734e83599380a61c822a43da60da9000 08-Mar-2011 Sidipotu Ashok <sashok@codeaurora.org> libstagefright: Add error handling in AMRNB deooder

Return error when AMRNB software decoder fails

Change-Id: I1203db4a4b5ac766c8c131d3d0ba18a4ff2e3ceb
ibstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
eb30077ee928a3c2b8af7c38670c948079f90640 14-Mar-2011 Eric Laurent <elaurent@google.com> am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1

* commit '733cb79a27fa434a1f5548201c953131285b4e81':
Partial fix for issue 3515250: video chat and SCO
8ecd9dc04d0f38e23fd28d5ebbf7664c0e423077 14-Mar-2011 Mike Lockwood <lockwood@android.com> am 2d24213f: am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1

* commit '2d24213fca55fece8ce4a69a53abcd45983b0443':
MtpDevice: Handle zero length packets in readResponse()
76d41f5796c73e499f05375d004b39dc9961820c 14-Mar-2011 Kenny Root <kroot@android.com> am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"

* commit '206c62ed34dc8a48fd6c907d95456226949f42dd':
Remove unnecessary SkImageDecoder_libjpeg.cpp
96a4323a47dd48db8071143a2b3e8340e6400cf9 14-Mar-2011 James Dong <jdong@google.com> Merge "Fix PV AAC decoder crash due to out-of-boundary array access."
733cb79a27fa434a1f5548201c953131285b4e81 14-Mar-2011 Eric Laurent <elaurent@google.com> am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1

* commit '3cbfd10bbb869f763880060ebe01dd66da62bbc3':
Partial fix for issue 3515250: video chat and SCO
3cbfd10bbb869f763880060ebe01dd66da62bbc3 14-Mar-2011 Eric Laurent <elaurent@google.com> Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1
3a785fe0799319004c234c9d259d1f9b74ca1214 14-Mar-2011 Andreas Huber <andih@google.com> Experimental support for changing the video surface/texture on an active mediaplayer

Change-Id: Ia7a5126e9311dc1c721ab2aef54bd698151c88cd
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
a2e29968abe003f1b92ea9cbff5e70c77f28be34 13-Mar-2011 James Dong <jdong@google.com> Fix PV AAC decoder crash due to out-of-boundary array access.

Two cases were fixed:
o xover had a larger number of bands than the high frequency band, which led to some negative array index under some circumstances
o integrated a PV fix from OpenCore.git where the array index for scratch_mem may be over the array boundary

bug - 3473128

Change-Id: I844cd8797b4e5b0120fafa0c46a8c1facea78a8b
ibstagefright/codecs/aacdec/sbr_dec.cpp
2d24213fca55fece8ce4a69a53abcd45983b0443 14-Mar-2011 Mike Lockwood <lockwood@android.com> am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1

* commit '3ec9d06f070db3a8899ad235736abd0ffaf6f578':
MtpDevice: Handle zero length packets in readResponse()
90f5d75cf0502788fbc2fb49f366de40d5ffc164 14-Mar-2011 Mike Lockwood <lockwood@android.com> MtpDevice: Handle zero length packets in readResponse()

Bug: 3509060

Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
92405699cb2a9566a0e2681019de9ccfe070cdf7 14-Mar-2011 Mike Lockwood <lockwood@android.com> am 0bea34fc: am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1

* commit '0bea34fc3ec5dfd8d0e7483368875b457b7e2262':
MTP host: Fix problems reading large data packets
0bea34fc3ec5dfd8d0e7483368875b457b7e2262 14-Mar-2011 Mike Lockwood <lockwood@android.com> am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1

* commit 'dec0b755fff1bf87aafd397ef0dd864f54c587cf':
MTP host: Fix problems reading large data packets
fa640154f1f42121d81242b2f1a10f03e52f0014 13-Mar-2011 Eric Laurent <elaurent@google.com> Partial fix for issue 3515250: video chat and SCO

Do not call directly into AudioSystem in setBluetoothScoOn() but
send a message to the AudioService handler instead. As the
procedure to switch audio path to BT SCO can last some time we should
not block the caller which can run in the UI thread.

Change-Id: I6ac4b5a934d69781db3aebe5d0e8137b52a0ada4
ava/android/media/AudioService.java
bcc0516bc8d0849f64f2fe759229301aa6eb7325 12-Mar-2011 Mike Lockwood <lockwood@android.com> MTP host: Fix problems reading large data packets

Fixes problem reading large thumbnails via PTP

Bug: 4065217

Change-Id: I643672512829c93ab0827091f39103dbb1918071
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDataPacket.cpp
e1976e5c61cdbd22db291ba1698079469bc21955 12-Mar-2011 Mike Lockwood <lockwood@android.com> am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1

* commit '3b473d958c46ea6511b9599f727b47636e5cbc4a':
USB: minor cleanup work
133cf8b92a07d5be8c64607b9644aa9cef169fb0 12-Mar-2011 James Dong <jdong@google.com> Add a release() method to MediaScanner

bug - 2586042

Change-Id: I08713ac75cbcaf01dff21a24cdefb6e2dacc92cb
ava/android/media/MediaScanner.java
ni/android_media_MediaScanner.cpp
a7727dc887e68cf835bda9ebebd07a1fa9ec7595 12-Mar-2011 James Dong <jdong@google.com> Merge "If MP3 decoder output frame size were 0, media server would crash."
3b473d958c46ea6511b9599f727b47636e5cbc4a 12-Mar-2011 Mike Lockwood <lockwood@android.com> am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1

* commit '9fffd9a8bb73e9b225878686862d49b27e98c659':
USB: minor cleanup work
86ad55028be46a4cfbe821f27729fcebf045ccc8 12-Mar-2011 Ying Wang <wangying@google.com> Merge "Remove unnecessary ld flags."
69ad25e0ffdc034abb19bfe617fd2d46bfa69cca 26-Feb-2011 James Dong <jdong@google.com> If MP3 decoder output frame size were 0, media server would crash.

This is to log an error message should that happen.

Change-Id: I0f947cd7a8e6639b4f11a928bf90286a34cc652e
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
eab30df28154ef6b671340726225ea60c8443595 12-Mar-2011 Ying Wang <wangying@google.com> Remove unnecessary ld flags.

This fixes the x86 buid, in which bfd linker is unavailabe.

Change-Id: Ibce1b5cbfb0435644b2d75056003578371510929
ni/mediaeditor/Android.mk
62cfeeb821afb2f3d3b78ad93caa13408cd26eac 12-Mar-2011 Mike Lockwood <lockwood@android.com> USB: minor cleanup work

Bug: 4067029

Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpConstants.java
ava/android/mtp/MtpDevice.java
206c62ed34dc8a48fd6c907d95456226949f42dd 12-Mar-2011 Kenny Root <kroot@android.com> am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"

* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
Remove unnecessary SkImageDecoder_libjpeg.cpp
d96d1be7bd4ba6ebb3e4653ab39f36988b9727cc 12-Mar-2011 James Dong <jdong@google.com> Merge "A little cleanup in MediaScanner JNI code"
7d93b7574f741a9cd8872771faefa3c92bed6576 11-Mar-2011 James Dong <jdong@google.com> am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread

* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
4c1ac4e66560f53625de28663c67e81a5f8f4401 10-Mar-2011 Chih-Wei Huang <cwhuang@linux.org.tw> Remove unnecessary SkImageDecoder_libjpeg.cpp

Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: Ia0ed72d8a6cbd3b2f3997b71dfdcf72fee50f5bb
ests/omxjpegdecoder/Android.mk
f39975285874ba80bca3e8d94323c6aad3bb83da 11-Mar-2011 James Dong <jdong@google.com> A little cleanup in MediaScanner JNI code

o mainly use the defined class name rather than repeat the string each time
to reduce the typo chance.
o format the code also

Change-Id: I131c98f11335ff524d01a6791baa1b8c11013abc
ni/android_media_MediaScanner.cpp
b46ecb352617b4c2f2d5f716aa6af6f518d1f579 11-Mar-2011 Mike Lockwood <lockwood@android.com> am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1

* commit '75c95e9a6d5a91b660af62f72b5a3bac0f5c3811':
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
75c95e9a6d5a91b660af62f72b5a3bac0f5c3811 11-Mar-2011 Mike Lockwood <lockwood@android.com> am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1

* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
070b2e1a5c63b4f5421a0d222e975652e33795bb 11-Mar-2011 James Dong <jdong@google.com> MP3Extractor and MP3 decoder fixes - DO NOT MERGE

cherry-picked the following patches from HC branch:
o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits
o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
o When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.
o Speed up MP3Extractor using cached reads

bug - 4083532

Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
ibstagefright/MP3Extractor.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
0eb7b697b7c180660647b5cd0cd7dd067f6b6abb 11-Mar-2011 Mike Lockwood <lockwood@android.com> Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1

* changes:
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
92b94c7f97a36da480df9a45e89a640a22e9bda4 11-Mar-2011 Andreas Huber <andih@google.com> Only use ChromiumHTTPDataSource if webkit was built with chromium support.

Change-Id: I9ce16f4aae35c61c9fb92fefc2a7c72537631cba
ibstagefright/Android.mk
ibstagefright/HTTPBase.cpp
6dd429efe2f5f4aee1f3b934bb5404e24d65ac93 11-Mar-2011 Glenn Kasten <gkasten@google.com> am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1

* commit '055066e1e77d944383360d50057f5b8187f23c0b':
Bug 3012968 DRM output control
055066e1e77d944383360d50057f5b8187f23c0b 11-Mar-2011 Glenn Kasten <gkasten@google.com> am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1

* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug 3012968 DRM output control
c72eb9113a2f3f7886afcecf5c29507e0a3a8266 11-Mar-2011 Mike Lockwood <lockwood@android.com> Remove MtpClient class from framework and public API

After reviewing this class I decided it would be best not to include it in the public API
since it adds no functionality that cannot be done using MtpDevice and other APIs directly.
So I am moving it to the CameraBrowser sample instead.

Also changed CameraBrowser to build against the SDK to ensure all the necessary APIs for
PTP support have been made public.

Bug: 4067029

Change-Id: I585b06104084953176d018ced08bba0cb4607490
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpClient.java
ests/CameraBrowser/Android.mk
ests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/CameraBrowserApplication.java
ests/CameraBrowser/src/com/android/camerabrowser/MtpClient.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
ests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java
acc29cc91be634070c92a807df412ced97b9b375 11-Mar-2011 Mike Lockwood <lockwood@android.com> UsbDevice: Move IO related methods to new UsbDeviceConnection class

UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpClient.java
ava/android/mtp/MtpDevice.java
b8763f60b488ea4e233c9ebed8208599edb36da3 28-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 3012968 DRM output control

Modifies Stagefright to verify that there is a hardware-protected path
to video sink for DRM content.

Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
7363ac80cf368c4ff0743c43d9bd366d4aaefd4b 11-Mar-2011 Gloria Wang <gwang@google.com> Merge "Fix for bug 3477330 This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead."
ae7752798a98fc81ff5e6ae69dde2137692106be 25-Feb-2011 Gloria Wang <gwang@google.com> Fix for bug 3477330
This patch fixs a crash bug caused by using a NULL DecryptHandle pointer.
Fix by using sp<DecryptHandle> instead.

Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/FileSource.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/ChromiumHTTPDataSource.h
ibstagefright/include/DRMExtractor.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/NuHTTPDataSource.h
c0d9d25b8731be61015ebf44c10a2d372d52c893 11-Mar-2011 Rajneesh Chowdury <rajneeshc@google.com> am a4865ec7: am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1

* commit 'a4865ec73f9faccd6dc442cbc6d78666b1a69b28':
Fix for 4080402 NPE in Transition.setDuration
a4865ec73f9faccd6dc442cbc6d78666b1a69b28 11-Mar-2011 Rajneesh Chowdury <rajneeshc@google.com> am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1

* commit 'a7118e33b494b26bfbd37c895a1c412cd5da56ec':
Fix for 4080402 NPE in Transition.setDuration
a7118e33b494b26bfbd37c895a1c412cd5da56ec 11-Mar-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
e7defc29750e5e201a5041d0fce1ffca9e305229 10-Mar-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for 4080402 NPE in Transition.setDuration

Change-Id: I1e4499e3191beafdaf9bb4b7fd51798bd1eab300
ava/android/media/videoeditor/Transition.java
ava/android/media/videoeditor/TransitionAlpha.java
c2d68c90961328721a6b90577f684f6deb16165d 10-Mar-2011 Chih-Wei Huang <cwhuang@linux.org.tw> Remove unnecessary SkImageDecoder_libjpeg.cpp

Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
ests/omxjpegdecoder/Android.mk
8fe7ca1d7ddaf9faace4a12666381b14e73a3a4b 10-Mar-2011 Mike Lockwood <lockwood@android.com> am 18d8a074: am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1

* commit '18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896':
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896 10-Mar-2011 Mike Lockwood <lockwood@android.com> am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1

* commit '564f12ebe409bead467eee04dfd719e97367e520':
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
564f12ebe409bead467eee04dfd719e97367e520 10-Mar-2011 Mike Lockwood <lockwood@android.com> Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1

* changes:
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
aab7d1a29a5494fbf3082a981aaad2b68067205b 10-Mar-2011 Andreas Huber <andih@google.com> Merge "Support http authentication ala http://foo:bar@host.org in stagefright."
3b093c13398493956ba7ba656e5ccd89ef86d7aa 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am d1e09e08: am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.

* commit 'd1e09e08210e755034bbdd07e1f48b35ec9a4752':
Support IPv6->IPv4 fallback in HTTP streaming.
6c3727413bee46facfce797c6acdbaafe001022e 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am d6aaec0c: am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.

* commit 'd6aaec0ce7639a9d8bb73983711e20545b55e860':
Support IPv6 in HTTP streaming.
d1e09e08210e755034bbdd07e1f48b35ec9a4752 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.

* commit '8df2477c4e7e5bf72d6d1216ae5184c53304470e':
Support IPv6->IPv4 fallback in HTTP streaming.
d6aaec0ce7639a9d8bb73983711e20545b55e860 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.

* commit 'e4a02b61290fa61955c979cfd1afc17a92bba481':
Support IPv6 in HTTP streaming.
8df2477c4e7e5bf72d6d1216ae5184c53304470e 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.

* commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a':
Support IPv6->IPv4 fallback in HTTP streaming.
e4a02b61290fa61955c979cfd1afc17a92bba481 10-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am b9da16a1: Support IPv6 in HTTP streaming.

* commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
20660eeb4dcb8f5ecb469b2e09c2d1f53c57a98f 09-Mar-2011 Andreas Huber <andih@google.com> Support http authentication ala http://foo:bar@host.org in stagefright.

Change-Id: I0b20077ad540ec8aa11adf0ca9f4142ea8b8ae98
ibstagefright/chromium_http/support.cpp
b966b9d9e882835691e5adda292d89dd704df71c 09-Mar-2011 Mike Lockwood <lockwood@android.com> MTP: Convert date created and modified values from seconds to milliseconds

BUG: 4026365

Change-Id: Ifd78cca305299ed1cedd6595609d9bf8d520cd8e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_mtp_MtpDevice.cpp
db7dc9cc892dc6fb57f1a4a178c45bcb6437f821 09-Mar-2011 Andreas Huber <andih@google.com> Use the same http proxy mechanism that webkit uses instead of bypassing proxies.

Change-Id: Ifd64664d3052fbfa715c2920984170c2a6190f6b
related-to-bug: 3440271
ibstagefright/chromium_http/support.cpp
18632db49a938ca1ec12fbb2e4377e3d776d3ac2 09-Mar-2011 Eric Laurent <elaurent@google.com> am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1

* commit '2dc78477364bd4accb9a603baaafca9a5523dcec':
Fix issue 3439872: video chat and bluetooth SCO
cc34967fdcbf64826a068901d6fb1bd8bb1fa99f 09-Mar-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
f9f6087915f8db1c13fbd0ae83aa5bfccc3e4b90 09-Mar-2011 Andreas Huber <andih@google.com> Merge "An HTTP datasource for stagefright using the chromium code."
0984ba25dbb6b405a905264b343e8286483368cb 09-Mar-2011 Jean-Michel Trivi <jmtrivi@google.com> am 8d0e2b98: am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1

* commit '8d0e2b9857e5f77ced233dc408a7acd9e8ab2e8c':
Fix bug 4064086 Use a death handler on audio focus changes from mode
5fa7aac81b471557cd944f762340281e5fa012f9 09-Mar-2011 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
5f5719e45b3c4e3237a45b019e0fcd86060974a8 09-Mar-2011 Andreas Huber <andih@google.com> An HTTP datasource for stagefright using the chromium code.

Use of this new datasource is now the default unless overwritten by

adb shell setprop media.stagefright.use-chromium false

Change-Id: I156a8eb9a1fff1cb537b4aec6cf3e8e6052be81e
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/HTTPBase.cpp
ibstagefright/chromium_http/Android.mk
ibstagefright/chromium_http/ChromiumHTTPDataSource.cpp
ibstagefright/chromium_http/support.cpp
ibstagefright/chromium_http/support.h
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/ChromiumHTTPDataSource.h
ibstagefright/include/HTTPBase.h
ibstagefright/include/LiveSession.h
ibstagefright/include/NuHTTPDataSource.h
77e1a4c57e1d5a75a09c514ef5b7d358a9150bbf 09-Mar-2011 Mike Lockwood <lockwood@android.com> am 093cf07f: am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1

* commit '093cf07f3c58a6553c415d750edba1a75b269f05':
Close USB dialogs if their corresponding accessory or device has disconnected
USB: Add API and dialog for apps to request permissions for USB devices and accessories
UsbService: Automatically use system apps by default if it is the only choice
3a68b8338b431eb15d28e92f06452efbbda9493e 08-Mar-2011 Mike Lockwood <lockwood@android.com> USB: Add API and dialog for apps to request permissions for USB devices and accessories

New APIs:

UsbManager.hasPermission returns true if the caller has permission
for the given device or accessory

UsbManager.requestPermission poses a dialog to allow the user to give the caller
permission for the device or accessory.
Result is returned via a PendingIntent.
No dialog is displayed if the caller already has permission.

Also moved UsbResolverActivity to SystemUI package

BUG: 4069037

Change-Id: I93be769501a8776b49ac26e468af19f8fa2114c9
ava/android/mtp/MtpClient.java
421ddc014b31478ba0ef115e098d8780a35af331 07-Mar-2011 Eric Laurent <elaurent@google.com> Fix issue 3439872: video chat and bluetooth SCO

This change fixes the stability problems experienced when using
a bluetooth headset supporting both A2DP and SCO. Problems occur
when starting the video chat at which time the A2DP output is being
stopped to start SCO. At that time, active AudioTracks are invalidated
by AudioFlinger so that a new AudioTrack binder interface can be
recreated by the client process on the new mixer thread with correct parameters.
The problem was that the process to restore the binder interface was not
protected against concurrent requests which caused 2 binder interfaces
to be created sometimes. This could lead to permanent client deadlock
if one of the client threads was waiting for a condition of the first
created binder interface while the second one was created (as the AudioFlinger
would only signal conditions on the last one created).
This concurrent request situation is more likely to happen when a client
uses the JAVA AudioTrack as the JNI implementation uses simultaneously the
native AudioTrack callback and write push mechanisms. By doing so, the code
that checks if the binder interface should be restored (in obtainBuffer()) is
much more likely to be called concurrently from two different threads.

The fix consists in protecting the critical binder interface restore phase
with a flag in the AudioTrack control block. The first thread acting upon the binder
interface restore request will raise the flag and the second thread will just wait for
a condition to be signaled when the restore process is complete.

Also protected all accesses to the AudioTrack control block by a mutex to prevent
access while the track is being destroyed and restored. If a mutex cannot be held
(e.g because we call a callback function), acquire a strong reference on the IAudioTrack
to prevent its destruction while the cblk is being accessed.

Modified AudioTrack JNI to use GetByteArrayElements() instead of
GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would
cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem
callback being called during the critical section when media server process restarts.
Anyway with current JNI implementation, either versions do not copy data most of the times
and the criticial version does not guaranty no data copy.

The same modifications have been made to AudioRecord.

Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
382f4e6ea4dcf39105b36364582ed01642daa93c 08-Mar-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 4064086 Use a death handler on audio focus changes from mode

Use a death handler when audio focus changes are caused by audio
mode changes.

The bug comes from the fact that audio focus clients that use the
audio mode for automatic focus handling didn't register a death
handler, which was set to null. When such a client died, this
handler was compared against the one to remove from the
audio focus stack, which resulted in an NPE.
The fix consists in registering a valid IBinder object in the
audio focus stack, even for clients whose focus requests originate
from a change in audio mode, as implemented in the
handleFocusForCalls() method.

Change-Id: Id9e1d3d10afcd99969285f6d60fc4d7dde1e4a10
ava/android/media/AudioService.java
bd0e806a61df9b67890dc3b1390db554e7468b4a 04-Feb-2011 Lorenzo Colitti <lorenzo@google.com> Support IPv6->IPv4 fallback in HTTP streaming.

Bug: 4068057
Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
ibstagefright/HTTPStream.cpp
b9da16a1e36fcf4e38a50adcf10ea59c12dea254 04-Jan-2011 Lorenzo Colitti <lorenzo@google.com> Support IPv6 in HTTP streaming.

Bug: 4068057
Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
ibstagefright/HTTPStream.cpp
8b4a4207f6683ee3d9aaf9510a64c2f3589a5d69 08-Mar-2011 Mike Lockwood <lockwood@android.com> am bd3d019c: am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1

* commit 'bd3d019cc66237c23ab0658ff80aa7923e84b239':
MTP: Use SharedPreferences for MTP device properties rather than sqlite3
823f5bf3db8b2f588ae917aaff5d27a65c87f132 08-Mar-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
165c77b9e4b0e3e204cf529b1fcbfbbe25f0d9b1 08-Mar-2011 Santosh Madhava <smadhava@google.com> am 5893b453: am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1

* commit '5893b453fc762d18e759a391a442600be4924489':
Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
0e8dc72db34c0a4eb92763de4e048abc4d20f47f 08-Mar-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
2df32f92cff0c7f4c097cdb8cd28f6e6a6ede96e 08-Mar-2011 James Dong <jdong@google.com> Merge "Add the default back-facing camera to the MediaProfile camera vector As a result, missing media_profiles.xml will be still allowed."
d21668768ae4b176119692c5c5d06d2cb7ceec8b 08-Mar-2011 James Dong <jdong@google.com> Add the default back-facing camera to the MediaProfile camera vector
As a result, missing media_profiles.xml will be still allowed.

Change-Id: Ie6c1bbfdfd4e971f1d5d0e031a913e757f3863a7
ibmedia/MediaProfiles.cpp
b1be086e1d2f15c858b4aa7f40d49667b3e26d3a 08-Mar-2011 James Dong <jdong@google.com> am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...

* commit 'd581c04722e2610ca5471b9c3d1881043b1205b1':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
d581c04722e2610ca5471b9c3d1881043b1205b1 07-Mar-2011 James Dong <jdong@google.com> Add missing copyright headers for a couple of files. DO NOT MERGE
Cherry-picked from other branch...

bug - 4025673

Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/NuHTTPDataSource.h
6f3489caf2c6bd280802e3c100f53c930a107d85 07-Mar-2011 James Dong <jdong@google.com> am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1

* commit 'a7c9dffdb8097105482ce976ba0a51baa76d8806':
Add missing copyright headers to a couple of files
4ed072f904b5344ce4ef6f832c618a1d3f43867d 07-Mar-2011 James Dong <jdong@google.com> Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
e2693e5d6237a2aacda3c337eabfc42af273c594 05-Mar-2011 James Dong <jdong@google.com> Add missing copyright headers to a couple of files

bug - 4025673

Change-Id: Ie1c4cf18c06032f9b89cc08e5be25d38c0f76aa1
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/NuHTTPDataSource.h
2d5bb293a47326bb615362315aa919376d0fcf98 07-Mar-2011 Mike Lockwood <lockwood@android.com> am 1cdb2929: am 11cb5cb9: Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1

* commit '1cdb2929f368a1ab1c30e89200e585fcb1278492':
MtpClient: Fix problem with getDeviceList() returning empty result in some cases
2b8a1ee0578e81b6600d5b2b03db9446d63e4616 07-Mar-2011 Mike Lockwood <lockwood@android.com> MtpClient: Fix problem with getDeviceList() returning empty result in some cases

BUG: 3503128

Change-Id: I2263437d6018848e316ae4096eb07305fc4dc486
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpClient.java
bfa40efc9b9105aaa3a2ea52b1d37de411d81e3b 07-Mar-2011 Andreas Huber <andih@google.com> Merge "Added more metadata published by the MediaMetaDataRetriever"
775de951a8d4f4fe58c849efd9ef7b92c4ade907 05-Mar-2011 Mike Lockwood <lockwood@android.com> MTP: Use SharedPreferences for MTP device properties rather than sqlite3

sqlite3 is overkill for what we are doing here, and more fragile.

BUG: 3512856

Change-Id: I83d86127949d894a3887db3456d91b013060e852
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpDatabase.java
895a28e14e6c88b4ff3b1f1cdf02d22f7b3b52ca 05-Mar-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents

Change-Id: I376483c42b5bed8d2a1765804c2261c18d720a0c
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaVideoItem.java
ni/mediaeditor/VideoEditorOsal.cpp
ni/mediaeditor/VideoEditorPropertiesMain.cpp
6f4d877bbfda6efb71a3357fa071108b5059aa0b 05-Mar-2011 James Dong <jdong@google.com> am 0b7912d3: am 99b86247: Fix a leak from AACEncoder.cpp

* commit '0b7912d32848e123e3356d6452895f734b5dda7e':
Fix a leak from AACEncoder.cpp
99b862476df2f5d487db98a32a0c88e3a6be8420 05-Mar-2011 James Dong <jdong@google.com> Fix a leak from AACEncoder.cpp

bug - 3470617

Change-Id: I328e92bc1b2aca72e5856703dae00f957f40bc27
ibstagefright/codecs/aacenc/AACEncoder.cpp
f7748f40a61d701ebdba391b291fea04b5f459fa 04-Mar-2011 James Dong <jdong@google.com> am 70d7522e: am 865448a0: Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1

* commit '70d7522e9f25f80f528d9737fa67976eacb24afd':
Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
858b673a3518b2b15302cfdbf9433f111536c72c 04-Mar-2011 James Dong <jdong@google.com> Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode

For some mp3 files, the mode can be changed from one audio frame to another. Without
the capability to switch modes, the decoded audio may have lots of artifacts.

bug - 3253310

Change-Id: Id57bb1f204642d15e38a800c72214f6794cfaa37
ibstagefright/MP3Extractor.cpp
c4c38fc1ea06086ea3c7ba12f59ecfacd5fa716b 04-Mar-2011 Andreas Huber <andih@google.com> Added more metadata published by the MediaMetaDataRetriever

- presence of audio/video content
- video dimensions
- avg. bitrate

Change-Id: Ie6d478a3c2d0bb6bebaea99ac0a20a4c17808934
related-to-bug: 3506316
ava/android/media/MediaMetadataRetriever.java
ibstagefright/StagefrightMetadataRetriever.cpp
f80e45a60a93c7bd63a47f5cb23750b69567fc37 03-Mar-2011 Andreas Huber <andih@google.com> Reject streaming .mp4 files over http that are not muxed reasonably.

Audio and video samples must be reasonably close by at any given timestamp,
for now we define "reasonably" as "their offsets must not be more than 1MB apart".

related-to-bug: 3509977
Change-Id: I4c3a2a239bf911306833f3b17b73c9e2f76ab901
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/MPEG4Extractor.h
a2c322f599b5a44ca153922b994a05a4311331cb 22-Feb-2011 Ray Chen <raychen@google.com> 3406494 Gallery photos in nonsensical order

Change-Id: Ic992465a6683179bff280753dcaf9aa6372424e6
ava/android/media/MediaScanner.java
396f6de6606e44bcbef9548d369e31945dfa46b1 03-Mar-2011 Gloria Wang <gwang@google.com> Merge "- To track the usage of all audio output devices - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()"
37b05d7d61cb7e7313736e14ca46c1287c5d1089 03-Mar-2011 Mike Lockwood <lockwood@android.com> Merge "MtpClient: remove finalize override to avoid multiple calls to unregisterReceiver"
1bdeef34efc4245c8ec47799e2bd0bfa4408ef2b 03-Mar-2011 Mike Lockwood <lockwood@android.com> MtpClient: remove finalize override to avoid multiple calls to unregisterReceiver

BUG: 3497801

Change-Id: I4ed0166efcc509a18361287c5816bc4844089025
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpClient.java
9b3f1521b521fd7248632fed71a81423e479a523 24-Feb-2011 Gloria Wang <gwang@google.com> - To track the usage of all audio output devices
- To track the currently used audio device
- The devices are separated as speaker and other audio devices
- Provide the collected data to battery application through pullBatteryData()

Change-Id: I374c755266b5ac6b1c6c630400f4daf901ea8acc
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
28a8cb75e8b67e0e43d7ac252c7fa0186680fc2a 03-Mar-2011 Jamie Gennis <jgennis@google.com> Merge "Stagefright: Use the ANW min undequeued bufs query."
ce80b0ca3339cc674b85cbc40e8287eac2a2ee5f 03-Mar-2011 Andreas Huber <andih@google.com> Merge "Resize internal PES buffers dynamically instead of relying on a fixed maximum size."
56e84ba1506399f78125db838dab8db5816fe731 03-Mar-2011 Andreas Huber <andih@google.com> Resize internal PES buffers dynamically instead of relying on a fixed maximum size.

Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952
ibstagefright/mpeg2ts/ATSParser.cpp
00fa3a729c49d6dabaf2fa8127dccc2f6eb0af00 03-Mar-2011 Andreas Huber <andih@google.com> Merge "Allow optional specification of a PTS timestamp when signalling a discontinuity."
669ad13de924af145771837b339c882e30ea8ce2 03-Mar-2011 Andreas Huber <andih@google.com> Allow optional specification of a PTS timestamp when signalling a discontinuity.

If present, rendering will be suppressed until reaching the timestamp.

Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19
related-to-bug: 3489454
ibmedia/IStreamSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
ibmediaplayerservice/nuplayer/NuPlayerStreamListener.h
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
d08f27ee5b0bd6dee4942bbefd02dc4add09d742 02-Mar-2011 James Dong <jdong@google.com> Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits"
c096a1308e4637ce75f993719cbe651ad90af40f 02-Mar-2011 James Dong <jdong@google.com> PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits

bug - 3464899

Change-Id: Idef81a1bd3846d60fc5e4a40c11ce1ba78ebaa23
ibstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
76bb1200c2ea08665f33fb0d54023113c19b8286 02-Mar-2011 Andreas Huber <andih@google.com> Merge "Provide better duration and seek accuracy if playing vorbis audio from a non-streaming source."
4a3a05879e898fee398137aa78ff74556b600948 02-Mar-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "Fix for issue 3371667: fix source code compilation warnings (4)"
c655790d61ce7070de79291cb2340a987379f749 02-Mar-2011 Andreas Huber <andih@google.com> Provide better duration and seek accuracy if playing vorbis audio from a non-streaming source.

Change-Id: Ib823c2dd28e84f4c49e3676f4e4962a6e006b166
related-to-bug: 3107013
ibstagefright/OggExtractor.cpp
4fad6762c6429379c4f7fe5d78e84d0718f52817 28-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Fix for issue 3371667: fix source code compilation warnings (4)

Change-Id: I898f81fea6c061b9ca7cbd675218d9f4b8c0bc77
ni/mediaeditor/VideoBrowserMain.c
ni/mediaeditor/VideoEditorClasses.cpp
06b3afe2bdea5a00a2221ca1f3381def1c431ab7 02-Mar-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3495914: (In Java) Video clip switches between start and end"
7256a7c525e079442fd733db692936f5f070b996 02-Mar-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3495914: (In Java) Video clip switches between start and end

Change-Id: Ie5ea83c61c6c008162abea76e15d745a901a1e23
ava/android/media/videoeditor/MediaArtistNativeHelper.java
de1d7b4be6cb77734b05c8d7990dc87c60d4f2b1 02-Mar-2011 James Dong <jdong@google.com> Merge "Get rid of redundant media profiles"
797e4f1dce3790a76a515468f61a1e5e17c6702e 01-Mar-2011 James Dong <jdong@google.com> Get rid of redundant media profiles

bug - 3330679

Change-Id: Idc55aea32746c0c57552c5e15a289681421aa859
ibmedia/MediaProfiles.cpp
9b44c662d5cf63e84e7e27a6b386688d1d1982b7 01-Mar-2011 Eric Laurent <elaurent@google.com> Fix issue 3499926.

Make sure that NumberEffectsEnabled is decremented at the same time as
SamplesToExitCountBb reaches 0 in Effect_process(). Not doing so
causes NumberEffectsEnabled not being decremented if Effect_setEnabled()
is called after SamplesToExitCountBb reaches 0 and before next Effect_process() is called.

Change-Id: Id827a301f93a5a09ecd9995a0c7d731ef526711a
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
2380aa08c2571b4e2577a14f02a93a8047236460 01-Mar-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3431967: Memory leak from video editor engine"
04e1a9620f94319c455c9422776adb4a8963f920 01-Mar-2011 Mike Lockwood <lockwood@android.com> Merge "Move USB framework support from android.hardware to android.hardware.usb package"
71771b3b1bbcafe84e7bd14941b98a1b1d6c8a60 01-Mar-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3431967: Memory leak from video editor engine

Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
ni/mediaeditor/VideoEditorMain.cpp
7fc013753bdaddd429ffbc13ba33cc405f4ebcee 01-Mar-2011 Jamie Gennis <jgennis@google.com> Merge "Stagefright: Query buffer usage from the component."
29f87f76bc3c39005c8ce7a78fe23c2c3f19cc24 01-Mar-2011 Jamie Gennis <jgennis@google.com> Merge "Add an OMX IL API for querying buffer usage flags."
dbb520e0a0026b58fb6ba8be65ae4754f154feea 01-Mar-2011 Jamie Gennis <jgennis@google.com> Merge "Fix error recovery in Stagefright init."
c4308f01c965571dc2354107c3574df113e397ee 01-Mar-2011 Mike Lockwood <lockwood@android.com> Move USB framework support from android.hardware to android.hardware.usb package

Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpClient.java
ava/android/mtp/MtpDevice.java
ests/CameraBrowser/AndroidManifest.xml
ests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
e8be6a8d5bcade52a19a043b3d366b42062a25be 01-Mar-2011 Mike Lockwood <lockwood@android.com> Merge "CameraBrowser: Add USB device filter meta-data for digital cameras"
0fd3c4a1e2716afdf2a1459abf0bdb76f1c3ddf0 27-Feb-2011 Mike Lockwood <lockwood@android.com> CameraBrowser: Add USB device filter meta-data for digital cameras

This is used by the USB service to associate Gallery with PTP cameras.
Removed unnecessary broadcast receiver

Change-Id: Ifd78aa94f69cb7d6ec0b557313e90bb79812f15d
ests/CameraBrowser/AndroidManifest.xml
ests/CameraBrowser/res/xml/device_filter.xml
ests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java
4fdc6ebb9130ace5687ad2192507d47c48e8b8c1 28-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Remove the hard coded media recorder test cases. Add the native heap dump catpure functionality."
01951fdbdc6437109cc521b7c60880f74823a003 28-Feb-2011 Jamie Gennis <jgennis@google.com> Stagefright: Use the ANW min undequeued bufs query.

This change modifies Stagefright's ANativeWindow initialization to use
the new MIN_UNDEQUEUED_BUFFERS query on the ANativeWindow.

Change-Id: I62565945e90ac40de326de77adcfa5577ed89975
Related-Bug: 3356050
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
420246479b8dfbfdd583564655f2bda5a36a7912 23-Feb-2011 Jamie Gennis <jgennis@google.com> Fix error recovery in Stagefright init.

This change fixes the error path of
OMXCodec::allocateOutputBuffersFromNativeWindow so that it cancels the
correct number of buffers if a dequeueBuffer operation fails.

Change-Id: Ib7cdcdf24f1718bc070ad218a5980949c0e942eb
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
94c59802c055d5f45f143896e59a3dc860cdc1b2 24-Feb-2011 Jamie Gennis <jgennis@google.com> Stagefright: Query buffer usage from the component.

This change makes Stagefright query the gralloc buffer usage flags from
the OMX IL component and passing those flags on to the ANativeWindow.

Change-Id: Ic9af8a9e6df9ff4aadc7355890324d68841bc488
Related-Bug: 3479027
ibstagefright/ACodec.cpp
ibstagefright/OMXCodec.cpp
e6befb88bd2ade12c50b0a0e95b209e1f4be94b4 24-Feb-2011 Jamie Gennis <jgennis@google.com> Add an OMX IL API for querying buffer usage flags.

This change defines an OpenMAX IL API for querying from the IL component
the gralloc buffer usage flags that should be used to allocate the
buffers. It also adds the Stagefright plumbing for using the new OMX IL
API.

Change-Id: I046b5e7be70ce61e2a921dcdc6e3aa9324d19ea6
Related-Bug: 3479027
ibmedia/IOMX.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
8f77b413e8a31e508859e9cc257c9543a5b7887d 28-Feb-2011 James Dong <jdong@google.com> Merge "The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4."
9e69035598914f1c92dd0f58b3e40f9eb29a82f8 28-Feb-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3466385: Low quality video properties are applied to all"
65260be5d4e9793b466d84ca5f59b20a8605126c 28-Feb-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 3388354."
051d4430715ea257f0afd124b919a14ced6385b8 28-Feb-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Instrumentation code to enable/disable memory leak check using setprop"
854938a72d968c1bc0de4e2b0ea87777cfebc045 22-Feb-2011 Eric Laurent <elaurent@google.com> Fix issue 3388354.

Release all sco audio clients when the intent indicating
STATE_AUDIO_DISCONNECTED state is received.
Also clear mScoClients array when clients are released.

Change-Id: I63ec9d70fe72a102e09a4a473a367fb2e550b171
ava/android/media/AudioService.java
15f5eeef0e75ca269711325fbbbe67f5ea4de59f 28-Feb-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3431967: Memory leak from video editor engine"
5f63069f3256f8ba253d1331c5bef0d162d2bd67 21-Feb-2011 Glenn Kasten <gkasten@google.com> Bug 3447027 Limit previews for DRM video

Change-Id: I5b15cf6a15623cf73f007c59143ab5e3fa5a07e8
ibstagefright/DRMExtractor.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
f67441eb370f764710b5697885d1a1549d41e819 25-Feb-2011 Rajneesh Chowdury <rajneeshc@google.com> Instrumentation code to enable/disable memory leak check using setprop

The heap memory dump is enabled when libc.debug.malloc property is 1.
Two .dump files are created in predefined path.

Memory leak report can be generated using nativeheapdump tool.

Change-Id: Ie03928b5a05993e72d4700a158657c514478ecd3
ava/android/media/videoeditor/VideoEditorImpl.java
7c8f25f5b81ed2c6520174ead6d0fdf96a313945 28-Feb-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3431967: Memory leak from video editor engine

Change-Id: I610e82f5bdb8ac7b32541301a9fa41bbd8f1459d
ni/mediaeditor/VideoEditorMain.cpp
bcbf68583e38eeb79266f9f3a8c3d1b17f75a8c2 28-Feb-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3466385: Low quality video properties are applied to all

Change-Id: Idcae85d88de65bae549263f9c43a6f3020dd63a1
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/VideoEditorImpl.java
62f755ac65cb40f231a7fa0695724ae01975d01c 26-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Remove the hard coded media recorder test cases.
Add the native heap dump catpure functionality.

Change-Id: I434ff886152cbb9b2b9a4e39c75bfd016e0e50a0
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaTestUtil.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
e883d317d51733145b880ce11c610f0287fba447 25-Feb-2011 James Dong <jdong@google.com> mp4a box contains mp3 audio when the object type indication is 0x6b

In this case, the MediaExtractor returns ERROR_UNSUPPORTED since our
software MP3 audio decoder may not be able to handle packetized
MP3 audio.

bug - 3377570

Change-Id: I8bb6b3813716b5fa019e318842e8e1908b3c8bf8
ibstagefright/MPEG4Extractor.cpp
66d16910a84c9a67d854cf1d2d78cee94641be1f 25-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor: Issue:3396697: Update Perf and Stress test code"
0c6a5182ed7b7d6bf25785f41b3a45bf2f48c989 25-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor: Issue:3396697: Update Perf and Stress test code

Change-Id: Ifd90e8e1fdff1a04d47a3ae65813584cab78255c
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java
0b52dbe315938329b018f14a334ac1b50307031e 25-Feb-2011 Andreas Huber <andih@google.com> Merge "Alternate patch for late video issue: seek only the video ahead to the next"
92df99547fa8c02bbd1e463a9d4596a03dd73fcb 25-Feb-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3485010: The project thumbnail is not regenerated"
89782f501343fdbbe3bd6ab36e65474d49cd4b89 25-Feb-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3485010: The project thumbnail is not regenerated

Change-Id: I2c882bdf2e82b95b1ad19ab50ec636a78b1c1561
ava/android/media/videoeditor/VideoEditorImpl.java
a28f6f11f22963e3679537e83f243edeaa5ee17c 24-Feb-2011 Andreas Huber <andih@google.com> Merge "Suppress the logging of URLs when in incognito mode."
53182c439cf16f910974fd1f9d6c3002dda445eb 24-Feb-2011 Andreas Huber <andih@google.com> Suppress the logging of URLs when in incognito mode.

Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a
related-to-bug: 3336575
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/LiveSession.h
ibstagefright/include/NuHTTPDataSource.h
b607b884bd94d4f75fb4b2ead7457f2027ceb850 24-Feb-2011 Mike Lockwood <lockwood@android.com> Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts"
a2c29973e34aa9d26f98a609f79692f709e1ce11 24-Feb-2011 Andreas Huber <andih@google.com> Alternate patch for late video issue: seek only the video ahead to the next

syncframe after the current audio media position, leave audio untouched.

Change-Id: Ia9fa8e205467e5460c8219afd396bddd09fcfb46
related-to-bug: 3375737
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
373ed6fc79e6c41f4b5dbb8eb72363033f2e40b3 24-Feb-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"
563ab6ec5ec16db78567f8b3c9dff22c5dfaab08 24-Feb-2011 James Dong <jdong@google.com> Fix MP3Extractor

When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.

o also fix some of the formatting string for logging

bug - 3482444

Change-Id: Ie0b56f4691ff9e80a48a57f1b7d0d28c78cfb313
ibstagefright/MP3Extractor.cpp
7b76c8d3fc25aedea6edfed9638b008faa2f6ae8 24-Feb-2011 Glenn Kasten <gkasten@google.com> Merge "Don't crash when parsing DRM MIME types"
bc5f1f5c815e6a158859c031fa7bb0fd68d973b9 24-Feb-2011 James Dong <jdong@google.com> d263 may contain optional bitr box, and thus its size can be up to 23 bytes

bug - 3482703

Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
ibstagefright/MPEG4Extractor.cpp
7f97c4ef12263a70a5c9ee7cd16f194c0240e658 24-Feb-2011 Mathias Agopian <mathias@google.com> Merge "Remove RefBase.h dependency on TextOutput.h"
cc562a3576a6a8096626387472e05e8bee03352a 09-Feb-2011 Glenn Kasten <gkasten@google.com> Bug 3438258 Add SurfaceTexture as MediaPlayer sink

This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.

This includes:
- New Java and C++ interfaces
- C++ plumbing and implementation (JNI, Binder)
- Stagefright AwesomePlayer and NuPlayer use ANativeWindow
(either Surface or SurfaceTextureClient)

Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/Android.mk
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/TestPlayerStub.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibstagefright/ACodec.cpp
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/SoftwareRenderer.h
ests/players/invoke_mock_media_player.cpp
daabf8b5ee562a990067be310b653b203e803da2 23-Feb-2011 Gloria Wang <gwang@google.com> Merge "To collect the total usage time of encoders in the media recorder"
62e05a61598652f8b7d11f28a81d1cd7cac2ed95 23-Feb-2011 Gloria Wang <gwang@google.com> To collect the total usage time of encoders in the media recorder

Change-Id: I94c9c94dec6bd714a3ebf96b4465b94f069e55b8
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
188d00b07ef0b8968868b3489e80dd9f53d3bafa 23-Feb-2011 Mike Lockwood <lockwood@android.com> UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts

These extras are also accessable via the UsbDevice and UsbAccessory classes,
which are also included as extras.
Since you can't filter Intents based on extras there is no point in duplicating
this information as separate extras.

Change-Id: I4c8d1e70d66023a1800b3f8f06118898da6b37af
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpClient.java
ests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
afc671fc5ed81941c972d5318555b84a63eb2619 23-Feb-2011 James Dong <jdong@google.com> Merge "Application-managed callback buffer support for raw image"
bba9529d796654b0ac7a966261daf53706dfabc9 23-Feb-2011 Santosh Madhava <smadhava@google.com> Merge "Cleanup for issue 3471160 : video editor calls System.gc"
87e639bc151551c9618641a6765837b44eb90b9b 23-Feb-2011 Gloria Wang <gwang@google.com> Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data"
d211f41f764fe81fe00b10a99b4b44cb84479cbe 20-Feb-2011 Gloria Wang <gwang@google.com> - Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data

Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/AwesomePlayer.cpp
9a146d9d6592cc527c3ca0beeb721cb7e7720805 23-Feb-2011 James Dong <jdong@google.com> am d97c598f: am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb

* commit 'd97c598ff4d902583f9083960b088b31350d0018':
Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
d97c598ff4d902583f9083960b088b31350d0018 23-Feb-2011 James Dong <jdong@google.com> am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb

* commit '6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
e00cab707dcaf6f05adb5ccb9c80fdf25c483427 18-Feb-2011 James Dong <jdong@google.com> Application-managed callback buffer support for raw image

bug - 3292153

Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
ibstagefright/CameraSourceTimeLapse.cpp
3f48207ea4592ec0897f2043b2042a7114f8487d 23-Feb-2011 Santosh Madhava <smadhava@google.com> Cleanup for issue 3471160 : video editor calls System.gc

Change-Id: I8cdebde25a45767a1c1b9b6c2c59b7e65cacc0bd
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
a688b574d294faae5f56224908b40856c5045aac 17-Feb-2011 Mathias Agopian <mathias@google.com> Remove RefBase.h dependency on TextOutput.h

Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
ibstagefright/include/AMRExtractor.h
ibstagefright/include/MP3Extractor.h
ibstagefright/include/OggExtractor.h
ibstagefright/include/WAVExtractor.h
ibstagefright/include/avc_utils.h
ibstagefright/mpeg2ts/ESQueue.h
16dc3073a2f06a77d9873e536f633a4adf575fce 18-Feb-2011 Mike Lockwood <lockwood@android.com> Don't treat WMV and ASF files as video files unless WMV is supported

Change-Id: I512d1db67e06273d9c23d10fa30d2d62f9f75a75
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
5fb008e3800032be18c6d5f1e7ace4d7c2661e26 23-Feb-2011 James Dong <jdong@google.com> Merge "Remove mkvparser code from /frameworks/base"
8433f75b07cc3c5fb477c7585c1add375c2a4ffc 23-Feb-2011 James Dong <jdong@google.com> Remove mkvparser code from /frameworks/base

bug - 3322129

Change-Id: I94dca6234ce57c9a32290aa7ac4885b0a2f566a9
ibstagefright/matroska/Android.mk
ibstagefright/matroska/mkvparser.cpp
ibstagefright/matroska/mkvparser.hpp
b6723735cf1fef04f8af0b4a5a8cb19a96c3c26d 23-Feb-2011 Andreas Huber <andih@google.com> Support for PCMA and PCMU raw audio data in RTP/RTSP.

Change-Id: Icb87bdfa7cf572c572e2a86c46fa072d9fad18f6
related-to-bug: 3084183
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARawAudioAssembler.cpp
ibstagefright/rtsp/ARawAudioAssembler.h
ibstagefright/rtsp/Android.mk
66e57f6aa9d206552e9b154bf00a17d6efae7fb0 18-Feb-2011 Mike Lockwood <lockwood@android.com> MTP: Disable MTP when the keyguard is locked and secure

BUG: 3402847

Change-Id: I6c77efe18f525cd0af37911c8b6aac4f17352552
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpServer.java
ni/android_mtp_MtpServer.cpp
467ca0de6d7fd55787a37de9dfd7e5325e1c3c6f 18-Feb-2011 Mike Lockwood <lockwood@android.com> MTP: Add support for dynamically adding and removing storage units

BUG: 3402847

Change-Id: I7da266061d949abcb6bb11c6faaa47b5e4a2a977
ni/android_mtp_MtpServer.cpp
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/mtp.h
dc94eea3f4be353d17ced0b302a44cb4a43b9f8f 22-Feb-2011 Andreas Huber <andih@google.com> Merge "Support more MPEG4-LATM audio functionality."
14460b9564ab700a8d426855003064568bff31e3 22-Feb-2011 James Dong <jdong@google.com> Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed

bug - 3040402

Change-Id: I455d2a664851c73212711e8c4b88e97b50ee5b62
ava/android/media/MediaPlayer.java
8c7c6dc413e12b2394aae06bd2ccc3db7a29c710 22-Feb-2011 Andreas Huber <andih@google.com> Support more MPEG4-LATM audio functionality.

related-to-bug: 3474610

Change-Id: I6dab40e8b465922c62be9ee7f168718822c6caac
Now skipping extra header that the spec claimed shouldn't be present in LATM...
ibstagefright/foundation/ABitReader.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.h
117549fc785428b4c9307b909a7dc75761b10145 22-Feb-2011 James Dong <jdong@google.com> Merge "Check file descriptor before passing it through binder calls"
bafa7eaccb4eb402b9719f9553be74332f158756 22-Feb-2011 James Dong <jdong@google.com> Check file descriptor before passing it through binder calls

bug - 3476613

Change-Id: I858933fd2fe4c095c0bd58bf50344c47fc104be9
ibmedia/mediarecorder.cpp
3ed54d03ee7c57cf1f329604faa6a00dfd8c09f0 22-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor:IssueID:3396697: Added Performance test code"
b2c3c3e011876db44922e1e67766fc67caeb4c1b 22-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor:IssueID:3396697: Updated Preview Test code"
dab9689491c615f605d503807b93e319048dd2a7 22-Feb-2011 Rajneesh Chowdury <rajneeshc@google.com> Merge "Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash"
06a087a52b35f6cc9096a9a60c924bb765a5a746 22-Feb-2011 Rajneesh Chowdury <rajneeshc@google.com> Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash

Change-Id: Ib257484ff8646b8e6a0a6a4bb9b937d5338c060c
ava/android/media/videoeditor/Transition.java
e8c89a319944fd61d427816b26c26994c4b77ea7 19-Feb-2011 Gloria Wang <gwang@google.com> Move all Widevine code which have dependency on vendor modules to vendor/widevine

Change-Id: If75bce539bae02117fb4f628be64e3a7363375e9
ibwvm/Android.mk
ibwvm/WVMExtractorImpl.cpp
ibwvm/WVMFileSource.cpp
ibwvm/WVMLogging.cpp
ibwvm/WVMMediaSource.cpp
ibwvm/include/WVMExtractorImpl.h
ibwvm/include/WVMFileSource.h
ibwvm/include/WVMLogging.h
ibwvm/include/WVMMediaSource.h
ibwvm/test/Android.mk
ibwvm/test/Testlibwvm.cpp
f1f9ff28c3acae5cb4eb309f28e7872aff35eff6 14-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor:IssueID:3396697: Added Performance test code

Updated with review comments: MediaFrameworkStressTestRunner.java deleted
Updated with growing heap report in Stress test case

Change-Id: I847f8810e2b844015c47b7d24e488a611d85287c
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaPlayerStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java
6681984cf6aaae5f26cf6b82c7bb9f1c50d7ecd7 15-Feb-2011 Gloria Wang <gwang@google.com> - Update from Widevine
- Bug fixes

Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
ibwvm/Android.mk
ibwvm/WVMExtractorImpl.cpp
ibwvm/WVMFileSource.cpp
ibwvm/WVMLogging.cpp
ibwvm/WVMMediaSource.cpp
ibwvm/include/WVMExtractorImpl.h
ibwvm/include/WVMFileSource.h
ibwvm/include/WVMLogging.h
ibwvm/include/WVMMediaSource.h
ibwvm/test/Android.mk
ibwvm/test/Testlibwvm.cpp
df0b651236f9f44cdc70e209455e330fe31fc546 19-Feb-2011 Glenn Kasten <gkasten@google.com> Don't crash when parsing DRM MIME types

Change-Id: I414897c911a6588061ddbb5f05c574e78162dca9
ibstagefright/MediaExtractor.cpp
c2b9eb88fd6ee37aacd36a17a8236d4ead23ac10 18-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor:IssueID:3396697: Updated Preview Test code

Change-Id: I895bcdbb0c65679b837e616de58e533a080bbf2f
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorPreviewTest.java
28926cb964cc04f0e059ed5c8de0207a3af5b943 18-Feb-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames"
a3da3b18b5714ae3232cd980899e91902ad3ab92 18-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Fixed the media playback report format."
414e15309cfcfd792cb63b53ea6b2b4f426ae7d4 18-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Fixed the media playback report format.

Change-Id: I8b943f8cd914acc6c9ee81a71f0efbecece7263e
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
3f0a4853073f98de40b64bc95df689d79fa47800 17-Feb-2011 Andreas Huber <andih@google.com> Merge "Experimental support for https transfers in stagefright."
5b025c46158f2b4eb95bc062170b7d585d967d0c 17-Feb-2011 James Dong <jdong@google.com> Merge "A/V synchronization at the beginning of a recording session"
cbeebb194b374a5eea2f1c6ed6298c09a937c4cb 16-Feb-2011 James Dong <jdong@google.com> A/V synchronization at the beginning of a recording session

o do not use edts/elst boxes since these optional boxes are ignored
o manipulate the first video/audio frame duration to make sure that the rest
of the audio/video is in sync (ideally, we should only manipulate
the vidoe frame duration, not the audio)
o reduce the initial audio mute/suppression period, which is used to
eliminate the "recording" sound.

bug - 3405882 and 3362703

Change-Id: Ib0acfb4f3843b365157288951dc122b006299c18
ibstagefright/AudioSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
118a150a67f45130755d82491b4d98940c15dbd0 17-Feb-2011 Andreas Huber <andih@google.com> Experimental support for https transfers in stagefright.

Change-Id: If1bd0f265dda136c7c34b53317f64383023b53a3
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/HTTPStream.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/HTTPStream.h
ibstagefright/include/NuHTTPDataSource.h
45fde077428846e76c77b77d6e7ec77572ffcd8f 17-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Update the summary output format which match the PM data posting."
ce6ff2c2e6f5ac1d4e86c94b68587b8634032908 17-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Update the summary output format which match the PM data posting.

Change-Id: I3e3f7313020da6d0d219acd90ac9edc8a4d0bce4
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
df4723ef3c43b3a0b2548908a4461db29b5649d2 17-Feb-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames

Change-Id: I0f9257a1bfb96c00acfdffa0f4f7f8188646c713
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ni/mediaeditor/VideoEditorMain.cpp
83361072e7d5e66bf1438e413d1b1645a6e13a47 16-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor:Issue ID: 3431967"
9cfeb6ecfaaee07d17ce9313946518ca6006bc8e 16-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor:Issue ID: 3431967

Fixes memory leak in getProperties
Updated with Review comments

Change-Id: Ie4e8edaee1c76f18d0526b5eae9f9a128e0a3c17
ni/mediaeditor/VideoEditorPropertiesMain.cpp
79a97489494deb8bdae85696f612ec7acda54240 16-Feb-2011 Andreas Huber <andih@google.com> am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.

* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
DO NOT MERGE: Respond to RTSP server->client requests.
dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed 16-Feb-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Respond to RTSP server->client requests.

Even if it's just to tell them that we don't support any (this is optional).

Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug: 3353752
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
9464f9c5a453acf58ef2c84d8d4437d5b6aa9658 16-Feb-2011 Andreas Huber <andih@google.com> Merge "Respond to RTSP server->client requests."
e0666163abb2476679a13624ca154df47592b37f 16-Feb-2011 Andreas Huber <andih@google.com> Respond to RTSP server->client requests.

Even if it's just to tell them that we don't support any (this is optional).

Change-Id: I557865ac00d0fb65ffa69363eb1eceaabe522a1a
related-to-bug: 3353752
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
85305f04d52e921de0452a1efef01175b1bbac3c 16-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Change the media player stress test to repor the total number of failure and the total number of info.
Register the surface callback in the test application bug# 2909064

Change-Id: I3420b5bc81e276b50f612c126ed5fc1f4f16c08c
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
d33a4ccb5c3b58406cee45a4d933d40219177f8c 15-Feb-2011 James Dong <jdong@google.com> Decouple AudioRecord read and audio encoding

bug - 3313754

Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
ibstagefright/AudioSource.cpp
d6c421f1a0ae556d315159dff8a76e4a0e62e700 16-Feb-2011 Andreas Huber <andih@google.com> Remove legacy, AwesomePlayer-based http live implementation.

Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5 16-Feb-2011 Andreas Huber <andih@google.com> am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
94f401999442ceb572200b0eeffcc31546d7a4c7 16-Feb-2011 Gloria Wang <gwang@google.com> Merge "Add AAC extractor"
c5b0abf900474b204c367093984ff60da4fba09c 02-Feb-2011 Gloria Wang <gwang@google.com> Add AAC extractor

Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
ibstagefright/AACExtractor.cpp
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/avc_utils.cpp
ibstagefright/include/AACExtractor.h
ibstagefright/include/avc_utils.h
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
7ff893979a3ca30329dbd85e90ad6488d83bab91 16-Feb-2011 Andreas Huber <andih@google.com> Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"

This reverts commit e7c83d4a711241923854d6bbd5de0e24f9192f93.

Change-Id: I5151c7c72d79154528c55aa01bf006c8e38e7af7
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
f040d7dfc579cc4d2cb235292dd2a7effdb031ca 15-Feb-2011 Andreas Huber <andih@google.com> Merge "Derive the Transport "source" attribute from the RTSP endpoint address if necessary"
ea47cb4edea4426b0da7807db10548ddae7104f2 15-Feb-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary

and continue even if we were unable to poke a hole into the firewall.

Change-Id: I5757a2521b8d81a42d03cca379179ce2c9ee46e7
related-to-bug: 3457201
ibstagefright/rtsp/MyHandler.h
27db53de35bbe83ce3b906da675b065803471481 15-Feb-2011 Andreas Huber <andih@google.com> Derive the Transport "source" attribute from the RTSP endpoint address if necessary

and continue even if we were unable to poke a hole into the firewall.

related-to-bug: 3457201
Change-Id: I0a523f38e6959bf00b8b140a70bb65fcc414c9c1
ibstagefright/rtsp/MyHandler.h
284ff954f092468f9f02c4ae22173c9e3f54d445 15-Feb-2011 Andreas Huber <andih@google.com> Merge "Work around several issues with non-compliant RTSP servers."
0407269ae35e62a6aa2f6e40964970db1bd4b14a 15-Feb-2011 Andreas Huber <andih@google.com> Work around several issues with non-compliant RTSP servers.

In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.

They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...

Change-Id: I63fa90ca2398f19e8b52c147248bd2c5c2372426
related-to-bug: 3452103
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
8c553b90033954cd25afc6ab648752e353cb9161 15-Feb-2011 Mike Lockwood <lockwood@android.com> MTP host: disable some test code

Change-Id: I2237ad88f73b03a2c324f17267c52cc42b8a0d5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
e0c9f2757b0ebd291fec89ebb520878aacd3f7dc 15-Feb-2011 Andreas Huber <andih@google.com> am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
d1ba051a465518fa4325c364ed77025fc1a2a794 15-Feb-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.

They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...

Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325
related-to-bug: 3452103
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
0554f32afd5309344b8d0ddcebd5ff7bc6ae3410 14-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor:IssueID:3396697: Added Preview Test code

This has dependency on Ide5ee82b24806a52b4e612db4bc3c34f75e4465a
Removed trailing space in xml file
Removed dependency on test cases other than Preview & API

Change-Id: I835c0ca17d6ff15819407eb930cca8a08b095287
ests/MediaFrameworkTest/res/layout/surface_view.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorPreviewTest.java
e77345966cbc2490ae7f0e343294a1ac215f07d5 15-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor:Inconsistance defines:Issue ID:3419090"
046dc1ea810332d4040bf70c67d64a43fd1f6a33 15-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes"
c0171d3e7b3459168e8db76b7f5d72b07f69f42a 13-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes

Updated with review comments: code cleaning in MP.

Change-Id: Ide5ee82b24806a52b4e612db4bc3c34f75e4465a
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorExportTest.java
699587da4bf10c6e6872063a7fdbe53f05e6b83d 12-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor:Inconsistance defines:Issue ID:3419090

Assigned with MediaProperties array values

Change-Id: I97efa98954eb1be3b21a9e42b989def6bb657d77
ava/android/media/videoeditor/MediaArtistNativeHelper.java
09f18d05034f14b609d25bfa899c0404856fdbee 15-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor: Issue ID:3396697 Missing Files added"
cb218793c3bcdc5a847a3982495e50f777eca17d 14-Feb-2011 Andreas Huber <andih@google.com> Enable cancelling the rtsp connection process early.

Change-Id: Ie2059c54541ad8c675944d71b39c772b0f6f04c8
related-to-bug: 3452699
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/rtsp/ARTSPController.cpp
321aa99762dba7e5a4c60dc4087409c3c59f58a6 14-Feb-2011 Mike Lockwood <lockwood@android.com> MTP host: Use usb_device_bulk_transfer for synchronous transfers

Change-Id: Icf42ea0e5a848cee1565da49713ee9ad0db9f1a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpPacket.cpp
fc04c1d67e28e86cf764fb6163904bac5c6b5b10 13-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor: Issue ID:3396697 Missing Files added

IMG_640x480_Overlay2: dimension correction done

Change-Id: I40960a44584fb27538d7e22829d293a34c654df7
ests/contents/media_api/videoeditor/H264_BP_960x720_25fps_800kbps_AACLC_48Khz_192Kbps_s_1_17.mp4
ests/contents/media_api/videoeditor/IMG_640x480_Overlay2.png
ests/contents/media_api/videoeditor/MPEG4_SP_176x144_30fps_256kbps_AACLC_96kbps_44kHz_s_1_17.3gp
ests/contents/media_api/videoeditor/Text_FileRenamedTo3gp.3gp
b27a1ca53e43c97d206d19c2b219f53690b324eb 12-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor: Fixes Issue ID:3448077"
4eb7a983427e3bff17f9b3492d33e6983588fb0f 12-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor: Fixes Issue ID:3448077

Updated with review comments. checks width & height

Change-Id: I79bd28862f511e7653e7e7a63c88772834ee6559
ava/android/media/videoeditor/EffectKenBurns.java
656055866a9669e244a70b006e52d0d61cf99d54 12-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor: Populate profile&level: Issue:3419090"
2b06e56031ef8bd1b5155ec3225f37248d4833b4 11-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor: Populate profile&level: Issue:3419090

Updated with new values for Profiles and levels

Change-Id: Ib0abcab1be741c151ce44b54eb1deff64828af00
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/MediaVideoItem.java
4d0e920c4f9a77b1cc347b713893a187af5922d1 12-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Add the open source test media contents."
bd508bdbe468cbc4b9174fc361fb10a508b7896a 12-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Add the open source test media contents.

Change-Id: I956e06712454287f502bffb22e10612e980b936d
ests/contents/media_api/video/H263_500_AMRNB_12.3gp
ests/contents/media_api/video/H263_56_AAC_24.3gp
ests/contents/media_api/video/H263_56_AMRNB_6.3gp
ests/contents/media_api/video/H264_320_AAC_64.3gp
ests/contents/media_api/video/H264_320_AMRNB_6.3gp
ests/contents/media_api/video/H264_500_AAC_128.3gp
ests/contents/media_api/video/H264_HVGA_500_NO_AUDIO.3gp
ests/contents/media_api/video/H264_QVGA_500_NO_AUDIO.3gp
ests/contents/media_api/video/MPEG4_320_AAC_64.mp4
ests/contents/media_api/video/border_large.3gp
fe84cf13cdbccec4a499caca05f0dc309df9d318 12-Feb-2011 James Dong <jdong@google.com> Make available h263 DSI information from MPEG4Extractor

bug - 3446863

Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
ibstagefright/MPEG4Extractor.cpp
4c030b56160918117776b4379dcc1e258b854e2d 12-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "Video Editor CTS Test Code: annotation suppress"
e69ce389036eeae365838c35d83af092c8cc21c1 12-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "VideoEditor Test contents: Issue ID:3396697"
31d19c80c7caefe2d2cbc623f6618f1010cd79a5 11-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> VideoEditor Test contents: Issue ID:3396697

Moved to folder contents/media_api/videoeditor

Change-Id: I809b684931130badca1c5bbf91178b142ba5017f
ests/contents/media_api/videoeditor/AACLC_44.1kHz_256kbps_s_1_17.mp4
ests/contents/media_api/videoeditor/AACLC_48KHz_256Kbps_s_1_17.3gp
ests/contents/media_api/videoeditor/AMRNB_8KHz_12.2Kbps_m_1_17.3gp
ests/contents/media_api/videoeditor/H263_profile0_176x144_10fps_256kbps_0_25.3gp
ests/contents/media_api/videoeditor/H263_profile0_176x144_10fps_256kbps_1_17.3gp
ests/contents/media_api/videoeditor/H263_profile0_176x144_10fps_96kbps_0_25.3gp
ests/contents/media_api/videoeditor/H263_profile0_176x144_15fps_128kbps_1_35.3gp
ests/contents/media_api/videoeditor/H263_profile0_176x144_15fps_256kbps_AACLC_16kHz_32kbps_m_0_26.3gp
ests/contents/media_api/videoeditor/H263_profile0_176x144_15fps_256kbps_AACLC_32kHz_128kbps_s_0_26.3gp
ests/contents/media_api/videoeditor/H263_profile0_176x144_15fps_256kbps_AACLC_32kHz_128kbps_s_1_17.3gp
ests/contents/media_api/videoeditor/H264_BP_1080x720_30fps_12Mbps_AACLC_44.1khz_64kbps_s_1_17.mp4
ests/contents/media_api/videoeditor/H264_BP_1080x720_30fps_800kbps_1_17.mp4
ests/contents/media_api/videoeditor/H264_BP_1280x1080_30fps_1200Kbps_1_10.mp4
ests/contents/media_api/videoeditor/H264_BP_1280x720_15fps_512kbps_AACLC_16khz_48kbps_s_1_17.mp4
ests/contents/media_api/videoeditor/H264_BP_176x144_15fps_144kbps_AMRNB_8kHz_12.2kbps_m_1_17.3gp
ests/contents/media_api/videoeditor/H264_BP_1920x1080_30fps_1200Kbps_1_10.mp4
ests/contents/media_api/videoeditor/H264_BP_640x480_12.5fps_256kbps_AACLC_16khz_24kbps_s_0_26.mp4
ests/contents/media_api/videoeditor/H264_BP_640x480_15fps_1200Kbps_AACLC_48KHz_32kbps_m_1_17.3gp
ests/contents/media_api/videoeditor/H264_BP_640x480_15fps_1200Kbps_AACLC_48KHz_64kps_m_0_27.3gp
ests/contents/media_api/videoeditor/H264_BP_640x480_15fps_384kbps_60_0.mp4
ests/contents/media_api/videoeditor/H264_BP_640x480_30fps_192kbps_1_5.mp4
ests/contents/media_api/videoeditor/H264_BP_640x480_30fps_256kbps_1_17.mp4
ests/contents/media_api/videoeditor/H264_BP_720x480_25fps_256kbps_AMRNB_8khz_12.2kbps_m_0_26.mp4
ests/contents/media_api/videoeditor/H264_BP_800x480_15fps_512kbps_1_17.mp4
ests/contents/media_api/videoeditor/H264_BP_800x480_15fps_512kbps_AACLC_24KHz_38Kbps_s_1_17.mp4
ests/contents/media_api/videoeditor/H264_BP_800x480_15fps_512kbps_AMRNB_8KHz_12.2Kbps_m_0_26.mp4
ests/contents/media_api/videoeditor/H264_MP_960x720_25fps_800kbps_AACLC_48Khz_192Kbps_s_1_17.mp4
ests/contents/media_api/videoeditor/IMG_1600x1200.jpg
ests/contents/media_api/videoeditor/IMG_176x144.jpg
ests/contents/media_api/videoeditor/IMG_176x144_Overlay1.png
ests/contents/media_api/videoeditor/IMG_176x144_Overlay2.png
ests/contents/media_api/videoeditor/IMG_320x240.jpg
ests/contents/media_api/videoeditor/IMG_640x480.gif
ests/contents/media_api/videoeditor/IMG_640x480.jpg
ests/contents/media_api/videoeditor/IMG_640x480.png
ests/contents/media_api/videoeditor/IMG_640x480_Overlay1.png
ests/contents/media_api/videoeditor/IMG_640x480_Overlay2.png
ests/contents/media_api/videoeditor/MP3_48KHz_128kbps_s_1_17.mp3
ests/contents/media_api/videoeditor/MPEG2_640x480_30fps_192kbps_1_5.mp4
ests/contents/media_api/videoeditor/MPEG4_SP_176x144_12fps_92kbps_AMRNB_8KHz_12.2kbps_m_0_27.3gp
ests/contents/media_api/videoeditor/MPEG4_SP_176x144_30fps_256kbps_AACLC_44.1kHz_96kbps_s_1_17.3gp
ests/contents/media_api/videoeditor/MPEG4_SP_176x144_30fps_256kbps_AACLC_96kbps_44kHz_s_1_17.3gp
ests/contents/media_api/videoeditor/MPEG4_SP_640x480_15fps_1200kbps_AACLC_48khz_64kbps_m_1_17.3gp
ests/contents/media_api/videoeditor/MPEG4_SP_640x480_15fps_1200kbps_AACLC_48khz_64kbps_m_1_17.mp4
ests/contents/media_api/videoeditor/MPEG4_SP_640x480_15fps_256kbps_0_30.mp4
ests/contents/media_api/videoeditor/MPEG4_SP_640x480_15fps_512kbps_AACLC_48khz_132kbps_s_0_26.mp4
ests/contents/media_api/videoeditor/MPEG4_SP_640x480_30fps_512Kbps_0_23.3gp
ests/contents/media_api/videoeditor/MPEG4_SP_640x480_30fps_512Kbps_0_27.mp4
ests/contents/media_api/videoeditor/MPEG4_SP_720x480_30fps_280kbps_AACLC_48kHz_161kbps_s_0_26.mp4
ests/contents/media_api/videoeditor/MPEG4_SP_720x480_30fps_280kbps_AACLC_48kHz_96kbps_s_0_21.mp4
ests/contents/media_api/videoeditor/MPEG4_SP_800x480_515kbps_15fps_AMR_NB_8KHz_12.2kbps_m_0_26.mp4
ests/contents/media_api/videoeditor/MPEG4_SP_854x480_15fps_256kbps_AACLC_16khz_48kbps_s_0_26.mp4
ests/contents/media_api/videoeditor/TransitionSpiral_QVGA.jpg
ests/contents/media_api/videoeditor/corrupted_H264_BP_640x480_12.5fps_256kbps_AACLC_16khz_24kbps_s_0_26.mp4
990909242c6f11f79bd9b34e326fb414d3648bda 11-Feb-2011 Andreas Huber <andih@google.com> Merge "Start playing (and decoding) audio only after the first video frame has been decoded."
86e9e9be1e6cbcc0f8dbb2ecc41fafa7ddb5f8d1 11-Feb-2011 Basavapatna Dattaguru <dattaguru@google.com> Video Editor CTS Test Code: annotation suppress

Fix for Issue: ID:3396697
Updated with review comments

Change-Id: Ie20e60598f046b23ed49b2533e9d500607a23c17
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/VideoEditorHelper.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
ce8a1013f3b30c3b205057e32663164a3855c441 11-Feb-2011 Andreas Huber <andih@google.com> Start playing (and decoding) audio only after the first video frame has been decoded.

if there's both audio and video content. This gives the video decoder an opportunity
to fill its internal buffer queue at the start of playback.

Change-Id: Ib2c95753b430e4e47207953b913b607024a328d7
related-to-bug: 3431702
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
94738e40c2db7d0197838ca81831dd26ca4dc01b 11-Feb-2011 James Dong <jdong@google.com> The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4.

bug - 3379293

Change-Id: I8960737f0604b54ce90dfc26137f1582073b4ab2
ibstagefright/colorconversion/ColorConverter.cpp
9ee9aad80981c661af3f4c16f5932aef1f98e7b0 11-Feb-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3444358 : Movie studio is broken in Master-TOT

Change-Id: Ie83703a5da6587a6b5668bc4777fdba71042b2bc
ni/mediaeditor/VideoEditorMain.cpp
1d830165a0535010c176f08feba2973ad9003598 11-Feb-2011 Dheeraj Sharma <dheerajs@google.com> Merge "Fix for issue : 3439708 Last frame is missing effect"
540380fb0a45b12af3970f9ea1ed041607451f46 10-Feb-2011 Mike Lockwood <lockwood@android.com> Add MTP/PTP host support to the public API

Needed for unbundling the Gallery app

Change-Id: I57e6b76ee5c9e57cb8c055329ac13251879baafd
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpClient.java
ava/android/mtp/MtpConstants.java
ava/android/mtp/MtpDevice.java
ava/android/mtp/MtpDeviceInfo.java
ava/android/mtp/MtpObjectInfo.java
ava/android/mtp/MtpStorageInfo.java
bc20c93863aefc6bf9a9338c4f1cb68e529826d3 11-Feb-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix JNI warnings in MtpDevice"
40304e227247c788d1c0e8d41c386cdb10cba91b 11-Feb-2011 Mike Lockwood <lockwood@android.com> MTP: Fix JNI warnings in MtpDevice

Needed to add a global ref to the classse to avoid
"not a valid JNI reference" errors when calling the constructor.

Change-Id: Ieb7e69f5d19fd5a090c53d32f69a201040c49112
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_mtp_MtpDevice.cpp
fb4e92c4ed316295c7cde38e58cf0816c0e5f8ce 11-Feb-2011 Dheeraj Sharma <dheerajs@google.com> Fix for issue : 3439708 Last frame is missing effect

Change-Id: Ibfc81c06ec525e95e5733bf03b7a2f3b58a5574c
ni/mediaeditor/VideoEditorMain.cpp
8132a8caf36f6c13d679f7275be8e2fd5afd52ba 11-Feb-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3352047 Wrong message when adjusting volume"
8b4b97a14ad9b5b982d8fe92755efabec8ad0076 04-Feb-2011 Glenn Kasten <gkasten@google.com> Bug 3352047 Wrong message when adjusting volume

Add hidden AudioManager.getDevicesForStream and output device codes.

Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
ava/android/media/AudioManager.java
ava/android/media/AudioSystem.java
ibmedia/AudioSystem.cpp
ibmedia/IAudioPolicyService.cpp
04f7861cfa37cbde14be5a0a0ed6bd99841693c6 10-Feb-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 3435692"
a25c5d88d17f251262307ce31e799c9cf361d145 10-Feb-2011 Eric Laurent <elaurent@google.com> Fix issue 3435692

The problem is that the AudioService is not notified of the death of
IAudioFlinger binder interface because no methods was called on AudioFlinger
from system_server since the device booted. Therefore, AudioSystem did not created any
IAudioFlinger interface in the system_server process.
The root cause was always present but more likely to happen on a tablet than on a phone
as for instance no beeps are played when volume is adjusted.

The fix consists in having AudioSystem explicitly call a method on AudioFlinger when a
callback is installed to make sure that an IAudioFlinger binder interface is created
regardless of any other activity in the client process.

Change-Id: I9df34a36825af0b25cd0246dd02edbd712263f41
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
8cdc31f76a60f451bc08501ed020445859978849 10-Feb-2011 Andreas Huber <andih@google.com> Merge "Fix the build."
c2f9a26b1ec759c1db17811631de14563344204b 10-Feb-2011 Andreas Huber <andih@google.com> Fix the build.

Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
ibstagefright/rtsp/Android.mk
4fd18e6310c82279acbe43492a14626ea3d4a7ee 10-Feb-2011 Marco Nelissen <marcone@google.com> Merge "Better genre support."
cb613a04c16915f6374c6436b5b37355bce3ed1c 10-Feb-2011 Marco Nelissen <marcone@google.com> Better genre support.

Expand the list of genres, and support genres that look like "(192)CustomGenre".
b/3349415

Change-Id: I617ea7dfeace708bbd0d9c00ff04de72fa2d383e
ava/android/media/MediaScanner.java
8e6f60d9bbbfe4a074c3958da648326bc7bf15d6 10-Feb-2011 Andreas Huber <andih@google.com> Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support"
b2934b16eac8d8a866c37a7d1d7e03635f475b08 08-Feb-2011 Andreas Huber <andih@google.com> Change timestamp handling in RTSP, remove unused, experimental, gtalk support

related-to-bug: 3216447

NTP timestamp handling is now done at a higher layer than before.

Change-Id: I9fb23f1335110ec59e534f9aa0fe6f6a6406dd52
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/rtsp/ARTPAssembler.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPConnection.h
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTPSource.h
ibstagefright/rtsp/Android.mk
ibstagefright/rtsp/MyHandler.h
adca6840e3271e2e7d885b5e6059b2ef4d0865b3 10-Feb-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for 3431967: Memory leak from video editor engine in JNI"
91ba3a0033f1ed7f26fc9e8cd9088479c7de134a 10-Feb-2011 Santosh Madhava <smadhava@google.com> Fix for 3431967: Memory leak from video editor engine in JNI

Change-Id: If879bbcf68d01fea0995be0faf070b6dd7361218
ni/mediaeditor/VideoEditorMain.cpp
f6a2bff0c9f65b318bbe2236d19423dc013123b9 09-Feb-2011 James Dong <jdong@google.com> Reduce blocking time in file write

bug - 3418787

Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
ibstagefright/MPEG4Writer.cpp
10a5e2794d9d1b0172a9fd344eed106f5823f025 09-Feb-2011 James Dong <jdong@google.com> Catch read error from AudioRecord and do not assert

bug - 3439313

Change-Id: Ie29d6e4945978ef27fc3e5849e467d895c7736d3
ibstagefright/AudioSource.cpp
0a8bfd1b3b81ce50bb38a54644554b95db7744b0 09-Feb-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix NPE in MtpPropertyGroup"
fd22edc66818e0336597e23dafc9db4dcfb6878e 09-Feb-2011 Mike Lockwood <lockwood@android.com> MTP: Fix NPE in MtpPropertyGroup

Change-Id: I65fbd3f2f62724434136c6ae310e6647884902d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpPropertyGroup.java
cbefb805a8a54c493cecb01b7a4fa85a5bae808e 09-Feb-2011 James Dong <jdong@google.com> Merge "Should reset errno to 0 before calling strtoll()."
75fb238b3fa89db5cc9d0ea3ced74a6512527702 09-Feb-2011 James Dong <jdong@google.com> Should reset errno to 0 before calling strtoll().

bug - 3431238

Change-Id: I855847209d2e022242b8eb62985759922ab94779
ibmediaplayerservice/StagefrightRecorder.cpp
9a7836d48fbc7686b342937a0d506ec2a72889d3 08-Feb-2011 Gloria Wang <gwang@google.com> Merge "Add more check before using the DRM manager client."
adc4d9c86d45376a3936a67616c2a302f08b5f21 08-Feb-2011 Gloria Wang <gwang@google.com> Add more check before using the DRM manager client.

Change-Id: I7369dcd6b6abd1945430373200fd5353bca70652
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/FileSource.cpp
ibstagefright/NuHTTPDataSource.cpp
5ed9a80571ede30d4cb7967227bff996c9cecb9e 08-Feb-2011 Andreas Huber <andih@google.com> Merge "Handle some edge cases when seeking while starting up OMXCodec"
b9289833341ec19e016891d0ca9638f0973b9647 08-Feb-2011 Andreas Huber <andih@google.com> Handle some edge cases when seeking while starting up OMXCodec

These were exposed by the new preview-seekframe while paused code.
In particular, the codec may have been in state RECONFIGURING when attempting
to seek, or we may have initiated flushing of the output port and this may not
have completed yet by the time we want to reconfigure the output port.

Change-Id: Id7640ade11dbc7205a22f648ea0b5e3e9b49cf4b
related-to-bug: 3392259
ibstagefright/OMXCodec.cpp
2157f045d3579cb789d7c2c4f892724c7b0b1b39 08-Feb-2011 Andreas Huber <andih@google.com> Merge "Remove one log message from the VPXDecoder"
4a4bf2211634b87c862e02b95d97eaa8b43819d2 08-Feb-2011 Gloria Wang <gwang@google.com> Merge "- Do not use global DrmManagerClient - Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811"
e0b37478614be3edc8176fcbf38e92dbf88580d2 08-Feb-2011 Andreas Huber <andih@google.com> Remove one log message from the VPXDecoder

related-to-bug: 3402216

The VPX format supports "internal-only" frames that are
referenced by future content but never actually displayed, so
this is a perfectly valid scenario that doesn't require a
log message.

Change-Id: I8330bfdfefcdf4ab66ae6d2b59b99fd9b89350df
ibstagefright/codecs/on2/dec/VPXDecoder.cpp
5d386a1ae28084626f2e207add4be6912db033ce 08-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Fix the build.

Change-Id: Ie02c5086c1dc8c4ef1c52c6ae43b018a48a18bdd
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
9cca1da60c796046461252a15b232d13d2ff25c9 08-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Remove the old media player stress test. Add the new playback stress that which caputred the total number of crashes, frame drops from a list of video which side-loaded to the device."
a58389bdc1f3c41014003ab6e1a5e9a0ca37d789 08-Feb-2011 Yu Shan Emily Lau <yslau@google.com> Remove the old media player stress test.
Add the new playback stress that which caputred the total number of crashes, frame drops from a list of video which
side-loaded to the device.

Change-Id: I41d54b5286da0aecb52a37feec176d8ae5456d9e
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaPlayerStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
c2dc4729e3c88d733c0aa6d9a9af6101b2f09e35 07-Feb-2011 Gloria Wang <gwang@google.com> - Do not use global DrmManagerClient
- Release the DrmManagerClient and DecryptHandle in DataSource
Fix for bug 3429811

Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/FileSource.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/DRMExtractor.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/NuHTTPDataSource.h
3ec816ba616298facfb1965672c487348d3e4c87 07-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am 284f3128: am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb

* commit '284f3128fa959c8c2aa901d0af359f1f1b4d8bc4':
Fix issue 3426489 Overlay background changed when exported
88928ffc1c0b57fc8bf220332034231348678d96 07-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am 73edcfe8: am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb

* commit '73edcfe8f4678c4d5e91c8018e00a72ea325da71':
Fix issue 3426200 Movie Studio crashes when a media item is deleted
5bdbb562ee8c995eed5c34f2b0249afd913f2b89 07-Feb-2011 Danny Fernandes <dannyfernandes@google.com> am 7d913d43: am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb

* commit '7d913d4350230afba8dea55718d887cf967d1ab2':
Fixed 3423072 Imported 1080x720 video clips present distorted view
b82d4570d91681aa00b6b703024cd68fdf0d374e 07-Feb-2011 Eric Laurent <elaurent@google.com> am 5f3e9e69: am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb

* commit '5f3e9e69a16f5a7bc70f3f010c8aae91f287e941':
Issue 3395734: fix media server restart detection
3da2538aa18da2d457b54380c81aba1d992b60b2 07-Feb-2011 Eric Laurent <elaurent@google.com> am bdb23c26: am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb

* commit 'bdb23c26759089e29eb2f379e296bd006bc32b97':
Fix issues 3425035 and 3423785.
23dea9a13991cabdd81baf255e1099c79d6ba45d 07-Feb-2011 Danny Fernandes <dannyfernandes@google.com> am 1734e835: am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb

* commit '1734e8350f1aadbebf8234e3c470a9d4d0c96e8f':
Fixed 3419090 Throwing exception for unsupported video codec profiles and level
0b180a7fae0619ab7a3f0082f535a622b8f59e7a 07-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am d5924e9d: am 67ec9aa8: Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame

* commit 'd5924e9d3a370c2816613d4420b622b857da4f00':
Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
4d3cd2c23e347e69534c626cad082ad1cc5fe36b 07-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am 6a9cb7dd: am e05c33fe: Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb

* commit '6a9cb7ddec346145b4563e06ff0940199758f888':
Modification for using Software decoder for thumbnail generation in JNI
c442bbe2642f3b99e317cc9ccc2056285ba7632e 07-Feb-2011 Andreas Huber <andih@google.com> Merge "Display a single (still-)frame of video after seeking while paused."
7da5fd29dae13fc40129bd7599604763b966f2d6 07-Feb-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Add support for querying all objects in GetObjectPropList"
0a84f4fef9f2441f3acf266f089b17a1f8b37deb 07-Feb-2011 Andreas Huber <andih@google.com> Display a single (still-)frame of video after seeking while paused.

Change-Id: Ia78bf29ba6d649043e70c49913725cecdf918c03
related-to-bug: 3392259
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
9d967a5530bab57611492e478586aa33e08c1413 07-Feb-2011 Gil Dobjanschi <virgild@google.com> am 99ec3e7f: am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb

* commit '99ec3e7f27ec7767d1f1a2c596ff2bddb7907a9c':
Bug fix: 3421011 ANR during delete video clip
4356d81b34a57a4046d9fa2287c2d85b51c7ca24 07-Feb-2011 Mike Lockwood <lockwood@android.com> MTP: Add support for querying all objects in GetObjectPropList

Change-Id: I1f31971c4c777462f485e52fac016dc0fff48ad9
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpPropertyGroup.java
284f3128fa959c8c2aa901d0af359f1f1b4d8bc4 05-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb

* commit 'f7f2499638624392ce7665faba5246c46c5e5634':
Fix issue 3426489 Overlay background changed when exported
ab280b8db6743b826f7412ec1de70e203b91c23d 05-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Fix issue 3426489 Overlay background changed when exported

Change-Id: I53d05732f6de6363cfb64fc84b2539e957adfcd6
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/Transition.java
73edcfe8f4678c4d5e91c8018e00a72ea325da71 05-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb

* commit 'b894f8959c6be2de5a0c89fedb9824012783dd14':
Fix issue 3426200 Movie Studio crashes when a media item is deleted
b894f8959c6be2de5a0c89fedb9824012783dd14 05-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb
7d913d4350230afba8dea55718d887cf967d1ab2 05-Feb-2011 Danny Fernandes <dannyfernandes@google.com> am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb

* commit '6ef407c0e6e3c178b01e2837e59348f72c97cf8c':
Fixed 3423072 Imported 1080x720 video clips present distorted view
6ef407c0e6e3c178b01e2837e59348f72c97cf8c 05-Feb-2011 Danny Fernandes <dannyfernandes@google.com> Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb
5f3e9e69a16f5a7bc70f3f010c8aae91f287e941 05-Feb-2011 Eric Laurent <elaurent@google.com> am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb

* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
Issue 3395734: fix media server restart detection
d4b88c8829cdababbf16aaf903ba25a1669310e7 05-Feb-2011 Eric Laurent <elaurent@google.com> Merge "Issue 3395734: fix media server restart detection" into honeycomb
086396a92408b47ee32f7fedaae9af533608ff6d 05-Feb-2011 Eric Laurent <elaurent@google.com> Issue 3395734: fix media server restart detection

Commit 25101b0b in AudioSystem for issue 3395734 broke the mechanism
in AudioService to poll and detect the restarting of media server
process after a crash.

The fix consists in changing the method used to poll AudioSystem and
trigger a callback indicating success when media server is responding
(the method must be on IAudioFlinger and not IAudioService to trigger the callback).

Change-Id: I843c0194de9cbf82c779cabbf2f3cbf8064603c8
ava/android/media/AudioService.java
69e868dcabeb14c27251334fc33a5cad0982d379 04-Feb-2011 Danny Fernandes <dannyfernandes@google.com> Fixed 3423072 Imported 1080x720 video clips present distorted view

Change-Id: If4f4039c516eb77423dd590e8634a2d4a05d4622
ni/mediaeditor/VideoEditorPropertiesMain.cpp
0d99f5a95ccf45ad45824875f3c4b56510a421d1 05-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Fix issue 3426200 Movie Studio crashes when a media item is deleted

Change-Id: I1149fbfd22b44b388897bbcc6970da74c1f6ac4f
ava/android/media/videoeditor/MediaArtistNativeHelper.java
bdb23c26759089e29eb2f379e296bd006bc32b97 04-Feb-2011 Eric Laurent <elaurent@google.com> am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb

* commit '2e96f15d8c6608c6bcb49c73fe13078a57245b28':
Fix issues 3425035 and 3423785.
2e96f15d8c6608c6bcb49c73fe13078a57245b28 04-Feb-2011 Eric Laurent <elaurent@google.com> Merge "Fix issues 3425035 and 3423785." into honeycomb
1734e8350f1aadbebf8234e3c470a9d4d0c96e8f 04-Feb-2011 Danny Fernandes <dannyfernandes@google.com> am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb

* commit '5e1f3e4112f77bdb99bfef8c3ba185f0cb89e5ef':
Fixed 3419090 Throwing exception for unsupported video codec profiles and level
7b3f26328bb2555a1728db38780a4cb3be00a893 04-Feb-2011 Danny Fernandes <dannyfernandes@google.com> Fixed 3419090 Throwing exception for unsupported video codec profiles and level

Change-Id: I89e8723a6b89338ecedcfabf8b0c63ed2f7e9468
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/MediaVideoItem.java
402f7f29634a9f68e7929be828a927a3e2f5efe9 04-Feb-2011 Eric Laurent <elaurent@google.com> Fix issues 3425035 and 3423785.

- Make sure that STREAM_MUSIC is affected by ringer mode on non voice capable
devices whatever the saved settings say.

- Added a hidden method to AudioManager for VolumePanel to override
the stream selection logic while the panel is showing.

Change-Id: Ib2ff2a7af63decb4e29c45700c41e5058f79d877
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
6760f9832df60e8421c10c4928d0612662222811 04-Feb-2011 Andreas Huber <andih@google.com> Improvements/fixes to ACodec.

- Make sure ACodec reverts its state when it's shutdown
- Defer "resume" to after handling the OutputPortSettingsChange

- If the OMX_EventPortSettingsChanged event comes in while we're flushing, defer it
and make sure the output port can be disabled by deleting all buffers not already
owned by the component.

Change-Id: I1f8cdffa71237b57d4275a48b834647a7b263e8b
ibstagefright/ACodec.cpp
d5924e9d3a370c2816613d4420b622b857da4f00 04-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am 67ec9aa8: Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame

* commit '67ec9aa87812a4d55a3c0ed5d0ab66cdb36342f0':
Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
67ec9aa87812a4d55a3c0ed5d0ab66cdb36342f0 04-Feb-2011 Dheeraj Sharma <dheerajs@google.com> Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame

Change-Id: Ie9cf769e42869b5cab57694e92884900d33f40d9
ni/mediaeditor/Android.mk
6a9cb7ddec346145b4563e06ff0940199758f888 04-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am e05c33fe: Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb

* commit 'e05c33fed3175972e0158a7c377763eb31160e27':
Modification for using Software decoder for thumbnail generation in JNI
b62d78bd0d6a7738cc75df6f14f65abebb9b7b5f 04-Feb-2011 Dheeraj Sharma <dheerajs@google.com> Modification for using Software decoder for thumbnail generation in JNI

Change-Id: Ie3dd5a28311627fd0b559bc3d4e28d2f668ccc61
ni/mediaeditor/Android.mk
ni/mediaeditor/VideoBrowserMain.c
99ec3e7f27ec7767d1f1a2c596ff2bddb7907a9c 04-Feb-2011 Gil Dobjanschi <virgild@google.com> am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb

* commit '7dd5763d0e6f96ff2a7bb48b816664b1ec7d645d':
Bug fix: 3421011 ANR during delete video clip
2e8fbebff4e12581ed58e25fc98134e1124d6482 04-Feb-2011 Eric Laurent <elaurent@google.com> am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb

* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
Fix issue 3371080
3f1c57394091de7204d218898696baeb20c04f25 03-Feb-2011 Gil Dobjanschi <virgild@google.com> Bug fix: 3421011 ANR during delete video clip

Change-Id: I9ba027619d611d76f41d9430a4ad3c9ee5211711
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/VideoEditorImpl.java
7ee76cfeead74b4d3b46abb244b63e638c25d1c5 04-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am d13f987f: am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb

* commit 'd13f987f73df03b06c70c631452f6cafbdc254e1':
Fix for issue : 3419353 Crash during transition generation
223f2696bb51b3be1af0c606f72c35e2c88c8a49 04-Feb-2011 Gil Dobjanschi <virgild@google.com> am 3f9a851e: am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb

* commit '3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
Bug fix: 3419287 Deleted images and video clips invalidate the entire project
792faa453a6350eda70ad02c58a6110fee7ebb52 04-Feb-2011 Andreas Huber <andih@google.com> Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"
e7c83d4a711241923854d6bbd5de0e24f9192f93 04-Feb-2011 Andreas Huber <andih@google.com> Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)

Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
bd352c3cdc6a8682dae58a5108c82a303be05274 03-Feb-2011 Andreas Huber <andih@google.com> Make sure timestamps attached to encoded media are composition timestamps.

not decoding timestamps. Obviously there is no difference between them if the
content in question does not involve frame reordering.

Change-Id: Iac4d06cfeb8a136f735c1148e98cac340d3ef893
related-to-bug: 3398314
ibstagefright/MPEG4Extractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/include/SampleTable.h
f9f223edb408cdc9fd946dc099a86857079a639f 13-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 1804058 FLAC extractor

Note: dependent on external/flac for libFLAC

Implemented and tested:
* FLAC container
* mono and stereo
* standard sample rates
* standard bit depths
* sniffer
* media scanner
* Vorbis comment metadata including album art
* random access seeking with "torture test"
* web browser integration for audio/flac (not audio/x-flac), but
note that most web servers don't correctly report the MIME type

Not implemented:
* 24-bit to 16-bit dither or noise shaping in AudioFlinger
* 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger
* replay gain is better done in AudioFlinger
* multi-channel, would need AudioFlinger support
* Ogg container, does not seem to be very popular yet

Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
ava/android/media/MediaFile.java
ava/android/mtp/MtpDatabase.java
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/FLACExtractor.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/include/FLACExtractor.h
ibstagefright/include/OggExtractor.h
6f1bd261b7fd86ac7817ca061dfb55b95150b836 03-Feb-2011 Eric Laurent <elaurent@google.com> am 9c0a1003: Merge "Fix issue 3371080" into honeycomb

* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
Fix issue 3371080
9c0a1003bd676121cf9b1c942ecebd5b486290d5 03-Feb-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 3371080" into honeycomb
d13f987f73df03b06c70c631452f6cafbdc254e1 03-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb

* commit '36b685ffb0e3c1848bc8085757da3e673d19028a':
Fix for issue : 3419353 Crash during transition generation
25101b0b9a84571ead15b26e9f4cd9c4298d7823 02-Feb-2011 Eric Laurent <elaurent@google.com> Fix issue 3371080

Modified default volume control logic in AudioService:
1 IN_CALL volume if in video/audio chat
2 NOTIFICATION if notification is playing or was playing less than 5s ago.
3 MUSIC

Modified silent mode:
- now also affect MUSIC stream type
- entering silent mode when VOL- hard key is pressed once while selected
stream volume is already at 0 (except for VOICE_CALL stream).
- exiting silent mode when pressing VOL+ hard key while in silent mode

Play sound FX (audible selections, keyboard clicks) at a fixed volume.

Modified audio framework:
- isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger)
- iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.

Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/IAudioService.aidl
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioPolicyService.cpp
13984592b1b63a14c8401cf314865daf633e85ec 03-Feb-2011 Dheeraj Sharma <dheerajs@google.com> Fix for issue : 3419353 Crash during transition generation

Change-Id: I1f15f05c87bdc1ad8acdb6fc5db3c350e5b28947
ava/android/media/videoeditor/VideoEditorImpl.java
3f9a851e07f0fbe0f5440afd82f26b52ca79428e 03-Feb-2011 Gil Dobjanschi <virgild@google.com> am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb

* commit 'ed2c513337ae7581ef73b88424da91ef2d862a78':
Bug fix: 3419287 Deleted images and video clips invalidate the entire project
29206e917574688a6270233f92b734a2d7231faa 03-Feb-2011 Gil Dobjanschi <virgild@google.com> Bug fix: 3419287 Deleted images and video clips invalidate the entire project

Change-Id: I9dcc3b9fa0574fefe688c1616e69ba37811bde51
ava/android/media/videoeditor/VideoEditorImpl.java
3fe81c9e2b03dd2dc5920ea1f85692312554606a 03-Feb-2011 Kenny Root <kroot@google.com> Merge "Fix some memory leaks found in static analysis"
2d0010674aa5fc30ba48b83e8a9c035fdf38cfaf 03-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am 3d3621f0: am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb

* commit '3d3621f08b02ae559036c7d085c02276ae0a24d9':
Fix issue 3412777 ANR on adding effects.
3d3621f08b02ae559036c7d085c02276ae0a24d9 03-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb

* commit '54b0a7f3ff0411a215e7e23f1041d414a32147b5':
Fix issue 3412777 ANR on adding effects.
3d384f8edbf604408532001e7a7ba1ee76b65c95 02-Feb-2011 Kenny Root <kroot@google.com> Fix some memory leaks found in static analysis

Change-Id: Icd630009793c51acfaed45763ef50489ead40024
tp/MtpDevice.cpp
8930a1259dccd3d0639e74d7a9125f1f968dc65f 02-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am 2fa861cc: am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb

* commit '2fa861cc6ef65696854dc4a85494bea6dd87fd8e':
Fix issue 3408285 Crash while generating KenBurns
2fa861cc6ef65696854dc4a85494bea6dd87fd8e 02-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb

* commit '261ddb81206a502a4fd4c9fe1cdc0d931c0e6db1':
Fix issue 3408285 Crash while generating KenBurns
a3f87f855b9abe2d086658eba8a92e04b69dd078 02-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Fix issue 3412777 ANR on adding effects.

Change-Id: Id3c480a8261423412a99375f71cf6ee585b6c22b
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/VideoEditorImpl.java
261ddb81206a502a4fd4c9fe1cdc0d931c0e6db1 02-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb
bf1e5cefe24f19d570426ef3ed1739902ea07631 02-Feb-2011 Nemmara Venkateswaran <vekateswar@google.com> am e00d44ce: am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb

* commit 'e00d44ced228dc523f4492edd66d4eeb5dabd305':
Fix for issue 3370023 : Wrong aspect ratio in overlay
e00d44ced228dc523f4492edd66d4eeb5dabd305 02-Feb-2011 Nemmara Venkateswaran <vekateswar@google.com> am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb

* commit '47b8c96b253ab24d0df089c87ce0798d4981400a':
Fix for issue 3370023 : Wrong aspect ratio in overlay
beb9fc8ee8d3bd14d141104e91d41809dcfe0e1a 02-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Fix issue 3408285 Crash while generating KenBurns

Change-Id: Iaa207229e2c699e1d374b424893bcf252c6614f3
ni/mediaeditor/VideoEditorMain.cpp
63298a980930c81754ab4fb7849a4ff61088d864 01-Feb-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3370023 : Wrong aspect ratio in overlay

Change-Id: I65bdfb2b5c9edc26de94052e21b8f55ec8671f6a
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/OverlayFrame.java
ava/android/media/videoeditor/VideoEditorImpl.java
ni/mediaeditor/VideoEditorMain.cpp
13c05526430488ceac6a9fe839cdc42da50e7c17 02-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am e9c5ade3: am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.

* commit 'e9c5ade37168e43203c060635c66dbd4de2ae458':
Fix issue 3414805 Crash during Overlay editing. JNI fixes.
e9c5ade37168e43203c060635c66dbd4de2ae458 02-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.

* commit 'c08f85a6484ee5da7062a5eac0f19912bd7e2513':
Fix issue 3414805 Crash during Overlay editing. JNI fixes.
c08f85a6484ee5da7062a5eac0f19912bd7e2513 02-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Fix issue 3414805 Crash during Overlay editing. JNI fixes.

Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
ni/mediaeditor/VideoEditorMain.cpp
9cd6a8e2cf11de51832ba00fe7cc90c2174b2977 01-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am dacacb50: am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb

* commit 'dacacb50ed616bc52c092d9716252ec49a94457d':
Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
b5f497b40439edef892b6fac96f44692f43c1f06 01-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am 537cc3b1: am ba2ee617: Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb

* commit '537cc3b19d84e5b0c8d3631c051bb36a4c8cf784':
Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
4fd9eaf5a96a47c2b5fffe5d28873a00c3d3a053 01-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am 8ceccbed: am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb

* commit '8ceccbed7177234f219f2aa39f71554f9141d084':
Fix issue 3408285. Fix issue in Thread safe in Java.
944170f2cf3456a9885e998516120f053e2496d1 01-Feb-2011 Gloria Wang <gwang@google.com> Merge "- Support comfort noise in AMRExtractor - Support duration and seeking in AMRExtractor for different bit rates"
069715b6f8fd6373163c1689c3ee6e5a87f424b7 28-Jan-2011 Gloria Wang <gwang@google.com> - Support comfort noise in AMRExtractor
- Support duration and seeking in AMRExtractor for different bit rates

Bug 2530101

Change-Id: I12beffea73cea0ec056f0e0cf51a4a8d46d897b8
ibstagefright/AMRExtractor.cpp
ibstagefright/include/AMRExtractor.h
dacacb50ed616bc52c092d9716252ec49a94457d 01-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb

* commit '22ad6243d7c9081e4f1a13097cfa4638cf42c3fe':
Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
8afee6694b9584e7efcbf48c977780893bda4870 01-Feb-2011 Dheeraj Sharma <dheerajs@google.com> Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project

Change-Id: Ice53fb284e029b1d22093048e8343f9ce8d853dd
ava/android/media/videoeditor/VideoEditorImpl.java
537cc3b19d84e5b0c8d3631c051bb36a4c8cf784 01-Feb-2011 Dheeraj Sharma <dheerajs@google.com> am ba2ee617: Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb

* commit 'ba2ee6178ec386e838434cef902fb7de34ec6585':
Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
178d4f41119614b9064720a5bffeaebf3affe941 01-Feb-2011 Dheeraj Sharma <dheerajs@google.com> Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged

Change-Id: Iddd1b9b2c430439c4bef4f1cf20fb166ac572d60
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/VideoEditorImpl.java
8ceccbed7177234f219f2aa39f71554f9141d084 01-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb

* commit '327549f9961b8cd562d1a92c1455005672aa2b95':
Fix issue 3408285. Fix issue in Thread safe in Java.
327549f9961b8cd562d1a92c1455005672aa2b95 01-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb
0026394ed9d13008b9a85dfca8d2f6c6fa6e8aac 01-Feb-2011 Andreas Huber <andih@google.com> am b450d96b: am 537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb

* commit 'b450d96b3d13cd341ef7aa4483c2223ddfecce3c':
Disconnect HTTP live sessions as soon as the request comes in.
b450d96b3d13cd341ef7aa4483c2223ddfecce3c 01-Feb-2011 Andreas Huber <andih@google.com> am 537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb

* commit '537fa17f21390fcb4a8d4b24f1cc80ca147ccce0':
Disconnect HTTP live sessions as soon as the request comes in.
a573b563b3c6a3edc60393543dc9adb7ade4f188 01-Feb-2011 Dharmaray Kundargi <dharmaray@google.com> Fix issue 3408285. Fix issue in Thread safe in Java.

Change-Id: Ifddcecfc2d7b1bd3e8a91c4850c169e1fb7c65ae
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/EffectKenBurns.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorImpl.java
17ab86cdb1eb8b44780676177ad37a6c1df4cf5f 01-Feb-2011 Andreas Huber <andih@google.com> Disconnect HTTP live sessions as soon as the request comes in.

Instead of waiting until pending events have been processed.

Change-Id: Id758f5508a514561e18aade82175d69e9156965e
related-to-bug: 3409681
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/LiveSession.h
4639532261581eb2e6d4bb379604b0357d460dc0 31-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: Use ro.product.manufacturer system property value for MTP manufacturer name

Previously it was hard coded to "Google, Inc."

BUG: 3405965

Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
045815985288d37d3be598379621bdfac060d730 31-Jan-2011 Gil Dobjanschi <virgild@google.com> am 1aa865aa: am 2bb13573: Bug fix: 3405930 Crash editing overlay text

* commit '1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673':
Bug fix: 3405930 Crash editing overlay text
1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673 31-Jan-2011 Gil Dobjanschi <virgild@google.com> am 2bb13573: Bug fix: 3405930 Crash editing overlay text

* commit '2bb13573d619e3371d06847d36db78a20b17dfab':
Bug fix: 3405930 Crash editing overlay text
2bb13573d619e3371d06847d36db78a20b17dfab 31-Jan-2011 Gil Dobjanschi <virgild@google.com> Bug fix: 3405930 Crash editing overlay text

Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Overlay.java
ava/android/media/videoeditor/OverlayFrame.java
ava/android/media/videoeditor/VideoEditorImpl.java
3a70cf3aff5da2ed30923bf5fe70334ee54ede14 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am 60a3ead5: am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb

* commit '60a3ead52ec6216b28d1d82ab3480a08bf919c17':
Fix for issue 3404671 Crash when exporting movie in JNI
60a3ead52ec6216b28d1d82ab3480a08bf919c17 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb

* commit 'cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
Fix for issue 3404671 Crash when exporting movie in JNI
cd73d1ed6d1149a2ae642e87ffe8d89100fbafec 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb
8e6c69b092a4370c4ed10c3263f3580e8b960095 31-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am 75aa290d: am ff843254: Merge "Merging the same files on top of tree." into honeycomb

* commit '75aa290d5d23a9bb862e409f9b5de23a0ffda579':
Merging the same files on top of tree.
75aa290d5d23a9bb862e409f9b5de23a0ffda579 31-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am ff843254: Merge "Merging the same files on top of tree." into honeycomb

* commit 'ff8432548eb96655190486ee0f0fa08de5451e66':
Merging the same files on top of tree.
4e7032052137345450bfd2b7a4a9a05ecde17076 30-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Merging the same files on top of tree.

Add support for .m4v Issue 3395600

Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/MediaVideoItem.java
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorClasses.h
ni/mediaeditor/VideoEditorJava.cpp
ni/mediaeditor/VideoEditorPropertiesMain.cpp
407a558af5556a9e198c6e0be255f6829c4e81ba 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am 471ebbca: am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb

* commit '471ebbca5f404062bed232aa27da9c1f1ebf0a1d':
Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
471ebbca5f404062bed232aa27da9c1f1ebf0a1d 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb

* commit '45911e1969fd1843bac5806e06f351123b67f596':
Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
45911e1969fd1843bac5806e06f351123b67f596 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
085787a4029fe76ea3ad8012853e647f18699057 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am bd633b72: am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb

* commit 'bd633b7297c60771223f0e8799c418cdbce3017c':
3404665 Preview window is blank after returning from playing exported movie
bd633b7297c60771223f0e8799c418cdbce3017c 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb

* commit '167e7488af4d53673ff2fcc0723ae2a1584f5194':
3404665 Preview window is blank after returning from playing exported movie
167e7488af4d53673ff2fcc0723ae2a1584f5194 31-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb
c1a2f40005acef8d05c622e8934b84d5d0575f23 30-Jan-2011 Dheeraj Sharma <dheerajs@google.com> 3404665 Preview window is blank after returning from playing exported movie

Change-Id: Idf2719953cbaf41e09eaf86de37e3459a1ea4aed
ava/android/media/videoeditor/MediaArtistNativeHelper.java
9803b8435e973d7e44360b91fa6935d0e3981a76 30-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI

Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
ava/android/media/videoeditor/MediaImageItem.java
ni/mediaeditor/VideoEditorClasses.cpp
b2abd8c424a68eb6a5e3615a99f66c0bd46e6063 30-Jan-2011 The Android Open Source Project <initial-contribution@android.com> Mass merge from gingerbread - do not merge

Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
5618e037af1a9d4323990a580d4181b9bc8e3091 30-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Fix for issue 3404671 Crash when exporting movie in JNI

Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
ni/mediaeditor/VideoEditorMain.cpp
cc2915c0b1608933819aa284788dbdb184fe9823 29-Jan-2011 Marco Nelissen <marcone@google.com> am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread

* commit 'c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
f51c35e45fe69eeab1486109dbd515be177771b9 28-Jan-2011 Andreas Huber <andih@google.com> am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb

* commit '35a1f771759459fc6c9b355d548c5b97cd50e110':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
35a1f771759459fc6c9b355d548c5b97cd50e110 28-Jan-2011 Andreas Huber <andih@google.com> am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb

* commit '79c4648597dab2b7786c8f067896ab66abe190de':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
70888c00a0371692a07132f0dd94208456dd44c1 28-Jan-2011 Andreas Huber <andih@google.com> am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.

* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
d916339e2fe173c32cdfa21671dade32a254b1ad 28-Jan-2011 Andreas Huber <andih@google.com> Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"

This reverts commit aac2e9e1566a3bb0ef811ebd3a56b538324c95c1.

Change-Id: Ic84dfa829981fdc1a1330ccfe6b9dccf64a80719
related-to-bug: 3392386
ibstagefright/AwesomePlayer.cpp
b6c2e2b46c574a90450438cccfb6cb97b7edc20f 28-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.

Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug: 3217210
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/ASessionDescription.h
ibstagefright/rtsp/MyHandler.h
12a8c3959f36c0a047afc613eb43305832e8db08 28-Jan-2011 Andreas Huber <andih@google.com> am 970436ee: am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb

* commit '970436ee42bad03940a73666f8150a28c5789713':
More robust parsing of NPT time ranges in RTSP.
970436ee42bad03940a73666f8150a28c5789713 28-Jan-2011 Andreas Huber <andih@google.com> am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb

* commit 'b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4':
More robust parsing of NPT time ranges in RTSP.
a2edd7d8d1323aad756d6f58f545d01c0bf33458 28-Jan-2011 Andreas Huber <andih@google.com> More robust parsing of NPT time ranges in RTSP.

Change-Id: I3674501d2fd66aaface805c0a8678c74671a6dd3
related-to-bug: 3217210
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/ASessionDescription.h
ibstagefright/rtsp/MyHandler.h
28817de4d73f3b3054bdd405c13a92e6a5f0a4ba 28-Jan-2011 Jean-Michel Trivi <jmtrivi@google.com> am 965f22ba: am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb

* commit '965f22ba325ea488034174bf76194470a6f0ee52':
Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
965f22ba325ea488034174bf76194470a6f0ee52 28-Jan-2011 Jean-Michel Trivi <jmtrivi@google.com> am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb

* commit '3b5d9515f208d28ae168c3f3d3cd442ff6e6e45a':
Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
834662d4224ebbb95527cb43eaf9dcea548d7b19 28-Jan-2011 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes

When the user is in a phone or VoIP call, the volume keys should
control the STREAM_VOICE_CALL volume. Before MODE_IN_COMMUNICATION
was introduced to cover VoIP use cases, having an active VoIP call
was determined by checking whether there was any track used the
output stream STREAM_VOICE_CALL, which can give false positives.
This CL checks instead against the audio mode to see if
MODE_IN_COMMUNICATION is selected to determine if a VoIP call
is in progress.

This implies that applications that play on STREAM_VOICE_CALL
shouldn't rely on that fact alone to expect the volume keys
to control the STREAM_VOICE_CALL volume, and should instead,
rely on the official mechanism for that:
android.app.Activity.setVolumeControlStream(int)

Change-Id: Ia487951ea1684477aa3d522c9031fad484d8a40d
ava/android/media/AudioService.java
1fce24b241e386af19ba7c5bc29af5d18461f4ff 27-Jan-2011 Mike Lockwood <lockwood@android.com> Add support for synchronous bulk USB transfers

Change-Id: Id5de49e4d728a702fa1583ecc24f83f36cc57d21
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
05b536e671b60740a47c37e8be6adbfff6fad3eb 28-Jan-2011 Santosh Madhava <smadhava@google.com> am c4f5b712: am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb

* commit 'c4f5b712049a5891bc2d1a87031134f3fe0acb03':
Fix for issue 3370007 Overlay transparency in Java
c4f5b712049a5891bc2d1a87031134f3fe0acb03 28-Jan-2011 Santosh Madhava <smadhava@google.com> am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb

* commit '270cbcc16a72f982d84afeb5e3fd3f166936394a':
Fix for issue 3370007 Overlay transparency in Java
270cbcc16a72f982d84afeb5e3fd3f166936394a 28-Jan-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb
4f54da9629a1fd67e9ab41a66137be3e78eb0fdf 28-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am b408c3e9: am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb

* commit 'b408c3e984dbc3af43befc6fd16ff74dd24457a9':
Fix Issue: 3373525: reduces app. 100mS in create
b408c3e984dbc3af43befc6fd16ff74dd24457a9 28-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb

* commit '64a2c359aeda59e4bc43d48f31ade919e918ea26':
Fix Issue: 3373525: reduces app. 100mS in create
73f376cf6446c607b6f0355ad8282dd47608346d 27-Jan-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3370007 Overlay transparency in Java

Change-Id: I68be6f56ad58672a771485a028fc0cd8a0514e8a
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/OverlayFrame.java
64a2c359aeda59e4bc43d48f31ade919e918ea26 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb
737bd08db020802f1c60941be09e13c3c587f2aa 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Fix Issue: 3373525: reduces app. 100mS in create

Updated by removing code duplication

Updated with review comments

Change-Id: I57a596ed09d4d543964059e18a86e143108305ec
ava/android/media/videoeditor/MediaImageItem.java
6adcce8a5751b0afba86a55f600aa1f14a56d03c 27-Jan-2011 Gil Dobjanschi <virgild@google.com> am 0966fb9e: am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface

* commit '0966fb9e73345b1e5ea9464e77beed07378edd6a':
Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
0966fb9e73345b1e5ea9464e77beed07378edd6a 27-Jan-2011 Gil Dobjanschi <virgild@google.com> am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface

* commit 'eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5':
Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5 27-Jan-2011 Gil Dobjanschi <virgild@google.com> Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface

Change-Id: Ib7cb994e995d934cf896b856da462c9240fcb5f0
ava/android/media/videoeditor/VideoEditorImpl.java
655c66332eeda16f1be6e11ab0687a4e5b9c0ea5 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb

* commit '90982936a026f1f951fe06ad4d2bcfd72a99ab8f':
Revert "Video editor CTS: Framework modifications"
a44f02a4ef397fe623042c5b96591cfcf9e87742 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am 141a2adb: am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb

* commit '141a2adb25130bcbe8620ae239e94d33c7c92eef':
Revert "Fixes Issue ID: 3396697"
90982936a026f1f951fe06ad4d2bcfd72a99ab8f 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb

* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
Revert "Video editor CTS: Framework modifications"
141a2adb25130bcbe8620ae239e94d33c7c92eef 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb

* commit '3b728ca70a4fe6760b682589505d76848c47d765':
Revert "Fixes Issue ID: 3396697"
89378fd1666cd589599a0c5a7d0c71fa2f8159a5 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
3b728ca70a4fe6760b682589505d76848c47d765 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
d36b1f07394c3326d6629cd3bc706974ac49345a 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Revert "Video editor CTS: Framework modifications"

This reverts commit eb6d6ecf4ba7a3965ce6ab178dce48eb9416bfc7.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
4b9969af57137736e70df68844f198a3b69fcb4c 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Revert "Fixes Issue ID: 3396697"

This reverts commit 8b9ba616444a265df6cd2b4f4a0a39d808c65ade.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/VideoEditorHelper.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorExportTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorPreviewTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java
e9ad1bf4edf3a1c559ae51e30971b800016442d5 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb

* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
Video editor CTS: Framework modifications
497c56f67fac8e7b31ccb0710e84bc9843c47a8e 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb

* commit '55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21':
Fixes Issue ID: 3396697
a33537c3f1dbe1a4fa57560c406bf45e8f52436e 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb

* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
Video editor CTS: Framework modifications
55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb

* commit '643e8476e1b9da93a06d073797863298ae268393':
Fixes Issue ID: 3396697
9af5da5258d14c743150318e9887b7d10c0117d4 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "Video editor CTS: Framework modifications" into honeycomb
643e8476e1b9da93a06d073797863298ae268393 27-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Merge "Fixes Issue ID: 3396697" into honeycomb
d4d138a064e7c4e364fed5162630368c4d6475d1 27-Jan-2011 James Dong <jdong@google.com> am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb

* commit 'f1e687b6e31ba4597558de94c40a73a074ba7703':
Eliminate duplicated code in export method
f1e687b6e31ba4597558de94c40a73a074ba7703 27-Jan-2011 James Dong <jdong@google.com> am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb

* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
Eliminate duplicated code in export method
eb6d6ecf4ba7a3965ce6ab178dce48eb9416bfc7 18-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Video editor CTS: Framework modifications

Fixes Issue ID: 3396697

Copyright changed to 2011

Change-Id: I1b69c6903bb6b0434eb93337783f93c92fd20899
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
8b9ba616444a265df6cd2b4f4a0a39d808c65ade 18-Jan-2011 Basavapatna Dattaguru <dattaguru@google.com> Fixes Issue ID: 3396697

Updated with annotation LargeTest

Copyright changed to 2011

Review reworked and with new test contents

Video Editor CTS Test code

Change-Id: Ia37956ef39fafcc5d969996c1791fce8663aa0fe
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/VideoEditorHelper.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorAPITest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorExportTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/VideoEditorPreviewTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/VideoEditorPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/VideoEditorStressTest.java
20586a128c1faa0bcca27537f006a2cbcd17206d 26-Jan-2011 James Dong <jdong@google.com> Eliminate duplicated code in export method

bug - 3385135

Change-Id: I26b8113b457bf08bf8a89cef25cf45cdba79c08d
ava/android/media/videoeditor/VideoEditorImpl.java
edbf4b3b21e76c2cdaca94b67bcbc173cd1dc94b 27-Jan-2011 Andreas Huber <andih@google.com> am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb

* commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
586096a9575a52ea7fa318f6f8540b47ba2ed2e8 27-Jan-2011 Andreas Huber <andih@google.com> am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2dce338e01678620db0734fc3d84bcb3f2512d62 27-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

And now we're just ignoring them. Yay standards.

Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749
related-to-bug: 3353752
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
bba92023e55f46e8b4f8b81b3412e663a5e71ceb 27-Jan-2011 Andreas Huber <andih@google.com> am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb

* commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73 27-Jan-2011 Andreas Huber <andih@google.com> Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
0f535afd7e177b9a133f3ef4d014042797b225ff 27-Jan-2011 Andreas Huber <andih@google.com> This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.

And now we're just ignoring them. Yay standards.

Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35
related-to-bug: 3353752
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
82cb6731a08cc094fba5c5f6dca6e739db9a0500 27-Jan-2011 Mike Lockwood <lockwood@android.com> am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb

* commit 'bd65c065b2dcb54dde563a8a21c9f92da947c7dd':
MTP: Fix month off by one error in date parsing and formatting code
bd65c065b2dcb54dde563a8a21c9f92da947c7dd 27-Jan-2011 Mike Lockwood <lockwood@android.com> am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb

* commit 'a13732e17a0f3d69df9c418407985b3ad64b1852':
MTP: Fix month off by one error in date parsing and formatting code
a13732e17a0f3d69df9c418407985b3ad64b1852 27-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
2107d23fc9d324ee3f5d5584c9a4bedb0fcf3da8 26-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: Fix month off by one error in date parsing and formatting code

BUG: 3379100

Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpUtils.cpp
804d8798d525ef8cda01998701d76166c641fc71 26-Jan-2011 James Dong <jdong@google.com> am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb

* commit '8bea1d5585822bb62996e789f59c7629dfd9ac50':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
8bea1d5585822bb62996e789f59c7629dfd9ac50 26-Jan-2011 James Dong <jdong@google.com> am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb

* commit '7fb232c40cde91d0958be1694db2d97a126b95f9':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
7fb232c40cde91d0958be1694db2d97a126b95f9 26-Jan-2011 James Dong <jdong@google.com> Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
1155efdc715413cd7a881e5226b5f5f0b2db8f71 26-Jan-2011 Jean-Michel Trivi <jmtrivi@google.com> am 2ba92c71: do not merge bug 3370834 Cherrypick from master

* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
7a58635e84dc27329e4061c12b186fa4c7f36dd7 26-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am 666b9eb3: am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb

* commit '666b9eb3a260034c85e2a6eaa5e8f4ceea968f33':
Overlay java files Issue 3370836
5af2ce4c5fd45250943fa62ad5dc194ca5e3de51 26-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am 81bebad0: am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb

* commit '81bebad0f1fa0bda5a74e4e78b43bd94bd94bf40':
Fix for Issue 3370836 : JNI files for Overlay optmization.
666b9eb3a260034c85e2a6eaa5e8f4ceea968f33 26-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb

* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
Overlay java files Issue 3370836
81bebad0f1fa0bda5a74e4e78b43bd94bd94bf40 26-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb

* commit 'ecebf173deca568aa44f4fc29968e10c78ad7571':
Fix for Issue 3370836 : JNI files for Overlay optmization.
45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc 26-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "Overlay java files Issue 3370836" into honeycomb
ecebf173deca568aa44f4fc29968e10c78ad7571 26-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
17c914a067b4cfe17dae38482480bf9639961c98 26-Jan-2011 Andreas Huber <andih@google.com> am 11934aa3: am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb

* commit '11934aa32102d56ea920b058cb3cc9a455cd2232':
More instrumentation to track down the hardware decoder not shutting down bug.
bd36c2230b3e497e7bd7f7de07dc5a85f4fcb026 26-Jan-2011 Andreas Huber <andih@google.com> am 1a6e6d55: am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb

* commit '1a6e6d55b8dd33b3bd2b52849d39ef96b556b52f':
Ignore errors returned from native_window_set_crop.
5f3ab06e90365ad6c4865e2cab358a20e12ce0eb 26-Jan-2011 James Dong <jdong@google.com> Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.

This will fix the stop failure issue where we have to wait n * time_interval before a key frame can be received by the file writer, where
o n is the actual number of buffers advertised by the video encoder
o time_interval is the interval settings for timelapse video recording
specifying the time distance between neighboring input video frames

The fix includes two parts:
o OMXCodec will not submit all n buffers at one time, but instead submit one input
frame at one time if it become available.

o Timelapse camera source made available the first two input frames and do not skip
them so that the first compressed output frame data can be received regardless
the specified time_interval

bug - 3367659

Change-Id: Ia68cc2cb0d71aa7dc54540e9ad82fae911ad530b
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ibstagefright/OMXCodec.cpp
11934aa32102d56ea920b058cb3cc9a455cd2232 26-Jan-2011 Andreas Huber <andih@google.com> am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb

* commit '373d357a8b13dc2cdc82d9e1d6144fb26e3bb202':
More instrumentation to track down the hardware decoder not shutting down bug.
1a6e6d55b8dd33b3bd2b52849d39ef96b556b52f 26-Jan-2011 Andreas Huber <andih@google.com> am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb

* commit '6df89fde0db446bb530ab872b373b1faa3ccb06c':
Ignore errors returned from native_window_set_crop.
373d357a8b13dc2cdc82d9e1d6144fb26e3bb202 26-Jan-2011 Andreas Huber <andih@google.com> Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
06be3b14c97326f362f9b501e639e9ac32d2c292 25-Jan-2011 Andreas Huber <andih@google.com> More instrumentation to track down the hardware decoder not shutting down bug.

Change-Id: I3f31b6fdf5c90b436567bbce578dcbc4666ed7c2
related-to-bug: 3362836
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMXNodeInstance.cpp
00d6c725ec465fe2d51252f961b5eaeebf9c9864 26-Jan-2011 Andreas Huber <andih@google.com> Ignore errors returned from native_window_set_crop.

If the surface is already invalid, we'll know soon enough.

Change-Id: If360ffb8293817afb47df8c1a75722aea74bb335
related-to-bug: 3394601
ibstagefright/OMXCodec.cpp
dca5cb32040255586b9c69f20ae9121aad6c3b1d 26-Jan-2011 Andreas Huber <andih@google.com> am 38a1714b: am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb

* commit '38a1714bf79821dad296eeddfda1b6a7ce93ebbd':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
36fc650bd866d2d475aed16a5b7e1ca832f029d4 26-Jan-2011 Andreas Huber <andih@google.com> am 807398e7: am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb

* commit '807398e7f0718aaa9e8f53c556d0707c083819cf':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
38a1714bf79821dad296eeddfda1b6a7ce93ebbd 26-Jan-2011 Andreas Huber <andih@google.com> am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb

* commit '7765c65dbe1ba8f2229f2fec5a83ba2d1da79733':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
807398e7f0718aaa9e8f53c556d0707c083819cf 26-Jan-2011 Andreas Huber <andih@google.com> am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb

* commit 'd030359ff10a031c762d4f229d9c1bdfd366cb50':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
9c077e44c05f6829dd12067947a387c132dc6eaa 26-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Overlay java files Issue 3370836

Change-Id: If062ad12dc2f5faf58936436527234ce80dffad9
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/Transition.java
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorImpl.java
7765c65dbe1ba8f2229f2fec5a83ba2d1da79733 26-Jan-2011 Andreas Huber <andih@google.com> Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
2ba92c71b5684dce700cf848bf157153c156df1d 15-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> do not merge bug 3370834 Cherrypick from master

Cherripick from master CL 79833, 79417, 78864, 80332, 87500

Add new audio mode and recording source for audio communications
other than telelphony.

The audio mode MODE_IN_CALL signals the system the device a phone
call is currently underway. There was no way for audio video
chat or VoIP applications to signal a call is underway, but not
using the telephony resources. This change introduces a new mode
to address this. Changes in other parts of the system (java
and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
state variable directly, but to use two new convenience methods,
isInCall() and isStateInCall(int) instead.

Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Update the platform-independent audio policy manager to pass the
nature of the audio recording source to the audio policy client
interface through the AudioPolicyClientInterface::setParameters()
method.

SIP calls should set the audio mode to MODE_IN_COMMUNICATION,
Audio mode MODE_IN_CALL is reserved for telephony.

SIP: Enable built-in echo canceler if available.
1. Always initialize AudioRecord with VOICE_COMMUNICATION.
2. If echo canceler is available, disable our echo suppressor.

Note that this CL is intentionally not correcting the
getAudioSourceMax() return value in MediaRecorder.java as the
new source is hidden here.

Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/MediaRecorder.java
ibmedia/AudioSystem.cpp
4aeec2da39fce4de9b07b694d59fd308ffb3d491 26-Jan-2011 Andreas Huber <andih@google.com> Instead of not feeding the AudioTrack any data after EOS, play silence instead.

Change-Id: I9aa797cf5bb58eefed51d732f4e5d09450551158
related-to-bug: 3347428
ibstagefright/AudioPlayer.cpp
231640950ebd5accb7760ef0858f968d2c62a4dd 26-Jan-2011 Andreas Huber <andih@google.com> Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.

Change-Id: Id53e7831761619f72ddc61f63571230011c93f16
related-to-bug: 3362836
ibstagefright/HTTPStream.cpp
c16ccc1c5a6293136ae9bd4756dc2f57914a2020 22-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Fix for Issue 3370836 : JNI files for Overlay optmization.

Change-Id: I3d7a0248bfd75bbd7c23321e22c3c331eb33ddd2
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorMain.h
ae27549f834bd0acedbc7cdb5654b8e789a1bce6 26-Jan-2011 Santosh Madhava <smadhava@google.com> am c4132eb2: am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb

* commit 'c4132eb299d52575c3a5f4a9361f62f1737ad64e':
Review rework for issue 3385068 : Play gets out of sync
c4132eb299d52575c3a5f4a9361f62f1737ad64e 26-Jan-2011 Santosh Madhava <smadhava@google.com> am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb

* commit '4991a00b28ea17941681396ec5dfc62a53408158':
Review rework for issue 3385068 : Play gets out of sync
4991a00b28ea17941681396ec5dfc62a53408158 26-Jan-2011 Santosh Madhava <smadhava@google.com> Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb
3cf1554b764e9d25db1850c9837a7cf1ec10213c 26-Jan-2011 Santosh Madhava <smadhava@google.com> am 7196a266: am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb

* commit '7196a266c5967f64a858519c5fe71f0964035390':
Fix for issue 3366265 : Native crash exporting movie
7196a266c5967f64a858519c5fe71f0964035390 26-Jan-2011 Santosh Madhava <smadhava@google.com> am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb

* commit 'b38ed1af92c6af03249a50fed0530d20de5cd14d':
Fix for issue 3366265 : Native crash exporting movie
1abe0050fa82ada9dbc14f7371e8b4ef0e093936 26-Jan-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3366265 : Native crash exporting movie

Change-Id: I04195198031eeb7d34d4249b49a1092321a2eb0a
ava/android/media/videoeditor/VideoEditorImpl.java
53df92d84e7380d85a99efe9d9b538627310c015 26-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am d28bb6e2: am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb

* commit 'd28bb6e279c17224e843101199d228fe5aad459d':
VideoEditor:Fix for 3369908
d28bb6e279c17224e843101199d228fe5aad459d 26-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb

* commit '2aaa776429f58069e25c8160a9e5b9a969f6e993':
VideoEditor:Fix for 3369908
2aaa776429f58069e25c8160a9e5b9a969f6e993 26-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Merge "VideoEditor:Fix for 3369908" into honeycomb
de412d277ce9e5dc3918401fc399ace98d4f1d31 26-Jan-2011 Santosh Madhava <smadhava@google.com> Review rework for issue 3385068 : Play gets out of sync

Change-Id: I7f7435bd898a72302500cdc15874e469922cbebe
ava/android/media/videoeditor/MediaArtistNativeHelper.java
2c91b5699e95519d9ce297ab7305b09841cd3285 26-Jan-2011 Mike Lockwood <lockwood@android.com> am c80daa1b: am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb

* commit 'c80daa1b05b8f1d2873df23821ae2c5344e76fb8':
StagefrightMediaScanner: Close metadata retriever after we are done scanning
501e52f09d555cc27c637846a897b4903a116678 26-Jan-2011 Mike Lockwood <lockwood@android.com> am 7fadb5e7: am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb

* commit '7fadb5e77fd079c3a6c5eeae1ae81a487864b129':
MTP: Fix race conditions in MtpServer JNI code
7ae6dac845eca9b1f1ded4567d8ef90501ac7ae4 26-Jan-2011 James Dong <jdong@google.com> am 45800cf9: am 3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb

* commit '45800cf939d716a6d6435872f5f876b2cfd2689d':
Report errors to applications if AudioRecord->start() fails
4a39e8ad70163d5f0faa4963e9787ad8b2d5cbd2 26-Jan-2011 Santosh Madhava <smadhava@google.com> am d6451721: am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb

* commit 'd645172123f6aac530986ede22fae13f647ccb9f':
Fix for issue 3385068 : Play gets out of sync
c80daa1b05b8f1d2873df23821ae2c5344e76fb8 26-Jan-2011 Mike Lockwood <lockwood@android.com> am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb

* commit 'f10d940413000732f1cd35bcb113c41019c7e3b7':
StagefrightMediaScanner: Close metadata retriever after we are done scanning
f10d940413000732f1cd35bcb113c41019c7e3b7 26-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
7fadb5e77fd079c3a6c5eeae1ae81a487864b129 26-Jan-2011 Mike Lockwood <lockwood@android.com> am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb

* commit '2b3da7ab61ac920881f35bbf66234c073d79ba24':
MTP: Fix race conditions in MtpServer JNI code
2b3da7ab61ac920881f35bbf66234c073d79ba24 26-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
45800cf939d716a6d6435872f5f876b2cfd2689d 26-Jan-2011 James Dong <jdong@google.com> am 3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb

* commit '3115dad3fc8493ff510b9f6a46b18d951bf5c162':
Report errors to applications if AudioRecord->start() fails
d7ef5b6febf5e645a7757bd48d30af9c051fabf6 25-Jan-2011 James Dong <jdong@google.com> Report errors to applications if AudioRecord->start() fails

bug - 3385198

Change-Id: I86ac8071eb28a538b333e102192193d1b9eda5eb
ibstagefright/AudioSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
18bb1ce02f4d886b34f63a01b185ed3fc271e9df 26-Jan-2011 Yu Shan Emily Lau <yslau@google.com> am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread

* commit '2af4e71dd47565d794ad48041a156871396a7dde':
Fix the test application orientation. Bug# 3205196
8151dc3229888109f4ec699eb6311975b51a05b9 26-Jan-2011 Mike Lockwood <lockwood@android.com> StagefrightMediaScanner: Close metadata retriever after we are done scanning

This prevents the mediaserver from leaking a file descriptor after
the media scanner runs

BUG: 3373546

Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibstagefright/StagefrightMediaScanner.cpp
071b2b6739c83d3de806cda5d7be2aba33fde1af 25-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: Fix race conditions in MtpServer JNI code

Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.

BUG: 3317803

Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpPropertyGroup.java
ava/android/mtp/MtpServer.java
ni/android_mtp_MtpServer.cpp
164fddfeae394ee79b163321261a59b509d48579 26-Jan-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3117154"
d645172123f6aac530986ede22fae13f647ccb9f 25-Jan-2011 Santosh Madhava <smadhava@google.com> am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb

* commit '1c9ac91634f7663b7a199f6eacc5a363f888e4d4':
Fix for issue 3385068 : Play gets out of sync
1c9ac91634f7663b7a199f6eacc5a363f888e4d4 25-Jan-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb
da6e64a6b49931da472bf13f198d842d16b12ba0 25-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> am e4d494b4: am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb

* commit 'e4d494b49548eca62bf665fd5954c90731fd18e3':
Rename virtual call API to ScoUsingVirtualCall.
e4d494b49548eca62bf665fd5954c90731fd18e3 25-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb

* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
Rename virtual call API to ScoUsingVirtualCall.
5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba 25-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
dde68c64fd8e97a592633ec4c09283ec928e5697 24-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Rename virtual call API to ScoUsingVirtualCall.

This API makes more sense with regard to headset profile.
Bug: 3381532

Change-Id: Ife07d101a3b04bcddb31e7ae86712e1d97a660c5
ava/android/media/AudioService.java
a6714ce2bbb593efdfb53e071607df2a5117a643 25-Jan-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3385068 : Play gets out of sync

Change-Id: Iaf5e2f246b9cbfc5c8093d34ed085fe255ae500b
ava/android/media/videoeditor/MediaArtistNativeHelper.java
454693d3f6f9e2db5079138f2f7b744bc0a58fb3 25-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am 4ba9e68f: am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb

* commit '4ba9e68fa95c59e4f2c7c6b17a663b10a5405f45':
Video Editor:Fix for 3375632
4ba9e68fa95c59e4f2c7c6b17a663b10a5405f45 25-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb

* commit 'b8942108826893657ca0b8b6d5d6d153739a76f6':
Video Editor:Fix for 3375632
b8942108826893657ca0b8b6d5d6d153739a76f6 25-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Merge "Video Editor:Fix for 3375632" into honeycomb
acd65ba837c0cb05ae63147273d73a73c5cb1d6d 25-Jan-2011 Marco Nelissen <marcone@google.com> am 8952df72: am 4b440268: am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread

* commit '8952df72402d8edbc60a0285f0dc7e8fce29a96f':
Increase the number of useful bits in the spectrum.
8952df72402d8edbc60a0285f0dc7e8fce29a96f 25-Jan-2011 Marco Nelissen <marcone@google.com> am 4b440268: am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread

* commit '4b44026879723d924ddc306ea1e330a9e87c3a1c':
Increase the number of useful bits in the spectrum.
161fb37534622e68cc7bbdfd4871c529dacd8c88 25-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 3117154

The previous default audible behavior was actually NONE (dry), despite
the default value of MEDIUMROOM. Corrected default value to match the
default behavior.

Change-Id: Iadb0d41629a383fd52f03e8a21ba4b74ea24401c
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
23b802f65b76c3af251fd5bf61985ec7e910b729 25-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> am 28ae70ce: am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"

* commit '28ae70ceac7d8295c3ba0dbd644c5cef56dc72b3':
Avoid using String.format in MediaRecorder
28ae70ceac7d8295c3ba0dbd644c5cef56dc72b3 25-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"

* commit '23a813e17d94083c24a34559864722c809b4e0f7':
Avoid using String.format in MediaRecorder
4b44026879723d924ddc306ea1e330a9e87c3a1c 25-Jan-2011 Marco Nelissen <marcone@google.com> am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread

* commit 'c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
c929677e017759047d94599faa1b80ebe278fefb 25-Jan-2011 Marco Nelissen <marcone@google.com> Merge "Increase the number of useful bits in the spectrum." into gingerbread
244d6d3c8b260da0434befce40a85bb35baf9743 25-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am 08902803: am a2edecfe: Merge "Issue no : 3370622" into honeycomb

* commit '08902803458faa74fd9aeaec2d9de35046912ed0':
Issue no : 3370622
08902803458faa74fd9aeaec2d9de35046912ed0 25-Jan-2011 Dheeraj Sharma <dheerajs@google.com> am a2edecfe: Merge "Issue no : 3370622" into honeycomb

* commit 'a2edecfe75134ba8bb7258ef30941ef3e9024de4':
Issue no : 3370622
1ac760afabeb19ced48a788c7b675baba47d4db3 24-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Issue no : 3370622

VideoEditor: Fix for Clear Surface API

Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/VideoEditorImpl.java
ni/mediaeditor/VideoEditorMain.cpp
5386fd807716835e41ca9475a6fde7560dc4fcd0 25-Jan-2011 Santosh Madhava <smadhava@google.com> am a1ec9893: am 9c0bd864: Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb

* commit 'a1ec9893b8fd2aa0e499261323d9fe7ad115d915':
Review rework on Patch Set 2 for issue 3372849
a1ec9893b8fd2aa0e499261323d9fe7ad115d915 25-Jan-2011 Santosh Madhava <smadhava@google.com> am 9c0bd864: Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb

* commit '9c0bd864a302ac2a8cb826c3c8d2f0d0ce6f2406':
Review rework on Patch Set 2 for issue 3372849
9c0bd864a302ac2a8cb826c3c8d2f0d0ce6f2406 25-Jan-2011 Santosh Madhava <smadhava@google.com> Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb
6bcbb3bd095daf2c630454f2ac0c26f48b6edf60 22-Jan-2011 Santosh Madhava <smadhava@google.com> Review rework on Patch Set 2 for issue 3372849

Change-Id: I3c077f3318e44035e8ea6eb160d0024e77aaa710
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
d5369d8a6871ae06aad81d1cd5121a040bf2d9e1 25-Jan-2011 Wu-cheng Li <wuchengli@google.com> am 1ab0ac3f: am c8de291e: Merge "Improved conversion accuracy of exif geotag data" into honeycomb

* commit '1ab0ac3f17e52d6cf4f23598f76a8fa8af2310d8':
Improved conversion accuracy of exif geotag data
1ab0ac3f17e52d6cf4f23598f76a8fa8af2310d8 25-Jan-2011 Wu-cheng Li <wuchengli@google.com> am c8de291e: Merge "Improved conversion accuracy of exif geotag data" into honeycomb

* commit 'c8de291ee58665010f80cdedc1bccc57c1d675fb':
Improved conversion accuracy of exif geotag data
c8de291ee58665010f80cdedc1bccc57c1d675fb 25-Jan-2011 Wu-cheng Li <wuchengli@google.com> Merge "Improved conversion accuracy of exif geotag data" into honeycomb
33bdc6789201c44197841321fabee029fb60f1a8 25-Jan-2011 James Dong <jdong@google.com> am 73b38938: am 9807a7b2: Merge "Reduce the JNI native method visibility" into honeycomb

* commit '73b38938a5397c1f89702d4dac00e2f52dc264a8':
Reduce the JNI native method visibility
73b38938a5397c1f89702d4dac00e2f52dc264a8 25-Jan-2011 James Dong <jdong@google.com> am 9807a7b2: Merge "Reduce the JNI native method visibility" into honeycomb

* commit '9807a7b27047c4108e3b2f802a814d4f746898cc':
Reduce the JNI native method visibility
ca1cf59f495dacb132f2a83cefad41d51141a699 25-Jan-2011 Andreas Huber <andih@google.com> am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
efebdf4bd4da35bc50c7d81450c8473697f6654a 24-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37
related-to-bug: 3384367
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
ibstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h
ibstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
98dcca909a44e527ca3a187b13cd1e49a328cbfb 25-Jan-2011 James Dong <jdong@google.com> Reduce the JNI native method visibility

bug -3385135

Change-Id: I568b53d2279622b44ca5b8a23a8691ca3395f9a5
ava/android/media/videoeditor/MediaArtistNativeHelper.java
f47bfa0199798589d4b18f7fddfec89ba27684c9 24-Jan-2011 Andreas Huber <andih@google.com> am 54bce526: am bc5172fe: Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb

* commit '54bce526bf1062093d012853ae6ed2eb68e37e26':
Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
23a813e17d94083c24a34559864722c809b4e0f7 24-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> am 996de2dd: Merge "Avoid using String.format in MediaRecorder"

* commit '996de2dd41498a48be6821cfa0a81b16c0b3975c':
Avoid using String.format in MediaRecorder
54bce526bf1062093d012853ae6ed2eb68e37e26 24-Jan-2011 Andreas Huber <andih@google.com> am bc5172fe: Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb

* commit 'bc5172fe662104e2558b0841fcf82035398e5cac':
Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
bc5172fe662104e2558b0841fcf82035398e5cac 24-Jan-2011 Andreas Huber <andih@google.com> Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb
8b1893f69e0d34387395d01914bfe666c1b23b37 24-Jan-2011 Andreas Huber <andih@google.com> am 5481142a: am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb

* commit '5481142a0358f72c192d5a7e7f50cda77106309e':
The .mkv parser lib leaves some tracks NULL if it doesn't support them.
a8385dd7c12f69677e22f64187d384289e15ecad 24-Jan-2011 Andreas Huber <andih@google.com> Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

Change-Id: Ia22ebce66d9c35de4b04c3eedc9495847796901d
related-to-bug: 3384367
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
ibstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h
ibstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
5481142a0358f72c192d5a7e7f50cda77106309e 24-Jan-2011 Andreas Huber <andih@google.com> am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb

* commit 'c45d3ad08469eb4c519a5aeef74f6d914e674144':
The .mkv parser lib leaves some tracks NULL if it doesn't support them.
b73f4208f0f05146345a1109823e5184f3f31b14 24-Jan-2011 Andreas Huber <andih@google.com> am bd6ac1e4: am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb

* commit 'bd6ac1e4d444e69d31677fec41d4d1a265098f08':
Make AwesomePlayer's reset process more verbose to track down ANRs (again)
01a9c0289e20827dc26c2fd0705244933d151ec6 24-Jan-2011 Santosh Madhava <smadhava@google.com> am 47254778: am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb

* commit '47254778584db8d7a8b9ff17e3704fbdf18fa348':
Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
dc5b1762da470d6b1f26a28fb8abe0b7ee27df45 24-Jan-2011 Gil Dobjanschi <virgild@google.com> am 6c170ecc: am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into honeycomb

* commit '6c170eccf2864e526a145c91102b204cb787c860':
VideoEditor:Clear Surface API addition
dfe8d9b1ffd016744504cd63a777d243fd2099ce 24-Jan-2011 Andreas Huber <andih@google.com> The .mkv parser lib leaves some tracks NULL if it doesn't support them.

But it still counts them as valid tracks...

Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0
related-to-bug: 3377186
ibstagefright/matroska/MatroskaExtractor.cpp
bd6ac1e4d444e69d31677fec41d4d1a265098f08 24-Jan-2011 Andreas Huber <andih@google.com> am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb

* commit 'da6f9295840b0e74f61afa273ce2a767d8148af7':
Make AwesomePlayer's reset process more verbose to track down ANRs (again)
47254778584db8d7a8b9ff17e3704fbdf18fa348 24-Jan-2011 Santosh Madhava <smadhava@google.com> am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb

* commit '36486912595525a3ec4f0027deeb91d318ec4d9d':
Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
da6f9295840b0e74f61afa273ce2a767d8148af7 24-Jan-2011 Andreas Huber <andih@google.com> Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb
aac2e9e1566a3bb0ef811ebd3a56b538324c95c1 24-Jan-2011 Andreas Huber <andih@google.com> Make AwesomePlayer's reset process more verbose to track down ANRs (again)

Change-Id: I0d66994cc4295fd5ceeaaf151ce913ed0dd995f9
related-to-bug: 3362836
ibstagefright/AwesomePlayer.cpp
4ff8a0b410a48a24a94e7d0c608b9b03e7928f71 24-Jan-2011 Santosh Madhava <smadhava@google.com> Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'

Change-Id: Id2e4598f29191c506ab99a112bd7743f6a794cd6
ava/android/media/videoeditor/MediaArtistNativeHelper.java
2450830c0c41a45d333838f4dcf3ba1e4a2409a2 24-Jan-2011 Henrik Backlund <henrik.backlund@sonyericsson.com> Avoid using String.format in MediaRecorder

String.format was used instead of a simple string concatenation.
This is a problem when language is set to Arabic since simple
integers will be converted into Arabic numbers.

Change-Id: I2cbd4c5cd2d09117202e6ae191845fd5fc9154ec
ava/android/media/MediaRecorder.java
dbc0fe985f5cb026113918c96929ee448fc9605e 19-Jan-2011 Marco Nelissen <marcone@google.com> Increase the number of useful bits in the spectrum.

Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
ibmedia/Visualizer.cpp
6c170eccf2864e526a145c91102b204cb787c860 24-Jan-2011 Gil Dobjanschi <virgild@google.com> am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into honeycomb

* commit '9c265fcc846699050bee169f60defff4f5a73b5c':
VideoEditor:Clear Surface API addition
05d9f81bd638a749669192b50e680b166529d5f3 24-Jan-2011 Dheeraj Sharma <dheerajs@google.com> VideoEditor:Clear Surface API addition

Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorImpl.java
ni/mediaeditor/VideoEditorMain.cpp
a113a075ca9afa14361806ea592c8f078b1636c5 14-Jan-2011 Oscar Rydhe <oscar.rydhe@sonyericsson.com> Improved conversion accuracy of exif geotag data

Changed degrees and minutes of geotag data into double to avoid
data loss during cast.

Also improved error handling if geotag data can't be parsed.

bug:3381761
Change-Id: I864843c7fc699fe81e6acba801fe46d10a01925b
ava/android/media/ExifInterface.java
474cb4d2d563d130b61a2832811b3aea26028307 23-Jan-2011 Dheeraj Sharma <dheerajs@google.com> VideoEditor:Fix for 3369908

Change-Id: Ic28d1c96a681dcc56d4432e10dffc273029e1c85
ni/mediaeditor/Android.mk
b21827d1bc543e6c3fe31f0b0bc02e8ce306f43f 23-Jan-2011 Dheeraj Sharma <dheerajs@google.com> Video Editor:Fix for 3375632

Change-Id: I354b8b653ea0ccddda49a6e530ad63b5bd44a5b2
ni/mediaeditor/VideoBrowserMain.c
20bc97fc541610a296d12e25570ac3eb6d599673 07-Jan-2011 Mike Lockwood <lockwood@android.com> CameraBrowser: new implementation based on new MTP host APIs

Change-Id: I81300e3218d6f6fce87432ce506fc282aa4dc4b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/Android.mk
ests/CameraBrowser/AndroidManifest.xml
ests/CameraBrowser/res/layout/object_info.xml
ests/CameraBrowser/res/layout/object_list.xml
ests/CameraBrowser/res/values/strings.xml
ests/CameraBrowser/res/values/styles.xml
ests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/CameraBrowserApplication.java
ests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
ests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java
47063a859ada034d9181b58ffb9875902a4e2531 23-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "New APIs for MTP and PTP host support"
8182e72479a8b0d832df9c392890b25bfa6f97b5 30-Dec-2010 Mike Lockwood <lockwood@android.com> New APIs for MTP and PTP host support

This replaces the previous ContentProvider based interface

Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpClient.java
ava/android/mtp/MtpDevice.java
ava/android/mtp/MtpDeviceInfo.java
ava/android/mtp/MtpObjectInfo.java
ava/android/mtp/MtpStorageInfo.java
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_mtp_MtpDevice.cpp
tp/Android.mk
tp/MtpClient.cpp
tp/MtpClient.h
tp/MtpDevice.cpp
tp/MtpDevice.h
f1762fd25f326dde776a248c193b8eccc2dfddff 22-Jan-2011 Mike Lockwood <lockwood@android.com> am 2d044d1f: Merge "Remove MTP related log spam" into honeycomb

* commit '2d044d1ff9d5d51eba9669857b7d5ea4e9c2ac52':
Remove MTP related log spam
2d044d1ff9d5d51eba9669857b7d5ea4e9c2ac52 22-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "Remove MTP related log spam" into honeycomb
f26a586c86b097f975e26fe526ead564ad011bd0 22-Jan-2011 Mike Lockwood <lockwood@android.com> Remove MTP related log spam

Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpDatabase.java
ava/android/mtp/MtpServer.java
ni/android_mtp_MtpDatabase.cpp
ni/android_mtp_MtpServer.cpp
tp/MtpServer.cpp
tp/MtpStorage.cpp
8513cf6ff26ca188868a899aee3d1344eb975bb5 22-Jan-2011 Carl Shapiro <cshapiro@google.com> am 76afe3e5: Merge "Remove dead code referencing an obsolete interface." into honeycomb

* commit '76afe3e5cdf3a531835d349a6ab04f2fe82e3958':
Remove dead code referencing an obsolete interface.
8f995b5f6de6690ecf80d40cde70e2e6f6e3f232 21-Jan-2011 Carl Shapiro <cshapiro@google.com> Remove dead code referencing an obsolete interface.

Bug: 3378919

Change-Id: I780d98492ea7996187e3d97fcae7748f7ee68e91
ni/android_media_MediaMetadataRetriever.cpp
17066b8fb2ffe0bc197f397497942b1d96570fe1 22-Jan-2011 Carl Shapiro <cshapiro@google.com> am 8dac54c5: Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb

* commit '8dac54c5855cdb3334ea31ff1b5f04972515ff7f':
Perform orthogonal rotations without using a Skia canvas.
8dac54c5855cdb3334ea31ff1b5f04972515ff7f 22-Jan-2011 Carl Shapiro <cshapiro@google.com> Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
48e8ec611a6ce4d5fa23830b1ebd24cfbc1c84f2 22-Jan-2011 Carl Shapiro <cshapiro@google.com> am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb

* commit '366d15d5425aaa090d9c1a1d7273f13e2c85c43b':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
d6c276a5ef70937a6bc793bf7d420316dff8bcbc 21-Jan-2011 Carl Shapiro <cshapiro@google.com> Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."

This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c.

Bug: 3378444
Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
ibstagefright/AwesomePlayer.cpp
ae12a50a35c0d8425430d0e934c022ecb9cd4936 21-Jan-2011 Carl Shapiro <cshapiro@google.com> Perform orthogonal rotations without using a Skia canvas.

Bug: 3371653

Change-Id: I315f671c0016f61417ff7c2a98d2c96f6b243bdf
ni/android_media_MediaMetadataRetriever.cpp
3564d9eada7ae3f40bc4c80272fbbb867f04e018 21-Jan-2011 Andreas Huber <andih@google.com> am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb

* commit '63d64a14790ae21db31b60747864b4a7565b33c3':
Properly rotate video that's marked as such and decoded to a surface.
5e9dc94a3c7a42d77ab454b77e1350b6fa5d2c26 21-Jan-2011 Andreas Huber <andih@google.com> Properly rotate video that's marked as such and decoded to a surface.

Change-Id: I1e9144db3447e58c99aac3f47702ad471678789c
related-to-bug: 3378148
ibstagefright/OMXCodec.cpp
9a62d902ead8f94fa0ce071300e3767bfb976d8b 21-Jan-2011 Andreas Huber <andih@google.com> am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb

* commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8':
Some tweaks to HTTP live / nuplayer behaviour
19922adceb29a3192a63e35a07fb02412aa2a4a2 21-Jan-2011 Andreas Huber <andih@google.com> Some tweaks to HTTP live / nuplayer behaviour

- play audio-only streams again
- workaround for malformed streams that switch PIDs across bandwidths
- attempt to pick a different bandwidth stream if the previously chosen one appears
to be malformed/unsupported.

Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9
related-to-bug: 2368598
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
10fcc6f500140886d3dd9b1684c85dd2eb35061a 21-Jan-2011 Santosh Madhava <smadhava@google.com> am ff23e4d7: Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb

* commit 'ff23e4d7f872df4d5880e69cc3742fc08d66f00b':
Fix for issue 3370052 : Export progress percentage is incorrect
f82856f3d206e3f3f2ef6c72d40538209e0eb659 21-Jan-2011 Santosh Madhava <smadhava@google.com> am 95788cf4: Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb

* commit '95788cf478d177d6748c40d4ce725fb4f93aec82':
Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
ff23e4d7f872df4d5880e69cc3742fc08d66f00b 21-Jan-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb
95788cf478d177d6748c40d4ce725fb4f93aec82 21-Jan-2011 Santosh Madhava <smadhava@google.com> Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb
b6e89affd5d119f40e5c8a40f2d4f29ca5e534ca 21-Jan-2011 Dave Sparks <davidsparks@android.com> am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread

* commit '65d39eeb9b032e5507a01daa25afff62b29bffe4':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
ec0c94b7d70c1e4160e1ec57070b94d052de7eb5 21-Jan-2011 Andreas Huber <andih@google.com> am c4f82e33: Merge "Implement missing pause/resume support for NuPlayer." into honeycomb

* commit 'c4f82e3387429ae94e4874b7dc1649b3c643b505':
Implement missing pause/resume support for NuPlayer.
9d5ca4a14cca0985957eb4e23fd09068f2fd2215 21-Jan-2011 Santosh Madhava <smadhava@google.com> Fix for issue 3370052 : Export progress percentage is incorrect

Change-Id: If1a39ab4c34e44b84dc6ada7b4d7b634ac347099
ava/android/media/videoeditor/MediaArtistNativeHelper.java
601fe0e5957d2ef82c51ca48f963d996ea2650bc 21-Jan-2011 Andreas Huber <andih@google.com> Implement missing pause/resume support for NuPlayer.

Change-Id: Ia3f1ce521dd4b70e134ef03aa7c9db8e8d39a134
related-to-bug: 2368598
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
bdb2e79a410681ae2be8070b1897e78b4c44ded0 20-Jan-2011 Santosh Madhava <smadhava@google.com> Fix for PR 3369866 : Project thumbnail should have the same aspect ratio

Change-Id: I028f0c74f71c8b5497a6c904b93a3f09dde559e0
ava/android/media/videoeditor/VideoEditorImpl.java
3230f1a97db64e2d4ac3a0c691955f1a259d425a 20-Jan-2011 James Dong <jdong@google.com> am 637739d4: Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb

* commit '637739d4bf014e82af19ec4465e6031579ca6eea':
Eliminate recording sound by starting the video track before audio track.
637739d4bf014e82af19ec4465e6031579ca6eea 20-Jan-2011 James Dong <jdong@google.com> Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
44b004b0c2536a1232887f6b6492d505a68c9ccb 20-Jan-2011 James Dong <jdong@google.com> Eliminate recording sound by starting the video track before audio track.

Due to the variable delays in the system, the recording sound can still be heard
if the audio track is started early. This happens even after we suppress a relative
long period of initial audio for a recording session. By starting the video track
before the audio track, we effectively play the recording sound earlier.

bug - 3371141

Change-Id: I2cccf77eae953d96827fc080c618b1d962445c26
ibmediaplayerservice/StagefrightRecorder.cpp
a2ab9aace3f7c2b283e6244a510a6378ce4650c3 20-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.

The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.

Change-Id: I3bc889b264f599bfd5c2bbdf48b88ccb55d86172
related-to-bug: 3362836
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
559da2fd899dcd88ccea3f7df31a27b41d6ca074 20-Jan-2011 Andreas Huber <andih@google.com> am 3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb

* commit '3cd6302b9e54ff888df5eb47b35d25e7dac1d763':
Prefill the cache before trying to instantiate the media extractor.
3cd6302b9e54ff888df5eb47b35d25e7dac1d763 20-Jan-2011 Andreas Huber <andih@google.com> Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
9634665ed6eedebc2082f071255886ee3e051c85 20-Jan-2011 Andreas Huber <andih@google.com> Prefill the cache before trying to instantiate the media extractor.

The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.

Change-Id: Ia42496d88a11314386ea8797d665bf4e94871e30
related-to-bug: 3362836
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
fc8ea8ecb408b553c2646b904078c672bf78b343 19-Jan-2011 Gil Dobjanschi <virgild@google.com> am c4edeb5a: Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition

* commit 'c4edeb5a60a45af874474ae7244c921a268430f1':
Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
c4edeb5a60a45af874474ae7244c921a268430f1 19-Jan-2011 Gil Dobjanschi <virgild@google.com> Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition

Change-Id: I8217e7fe00392455427e117dc54c3461301f95c5
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaVideoItem.java
97619db928777d9ebfecf6c5cbbaf0ea7147a453 19-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am fe93351c: Merge "remove eng developement local tags in make file" into honeycomb

* commit 'fe93351cf1e16dcb32c3c824cf4f1201991b2130':
remove eng developement local tags in make file
fe93351cf1e16dcb32c3c824cf4f1201991b2130 19-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "remove eng developement local tags in make file" into honeycomb
aa474aa6f9857272c5f74a14d8ab026ae8fc55c3 19-Jan-2011 James Dong <jdong@google.com> am fc37018a: Merge "Logging the duration range from different media tracks for recording" into honeycomb

* commit 'fc37018a9040f9b0f7cf4dac6d6fc5a5bdd6c287':
Logging the duration range from different media tracks for recording
fc37018a9040f9b0f7cf4dac6d6fc5a5bdd6c287 19-Jan-2011 James Dong <jdong@google.com> Merge "Logging the duration range from different media tracks for recording" into honeycomb
6dbd3ee67b4e4d3bae9508c640e14e39cc953903 19-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> remove eng developement local tags in make file

Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
ni/mediaeditor/Android.mk
4026ea7c25089e88a49920035b937ab95ed47029 19-Jan-2011 Andreas Huber <andih@google.com> am 0353459d: Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb

* commit '0353459d405e20750b3ddd8abad83eace1ed2a39':
Always revert to the previous bandwidth if the required sequence number cannot be found
0353459d405e20750b3ddd8abad83eace1ed2a39 19-Jan-2011 Andreas Huber <andih@google.com> Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
da58076a6b973e9dd6c22c5508328b63842949c1 19-Jan-2011 James Dong <jdong@google.com> Logging the duration range from different media tracks for recording

Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
ibstagefright/MPEG4Writer.cpp
894339298ec7e8a6b47bf949d4b242289f241103 19-Jan-2011 James Dong <jdong@google.com> am 4f28901f: Merge "Turn error/exception logging on at the native layer" into honeycomb

* commit '4f28901f2a15f566a98bf5d14ac510e05401f960':
Turn error/exception logging on at the native layer
581cad2221cb367e9e3ef6991c565cd37ced994f 19-Jan-2011 James Dong <jdong@google.com> Turn error/exception logging on at the native layer

o also fixed some compilation warnings

Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
ni/mediaeditor/VideoEditorLogging.h
ni/mediaeditor/VideoEditorMain.cpp
ee48eabab8c32104eb04e2abb6f6212b94f32211 19-Jan-2011 Andreas Huber <andih@google.com> am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb

* commit '71bb6a2a3eb668fe7459cd8fff1f65a15804c3be':
Return a runtime error if decryption fails instead of asserting.
283e031d112f5897c4a4124307ff4e4055bf666d 19-Jan-2011 Andreas Huber <andih@google.com> Always revert to the previous bandwidth if the required sequence number cannot be found

Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
ibstagefright/httplive/LiveSession.cpp
0cf2616faca9110a761f9d85c7e6cc5c1a5c689f 19-Jan-2011 Andreas Huber <andih@google.com> Return a runtime error if decryption fails instead of asserting.

Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
ibstagefright/httplive/LiveSession.cpp
8da1ca52808f81f41919e118c3667b794ee31f6b 19-Jan-2011 Andreas Huber <andih@google.com> am 069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb

* commit '069ee21a2012e0b6fd355253ea81a84ea11138d2':
Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
069ee21a2012e0b6fd355253ea81a84ea11138d2 19-Jan-2011 Andreas Huber <andih@google.com> Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
d95b46a1d130a90835f217540926f400a9075aa5 19-Jan-2011 Andreas Huber <andih@google.com> Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.

Refactor the logic a little.

Change-Id: Idd7a26678d846c96b0b11f096305e7467381bda3
ibmedia/IOMX.cpp
6df89f2efc587b33134c545f594a5b1ac2cd9fbb 19-Jan-2011 James Dong <jdong@google.com> am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb

* commit '8e7d626385eef104d52aa9080b70395ca840a0cd':
Expose average video frame rate via MPEG4Extractor
8e7d626385eef104d52aa9080b70395ca840a0cd 19-Jan-2011 James Dong <jdong@google.com> Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
216a7b97ebedc6886d98a117fcfe0b83891e5e45 19-Jan-2011 Mike Lockwood <lockwood@android.com> am dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb

* commit 'dc80b7ec053dd9e6f195bb807924d1e3891c00aa':
MTP: Close and reopen driver file after an error.
cbb488d67826dd38f665bc8626b55dfe2f0e135f 19-Jan-2011 James Dong <jdong@google.com> Expose average video frame rate via MPEG4Extractor

bug - 3362483

Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
ibstagefright/MPEG4Extractor.cpp
dc80b7ec053dd9e6f195bb807924d1e3891c00aa 19-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Close and reopen driver file after an error." into honeycomb
897f894e88a3a1c9010309f04c6bf466125ff818 19-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: Close and reopen driver file after an error.

BUG: 3368665

Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_mtp_MtpServer.cpp
1324e3b1a4246f77d516b37fa98013ffad91268e 19-Jan-2011 James Dong <jdong@google.com> am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb

* commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18 19-Jan-2011 James Dong <jdong@google.com> Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
d3bf3eeadd59748b9cbe7535378b4bdf8dd8f117 19-Jan-2011 Andreas Huber <andih@google.com> am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb

* commit '2597aedb3869e46f945359c529e03263c77a944d':
Turn another assertion into a runtime error. Damn you surfaces.
ba1b16790a02abfba4e10708470d09ee642c3464 19-Jan-2011 Andreas Huber <andih@google.com> Turn another assertion into a runtime error. Damn you surfaces.

Change-Id: Ib62957180949293a6fb84bb5a40af058798337ab
related-to-bug: 3335220
ibstagefright/OMXCodec.cpp
08adfd29ae3634b554cfe184ab82f112ef934d7b 16-Jan-2011 James Dong <jdong@google.com> Fix the presentation video resolution when it is different from the actual image resolution of the video.

bug - 3352413

Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/AwesomePlayer.h
66e35c240e6105934e76cabfafed385f95f013ba 19-Jan-2011 Andreas Huber <andih@google.com> am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread

* commit 'e9a00235c102d198a702bc665b2ea5b5e8c4bc07':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
456570ef558d99200bdd9ffb80be22f157e17c53 19-Jan-2011 James Dong <jdong@google.com> am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy

* commit '5fb60c7af2cbf59a99ae324c4284c7860b37c723':
Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
5fb60c7af2cbf59a99ae324c4284c7860b37c723 19-Jan-2011 James Dong <jdong@google.com> Use metadata in video buffers for timelapse video recording by default to eliminate memcpy

bug - 3361771

Change-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/CameraSourceTimeLapse.cpp
6b280468f5216ac7e09ac83ddc6719fa27bb088c 19-Jan-2011 Mike Lockwood <lockwood@android.com> am 2bc6971d: Merge changes I7df1ff78,Ibc2e8adf into honeycomb

* commit '2bc6971dd82d37273b0baafeeebf3ba90d15837f':
MediaScanner: Make sure name field is set for file based playlists
MTP: Fix problem with MTP starting up on the first try.
2bc6971dd82d37273b0baafeeebf3ba90d15837f 19-Jan-2011 Mike Lockwood <lockwood@android.com> Merge changes I7df1ff78,Ibc2e8adf into honeycomb

* changes:
MediaScanner: Make sure name field is set for file based playlists
MTP: Fix problem with MTP starting up on the first try.
242d0cdc1ad6c48faca403ea352bde73138443b5 19-Jan-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Make sure name field is set for file based playlists

Change-Id: I7df1ff783d815d6021ec2432467ba56cb3f3ad1b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
a1c9180461a819f0515ec92a72d8ebfe462d977f 19-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: Fix problem with MTP starting up on the first try.

BUG: 3361230

Change-Id: Ibc2e8adf24a14ea18385b306e786a77983ff8f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_mtp_MtpServer.cpp
0e49d20107ec1095447e166cb789e948c981d365 19-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"

if the network interface is shutdown while connecting.

Change-Id: I168c6026de24812efa9b7e607a9eb83efded8c1f
related-to-bug: 3362836
ibstagefright/HTTPStream.cpp
f9846fcdf89432d05c713a5f356a0bd1447d3cf1 19-Jan-2011 Andreas Huber <andih@google.com> am 39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb

* commit '39560507215774873ba64b5f0ff61648488924ea':
Apparently our native TCP sockets do not return an error from blocking "connect"
39560507215774873ba64b5f0ff61648488924ea 19-Jan-2011 Andreas Huber <andih@google.com> Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
eee580a495abec87d6c46a998171ab8dfb8bdf2d 19-Jan-2011 Andreas Huber <andih@google.com> Apparently our native TCP sockets do not return an error from blocking "connect"

if the network interface is shutdown while connecting.

Change-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0
related-to-bug: 3362836
ibstagefright/HTTPStream.cpp
d2225a06a315db9988236dcf5c5bca743f6d457d 18-Jan-2011 James Dong <jdong@google.com> am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb

* commit '1418de7eff012c37cf34328eb368a547d70a1441':
Fix the sluggish preview during timelapse video recording because software encoder is used.
183fa14b47faa3bbcd5377ee73fcdb0bccd8db88 18-Jan-2011 James Dong <jdong@google.com> Fix the sluggish preview during timelapse video recording because software encoder is used.

bug - 3361771

Change-Id: Ic5344e9eabe7f1b82910b65b4260e4ad8dc51c32
ibmediaplayerservice/StagefrightRecorder.cpp
2d1362b7b4c090157878212edfddba282f831502 18-Jan-2011 Eric Laurent <elaurent@google.com> am 74ff70d2: Merge "Fix typo" into honeycomb

* commit '74ff70d2f2e90c591c58723121bc26ab44a3adcc':
Fix typo
74ff70d2f2e90c591c58723121bc26ab44a3adcc 18-Jan-2011 Eric Laurent <elaurent@google.com> Merge "Fix typo" into honeycomb
ed6eae420fd60dcb7d90f54c3116959b75bd6276 18-Jan-2011 Glenn Kasten <gkasten@google.com> Fix typo

Change-Id: I73e7c5cf13c5ed82398006af61308665eb1d3ad0
ava/android/media/audiofx/AudioEffect.java
ava/android/media/audiofx/Visualizer.java
14032e3b3e9b5f31d7dd1264a8d0c79e2bc633e7 18-Jan-2011 Mike Lockwood <lockwood@android.com> am 5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb

* commit '5f31aa30cdf104dc10c2a503d7846178d6aa79cb':
MTP: Set modification date for abstract playlists
5f31aa30cdf104dc10c2a503d7846178d6aa79cb 18-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Set modification date for abstract playlists" into honeycomb
1b67fec7e16860d6f605f810ae422375ec3a567d 18-Jan-2011 James Dong <jdong@google.com> am 0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb

* commit '0a3dbf6f69a72d557afca69f006a407fbfc2482d':
Fix the build break in git_master-without-vendor
8ed67acf38ccdfdb89553ed58620a135f2100e10 18-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: Set modification date for abstract playlists

BUG: 3224269

Change-Id: I96ae8e6d2f7e28860e9217ceb911331b333e1391
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpDatabase.java
0a3dbf6f69a72d557afca69f006a407fbfc2482d 18-Jan-2011 James Dong <jdong@google.com> Merge "Fix the build break in git_master-without-vendor" into honeycomb
b5f08714597c7a50388336480a6b72f3dc698735 18-Jan-2011 Mike Lockwood <lockwood@android.com> am 26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb

* commit '26c1ab2e58f47ac94e638f69b9b626cc6b1925b6':
MTP: Strip ".pla" file extension from name field for WMP playlists
26c1ab2e58f47ac94e638f69b9b626cc6b1925b6 18-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb
8cc6eb1e4c708fb4398292ba30aa80ad5770d7ce 18-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: Strip ".pla" file extension from name field for WMP playlists

BUG: 3309324

Change-Id: Ia136f94406496f971819f4f805f742f2a6829007
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/MtpDatabase.java
a1a55bbe9480231095c0da28ae34804b663bc11f 18-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Fix the build break in git_master-without-vendor

Change-Id: I8fff5ee69958212a80711e0d86fb86514c8797f4
ni/mediaeditor/Android.mk
63e99c39e1e1a0dd7989bb858447b3ca76738554 18-Jan-2011 Andreas Huber <andih@google.com> am 529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb

* commit '529fc53d3fd298ee5aef20e3a07bd263f7376b8d':
Implement parsing of vbv buffering info in RTSP.
529fc53d3fd298ee5aef20e3a07bd263f7376b8d 18-Jan-2011 Andreas Huber <andih@google.com> Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
6d7d0da9fb5bc52282b3d1d1fc2ac6ad8a4eb01b 18-Jan-2011 Bryan Mawhinney <bryanmawhinney@google.com> am 3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb

* commit '3a4d547c588dc3a1abb48988595dc17874660bb8':
Don't report 100% buffered when the stream ends prematurely.
3a4d547c588dc3a1abb48988595dc17874660bb8 18-Jan-2011 Bryan Mawhinney <bryanmawhinney@google.com> Merge "Don't report 100% buffered when the stream ends prematurely." into honeycomb
f9828f6584ddbab9aab3abdbc47ef355651e7bfb 18-Jan-2011 Mike Lockwood <lockwood@android.com> am 0de274b3: Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb

* commit '0de274b34c554a0e87b1071e001e41e416cd7678':
MTP: Fix problems with modification dates for folders and non-media files
77034e6393838b391eb3a54e4ac6d6715cd45dac 18-Jan-2011 Andreas Huber <andih@google.com> Implement parsing of vbv buffering info in RTSP.

Change-Id: I7d871cafda2c4c65670a40ad9ab4f24317f8568a
related-to-bug: 3351915
ibstagefright/rtsp/APacketSource.cpp
e26275bdacc7dda736001e1580f8ef70647392e5 18-Jan-2011 Bryan Mawhinney <bryanmawhinney@google.com> Don't report 100% buffered when the stream ends prematurely.

Change-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/NuCachedSource2.h
7a0bd17bceaf3efc3732e30c538fae420d3b742c 18-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: Fix problems with modification dates for folders and non-media files

Also removed an unnecessary parameter to MtpDatabase.endSendobject()

BUG: 3352142

Change-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ava/android/mtp/MtpDatabase.java
ni/android_mtp_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpServer.cpp
b7d33124494f146e0a835c2862f6de96d0e379d8 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am 9ed99405: Merge "Video editor API update - rework for Patch Set 3" into honeycomb

* commit '9ed99405ae8cdd9038071a872e7d92cf256f2165':
Video editor API update - rework for Patch Set 3
bf6ccb04b93f7a2738f29f2d96a69f32f7602f51 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am 307003a8: Merge "integrate videoeditor preview player." into honeycomb

* commit '307003a844c90458bcfd7398c44bbae734936238':
integrate videoeditor preview player.
f7465eb652717d89193b0208a85edc8bd1ef0b4d 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb

* commit '4e4f3d1df475b03a1a49954d2b3b4530e39778ab':
videoeditor JNI files on honeycomb
20fd4c8b9645b37e957a8e63a88316bb2b32af84 17-Jan-2011 Eric Laurent <elaurent@google.com> am 72b83b59: Merge "Fix issue 3354692." into honeycomb

* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
Fix issue 3354692.
9ed99405ae8cdd9038071a872e7d92cf256f2165 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "Video editor API update - rework for Patch Set 3" into honeycomb
307003a844c90458bcfd7398c44bbae734936238 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "integrate videoeditor preview player." into honeycomb
4e4f3d1df475b03a1a49954d2b3b4530e39778ab 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> Merge "videoeditor JNI files on honeycomb" into honeycomb
117b7bb5b5a4457711f59bde3dcc83d8f111c524 17-Jan-2011 Eric Laurent <elaurent@google.com> Fix issue 3354692.

The problem is that SoundPool never calls the onLoadComplete() callback
when load() method fails because the file cannot be opened.
AudioService loadSoundEffects() was blocked waiting for a callback
that never came.
In this particular case, this happened on a specific build where sound
effects assets were not included.

The fix consists in waiting for the callback only if at least one sample is
accepted by SoundPool load().

Also moved the initial loading of sound effect samples from the boot completed
broadcast receiver to the audio service message handler to avoid waiting in the
main system server thread.

Change-Id: I902e5988f8b644a81d8e585c52eed1df4ca0ec05
ava/android/media/AudioService.java
0208c0ab439a2118c1e2af5473fbb63c1336c368 14-Jan-2011 Oscar Rydhe <oscar.rydhe@sonyericsson.com> Improved conversion accuracy of exif geotag data

Changed degrees and minutes of geotag data into double to avoid
data loss during cast.

Also improved error handling if geotag data can't be parsed.

Change-Id: I864843c7fc699fe81e6acba801fe46d10a01925b
ava/android/media/ExifInterface.java
cd196d3727db641e581d4223815367a5ca5d5637 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> videoeditor JNI files on honeycomb

Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
ni/mediaeditor/Android.mk
ni/mediaeditor/VideoBrowserInternal.h
ni/mediaeditor/VideoBrowserMain.c
ni/mediaeditor/VideoBrowserMain.h
ni/mediaeditor/VideoEditorClasses.cpp
ni/mediaeditor/VideoEditorClasses.h
ni/mediaeditor/VideoEditorJava.cpp
ni/mediaeditor/VideoEditorJava.h
ni/mediaeditor/VideoEditorLogging.h
ni/mediaeditor/VideoEditorMain.cpp
ni/mediaeditor/VideoEditorMain.h
ni/mediaeditor/VideoEditorOsal.cpp
ni/mediaeditor/VideoEditorOsal.h
ni/mediaeditor/VideoEditorPropertiesMain.cpp
ni/mediaeditor/VideoEditorThumbnailMain.cpp
ni/mediaeditor/VideoEditorThumbnailMain.h
9bcedf7cf3e9c981837f2d8ec98cd118efad3f01 18-Dec-2010 Santosh Madhava <smadhava@google.com> Video editor API update - rework for Patch Set 3

Change-Id: I75bfa17fe98bec13f672ff9a4edf623bb85020c8
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/EffectColor.java
ava/android/media/videoeditor/EffectKenBurns.java
ava/android/media/videoeditor/ExtractAudioWaveformProgressListener.java
ava/android/media/videoeditor/MediaArtistNativeHelper.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Overlay.java
ava/android/media/videoeditor/OverlayFrame.java
ava/android/media/videoeditor/Transition.java
ava/android/media/videoeditor/TransitionAlpha.java
ava/android/media/videoeditor/TransitionCrossfade.java
ava/android/media/videoeditor/TransitionFadeBlack.java
ava/android/media/videoeditor/TransitionSliding.java
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorFactory.java
ava/android/media/videoeditor/VideoEditorImpl.java
ava/android/media/videoeditor/WaveformData.java
3b3cddccc105a7eaade4bb98f0eead3d3d3a2cc9 17-Jan-2011 Dharmaray Kundargi <dharmaray@google.com> integrate videoeditor preview player.

Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
ibstagefright/include/AwesomePlayer.h
b3f44773897588cf1ab6335444e4ca5fb0160a7f 15-Jan-2011 James Dong <jdong@google.com> am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb

* commit 'e7df0ddee486f4705b17b4d8ed57ddbeb8b71943':
Fixed thrashing in the cached buffer during 720p YT video streaming
9286cfe5017363d95798d85163ec4f28aeb0c675 15-Jan-2011 Jean-Baptiste Queru <jbq@google.com> merge 83fdc69e from gingerbread - do not merge

Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
ac0e4bdf05f52eddf417a4e938410523aa06fe59 15-Jan-2011 James Dong <jdong@google.com> Fixed thrashing in the cached buffer during 720p YT video streaming

bug - 3340194

Change-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6
ibstagefright/NuCachedSource2.cpp
089971eaba92225aadec21d55d028df7948df012 13-Jan-2011 James Dong <jdong@google.com> am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb

* commit 'c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
Add audio encoding parameters check
c14b10c3068359b717b3f35b7218ce0e6dcdd08c 13-Jan-2011 James Dong <jdong@google.com> Merge "Add audio encoding parameters check" into honeycomb
f679ba7d944a403fbdc77926c44978ffd5161f2d 07-Jan-2011 Marco Nelissen <marcone@google.com> Cherrypick from GB. Do Not Merge.

Send "compilation" tag when inserting into the database.
It's not actually inserted into the database, but the media provider uses it
for disambiguating albums.
b/3311831

Change-Id: I67deb044800a6cb626c69bf3d54d51df4bf830f2
ava/android/media/MediaScanner.java
54815a78aff9bd453a8f0ac3c02f3a35c4b04146 13-Jan-2011 James Dong <jdong@google.com> Add audio encoding parameters check

bug - 3345296

Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
ava/android/media/MediaRecorder.java
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
9efe47374b61afd0ce84afa64e9fa5b41dfaef22 03-Dec-2010 James Dong <jdong@google.com> Squash commits of the following patches, cherry-picked from other branch - do not merge.

o Prepare for publishing MediaMetadataRetriever as public API
step one:
o replaced captureFrame with getFrameAtTime
o removed getMode

o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()
as part of the preparation for publishing MediaMetadataRetriever as public Java API

o Remove captureFrame from MediaMetadataRetriever.java class
It has been replaced by getFrameAtTime() method

o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java

o Publish MediaMetadataRetriever.java as public API
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc
o part of a multi-project change.

bug - 3309041

Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
ava/android/media/MediaMetadataRetriever.java
ava/android/media/ThumbnailUtils.java
ni/android_media_MediaMetadataRetriever.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/mediametadataretriever.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/include/StagefrightMetadataRetriever.h
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
7f08308fda8b66f20505d8235795b86f5d8d2e36 13-Jan-2011 James Dong <jdong@google.com> am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb

* commit '14bdce0441378b766afca3eaa5ac78dbc2f7c6e1':
Remove legacy code that should not be used
4507cef05e492f65755aa321007d6592d111d01f 13-Jan-2011 James Dong <jdong@google.com> Remove legacy code that should not be used

Change-Id: I9209e3a32b64a30627848d2a425f32ed6b73e8a2
ni/android_media_MediaMetadataRetriever.cpp
18aa2da202b5d955d1337c859bdb9155419fdf15 13-Jan-2011 Marco Nelissen <marcone@google.com> am a8a656b0: Fix scanning of modified files.

* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
Fix scanning of modified files.
a8a656b0c595fa876a387a91f8813f88a2d3abe7 12-Jan-2011 Marco Nelissen <marcone@google.com> Fix scanning of modified files.

When a media file, particularly a music file, is updated, the media
scanner should use the correct Uri to update it, and not the generic
files Uri. Otherwise, things like artist and album name will not
be properly updated.

Change-Id: I576629c51282bfbeb61c23f1e43b072700084a6c
ava/android/media/MediaScanner.java
156a3c9ba702f3159e0b4a76c65606b5f97b276c 12-Jan-2011 Andreas Huber <andih@google.com> am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb

* commit '7928ca6f87af4b70086ecf75383ba43da37da891':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
999fb5a5a952ffb0c13ee5d6940fa1a39f165bcd 12-Jan-2011 James Dong <jdong@google.com> am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb

* commit '068b41d5d41a4a78c96586b85ea89d464d302548':
Publish MediaMetadataRetriever.java as public API
7928ca6f87af4b70086ecf75383ba43da37da891 12-Jan-2011 Andreas Huber <andih@google.com> Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
068b41d5d41a4a78c96586b85ea89d464d302548 12-Jan-2011 James Dong <jdong@google.com> Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
0b44f6f588bb8836c1ef94e8b1f70ed49e2be53b 12-Jan-2011 Mike Lockwood <lockwood@android.com> am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database

* commit '0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3':
MediaScanner: Do not update the file path when updating records already in the database
7ff08aeb7e858513c295e5289f6659b2d1d5574d 12-Jan-2011 Mike Lockwood <lockwood@android.com> am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb

* commit 'a29464335a1d164fde0817715d86ba6224d0a61f':
Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3 12-Jan-2011 Mike Lockwood <lockwood@android.com> MediaScanner: Do not update the file path when updating records already in the database

The path should never change (media scanner treats renames as a delete and an insert)
and we want to preserve the mixed case paths in the database to avoid exposing the
lowercase squashing to MTP.

Change-Id: I79ef37e143c607242d438a4a0643d40191965b6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
a29464335a1d164fde0817715d86ba6224d0a61f 12-Jan-2011 Mike Lockwood <lockwood@android.com> Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb
11eab056dd0133a390169d3581edf3eef26d6a54 06-Jan-2011 James Dong <jdong@google.com> Publish MediaMetadataRetriever.java as public API

o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc

o part of a multi-project change.

bug - 2433195

Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
ava/android/media/MediaMetadataRetriever.java
ava/android/media/ThumbnailUtils.java
ni/android_media_MediaMetadataRetriever.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/mediametadataretriever.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
5df82ef953a4b0f29ab4690b838a7b269b1b4ab1 12-Jan-2011 James Dong <jdong@google.com> am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb

* commit 'cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed':
Speed up MP3Extractor using cached reads
cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed 12-Jan-2011 James Dong <jdong@google.com> Merge "Speed up MP3Extractor using cached reads" into honeycomb
c88b2c44117e7e3ff3deb786f7d984f4096a63de 12-Jan-2011 Andreas Huber <andih@google.com> am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.

* commit '7c6153606cc963191362494c8cb5669749e84326':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
4bca5e19d5863bc0cd94cf99871743d26c7f3a87 12-Jan-2011 Andreas Huber <andih@google.com> Fail to parse duration instead of asserting, if the server response cannot be parsed.

Change-Id: I42324468edca5ccce29486059091da8e64f36326
related-to-bug: 3338518
ibstagefright/rtsp/ASessionDescription.cpp
7c6153606cc963191362494c8cb5669749e84326 12-Jan-2011 Andreas Huber <andih@google.com> Fail to parse duration instead of asserting, if the server response cannot be parsed.

Change-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf
related-to-bug: 3338518
ibstagefright/rtsp/ASessionDescription.cpp
31d8a03e44b272afacad07a7670aaad764172797 12-Jan-2011 James Dong <jdong@google.com> Speed up MP3Extractor using cached reads

Change-Id: I53a5ed76bc2f76f0c184f3800b5448f677117ae3
ibstagefright/MP3Extractor.cpp
1c4e88d0b0a8deede0415183739478b5ebc12bfd 12-Jan-2011 Mike Lockwood <lockwood@android.com> Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media

This rips out some complicated code that was added since gingerbread
that is no longer necessary.

Change-Id: Iab5ecb7314c06221475ce01ef483f34f17003b06
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ava/android/mtp/MtpDatabase.java
5ac80dde0480f06a7fab9a15c2df90d6aee1ba22 12-Jan-2011 Glenn Kasten <gkasten@google.com> am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb

* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
Fix race in buffer ref counting.
4e26bc686b619ec9b6db39b7fefb84890904e59c 12-Jan-2011 Glenn Kasten <gkasten@google.com> Fix race in buffer ref counting.

Change-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6
ibstagefright/MediaBuffer.cpp
0ef0d76a9d5477942d5586933d35d299671fadc5 12-Jan-2011 Andreas Huber <andih@google.com> am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues

* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
7e2f9cc81da788006790365ff11f06551fc1bc26 12-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Fix Matroska issues

related-to-bug: 3331623

Squashed commit of the following:

commit 8484811f3784564ce962ec1b6311bac532d73ffc
Author: Andreas Huber <andih@google.com>
Date: Tue Jan 11 11:56:06 2011 -0800

Properly parse Matroska lacing flags and extract all frames contained in a block.

related-to-bug: 3331623

commit 38f1f39381a01659577461b3d35bd22db45ba317
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 15 15:10:34 2010 -0800

Proper support for variable NALsize lengths of AVC content in .mkv files.

related-to-bug: 3197442

Change-Id: I4b404f3c3d0a2a2fa336b9edff75eb25ffc66a2f
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/mkvparser.cpp
ibstagefright/matroska/mkvparser.hpp
d439ac396ecb9e909c543424211d563325fea72b 12-Jan-2011 repo sync <andih@google.com> resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp

Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
d22f7149736aba8f8e4ac4c7b1e307c2ddd0fb04 12-Jan-2011 Andreas Huber <andih@google.com> am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb

* commit '0827e697a9965195ca12ba593332c555702aa94a':
Increase cache size and low-watermark threshold, also
850e76b426be9330a8ef5928e173aa809d62564d 12-Jan-2011 Andreas Huber <andih@google.com> am 7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb

* commit '7f92be88e0d89a693bed4d620a83aea1a989c68e':
Properly parse Matroska lacing flags and extract all frames contained in a block.
0827e697a9965195ca12ba593332c555702aa94a 12-Jan-2011 Andreas Huber <andih@google.com> Merge "Increase cache size and low-watermark threshold, also" into honeycomb
7f92be88e0d89a693bed4d620a83aea1a989c68e 12-Jan-2011 Andreas Huber <andih@google.com> Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
52c7832e35b6f0c7d6197eb09346cea7dc5bea6b 12-Jan-2011 Andreas Huber <andih@google.com> Increase cache size and low-watermark threshold, also

MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages
to the JAVA client informing it how much (if at all) the video lags behind
audio (arg2 is the media delay in ms).

Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1
related-to-bug: 3335220
ava/android/media/MediaPlayer.java
ibmedia/mediaplayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/NuCachedSource2.h
513f3ab0500230be5975dee21113a30be1de8a6f 11-Jan-2011 Yu Shan Emily Lau <yslau@google.com> am 5619da8d: am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread

* commit '5619da8d8b66337db182a016619efa1f31266a78':
Fix the test application orientation. Bug# 3205196
9356e6093e804931d59ac30bacb2339ad690b2e5 11-Jan-2011 Marco Nelissen <marcone@google.com> am 2888208b: am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831

* commit '2888208b0bb38ac93bb6b500992869c8a6bf244c':
Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
6fe6b4c6f3cd96b69f8124a3cdb0dad3145bac91 11-Jan-2011 Andreas Huber <andih@google.com> Properly parse Matroska lacing flags and extract all frames contained in a block.

Change-Id: I1aca46b2e28b9cad88bf4a296f675e81e66ee095
related-to-bug: 3331623
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/mkvparser.cpp
ibstagefright/matroska/mkvparser.hpp
530069031e177c53b1cc3d3e1bdbd44b8aaa0857 11-Jan-2011 James Dong <jdong@google.com> Merge "Fix uninitialized rect structure for retrieving rect cropping information from decoder" into honeycomb
549f12ad04c491a2f25f599794868a4e21e9f1eb 11-Jan-2011 Andreas Huber <andih@google.com> DO NOT MERGE: Fix parsing of ntp= PLAY response.

related-to-bug: 3340186

Squashed commit of the following:

commit b61c36b7228aec9f5360883b1e1c1e0530488974
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 27 13:59:59 2010 -0700

Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries.

commit b10f322c07e5bebcaf032e8624cb4a5d733dfc15
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 25 09:40:52 2010 -0700

We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets.

commit 0aa83cf9e4637adf9501708fcdf7d0d6d4dc4fe1
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 20 15:00:34 2010 -0700

Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF.

related-to-bug: 3084183

Change-Id: I6e512cb73cc8d5624a83f7154aa5699f7fef7534
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.h
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/Android.mk
ibstagefright/rtsp/MyHandler.h
545c22ffd27588acabe3e5861e2d084cf17ff322 11-Jan-2011 James Dong <jdong@google.com> Don't release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp

bug - 3334999

Change-Id: I1c83080713696221048da9b1a9f8c2ee48849ade
ibstagefright/CameraSourceTimeLapse.cpp
0569e58988bae5f08733e21e8d8adfa61fe89b7f 10-Jan-2011 James Dong <jdong@google.com> am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread

* commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
b736cb28ab414c16b9cd89923a6da3778847cf2a 10-Jan-2011 Andreas Huber <andih@google.com> Return a runtime error instead of asserting if the M4vH263Decoder fails in start()

Change-Id: Ie704a72685f749613fa0ed5fa6f461abc0406371
related-to-bug: 3328200
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
748ba9a9512dee65d5b09cfe26a34ded753f4aab 10-Jan-2011 Andreas Huber <andih@google.com> Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb
7caa130a98baa64768dcd409bc110ce9acb0cbff 10-Jan-2011 Andreas Huber <andih@google.com> NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.

Change-Id: I99b4223ad6ecfd8839a3c0e737fef3165565d76d
related-to-bug: 3336496
ibmediaplayerservice/nuplayer/DecoderWrapper.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/ACodec.cpp
ibstagefright/foundation/AMessage.cpp
6328185b6cc632f85ff640f6e854ab33815ae97f 10-Jan-2011 James Dong <jdong@google.com> Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge

cherry-picked from: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89

bug - 3336424

Change-Id: I2d8ecb79a5422342988c195c012c9e6327ac457a
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMX.cpp
681e89c08264af948735d00552c4bd08180b06b4 10-Jan-2011 James Dong <jdong@google.com> Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object

bug - 3336424

Change-Id: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMX.cpp
e15ac3b97049b0f2e5d61e40910b0da9f810841a 08-Jan-2011 Eric Laurent <elaurent@google.com> Merge "Fix issue 3261656." into honeycomb
a60e212d0dda7d2a748180ce77405f2463c9cf53 29-Dec-2010 Eric Laurent <elaurent@google.com> Fix issue 3261656.

The problem can occur if a sample is started at the same time as the last AudioTrack callback
for a playing sample is called. At this time, allocateChannel() can be called concurrently with moveToFront()
which can cause an entry in mChannels being used by moveToFront() to be erased temporarily by allocateChannel().

The fix consists in making sure that the SoundPool mutex is held whenever play(), stop() or done() are called.

In addition, other potential weaknesses have been removed by making sure that the channel mutex is held while
starting, stopping and processing the AudioTrack call back.

To that purpose, a mechanism similar to the channel restart method is implemented to avoid stopping channels
from the AudioTrack call back but do it from the restart thread instead.

The sound effects SounPool management in AudioService has also been improved to make sure that the samples have
been loaded when a playback request is received and also to immediately release the SoundPool when the effects are
unloaded without waiting for the GC to occur.
The SoundPool.java class was modified to allow the use of a looper attached to the thread in which the sample
loaded listener is running and not to the thread in which the SoundPool is created.

The maximum number of samples that can be loaded in a SoundPool lifetime as been increased from 255 to 65535.

Change-Id: I368a3bdfda4239f807f857c3e97b70f6b31b0af3
ava/android/media/AudioService.java
ava/android/media/SoundPool.java
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/SoundPoolThread.h
28f939db9d4dee1e8b59459e4b722fd19f2930f9 06-Jan-2011 pmehendale <pmehendale@nvidia.com> Awesomeplayer : Frame dropping logic change

Changed late frame drop policy, now we are dropping only 1 in 8,
late (> 40ms) frames. Dropping every late frame result in lot of noticible
pauses, usually with peaky bitrate activity these pauses become more prominant.
Dropping few frames is still required to allow overall playback chain,
to regain the performance.
Experimentally decided to drop Max one late frame in 8.

Change-Id: If20848d619a76aaf8179b1e5c3155610e3bc85fd
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
a173541c6b1d7030890ef15f2fc44d688fe833ee 07-Jan-2011 James Dong <jdong@google.com> Fix uninitialized rect structure for retrieving rect cropping information from decoder

o This patch is from NV.

bug - 3333254

Change-Id: I02bc26af464ea0bc9ad9f2e111474e8398c67220
ibstagefright/OMXCodec.cpp
ee35aff74494e6c0b718e219427af6a6c573b928 06-Jan-2011 Marco Nelissen <marcone@google.com> Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
support for two common ways of specifying album artist in ogg files.
b/3311831

(cherry-picked from GB because of weird automerger failure)

Change-Id: Ibf12a3d6bc8bbc2ac5ea815de6b33414b8f53f0f
ava/android/media/MediaMetadataRetriever.java
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
5619da8d8b66337db182a016619efa1f31266a78 07-Jan-2011 Yu Shan Emily Lau <yslau@google.com> am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread

* commit '2af4e71dd47565d794ad48041a156871396a7dde':
Fix the test application orientation. Bug# 3205196
2af4e71dd47565d794ad48041a156871396a7dde 07-Jan-2011 Yu Shan Emily Lau <yslau@google.com> Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
2888208b0bb38ac93bb6b500992869c8a6bf244c 07-Jan-2011 Marco Nelissen <marcone@google.com> am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831

* commit 'f13d4501396aa1679004ad07d440f65ced3ecc2b':
Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
d1da80a4b3d50c1be120b0e873363da711428a81 07-Jan-2011 Marco Nelissen <marcone@google.com> am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831

* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
24b3a4ccd6943dfb9f2cb69d5c9d78a05e16561b 07-Jan-2011 Andreas Huber <andih@google.com> Fix typo.

Change-Id: I2d7796425ea746432964ce48959b6c227d31df11
ibstagefright/httplive/LiveSession.cpp
f13d4501396aa1679004ad07d440f65ced3ecc2b 07-Jan-2011 Marco Nelissen <marcone@google.com> Send "compilation" tag when inserting into the database.
It's not actually inserted into the database, but the media provider uses it
for disambiguating albums.
b/3311831

Change-Id: Idb630866e960338ce2795dcc128cafaf6c9c27f2
ava/android/media/MediaScanner.java
ba572aaea62ba5d220891ff58642ccee3ad20dec 07-Jan-2011 Andreas Huber <andih@google.com> If the stream for the new bandwidth doesn't have the segment we're looking for...

go back to the previous bandwidth' stream.

Change-Id: I3477cb6932102883509a7cbe9fb2b3bb02dac8c6
ibstagefright/httplive/LiveSession.cpp
ba77a3f9cb1d68b2ed4813aaae856444578e3a75 06-Jan-2011 Marco Nelissen <marcone@google.com> Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
support for two common ways of specifying album artist in ogg files.
b/3311831

Change-Id: Iba1152013b7577168af71f947d7249560419fa05
ava/android/media/MediaMetadataRetriever.java
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
d7069ca0bc62a21321eef5e30f152ff6ba646e04 06-Jan-2011 Andreas Huber <andih@google.com> Use NuPlayer for HTTP live streaming playback by default.

Reversed the property logic, set media.httplive.disable-nuplayer to true to revert

Change-Id: I1057940667aaab56bb75c9ea15c2cdcab736f3c6
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/httplive/LiveSession.cpp
c0dbe3a4457020bdba6ce311d383faecb7950a90 06-Jan-2011 Andreas Huber <andih@google.com> Colorconverter may not support some src/dst bitmap configurations.

Let it return an appropriate error code instead of asserting.

Change-Id: I7fe0dfa169e1cbdecb04c5fcbe8501e73362d05e
related-to-bug: 3328212
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/colorconversion/ColorConverter.cpp
eec06d3679db96ec41a017d542c878f3b7070b0e 06-Jan-2011 Andreas Huber <andih@google.com> If we failed to initialize the codec after transitioning to IDLE state, don't assert

during shutdown.

Change-Id: I40ac44260fb136c15d6dcb9f5ad62211640c66ec
related-to-bug: 3328222
ibstagefright/OMXCodec.cpp
27480cd49470af667dc8985f45b5ba43ab9ed4cd 06-Jan-2011 Mike Lockwood <lockwood@android.com> Remove support for obsolete PTP content provider

This will be replaced by a new PTP host API in an upcoming commit.

Change-Id: Ib914194e332b5c090cb8e34ed35bd691bc9f85d1
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/mtp/PtpClient.java
ava/android/mtp/PtpCursor.java
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_mtp_PtpClient.cpp
ni/android_mtp_PtpCursor.cpp
tp/Android.mk
tp/PtpCursor.cpp
tp/PtpCursor.h
65d2a4cb5f10a3964f66628be859bc150ec8921e 06-Jan-2011 Mike Lockwood <lockwood@android.com> Remove CameraBrowser test app

Change-Id: I7e04ef674746c5c2cdf421a2b9ec440d7ea831bd
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/Android.mk
ests/CameraBrowser/AndroidManifest.xml
ests/CameraBrowser/res/layout/object_info.xml
ests/CameraBrowser/res/layout/object_list.xml
ests/CameraBrowser/res/values/strings.xml
ests/CameraBrowser/res/values/styles.xml
ests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
ests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java
215b682b8a02ac51d820b8e301d50431bdd09b3d 04-Jan-2011 Mike Lockwood <lockwood@android.com> MTP: changes to use new usb_request support in libusbhost

Change-Id: Ic091eab166a66efcde0395dcebbbc513f2322fca
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpClient.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDevice.cpp
tp/MtpDevice.h
tp/MtpEventPacket.cpp
tp/MtpEventPacket.h
tp/MtpPacket.cpp
tp/MtpPacket.h
tp/MtpRequestPacket.cpp
tp/MtpRequestPacket.h
tp/MtpResponsePacket.cpp
tp/MtpResponsePacket.h
f4e4b2753d844c2856c3fc19221bdcd5d65de968 06-Jan-2011 Joe Onorato <joeo@google.com> Merge "Make the volume keys adjust the media volume by default if the device is not "voice capable.""
c7fcba4b7bd3d78e7cfe975a3f8e4dde2f6738b7 06-Jan-2011 Joe Onorato <joeo@google.com> Make the volume keys adjust the media volume by default if the device is not "voice capable."

Change-Id: Ide396f8940a075c0b00b7c983c1769c1cc0f17bf
ava/android/media/AudioService.java
b7df8ec4dbab4294f6a6b379aa9460340002d264 06-Jan-2011 Andreas Huber <andih@google.com> Merge "Some more fixes regarding HTTP live in NuPlayer."
847551cff3fc824e898a2652e4c6a8dd1b049cb5 06-Jan-2011 Andreas Huber <andih@google.com> Some more fixes regarding HTTP live in NuPlayer.

Change-Id: I9e29615fa8ee6c7bd4189373a75c20caef3fd2b1
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
a4bbc386a05a3d36f7bc9cdc5223adfa1b1f05e4 05-Jan-2011 Andreas Huber <andih@google.com> Merge "Seek/Duration support for completed http live streams in NuPlayer."
08e10cb404c0f1620ca9db7494ccbb8adcca5ee5 05-Jan-2011 Andreas Huber <andih@google.com> Seek/Duration support for completed http live streams in NuPlayer.

Change-Id: I55bbe75d87140c07b1927d14ad24130fce803463
related-to-bug: 3321475
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibmediaplayerservice/nuplayer/StreamingSource.h
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/LiveSession.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
876e44dfb5aabcd34e052a6a8a9f8ba8f07744ba 05-Jan-2011 James Dong <jdong@google.com> Merge "Use video output if necessary for timelapse video recording"
d97943d5d02b534afc9d9355a2f012b5459f8e64 05-Jan-2011 Yu Shan Emily Lau <yslau@google.com> Fix the test application orientation. Bug# 3205196

Change-Id: I57085d6507482ce15dbf3b167965be4af43b3d88
ests/MediaFrameworkTest/AndroidManifest.xml
7f08071f3dc78f9178589c4d2fe6233516060f17 05-Jan-2011 James Dong <jdong@google.com> Merge "Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java"
a1d2d8f7a5fd956ab82acc641415e09ff6c00a7e 05-Jan-2011 James Dong <jdong@google.com> Use video output if necessary for timelapse video recording

Change-Id: I88d0cc824f0fbf8b2f392fbc23c69b5bfefda1b8
ibstagefright/CameraSourceTimeLapse.cpp
df9b349b960fff95dff4fcf8b2661899e33059da 05-Jan-2011 James Dong <jdong@google.com> Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java

Change-Id: I34dfc1daa3bed1f334f3f266cbe70d1e3d7924f6
ava/android/media/MediaMetadataRetriever.java
ni/android_media_MediaMetadataRetriever.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
b794a5e53a8a954d7f8c2be1d321f1c87bfc556f 04-Jan-2011 Andreas Huber <andih@google.com> Merge "Properly shutdown the decoders on a reset() in NuPlayer's implementation."
cbeaca7a819cc11724f6f34457dabf5bd55a84a1 04-Jan-2011 Andreas Huber <andih@google.com> Properly shutdown the decoders on a reset() in NuPlayer's implementation.

related-to-bug: 3321470
Change-Id: Ida6d2171c5a3a407188d4633602b764f8fe7086a
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
69b43587bee29b4f60f554c947901c501046dc49 04-Jan-2011 James Dong <jdong@google.com> Merge "Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method"
6e77de71ac6d23b6591028d04e1f2a4b5fc14d94 04-Jan-2011 James Dong <jdong@google.com> Remove captureFrame from MediaMetadataRetriever.java class
It has been replaced by getFrameAtTime() method

Change-Id: I9ed762e10e61dbc188e2a740e489a3e2ef9a6bb2
ava/android/media/MediaMetadataRetriever.java
ibstagefright/StagefrightMetadataRetriever.cpp
90c656574175bd54ed8d258f406f158177e5e91c 04-Jan-2011 Andreas Huber <andih@google.com> Make AwesomePlayer's reset process more verbose to track down ANRs.

Change-Id: I8c9fa872263796ba61b3e8de6bc05d50f57833f5
related-to-bug: 3302399
ibstagefright/AwesomePlayer.cpp
0cd0136d440cf6ad9d5fab430269116786e671ec 30-Dec-2010 Mike Lockwood <lockwood@android.com> Move MTP Java classes to android.mtp.* package.

Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
ava/android/media/MediaScanner.java
ava/android/media/MtpConstants.java
ava/android/media/MtpDatabase.java
ava/android/media/MtpPropertyGroup.java
ava/android/media/MtpPropertyList.java
ava/android/media/MtpServer.java
ava/android/media/PtpClient.java
ava/android/media/PtpCursor.java
ava/android/mtp/MtpConstants.java
ava/android/mtp/MtpDatabase.java
ava/android/mtp/MtpPropertyGroup.java
ava/android/mtp/MtpPropertyList.java
ava/android/mtp/MtpServer.java
ava/android/mtp/PtpClient.java
ava/android/mtp/PtpCursor.java
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_media_MtpDatabase.cpp
ni/android_media_MtpServer.cpp
ni/android_media_PtpClient.cpp
ni/android_media_PtpCursor.cpp
ni/android_mtp_MtpDatabase.cpp
ni/android_mtp_MtpServer.cpp
ni/android_mtp_PtpClient.cpp
ni/android_mtp_PtpCursor.cpp
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
8cb9975f35cfc8ce2529c9876b777eaa783bd9f7 29-Dec-2010 Ying Wang <wangying@google.com> Fix build.

Due to a bug (fixed by 59163bf2f15e28712be6598144ae0fdb94dac52b),
libstagefright_yuv.so was actually not prelinked.

Change-Id: Idbc9b968708d0fc31a087d2e4f24398072d915e2
ibstagefright/yuv/Android.mk
da03aaad78c124be8903c2c4029ecd329b250f4c 29-Dec-2010 Mike Lockwood <lockwood@android.com> Change libusbhost and libmtp from static to shared libraries

Change-Id: Iccc67db32400cdeb88aa33261c9e0cf73db992ca
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/Android.mk
tp/Android.mk
54e6649e4cac3475593f3acb7894837fa1dc61eb 23-Dec-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit eaeaa2672d4e0a82891493b2bde8bdd0c0e79a1b
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 23 10:26:48 2010 -0800

Remove lowest bandwidth stream if using the legacy player.

Change-Id: I2f885e26344996de9152f8fda9fd6bdef89bf953

commit 7d652972615b2750fd8f1c21b9fab0e136df2b82
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 23 10:14:36 2010 -0800

Don't clear the packet source's format for legacy discontinuities.

Change-Id: I9bd5a21b9bd28043ad38bd0658ccc8eda3c1079a

commit 2b18a45aac17cbfe1aa089d0f6510957d438dd64
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 23 10:13:55 2010 -0800

Use NuPlayer for HTTP live streaming based on runtime property.

adb shell setprop media.httplive.enable-nuplayer true

Change-Id: I22738df3403985dc8e6992b1ab5da5747309f773

commit 50d899fb7b9ea52c3994b0a58e993998d926aeed
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 16:25:22 2010 -0800

Make ACodec a lot less verbose.

Change-Id: I94c7e499b61032321ffaf999f5ad2c913cde6a48

commit b19e1740cb4d02990a56844654b5d019987c6405
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 16:22:22 2010 -0800

Wait until we have fresh codec-specific-data before instantiating the decoders

after a discontinuity involving a format change.

Change-Id: I7bcf9b5ae3319f08bf8978a117e8ee5220902e37

commit 06428c006906c9099e430aface3b439ff1d36ecc
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 15:20:38 2010 -0800

Disable random seeks in the streaming tool for now.

Change-Id: Ie86fde422dcfc4b2c7a01be51a193fda9c88cd71

commit e19db68f3bea8a61c191f60f6940f30e3a0d5f1b
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 15:20:27 2010 -0800

Tweak HTTP live parameters.

Change-Id: If4b71e12485facc523a8a43d8213d0feb190daab

commit 1e9942791538c2256b579d96c6c04264b0d8b087
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 14:48:23 2010 -0800

Enable http live streaming through NuPlayer for http URLs containing the string m3u8

Change-Id: I1691fe12ae8f1507fe3673313959cd50bc324624

commit 4c33f96a6e499ee0efe0e70b687094430cb7c1c0
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 14:40:27 2010 -0800

Support for HTTP live streaming in NuPlayer.

Change-Id: Iacba1c3ebaeb8d3b972185deaf4cff18c8009c54

commit ddf705ce553708bc5b13d89a878484cf839bd674
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 13:42:47 2010 -0800

StreamingSource now a subclass of abstract NuPlayer::Source

Change-Id: Ia6c7c639628910b9d1f37decc55da48b07a70de3

commit 9e04a8406b1882a8e3fdeb7b4d52db5ae70b970a
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 22 13:33:52 2010 -0800

Refactor media data sourcing to NuPlayer::Source.

Change-Id: I1db9fb08c4e527bf7b19c29978cf342c2b0a0bc9

Change-Id: I9610a097481dda58f22142eacda3ac2dba0b63f9
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/HTTPLiveSource.cpp
ibmediaplayerservice/nuplayer/HTTPLiveSource.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibmediaplayerservice/nuplayer/NuPlayerSource.h
ibmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
ibmediaplayerservice/nuplayer/StreamingSource.cpp
ibmediaplayerservice/nuplayer/StreamingSource.h
ibstagefright/ACodec.cpp
ibstagefright/avc_utils.cpp
ibstagefright/httplive/LiveDataSource.cpp
ibstagefright/httplive/LiveDataSource.h
ibstagefright/httplive/LiveSession.cpp
ibstagefright/include/LiveSession.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
ibstagefright/mpeg2ts/ESQueue.cpp
2116dc91e96f7153f65468ed40a0b57e437679f7 22-Dec-2010 James Dong <jdong@google.com> Expose AMRNB/WB and AAC encoder and related file output formats
Cherry-picked from GB

bug - 3305667

Change-Id: I116ba908666d712495a1bd2bcc47c35f274c7fae
ava/android/media/MediaRecorder.java
27d4ad2a5771ad025fa69f64b093d7429d94bfd3 22-Dec-2010 James Dong <jdong@google.com> am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread

* commit '2bf89b2197674ccc414ea60a61199562df9dc52b':
Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
d609ca7f6a48f32dcd6671f877a96e8bf1b898ed 22-Dec-2010 James Dong <jdong@google.com> Expose AMRNB/WB and AAC encoder and related file output formats - do not merge

bug - 3305667

Change-Id: I8f137af7f87cb010f75cae1777b9ec6b6af8214f
ava/android/media/MediaRecorder.java
6cba61ee68a2335d65d140450692de050b660956 22-Dec-2010 James Dong <jdong@google.com> Merge "Avoid using private Bitmap constructor to generate bitmaps"
0e4b535b439f2c8bd4f7ba820f81bf74336bae76 19-Dec-2010 James Dong <jdong@google.com> Avoid using private Bitmap constructor to generate bitmaps

bug - 2433195

Change-Id: Ic74225286c9884055ae751cf76a1d65e8e70b3ae
ni/android_media_MediaMetadataRetriever.cpp
222e689267cae5b21821e45e67968d330bd47bd3 22-Dec-2010 Andreas Huber <andih@google.com> Distinguish discontinuities w/ a format change from those without.

Shutdown decoders as needed in anticipation of a format change, otherwise just flush.

Change-Id: Ieb04f8aa8658569b091409c4903075fd496e5abb
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
c0bfdb257c95486d2b6d60745deb8f04c07cbb95 21-Dec-2010 Andreas Huber <andih@google.com> Better handling of forming absolute https URLs, runtime error on https:// access.

Change-Id: I7f6275520b0bd070e645024dd151a8541b8787b2
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/M3UParser.cpp
3f3c58f1ef439e5c7526b34a5aa76a9ef15f73af 21-Dec-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
41c3f740485a069bf101d5a1e5263880ca1035ef 21-Dec-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 63be8ceb8b2354fb997a277c0092abae015ecf10
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:45:34 2010 -0800

Enable handling of discontinuities that involve potential format changes.

Change-Id: I21848a113db8764abb54bdcf302b0923253eaf4d

commit d18a7f80ec09af382026809263dcbbfa9e7a9ec8
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:45:01 2010 -0800

Signal whether or not a format change occured as part of the discontinuity.

Change-Id: I06e64f542f4369549c9cebbb892dc612346ae43d

commit c400adbd5fdbd65cfef7aed9ec65bcaace4bb69b
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:44:46 2010 -0800

A little more instrumentation of ACodec

Change-Id: I07f4aeccbbd15cdd9f80f48c3f92ee984ef6d92b

commit 1d802ee01f47b3cdc5b89502cec7fbb595e197a3
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:43:58 2010 -0800

Only sync audio/video queues if both types of media are actually present.

Change-Id: Ic88edf9bb1ebd4034c08747cce9877a4e28e0d35

commit e402da39d9a4d8b75653a78f728e20a3ef0fb497
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 17 13:42:24 2010 -0800

Disable the random seek for now.

Change-Id: Iddd597b546e2f229e88214f9bdd6452bb188105e

Change-Id: I27c4d9ba916080be94ce6117dbb095e9022ed62b
ibmediaplayerservice/nuplayer/DecoderWrapper.cpp
ibmediaplayerservice/nuplayer/DecoderWrapper.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibstagefright/ACodec.cpp
ibstagefright/httplive/LiveSession.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
7455630fff59ac1b68d67077aba360056ca88ece 21-Dec-2010 James Dong <jdong@google.com> Add more debugging code to track down hang during video recording

bug - 3276561

Change-Id: I1e02590b23031f29bcbfc4a1064f039ed80cb862
ibstagefright/CameraSource.cpp
ibstagefright/OMXCodec.cpp
2a1cc5ac30efc05880a12a2114c09364fc38e032 20-Dec-2010 James Dong <jdong@google.com> Merge "Backward-compatibility max file size support, ignoring 0 or negative file size limit"
26ea64c7442b0554d8864e8ad3822a3cc32c5a58 20-Dec-2010 James Dong <jdong@google.com> Backward-compatibility max file size support, ignoring 0 or negative file size limit

bug - 3281011

Change-Id: I2d3ae4565602e2374ca794c5e8d0837ad33cf0e8
ibmediaplayerservice/StagefrightRecorder.cpp
7dd7c69f0fba6f205e584d9379b5daeb99c55dc4 20-Dec-2010 Jamie Gennis <jgennis@google.com> Merge "Change a Stagefright assert to an error check."
fd8b75afddb189d6fb14d3f3e17062c95229b15a 18-Dec-2010 Jamie Gennis <jgennis@google.com> Change a Stagefright assert to an error check.

During OMX codec initialization it is possible that buffer allocation
fails. This changes Stagefright to set an error state and abort
initialization rather than crashing with an assert failure when that
happens.

Change-Id: I2fc2fadfe75657cdbf649cc8cafd2e4c251a5f8b
Bug: 3282700
ibstagefright/OMXCodec.cpp
fbc4939d2b51d511858846363bf02c7c9f851ed2 17-Dec-2010 Mike Lockwood <lockwood@android.com> MediaScanner: Fix handling of .nomedia files in directories

In particular, fix the code that prevents the database triggers from deleting
files when a .nomedia file is added to a directory

Change-Id: Ie913223f3b1bbf9122842a675b96d4baac3b1c6f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
28cfb113daec5679ac711f74d0d8cdb73547e150 17-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Add support for scanning empty directories"
a1608902f95dc8ff31a52c1f1c384829a803a701 17-Dec-2010 Eric Laurent <elaurent@google.com> am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread

* commit '5a756fb0f1f3f8cd7612284c889dfc69875577a8':
Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
076e05b488e40fdd946f0d35137fe66a576efe09 16-Dec-2010 Mike Lockwood <lockwood@android.com> MediaScanner: Add support for scanning empty directories

Currently the media scanner does not create database entries for directories
unless they contain a file that is scanned.
Fixing this so we provide a consistent view of the world to MTP.

Change-Id: Ia776acfeae23192183e7192d63cdc34d830ea889
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerClient.java
ni/android_media_MediaScanner.cpp
ibmedia/MediaScanner.cpp
c4f297d612a06a1f5eeac0adca03852d51c85f72 16-Dec-2010 Andreas Huber <andih@google.com> Instead of asserting, gracefully abort and signal and error.

Change-Id: I170a602ed80e6c85a94e46deadfc02aaf92bfebb
ibstagefright/httplive/LiveSession.cpp
f76aca984c4754e4de2cd731d5b6bbdb169b7544 16-Dec-2010 Andreas Huber <andih@google.com> Merge "The HTTP/1.1 Host request header must include port if it's not the default (80)."
3abb7dde86767a60bb4626612811afd0b6fd335c 16-Dec-2010 Andreas Huber <andih@google.com> The HTTP/1.1 Host request header must include port if it's not the default (80).

Change-Id: Idcc1429fbeecef99dad435208c9a1bd481132e2b
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/M3UParser.cpp
2e8295950af4da33d8599b9f17585a533a97135e 16-Dec-2010 Andreas Huber <andih@google.com> Merge "Remove now obsolete implementation of streaming from AwesomePlayer."
52185ff75429282f8713407b30ec5517739b503e 16-Dec-2010 Andreas Huber <andih@google.com> Merge "Properly announce decoder output format changes, make sure AMessage::dup does."
49dad77148c955cba7a72188ec2a90105941ecdd 16-Dec-2010 James Dong <jdong@google.com> Merge "Give the standard not compliant video sample a chance if its size in the mp4 header is invalid"
d936726fd7a5bfaf651b206305665d8357a46e6d 16-Dec-2010 Andreas Huber <andih@google.com> Remove now obsolete implementation of streaming from AwesomePlayer.

Change-Id: If62bedbf74c8e987d6651604d7bebc9da381e86a
ibstagefright/AwesomePlayer.cpp
687b32d83e0145b0a684e3a9704ab50939260d60 16-Dec-2010 Andreas Huber <andih@google.com> Properly announce decoder output format changes, make sure AMessage::dup does.

Change-Id: Ia77f6b6d5e5c5055583740dfe876b8a3c22be9b6
ibmediaplayerservice/nuplayer/DecoderWrapper.cpp
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibstagefright/foundation/AMessage.cpp
c32dd5f2d12107f3f1eff26dfd55a42d49c337de 16-Dec-2010 Chih-Chung Chang <chihchung@google.com> Fix 3274309: Returns correctly sized thumbnails for MINI_KIND video thumbnails.

Change-Id: I88b293e44430eebe780dfb9eb06d80f8ce89483f
ava/android/media/ThumbnailUtils.java
36d41b8103a525a9a581c01740428ec9f9c782a2 16-Dec-2010 Eric Laurent <elaurent@google.com> Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.

The problem is that when an input stream is opened for record over bluetooth SCO, the kernel
mono audio device should be opened in RW mode to allow further use of this same device by an output stream
also routed to bluetooth SCO.
This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true
when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO).

Change-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75
ibmedia/AudioSystem.cpp
c9e1c80f786667e264748bf2843dabdc2029c006 16-Dec-2010 James Dong <jdong@google.com> Give the standard not compliant video sample a chance if its size in the mp4 header is invalid

Change-Id: Ib573ededb9c73285822fa238120faa484402bcf7
ibstagefright/MPEG4Extractor.cpp
0efdc95d59a51a130ce9d2515bcc9e2c01b52f14 16-Dec-2010 James Dong <jdong@google.com> Opted to recognize "h263" or "H263" boxes in an mp4 file

bug - 3278240

Change-Id: Ifd1b1f3e5dd55dbf2c33bbad9dd51998c25bfc15
ibstagefright/MPEG4Extractor.cpp
7c6ca1907ee9f323d20a4d4b5bfa4be9e1c66d8b 16-Dec-2010 Andreas Huber <andih@google.com> Merge "Properly order the data written out to the transport stream by timestamp."
a15874665fa785c82afa9f2e8cb3512470c297cb 16-Dec-2010 Andreas Huber <andih@google.com> Initial support for a true streaming player for mpeg2 transport streams.

Change-Id: I153eec439d260a5524b21270e16d36940ec3161a
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/nuplayer/Android.mk
ibmediaplayerservice/nuplayer/DecoderWrapper.cpp
ibmediaplayerservice/nuplayer/DecoderWrapper.h
ibmediaplayerservice/nuplayer/NuPlayer.cpp
ibmediaplayerservice/nuplayer/NuPlayer.h
ibmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
ibmediaplayerservice/nuplayer/NuPlayerDecoder.h
ibmediaplayerservice/nuplayer/NuPlayerDriver.cpp
ibmediaplayerservice/nuplayer/NuPlayerDriver.h
ibmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
ibmediaplayerservice/nuplayer/NuPlayerRenderer.h
ibmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
ibmediaplayerservice/nuplayer/NuPlayerStreamListener.h
ibstagefright/ACodec.cpp
ibstagefright/Android.mk
ibstagefright/foundation/AHierarchicalStateMachine.cpp
ibstagefright/foundation/Android.mk
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
fb16f7009b416a895c674cc82f236f46ceb69583 11-Dec-2010 Andreas Huber <andih@google.com> Properly order the data written out to the transport stream by timestamp.

This ensures data locality across tracks.

Change-Id: I823b9407e3603473422177ec02dff4860ffc5b4f
ibstagefright/MPEG2TSWriter.cpp
ebf90ac7a82c9a0fa5c02702ccba36bc5082240f 15-Dec-2010 Andreas Huber <andih@google.com> Merge "Proper recovery of timestamp information in the transport stream parser."
9c5d62a5be43904081575a943fe04d3cfcc2dda8 15-Dec-2010 Andreas Huber <andih@google.com> Proper recovery of timestamp information in the transport stream parser.

Change-Id: I647c73688c95529f54f0bb6af17d109dfe2bb11d
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
828b5a328c340420691cad82b617cc9e920891a4 15-Dec-2010 Eric Laurent <elaurent@google.com> Merge "Change audio routing policy for HDMI"
2c61bee2b05a6f4cf06a0048b3c0a81f248a48cd 15-Dec-2010 Eric Laurent <elaurent@google.com> Change audio routing policy for HDMI

HDMI device should have a higher priority than analog dock audio but a lower priority
than wired headsets.
Also modified AudioService so that HDMI is mapped to DEVICE_OUT_AUX_DIGITAL device and not
DEVICE_OUT_DGTL_DOCK_HEADSET as before to enable discrimination between SPDIF going to
digital dock and SPIDF going to HDMI.

Change-Id: I887d0c73479784dd2edaf41ce1a7d8d0bdcbb4bd
ava/android/media/AudioService.java
08f83a6cd8c03a1a252b1dea13c72cee3def70c0 15-Dec-2010 Andreas Huber <andih@google.com> Merge "Emit better (correct) timestamps that respect AAC upsampling."
4453aa4c306871bb85fcf1d6efcaaf151327f2ce 15-Dec-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: Catch ActivityNotFoundException when attempting to display imported file.

Change-Id: I448f2506caf0a5599c885654fd0078beb6240965
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/res/values/strings.xml
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
88b77412286115b158d906369b62515d773f21bc 15-Dec-2010 James Dong <jdong@google.com> Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature

Change-Id: I48c94b7a77a717c15fac548c7068a8a3e62c79fb
ni/android_media_MediaMetadataRetriever.cpp
3d6576efd025641182ec0145c9a03e5b9c26c6ef 15-Dec-2010 Andreas Huber <andih@google.com> Emit better (correct) timestamps that respect AAC upsampling.

Change-Id: I6587416c9caa0e263aa8ec6c6d89a42e28f6ff19
ibstagefright/codecs/aacdec/AACDecoder.cpp
3be80f2e6cf763fdfeb058d5a4ac8257cdc91135 14-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Make recursive delete more efficient"
55f808cff9913a00164120a422af6ca45db5072b 14-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Make recursive delete more efficient

Change-Id: Iec9df8ac910f5257236b59c95b0ee3d7d05f367c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
6f7d56cf9f743259a3b43bf40608fe24c9fe6d51 14-Dec-2010 James Dong <jdong@google.com> Merge "Fix an issue where a fixed number of bits per sample is used for seek position calculation."
1f356b9569da882df22ca231c1c0fdea6e330abf 14-Dec-2010 Andreas Huber <andih@google.com> Merge "Properly signal the condition if we run out of input data."
69d23b2fc82adb1ced0edc71ae0666bfa88f3c46 14-Dec-2010 Andreas Huber <andih@google.com> Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes."
94bced1eb23df4488b9ca319666f04b37925e255 14-Dec-2010 Andreas Huber <andih@google.com> Properly signal the condition if we run out of input data.

Change-Id: I7a5ada8c25c1d32ca603b3b2c75e1808e140c367
ibstagefright/OMXCodec.cpp
5d266dd84ef6bbdede935e60b24f34c245982960 14-Dec-2010 Andreas Huber <andih@google.com> Support malformed ID3 V2.4 tags written by early versions of iTunes.

Change-Id: I90c2a9bbf216e2ae9a37accdaa2214233f5e54ea
related-to-bug: 3275576
ibstagefright/id3/ID3.cpp
ibstagefright/include/ID3.h
bafca214eaf326441e5157d645b2ee7fe8c7d1ab 14-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: check for replacing existing files via the database instead of the file system

Change-Id: I283dab48f24d2836e48fab8e49764a9cdf13de55
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
tp/MtpServer.cpp
1b198ea6856cb5db989a7f161b7516eeecf5ebc8 14-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Create files/folders with group media_rw instead of sdcard_rw

Otherwise the sdcard daemon that implements the Fuse file system at
/mnt/sdcard won't have write access to the files.

BUG: 3254123

Change-Id: Ib0c306bbc31ec936fd6164f17e7cd1b5dfff21b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpServer.cpp
399623935cf279b41baab7d3f2f69d026fc6b64a 14-Dec-2010 James Dong <jdong@google.com> Fix an issue where a fixed number of bits per sample is used for seek position calculation.

The patch was from NV.

bug - 3278233

Change-Id: I9bc22b6b0ee6bfa5d4617a8c497f67eb577efca4
ibstagefright/WAVExtractor.cpp
5bd7d9347b23f7ad5301723aebcb4663897cac1b 13-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: No longer delete playlist files that have no valid entries"
eb46d0601e94533e50260e6fb7c807966e4ae097 13-Dec-2010 Mike Lockwood <lockwood@android.com> MediaScanner: No longer delete playlist files that have no valid entries

When copying files from MTP we must keep the file in the database, even
if we cannot find any of the playlist entries (or even if it is not a valid playlist file)

BUG: 3260341

Change-Id: I4b39027ee25ffae6778224cf74830a4b1ca3fecb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
fc8b7c9ccf33b161f07e9bfcad28171c78d752ca 07-Dec-2010 James Dong <jdong@google.com> Yield the omx threads so that file writer threads have a chance to retrieve the output buffers once they become ready

bug - 3252228

Change-Id: Iab7cf1c9a87cce7b814c63b42b21fcd6a7314b36
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
d1e039682082dc15583b64fafb2feeec4b0c9810 13-Dec-2010 James Dong <jdong@google.com> Merge "Revert "Allows the authoring engine to skip frame.""
b6a0dfb0f19492f9d685541033b47922a817eb34 13-Dec-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 3275151 Request and abandon audio focus with audio mode changes"
7f36b19b6b78c83f1c52edd153d64295ee3840ce 12-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Add support for reserve storage setting to avoid low storage situations.

Set resource config_mtpReserveSpaceMegabytes to number of megabytes to reserve.
If MTP has dedicated storage this value should be zero, but if MTP is
sharing storage with the rest of the system, set this to a positive value
to ensure that MTP activity does not result in the storage being
too close to full.

BUG: 3250924

Change-Id: I881c87240da268bad1ea1b99ad03673ab85ffdbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpServer.java
ni/android_media_MtpServer.cpp
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpStorage.cpp
tp/MtpStorage.h
2ade576148fe33c5ff6098d30ccfbcf28df70e8e 11-Dec-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 3275151 Request and abandon audio focus with audio mode changes

Before the introduction of the MODE_IN_COMMUNICATION audio mode,
"calls" were only made through telephony and the PhoneStateListener
was used to request and abandon audio focus as calls where started
and ended. VoIP applications do not cause phone state events to
be broadcast, and set the audio mode to MODE_IN_COMMUNICATION
directly. This change monitors mode changes to automatically
grab and abandon audio focus.

Change-Id: Ie9a4193e35ba8447764fac66a988959a93c4909f
ava/android/media/AudioService.java
2711e494caf9ec665c46258feb36c9654290f6e0 11-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Check for null string before calling GetStringUTFChars() in MtpDatabase JNI

BUG: 3274649

Change-Id: I5a3c8fcebf71ed453a121ca5a1345e39895d3bf3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpDatabase.cpp
2144f6316d9c993ba20c7de2a6cac35265291cc5 11-Dec-2010 James Dong <jdong@google.com> Revert "Allows the authoring engine to skip frame."

o Skipping frames could lead to a lot of issues such as I frames is lost etc.
It is not being used anyway.

This reverts commit 53d4e0d58e2d5c18f6e026c705af833b9bdd7aba.

Conflicts:

media/libstagefright/AudioSource.cpp
media/libstagefright/CameraSource.cpp

Change-Id: I3abba1647de48db25bdc369066eb2a7ae4dedec2
ibstagefright/AudioSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/MediaSource.cpp
ibstagefright/OMXCodec.cpp
845584e7172406224071ebeb04838dc757761bcb 10-Dec-2010 James Dong <jdong@google.com> Fixed a failure from timelapse video recording because of accidental use of metadata buffers

bug - 3274317

Change-Id: I2c0e9fcd30c9141ce5a85e9d72cbd0baf561458b
ibstagefright/CameraSource.cpp
63703876801b569caf3737ea6932ea3fc444c245 09-Dec-2010 James Dong <jdong@google.com> Release a recording frame only if mCamera exists and is not cleared.
and also call mCamera->stopRecording() only after CameraSource releases all the
outstanding video frames sent from CameraSource to its clients (such as video encoder).

Change-Id: I7eeed4e2f388e77c28668d52c24b5330d3d9ebde
ibstagefright/CameraSource.cpp
faa27f932e15c673106f984cbbeef23c079bcc81 10-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService"
770126a678ccc9328a89407ffc82f4d998b25427 10-Dec-2010 Mike Lockwood <lockwood@android.com> Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService

In preparation for an upcoming change that will make UsbService into a real system service

Change-Id: Id85d624cfc6b10b49a08105cfaaacc667a492c12
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
ests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java
337885be6e0eadda2d54977104c5738b03f6fb34 10-Dec-2010 James Dong <jdong@google.com> Merge "First step towards renabling Timelapse video recording"
bfd1d72a1a1d7be1d32d680a270d3c2207e59e28 10-Dec-2010 Mike Lockwood <lockwood@android.com> MTP host: Handle receiving a response packet instead of data packet.

This will happen if the device needs to report an error rather than returning the data.

Change-Id: I477512b3676c2f0518a85a4135832ed4475fbc2d
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
tp/MtpDevice.h
tp/MtpPacket.cpp
tp/MtpPacket.h
08800f3fdc607e1e8f8d0554eff4a9dc9a6c53d3 10-Dec-2010 James Dong <jdong@google.com> First step towards renabling Timelapse video recording

Change-Id: I93836b066fb69d5152d3774546a9935057a1f12f
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
ed6f095a83af9477d37e67a29762baf30ea97723 09-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP"
d285415e8ae193949b4236bd78ca6cdd28d99c72 11-Nov-2010 James Wylder <james.wylder@motorola.com> libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode

Speeds up the decoding leaving more time for cpuidle (lp2),
thus lowering overall current drain.

Change-Id: Ia4e0636b1813810072fe0a4f94f6921adf2eab31
Signed-off-by: James Wylder <james.wylder@motorola.com>
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/mp3dec/Android.mk
485059de22294a68099e9346af3aca88106919c6 09-Dec-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP

Change-Id: Ic5c7810ff4b7e25ba5f49a1107f5121391943108
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/AndroidManifest.xml
51f56cbd30c3d243934f75812e5d83d8b72b93d9 09-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Improve argument checking in SendObjectInfo"
c402def718f0daa8ff0aa4ae83aef87259d6c1cf 09-Dec-2010 James Dong <jdong@google.com> am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread

* commit '1f5b133ae29090f1807be392874f6b7a5d92c6d4':
When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
365e03e4943b2d2f4d1e602409ab0e770ea77d1d 09-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Improve argument checking in SendObjectInfo

In particular, make sure the parent is a folder and make sure file
does not already exist.

Change-Id: Ifa870faba3285f03a92025d9e82f93fed78a761c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpProperty.cpp
tp/MtpServer.cpp
da1b16ad41f7a4abf2531f86e1ba6053b588dae8 09-Dec-2010 James Dong <jdong@google.com> When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again

bug - 3264094

Change-Id: I291a9b09b335d0eb4acf91f992e59fc44bc57d01
ibstagefright/AwesomePlayer.cpp
daac81d1f75e0a05c280e4ee3e94a21c35ca137a 08-Dec-2010 Andreas Huber <andih@google.com> Merge "Fix thumbnail extraction for extractors that don't have a preference."
b1d49ded620fc9c80f793f32742bf1fef0281271 08-Dec-2010 Andreas Huber <andih@google.com> Fix thumbnail extraction for extractors that don't have a preference.

Change-Id: Id305a44416b08a667aae86c2109aa4dff9f17342
ibstagefright/StagefrightMetadataRetriever.cpp
7b2029be0b77702e51fff367a2bf4f7fcb5d2456 08-Dec-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 3159946."
f69583cde5e4e8c3337c2196f8102f987ef9ea61 08-Dec-2010 Andreas Huber <andih@google.com> Merge "Better buffer status management and verification in OMXCodec."
bbbcf65532c905b71f5c731551b15e9bd2fc26e0 07-Dec-2010 Andreas Huber <andih@google.com> Better buffer status management and verification in OMXCodec.

Change-Id: I90410f2ac0d8ff86076a239dc6e281b1bc4d8643
ibstagefright/OMXCodec.cpp
7f889328b70ef863529f1e882fdd331d9d765432 08-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: pass format back as default value in GetObjectPropDesc for format property"
a9e67c11c0e4be3508662b2382b6d1f19e8aa258 08-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Support format argument in host GetObjectPropDesc command"
9b5e9c407d35eab4f37c208d81bdf0b8bcdbdf93 08-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: pass format back as default value in GetObjectPropDesc for format property

Change-Id: Icc4071af16763a613c9fb31e87dc716f1516c7d8
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpDatabase.cpp
a194cc7d8b39656c37acf93096550314a8d2101b 08-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Support format argument in host GetObjectPropDesc command

Change-Id: Ic14313c0f95bea1d1d475cc6a001b256fccb91c8
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
tp/MtpDevice.h
b3f522f34bfaef16cf978930fa7b021ef12288f4 08-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Read property code before calling isDeviceProperty in MtpProperty::read()"
bf1dbd193827c05fcb017ea5a87953b47a75dbd5 07-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Read property code before calling isDeviceProperty in MtpProperty::read()

Change-Id: I0b1493f3af5d9caac08327f9ffba91ee255d3d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpProperty.cpp
c7f2f0ab01a044133ca1935a3127a068ba06da8c 08-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Improve MtpProperty logging support"
e4880e421fba5f429f4c6d43ec41ae17902c1626 07-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Improve MtpProperty logging support

Change-Id: I46800b99763edcc5e994d912941f9f5e9b1c94d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
tp/MtpDevice.h
tp/MtpProperty.cpp
tp/MtpProperty.h
9cf29560e82120a3bab3875a7362be95454ec0c2 08-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc"
612ca8781f897121e0ec70c461f26cdd7d0859f1 08-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Use correct return type for getSupportedObjectProperties"
ea4af54093ae92e642830bdae97d4c04d72eaf18 08-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "Revert "MTP: Remove static library build for linux host.""
ecce2f6d82650a18889fb2a5ff6b45f318e50bdf 08-Dec-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property."
62ef767b15a712bab31cc0d5508a330906f535c2 24-Nov-2010 Eric Laurent <elaurent@google.com> Fix issue 3159946.

AudioService now uses SCO virtual calls instead of voice recognition to
implement startBluetoothSco() method.
Also make sure that a virtual call is not started when SCO audio is active
due to in call audio or voice recognition.

Change-Id: I93ed119afbc57250a4433201156714e35f70fea4
ava/android/media/AudioService.java
5768f1089bc0037db43ef9a5cff7b5cdbd643d76 07-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc

Change-Id: I6fd23587597fc68227dfb61118b097eda3e3e1d5
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
tp/MtpDevice.h
4cb956cc58ef808f5b35827716dec60a5774d4ab 07-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Use correct return type for getSupportedObjectProperties

Change-Id: I6d5bd63fecaa3384dfa1b97dbc0d89ea5668981f
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
87626b1d018ec0b7742b6ec5b622871c22ea5fa0 07-Dec-2010 Mike Lockwood <lockwood@android.com> Revert "MTP: Remove static library build for linux host."

This reverts commit d46c683f0e13ad9341ba83453835f6658ae5ad15.

Change-Id: I7e56760c92bad1d66d4a1f2415328a4d2138de84
tp/Android.mk
ea93fa16b166ff477e9cf6bd3ac67c8fb259fb57 07-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property.

Return screen size as preferred maximum image size.

Change-Id: I8dc4afb0e49fe45f6925a35aa443d3fc30211453
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
b0fa4f2c6f20a873370d9d50d9f77a4ea705270d 07-Dec-2010 Andreas Huber <andih@google.com> Merge "API Support for both synchronous and queued commands, optionally associated metadata."
25d7094279d2eeda0b18a2ca0104d672c4b3c8e5 06-Dec-2010 James Dong <jdong@google.com> Log the exception cause for better problem analysis

Change-Id: Ia1f81adb6fc3be87098c9399509b68d5daf7f2da
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
0efe974ee6787f84d4a2f14487e31bbbd3d011bd 06-Dec-2010 James Dong <jdong@google.com> Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created."
ae9d5072534de65d9ea41def2e1b4258a1731ca4 06-Dec-2010 Andreas Huber <andih@google.com> API Support for both synchronous and queued commands, optionally associated metadata.

Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
ibmedia/Android.mk
ibmedia/IStreamSource.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/foundation/AMessage.cpp
ibstagefright/foundation/Android.mk
28bec9ebceba9df6e7400d18c1e6b8a04430114e 06-Dec-2010 Yu Shan Emily Lau <yslau@google.com> Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)"
b5590846c035a28399818451201aaf1256913ec3 04-Dec-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 9254c845d7c82976fd4b8be406ce4b17eeb0e119
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:26:12 2010 -0800

Remove obsolete code from the cached data source.

Change-Id: I794b986ac8977cbc834dff189221a636ba564e36

commit 2ee33711064c58c53ba65ed9e63dd4b01ec2380e
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:23:13 2010 -0800

LiveSource is dead, long live LiveSession.

Change-Id: Ibcd0731ecf9c94f0b3e5db3d53d012d9da2a1c66

commit 9eabb2c3cd8571ab859bdeae0aa7f655c414d8fa
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 12:49:31 2010 -0800

Respect explicitly signalled discontinuities.

Change-Id: I3c0c16a2de7a99742d25db7d1b2ff0258de52271

commit 7f7f7b6b906b6ece6e4d43af7fd5f494e805c5e5
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 11:45:57 2010 -0800

Better protection against syncword emulation in AAC ADTS content.

Change-Id: I867e80a4556dd46d24ab3e781177c248a5221719

commit fe765766582efcc350aed01135ea603576adccf6
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 09:15:59 2010 -0800

New implementation of http live driving code.

Change-Id: I31ddf3d6a0d5929b121be704a2b9c3d6775f7737

Change-Id: Id8d1829c8fcb173756965013f848c1d426ef1048
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/Android.mk
ibstagefright/httplive/LiveDataSource.cpp
ibstagefright/httplive/LiveDataSource.h
ibstagefright/httplive/LiveSession.cpp
ibstagefright/httplive/LiveSource.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/LiveSession.h
ibstagefright/include/LiveSource.h
ibstagefright/include/MPEG2TSExtractor.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
5df53fe2f038bc23f2e3c452dc8398c8bdd08d30 05-Dec-2010 James Dong <jdong@google.com> Remove check if the target video resolution is not supported by CameraSource
and clean up Camera is CameraSource could not created.

bug - 3254411

Change-Id: I43497c450e7007de5ce027e2912b1421119e8887
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/CameraSource.cpp
e8f317d32ccf09f613f91da75965532a05dd4bca 04-Dec-2010 Yu Shan Emily Lau <yslau@google.com> Suppress the unsupported camera recording size (ie QVGA and SQVGA)

Change-Id: I34b6433f0aae4a117b2467069523a62e44bf9bbe
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
f6bd1ea0c79516a5ef3c0c463761deec1a80e419 04-Dec-2010 James Dong <jdong@google.com> Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()

as part of the preparation for publishing MediaMetadataRetriever as public Java API

bug - 2433195

Change-Id: I6e8a771347e3d89bfe359ae403ebfe3205ea6313
ava/android/media/ThumbnailUtils.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
faf09ba9405ff019b5ca7e2317debe4ff269d4f8 03-Dec-2010 James Dong <jdong@google.com> Prepare for publishing MediaMetadataRetriever as public API

step one:
o replaced captureFrame with getFrameAtTime
o removed getMode

bug - 2433195

Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
ava/android/media/MediaMetadataRetriever.java
ni/android_media_MediaMetadataRetriever.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/mediametadataretriever.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/include/StagefrightMetadataRetriever.h
ded695bb30e9c88c48c37e6fa5736771c6011b3d 03-Dec-2010 James Dong <jdong@google.com> Merge "If camera source uses the metadata, we must use HW encoder Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera"
f3332a1d874649dacc048e0e1fe3a2a034bb154c 02-Dec-2010 Gil Dobjanschi <virgild@google.com> Merge "Remove the VideoEditorTestImpl"
6312dd6d2b19d158773d14ed8cefa3f20272d488 02-Dec-2010 James Dong <jdong@google.com> If camera source uses the metadata, we must use HW encoder
Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera

bug - 3242213

Change-Id: I97361ed88b2a687190e5129459011afff7f32c2d
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
0a218eab61c1f0775c8155ce6509564613274ab5 02-Dec-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
731e46575aeffa26b41d7590a0a4de637d792258 02-Dec-2010 Gil Dobjanschi <virgild@google.com> Remove the VideoEditorTestImpl

Change-Id: I16302716f4aa32f69f48c9f4cc5732b421c1a675
ava/android/media/videoeditor/VideoEditorFactory.java
ava/android/media/videoeditor/VideoEditorImpl.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
cd023f98fab0f01603f006c3029a73cd820b4678 02-Dec-2010 Gil Dobjanschi <virgild@google.com> Merge "Added a callback interface to the generatePreview method."
b5c6afc208bd70eba386dbb2c0fb29b34e44e4d4 02-Dec-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit de99ae4a523ff5ec40b47071f22fdde1a4b2a0bf
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:18:40 2010 -0800

Scan for sync words to find H.264 frame/AAC frame boundaries if PES packets do not start with them.

Change-Id: If2861982ecb3006fac806105dbfcd1d43c2a4205

commit be23791ff0d037aa7073589cdc8bfc362e1c281d
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:12:39 2010 -0800

Properly expand relative key URLs and strip surrounding quotes in the M3UParser.

Change-Id: I013a6d83a64f095d090e5c7730298bdac7d03ab4

commit 0f1d8f65effe0cc42a265dd91d8b91dce6534325
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:11:27 2010 -0800

Ugly hack that assumes that any http url containing "m3u8" refers to an httplive stream.

Change-Id: I05d7bbc5dab0f9822558122b5b9dc2a109ed8518

commit 255f0d5cdb1072ecd66b47ee614bf574f1388e5a
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:10:56 2010 -0800

Add one more mimetype "application/x-mpegurl" to identify httplive playlists.

Change-Id: I63fd3b8c2539c9ee23c077df533157af78b10863

Change-Id: I135687383009dbe32d690c9ba8dea60159adc616
ava/android/media/MediaFile.java
ibstagefright/AwesomePlayer.cpp
ibstagefright/httplive/LiveSource.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/include/M3UParser.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
786ecf849c57de5400a0d594d3b133758a17a1a0 02-Dec-2010 Gil Dobjanschi <virgild@google.com> Added a callback interface to the generatePreview method.

Change-Id: I7ba678aba47f232e1c320bb36decf59f80f3755d
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorFactory.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
6785699f19ed22b07e9c7b9fa2f29ad3571febed 02-Dec-2010 James Dong <jdong@google.com> am 80639875: am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread

* commit '806398755fdc63438b607856574e5b885ad98e6b':
Be conservative in estimating the file size limit.
806398755fdc63438b607856574e5b885ad98e6b 02-Dec-2010 James Dong <jdong@google.com> am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread

* commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74':
Be conservative in estimating the file size limit.
f45853af5051df4abaa33cdca7fa986104811d1a 02-Dec-2010 Mike Lockwood <lockwood@android.com> MediaScanner: Fix path mismatch in code that check for missing files in postScan()

BUG: 3213640

Change-Id: I102d6c9ae95adadb855e2199380117808ccaa1ee
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
7d7fb63071ca370f77ed69055ac30341b8388d15 02-Dec-2010 Mike Lockwood <lockwood@android.com> MTP: Add support for multiple properties in GetObjectPropList command

Change-Id: Ib469a6c8141937aaa3e811345056195117abb4b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ava/android/media/MtpPropertyGroup.java
ava/android/media/MtpPropertyList.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpProperty.cpp
tp/MtpServer.cpp
938f2577e6d5166407c9483509e013c72f094b45 01-Dec-2010 Eric Laurent <elaurent@google.com> am 371ed722: am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread

* commit '371ed72216789505acadfac3f2e905dafb04f6e0':
Update java doc for visualizer FFT capture.
5cdcf16ec7c5f6e0de1d17e8246fe4d2a12e7ace 01-Dec-2010 James Dong <jdong@google.com> Be conservative in estimating the file size limit.

bug - 3045580

Change-Id: Ifdffa354b9433639c3f246a0eb581ef14af1e797
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/MPEG4Writer.cpp
1981674771f9517899c346d3095b4227e63bd2a2 01-Dec-2010 Chia-chi Yeh <chiachi@android.com> am 4f93f08d: am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread

* commit '4f93f08d8c8b8067ff2176d9ec15c76c0e4cc0c2':
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
b460779cff97f2619e22911264350f5dbb7e76bc 30-Nov-2010 Andreas Huber <andih@google.com> am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread

* commit '30c818444d876dd868b84adec2416308c90f32e3':
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
30c818444d876dd868b84adec2416308c90f32e3 30-Nov-2010 Andreas Huber <andih@google.com> Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
9157478dcfb624a57e2ee83fb3cffd0bb2f72685 30-Nov-2010 Andreas Huber <andih@google.com> am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread

* commit 'a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb':
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb 30-Nov-2010 Andreas Huber <andih@google.com> Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
d208a2c7b0993da0fba7c453763c472746ad4282 28-Oct-2010 Andreas Huber <andih@google.com> DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.

DO NOT MERGE
related-to-bug: 3141937

Change-Id: Iaf1b0c5d45a6b5bb7624a59747041c27b4dde83b
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/mkvparser.cpp
ibstagefright/matroska/mkvparser.hpp
8d023ddcd45e55ae426e6c6d9e6e9231c3987018 18-Nov-2010 Andreas Huber <andih@google.com> DO NOT MERGE Support for "chunked" HTTP transfer encoding.

DO NOT MERGE

Change-Id: I253d48ea69f239a6d3d0bb7e0d31eef5c773a9d6
related-to-bug: 3205131
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/LiveSource.cpp
ibstagefright/include/HTTPStream.h
ibstagefright/include/NuHTTPDataSource.h
aeaa3b3c6ad004b9a13fc9d48c924c77042e8c22 30-Nov-2010 Andreas Huber <andih@google.com> am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread

* commit '567b2bd1469b1c37e6249637d313253b7d84971e':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
567b2bd1469b1c37e6249637d313253b7d84971e 30-Nov-2010 Andreas Huber <andih@google.com> Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
371ed72216789505acadfac3f2e905dafb04f6e0 30-Nov-2010 Eric Laurent <elaurent@google.com> am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread

* commit '688f4c58d4a7590ad47c219af3a5b8479d3a084d':
Update java doc for visualizer FFT capture.
3a2dc0d573bcfdebc1464ee9316767c2fca91a55 30-Nov-2010 Andreas Huber <andih@google.com> am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread

* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
688f4c58d4a7590ad47c219af3a5b8479d3a084d 30-Nov-2010 Eric Laurent <elaurent@google.com> Merge "Update java doc for visualizer FFT capture." into gingerbread
0fb258d6c360c1fca42c594527792314e358ce93 30-Oct-2010 Andreas Huber <andih@google.com> After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.

Change-Id: Ifb1f8c91e95a5cafe30ae1035973316c210b98a5
related-to-bug: 3152363
ibstagefright/AwesomePlayer.cpp
4f93f08d8c8b8067ff2176d9ec15c76c0e4cc0c2 30-Nov-2010 Chia-chi Yeh <chiachi@android.com> am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread

* commit '683a7ff922409d2aa6c944bc4e08de32029e80e5':
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
122a9ccbcdcdaf00a349813555d28d86709a6ed9 12-Nov-2010 Andreas Huber <andih@google.com> DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.

Change-Id: Ibb14e5aff20920da4917d85de38ba3a8ee71d0bd
related-to-bug: 3188835
ibstagefright/AwesomePlayer.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/SoftwareRenderer.h
ibstagefright/omx/OMX.cpp
84e3916720e430e0d6debfaf5343b8a14fdf1ce4 30-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Don't fail in playlist transfer if not all playlist items can be found."
50225445f864cf7dc1884cf25de1eb3c64272f85 30-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Make sure buffer is big enough before reading the data packet"
7adfd1896c17d734440962c9f8dbe4aad48bcb49 30-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Don't fail in playlist transfer if not all playlist items can be found.

Change-Id: I8275c4e5eca34e193a3cedcba16442bf388e74eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
9dfc7de2cc3b552472f843e12ba229db0fd31fdf 30-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Make sure buffer is big enough before reading the data packet

Fixes buffer overflow when transferring large playlists.

Change-Id: I1b7feaf9e56d849e5b6609f0f68a6aa5a3ae1ea8
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDataPacket.cpp
683a7ff922409d2aa6c944bc4e08de32029e80e5 30-Nov-2010 Chia-chi Yeh <chiachi@android.com> Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
7411c1b8364ad1340c20f1da546e307c2d330e63 29-Nov-2010 James Dong <jdong@google.com> Renable the captureFrame unit tests

o We need to make sure that
/sdcard/media_api/metadata rwx to the test app
before tests

Change-Id: Iaa2d58bb2d380bf7e93ec71f77c4c769d65b1d85
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
c584428795e26c49c4c00edf0d4dccd93d832345 25-Nov-2010 Gloria Wang <gwang@google.com> Remove empty Widevine make files

Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
ibwvm/Android.mk
ca3c639cc4803b89a8a45aa7ab2a6de1c470f456 24-Nov-2010 Shyam Pallapothu <shyamp@google.com> Merge "Added new bitrate values"
83cd9dcf988b02366e095348883eca992bdbb0ed 24-Nov-2010 Gil Dobjanschi <virgild@google.com> Added new bitrate values

Change-Id: I2e6ab51d9a845beca02f84cefc66663fbf89aabf
ava/android/media/videoeditor/MediaProperties.java
6bdbcd748ee64c7d66547c89673b415197a3001f 24-Nov-2010 Andreas Huber <andih@google.com> Merge "Support streaming data across binder boundaries."
2ed9910d55ea0a4d19eed8b235317f4a7ee4c94a 24-Nov-2010 Mike Lockwood <lockwood@android.com> Merge changes Ia5fec45a,I74927f73,I5a3c0b07

* changes:
MTP: Fix typo in MtpServer::doGetObjectPropList
MTP: Implement GetPartialObject command
MTP: Use DateTime form in GetObjectPropDesc for date/time properties.
e3634c3a804eb0b319d8912442322b2d2ff83569 24-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Fix typo in MtpServer::doGetObjectPropList

Change-Id: Ia5fec45a238c49a6797a4ac55457ddb5d6521408
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
44e82ddaec046b033abcc9f02d391cf68bf13d26 23-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Implement GetPartialObject command

Allows host to read partial contents of files on the device

Change-Id: I74927f7394224d674e1d150a4b72a51d9358459b
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpPacket.cpp
tp/MtpServer.cpp
tp/MtpServer.h
5b19af05f2c6ad71171f95bdad2484a38b61121f 24-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Use DateTime form in GetObjectPropDesc for date/time properties.

Change-Id: I5a3c0b07a9f2958b86947256606e6a824dbe93a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpDatabase.cpp
tp/MtpProperty.cpp
tp/MtpProperty.h
52b52cdfb7502d5a0fd7bba21d1daa3e36a54e42 23-Nov-2010 Andreas Huber <andih@google.com> Support streaming data across binder boundaries.

Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
ibmedia/Android.mk
ibmedia/IMediaPlayerService.cpp
ibmedia/IStreamSource.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
9fff216da9e67ca713d685c320d9bf79eeb12b08 23-Nov-2010 James Dong <jdong@google.com> Merge "Do not getConfig on video encoder on output port"
0c9153df101b9459f3e96ad43144d1b463f9c1ef 23-Nov-2010 James Dong <jdong@google.com> Do not getConfig on video encoder on output port

Change-Id: Id53e01dd8f3ec0c9ca94bb1d6dfccd7696254a2d
ibstagefright/OMXCodec.cpp
5a2755d0c9220b6bc52cb1262927e27dc3dce6c1 22-Nov-2010 Mike Lockwood <lockwood@android.com> Rename MtpCursor to PtpCursor

Change-Id: I8ce257641388b195f3e17995d323355b19355dc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_PtpCursor.cpp
tp/Android.mk
tp/MtpCursor.cpp
tp/MtpCursor.h
tp/PtpCursor.cpp
tp/PtpCursor.h
d46c683f0e13ad9341ba83453835f6658ae5ad15 20-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Remove static library build for linux host.

Change-Id: Iefdd386b91dba0579ca952aca40b7114535e1d4e
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
c0b8b321d5428e4fc425713e3889ef745af3af2d 20-Nov-2010 Mike Lockwood <lockwood@android.com> Rename MtpClient and MtpCursor to PtpClient and PtpCursor

Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ava/android/media/MtpCursor.java
ava/android/media/PtpClient.java
ava/android/media/PtpCursor.java
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_media_MtpClient.cpp
ni/android_media_MtpCursor.cpp
ni/android_media_PtpClient.cpp
ni/android_media_PtpCursor.cpp
a31560598af25d5116effc2a6af0d9be12a0628d 20-Nov-2010 Mike Lockwood <lockwood@android.com> Rename android.provider.Mtp to android.provider.Ptp

We are only supporting the PTP subset of MTP in host mode and have
no plans for full MTP, so calling it Mtp was misleading.

Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore
and added it to the public API.

Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpCursor.java
ava/android/media/MtpDatabase.java
ests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
ests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java
c60df506c152d8fd64ae386415060bf354e68d8e 23-Nov-2010 Gloria Wang <gwang@google.com> am 3e18dfab: am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"

* commit '3e18dfab3417e139c7ec3896cea9e303fdc8fa63':
Notify the playback status to DRM agents before the playback starts
3e18dfab3417e139c7ec3896cea9e303fdc8fa63 23-Nov-2010 Gloria Wang <gwang@google.com> am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"

* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
e45674e284f690ca9c395811ae0703c276514f2b 23-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Begin transition was invalidated when the image duration was changed."
4a0ff4de7954295ef7a1fd595c999240523860f8 23-Nov-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
37f7e0c7bfcfa6684a2012e1f22d1a926ab3d8a3 23-Nov-2010 Gil Dobjanschi <virgild@google.com> Begin transition was invalidated when the image duration was changed.

Change-Id: I0118813a66c65d8b3746fc2c689cf9d8da651aa3
ava/android/media/videoeditor/MediaImageItem.java
1bb0ffd0981bec26f906bc62d449e136111af4f8 22-Nov-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 0870f7bdd10a7cd36087d723d1957d8e1b967ca7
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 22 12:57:04 2010 -0800

set_surface_crop doesn't seem to work right yet, stop using it in the SoftwareRenderer.

Change-Id: If0a24f78b7810a6cecaa82eb4f23d0f90c22cc42

commit 4767b52bee3a54ae117a8708d6832276a44e6a6a
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 22 11:14:57 2010 -0800

info->mMediaBuffer may still be NULL at this point...

Change-Id: I25a71569015b1bb87f1ea7efff7588958774426f

commit 0cef79874e1f1ddb10b7402177a87d3cffc7de92
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 22 10:55:12 2010 -0800

QCOM's YVU420 color format conversion has now been tested.

Change-Id: I7fef4b642a928af15d42f006f7cdc107d5ff1d67

commit 84fe05a6c969ede0ce8a85a530e110afca07c7a7
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 22 09:59:50 2010 -0800

Removed remaining traces of suspend/resume. Proper reporting of video dimensions based on cropping rectangle.

Change-Id: Ib238b80cbc1f19e7d312f2422eb5e9ab6b06b1bc

commit 50970cdc837c5c498bcf0cb61b436196ca9e2ef7
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 16:11:06 2010 -0800

Revamped Software Renderer respects the crop rectangle.

Removed obsolete ADRENO support code.

Change-Id: I984cbc8a99c4d97e09e7d1b1292099c88b9ae535

commit 8abbc6a5608bff650f968540f24a2eab75f254ed
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 16:10:41 2010 -0800

The metadata retriever now respects the crop rectangle while capturing a video frame.

Change-Id: Id3377176060086d16717f62c77ce26fabe899050

commit 2d42e4466609d304e88bd2cdd6eb7b297340cc21
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 16:09:50 2010 -0800

Changed ColorConverter APIs to be more general.

Clients can now refer to crop rectangles in both source and destination.

Change-Id: Ief151d736818396d0389ec04e7df5650e3ad7c04

commit 273184303d54a54febd3e9c3dd4df30507ea78b5
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 15:04:06 2010 -0800

The stagefright commandline tool now writes the extracted video frame to /sdcard/out.jpg

Change-Id: Ieb2ab3fda7a7cd9294beccb8db0eed75096eeef4

commit 2d43390328cadf4ba94c1c3c02e4fb30baa29690
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 14:36:55 2010 -0800

The AVC software decoder now properly advertises the cropping rectangle.

Change-Id: Idb7a8a7e2fde5740f0fc34b7e8c92eca2577104b

commit 9a7ed23c2fac8ce19dce7a34a603acee945a89f6
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 13:40:39 2010 -0800

OMXCodec now signals a format change if the cropping rectangle changes.

...and puts the cropping info into its output format.

Change-Id: I3ffbd8e877ba286fe06a82c536ef20d92548d2e2

commit efe0323947029df1c502599ccc288c8d676dfd31
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 11:29:39 2010 -0800

Stagefright's MetaData object now supports rectangle items.

Change-Id: I5667bb5ee6622c76104b99fb57f60abb802a8504

Change-Id: I27cb78f2c5e0353f95fdfc5cb53991949ed75b70
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/MetaData.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/colorconversion/Android.mk
ibstagefright/colorconversion/ColorConverter.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/SoftwareRenderer.h
ibstagefright/omx/Android.mk
8aa798b244e32e227bad97d40ddfd7d3557030a3 18-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> Unhide android.media.AudioManager.MODE_IN_COMMUNICATION

Unhide new constant for an audio mode for a system state when
the device has a VoIP (as opposed to telephony) call established.
Update the setMode and getMode javadoc to link to the mode constants
that can be set or retrieved.

Change-Id: I90c4417679f215eb66e5305086fd077beddaa59c
ava/android/media/AudioManager.java
95dbffb2417a038625df8c790290e610b5f839d9 05-Nov-2010 Gloria Wang <gwang@google.com> Notify the playback status to DRM agents before the playback starts

Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
ibstagefright/AwesomePlayer.cpp
0950b4bd5b300708f352182de1e4a844ecff5e45 20-Nov-2010 James Dong <jdong@google.com> Fixed an issue in SampleTable where the table index was incorrectly wrapped around to -1

bug - 3198642

Change-Id: Ia0544172502fc771f48fce22d5c1db19ac3554bb
ibstagefright/SampleTable.cpp
86e735375eb4f681ec8501e12df4730397b4331c 20-Nov-2010 James Dong <jdong@google.com> Merge "Fixed MediaPlayer unit test issues"
621b41c7447fdcf312e805d05973051e707333ab 20-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp

* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2':
StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
f360acf8759d5eedc2b4110c721c8d1a3262470c 19-Nov-2010 James Dong <jdong@google.com> Fixed MediaPlayer unit test issues

o We used to have two different "idle" state with OpenCore.
Now, with SF, we have a single and consistent "idle" state.

bug - 3198642

Change-Id: I2bbb5e8b6c2d8166841a6e99a1c2c4a47e00b574
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetCurrentPositionStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetDurationStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerPauseStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSeekToStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetAudioStreamTypeStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStopStateUnitTest.java
04d070f2937ae4dd72d9d87407b9abf7f664660e 20-Nov-2010 James Dong <jdong@google.com> Merge "Removed uncessary FILE structure pointer for I/O"
716f60ce605131429dc9efe8f351f0da0c8cc8c2 20-Nov-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp

Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
d48124e0fe511265024a61abee67d8ed6ac61592 20-Nov-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 3157123."
f3d6dd0782e3135885efdc26cb86cf0bf811749f 18-Nov-2010 Eric Laurent <elaurent@google.com> Fix issue 3157123.

Use a Mutex wherever atomic operations were used in AudioTrack,
AudioRecord, AudioFlinger and AudioEffect classes.

Change-Id: I6f55b2cabdcd93d64ef19446735b8f33720f8dbc
ni/soundpool/SoundPool.h
ibmedia/AudioEffect.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
c2b18f28e05a06c633393c8c98a60e9ebb46da5d 19-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "CameraBrowser: temporarily move to system partition"
af8632ccb450ee02800840b3dd90ffc6d58a70b6 19-Nov-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: temporarily move to system partition

Change-Id: Ied871109f98bdeba7456aacefc537d70a81ee8c9
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/Android.mk
04ee03d593f9367dad11410bfabc67132a71b0d1 19-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "CameraBrowser improvements:"
1d5dedc9e44fdccf0636cedac90529c0c5f6e166 19-Nov-2010 Mike Lockwood <lockwood@android.com> CameraBrowser improvements:

Replace menu for importing and deleting files with buttons.

Automatically close activities when camera is disconnected.

Change-Id: I88351e7c337c796057ce3f7da46fc287305f2220
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/res/layout/object_info.xml
ests/CameraBrowser/res/menu/object_menu.xml
ests/CameraBrowser/res/values/strings.xml
ests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
ests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java
76151f250539586ae6aadf956b949894467b785f 19-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "PTP: Fix permissions problems with files imported via PTP"
929b3da2fcf061219a82dcced85ffa186c742cc4 19-Nov-2010 Mike Lockwood <lockwood@android.com> PTP: Fix permissions problems with files imported via PTP

Change-Id: I630a89c67e5b3d6d0c29e6c257f84e1909fa4de2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpClient.cpp
tp/MtpDevice.cpp
tp/MtpDevice.h
2747e0e07ff7ec2ba808298e8d96536d72d211cb 19-Nov-2010 James Dong <jdong@google.com> Removed uncessary FILE structure pointer for I/O

o also move the fd owner from caller to callee in the Writers

Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/FileSource.cpp
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/rtsp/ARTPWriter.cpp
978ba938421f4e0e73d7c608d6ecbafa4368eb1d 19-Nov-2010 Andreas Huber <andih@google.com> Merge "Fix an artifact of going from off_t to off64_t"
f69f356ebaf33aa150817c44ee2bd781f24e4e71 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"

* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
ec99f45fc54fe1988598a51b58521fd2145d14a9 19-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "Remove command line mtp host tool"
783f68398b42896666e844eee9eff18e6484918f 19-Nov-2010 Andreas Huber <andih@google.com> Fix an artifact of going from off_t to off64_t

Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
ibstagefright/NuCachedSource2.cpp
61c79b6df97d88c88ee0852d05dcfde43fdb8a6e 19-Nov-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 610ed879d57785cb0457f7f127889496d325f732
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 09:28:52 2010 -0800

HTTP header keys are to be treated case insensitive.

Change-Id: I9690880528a6b0f611958de7996c2753948a03c3

commit 554a2499a293d8d53907d01d972a9cfe9b92738e
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 19 09:22:45 2010 -0800

Remove one more legacy "string" implementation.

Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b

Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
ibstagefright/Android.mk
ibstagefright/HTTPStream.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/ShoutcastSource.cpp
ibstagefright/include/HTTPStream.h
ibstagefright/include/stagefright_string.h
ibstagefright/string.cpp
49fd5d99571b825bdb0c1a7a31b163872094d53d 19-Nov-2010 Mike Lockwood <lockwood@android.com> Remove command line mtp host tool

I don't need this any more, and don't have time to finish nor maintain it.

Change-Id: I35c5d003e1ad163d429832eb1d0c8d880058c7f1
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/mtp/Android.mk
ests/mtp/MtpFile.cpp
ests/mtp/MtpFile.h
ests/mtp/mtp.cpp
954c267725d64a37655d6f3a00de6a5aa00ddaf8 19-Nov-2010 Mike Lockwood <lockwood@android.com> PTP: Improve performance and reliability of file importing

Now the file copy is done completely within the media process
rather than pushing data to the client via ContProvider.openFile().

File system writes are now interleaved with USB reads, which allows us
to copy the data faster and prevents the camera from timing out during transfer.

File is automatically inserted in the media provider after a successful import
and a Uri is returned to the client.

BUG: 2994234

Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ava/android/media/MtpCursor.java
ni/android_media_MtpClient.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDevice.cpp
tp/MtpDevice.h
ests/CameraBrowser/AndroidManifest.xml
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
ests/mtp/mtp.cpp
dc1a26eb7870cfafe4774d0db4613025c427db23 06-Nov-2010 Hiroshi Takekawa <sian@big.or.jp> StagefrightMediaScanner: Call endFile() for MIDI and OGG files.

addStringTag() caches non-ascii metadata strings for later
processing, and then endFile() will be called at the end of
processFile() to convert non-ascii strings from locale's charset
to utf-8 if required.

Stagefright's processFile() failed to call endFile() when the
processing file is a MIDI file or an OGG file. This patch fixes
this problem to populate metadata correctly.

Reviewed by: Brad Fitzpatrick, Marco Nelissen.

Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
ibstagefright/StagefrightMediaScanner.cpp
71d4ecb185bbe9e699aa85c65c98427a67a3fb12 19-Nov-2010 James Dong <jdong@google.com> Merge "64-bit file size/offset support for media framework"
b9401d9010b67342df9129f4126045c3c50a3d79 19-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "AudioTrack getTimelineDuration clarification."
b04c150314bdb4a04f9aebe0ad5b06b685f78e3b 18-Nov-2010 Jamie Gennis <jgennis@google.com> Set the external display usage bit in Stagefright.

Change-Id: Ie18fa773fdb83508d96300dd7e4e4c7c3cdc4540
ibstagefright/OMXCodec.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
a0dfa2cdd8c84db4732c9ac8344c5e8d1480bc1f 18-Nov-2010 Gil Dobjanschi <virgild@google.com> AudioTrack getTimelineDuration clarification.

Change-Id: I276316e851918df227b7246766916fa8572f1b89
ava/android/media/videoeditor/AudioTrack.java
23c430ca7534671d187049ab5fd9a69700d7cb81 18-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Added IOException to WaveformData constructor"
b1fcb2abd3ec1847208cef048b06ff5be65add3a 18-Nov-2010 Gil Dobjanschi <virgild@google.com> Added IOException to WaveformData constructor

Change-Id: Ic00b582beaa2701ffa72e99194693fd7cfa45a6d
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/TransitionAlpha.java
ava/android/media/videoeditor/WaveformData.java
b1262a8b1dd23abad64465f9ffd25c44facdf4d2 16-Nov-2010 James Dong <jdong@google.com> 64-bit file size/offset support for media framework

Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
ibstagefright/AMRExtractor.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/FileSource.cpp
ibstagefright/JPEGSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/ThrottledSource.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/XINGSeeker.cpp
ibstagefright/httplive/LiveSource.cpp
ibstagefright/id3/ID3.cpp
ibstagefright/include/LiveSource.h
ibstagefright/include/MP3Extractor.h
ibstagefright/include/MP3Seeker.h
ibstagefright/include/MPEG2TSExtractor.h
ibstagefright/include/MPEG4Extractor.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/NuHTTPDataSource.h
ibstagefright/include/SampleIterator.h
ibstagefright/include/SampleTable.h
ibstagefright/include/ThrottledSource.h
ibstagefright/include/VBRISeeker.h
ibstagefright/include/WAVExtractor.h
ibstagefright/include/XINGSeeker.h
ibstagefright/matroska/MatroskaExtractor.cpp
ests/omxjpegdecoder/StreamSource.cpp
ests/omxjpegdecoder/StreamSource.h
6ac2cb2c5292df82c72ee23e29bbff1e63aca37a 18-Nov-2010 Andreas Huber <andih@google.com> Log H.264 profile/level in OMXCodec

Change-Id: I5bf98e1ace701b543234dd9dae1315037ff363c2
ibstagefright/OMXCodec.cpp
83ed1ae073556f4971bf8f3a5cbcd2d37e1dd2bb 18-Nov-2010 Andreas Huber <andih@google.com> Merge "Support for "chunked" HTTP transfer encoding."
ced153a22ea872b5455064809c1bc3f4c58b6266 18-Nov-2010 James Dong <jdong@google.com> Merge "Fix an issue wherre error notification will not be sent after mediaplayer reset"
9d20276032912cfcf71cc49998dcd0ee5e21583a 18-Nov-2010 Andreas Huber <andih@google.com> Support for "chunked" HTTP transfer encoding.

Change-Id: I2f20d2d9ec0fa0c840b429049b0385289a30e774
related-to-bug: 3205131
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/LiveSource.cpp
ibstagefright/include/HTTPStream.h
ibstagefright/include/NuHTTPDataSource.h
c5bba6cc70f567a3e9b59b1051a2e09614f1d69b 18-Nov-2010 James Dong <jdong@google.com> Fix an issue wherre error notification will not be sent after mediaplayer reset

bug - 3198642

Change-Id: Ieab13e12af9fdd0ad0873c522885e1350e7cd24c
ibmedia/mediaplayer.cpp
3d1c5a27884ef01772b187ff250daadb7678572e 18-Nov-2010 Gloria Wang <gwang@google.com> Merge "Add getUri() for streaming"
43cd12dae2bbfd128e58a836f2627907d5a92381 10-Nov-2010 Gloria Wang <gwang@google.com> Add getUri() for streaming

Change-Id: I56e15e67cc5f4d0f41c9e2985404a4d89d757e7e
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/NuHTTPDataSource.h
91823e3b25a135a23fdea8bea3d835660b2f3479 18-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Disable ducking by default. Changed ducking threshold parameter range."
ffd0eb0f1106b0229694a1a86ce7d6356efcf50d 17-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 3183484 unhide MediaRecorder.AudioSource.VOICE_COMMUNICATION

Change-Id: I26cd88b1bb05de546415b1f92fbb9430e63b4eab
ava/android/media/MediaRecorder.java
0f76d9b1c2d93a19b436dcbfef9fc46a2712d195 18-Nov-2010 Gil Dobjanschi <virgild@google.com> Disable ducking by default. Changed ducking threshold parameter range.

Change-Id: I66a73b270466ced2ace9e3b10f82cfab1a1306bb
ava/android/media/videoeditor/AudioTrack.java
b61d530575fbc278419435e7333f7eed8a4ae67b 18-Nov-2010 Matthias Bady <aegirxx@googlemail.com> build failed with g++ v. 4.4.5
err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’
strrchr provides two prototypes. the one used returns const char* instead of char*

Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
ibstagefright/MediaExtractor.cpp
413577d8600413bb1dca3730d4ccf20892b929b4 16-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Fixes to allow file transfers > 4 gigabytes

BUG: 3198248

Change-Id: I6f11c79a19d7bdd63718a7370939124b1262d221
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpServer.cpp
558cf799293df19aab99b30d5a1579b989e0465a 17-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Set correct format for abstract audio playlists"
0b58c19840c577c8d8fd8aa5315676d61b78ba0f 17-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Set correct format for abstract audio playlists

Fixes a bad interaction with the media scanner that could result in
playlists getting duplicated or deleted after rebooting.

BUG: 3175649

Change-Id: I970234e86b24ac17d069aca085683d988abc7881
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
tp/MtpServer.cpp
05b07fd204cc9cc340dc579db17008bf9e8161fd 17-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add new audio mode for audio communications other than telelphony."
66b8994ed2523d1e71bddd2770de33fcd2fec254 17-Nov-2010 Andreas Huber <andih@google.com> Merge "Support post-decode video rotation."
940c866c992f122be7aeb92a1b314d7df437d4e2 17-Nov-2010 Andreas Huber <andih@google.com> Support post-decode video rotation.

Change-Id: I9ac90871269c5e132e98a9bf3ad8cae00f329f17
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/MPEG4Extractor.h
ibstagefright/include/SoftwareRenderer.h
3ee66f7b34b6216efb84ca6cb1cce63079561b99 17-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Invalidate transitions when the start time or duration of an effect or overlay changes."
c23dabfb20f1059f42b1fb80956ccc77c72e39e0 16-Nov-2010 Andreas Huber <andih@google.com> Remove all traces of legacy renderer support in stagefright.

Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
ibmedia/IMediaPlayer.cpp
ibmedia/IOMX.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/TestPlayerStub.h
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/OMX.h
ibstagefright/include/SoftwareRenderer.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXRenderer.h
ests/players/invoke_mock_media_player.cpp
f1d8f2a140bf5c03c8e3b0a4baab8a3a68fb9f1d 16-Nov-2010 Gil Dobjanschi <virgild@google.com> Invalidate transitions when the start time or duration of an effect or overlay changes.

Change-Id: Ibc4d80e92ff46b4ecabed5b998f5b0f2c9ca3473
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Overlay.java
ava/android/media/videoeditor/WaveformData.java
af376a5427424a560a0d1a5924c527715762672a 16-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Always use mime type provided to the media scanner"
8c7cb61cff38580b9f38da9f8b70305afe83b3ed 16-Nov-2010 Andreas Huber <andih@google.com> Make sure live streamed http live content does not start playing from the very beginning.

The different bandwidth streams may not all start on the same seqnum, so switching bandwidths may fail lateron if we start playing from the very beginning.

Change-Id: I03df8d1f44b3f7b4713d381a3d97847997e3ee59
related-to-bug: 2368598
ibstagefright/httplive/LiveSource.cpp
8f677d66d9c3ba34c97e69b2bb9e161f129af0ee 15-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> Add new audio mode for audio communications other than telelphony.

The audio mode MODE_IN_CALL signals the system the device a phone
call is currently underway. There was no way for audio video
chat or VoIP applications to signal a call is underway, but not
using the telephony resources. This change introduces a new mode
to address this. Changes in other parts of the system (java
and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
state variable directly, but to use two new convenience methods,
isInCall() and isStateInCall(int) instead.

Change-Id: Id744cd26520ea1d1a4795eabe6a1f0c58789af76
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
858caeaaa1db4076565e6df06b2b2721ec453c4e 16-Nov-2010 Mike Lockwood <lockwood@android.com> MediaScanner: Always use mime type provided to the media scanner

BUG: 3179926

Change-Id: Ib94aea43b83658e3ab31c5eacf7a5135cd14822a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
36663b2f6cb0c40f09f1d65fd77694c9f7f05a45 15-Nov-2010 James Dong <jdong@google.com> Add initial stereo capture support for AAC encoder

Change-Id: I1b9335f036ff42d958d0b32f25359b21733f96d4
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/include/AACEncoder.h
7dcf95af0572cefcb00341265bb9c3a8b833f82e 16-Nov-2010 Andreas Huber <andih@google.com> Merge "Proper support for variable NALsize lengths of AVC content in .mkv files."
0f624584347a1b2d1b1c1e7d013b8c8aa73fa32c 16-Nov-2010 Andreas Huber <andih@google.com> Proper support for variable NALsize lengths of AVC content in .mkv files.

Change-Id: If60cc80998b3231b6aaedc39fc3f5a94f84a5929
related-to-bug: 3197442
ibstagefright/matroska/MatroskaExtractor.cpp
df7a856d3d7a62049e3d1091cf07e95019da4609 15-Nov-2010 James Dong <jdong@google.com> Fixed a race condition where some recording frames may not be released.

When startRecording() is called before setListener(), recording frames
are sent right after startRecording(), but there is no listener to
release the recording frames. This causes the hang in media server.

bug - 3166356

Change-Id: I19366ca682ef9f6b847590c190c30a15ed32b8e4
ibstagefright/CameraSource.cpp
160b977c81ce1b3edc7c310a661c31e3d5183768 15-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList"
3159991e586f9e243f60d65a9554828328b00521 15-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList

Change-Id: If9bb8b4b19ed6c8d57736e5d1af948fcc946af0e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
645336a7427afc2613df4648d7c4159ab2ec4b0e 15-Nov-2010 Andreas Huber <andih@google.com> Merge "More HTTP live support, AES encryption etc."
d98f49b014c98d1f64905aa6f5a02de45e236bbf 15-Nov-2010 Andreas Huber <andih@google.com> Merge "Refactor h.264 profile/level support into avc_utils."
ffd998e744abc79b765b555df68d6f286e4ec8ea 15-Nov-2010 Andreas Huber <andih@google.com> Merge "Provide bandwidth estimation support in NuHTTPDataSource"
81a602958ffc78d591700229e19acd653b7dd4de 15-Nov-2010 Andreas Huber <andih@google.com> Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."
93248f8160b437428c330e754cfbc9a4acfff5f7 15-Nov-2010 James Dong <jdong@google.com> Merge "Remove legacy PV stuff"
2381a8a91b94554d5e9e8b03125e05e20487d8ae 15-Nov-2010 Andreas Huber <andih@google.com> Provide bandwidth estimation support in NuHTTPDataSource

Change-Id: Ic98d8cf147bbba60ec735e7ca200addb2bd09f29
related-to-bug: 2368598
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/NuHTTPDataSource.h
6a1f5f90e40bbbb0635af9bf0addace723dccb77 15-Nov-2010 Andreas Huber <andih@google.com> More HTTP live support, AES encryption etc.

Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c
related-to-bug: 2368598
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/httplive/Android.mk
ibstagefright/httplive/LiveSource.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/include/LiveSource.h
ibstagefright/include/M3UParser.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ESQueue.cpp
f7e2e31f7a12335c11906b63198e9c64ff0cc25a 15-Nov-2010 Andreas Huber <andih@google.com> Refactor h.264 profile/level support into avc_utils.

Change-Id: Idb33636dc723aa79ea0122dc3582109ada4b1358
related-to-bug: 2368598
ibstagefright/OMXCodec.cpp
ibstagefright/avc_utils.cpp
ibstagefright/include/avc_utils.h
5dffd0e3af502acdc2e45425139ef8081fa4f0a8 15-Nov-2010 Andreas Huber <andih@google.com> Add http live mime types to MediaFile, add support for playlist mime types to browser.

Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f
related-to-bug: 2368598
ava/android/media/MediaFile.java
e2ad6ec1718ef0c0e8230f8f62e7cfefcf598b6a 15-Oct-2010 Mike Lockwood <lockwood@google.com> MTP: Partial implementation of the GetObjectPropList command

In this initial implementation we only support fetching one property at a time.
Support depth = 0 (single object) or depth = 1 (all objects in a directory)
Reimplemented GetObjectPropValue on top of GetObjectPropList, since the former
is a special case of the latter.

Change-Id: Ia76ee61741d6ee3902b5c5d9fc094cf86dfaf650
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/MtpConstants.java
ava/android/media/MtpDatabase.java
ava/android/media/MtpPropertyList.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpDebug.cpp
tp/MtpProperty.cpp
tp/MtpServer.cpp
tp/MtpServer.h
tp/mtp.h
44d47ad56502a1ccb308a9ec2cd05120a53fac3d 15-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Add support for importing file based playlists copied over MTP"
8ec2d9add9f25198b9ea7023c7c772ae17f72ea4 11-Nov-2010 James Dong <jdong@google.com> Remove legacy PV stuff

Change-Id: I60ffea7c65592df4b3a80c590c863f1f79b371fd
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
98d50a0be8a61fa1d093136b57bc5712be795c2b 15-Nov-2010 James Dong <jdong@google.com> Merge "Disable flaky streaming server check"
2fd4e5935c4d1760e846a7c98642ec0d348680a3 14-Nov-2010 James Dong <jdong@google.com> Fix a typo in LOG_TAG for MediaPlayer unit tests

Change-Id: I351f32fe4b4da82c32acf5c9e5ebdb81bb003525
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStateUnitTestTemplate.java
a76e7efde89424712ab2bddba2f8dc1472c2f203 14-Nov-2010 James Dong <jdong@google.com> Disable flaky streaming server check

o Although the streaming server is available, the check fails most of the time.

Change-Id: I1084e715605541c4fc3d40e4055db90ddb118b6f
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
bbced1b9e9b63e438322cf86f06b11680486eec0 13-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Transition invalidation bug fix."
a9d02bf6020e195acc18b16508c62f8be20dc207 13-Nov-2010 James Dong <jdong@google.com> Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h"
75159247d81943ba99935fe02c38383c7c380304 13-Nov-2010 Gil Dobjanschi <virgild@google.com> Transition invalidation bug fix.

Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
ava/android/media/videoeditor/MediaImageItem.java
caf7e43a40245520fc26b19bce408da24c050e01 13-Nov-2010 Mike Lockwood <lockwood@android.com> MediaScanner: Add support for importing file based playlists copied over MTP

Change-Id: I53a9f204297ff29d4df994d2174bd6d6288f2c97
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
1a22bdb01ac4068c2876fe2d02f3c4c729669a1c 09-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> Add support for audio recording source in generic audio policy mgr.

Update the platform-independent audio policy manager to pass the
nature of the audio recording source to the audio policy client
interface through the AudioPolicyClientInterface::setParameters()
method.

Change-Id: I6b4fd0f8a3acea0d7d30bbad98edd1977dc012bf
ibmedia/AudioSystem.cpp
aac193cf38ac084eea0f6367b98f6304d1ec38f2 11-Nov-2010 James Dong <jdong@google.com> Separate the key for audio sampling rate and video frame rate in MetaData.h

Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/CameraSource.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
0bf307524157a355667e1c05fbac864dc117af81 12-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Invalidate transitions when an image media item duration changes."
3de594d3709994824ba8c3b4c9e81a8ce6582eb0 12-Nov-2010 Andreas Huber <andih@google.com> Increase the prefetcher's low water mark so it restarts fetching data earlier.

720p high bitrate content pretty much requires this.

Change-Id: I2cb29d1fa2e3c511f1b88a106a02c53c68a10f2f
ibstagefright/include/NuCachedSource2.h
dcdb6d001da4cbfa15ccd365c0bbd2a97ae65a1b 12-Nov-2010 Andreas Huber <andih@google.com> Merge "Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun."
10b920cd99a0c3eff54768d9798504a022cce4db 12-Nov-2010 Andreas Huber <andih@google.com> Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun.

Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3

Conflicts:

media/libstagefright/AwesomePlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/NuCachedSource2.h
d781089731127bd9199d47f53b170895868b8750 11-Nov-2010 James Dong <jdong@google.com> Add color format query support to QueryCodecs()

Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
ibstagefright/OMXCodec.cpp
798a9d2eb1d2421f904ab61f05e4b70a5095d31a 11-Nov-2010 James Dong <jdong@google.com> Merge "Fix memory leak when 0-memcpy quirk is used"
5c7d5ae094ab90f1d0f0b1d3dbc5696bea87749e 11-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MediaFile: Recognize MPG file extension as MPEG video"
28d1a4aaf3c338f42d7b71d4653be707f06948a6 11-Nov-2010 Mike Lockwood <lockwood@android.com> MediaFile: Recognize MPG file extension as MPEG video

Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
34fad156999e69f8700ba2a693805ec83ebebcb6 11-Nov-2010 Gil Dobjanschi <virgild@google.com> Invalidate transitions when an image media item duration changes.

Change-Id: I3cff920ef629df49dcfcb63065afeeb47a649287
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
31b9375f45e19c1408f45af497286b795604c9ec 11-Nov-2010 James Dong <jdong@google.com> Fix memory leak when 0-memcpy quirk is used

o minor change to the original patch by Andreas:
call restorePatchedDataPointer() method only if kAvoidMemcopyInputRecordingFrames is turned on

Change-Id: Idf3710e6f759d37d28e866613f98d39215722cb9
ibstagefright/OMXCodec.cpp
0fbb7a601f68de469455ebcf423fff7f2aa49198 11-Nov-2010 James Dong <jdong@google.com> Merge "Fix testWAVSeekToEnd() testcase"
f0c3a99cee063a3e4e71f6b5c9a6505682cd7add 11-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Add missing call to closedir() in recursive delete code"
a108b2fdc1abf755f7685fd4cde157bb02163325 11-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Add missing call to closedir() in recursive delete code

BUG: 3185660

Change-Id: I3744d2cb193829d20a689af2aea50e8516779631
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
c5d4730ed1d7598a6c4f2b92efbafa2989b56670 11-Nov-2010 James Dong <jdong@google.com> Fix testWAVSeekToEnd() testcase

The testcase does not depend on the availability of WMV decoder

Change-Id: I983f6d5954242a28fb9818fa03447b4afe7ad3d1
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
a71f52bf32b77b1a342f8b6f7da8739a6da51e5b 10-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Close the file input stream if the XML file parsing fails."
d1970b8c6ebdf9e51fdfe8b43f5908b6c535d6c9 10-Nov-2010 James Dong <jdong@google.com> Merge "Fix uninitialized variable"
5d0b783c4448eca7515bfadd82d995acc0ab3d50 10-Nov-2010 James Dong <jdong@google.com> Fix uninitialized variable

o This was missed while the rotation patch was hand merged.

Change-Id: I4016f9fb9cd54c5e853da15bbaaa50b1d1dac8c8
ibmediaplayerservice/StagefrightRecorder.cpp
f1094227f8efc04351b25d7095c36c6a4d8d033c 10-Nov-2010 Mike Lockwood <lockwood@android.com> Merge changes I49b383d3,I70809401

* changes:
MTP: Don't dump data packets twice in debug output.
Add support for range and enum forms in MTP ObjectPropDescs
83cff86dcd5b137fd21f765f35736cf313a89ae1 10-Nov-2010 Mike Lockwood <lockwood@android.com> MTP: Don't dump data packets twice in debug output.

Change-Id: I49b383d39aea101a58ae6902952ba91b44e7dc3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDataPacket.cpp
tp/MtpDebug.cpp
4a65e281fa0390a0c58d0e37eea9c756a7bbb3fd 10-Nov-2010 Mike Lockwood <lockwood@android.com> Add support for range and enum forms in MTP ObjectPropDescs

Change-Id: I70809401e37a1cfb82f5dbf86947be7d9500ccf1
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpProperty.cpp
tp/MtpProperty.h
1fbeece669ac2ee1eec7dc45dc5a2a1bd5c36574 10-Nov-2010 Gil Dobjanschi <virgild@google.com> Close the file input stream if the XML file parsing fails.

Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
ava/android/media/videoeditor/VideoEditorTestImpl.java
c32474d90afa4396d202c2430710e0d6b694a878 10-Nov-2010 James Dong <jdong@google.com> Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder"
0244d94455236abd1c07e62f0e6cbbff37bf2c8c 10-Nov-2010 James Dong <jdong@google.com> Fix missing breaks in the profile/level conversion code in M4vH263 encoder

Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
40e8dc171f07c1d7e0f68ccf6af9313522d0520d 09-Nov-2010 Andreas Huber <andih@google.com> Merge "Some refactoring and added support for another form of vbr headers."
1bd9949815b93b5a741c0f2533bf50d32542dbe5 09-Nov-2010 Andreas Huber <andih@google.com> Some refactoring and added support for another form of vbr headers.

related-to-bug: 3172324

Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
ibstagefright/Android.mk
ibstagefright/MP3Extractor.cpp
ibstagefright/VBRISeeker.cpp
ibstagefright/XINGSeeker.cpp
ibstagefright/include/MP3Extractor.h
ibstagefright/include/MP3Seeker.h
ibstagefright/include/VBRISeeker.h
ibstagefright/include/XINGSeeker.h
820b9e0d3b6f94fe0b524aebf756ce25df273e6a 09-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> Add recording source for voice communication

Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
ava/android/media/MediaRecorder.java
b9d7e01eb8f2024ed2051e18644401d43fdb9311 09-Nov-2010 James Dong <jdong@google.com> Rotation support

- We only support 0, 90, 180, and 270 degree clockwise rotation

- Some players are known to ignore composition matrix in the MP4 file,
although this is part of the MP4 file standard.
Both QT and YT are supporting the rotation

The original patch (65a73f4e8c79d05c0d9001b660325748d4ecf37b) was not merged.
The only change I made is to reuse the same kKeyRotation in MetaData.h;
and thus do not neeed to use kKeyRotationDegree.

Change-Id: Ib328716d4842201c4adf57e4ddfe1f1ac1ae4d8a
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/MPEG4Writer.cpp
482083c57fc21516099d4f9987512f649e362960 09-Nov-2010 Wu-cheng Li <wuchengli@google.com> am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do not merge

* commit 'f6bd761f9407a35cc1c4a4b9e199e6a0dc8e4943':
Use back-facing camera as default in camera/camcorder profile.do not merge
5680635f39b3098539cbfd120f95fdc4479bab0f 09-Nov-2010 Wu-cheng Li <wuchengli@google.com> Use back-facing camera as default in camera/camcorder profile.

bug:3173302
Change-Id: Iae9565eb58949a1c9c2f2a1f5251b2df097ec167
ava/android/media/CamcorderProfile.java
ava/android/media/CameraProfile.java
f6bd761f9407a35cc1c4a4b9e199e6a0dc8e4943 09-Nov-2010 Wu-cheng Li <wuchengli@google.com> Use back-facing camera as default in camera/camcorder profile.do not merge

bug:3173302
Change-Id: I11eaed32bb393206b560834d52c412f3e5a1a7d9
ava/android/media/CamcorderProfile.java
ava/android/media/CameraProfile.java
d1604c731330a74d1c8f160f045246a10e675899 09-Nov-2010 James Dong <jdong@google.com> am 9cebb86c: am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread

* commit '9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b':
Update a comment about when setOrientationHint() should be called
9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b 09-Nov-2010 James Dong <jdong@google.com> am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread

* commit '1b2efbca7120cf799d1242d277af354df7b0a9bb':
Update a comment about when setOrientationHint() should be called
1b2efbca7120cf799d1242d277af354df7b0a9bb 09-Nov-2010 James Dong <jdong@google.com> Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
d1959717c28766d4a7fecedd703a79e17c532da8 09-Nov-2010 James Dong <jdong@google.com> am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread

* commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84':
Support extracting thumbnail from rotated video tracks
8346ad0a8f20aa65082af569ac09723db989ad8b 09-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Fix invalidateTransition method"
549a65b5a40e6377e2311ba5efb09ae4c94092f0 09-Nov-2010 Gil Dobjanschi <virgild@google.com> Fix invalidateTransition method

Change-Id: I12d5b7256d2956007b65c8304053717dd7b9b7ef
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Overlay.java
ava/android/media/videoeditor/OverlayFrame.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
c4a2ead2aa5ab4403553e4956ba71b44782f0c84 09-Nov-2010 James Dong <jdong@google.com> am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread

* commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e':
Support extracting thumbnail from rotated video tracks
53ebc72fd83f83bb5536d5917390aae03b7f5cad 09-Nov-2010 James Dong <jdong@google.com> Support extracting thumbnail from rotated video tracks

Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
ni/android_media_MediaMetadataRetriever.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
2e1a8967243a88d73f3b3485b07a02aa4f8d16d9 08-Nov-2010 Andreas Huber <andih@google.com> resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp

Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
51387974f0914a12dcf758938bbd4ffe120bdab4 08-Nov-2010 Joe Onorato <joeo@google.com> Merge "Move the volume, media, call, camera and search key handling from PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors."
5aa95dd36cd0708d25accd8d745ae8ebc255758f 08-Nov-2010 James Dong <jdong@google.com> Update a comment about when setOrientationHint() should be called

Change-Id: I389089390a552ee7a86823c050048dcec0a0eb2a
ava/android/media/MediaRecorder.java
76f15bcb8bd37085bb5494633976e81d1087fb4e 08-Nov-2010 Wu-cheng Li <wuchengli@google.com> Do not use CAMERA_ID_DEFAULT because it is removed.

bug:3173302
Change-Id: I360e55f2665b2e121c8cf017e17c4cb4dd181e88
ava/android/media/CamcorderProfile.java
08caf9e84f730837999e26753cb87f2aea0500c5 07-Nov-2010 James Dong <jdong@google.com> am bb97d7bb: am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread

* commit 'bb97d7bbf33393af842de1d8fd8512a24c73b6b3':
Add a new public API to support recording rotated videos
d8166a719e192a026bf25a82b8eb6212823950a3 06-Nov-2010 James Dong <jdong@google.com> am 1653e261: Merge "Rotation support" into gingerbread

* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
Rotation support
bb97d7bbf33393af842de1d8fd8512a24c73b6b3 06-Nov-2010 James Dong <jdong@google.com> am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread

* commit '0467b0abfc94f959163d84eadedf6941e41c1882':
Add a new public API to support recording rotated videos
a726e12fb71705f8629a1b0041821db15b1b95fc 06-Nov-2010 Owen Lin <owenlin@android.com> Merge "Add more EXIF tags."
86f6786032b1a0380cf089aeeceef7e9d8982ef8 06-Nov-2010 Joe Onorato <joeo@google.com> Move the volume, media, call, camera and search key handling from
PhoneWindow to a new PhoneFallbackEventHandler class that is used
for all windows, not just ones with decors.

Bug: 3155146
Change-Id: Ib070fa3e523e3564b225bca576c08012fef4f416
ava/android/media/AudioManager.java
d141305f93364810b4e2324fe41285b65a6b6c82 06-Nov-2010 Gil Dobjanschi <virgild@google.com> Fix: FileInputStream not closed after parsing XML file

Change-Id: I8ea69738d5ba1e91c9c759f76c49a8a324c24b88
ava/android/media/videoeditor/VideoEditorTestImpl.java
c7481cd56f2fdcf713bc6fa9a82810345e88f63e 06-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Added an export method without codec parameters."
31dc911aee2b50752c0eb7785176075cdaed139c 04-Nov-2010 Andreas Huber <andih@google.com> Support post-decode video rotation.

Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
ibmedia/IOMX.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/MPEG4Extractor.h
ibstagefright/include/OMX.h
ibstagefright/include/SoftwareRenderer.h
ibstagefright/omx/OMX.cpp
1653e261e84922facfe27d3d8acc455ed2b6b6da 06-Nov-2010 James Dong <jdong@google.com> Merge "Rotation support" into gingerbread
ad8f19c6b3167cadc90a35f4d795b07aa2f04ffa 05-Nov-2010 James Dong <jdong@google.com> Add a new public API to support recording rotated videos

o changed a comment about the rotation orientation from counter-clockwise
to clockwise.

Change-Id: I16ad73ce1a55cc627d9a516e23d1325753b3037e
ava/android/media/MediaRecorder.java
65a73f4e8c79d05c0d9001b660325748d4ecf37b 17-Aug-2010 James Dong <jdong@google.com> Rotation support

- We only support 0, 90, 180, and 270 degree clockwise rotation

- Some players are known to ignore composition matrix in the MP4 file,
although this is part of the MP4 file standard.
Both QT and YT are supporting the rotation

Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/MPEG4Writer.cpp
1a9be66e126c8a945b265f1c7540b8d935fba4ca 05-Nov-2010 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Fix mismatch between internal and external file paths."
250528e5b2362cb7b6749afb331acd8226f67744 05-Nov-2010 Mike Lockwood <lockwood@android.com> MediaScanner: Fix mismatch between internal and external file paths.

Change-Id: If2fac90a466c4d63fc90f96e91733c9e9ca14680
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
c006e8ef64bbfd47a9ecd4cfd708362e40b0d337 05-Nov-2010 Gil Dobjanschi <virgild@google.com> Added an export method without codec parameters.

Change-Id: If0a1c34f2266c441cd16c46da5c07ab1a509314b
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
32af3a2f56203acc66c8051e20c99a3914d1cec9 05-Nov-2010 James Dong <jdong@google.com> Merge "Use meta data in the media recording framework"
91460d7f49e92e13e2acccdf8be10934e9e770fe 05-Nov-2010 Gloria Wang <gwang@google.com> Merge "Add support for WV DRM"
c2c22e7e20a3b10c180c2fed2bf24aedef8ed269 01-Nov-2010 Gloria Wang <gwang@google.com> Add support for WV DRM

Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/FileSource.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/WVMExtractor.cpp
ibstagefright/include/NuCachedSource2.h
ibstagefright/include/NuHTTPDataSource.h
ibstagefright/include/WVMExtractor.h
ibwvm/Android.mk
4414eb4b2955be9eb62d1ddf379d1a7ae1822887 05-Nov-2010 Ray Chen <raychen@google.com> Add more EXIF tags.

Change-Id: I77a02a6de6bb4c364bb9718f7bed15468a38a279
ava/android/media/ExifInterface.java
05c2fd50d2030e20d6a4cacc6931e453cd2de5c4 02-Nov-2010 James Dong <jdong@google.com> Use meta data in the media recording framework

o This patch allows us to do 720p video recording

Change-Id: I2ea37e80a59630145396b08ebcdc6ee71df53333
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/OMXCodec.cpp
a7ccd130832c2d5d9151236da2b75fa76086bc7b 04-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Added audio and video codec parameters to the export method."
289f08990ca1f0de33c9939a00958739969dff7e 04-Nov-2010 Gil Dobjanschi <virgild@google.com> Added audio and video codec parameters to the export method.

Change-Id: I1badd08ce7148da540bf91df0e19c3da59287756
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
960423d46fa8bf81b62ba8294afe1dbd45e7a143 04-Nov-2010 Jamie Gennis <jgennis@google.com> Merge "Fix a MediaBuffer leak in Stagefright."
c25c28a496012f64da57f5beb3b99f7424abb602 04-Nov-2010 James Dong <jdong@google.com> am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread

* commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
Revert "Support rotation in media recorder"
c80c28801d683dcf37131b024300058d8df58f4a 04-Nov-2010 James Dong <jdong@google.com> Revert "Support rotation in media recorder"

This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
ava/android/media/MediaRecorder.java
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
0ce42c9d315ea6bf0e4f81b14b9e1a38f8979897 04-Nov-2010 Hiroshi Lockheimer <hiroshi@google.com> am c181a082: Merge "Support rotation in media recorder" into gingerbread

* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
Support rotation in media recorder
f1febe470ac30f8992066cb263c10f58493c4c34 04-Nov-2010 James Dong <jdong@google.com> Support rotation in media recorder

o needs to be tested with camera hal and camcorder application

Change-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232
ava/android/media/MediaRecorder.java
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
f0c5c1e8ce765c66d24bc9d00904fd350b99d16a 02-Nov-2010 Jamie Gennis <jgennis@google.com> Fix a MediaBuffer leak in Stagefright.

Change-Id: I548e60b07cf1676476874b156cfbc4ffefdfa2b9
ibstagefright/OMXCodec.cpp
26e37349831476d3225570af2dfbf1e459374c6b 03-Nov-2010 Praveen Bharathi <pbharathi@motorola.com> frameworks/base: switch audio to hdmi when cable is plugged in

Change-Id: I01c4ee968bc0ffbb6ce75370935571cc1ff6f8c7
Signed-off-by: Iliyan Malchev <malchev@google.com>
ava/android/media/AudioService.java
de04e5242ad7d95c392070e1a4f7acdf3809b91a 03-Nov-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Add STATE_AUDIO_CONNECTING state."
fd96799958b86a92187c6698e35c1c75d41c3587 03-Nov-2010 Andreas Huber <andih@google.com> Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."
9f9ae60ace9e16a4fe20652f1a71aedf1c306fb4 27-Oct-2010 Andreas Huber <andih@google.com> Experimentally reenable mpeg4 and h.263 hardware decoders.

Change-Id: I1be266bd4534004a08e8836b48cc6c09ca890ccc
ibstagefright/OMXCodec.cpp
30d181690e48b26cdfae3b144d23f1e16c75da37 01-Nov-2010 Jaikumar Ganesh <jaikumar@google.com> Add STATE_AUDIO_CONNECTING state.

Why is it needed: SCO audio connections can fail.
Currently no indication is given to clients which are waiting
for SCO connections. This was working fine before because
SCO connections where blocking calls, which was wrong in itself.

Change-Id: Ic449b2db8506a7a5ae6be6c68715f1a7343f9e40
ava/android/media/AudioService.java
8f7a0275f22e86c4436df1a64664865c24072c49 03-Nov-2010 Gloria Wang <gwang@google.com> am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit 'cf393faaa871333496a63c13196fdbc0f2bd9118':
- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
a3f5b615d7adc5a644cbedd55100deba562ec0ac 03-Nov-2010 James Dong <jdong@google.com> am f3847e87: Merge "DO NOT MERGE" into gingerbread

* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
DO NOT MERGE
82415bed3478a3a2200386691f05d671b46568f5 03-Nov-2010 Gil Dobjanschi <virgild@google.com> Merge "Use SoftReference for WaveformData"
6786fccf5a7979ca1b6fe4360ef47a9c9bbec9bb 03-Nov-2010 James Dong <jdong@google.com> DO NOT MERGE

Fix premature release of recording frames when physical address or metadata is stored in input video buffers

- bug 3158459

Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
ibstagefright/OMXCodec.cpp
db963e9c64cc88bd912dc92ebace6a62b752c2a4 03-Nov-2010 Gil Dobjanschi <virgild@google.com> Use SoftReference for WaveformData

Change-Id: I801a4eb4f55e0c6244f868bf8b474a2a79d81642
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaVideoItem.java
1f89c4f9f8df5d7125221250993ba1e853ed9fed 03-Nov-2010 Gloria Wang <gwang@google.com> Use SystemProperties.get() instead of System.getProperty()

Change-Id: I92571fa217e6623345bbd84cf87ab939fbe63b0a
ava/android/media/MediaScanner.java
35a4f21bd6c6aa82b88e53798131f0a0ff6976c4 02-Nov-2010 Gloria Wang <gwang@google.com> resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp

Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
e4eb4d9de37a8e9ed6f43a5f7deccf88f28bfc8b 02-Nov-2010 Marco Nelissen <marcone@google.com> In java, System.getProperty returns null when the property doesn't exist,
rather than an empty string like it does in native code.
b/3157546

Change-Id: I7985a405e4d2d1f20be0a151aa2cf2e5a83b380b
ava/android/media/MediaScanner.java
21e941bf43362ddc6639a9f2d0828053360f53d7 06-Oct-2010 Praveen Bharathi <pbharathi@motorola.com> Added support for dock headset observer

Change-Id: I06b2e65e3bfa10735e6c7fd3349afa9ae7d45292
Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
044ace6bde97eb71ca5a5cae12a93c5b101c55f3 30-Oct-2010 Jamie Gennis <jgennis@google.com> Stop using OMX_COLOR_FormatAndroidPrivateStart.

This removes the use (and definition) of the Android-private range of
OMX color formats from Stagefright. Instead we will just be
interpreting the video color format of an OMX port as an Android pixel
format if the port is in native buffer mode.

Change-Id: I3ea50703336a88249e7563bc7022dfedbeac506e
ibstagefright/OMXCodec.cpp
df75f8b319c25a0956656c2c20cf743f8bac9915 02-Nov-2010 Andreas Huber <andih@google.com> Merge "Notify surfaceflinger about (changes to) the crop rectangle output by the decoder."
2b5f9ad1eaf0d6daaca5cf3761434a09309902bb 30-Oct-2010 Mike Lockwood <lockwood@android.com> MTP: Changes to support /mnt/sdcard paths from MediaProvider.

Change-Id: I337f0514c20ed31738c73e1f7ab6fb71cc744057
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
eab18ea34dbd36b3f4e117d51ce5c1ea4b9f4fc4 29-Oct-2010 Gloria Wang <gwang@google.com> - Move the business rule management down to DRM agents.
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
5145d67e7738681af6971748fa77b5eb32ab2302 02-Nov-2010 Andreas Huber <andih@google.com> Notify surfaceflinger about (changes to) the crop rectangle output by the decoder.

Change-Id: I9c33618dd3351be1ecadcc7d0329654ea50bad3f
related-to-bug: 3153626
ibstagefright/OMXCodec.cpp
5d143ad4a8f8c90f44e185a494ff3ff638e6c103 01-Nov-2010 Gloria Wang <gwang@google.com> Media scanner support for FL(Forward Lock) DRM file types

Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
ava/android/media/MediaFile.java
ava/android/media/MediaScanner.java
ibstagefright/StagefrightMediaScanner.cpp
614d22c7f6d5abae8434d2e83f1c7d10c534b43c 30-Oct-2010 Andreas Huber <andih@google.com> After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.

related-to-bug: 3152363
Change-Id: Ia097bf61ca05e01365357cb23ff83e2ad417f3fd
ibstagefright/AwesomePlayer.cpp
67f41771d5c34e6e8568bf906724e137da123c77 01-Nov-2010 Chia-chi Yeh <chiachi@android.com> Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.

Change-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d
ibmedia/Visualizer.cpp
1219ea3b7131b34a17b16a73a441a2d05008c040 30-Oct-2010 James Dong <jdong@google.com> Merge "Added some debugging log messages at stop()"
e7a9c9010369d7672ac379347dc9c4441041fa89 30-Oct-2010 Gloria Wang <gwang@google.com> Merge "- register DRM sniffer only when drmserver is up - notify DRM agents the status after seeking"
3f9a819a9486c7fc77065f8f2c2dfe2417743393 29-Oct-2010 Gloria Wang <gwang@google.com> - register DRM sniffer only when drmserver is up
- notify DRM agents the status after seeking

Change-Id: Id77977fc7548970559dc8974461b0bd1d2aa9514
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
42338ff07f926d86491a235f5d7af88aa01f959b 30-Oct-2010 James Dong <jdong@google.com> Added some debugging log messages at stop()

There are so many cases where the codecs just could not stopped ...

Change-Id: If9ff261fcd4726c2ee21ec7c9336ca9c2917d399
ibstagefright/MPEG4Writer.cpp
69b8d69aadbf0e795f1a1e1adc82c78cf0b9959f 29-Oct-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:59:23 2010 -0700

suspend() and resume() methods on VideoView are back but don't do anything.

They need to be back because they were public before.

Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425

commit 16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:47:05 2010 -0700

Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."

This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25.

Conflicts:

api/current.xml

Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5

commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:16 2010 -0700

Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."

This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f.

commit f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:08 2010 -0700

Revert "Release MediaPlayer if suspend() returns false."

This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268.

commit 441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:40:46 2010 -0700

manually.

Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87

Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
9085a2441dc446bc3c4f3848b8a5100a70b4bf0c 29-Oct-2010 James Dong <jdong@google.com> Merge "Added profile and level translation in SW video encoders"
6e9f6d1e037139d2ef106b03b8f27248764169d8 29-Oct-2010 Andreas Huber <andih@google.com> Merge "Upgrade to the latest version of libwebm to fix YouTube webm playback."
393b2f9b8df9067fafcd346e297d83fd8cbc2106 29-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations."
6ea92ecabbb53a2997eb5835c11945fecc177b91 29-Oct-2010 Gil Dobjanschi <virgild@google.com> Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations.

Change-Id: I5f619807435dc75c285446bfd60327bc1c1ecacd
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Overlay.java
4b844457885853cfa0c1feafe4d9661af5a3b41d 28-Oct-2010 Andreas Huber <andih@google.com> Upgrade to the latest version of libwebm to fix YouTube webm playback.

Change-Id: I6a0f5e1aa07d3af428c314d36f69b119fa8d2d3a
related-to-bug: 3141937
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/mkvparser.cpp
ibstagefright/matroska/mkvparser.hpp
03a4090b4d5965ff01cbb03dcf6d96b30d634fa3 28-Oct-2010 Eric Laurent <elaurent@google.com> Update java doc for visualizer FFT capture.

The java doc for visualizer FFT capture was not describing
correctly the layout of the data returned by getFft() method.

Change-Id: Idec09538490ea73b211db253b1b8b733ca4d4a72
ava/android/media/audiofx/Visualizer.java
af50969f079901e18f9ba3a68a3d3e54e5f26a08 20-Oct-2010 James Dong <jdong@google.com> Added profile and level translation in SW video encoders

Change-Id: I6b9c33c7e4b497f3dc61b2a0dcf4e65727f9bcdd
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
b0d25a00fe28d3153d4c56b24d8e2792230d68be 27-Oct-2010 Andreas Huber <andih@google.com> Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries.

Change-Id: I20e3b86f52b7f0f41663ffe8bc1f4db92280e884
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.h
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ASessionDescription.cpp
30ca240a98becff34c2003ea13475d9f381956b2 27-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Waveform member variables must be private"
6f3c808b4f134eba1dfb57e13853addc351ca76f 27-Oct-2010 Gil Dobjanschi <virgild@google.com> Waveform member variables must be private

Change-Id: I8e61dbe5ad51b455377e39a0918ac82d138d8228
ava/android/media/videoeditor/WaveformData.java
0af3cfc6f3d364c3dd0a8952382ff4b843013d5f 27-Oct-2010 Yu Shan Emily Lau <yslau@google.com> am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
751cc4245ff65a979317827109818e1e127a53dd 27-Oct-2010 Yu Shan Emily Lau <yslau@google.com> am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
8b023a2ea2135cb6abbc8b3638bb9c8c044ccec9 27-Oct-2010 Yu Shan Emily Lau <yslau@google.com> Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
b89a29dd7548fc287e85dc6515566235074d0fec 27-Oct-2010 Marco Nelissen <marcone@google.com> am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread
cd08ada7f1d9601636aaa77084c423dba14a2512 27-Oct-2010 Marco Nelissen <marcone@google.com> am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread
05e148360bede32eff4399a1a437ad0304ec68f1 27-Oct-2010 Andreas Huber <andih@google.com> Merge "Remove annoying warning during mpeg4 extraction."
00c346becfe93125f57a80c979f65d737e7cbd7a 27-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Added waveform data support"
936747d672924d797c1f11c90efbf871f5ab04bb 27-Oct-2010 Andreas Huber <andih@google.com> Merge "FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem."
4545f73530d995860f0c12fbb1fdb722b3e82c18 27-Oct-2010 Gil Dobjanschi <virgild@google.com> Added waveform data support

Change-Id: I28e922e0d6588ffe13da7e814dae61f17446b1e9
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/WaveformData.java
7459b018db9aecea809add574cfa1b5ca72c47dd 27-Oct-2010 Andreas Huber <andih@google.com> FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem.

Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683
ibstagefright/FileSource.cpp
c69b9d3370df38a1cdf8fad43c9a9699e38e066c 27-Oct-2010 Andreas Huber <andih@google.com> Remove annoying warning during mpeg4 extraction.

Change-Id: Iffadeefb43bab6da1299b0a0582d6c6990156c32
related-to-bug: 3093774
ibstagefright/SampleTable.cpp
f514bdc964915e41579602849edc81bac69c68e2 27-Oct-2010 Marco Nelissen <marcone@google.com> Fix off-by-two and other bugs in the visualization code.
b/3137511

Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
ibeffects/visualizer/EffectVisualizer.cpp
883a922fbecc3a1efdee8329794073cc04520bcd 27-Oct-2010 Kristian Monsen <kristianm@google.com> Fix for simulator build break

strrchr returns a const char* in c++ if you give in a const char*

Change-Id: I15ac2ae9e1d41d7737193146c526fcbddccae27c
ibstagefright/MediaExtractor.cpp
c7415b7800d80bcac140da7a635cc05e09724bfb 27-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Removed the start and end transition types."
8aebc966d27081bcd75c3a4eaca05bc575f5fa16 27-Oct-2010 Vasu Nori <vnori@google.com> Merge "add method in MediaFile to determine if a file is a mediatype of not"
a8264dfe5a6f614e77b228edc71053cae7cd2153 27-Oct-2010 Andreas Huber <andih@google.com> am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
e1e82745881d8330341d80e111c50ed3a8eda797 27-Oct-2010 Andreas Huber <andih@google.com> am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
45b43622e329c25c6070a3f2f2fc2ba5a14533bb 27-Oct-2010 Vasu Nori <vnori@google.com> add method in MediaFile to determine if a file is a mediatype of not

this helps DownloadService to avoid invoking MediaScanner on
pdf or other non-mediatype files.

Change-Id: I92514e1a11f5119229c0c7292e410e352a9dbcdd
ava/android/media/MediaFile.java
0a612889b5e49b036dc7f2b75f6b8cc3ca54f89f 27-Oct-2010 Andreas Huber <andih@google.com> Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.

Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
ibstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
93aa00c664ae59c2224853f14d30a6671c467ef0 26-Oct-2010 Yu Shan Emily Lau <yslau@google.com> Add the mediaplayer release in the test validation. This is to ensure the media player release properly.

Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
ee1dc6221fc9193fb135386244e61e557a07260d 26-Oct-2010 James Dong <jdong@google.com> Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java"
fa3d263131ba775bf62c406ff0f85abb8366d70f 26-Oct-2010 Gil Dobjanschi <virgild@google.com> Removed the start and end transition types.

Change-Id: I0c3f9f82a90e0835f550b11c5f1ea8a1147535a4
ava/android/media/videoeditor/TransitionEndCurtainClosing.java
ava/android/media/videoeditor/TransitionEndFadeToBlack.java
ava/android/media/videoeditor/TransitionFadeBlack.java
ava/android/media/videoeditor/TransitionFadeToBlack.java
ava/android/media/videoeditor/TransitionStartCurtainOpening.java
ava/android/media/videoeditor/TransitionStartFadeFromBlack.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
23617befe43979b4f8ffb64fbd4e6d1c2f2c0e82 26-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Effects and overlays are not modified when a video clip is trimmed."
a0cab99dd281c0d180b3dbecaae91682e5d245b2 26-Oct-2010 James Dong <jdong@google.com> Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java

Change-Id: Ia464d79d65e43c84937624c5a6fa77c7155cffaa
ava/android/media/MediaRecorder.java
028b537051d56e0b02acd599b42cfd13871f31c2 26-Oct-2010 James Dong <jdong@google.com> Merge "Add two creation flags to OMXCodec::Create()"
ce03445c320042ca144bd4efd8c0356bb7775f9d 26-Oct-2010 Gil Dobjanschi <virgild@google.com> Effects and overlays are not modified when a video clip is trimmed.

Change-Id: Ib9a54ecab4ea253caa6c64204493fc3f40a6aa53
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
7f266f089ece32ab7373207d5782b23a7185cfd6 26-Oct-2010 Gloria Wang <gwang@google.com> A temporary fix for "Waiting for service drm.drmManager".

Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
ibstagefright/DataSource.cpp
70bfc087d95ab7b1bf782c3d579e1a3e48d9ddb2 26-Oct-2010 Gil Dobjanschi <virgild@google.com> Check before and after media item reference

Change-Id: I9abc017896ed82f069479a468e1b0b9d3303e3a6
ava/android/media/videoeditor/VideoEditorTestImpl.java
479f788a7dbb0f10f9401419f16ee7674a21699e 26-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Transition bug fix"
170a929648b9f5c6efbf6dcbec4f1bc73593cbde 23-Oct-2010 James Dong <jdong@google.com> Add two creation flags to OMXCodec::Create()

o This allows to force to use software codecs or hardware codecs
o If request cannot be fullfilled, Create() returns NULL.

Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
ibstagefright/OMXCodec.cpp
fc6d54ea074aa1f6a177b031e6b2814368ac7583 26-Oct-2010 James Dong <jdong@google.com> Merge "Remove OMX.PV.* components from OMXCodec.cpp"
5592bcc57a58b10c7b8de1086d42679f19842863 23-Oct-2010 James Dong <jdong@google.com> Remove OMX.PV.* components from OMXCodec.cpp

Change-Id: Ie43c00a4d589e9cca6e9505a5dabd4e0d8af321a
ibstagefright/OMXCodec.cpp
068ee16b57c54830ca78fab4066b39ca36c163e9 26-Oct-2010 James Dong <jdong@google.com> Merge "Don't change the video recording frame rate if it is not requested."
cbb053c3c97677c4795ca814dcc749e3d8513ed9 26-Oct-2010 Gloria Wang <gwang@google.com> resolved conflicts for merge of 965f960e to master

Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
b15f2eaa92070cd4871892bd0db2292e5019b6cd 24-Oct-2010 James Dong <jdong@google.com> Don't change the video recording frame rate if it is not requested.

o set the default video frame rate to the current frame rate being used
o add check on whether the requested frame rate is supported
o fix an issue where the hardware video encoder setting was bypassed
o increases the max frame rate from 30 t0 120 frames per second
the actual frame rate will be clipped if the requested frame rate is too
high when recording starts by checking the hardware encoder capabilities

Change-Id: I1b47671d74da0ebcb9601bdca390d430cc048fbc
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/CameraSource.cpp
b8791479af814d530a3810d0516ef5628958a8d0 26-Oct-2010 Gloria Wang <gwang@google.com> resolved conflicts for merge of 9084631d to gingerbread-plus-aosp

Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
36b7cc5e0b00f7dbf40492817ddc86d7ef3fb5c8 26-Oct-2010 Gil Dobjanschi <virgild@google.com> Transition bug fix

Change-Id: I0999aca3b341e4d6a4303ef84da8f5e541310bf0
ava/android/media/videoeditor/VideoEditorTestImpl.java
cf74754f9f5c7eb2f00ad2e45e7304986cc1b870 25-Oct-2010 Andreas Huber <andih@google.com> We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets.

Change-Id: I02a9b4af929601c899f04cee9864d0dd0716de62
ibstagefright/rtsp/ARTSPConnection.cpp
d5770917a50a828cb4337c2a392b3e4a375624b9 22-Jun-2010 Gloria Wang <gwang@google.com> DRM framework support:
- add a sniffer for DRM files
- add DRMSource and DRMExtractor for es_based DRM
- add pread in FileSource.cpp for container_based DRM
- add native DRM framework API calls in the player for
DRM audio/video playback

Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/DRMExtractor.cpp
ibstagefright/DataSource.cpp
ibstagefright/FileSource.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/DRMExtractor.h
ibstagefright/include/MPEG4Extractor.h
b04e3940d190458ae46e2aa10667a667398cd87a 15-Jul-2010 Mike Lockwood <lockwood@android.com> Fixes for simulator build on lucid

strchr and strrchr now return const char* instead of char*

Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
4de82c7885bd41f9fa5ca3938d617cae5edacbdf 23-Oct-2010 Eric Laurent <elaurent@google.com> am 5a9d2737: am b6a2256e: Merge "Fix issue 3126094." into gingerbread

Merge commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860'

* commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860':
Fix issue 3126094.
5a9d2737181768a1da54d4e7fb00a6b1b86b3860 23-Oct-2010 Eric Laurent <elaurent@google.com> am b6a2256e: Merge "Fix issue 3126094." into gingerbread

Merge commit 'b6a2256e5461160a89d077b761d3253d95ce869f' into gingerbread-plus-aosp

* commit 'b6a2256e5461160a89d077b761d3253d95ce869f':
Fix issue 3126094.
cc02ac54ac0758e6f44b2d8e5134ff1b2fa96409 23-Oct-2010 Eric Laurent <elaurent@google.com> Fix issue 3126094.

android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.

Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
ni/audioeffect/android_media_Visualizer.cpp
2351e69a13e8b9372cc4a33d28c1fd230f51faa3 22-Oct-2010 James Dong <jdong@google.com> Merge "OMX extension to support storing meta data in video input buffers during recording"
5a1e4cf83f5be1b5d79e2643fa791aa269b6a4bc 19-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Update BT APIs return type from Set to List.

Change-Id: Ia27220dd26cde13007f6938c830517ee7f6968ce
ava/android/media/AudioService.java
627d836ffff9084ba594a772491c8b91a2ce2d0a 22-Oct-2010 James Dong <jdong@google.com> am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread

Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227'

* commit '6123e0f7c91ffc7534da99b4668879dacf662227':
Turn the media time adjustment in file writer back on
6123e0f7c91ffc7534da99b4668879dacf662227 22-Oct-2010 James Dong <jdong@google.com> am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread

Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp

* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
Turn the media time adjustment in file writer back on
89a0104c7cd20ffe19d80714f627463b4929c5fc 22-Oct-2010 James Dong <jdong@google.com> Turn the media time adjustment in file writer back on

o This was turned off to unblock the tests on some device
o The adjustment duration is increased to suppress fluctuations observed on some device

bug - 3058745

Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
ibstagefright/MPEG4Writer.cpp
387e38dd87ae9c04ef79ebe06ea798762916ff5c 21-Oct-2010 James Dong <jdong@google.com> OMX extension to support storing meta data in video input buffers during recording

bug - 3042125

Change-Id: I7543809fa4ff61d48da35eec6c2bd5eaa7e8cead
ibmedia/IOMX.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
9165145342de3e62145da89cfa832a695f74a0be 21-Oct-2010 James Dong <jdong@google.com> am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread

Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99'

* commit '8ad6335d2c22900de5b46460473495b5bcea9f99':
File writer size estimation improvement
8ad6335d2c22900de5b46460473495b5bcea9f99 21-Oct-2010 James Dong <jdong@google.com> am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread

Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp

* commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
File writer size estimation improvement
6913c6176b6d239f833ea21120b93547aa5f93f7 21-Oct-2010 Jamie Gennis <jgennis@google.com> Fix a copy & paste logging error.

This change corrects the name of a variable used in a logging macro,
allowing AwesomePlayer.cpp to build with verbose logging enabled.

Change-Id: Ie23fe0fb17f08ac43348cee3209bfe68088e856e
ibstagefright/AwesomePlayer.cpp
7eac136a394b067e224efeafa29d6626fc9bcd7b 21-Oct-2010 Jamie Gennis <jgennis@google.com> Merge "Fix the non-ANW video decode path."
dbfb32e902ab99aa9bc4004bfcac476589e1f430 21-Oct-2010 Jamie Gennis <jgennis@google.com> Fix the non-ANW video decode path.

The BufferInfo::mOwnedByNativeWindow field was not being initialized in
the non-ANativeWindow video decode path.

Change-Id: If2f6249902a08690f6c62ef30791b9979050c0e5
ibstagefright/OMXCodec.cpp
fb26350c00069edcabbfce6bc1805ebfd4f9efb7 21-Oct-2010 Andreas Huber <andih@google.com> Merge "If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset()."
eaf2c5a5c3e55fa4b93a686412800dd9b4b1d82b 19-Oct-2010 Andreas Huber <andih@google.com> If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset().

Change-Id: I71a59d5e019e7b9ec3d9375d6231cc301ad3999b
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
65b51941e39120621f62a5acff8e8fb4a490a19a 21-Oct-2010 Andreas Huber <andih@google.com> Merge "Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF."
a0b442edbf6e1f602f89b3bda1c8894ef8740d72 21-Oct-2010 Andreas Huber <andih@google.com> Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF.

Change-Id: I57eaefdc4b300a8f56bbe5cf3a34c424e8efe63a
related-to-bug: 3084183
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/Android.mk
ibstagefright/rtsp/MyHandler.h
1dcb42b772c325620008581fa54a357e659f3385 20-Oct-2010 Andreas Huber <andih@google.com> Merge "Make sure we can encode the size of the codec specific data in a single byte."
1df9a7b133d37a1d5b8c087a72bd1473e10ab475 20-Oct-2010 Andreas Huber <andih@google.com> Make sure we can encode the size of the codec specific data in a single byte.

Change-Id: If7680cbfb380180c8dd6d6019b9c6c67661e468d
ibstagefright/MPEG4Writer.cpp
e6aaa3da3359cb7c48a9d54376e0880497c22cc8 20-Oct-2010 James Dong <jdong@google.com> Merge "Fix an issue where the video size was incorrectly retrieved from preview size"
26e54e258f0331e09c045c7af9b6b8cf11d19257 20-Oct-2010 James Dong <jdong@google.com> Fix an issue where the video size was incorrectly retrieved from preview size

bug - 3115814

Change-Id: I6aa59b3182ceee35c6d6ef54ff520f81077873f0
ibstagefright/CameraSource.cpp
58a36adac1bb3294cd9f2d516d52c6358987687a 07-Oct-2010 Jamie Gennis <jgennis@google.com> Add decode-to-ANativeWindow support to Stagefright.

This change adds support to Stagefright for doing OMX video decoding directly
into buffers dequeued from an ANativeWindow. It does this by registering the
dequeued buffers with the OMX component using an Android-specific OMX
extension, and then exchanging buffers between the OMX component and the
ANativeWindow.

Change-Id: Ida66f836503255a68d378c6903d96dfe9747ce87
ibstagefright/AwesomePlayer.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/OMXCodec.cpp
ab79d1febcb6d0bfaaf5e8bfb75f4c641c00a2fb 19-Oct-2010 James Dong <jdong@google.com> Make camera source ready for handling meta-data video buffers.

bug - 3042125

Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
22b37fa6e0d7abbfa373e5fdf057fc6dcb2474ff 20-Oct-2010 James Dong <jdong@google.com> File writer size estimation improvement

o Do not count the reserved space for moov if the meta data size is small
o Do not count the extra 1KB disturbing small file estimation.
o Reduce the default minimum reserved space from 4 KB to 3 KB.
o Estimate the moov size based on both duration AND file size limit is set
and set it to the smaller estimated value.

low risk change

bug - 3111983

Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
ibstagefright/MPEG4Writer.cpp
7bfcabbb9e5425985b2f2ffe095949e290a8a4ae 19-Oct-2010 Gil Dobjanschi <virgild@google.com> Finalized the audio track ducking API

Change-Id: I12b966c1898eaae76e9de71a6d745678dc489092
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
e01645137e919ddeb786175e5b25ac11c87962e3 19-Oct-2010 Andreas Huber <andih@google.com> am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread

Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'

* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
If we encounter video stream EOS while seeking we may still need to seek audio.
2d00c6050977f3e03665fbfef93f4f6aed041a63 19-Oct-2010 Andreas Huber <andih@google.com> am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread

Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp

* commit '52bea277ff92a2a1780e035c82c72082434e7b16':
If we encounter video stream EOS while seeking we may still need to seek audio.
9cb1898052c42a82dfd86b54f6328d8fcd29dd57 19-Oct-2010 Andreas Huber <andih@google.com> am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.

Merge commit '8b5161c2aed8637de9bffb1d81298d60ea237caf'

* commit '8b5161c2aed8637de9bffb1d81298d60ea237caf':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
c46b2a7b591a02bb6beeb2f62c7e571588ca6aa9 19-Oct-2010 Andreas Huber <andih@google.com> am 9b2f18df: am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread

Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2'

* commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2':
For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
3027855fb0d7cc32963aed892cac865c866fa87c 19-Oct-2010 Andreas Huber <andih@google.com> am 8f5214eb: am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread

Merge commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17'

* commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17':
If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
4d450a86572e549f845d335ab98eac0fd13d2c85 19-Oct-2010 Andreas Huber <andih@google.com> If we encounter video stream EOS while seeking we may still need to seek audio.

Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d
related-to-bug: 3108724
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
8b5161c2aed8637de9bffb1d81298d60ea237caf 19-Oct-2010 Andreas Huber <andih@google.com> am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.

Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp

* commit 'd68cda472a3646966a203338ccac04f0783293b7':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
d68cda472a3646966a203338ccac04f0783293b7 19-Oct-2010 Andreas Huber <andih@google.com> An attempt to unregister a handler that's no longer registered should not cause an assertion.

There are edge cases in which a handler attempts to unregister itself while on another thread a message fails to be delivered to that very handler and causes automatic unregistration. In this case the handler's good cleanup intentions are thwarted by the CHECK.

Change-Id: I4e41b5e7b619159ecce4856c15cccca031a28b5b
related-to-bug: 3101247
QA-impact: no(!!!) risk
ibstagefright/foundation/ALooperRoster.cpp
9b2f18df2436b6c2d9735e65119b92f320bb57e2 18-Oct-2010 Andreas Huber <andih@google.com> am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread

Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp

* commit 'bc96c2848dadaa844f95e89708d9941f73bbf400':
For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
bc96c2848dadaa844f95e89708d9941f73bbf400 18-Oct-2010 Andreas Huber <andih@google.com> Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17 18-Oct-2010 Andreas Huber <andih@google.com> am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread

Merge commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823' into gingerbread-plus-aosp

* commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823':
If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
99bc1da79b3c4d7ee82afeef53b9dbb54a9c0584 15-Oct-2010 Andreas Huber <andih@google.com> If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.

Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
ibstagefright/MPEG2TSWriter.cpp
5a40e394f1e6b0511542e171eaf4c3e5927efc13 18-Oct-2010 Andreas Huber <andih@google.com> For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.

related-to-bug: 3106534
Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
ibstagefright/OMXCodec.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
613ef2efa30e66591af45e3f394c0d00caf447ee 18-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Fix build (bad merge)

Bug: 3101573
Change-Id: I2c0518e31f39c9a6e88d86cc468653bbcb5be05e
ibstagefright/colorconversion/Android.mk
5582cc3a68589c905d56a05b17ba4d247c1b78b0 18-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge fb474872 from gingerbread-plus-aosp

Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
8f9486c1adb396d20b439da7141e5eb0f81166e2 16-Oct-2010 Andreas Huber <andih@google.com> am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread

Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'

* commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611':
Make sure we cache the sampleTable again if using the caching datasource.
2cd55d2f6db687d7398355b76fa18105314dfcd9 16-Oct-2010 Eric Laurent <elaurent@google.com> am 83ed30e5: am ae0bb04a: Merge "Fix issue 3098850" into gingerbread

Merge commit '83ed30e5e7aab370400657bcdafde2f071de0b54'

* commit '83ed30e5e7aab370400657bcdafde2f071de0b54':
Fix issue 3098850
fb47487259f0d5329d0fdbdecfc56baab9b96817 16-Oct-2010 Andreas Huber <andih@google.com> am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread

Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp

* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
f958f0fe9d7765600232ad3a25894376205d5f69 15-Oct-2010 Gil Dobjanschi <virgild@google.com> Save the color for gradient effects

Change-Id: I21e14344aa7410b5c99102ab41b4ec94db2fbe61
ava/android/media/videoeditor/VideoEditorTestImpl.java
a4f391c9bf581af19d6dec4603c194126995b6bf 15-Oct-2010 Andreas Huber <andih@google.com> Include the framework copy of the OpenMAX headers instead of referencing external/opencore.

Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
ibmedia/Android.mk
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
ibstagefright/codecs/avc/dec/Android.mk
ibstagefright/codecs/avc/enc/Android.mk
ibstagefright/codecs/m4v_h263/dec/Android.mk
ibstagefright/codecs/m4v_h263/enc/Android.mk
ibstagefright/codecs/on2/dec/Android.mk
ibstagefright/colorconversion/Android.mk
ibstagefright/httplive/Android.mk
ibstagefright/matroska/Android.mk
ibstagefright/mpeg2ts/Android.mk
ibstagefright/omx/Android.mk
ibstagefright/omx/tests/Android.mk
ibstagefright/rtsp/Android.mk
ests/omxjpegdecoder/Android.mk
cb90947bf8ed2c898c1b7e529dd0c99d112ed611 15-Oct-2010 Andreas Huber <andih@google.com> am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread

Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp

* commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c':
Make sure we cache the sampleTable again if using the caching datasource.
6da2ae11b62f155ee83c3e31fdd9cc53b2058586 15-Oct-2010 Andreas Huber <andih@google.com> Make sure we cache the sampleTable again if using the caching datasource.

QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position.

Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5
related-to-bug: 3098873
ibstagefright/MPEG4Extractor.cpp
a4a2a3aaef730dbab020f7ece09149b05a399000 15-Oct-2010 Andreas Huber <andih@google.com> am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread

Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'

* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
4bd4bd6fc05ab7108f4f59f98bd6b595cec58e02 15-Oct-2010 Andreas Huber <andih@google.com> am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread

Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b'

* commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b':
Attempt to derive the avg. bitrate of the entire stream from metadata.
dc0728f6b5603de0ea5795d29c9765cc6512340d 15-Oct-2010 Andreas Huber <andih@google.com> am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread

Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'

* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
Some webcams output rtp streams but never send any rtcp data in violation of
4a90f93781622e5cbca52b962cfe5325a29ec28e 15-Oct-2010 Kenny Root <kroot@google.com> resolved conflicts for merge of a127c07c to master

Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
e449fceaa4b1e1c76d95a4255d23ac508bd75751 15-Oct-2010 Andreas Huber <andih@google.com> am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread

Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'

* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
HTTP Live content that are tagged as complete are now seekable.
83ed30e5e7aab370400657bcdafde2f071de0b54 15-Oct-2010 Eric Laurent <elaurent@google.com> am ae0bb04a: Merge "Fix issue 3098850" into gingerbread

Merge commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac' into gingerbread-plus-aosp

* commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac':
Fix issue 3098850
02d0ff60c40cc2edbbd7769a8ce1210b28b8e507 15-Oct-2010 Eric Laurent <elaurent@google.com> Fix issue 3098850

Media framework test permissions were not updated when commit
14beea487c065ca902bfd7089399eb71a805e302 added
MODIFY_AUDIO_SETTINGS permission check for global effects.

Change-Id: I2a97be74f33d62fbb749642b1e7a26ddf92378f2
ests/MediaFrameworkTest/AndroidManifest.xml
27c7fb1a861776b4fdc2632697e4e25eee83617f 14-Oct-2010 Andreas Huber <andih@google.com> am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread

Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp

* commit '90d59d180bd963f00161e6bfaabfda432960cab6':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
0c9b577e4de7081355a4cba2d185e69f73d66057 14-Oct-2010 Andreas Huber <andih@google.com> Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.

Change-Id: I48175666857ab0fb1519777bdb6f7f0b6b5cc599
related-to-bug: 3073955
ibmedia/Metadata.cpp
bb5d7c21615128630fc9d08274bb14ca01e2124b 13-Oct-2010 Andreas Huber <andih@google.com> am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread

Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp

* commit '5f42391701c0657d520d00f62a4c061b18ba1280':
Attempt to derive the avg. bitrate of the entire stream from metadata.
5f42391701c0657d520d00f62a4c061b18ba1280 13-Oct-2010 Andreas Huber <andih@google.com> Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
8e4f3c76dd7f5596fa2fe10bdf008d4c02353160 13-Oct-2010 Andreas Huber <andih@google.com> am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread

Merge commit '646e0d5ab342f414f556574f2d078bd6deb22ed3' into gingerbread-plus-aosp

* commit '646e0d5ab342f414f556574f2d078bd6deb22ed3':
Some webcams output rtp streams but never send any rtcp data in violation of
0349b27be5b40fbc60d9b24f02ec5c645c0ec7f2 13-Oct-2010 James Dong <jdong@google.com> Remove hard-coded color format for Nvidia's video encoder

o camera would query the color format if camera source is used
o if camera source is not used, a MetaData can be passed to do the same.

Change-Id: Iff1f802cc4974b286085473e5384bd88e04fa05d
ibstagefright/OMXCodec.cpp
cc5fb1d5e5c1971cabfc2cba89de63ba65678882 13-Oct-2010 Andreas Huber <andih@google.com> Some webcams output rtp streams but never send any rtcp data in violation of
the specs. Attempt to use fake timestamps to be able to play these...

Change-Id: Ia7a926616fb764e972955df4acdb59d85cdd93df
related-to-bug: 3087310
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPConnection.h
ibstagefright/rtsp/MyHandler.h
4deb3eb534fea073c1b4afb032f4f1c643abb8e1 13-Oct-2010 Andreas Huber <andih@google.com> Attempt to derive the avg. bitrate of the entire stream from metadata.

related-to-bug: 3093224
Change-Id: I4726b023373e04468cc12fd64f7fe6ee923add95
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
a127c07c42b8961881f460eb8e6a6b722139e3b9 13-Oct-2010 Andreas Huber <andih@google.com> am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread

Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp

* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
Support for writing to MPEG2 transport stream files.
28b93967d0e702304c7edec854a29d5ab88bfce0 13-Oct-2010 Andreas Huber <andih@google.com> am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread

Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp

* commit '165c6579660c22edafb61fee2a0cf39334a2a905':
HTTP Live content that are tagged as complete are now seekable.
312644cdbb39522fe9cac028b15b907ce0e8e0f7 13-Oct-2010 Andreas Huber <andih@google.com> Merge "Support for writing to MPEG2 transport stream files." into gingerbread
2fd0c94a118c829a78f47ec26d04ce9d7961ec8b 13-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Test implementation bug fix."
9adf466021d37a5062d7d3361e14bfd9e7ffeba6 12-Oct-2010 Andreas Huber <andih@google.com> Support for writing to MPEG2 transport stream files.

Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
ava/android/media/MediaRecorder.java
ibmedia/mediarecorder.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/MPEG2TSWriter.cpp
e2c28468a5aa196f939474232f578b0fbf66a1f2 13-Oct-2010 Gil Dobjanschi <virgild@google.com> Test implementation bug fix.

Change-Id: I1448d06662e2538f01d9c462d4a86fcbf57d7125
ava/android/media/videoeditor/VideoEditorTestImpl.java
54d09724e3ea2af4e08dff47d7ade92a95784127 12-Oct-2010 Andreas Huber <andih@google.com> HTTP Live content that are tagged as complete are now seekable.

Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde
related-to-bug: 2368598
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/httplive/LiveSource.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/include/LiveSource.h
ibstagefright/include/M3UParser.h
ibstagefright/include/MPEG2TSExtractor.h
ibstagefright/include/NuCachedSource2.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
fefcc9c26b278e45aa95c8366df928eac566499b 12-Oct-2010 Andreas Huber <andih@google.com> am 5b0d0630: am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread

Merge commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5'

* commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
6a6a3aff17e057eeb1457ac4d04ab4b5e8f53abe 12-Oct-2010 Mike Lockwood <lockwood@android.com> MTP: allow renaming directories

Change-Id: I90849e7924f33a2f39dae400968f2eda64710beb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
5ebac83e20dadf10bd4a0cee4ddf69d0ec049f98 12-Oct-2010 Mike Lockwood <lockwood@android.com> MTP: Add support for renaming files

Change-Id: I679d674eb4dae88f60165ab2850cc20eec7ceee3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
25cf4fd9c7bf5110b44af4af86fb5e630bca2e5f 11-Oct-2010 Mike Lockwood <lockwood@google.com> Merge "MTP: Include size of 12 byte header in packet size for GetObject data packet"
db7743128b82d4c22f5b4d3b634d5232a6af7564 11-Oct-2010 Mike Lockwood <lockwood@google.com> MTP: Include size of 12 byte header in packet size for GetObject data packet

Fixes file transfer from device to host with libmtp.

Change-Id: Ifb304c1f106e94b2710ee5c11816b83cf5f25478
Signed-off-by: Mike Lockwood <lockwood@google.com>
tp/MtpServer.cpp
5b0d063010b364102ffb7a533e2b76ecfd9636d5 11-Oct-2010 Andreas Huber <andih@google.com> am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread

Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp

* commit '1010da2e02216b2f94fbe763a82d53201b340217':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
c5d322998325aa03c9716413295b8da3efbc165a 11-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Color effect comments and method name changes."
0dc6403f3c660f6e6f1840276e3240365889103d 11-Oct-2010 Andreas Huber <andih@google.com> Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.

Change-Id: Idd47968d4027f357222f19f15eecfd70fdec3282
related-to-bug: 3073813
ibstagefright/rtsp/MyHandler.h
0ce122e38b46ce3dc5d37c7b0719c0b9325e9cc0 11-Oct-2010 Gil Dobjanschi <virgild@google.com> Color effect comments and method name changes.

Change-Id: I58a9535e2bc4f61532f980f31bba4140797bf483
ava/android/media/videoeditor/EffectColor.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
01788562f26f213f63c14483fd3977e23b8314ab 11-Oct-2010 Mike Lockwood <lockwood@android.com> MTP: Fix copying files to root of storage using parent handle = 0

Change-Id: Ie732c5778e9424512b2ddecd87779f8c55668deb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
3e13c1b705af78f4fa20a38cb144d2a747894e88 11-Oct-2010 Mike Lockwood <lockwood@android.com> MTP: Remove some excessive logging

Change-Id: I4b082d8a2ea7ec4ee80e557ad50ed10b03fe4c52
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpServer.cpp
aee02b890d34951837909cae7cf9661e49963c69 11-Oct-2010 Andreas Huber <andih@google.com> am cac43e8a: am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread

Merge commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22'

* commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
023266c34c5f93c9fc0a7c9d3918fe9ec61e645a 11-Oct-2010 Andreas Huber <andih@google.com> am e0c8545a: am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread

Merge commit 'e0c8545a2369881fe09582337a9de3db2db1a951'

* commit 'e0c8545a2369881fe09582337a9de3db2db1a951':
Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
37de60c179449a706ea41fea8384063723b0cb63 11-Oct-2010 Andreas Huber <andih@google.com> am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread

Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'

* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
cb4e40768096412c7d068a9cf27b1f5155ddfa94 11-Oct-2010 Andreas Huber <andih@google.com> am 5dcf588a: am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread

Merge commit '5dcf588a81a59142985736d8bb0430586f68ec08'

* commit '5dcf588a81a59142985736d8bb0430586f68ec08':
Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
80ab64d7aac1409271b35a6fff2fdd037a02661c 11-Oct-2010 James Dong <jdong@google.com> am d31fc239: am 6dcdfdb4: Merge "Name the writer threads" into gingerbread

Merge commit 'd31fc2397a494fc54679ac8fdb52983b60287183'

* commit 'd31fc2397a494fc54679ac8fdb52983b60287183':
Name the writer threads
2ddbd7d9f8afda9b01e6290cd7d470f802df8c62 11-Oct-2010 Andreas Huber <andih@google.com> am 14ea1048: am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread

Merge commit '14ea1048e7e8a4b40836b5601bc86b91663525cb'

* commit '14ea1048e7e8a4b40836b5601bc86b91663525cb':
Disable the access unit timeout temporarily while a seek operation is in progress.
329430a54e152ad1f5e0003194728988661788bb 11-Oct-2010 Eric Laurent <elaurent@google.com> am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread

Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c'

* commit '4f21e517d09b9d793d20d64547df330fba705b3c':
Added getter for session Id to AudioSink
438a17292a3edf779eb7aef5966c8c9e034235a8 11-Oct-2010 Andreas Huber <andih@google.com> am d96a068c: am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread

Merge commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76'

* commit 'd96a068cc7b3519a5b7d122a12025684b6f28c76':
Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
06dfa35e3c5f379b14d2acbc584c8d8cb2e822c7 10-Oct-2010 Andreas Huber <andih@google.com> am bb708373: am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread

Merge commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43'

* commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
72662b1abe7e76f5d880ffc44c561b3af63f89ad 10-Oct-2010 Andreas Huber <andih@google.com> am 45bd1159: am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread

Merge commit '45bd1159fa34b51ba077e0cde760d171ca092552'

* commit '45bd1159fa34b51ba077e0cde760d171ca092552':
On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
997eaa2c7c6f7c59d145dab3e93431ea2e2a7dc7 09-Oct-2010 James Dong <jdong@google.com> 0-memcpy video recording framework

Part III: Move startRecording() call earlier, asking camera hal
to allocate video buffers before CameraSource.start() is called.

Change-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d
ibstagefright/CameraSource.cpp
0c128b67f066b2e691348d5375c2da47b84f69ac 08-Oct-2010 James Dong <jdong@google.com> Move Camera specific logic out from StagefrightRecorder to CameraSource

o updated comments and streamlined the logic in
checkVideoSize() and checkFrameRate() as suggested

Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
cac43e8a2ce59c1151d5a2028330b2a769591d22 09-Oct-2010 Andreas Huber <andih@google.com> am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread

Merge commit 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp

* commit 'beffefa24f398b610d58dd583d9f5613dc529c28':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
0c46b69f612da61ed39b32823d2d6baf2e8215e9 09-Oct-2010 Andreas Huber <andih@google.com> RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.

Change-Id: Ie61230cd60dd6c682baf72529100369ad6291189
related-to-bug: 3073955
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/ARTSPController.h
ibstagefright/include/AwesomePlayer.h
ibstagefright/rtsp/ARTSPController.cpp
ibstagefright/rtsp/MyHandler.h
bced934da06a5f431982191e66d8e7b153f5141f 08-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Hide project media by creating the .nomedia file"
ce52d1ff76015413787371378a2f64ee716154a3 08-Oct-2010 Gil Dobjanschi <virgild@google.com> Hide project media by creating the .nomedia file

Change-Id: I4ef1f16ceaa211b7f614cb3dfffa5beb4ae3e8de
ava/android/media/videoeditor/VideoEditorFactory.java
e0c8545a2369881fe09582337a9de3db2db1a951 08-Oct-2010 Andreas Huber <andih@google.com> am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread

Merge commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10' into gingerbread-plus-aosp

* commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10':
Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
069ead3adc1b83fdc906d81fa2f1b82b0f71f91a 08-Oct-2010 Mike Lockwood <lockwood@google.com> MTP: Throw a NullPointerException if client is null in MtpCursor constructor

Change-Id: Ia2a19ddcc5cacb54d9fcbe55bce1de1aed515424
Signed-off-by: Mike Lockwood <lockwood@google.com>
ava/android/media/MtpCursor.java
38285db197ba11ee396873713e504fdc3e836725 08-Oct-2010 Andreas Huber <andih@google.com> Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.

Change-Id: I61936601e55df7e4c23a8c13087579a4f85bd6e6
ibstagefright/avc_utils.cpp
ibstagefright/include/avc_utils.h
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/APacketSource.h
2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7 08-Oct-2010 Andreas Huber <andih@google.com> am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread

Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp

* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
f72dd0190ee64914161d361be1213eda8cab7b90 08-Oct-2010 Andreas Huber <andih@google.com> Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
5dcf588a81a59142985736d8bb0430586f68ec08 08-Oct-2010 Andreas Huber <andih@google.com> am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread

Merge commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c' into gingerbread-plus-aosp

* commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c':
Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c 08-Oct-2010 Andreas Huber <andih@google.com> Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
6934207ac3cb850c9e548c48063956a7998ff2ed 08-Oct-2010 Andreas Huber <andih@google.com> Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.

Change-Id: Id7f21d5ab8533b4e17ceaa8619a39c27f0306150
ibstagefright/avc_utils.cpp
d31fc2397a494fc54679ac8fdb52983b60287183 08-Oct-2010 James Dong <jdong@google.com> am 6dcdfdb4: Merge "Name the writer threads" into gingerbread

Merge commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f' into gingerbread-plus-aosp

* commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f':
Name the writer threads
14ea1048e7e8a4b40836b5601bc86b91663525cb 08-Oct-2010 Andreas Huber <andih@google.com> am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread

Merge commit 'c5912acc04226a8f9377d1aad50de8d3f883854c' into gingerbread-plus-aosp

* commit 'c5912acc04226a8f9377d1aad50de8d3f883854c':
Disable the access unit timeout temporarily while a seek operation is in progress.
10b9b3f3fe47cea0833fe2c7d5ed08a1185f9006 08-Oct-2010 Andreas Huber <andih@google.com> Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.

Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2
related-to-bug: 3073955
ava/android/media/Metadata.java
ibmediaplayerservice/StagefrightPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/include/ARTSPController.h
6dcdfdb42a562747dceb1e9fb2aa10c67d18959f 08-Oct-2010 James Dong <jdong@google.com> Merge "Name the writer threads" into gingerbread
c5912acc04226a8f9377d1aad50de8d3f883854c 08-Oct-2010 Andreas Huber <andih@google.com> Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
e51e80990e72dee6372e3300fbbcdac3a115b60a 08-Oct-2010 Andreas Huber <andih@google.com> Disable the access unit timeout temporarily while a seek operation is in progress.

Change-Id: I116cb76342aae4168f34ebae49ecb2301702a0ea
related-to-bug: 3073955
ibstagefright/rtsp/MyHandler.h
4f21e517d09b9d793d20d64547df330fba705b3c 08-Oct-2010 Eric Laurent <elaurent@google.com> am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread

Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp

* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
Added getter for session Id to AudioSink
b37fcbfd7f9d65b90b43e0242903030c5a6517b5 08-Oct-2010 Eric Laurent <elaurent@google.com> Merge "Added getter for session Id to AudioSink" into gingerbread
d96a068cc7b3519a5b7d122a12025684b6f28c76 08-Oct-2010 Andreas Huber <andih@google.com> am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread

Merge commit 'bb245d35b6e81d750a91815543973b0a5976352b' into gingerbread-plus-aosp

* commit 'bb245d35b6e81d750a91815543973b0a5976352b':
Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
c67acb2b2890eee013de97b819687511f9551b51 08-Oct-2010 James Dong <jdong@google.com> Name the writer threads

Change-Id: I51461c3800ac5850e21ff398e80eb20b562264b3
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
b3bdf3f0086f1d921720f6dc92cabc7b6f2ab63e 08-Oct-2010 Eric Laurent <elaurent@google.com> Added getter for session Id to AudioSink

Added a method to expose the audio session id at AudioSink interface
so that the AudioPlayer in stagefright can retrieve it.

Also:
- Fixed audio effect send level not being initialized in mediaplayer.
- Fixed compilation error when LOGV is enabled in mediaplayer JNI

Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
ni/android_media_MediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
3418835893f85c68029cfae0491ec47b07184829 08-Oct-2010 Andreas Huber <andih@google.com> Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.

Change-Id: I5a637f1b380e44c94040ec507843d58a1f5a9b61
related-to-bug: 3065605
ibstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_reorder.h
ibstagefright/codecs/mp3dec/src/s_tmp3dec_file.h
170bf59c7ccf894ec14f4f6230d25a0ce15e9e8a 08-Oct-2010 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty"
6458935331ccfacb4cccc50d6b893947febae687 07-Oct-2010 Mike Lockwood <lockwood@android.com> MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty

BUG: 3063257

Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
2409cdb5870a724cea8052d714a38cb8ebce627d 07-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Remove MediaVideoItem and AudioTrack playback APIs."
bb70837397e3fb437b7b4443b37d7a83c11e6e43 07-Oct-2010 Andreas Huber <andih@google.com> am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread

Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp

* commit '949f7d9066e09768e570686a5695aaba4a1dafd0':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
45bd1159fa34b51ba077e0cde760d171ca092552 07-Oct-2010 Andreas Huber <andih@google.com> am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread

Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
b27f2d3126d68796925f96078fd5ab3eb466e98a 07-Oct-2010 Gil Dobjanschi <virgild@google.com> Remove MediaVideoItem and AudioTrack playback APIs.

Change-Id: If3e5f341af7f581c90f04c91afb3681f9e8d5f82
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaVideoItem.java
d6e9d7695b55414420c366528ba431eacdea5dfc 07-Oct-2010 Andreas Huber <andih@google.com> Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback."
08478d17a364ec027f6d6ddbac267c2ac073c4e0 07-Oct-2010 Andreas Huber <andih@google.com> Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback.

Change-Id: Iee9cd7b0c326bac96382007b4ea077d4368d7d01
related-to-bug: 3051572
ibstagefright/OMXCodec.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
a458719bb6ebbcce99d4dba43af4bd51c5a06216 07-Oct-2010 Andreas Huber <andih@google.com> am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread

Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'

* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
4c19bf9833f59f58a9aaea566f0eb98a7fb7e2ea 08-Sep-2010 Andreas Huber <andih@google.com> Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.

Change-Id: I7150e5e7342e1117c524856b204aadcb763e06ed
related-to-bug: 2368598
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/httplive/LiveSource.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/LiveSource.h
ibstagefright/include/M3UParser.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
1e1941638398e5e3e1d7b9ad88e66f574576bcfa 07-Oct-2010 Andreas Huber <andih@google.com> On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.

Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c
related-to-bug: 3070094
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
3caf37eb320e37184397b5901c78c7291914d55d 07-Oct-2010 Jeff Brown <jeffbrown@google.com> am f358cecb: am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.

Merge commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2'

* commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2':
Fix Looper leaks in MediaRecorderStressTest.
8c4a042984ce9132810f6e79da732ea89e467d6f 07-Oct-2010 James Dong <jdong@google.com> am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread

Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe'

* commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
Fixed an issue where the reserved free space in the file writer was larger than intended
0ca0a12c6b49032065bf64e9f1cdebf765a0df9d 06-Oct-2010 Gil Dobjanschi <virgild@google.com> Added VideoEditor reference to protected AudioTrack constructor

Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
53f89e12306cec109022477fc699bc6323ab5087 06-Oct-2010 Gil Dobjanschi <virgild@google.com> Added the video editor to the media items and audio track constructors.

Change-Id: I5db229d28c28e17b487257a9c4ed8c5fb7570a8d
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
572eab6f17a78a9483bbf4b3646aa5a6038ea210 06-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Adjust start time and duration for overlays and effects."
b74ccaad18159d8236650448513ef90c02fab451 06-Oct-2010 James Dong <jdong@google.com> Merge "Use setVideoSize API in StagefrightRecorder"
e5867ef3f096521c4a7a289d83e75904b3a977c5 06-Oct-2010 Gil Dobjanschi <virgild@google.com> Adjust start time and duration for overlays and effects.

Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Overlay.java
73fe79da099eabd032f69b8db0bc6dacf0829ed1 06-Oct-2010 James Dong <jdong@google.com> am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread

Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'

* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
Resilent media time stamp adjustment
56ee1080f004110bff622e5b60c243d9cabfe120 05-Oct-2010 Andreas Huber <andih@google.com> am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread

Merge commit '17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp

* commit '17bc4f65324a823598e7671256c815bf32ddcc95':
Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
c743f4506f88a14189449c719a6ec1cfe5f0f812 05-Oct-2010 Andreas Huber <andih@google.com> Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.

Change-Id: Id574a0203efcb5e565f1b0fe77869fc33b9a9d56
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
f358cecb9cb2853ba0d6f54f350a92b1b5e247b2 05-Oct-2010 Jeff Brown <jeffbrown@google.com> am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.

Merge commit '79a3981e3885b9144bb3d458682141eed7365939' into gingerbread-plus-aosp

* commit '79a3981e3885b9144bb3d458682141eed7365939':
Fix Looper leaks in MediaRecorderStressTest.
79a3981e3885b9144bb3d458682141eed7365939 05-Oct-2010 Jeff Brown <jeffbrown@google.com> Fix Looper leaks in MediaRecorderStressTest.

The test was failing periodically due to too many files being open.
This change attempts to resolve the problem on the theory that
signaling pipe file descriptors are being leaked due to the large
number of Looper instances created during the test run.

However, it's still possible there are other leaks elsewhere.

Change-Id: I71f9f12d21605c47c9217c72c51e6c768142ce10
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
61f9184547a3b9ad4c06846b87f1b1cbd4787230 05-Oct-2010 Gil Dobjanschi <virgild@google.com> Added mute APIs for MediaVideoItem and AudioTrack

Change-Id: I2e4e8b213a5d19f895d9e3431b7d4f1acad70762
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
a86a6c4e326bfdfc351dacca95b23bb78f78efbe 05-Oct-2010 James Dong <jdong@google.com> am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread

Merge commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp

* commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54':
Fixed an issue where the reserved free space in the file writer was larger than intended
3398abafca25ff8c58feedd4d2b82857a3322061 05-Oct-2010 Gil Dobjanschi <virgild@google.com> Save AudioTrack to XML

Change-Id: Ie9afe8c620e21e160b56c36f489870db0a3987cc
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/VideoEditorFactory.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
6a9e39ac55b32a2847546ef1784c2d6c91863a55 05-Oct-2010 James Dong <jdong@google.com> Fixed an issue where the reserved free space in the file writer was larger than intended

The problem was that even though user does not explicitly request the max file size
limit via MediaRecorder.setMaxFileSize(), the file writer sets an implicit file
size limit if 32-bit file offset is used on user's behalf. The reserved free space
is estimated based on the file size, if the file size limit is set by the user.

The fix is to add an extra bool to tell the difference between an
explit requested file size and an implicit file limit and use that
to set the estimated moov box size accordingly.

Change-Id: I731aca6c7833aa764ed7b905edb77721577471b3
ibstagefright/MPEG4Writer.cpp
e799720dd478c60ac027d296f329b469119d1c1c 05-Oct-2010 Gil Dobjanschi <virgild@google.com> Merge "Added audio track playback API"
6a02ba0100e030e0b8bf2b6f195eabac1f1812db 05-Oct-2010 James Dong <jdong@google.com> am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread

Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp

* commit 'b99f0c7eae365f788a21944fef28de580c7f5f92':
Resilent media time stamp adjustment
b99f0c7eae365f788a21944fef28de580c7f5f92 05-Oct-2010 James Dong <jdong@google.com> Merge "Resilent media time stamp adjustment" into gingerbread
acee8e71317db40765b68a8bd295c8f3dc85a9ce 03-Oct-2010 James Dong <jdong@google.com> Resilent media time stamp adjustment

Change-Id: I13ab87c05f26bb11a3cc9bf8559f98e6ea0752db
ibstagefright/MPEG4Writer.cpp
52ac301ee15abd14cdb84053a5de4f1528c4b16c 04-Oct-2010 Gil Dobjanschi <virgild@google.com> Added audio track playback API

Change-Id: I9884ab5d3a7d8d8310f4b4426e50b0496cbbd295
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
8a9f8bfe16fc1904f5e835de0f13240f6daf8339 04-Oct-2010 James Dong <jdong@google.com> Use setVideoSize API in StagefrightRecorder

Change-Id: Ia7ddf5e8d2b931453d2cb801169906191349ca07
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
3d29e8c8465bfa632eb250d533a1cd8e77b85a66 04-Oct-2010 Andreas Huber <andih@google.com> am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread

Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c'

* commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c':
Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
dfd03fe99336792b6dae6c4c9fd5f5ba157e054c 04-Oct-2010 Andreas Huber <andih@google.com> am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread

Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp

* commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a':
Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
05f6787b887f0e731e7372ede0fb955e8939f703 04-Oct-2010 Andreas Huber <andih@google.com> Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.

Change-Id: I29143e357fb6ea7b860636100e010f2ea7436798
related-to-bug: 3037389
ibstagefright/AwesomePlayer.cpp
d84d9f40647644efcc8dcdaaad218b46c2208510 04-Oct-2010 Andreas Huber <andih@google.com> am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread

Merge commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80'

* commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80':
Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
bb506dab1ff10e6939fcd0457571e0b46793dd80 04-Oct-2010 Andreas Huber <andih@google.com> am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread

Merge commit '7fa693740756123fa9d05e62fb47aae5d703c71d' into gingerbread-plus-aosp

* commit '7fa693740756123fa9d05e62fb47aae5d703c71d':
Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
1913c1aeabc1ff8d288c2be269fc50f010ad5f0f 04-Oct-2010 Andreas Huber <andih@google.com> Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.

Change-Id: Iaf5880bb3376f9cbf22aefe198878eaf6f3f08c7
related-to-bug: 3037389
ibstagefright/AwesomePlayer.cpp
8f8fd3525b68a5d860d30cb630fd1890347593ca 02-Oct-2010 James Dong <jdong@google.com> am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread

Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2'

* commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2':
Turn off media time adjustment by default
2bf74b8f0ad59b1379534e760a356adeb3673fd2 02-Oct-2010 James Dong <jdong@google.com> am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread

Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp

* commit '6c609b6a60e533a93c6d0088222bd8da209b9953':
Turn off media time adjustment by default
6c609b6a60e533a93c6d0088222bd8da209b9953 02-Oct-2010 James Dong <jdong@google.com> Merge "Turn off media time adjustment by default" into gingerbread
9160e4aa2af53122ac235823e04faa28084b85b0 02-Oct-2010 James Dong <jdong@google.com> Turn off media time adjustment by default

Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
ibstagefright/MPEG4Writer.cpp
2a21e73accfdbc8a836f533f23028bef92f86735 01-Oct-2010 Andreas Huber <andih@google.com> am 57853559: am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread

Merge commit '57853559c31154db9c202d653065c592169c5027'

* commit '57853559c31154db9c202d653065c592169c5027':
Start playing live streams from the start, no the middle...
57853559c31154db9c202d653065c592169c5027 01-Oct-2010 Andreas Huber <andih@google.com> am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread

Merge commit 'e619a9da44e4c00f9034917aef67f86da0bc207f' into gingerbread-plus-aosp

* commit 'e619a9da44e4c00f9034917aef67f86da0bc207f':
Start playing live streams from the start, no the middle...
e619a9da44e4c00f9034917aef67f86da0bc207f 01-Oct-2010 Andreas Huber <andih@google.com> Merge "Start playing live streams from the start, no the middle..." into gingerbread
aafe912e8364b6e5503180b16d26f1d53818721a 01-Oct-2010 Andreas Huber <andih@google.com> am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbread

Merge commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16'

* commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16':
Remove development-only code.
a424f7c628036d23af078cc89d104c27735970fb 01-Oct-2010 Andreas Huber <andih@google.com> Start playing live streams from the start, no the middle...

Change-Id: Ie01ba1250b51155cb1fb32fc3340189a16c01476
related-to-bug: 2368598
ibstagefright/httplive/LiveSource.cpp
d6d5cfb91469d4f060db7cfccfd883903ce95f16 01-Oct-2010 Andreas Huber <andih@google.com> am 469b8033: Merge "Remove development-only code." into gingerbread

Merge commit '469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp

* commit '469b80336368bef3742e97c15e9017c1f2d404ae':
Remove development-only code.
1981bd034a48393189f613e36ecf230a5fdf6dd1 01-Oct-2010 Andreas Huber <andih@google.com> am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread

Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'

* commit '14401bf7bca34c692f248406c78bd8b49783217a':
Squashed commit of the following:
21d28a2a13b3a587705908f446a35dd8660172f3 01-Oct-2010 Andreas Huber <andih@google.com> Remove development-only code.

Change-Id: Ic2ca0efb631eb779ca157fb01b02aa19a1222c06
related-to-bug: 2368598
ibstagefright/AwesomePlayer.cpp
14401bf7bca34c692f248406c78bd8b49783217a 01-Oct-2010 Andreas Huber <andih@google.com> am d1398db3: Merge "Squashed commit of the following:" into gingerbread

Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp

* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
Squashed commit of the following:
b72c7e36a2d9f51ff8a5023dc1de0986ee47e279 01-Oct-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 46744c7697f29aec71aed8de3c95ce035c284d97
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 16:44:57 2010 -0700

better separation of access units

Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c

commit d34952ac0feb1ae722ff65824d7353335502219b
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 15:35:01 2010 -0700

Support for ES packets that do not start on PES packet boundaries.

Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4
related-to-bug: 2368598

Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
ibstagefright/AwesomePlayer.cpp
ibstagefright/avc_utils.cpp
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/include/avc_utils.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/Android.mk
ibstagefright/mpeg2ts/ESQueue.cpp
ibstagefright/mpeg2ts/ESQueue.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
785c416ecf627a550c15f33800fe3091482b181a 01-Oct-2010 Eric Laurent <elaurent@google.com> am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread

Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9'

* commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9':
Issue 3032913: improve AudioTrack recovery time
de12c3cf56e3f27b2efc60eeae8b5e422747f2b9 01-Oct-2010 Eric Laurent <elaurent@google.com> am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread

Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp

* commit '220ab8877b234e6807b7f6d9028ba55d23220301':
Issue 3032913: improve AudioTrack recovery time
4712baab81d0b683bc22668d2278c9daff92797e 01-Oct-2010 Eric Laurent <elaurent@google.com> Issue 3032913: improve AudioTrack recovery time

This issue showed that when an AudioTrack underruns during a too long period
of time and is therefore disabled by audioflinger mixer, it takes an additional
delay of up to 3 seconds to recover.
This fix adds a simple mechanism to recover immediately when the client application
is ready to write data again in the AudioTrack buffer

Also throttle warnings on record overflows

Change-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d
ibmedia/AudioTrack.cpp
048449ebfa3f42e1431338785f225d25125f294e 30-Sep-2010 Gil Dobjanschi <virgild@google.com> Added ability to instantiate various implementations of the VideoEditor

Change-Id: I5b09afafff1c009bada4f49a5568286fe3cd9aef
ava/android/media/videoeditor/EffectKenBurns.java
ava/android/media/videoeditor/OverlayFrame.java
ava/android/media/videoeditor/VideoEditorFactory.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
f46731ddded0b399f3dfa5c04e6c449e6c280079 29-Sep-2010 Chia-chi Yeh <chiachi@android.com> am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread

Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'

* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de 29-Sep-2010 Chia-chi Yeh <chiachi@android.com> am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread

Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp

* commit 'd6877fa4971710150de20453bf4ba54dca863429':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
d6877fa4971710150de20453bf4ba54dca863429 29-Sep-2010 Chia-chi Yeh <chiachi@android.com> Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
081833d791e4b910d849bb15269a31232a0bca18 29-Sep-2010 Chia-chi Yeh <chiachi@android.com> AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.

This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same
file without conflict definition.

Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
ibstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
ibstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
ibstagefright/codecs/amrnb/enc/src/gsmamr_enc.h
82aa7f017daaaeb96c13e6e3491d5037ab471085 28-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Update code for new BT APIs.

Change-Id: Idf806cba8160e6075e33e26ee9936663b850e96c
ava/android/media/AudioService.java
e63f20b5fe373822758182226d7512859d8e8356 29-Sep-2010 Gil Dobjanschi <virgild@google.com> Merge "Save overlays to XML"
5665fd6ac2b2d3a00b3addf1ae897426896935d6 28-Sep-2010 Gil Dobjanschi <virgild@google.com> Save overlays to XML

Change-Id: I549c40b55a85022136dbd4899cc0d2d4da6e33de
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/Overlay.java
ava/android/media/videoeditor/OverlayFrame.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
c9a9800fa1572c3a25831bdf22f7b4579fd8bd10 29-Sep-2010 Eric Laurent <elaurent@google.com> am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread

Merge commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c'

* commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c':
Fix several audio effects problems.
09527066f8d2f9458a124081c4ef460f73d2ba7c 29-Sep-2010 Andreas Huber <andih@google.com> am 387bdcda: am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread

Merge commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd'

* commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd':
Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c 29-Sep-2010 Eric Laurent <elaurent@google.com> am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread

Merge commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68' into gingerbread-plus-aosp

* commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68':
Fix several audio effects problems.
4fd3ecc1f0b8d95f52b516cd81fe4f06607d5cb0 28-Sep-2010 Eric Laurent <elaurent@google.com> Fix several audio effects problems.

Fixed the following issues in LVM effect bundle wrapper:
- memory leaks in EffectCreate() in case effect creation fails at various stages
- Added saturation when accumulating to output buffer
- Fixed problems with enabled effects count when an effect is released while enabled
- Do not allocate temporary buffer for accumulation each time process() is called

Fixed the following issues in effects framework (AudioFlinger)
- Release effect synchronously in the library when deleted from effect chain
- Do not call the effect process function if no tracks are present in the same
audio session

Change-Id: Ifbd80a163415cfb3c0a337c12082853ea45d9c91
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
ce635b55043dbc498ab1ef712b226922818cfe53 28-Sep-2010 Andreas Huber <andih@google.com> am d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread

Merge commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023'

* commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023':
Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
3bf613b2687d0cce13ce70a7a6650832f9656cfd 28-Sep-2010 Andreas Huber <andih@google.com> am c889bbfa: am 4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread

Merge commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06'

* commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
1a3038586a3a46d0cdc487fea40ba4f7712d677d 28-Sep-2010 Andreas Huber <andih@google.com> am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread

Merge commit '9d59186068891834272c2e3ee6f9c4228af24656'

* commit '9d59186068891834272c2e3ee6f9c4228af24656':
Squashed commit of the following:
387bdcdadc312c8e9f702da164bd8bd53cbd92fd 28-Sep-2010 Andreas Huber <andih@google.com> am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread

Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp

* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
88a995edcf3c371845cb32aed8bcddb7509bf875 28-Sep-2010 Andreas Huber <andih@google.com> Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
762665094fafc3bbae3ef4ecaa531611e058b30f 28-Sep-2010 Dave Sparks <davidsparks@android.com> am 7dff9dfd: am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that w

Merge commit '7dff9dfd6176fad1318a27f16318561453a429f0'

* commit '7dff9dfd6176fad1318a27f16318561453a429f0':
Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
ad3fcfe845163e6fd40e13faf179c6c595963256 28-Sep-2010 Andreas Huber <andih@google.com> Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.

Change-Id: I4909fdf19518dbabb6c340e2a31b50dfe6c5b067
related-to-bug: 3029947
ibstagefright/AudioPlayer.cpp
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
d6c30e8c1521bc584f33500b8ee897dafdfec023 28-Sep-2010 Andreas Huber <andih@google.com> am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread

Merge commit 'be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp

* commit 'be0450619528e65eebfa1d7eab78fde757d094cc':
Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
be0450619528e65eebfa1d7eab78fde757d094cc 28-Sep-2010 Andreas Huber <andih@google.com> Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
2b359ed5b5ba4775609c13408b2cf1336c2cc45b 28-Sep-2010 Andreas Huber <andih@google.com> Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.

Change-Id: I43875b6adaf96d4e982ef3dfc3d6c8f7034ac51d
related-to-bug: 3036592
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
c889bbfa965f4ba90636f561c5e1353289d4cb06 28-Sep-2010 Andreas Huber <andih@google.com> am 4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread

Merge commit '4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp

* commit '4769f57948455277d0670ef18f64824ca5d894c1':
Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
4769f57948455277d0670ef18f64824ca5d894c1 28-Sep-2010 Andreas Huber <andih@google.com> Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
9d59186068891834272c2e3ee6f9c4228af24656 28-Sep-2010 Andreas Huber <andih@google.com> am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread

Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp

* commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
Squashed commit of the following:
3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7 28-Sep-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:" into gingerbread
38ae220bb7c06e3cc82f96dada769c6b12a79d09 28-Sep-2010 Andreas Huber <andih@google.com> Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.

related-to-bug: 3036592
Change-Id: Ib142b171c829ed74156c0281d9d4543fcc96c802
ibstagefright/OggExtractor.cpp
ibstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
ibstagefright/include/VorbisDecoder.h
b0725a4aebbb74a633ce9ec795d291c1e619f963 28-Sep-2010 Gil Dobjanschi <virgild@google.com> Merge "Validate Overlay and effect duration and start time."
f8b04868e6fa1f7ca9c1fe3f39ae1f46a530b6df 28-Sep-2010 Gil Dobjanschi <virgild@google.com> Validate Overlay and effect duration and start time.

Change-Id: I3235573f9edc65f148541adacd01eb5caa0b8615
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/EffectColor.java
ava/android/media/videoeditor/EffectKenBurns.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/Overlay.java
ava/android/media/videoeditor/OverlayFrame.java
7dff9dfd6176fad1318a27f16318561453a429f0 28-Sep-2010 Dave Sparks <davidsparks@android.com> am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on t

Merge commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1' into gingerbread-plus-aosp

* commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1':
Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
e11eba3c8a799a9533bd9a85ef9d570c833b4555 28-Sep-2010 Mike Lockwood <lockwood@android.com> MtpCursor: Fix long to int truncation bug

BUG: 2978335

Change-Id: I2491a2ce3b65afa272540090cabace52067b8534
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpCursor.cpp
tp/MtpCursor.h
90bbe5e486850df6c70942bcf8b7b6687304f7e1 28-Sep-2010 Mike Lockwood <lockwood@android.com> MtpCursor: Remove some unused variables

Change-Id: Ie1c88bd817c45fc19e34165f8d8557f00514188d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpCursor.java
c73305cfd7bad91f654dfa818c44b640594d7aad 24-Sep-2010 Dharmaray Kundargi <dharmaray@google.com> work on review comments and code formating.
Removed white spaces

Change-Id: Ic54817bfc205be536ec086bdfd34b35b0eeac1a3
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/MediaVideoItem.java
124a346c7ae24a42048ab1a42f001832f9de9574 28-Sep-2010 Dave Sparks <davidsparks@android.com> Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
The dump function whitelists several directories as filters to the output.
The mount point changed for SD card in Froyo, and we started filtering files
that were open on the SD card. This fix changes the filter for the SD card,
and adds the directory for data files as well.

Change-Id: I61b67c3d11d93dbd530e8b3566000e79bc037137
ibmediaplayerservice/MediaPlayerService.cpp
c751eccad38cf46d7478eca85beefecd2c2b4c3b 27-Sep-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 29a4d3effb05a2e074cb0693316ab1977baeb0b6
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 12:01:32 2010 -0700

Fully working implementation of MPEG2TSWriter (for AAC and AVC sources).

Change-Id: I8a32a47565b647bf6c078c520e39565e08ea0d84

commit f4dec4c3899f3be393508e180d6c07e249d3335e
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 10:36:31 2010 -0700

More reliable identification of MPEG2 transport streams. Don't keep scanning forever in case the stream does not have both audio and video tracks.

Change-Id: Icc5b4e8be145b2805e8776559546a6818342aea7

commit 4fe3cc942f9b3d3cf54138b828c41214aa916dd2
Author: Andreas Huber <andih@google.com>
Date: Mon Sep 27 08:23:39 2010 -0700

test code

Change-Id: I16560a17661407d06497f99ff88230724bb898af

commit 64d988b24f49f179a90fa677be11c823959e734b
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 23 14:42:52 2010 -0700

First shot at supporting writing to an MPEG2 transport stream.

Change-Id: Ie537939a99fa3ddc0c7661c47c18277584817c74

Change-Id: If78fd034af8f6e8ceac8dbeff96d5ecb3f6b96dc
ibstagefright/Android.mk
ibstagefright/MPEG2TSWriter.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
ec67253bf0349be4c1282c16e440d126eb49f5bf 27-Sep-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix local reference leaks."
bf836ec6edf6411c68579730248fd84606c06520 27-Sep-2010 Gil Dobjanschi <virgild@google.com> Merge "Bug fix: getDuration vs. getDurationTimeline"
4b66f7a53f1b5a77c3ca1c12f256cdef078c1799 26-Sep-2010 Gil Dobjanschi <virgild@google.com> Bug fix: getDuration vs. getDurationTimeline

Change-Id: I41a40a3fc3b3674b5fcacecda174e924211b4ad2
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Transition.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
731a95a5f1399fededde0b6d529ad88e5d6e9456 27-Sep-2010 Mike Lockwood <lockwood@android.com> Merge changes I424ba760,Ic0826085

* changes:
MTP: Implement extra object properties for audio, video and image files
MediaStore: Add helper method to create Uri for querying genre for an audio file
8839471f4d83238f9c017142dcbe3f915f3213fb 27-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Fix local reference leaks.

We cannot rely on the VM automatically freeing local references for us
in a timely manner in JNI code that is not called directly from Java.

Change-Id: I6ee8a9a97cb557b9d3b2ace4e4d20467b436fb9c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpDatabase.cpp
ae078f7dacdc719d045c2d19bbce019599fec64e 26-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Implement extra object properties for audio, video and image files

Read-only support at this point.

BUG: 2869730

Change-Id: I424ba760c8f5f4af394bd65276f19438fa6da6cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
e9e0e0e970ccfeacee58b5e8e3dbb81d9c1d17dc 27-Sep-2010 James Dong <jdong@google.com> am a9f17c8b: am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread

Merge commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d'

* commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d':
Fix track duration calculation if the start timestamp is non-zero
a9f17c8b424b505b50fdfb920cab37c32cbe628d 27-Sep-2010 James Dong <jdong@google.com> am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread

Merge commit 'bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp

* commit 'bf47092e1e76224474745b6919febd3aa9df5bcf':
Fix track duration calculation if the start timestamp is non-zero
bf47092e1e76224474745b6919febd3aa9df5bcf 27-Sep-2010 James Dong <jdong@google.com> Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
dacebe62c61cebb801fce0f80abad8a21aa8aff9 24-Sep-2010 James Dong <jdong@google.com> Fix track duration calculation if the start timestamp is non-zero

o Updated the comments in the patch
o Added some additional checks on the timestamp

Change-Id: I8ad81eb6bfe358c1db5245cbb52efc905cdc234c
ibstagefright/MPEG4Writer.cpp
a54abd06d2a5ce3f2773fbd749b6eab035df4857 27-Sep-2010 Andreas Huber <andih@google.com> am fa5c8fc4: am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread

Merge commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc'

* commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc':
Support other kinds of HTTP redirect in NuHTTPDataSource
fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc 27-Sep-2010 Andreas Huber <andih@google.com> am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread

Merge commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp

* commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
Support other kinds of HTTP redirect in NuHTTPDataSource
abaabb2c7994e5a5026c2e2bd860d7f21eed0451 27-Sep-2010 Andreas Huber <andih@google.com> Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
ab2116c3516b2d731e4e34f6fcb5cdac503f2049 27-Sep-2010 Andreas Huber <andih@google.com> Support other kinds of HTTP redirect in NuHTTPDataSource

Change-Id: I3268a94cfb48cee9caa8914804d7907ff91d8a8e
related-to-bug: 3037686
ibstagefright/NuHTTPDataSource.cpp
3b8901946b41fa95218fa7bfade333600ba2932b 27-Sep-2010 Eric Laurent <elaurent@google.com> am 1b37df95: am 9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread

Merge commit '1b37df95ec9d03aaa5f4055c6cd86db42f9c9727'

* commit '1b37df95ec9d03aaa5f4055c6cd86db42f9c9727':
Fix error in AudioEffect command status reporting.
1b37df95ec9d03aaa5f4055c6cd86db42f9c9727 27-Sep-2010 Eric Laurent <elaurent@google.com> am 9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread

Merge commit '9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp

* commit '9627847d588cd969f60dcc79d165209184a90069':
Fix error in AudioEffect command status reporting.
cc64c5dbfbf11f513f60a82ee590f62dfb9a1565 26-Sep-2010 Mike Lockwood <lockwood@android.com> Merge changes I1302cacd,I05125c79,I8d9653ce

* changes:
MTP: Fix some warnings
MTP: Include current property value in GetDevicePropDesc
MTP: Fix reading and writing device property descriptors
ac745c1c6b625ab4254086bf7e763575e3482e6d 26-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Fix some warnings

Change-Id: I1302cacd1df885c770332cecaaea9f7c8ab97b88
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpCursor.cpp
tp/MtpObjectInfo.cpp
ests/mtp/mtp.cpp
a2a2128423309641a6b508a15404f3a7e8f3077b 26-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Include current property value in GetDevicePropDesc

Change-Id: I05125c79ad58b6f75734fcedcc8af9b689fa9ff3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpDatabase.cpp
tp/MtpProperty.cpp
tp/MtpProperty.h
tp/MtpStringBuffer.cpp
tp/MtpStringBuffer.h
tp/MtpTypes.h
564ff8432173545137ac8c658dac52306bc070be 25-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Fix reading and writing device property descriptors

Change-Id: I8d9653ceedfed688addd6c4194c097d7090c3468
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpProperty.cpp
d66a3fe1710eb2c19896c299c812fa0d8bd175b3 25-Sep-2010 Gil Dobjanschi <virgild@google.com> Merge "Adjust the duration of transitions if needed."
a7936a5d6d3c989055fffa74f6c5a4b4a8c83114 25-Sep-2010 Eric Laurent <elaurent@google.com> am f3ae63ee: am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread

Merge commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7'

* commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7':
fix problem in AudioEffect JNI setup.
4d3fb50782acefbcff29801629a79d78ffd4e332 24-Sep-2010 Eric Laurent <elaurent@google.com> Fix error in AudioEffect command status reporting.

AudioEffect::command() should not interpret the status
returned in pReplyData unless the command is ENABLE or
DISABLE.

Also fixed:
- bug in Visualizer::getWAveForm() status reporting.
- wrong initialization value for capture buffer in visualizer engine.

Change-Id: I60fb0011f9dba96ee74661dec1e8ef441edcaf35
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/Visualizer.cpp
05152ffd67a17491337236621aa5f7ef7c3b51db 24-Sep-2010 Gil Dobjanschi <virgild@google.com> Adjust the duration of transitions if needed.

Change-Id: I2e5f9431b1f1c25b30e2d144916140365b10021b
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Transition.java
f3ae63eef2d7f55c793b2e76d1371f82cea0aab7 24-Sep-2010 Eric Laurent <elaurent@google.com> am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread

Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp

* commit '52f58e96a723a56e6619c237c814a07503745de9':
fix problem in AudioEffect JNI setup.
2fb43ef8c0b922c1bd0d7cb6867e30d702d4bdb8 24-Sep-2010 Eric Laurent <elaurent@google.com> fix problem in AudioEffect JNI setup.

There is a problem in AudioEffect and Visualizer native_setup() methods
that causes a crash in the application after the mediaserver process
has crashed and restarted.
The problem is that the native AudioEffect/Visualizer constructor is
called while the JNI is in critical state after calling
GetPrimitiveArrayCritical(). As the mediaserver process just restarted, the
first call to AudioSystem will cause the binder IAudioflinger interface to
be reteived and a callback send to AudioSystem JNI to clear the mediaserver
error state. This will call env->FindClass() and crash due to the JNI being
in critical state.

Also fixed a similar problem in AudioTrack JNI

Change-Id: I4a9026a3e26c7f78d9b4b4bec1aac90fbee2ab62
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ed63f505ea8a8d89afb51cf4d0b21cad790ec469 24-Sep-2010 James Dong <jdong@google.com> Merge "Added two more video encoders"
ab853b39be33ee1403c4917bf521bb3fe44d4e1d 24-Sep-2010 Mike Lockwood <lockwood@android.com> Merge "Add constant for SDCARD_RW group ID."
920d649949f6636a9e4220904c9a3c5cd860fd53 24-Sep-2010 Marco Nelissen <marcone@google.com> Send album artist to the media provider again.

Change-Id: I13f44bab2024adcfbc4b9491ac565cfdf15ef9d9
ava/android/media/MediaScanner.java
58fd98accbff409601587b3357f2b3acf370f606 24-Sep-2010 Mike Lockwood <lockwood@android.com> Add constant for SDCARD_RW group ID.

Change-Id: I3b009cd06d3c1bc308ba82694db7383134709f75
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
dbaa3c8f68a51aaac2a2a93f7f3e5b6bd9b3b134 24-Sep-2010 Mike Lockwood <lockwood@android.com> Merge changes Ie8bd9107,I1065179a

* changes:
MTP: Reenable GetObjectPropValue and SetObjectPropValue
MTP: Minor debug output cleanup
d3bfecb0c9bdf3651a06e86c7c8607768a29a9ae 24-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Reenable GetObjectPropValue and SetObjectPropValue

Windows no longer chokes now that we implement the minimum set of properties

BUG: 2869730

Change-Id: Ie8bd9107610b9b38f060ad8a2f05334a3b4aff9b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpServer.cpp
9f67924862cf47dbd0bd60769840c35e6f10b897 24-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Minor debug output cleanup

Change-Id: I1065179aa64f43c7d8067ccda249319a016840ab
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
2c2d06da2a2e6c632adf4caf2f0ff13beb06ba8c 24-Sep-2010 Mike Lockwood <lockwood@android.com> Merge changes I75c4c7dc,Ie9f3dea3

* changes:
MTP: List all the formats we support in addition to FORMAT_UNDEFINED
MTP: Fix problems with signed ints in MtpCursor.cpp
12b8a99fc1d4acc427307a4a924bf33745410260 24-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: List all the formats we support in addition to FORMAT_UNDEFINED

Fixes Windows Media Player support

BUG: 3003770

Change-Id: I75c4c7dcdd833b3b5b200339e24c38d583efb1fa
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ba7655432c31c1a3ed48e768403d0b43ce9b2395 23-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Fix problems with signed ints in MtpCursor.cpp

BUG: 2978335

Change-Id: Ie9f3dea3b88b00a555e1ca3232f196e83ee7a6da
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpCursor.cpp
tp/MtpCursor.h
2e87f7b7075db8b47649280daa31cb58b7d42670 24-Sep-2010 James Dong <jdong@google.com> Added two more video encoders

Change-Id: Ia426da5bfc255974d7bbf3915a473543e0841dc9
ibstagefright/OMXCodec.cpp
b9354fdf729c1506cb433f659b3acdb6757e5adb 23-Sep-2010 Andreas Huber <andih@google.com> am 13770dcc: am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread

Merge commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33'

* commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33':
Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
13770dcce2cc1b4268ba092b59bc5a4c049f3a33 23-Sep-2010 Andreas Huber <andih@google.com> am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread

Merge commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275' into gingerbread-plus-aosp

* commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275':
Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
7b2ed5d7d607e435b88ea75db3a1a43a00a86275 23-Sep-2010 Andreas Huber <andih@google.com> Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly." into gingerbread
e7635933b6f3aa1e306f13663fd52b0210f0e98a 23-Sep-2010 Andreas Huber <andih@google.com> Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.

Change-Id: I1423923fafbcac6911218277e2bbfa068e49dcc6
ibstagefright/MPEG4Writer.cpp
7eb805707fc512f1711fbf00eb5eec2472a0bae1 23-Sep-2010 Gil Dobjanschi <virgild@google.com> Merge "1. Added OverlayFrame constuctor 2. Invalidate transitions when trimming video 3. Remove image file when removing an OverlayFrame 4. Bug fixes in the VideoEditor implementation"
bb7684bafad2d60f064ace2403b24c19040ea95c 23-Sep-2010 Eric Laurent <elaurent@google.com> resolved conflicts for merge of ac4a284a to master

Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8
ac4a284ab4b54a6193f1cca077e6a79ce0ba699c 23-Sep-2010 Eric Laurent <elaurent@google.com> am 7864c72b: Merge "Fix issue 3022800." into gingerbread

Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp

* commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8':
Fix issue 3022800.
1a5149e5d7f2dddc8b324f7695e69fd89af73c52 22-Sep-2010 Eric Laurent <elaurent@google.com> Fix issue 3022800.

- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class

Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
ava/android/media/AudioEffect.java
ava/android/media/AudioTrack.java
ava/android/media/BassBoost.java
ava/android/media/EnvironmentalReverb.java
ava/android/media/Equalizer.java
ava/android/media/MediaPlayer.java
ava/android/media/PresetReverb.java
ava/android/media/Virtualizer.java
ava/android/media/Visualizer.java
ava/android/media/audiofx/AudioEffect.java
ava/android/media/audiofx/BassBoost.java
ava/android/media/audiofx/EnvironmentalReverb.java
ava/android/media/audiofx/Equalizer.java
ava/android/media/audiofx/PresetReverb.java
ava/android/media/audiofx/Virtualizer.java
ava/android/media/audiofx/Visualizer.java
ava/android/media/audiofx/package.html
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/EnergyProbe.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioEffectTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEnvReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPresetReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVisualizerTest.java
3611a0ef0653105d6f28996786ed7f2ce1f3f91f 23-Sep-2010 James Dong <jdong@google.com> am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders

Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde'

* commit '693a430cff3c9fac503b5005e9fd5419611eddde':
Ignore errors from correction parameter query and config for M4v and H263 encoders
a03f8fb7d0ba9aa8991f47358a792a9cbe708c4b 23-Sep-2010 James Dong <jdong@google.com> am 30c7e132: am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread

Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'

* commit '30c7e132171edf41a787d6e29d169ac467f6f1ae':
Use the advertised profile and level from M4V and H263 video encoders
693a430cff3c9fac503b5005e9fd5419611eddde 23-Sep-2010 James Dong <jdong@google.com> am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders

Merge commit '903fc221068d02bdb53ba2a48f86339caf405259' into gingerbread-plus-aosp

* commit '903fc221068d02bdb53ba2a48f86339caf405259':
Ignore errors from correction parameter query and config for M4v and H263 encoders
30c7e132171edf41a787d6e29d169ac467f6f1ae 23-Sep-2010 James Dong <jdong@google.com> am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread

Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp

* commit '697bd76e427f00584a0e026ceca2f4d39215cd0d':
Use the advertised profile and level from M4V and H263 video encoders
903fc221068d02bdb53ba2a48f86339caf405259 23-Sep-2010 James Dong <jdong@google.com> Ignore errors from correction parameter query and config for M4v and H263 encoders

This feature is not essential for camcorder application

Change-Id: Id560632207dcf24fe361280ebe8178ea7332f22d
ibstagefright/OMXCodec.cpp
ff371cf0ed8ceb547043cd2f7db0cfd0990203b2 23-Sep-2010 Mike Lockwood <lockwood@android.com> MediaScanner: disable album artist support until MediaProvider really supports it

Fixes a "no such column" exception in MediaProvider.update() that I somehow
missed when testing the MediaProvider refactoring.

Change-Id: Icc502a5c0e3bd150b353972d000b978a9e044abc
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
21e9da6f446301756ddabbfb9d61155db5480366 23-Sep-2010 Gil Dobjanschi <virgild@google.com> 1. Added OverlayFrame constuctor
2. Invalidate transitions when trimming video
3. Remove image file when removing an OverlayFrame
4. Bug fixes in the VideoEditor implementation

Change-Id: I7bd3c888848edaf659a4faef14ad1c5a6603c3cc
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/OverlayFrame.java
ava/android/media/videoeditor/TransitionAlpha.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
a9158425cc5798594523f78f8364d55ce8d82753 23-Sep-2010 Mike Lockwood <lockwood@android.com> Merge "Changes to support MediaProvider refactoring"
1e0e166ebe9d749b4132c2d019e2857e49b52426 23-Sep-2010 James Dong <jdong@google.com> Use the advertised profile and level from M4V and H263 video encoders

This is already the case for AVC video encoder

Change-Id: I9cc97a03ab457b4bd0b21832c09f6d0aa7f5fc39
ibstagefright/OMXCodec.cpp
736da9cd1f0a63db7b548addb1a189a49735305c 23-Sep-2010 Eric Laurent <elaurent@google.com> am 4744774a: am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread

Merge commit '4744774a7a3644489ec1159f5554a41eb943a51b'

* commit '4744774a7a3644489ec1159f5554a41eb943a51b':
Fix more audio effects auto tests
4744774a7a3644489ec1159f5554a41eb943a51b 23-Sep-2010 Eric Laurent <elaurent@google.com> am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread

Merge commit '3efbc55545673f3988cb1b2934b903d78f8873cd' into gingerbread-plus-aosp

* commit '3efbc55545673f3988cb1b2934b903d78f8873cd':
Fix more audio effects auto tests
3efbc55545673f3988cb1b2934b903d78f8873cd 23-Sep-2010 Eric Laurent <elaurent@google.com> Merge "Fix more audio effects auto tests" into gingerbread
2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1 23-Sep-2010 Andreas Huber <andih@google.com> am a72bb404: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread

Merge commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2' into gingerbread-plus-aosp

* commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2':
Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
9c37da77216715c8dc7446a9cd05f5bf4c80c930 22-Sep-2010 Andreas Huber <andih@google.com> Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.

Change-Id: I73974a336852974e2fb95a9626c1a96f296449eb
ibstagefright/omx/tests/OMXHarness.cpp
ec1e9c7a441d6a8ba6206386a1fb43652f6bbd36 22-Sep-2010 Eric Laurent <elaurent@google.com> Fix more audio effects auto tests

commit 672c0dc3a04cb149691603342c319994e21235cb broke the energy probe
used by auto tests to verify that an effect is actually enabled.
The probe is based on the Visualizer which now scales the capture to maximise
the signal level: this prevents from detecting level changes between subsequent captures.
Playing sound at a lower volume moves the signal level out of the range where
scalling occurs and makes comparison possible again.

Change-Id: Ib56dec6e619c6d778dcc3ca6453091bf6136f290
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java
5a08b50e8029b7f11f998246bbae1a99d806789c 22-Sep-2010 Mike Lockwood <lockwood@android.com> Merge "MTP host: Use Java longs for storage and object IDs"
cc6b941cf01994c04b5e1f92b0860be8e2abc50e 22-Sep-2010 Andreas Huber <andih@google.com> am 4374b23d: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread

Merge commit '4374b23d6be406710b91be746229e6c548613410' into gingerbread-plus-aosp

* commit '4374b23d6be406710b91be746229e6c548613410':
Make sure we drain the avc software decoder's output queue once we run out of input data.
55f8aee55c3b52553b9ec1b58afcd988bb2b0164 22-Sep-2010 Andreas Huber <andih@google.com> Make sure we drain the avc software decoder's output queue once we run out of input data.

Change-Id: I3d92ebae4951b618a6dfcf42936cc4c63d4de539
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/include/AVCDecoder.h
f5a8f2f4634e4fffbb20c66fa37980d0599a27f1 22-Sep-2010 Andreas Huber <andih@google.com> Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
583df4ff73c7cf1200bd19f7adb63c433a88e630 22-Sep-2010 Andreas Huber <andih@google.com> Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.

Change-Id: I0650af10acb3097e9f03c6079992305540b6bc86
ibstagefright/omx/tests/OMXHarness.cpp
31e323e6c874e6f306e7f35a22350750b23b06de 22-Sep-2010 Andreas Huber <andih@google.com> Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread
3172ab47988a008c873ce94a5e85c452197b51ba 22-Sep-2010 Andreas Huber <andih@google.com> Make sure we drain the avc software decoder's output queue once we run out of input data.

Change-Id: I5de540675a64ac0b170eee10691d77a647950397
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/include/AVCDecoder.h
48ff0daae3db57f8d1cb7bff8de299b92e386cd5 22-Sep-2010 Eric Laurent <elaurent@google.com> am b35f36f0: am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread

Merge commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca'

* commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca':
Fix broken insert reverb auto tests.
b35f36f08ddc59fb0e264aff9de4d465321b26ca 22-Sep-2010 Eric Laurent <elaurent@google.com> am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread

Merge commit '4f294558aa23bc155988838ef153dca731efe707' into gingerbread-plus-aosp

* commit '4f294558aa23bc155988838ef153dca731efe707':
Fix broken insert reverb auto tests.
4f294558aa23bc155988838ef153dca731efe707 22-Sep-2010 Eric Laurent <elaurent@google.com> Merge "Fix broken insert reverb auto tests." into gingerbread
71fe631c78756da48662f8ee220fa7b09f5413fb 22-Sep-2010 Eric Laurent <elaurent@google.com> Fix broken insert reverb auto tests.

commit 27a2fdfb8ad1606bdb686c35e30ae894dd037588 changed the
insert reverb behavior when it is attached to a track in that
the reverb tail is silenced immediately when the track is paused.
The tests have been modified to test the insert reverb on session 0.

Change-Id: I90c6fec40167966853acfeaa4dec2b96f9e7839f
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEnvReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPresetReverbTest.java
dab59d1534e50f3c818c96f34f29389f818f077b 22-Sep-2010 Eric Laurent <elaurent@google.com> am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbread

Merge commit '6943b94b8f267c83060946bae0961efc30444dee'

* commit '6943b94b8f267c83060946bae0961efc30444dee':
Fix issue 2913071.
6943b94b8f267c83060946bae0961efc30444dee 22-Sep-2010 Eric Laurent <elaurent@google.com> am a6dc4699: Merge "Fix issue 2913071." into gingerbread

Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
Fix issue 2913071.
a6dc4699222a484222d1c54d5319f302a02e406b 22-Sep-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2913071." into gingerbread
55e024a925b061193432339a003b141103969250 22-Sep-2010 Andreas Huber <andih@google.com> am 0b2affe8: am 87d208f7: Merge "This log message is codec specific." into gingerbread

Merge commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1'

* commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1':
This log message is codec specific.
41fd0a0fa98adf06cad78d168f3e5fe4ab272ea4 22-Sep-2010 Andreas Huber <andih@google.com> am af909581: am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread

Merge commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6'

* commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6':
Remove stagefright foundation's incompatible logging interface and update callsites.
0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1 22-Sep-2010 Andreas Huber <andih@google.com> am 87d208f7: Merge "This log message is codec specific." into gingerbread

Merge commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13' into gingerbread-plus-aosp

* commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13':
This log message is codec specific.
af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6 22-Sep-2010 Andreas Huber <andih@google.com> am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread

Merge commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc' into gingerbread-plus-aosp

* commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc':
Remove stagefright foundation's incompatible logging interface and update callsites.
87d208f7ea7d8fc518d1403aae6d1ba1833bff13 22-Sep-2010 Andreas Huber <andih@google.com> Merge "This log message is codec specific." into gingerbread
67738486d9d1bdc2e6fb0c04698fd74de689acbc 22-Sep-2010 Andreas Huber <andih@google.com> Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread
6e3fa444c5b3970666707bb2b6d25e2615dafe80 21-Sep-2010 Andreas Huber <andih@google.com> Remove stagefright foundation's incompatible logging interface and update callsites.

Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
ibstagefright/NuCachedSource2.cpp
ibstagefright/ThreadedSource.cpp
ibstagefright/foundation/ADebug.cpp
ibstagefright/foundation/ALooperRoster.cpp
ibstagefright/foundation/Android.mk
ibstagefright/foundation/hexdump.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTPSource.h
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/UDPPusher.cpp
ibstagefright/rtsp/rtp_test.cpp
672c0dc3a04cb149691603342c319994e21235cb 21-Sep-2010 Eric Laurent <elaurent@google.com> Fix issue 2913071.

Scale audio signal during capture according to peak level so that
returned values on 8 bits contain enough information even for weak
signals.

Also do not reject requests to enable/disable the visualizer if we are
already in the requested state.

Change-Id: I07a705619764350834e61f82d161761eab688747
ava/android/media/Visualizer.java
ibeffects/visualizer/EffectVisualizer.cpp
af0a1883b8d67019f386f31239ddb8eb60a12a20 22-Sep-2010 Andreas Huber <andih@google.com> This log message is codec specific.

Change-Id: I603ae7bd13b186a6df0a26ea9abe073e89276caf
ibstagefright/OMXCodec.cpp
c2087e3c7acde1d3f14ebd83e68ca967b058468e 21-Sep-2010 Gil Dobjanschi <virgild@google.com> Merge "Added the behavior paramter to transition constructors"
590f87fe9a00777e73e3866c64ee4bf0bf987955 21-Sep-2010 Gil Dobjanschi <virgild@google.com> Added the behavior paramter to transition constructors

Change-Id: Ic8758fb81e9b9c30982f3ced2d9fffc3439b7c7e
ava/android/media/videoeditor/Transition.java
ava/android/media/videoeditor/TransitionEndCurtainClosing.java
ava/android/media/videoeditor/TransitionEndFadeToBlack.java
ava/android/media/videoeditor/TransitionStartCurtainOpening.java
ava/android/media/videoeditor/TransitionStartFadeFromBlack.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
8dc81c10140e39f6c246dc8a638db79daf540265 21-Sep-2010 Eric Laurent <elaurent@google.com> am 96d5c17e: am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread

Merge commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f'

* commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f':
Made audio effect control panel intents public.
96d5c17e7828f1a5cbeb3d87e0146d145870558f 21-Sep-2010 Eric Laurent <elaurent@google.com> am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread

Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
Made audio effect control panel intents public.
8d1513e13c1e3d0142423570c0028e147bf0ea37 21-Sep-2010 Eric Laurent <elaurent@google.com> Merge "Made audio effect control panel intents public." into gingerbread
92cf2d60851462d91a1eb4b9615ea93579dd4330 21-Sep-2010 Eric Laurent <elaurent@google.com> Made audio effect control panel intents public.

Change-Id: If927606a24966605eb3e02788b2477937349d518
ava/android/media/AudioEffect.java
1d2f4506806838aee4720d94edd31b85b87462c5 21-Sep-2010 James Dong <jdong@google.com> am e436ef09: am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread

Merge commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193'

* commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193':
Another attempt for fixing AAC+/eAAC+ related issue
e436ef09d205eee473d5a4a4d0a1721b8dfbe193 21-Sep-2010 James Dong <jdong@google.com> am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread

Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
Another attempt for fixing AAC+/eAAC+ related issue
f1f5361e328c13be80e3760d8cc2170d70c9d0ba 21-Sep-2010 Mike Lockwood <lockwood@android.com> MTP host: Use Java longs for storage and object IDs

This avoids problems with unsigned 32 bit numbers with cameras that use
storage and object IDs > 0x7FFFFFFF

Change-Id: I615f2d468851e9d6ff8882d22966d3687697d8eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ava/android/media/MtpCursor.java
ni/android_media_MtpClient.cpp
ni/android_media_MtpCursor.cpp
ests/CameraBrowser/Android.mk
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
ests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java
40da64f07b2eab76878958b637ac2facde2ba260 18-Sep-2010 James Dong <jdong@google.com> Another attempt for fixing AAC+/eAAC+ related issue

The decoder has to decode the very first two frames (decoder specific data + first data
frame) in order to be really sure whether a stream is AAC or AAC+/eAAC+.

bug - 2966336

Change-Id: Ib12a07285933df0d6c346370a12f70e99e811881
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/include/AACDecoder.h
1779789b427747026d96266bd621baee5aad2a32 21-Sep-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: show format in object info and show info for non-JPEG objects

Change-Id: I22b1906fecbf8609bc688a148180edc95fa1badf
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/res/layout/object_info.xml
ests/CameraBrowser/res/values/strings.xml
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
88fc2b85cb6f9b4ac33211e3a6ad0dbbee13afc9 21-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Fix typo that resulted in the MTP provider returning thumb format for object format

BUG: 2994234

Change-Id: I99574043d3e0b310b9b7246f89b5b4a1e14fb5a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpCursor.cpp
ca216a03f5301dd7d28a31529ae44d4974255b37 18-Sep-2010 Marco Nelissen <marcone@google.com> am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread

Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c'

* commit '5c9f35799422d818f34f814c76c2acd8c939a40c':
Add a check to track a problem the monkey script has been triggering.
11dd325466ce62b93c3d4737939794ecc9f493fc 18-Sep-2010 Gil Dobjanschi <virgild@google.com> Merge "I splitted the start and end transtions into separate classes."
7c1df82880646f0b840162aeff499ad490cc8e0a 18-Sep-2010 Gil Dobjanschi <virgild@google.com> I splitted the start and end transtions into separate classes.

Change-Id: Ia8fbf5b34ee4b96fa4339d6dda78ec03c8a08615
ava/android/media/videoeditor/TransitionAtEnd.java
ava/android/media/videoeditor/TransitionAtStart.java
ava/android/media/videoeditor/TransitionEndCurtainClosing.java
ava/android/media/videoeditor/TransitionEndFadeToBlack.java
ava/android/media/videoeditor/TransitionStartCurtainOpening.java
ava/android/media/videoeditor/TransitionStartFadeFromBlack.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
0a5dd105f7b8887c0cc36363c1bcfa4093628ca9 18-Sep-2010 Andreas Huber <andih@google.com> am 7bc600cb: am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.

Merge commit '7bc600cb08394e60eef984843976d4f79e5d94e8'

* commit '7bc600cb08394e60eef984843976d4f79e5d94e8':
Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
5c9f35799422d818f34f814c76c2acd8c939a40c 18-Sep-2010 Marco Nelissen <marcone@google.com> am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread

Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp

* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
Add a check to track a problem the monkey script has been triggering.
f6bd4369fd12c983b20993c98030bc581a7274c5 18-Sep-2010 Andreas Huber <andih@google.com> resolved conflicts for merge of 1fc97385 to master

Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
3c473ea7f9aee2f85d9326e07a9764f566334dc6 18-Sep-2010 Marco Nelissen <marcone@google.com> Add a check to track a problem the monkey script has been triggering.

Change-Id: If3896946d993cbab2442e17740f18efd7e753a3b
ibmedia/mediaplayer.cpp
872630590501cef9783f0669218c3e85e218db05 17-Sep-2010 Nipun Kwatra <nkwatra@google.com> Merge "Adding default profiles for specific levels."
d48a15c3fead59a1aa710a16bb5f923164475918 17-Sep-2010 Nipun Kwatra <nkwatra@google.com> Adding default profiles for specific levels.

The low and high profiles should each match one of the
specific profiles. So we need to add the specific profiles
corresponding to the low/high profiles. This makes the
default profile compliant to documentation + cts.

Also fixed javadoc to account time lapse profiles.

Change-Id: I34e7307d00ce261c69dc10ead2900025c7f6d428
ava/android/media/CamcorderProfile.java
ibmedia/MediaProfiles.cpp
7bc600cb08394e60eef984843976d4f79e5d94e8 17-Sep-2010 Andreas Huber <andih@google.com> am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.

Merge commit 'f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp

* commit 'f98197a7274c2d7da647f52b3d8b0c74492139af':
Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
1fc97385d8c375eac2c9c61884596d150dc1f4fe 17-Sep-2010 Andreas Huber <andih@google.com> am 524e6f62: Register the new OMX components.

Merge commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c' into gingerbread-plus-aosp

* commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c':
Register the new OMX components.
f98197a7274c2d7da647f52b3d8b0c74492139af 17-Sep-2010 Andreas Huber <andih@google.com> Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.

Change-Id: I9c896cf07dea0c3201b6f074dbaf27e6d85cd784
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMX.cpp
7553cf74e67a83440139b34a098b90a2ad6ed86d 16-Sep-2010 Nipun Kwatra <nkwatra@google.com> Implemented frequent read returns for quick stop in time lapse.

If the frame capture interval is large, read will block for a long time.
Due to the way the mediaRecorder framework works, a stop() call from
mediaRecorder waits until the read returns, causing a long wait for
stop() to return. To avoid this, we return a copy of the last read
frame with the same time stamp if a frame is not available quickly.
This keeps the read() call from blocking too long. This method is
triggered when startQuickReadReturns() is called on
CameraSourceTimeLapse.

In the still camera case, also using waitRelative on Condition
instaed of sleeping, so that we can wake it up.
Also for the idle check instead of sleeping, we now wait on a
condition variable, which is woken up when the last takePicture
callback gets called.

Change-Id: Ia74386e175536aee0f44ae2f8b114c353d3d72f5
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
524e6f62c93e9947f3f9de386c6f6be7a3085d3c 16-Sep-2010 Andreas Huber <andih@google.com> Register the new OMX components.

Change-Id: I795287c63073ca86ad0f97d6afcfc85c401dc984
ibstagefright/OMXCodec.cpp
09a985187a8cd073b4f0d50f991ba66c48f6af10 17-Sep-2010 Andreas Huber <andih@google.com> am 92aa28ad: am a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread

Merge commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9'

* commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
ec7291c99f60658fff3dc1921d2908c986ca3e9e 17-Sep-2010 Gil Dobjanschi <virgild@google.com> Merge "Initial Video Editor API"
92aa28addd5dbe576b2c1b66cbc00c561402f2b9 17-Sep-2010 Andreas Huber <andih@google.com> am a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread

Merge commit 'a7516e90d01a22d17a470695eefa905e0ff066cc' into gingerbread-plus-aosp

* commit 'a7516e90d01a22d17a470695eefa905e0ff066cc':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
a7516e90d01a22d17a470695eefa905e0ff066cc 17-Sep-2010 Andreas Huber <andih@google.com> Merge "Make sure the .wav extractor does not read data outside the bounds of the 'data' box." into gingerbread
fdacc8be92cd36f712cfdb0fcf9b0e847f8eeb58 07-Sep-2010 Gil Dobjanschi <virgild@google.com> Initial Video Editor API

Change-Id: Iaa91e78d0e50f45ceb943bab93c4f1ea1bdee003
ava/android/media/videoeditor/AudioTrack.java
ava/android/media/videoeditor/Effect.java
ava/android/media/videoeditor/EffectColor.java
ava/android/media/videoeditor/EffectKenBurns.java
ava/android/media/videoeditor/ExtractAudioWaveformProgressListener.java
ava/android/media/videoeditor/MediaImageItem.java
ava/android/media/videoeditor/MediaItem.java
ava/android/media/videoeditor/MediaProperties.java
ava/android/media/videoeditor/MediaVideoItem.java
ava/android/media/videoeditor/Overlay.java
ava/android/media/videoeditor/OverlayFrame.java
ava/android/media/videoeditor/Transition.java
ava/android/media/videoeditor/TransitionAlpha.java
ava/android/media/videoeditor/TransitionAtEnd.java
ava/android/media/videoeditor/TransitionAtStart.java
ava/android/media/videoeditor/TransitionCrossfade.java
ava/android/media/videoeditor/TransitionFadeToBlack.java
ava/android/media/videoeditor/TransitionSliding.java
ava/android/media/videoeditor/VideoEditor.java
ava/android/media/videoeditor/VideoEditorFactory.java
ava/android/media/videoeditor/VideoEditorTestImpl.java
4f5bb1e6998d068a44fd562f47820fe5d6ef5067 16-Sep-2010 Andreas Huber <andih@google.com> Make sure the .wav extractor does not read data outside the bounds of the 'data' box.

Change-Id: Icf18f9224d97e6a78328dd429ebc3a3433e5cecd
related-to-bug: 3007790
ibstagefright/WAVExtractor.cpp
9b61dc564e673a116928838e42dae25bdf1e0796 16-Sep-2010 James Dong <jdong@google.com> Add YUV420P color format support for video output from camera hal

Change-Id: I5c8266348d0840361c8095ce351ac85c44d4068f
ibstagefright/CameraSource.cpp
1b0c3e2a4477e134e77235549b4fc0462f956515 16-Sep-2010 James Dong <jdong@google.com> am e30d039f: am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread

Merge commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194'

* commit 'e30d039f0ef797c35dd9f75e590f0b819c1c6194':
Fixed a bug in the query to the supported profiles and levels
e30d039f0ef797c35dd9f75e590f0b819c1c6194 16-Sep-2010 James Dong <jdong@google.com> am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread

Merge commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b' into gingerbread-plus-aosp

* commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b':
Fixed a bug in the query to the supported profiles and levels
a7f5e476d54e6f7da588909d370580c3e3457e9b 16-Sep-2010 James Dong <jdong@google.com> Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread
33708a058c0139d3071073c7c559181a52061ed8 16-Sep-2010 Andreas Huber <andih@google.com> am 62d4ebc0: am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread

Merge commit '62d4ebc0423831dfd8165d359e5b809f00f60656'

* commit '62d4ebc0423831dfd8165d359e5b809f00f60656':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
62d4ebc0423831dfd8165d359e5b809f00f60656 16-Sep-2010 Andreas Huber <andih@google.com> am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread

Merge commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f' into gingerbread-plus-aosp

* commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
dfb89914d47a5df8b9ed7e6326848ea89195d9f3 16-Sep-2010 James Dong <jdong@google.com> Fixed a bug in the query to the supported profiles and levels

According to OMX spec, the levels returned is the max level settings.
In fact, we could not enum all the levels.

Change-Id: Ib1cba74100512800a5761c7567894c7ea5b5a452
ibstagefright/OMXCodec.cpp
f146cb447916d73279ce2bd41142c9152289dda7 16-Sep-2010 Andreas Huber <andih@google.com> am 7a848c0d: am 8946ab26: A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It\'s now used for the vpx decoder to decode frames ahead of time to improve playback performance.

Merge commit '7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6'

* commit '7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6':
A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
9e6f16a5d03726d2ca3f265158e3c395f0b57e63 16-Sep-2010 Eric Laurent <elaurent@google.com> am d32d3011: am 37de5da0: Merge "Fix problem in lvm effect bundle wrapper" into gingerbread

Merge commit 'd32d30119bd0c0988a6806f1205db5426235af52'

* commit 'd32d30119bd0c0988a6806f1205db5426235af52':
Fix problem in lvm effect bundle wrapper
45922df0f2948c457da988748dc884c9bc4fe8e3 16-Sep-2010 Andreas Huber <andih@google.com> Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.

Change-Id: I6c0782b51b57e9be0fd410bd34078dc3c2b088d6
related-to-bug: 3005156
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
7a848c0d7cb1978155ab7743aadb2e07bc4bdcc6 16-Sep-2010 Andreas Huber <andih@google.com> am 8946ab26: A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It\'s now used for the vpx decoder to decode frames ahead of time to improve playback performance.

Merge commit '8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa' into gingerbread-plus-aosp

* commit '8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa':
A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.
8946ab2618a4eebfdf7b00c6b68e6a5d8432cafa 16-Sep-2010 Andreas Huber <andih@google.com> A ThreadedSource wraps around an existing MediaSource and reads output buffers on a separate thread. It's now used for the vpx decoder to decode frames ahead of time to improve playback performance.

Change-Id: I57a798b00adeb2c8056e85aab29a2b57aef00b63
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/ThreadedSource.cpp
ibstagefright/include/ThreadedSource.h
d32d30119bd0c0988a6806f1205db5426235af52 16-Sep-2010 Eric Laurent <elaurent@google.com> am 37de5da0: Merge "Fix problem in lvm effect bundle wrapper" into gingerbread

Merge commit '37de5da03b33e85c2b0561b9a32e3c5395cfbc15' into gingerbread-plus-aosp

* commit '37de5da03b33e85c2b0561b9a32e3c5395cfbc15':
Fix problem in lvm effect bundle wrapper
37de5da03b33e85c2b0561b9a32e3c5395cfbc15 16-Sep-2010 Eric Laurent <elaurent@google.com> Merge "Fix problem in lvm effect bundle wrapper" into gingerbread
f0f95b8bc5fb942101ec97d35619fbf38cbf3df3 16-Sep-2010 Eric Laurent <elaurent@google.com> Fix problem in lvm effect bundle wrapper

When an effect was deleted while enabled, the count of enabled effects
in the bundle was not decremented. Resulted a state where if another effect
was still enabled, its process function was called only every other time.

Change-Id: I59a0c5b7f50f416a9ecadae297b42912e56ddd51
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
c2206a0710a3ca2c29854c1a0638c5ba55629ba2 16-Sep-2010 Mike Lockwood <lockwood@android.com> Changes to support MediaProvider refactoring

Update table columns in MediaStore and adjust media scanner MTP support.

Change-Id: Ide41315a6d7650aadb703f93c7e022fc5c40d4dd
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
216e344130fb112c54ccdeccd1a2f51c4f4e044b 16-Sep-2010 Andreas Huber <andih@google.com> am f8297ba0: am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread

Merge commit 'f8297ba011af959331873e09612665a486e1a1a7'

* commit 'f8297ba011af959331873e09612665a486e1a1a7':
Upgrade to the latest .webm project code.
3dee32bfcd42214744a400341a16c9488f313862 16-Sep-2010 James Dong <jdong@google.com> am 0cd2472b: am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread

Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f'

* commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f':
Add some explicit error log messages
6918ab4a0511ccd5c1c6e0305ea8bef611b3bcef 16-Sep-2010 James Dong <jdong@google.com> am beb55f57: am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread

Merge commit 'beb55f572fd217174ebf8f6679792a6b22896645'

* commit 'beb55f572fd217174ebf8f6679792a6b22896645':
Fix audio input sample timestamp when audio driver loses audio samples
4d8024c498428f36d1a10bfac54be784072b2172 16-Sep-2010 Andreas Huber <andih@google.com> am 7ff94577: am 9909b948: Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread

Merge commit '7ff945775210c60e6f113fb00903449cbb05c68a'

* commit '7ff945775210c60e6f113fb00903449cbb05c68a':
Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
f8297ba011af959331873e09612665a486e1a1a7 16-Sep-2010 Andreas Huber <andih@google.com> am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread

Merge commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d' into gingerbread-plus-aosp

* commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d':
Upgrade to the latest .webm project code.
5d1d920be18881ca2c948dbca85ce47785742552 16-Sep-2010 James Dong <jdong@google.com> Fix potential unintialized variable yuvformat

Change-Id: If0a77855d98b45769a154b25d6535f30cd41536a
ibstagefright/CameraSourceTimeLapse.cpp
24a2c2b59670b4d9083ff0d23c87d3910a632e7d 16-Sep-2010 Andreas Huber <andih@google.com> Merge "Upgrade to the latest .webm project code." into gingerbread
e5f853911ca05fc812ae99822f243674f3d1356a 16-Sep-2010 Andreas Huber <andih@google.com> Upgrade to the latest .webm project code.

Change-Id: I645eff9b7c10bf33144977e6093663407af402e2
ibstagefright/codecs/on2/dec/VPXDecoder.cpp
0cd2472bf8a0062b56b9cd4613c44791b32fe42f 15-Sep-2010 James Dong <jdong@google.com> am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread

Merge commit '82a39f4aabb5b44801690a95fcf61d4f2ab97a8e' into gingerbread-plus-aosp

* commit '82a39f4aabb5b44801690a95fcf61d4f2ab97a8e':
Add some explicit error log messages
beb55f572fd217174ebf8f6679792a6b22896645 15-Sep-2010 James Dong <jdong@google.com> am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread

Merge commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24' into gingerbread-plus-aosp

* commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24':
Fix audio input sample timestamp when audio driver loses audio samples
82a39f4aabb5b44801690a95fcf61d4f2ab97a8e 15-Sep-2010 James Dong <jdong@google.com> Merge "Add some explicit error log messages" into gingerbread
9f882c0b10ddbd436e24e51db8b1063bc5591d24 15-Sep-2010 James Dong <jdong@google.com> Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
30ef985b702e97e8b1b04fab119d0085a2ada71f 15-Sep-2010 Eric Laurent <elaurent@google.com> am 23b8054e: am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread

Merge commit '23b8054e85eaffa515c597e7b386e3892968302d'

* commit '23b8054e85eaffa515c597e7b386e3892968302d':
Added intents for audio effects control application
7ff945775210c60e6f113fb00903449cbb05c68a 15-Sep-2010 Andreas Huber <andih@google.com> am 9909b948: Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread

Merge commit '9909b948ac83d2cf19f7eeb06748b85fcac2212a' into gingerbread-plus-aosp

* commit '9909b948ac83d2cf19f7eeb06748b85fcac2212a':
Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
9909b948ac83d2cf19f7eeb06748b85fcac2212a 15-Sep-2010 Andreas Huber <andih@google.com> Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread
f3d2bdf73c36be549f1ddff4238e97b3629c480d 15-Sep-2010 Andreas Huber <andih@google.com> Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.

Change-Id: Idbec5996ed0675c70e911b9c0514961fea099fb4
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/MyHandler.h
8e02ca748bf41e1357b94170226dfb5e8ca11f10 15-Sep-2010 Nipun Kwatra <nkwatra@google.com> Disable shutter sound and play recording sound for still mode time lapse.

Disabling shutter sound when using still capture for time lapse recording.
We also play recording sound at the start and stop of recording as is
done for usual video recording.

Change-Id: I6a6fa0c7c867979624105eea74fc17945db1f517
ibstagefright/CameraSourceTimeLapse.cpp
fb5a2d736573ab4b03d615a2dbc3dd84cc78f414 14-Sep-2010 Nipun Kwatra <nkwatra@google.com> Checks for auxiliary video recording.

- Check that time lapse mode is on when using auxiliary video recording.
- Check that auxiliary video size is strictly less than the main video
size.

Change-Id: Ic49d25e6ac30f6f885ce4f5fb38dbe0cc7bc1be1
ibmediaplayerservice/StagefrightRecorder.cpp
1fec21be65ddda46fe39c40e00d2fb94a8ce59f1 14-Sep-2010 Nipun Kwatra <nkwatra@google.com> Unhiding time lapse api's, removing setTimeLapseParameters()

- Removing setTimeLapseParameters() as its functionality is taken
over by setProfile() and setCaptureRate()
- Unhiding setCaptureRate()
- made setAuxiliaryOutputFile() public.
- Changed setAuxVideoParameters() to compute video size and bitrate
using CamcorderProfile::QUALITY_HIGH. Also made it private as it
now just needs to be called from setAuxiliaryOutputFile().

Change-Id: I94b8ed562579049b6b923c0fc4f3293285ef0a5b
ava/android/media/MediaRecorder.java
b5024daa6c49daaf9839923e9665f3a8051cf5d1 14-Sep-2010 James Dong <jdong@google.com> Add some explicit error log messages

Change-Id: I8a69157b75a67f0d3c19f05775a8cb0629232299
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
7589ebfbfd1e01217b21861fd4b7bfdcc26c2e84 14-Sep-2010 James Dong <jdong@google.com> Fix audio input sample timestamp when audio driver loses audio samples

Change-Id: Ic0f1489f710929af50e7714867ae5153b3242dd8
ibstagefright/AudioSource.cpp
23b8054e85eaffa515c597e7b386e3892968302d 14-Sep-2010 Eric Laurent <elaurent@google.com> am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread

Merge commit 'eea35ce87f179098215b590fbb21162cca5ff8da' into gingerbread-plus-aosp

* commit 'eea35ce87f179098215b590fbb21162cca5ff8da':
Added intents for audio effects control application
d09af7d5518d0a5b3c8070784c13a1070f46f460 14-Sep-2010 Eric Laurent <elaurent@google.com> Added intents for audio effects control application

Added intents to launch audio effects control panel UI and
communicate playback state from media player applications
to effect control application/service.

Change-Id: Iede23ae11fa9f0802df5f36299dd80ea57eda376
ava/android/media/AudioEffect.java
ava/android/media/MediaPlayer.java
05f5a78df6e67067426f2e55b78e6bc8c8bd91cf 14-Sep-2010 Mike Lockwood <lockwood@android.com> Merge changes I28b846a3,Ifd9b48cb

* changes:
MediaScanner: Fix problems with scanner non-file objects from the database
MTP: Delete all files and subdirectories when deleting directories.
d7456c650ef4e105f9835236b79244d906e2f1e0 14-Sep-2010 Mike Lockwood <lockwood@android.com> MediaScanner: Fix problems with scanner non-file objects from the database

Abstract objects should not be garbage collected and directories should be
removed only if they no longer exist in the file system.

Change-Id: I28b846a39324a7c2968357917089cd4c1238a014
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
ava/android/media/MtpConstants.java
ccb6e961941c607208ed9ac44db2dc9a9649b218 13-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Delete all files and subdirectories when deleting directories.

Children are now recursively deleted from the database and filesystem.

Change-Id: Ifd9b48cbc34b84b8f5073f2493dfe9735fae5492
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
tp/MtpServer.cpp
e931c68f53ffca710270f26a21387e482a88e1e3 13-Sep-2010 Eric Laurent <elaurent@google.com> am 4d987850: am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread

Merge commit '4d9878502f7661ed34540a485a5942d859e209c7'

* commit '4d9878502f7661ed34540a485a5942d859e209c7':
Fix volume problems with insert revert
5195e615b0d6464e8df5c87ab5c3024515888b72 13-Sep-2010 Nipun Kwatra <nkwatra@google.com> Merge "Enabling time lapse in setProfile, added setCaptureRate"
4f6bf17407bc2fe89d42537fdf5fc431c82902db 11-Sep-2010 Nipun Kwatra <nkwatra@google.com> Enabling time lapse in setProfile, added setCaptureRate

- Time lapse is automatically enabled in setProfile() if a time lapse
profile is selected. Also audio setup is skipped for time lapse.
- Added setCaptureRate() to set the frame capture rate, which may be
different from the video playback rate.
- Getting rid of enableTimeLapse() since setProfile() and
setFrameCaptureDelay() do its job now.

Change-Id: Ifd9f89cea0d05ffbefc22eac4ea5d34147cc1fbe
ava/android/media/MediaRecorder.java
4d9878502f7661ed34540a485a5942d859e209c7 13-Sep-2010 Eric Laurent <elaurent@google.com> am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread

Merge commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a' into gingerbread-plus-aosp

* commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a':
Fix volume problems with insert revert
27a2fdfb8ad1606bdb686c35e30ae894dd037588 11-Sep-2010 Eric Laurent <elaurent@google.com> Fix volume problems with insert revert

- Use a constant input level to the reverb engine and implement volume control in the
insert reverb. This avoids the volume spikes when an effect that was inserted after
the reverb is disabled or removed.
- Fix clicks (one silent buffer) at the end of the reverb disable period.
- Modified volume management in audioflinger so that the volume ramp is also done by
the insert effect if present when the track is paused (avoids clicks).
- Increased room level for all presets.

Also fixed problems with output stage session (-1):
- effect bundle wrapper was not designed to support session -1
- the permission check in audioflinger for using session -1 failed due to a wrong usage of
getCallingPid()

Change-Id: Id1ff51327263364bf71d3f2668fa5cde4311d84f
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
fde2ca180ea63ebd314770ec55b97e0a3c5a0788 11-Sep-2010 Mike Lockwood <lockwood@android.com> MediaFile: Add support for some popular non-media file types.

Change-Id: I68379740b535b08e707158f357e4e58a9c4d74ec
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
c37255d5d0fd9e0ec02b0d7cb5c4b235e200d367 10-Sep-2010 Mike Lockwood <lockwood@android.com> Media scanner support for tracking files of arbitrary type.

The native media scanner no longer filters files based on file extension.
Audio, video, image and playlist files are handled as before, but non-media
files are now inserted into the "files" table, which was originally added
to support MTP.

Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
ava/android/media/MediaScanner.java
ava/android/media/MtpDatabase.java
ni/android_media_MediaScanner.cpp
ibmedia/MediaScanner.cpp
522632cde516001429549c60bd570c399ffad800 11-Sep-2010 Nipun Kwatra <nkwatra@google.com> Exposing specific profile levels + hasProfile().

- Exposing the specific resolution profile levels
QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles
QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P}
- Unhiding the hasProfile() function used to test if a given profile exists.

Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
ava/android/media/CamcorderProfile.java
ibmedia/MediaProfiles.cpp
55d39f20660d3c619f8342bbee4bbd11a30de8ba 11-Sep-2010 Nipun Kwatra <nkwatra@google.com> Merge "Adding hasProfile."
35c8b532e576abc50fe7cdb42db0e22ccb1c7390 10-Sep-2010 Nipun Kwatra <nkwatra@google.com> Merge "Added specific resolution and time lapse profiles."
9d619542bea7d4c376a5a8b4a55c795a796adef3 10-Sep-2010 Nipun Kwatra <nkwatra@google.com> Adding hasProfile.

- Added hasProfile to CamcorderProfile and JNI.
- Added hasCamcorderProfile to MediaProfiles.
- using android.hardware.Camera.CAMERA_ID_DEFAULT for default camera
in get().

Change-Id: Ib57bb49ae79492d7cbc0ec6c7b6efcbf74f80013
ava/android/media/CamcorderProfile.java
ni/android_media_MediaProfiles.cpp
ibmedia/MediaProfiles.cpp
4af0dfd6cbc13fa6a89ec1430cbe6f619cd64d8a 07-Sep-2010 Nipun Kwatra <nkwatra@google.com> Added specific resolution and time lapse profiles.

- Added enums QUALITY_{QCIF,480P,720P,1080P}
QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,480P,720P,1080P} in CamcorderProfile
and corresponding ones in MediaProfiles.
- Added functions createDefaultCamcorderTimeLapseLowProfile,
createDefaultCamcorderTimeLapseHighProfile to set default values.
- Moved javadoc for constants to the get() function.

Change-Id: Ib8b3f8d29395dff77a397d1e6b44cfaf8c481d4d
ava/android/media/CamcorderProfile.java
ni/android_media_MediaProfiles.cpp
ibmedia/MediaProfiles.cpp
c18c02d78c0d9ec422f35aac2680022096c8c7cf 10-Sep-2010 James Dong <jdong@google.com> am 2432248b: am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread

Merge commit '2432248b03c675812dbb2154e2535bf3ada54b0a'

* commit '2432248b03c675812dbb2154e2535bf3ada54b0a':
Fixed a copy and paste error
dd88d7e3ffdd8fa79bbc31dbfe4d29c631b60a6b 10-Sep-2010 Eric Laurent <elaurent@google.com> am ea4680f0: am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread

Merge commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981'

* commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981':
LVM release 1.09 delivery
2432248b03c675812dbb2154e2535bf3ada54b0a 10-Sep-2010 James Dong <jdong@google.com> am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread

Merge commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa' into gingerbread-plus-aosp

* commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa':
Fixed a copy and paste error
4709c7faaa7d14b136dd3b1d8126f972ee11a1aa 10-Sep-2010 James Dong <jdong@google.com> Merge "Fixed a copy and paste error" into gingerbread
ea4680f007c9fbc1ff73a6b161e6e83ebaeff981 10-Sep-2010 Eric Laurent <elaurent@google.com> am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread

Merge commit '2814ad25578d1a52826464477da16217247c04e0' into gingerbread-plus-aosp

* commit '2814ad25578d1a52826464477da16217247c04e0':
LVM release 1.09 delivery
2814ad25578d1a52826464477da16217247c04e0 10-Sep-2010 Eric Laurent <elaurent@google.com> Merge "LVM release 1.09 delivery" into gingerbread
8d3b9100a660591cca01f1df801aaf9830b9e3ba 10-Sep-2010 James Dong <jdong@google.com> Fixed a copy and paste error

Change java/lang/IOException to java/lang/RuntimeException
since there is no java/lang/IOException while keeping
the signature of the MediaRecorder class
constructor unchanged.

Change-Id: Id9b9aa55db42bef528069ef1e2102038391bc15f
ni/android_media_MediaRecorder.cpp
2004ebfde368e5ae0cfc19b26e9e95f591909977 10-Sep-2010 Andreas Huber <andih@google.com> am 0d661b5e: am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread

Merge commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055'

* commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055':
TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
0d661b5eb42aba49de8d4d6ddc5140a8b2348055 10-Sep-2010 Andreas Huber <andih@google.com> am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread

Merge commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1' into gingerbread-plus-aosp

* commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1':
TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
4b3d32bb1b67d92c4297f3513eb2f1d319af5131 10-Sep-2010 Andreas Huber <andih@google.com> TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.

Change-Id: I630c9fb51686d87a4075f01a6d7f6f9139ddcb4b
related-to-bug: 2944452
ibstagefright/TimedEventQueue.cpp
e611ad410abf5074105b96d1cf834e5f288dab91 10-Sep-2010 Mike Lockwood <lockwood@android.com> Merge "Use separate Uris for MTP to the media provider files table"
f6b815409d91292f68295102a60f6320e8936f65 09-Sep-2010 Andreas Huber <andih@google.com> am 8986f62b: am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread

Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674'

* commit '8986f62b30e494b68476ff8ef81acd4b1dd22674':
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
c4a43e25626e6323737e4933868b7786c9ae1c4f 09-Sep-2010 James Dong <jdong@google.com> am e19df3dc: am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread

Merge commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412'

* commit 'e19df3dca1c8a1d9f783a6722c56f6ea82189412':
When 32-bit offset is used,
1560473ec1e0f7fe63e182dd72a4beb4a1ed1c7b 09-Sep-2010 Andreas Huber <andih@google.com> am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread

Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'

* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
8490e66f57506d4e4b05e7c987c7ca34295843e6 09-Sep-2010 Mike Lockwood <lockwood@android.com> Use separate Uris for MTP to the media provider files table

Separating the Uris for local and MTP access to the database will
allow us to handle MTP originated queries differently in the provider.

Change-Id: I78d1c0a0e656eddee1e17212a79157f67ca46b38
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
792ec849e5bc27c090c62f578846b888fa43e0d6 09-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Fix support for transfering folders and playlists.

This broke when I added support for transfering arbitrary files.

Change-Id: I6f2c052f3bd69839befcf0783d7aff5bcfd29b3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
305443c9898948a55f5c8f12a61c84151ebc853f 09-Sep-2010 Eric Laurent <elaurent@google.com> LVM release 1.09 delivery

- Reverb:
- 1 channel mixed has gain zero
- core componenet now only outputs STEREO samples
- wrapper now handles only STEREO from the Reverb Core
- Bass Boost:
- increase scratch memory

Change-Id: I00ae31051cc40a7006fc993420facfeb4d30dc52
ibeffects/lvm/lib/Bass/src/LVDBE_Private.h
ibeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
ibeffects/lvm/lib/Reverb/src/LVREV_Process.c
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
8986f62b30e494b68476ff8ef81acd4b1dd22674 09-Sep-2010 Andreas Huber <andih@google.com> am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread

Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp

* commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e':
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
e19df3dca1c8a1d9f783a6722c56f6ea82189412 09-Sep-2010 James Dong <jdong@google.com> am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread

Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp

* commit '5c43a7af7b9530016b922ddec0401ab9199cd595':
When 32-bit offset is used,
f3de053c0a525f85f763ab9b8781ae95ef3e930e 09-Sep-2010 Andreas Huber <andih@google.com> Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread
5c43a7af7b9530016b922ddec0401ab9199cd595 09-Sep-2010 James Dong <jdong@google.com> Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
d7f2225e7455f5e0da32f409a528ced283631c5d 09-Sep-2010 Andreas Huber <andih@google.com> Instead of asserting return a runtime error if the maximum sample size cannot be determined.

Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac
related-to-bug: 2602446
ibstagefright/MPEG4Extractor.cpp
f0eab98c4ef7449eb5a5ef659cd794e0003216b3 09-Sep-2010 Andreas Huber <andih@google.com> am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread

Merge commit 'a063cd6478254bba3290576ae5556abf469d6535' into gingerbread-plus-aosp

* commit 'a063cd6478254bba3290576ae5556abf469d6535':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
3e0f2be7d6501b923d586512e86a1c205b162fd6 09-Sep-2010 Andreas Huber <andih@google.com> Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.

Change-Id: I26db4524c5306bf2346438d2bd359c5cfb95cead
related-to-bug: 2900419
ibstagefright/MP3Extractor.cpp
ibstagefright/include/MP3Extractor.h
8624e6399d9f254981281ed93b041f1288e10f2a 09-Sep-2010 Mike Lockwood <lockwood@android.com> Merge "Add framework resource to specify case sensitivity of the external storage filesystem"
f73738b78a8396552274cf33b0021f414fb7201d 09-Sep-2010 Mike Lockwood <lockwood@android.com> Add framework resource to specify case sensitivity of the external storage filesystem

Change-Id: I8a433de9188c32214b1f8d6a4490dfe731d68c40
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
e3aa6aa77014b5798f95f6c5817df85910ecaac3 09-Sep-2010 James Dong <jdong@google.com> am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread

Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334'

* commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334':
HW audio encoder expects timestamp via kKeyTime from each input buffer
a4fb816bd59a452445114e065874d7004bdc6b0f 09-Sep-2010 James Dong <jdong@google.com> When 32-bit offset is used,
if the requested max file size is greater than the 32-bit offset limit,
set the limit to the max 32-bit offset limit.

Change-Id: Ie74cbed98469721d4280a0b87491e888948f0046
ibstagefright/MPEG4Writer.cpp
306cd58ddcc0cb8487bc6e015f8c692eea47a334 09-Sep-2010 James Dong <jdong@google.com> am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread

Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp

* commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
HW audio encoder expects timestamp via kKeyTime from each input buffer
d353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7 09-Sep-2010 James Dong <jdong@google.com> Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
d015ccf62b4e87756e2f7785af92338d35a21c15 09-Sep-2010 James Dong <jdong@google.com> HW audio encoder expects timestamp via kKeyTime from each input buffer

- This fixes media server crashes on droid

Change-Id: I7191cadc5275107425ec3ee3d437b2c5295858dc
ibstagefright/AudioSource.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
15ff01cdb4c4878936a903ea7699daf1fa2b5927 09-Sep-2010 Eric Laurent <elaurent@google.com> am e126119c: am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread

Merge commit 'e126119c3a406bc564f2549aeb1416aff112689d'

* commit 'e126119c3a406bc564f2549aeb1416aff112689d':
Modify type of some environmental reverb parameters
e126119c3a406bc564f2549aeb1416aff112689d 09-Sep-2010 Eric Laurent <elaurent@google.com> am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread

Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp

* commit '95d8648054223a501fe5390edef7e5d9383a4be8':
Modify type of some environmental reverb parameters
95d5de06819e98e298892f0486ee7ff210bcdd8b 09-Sep-2010 Eric Laurent <elaurent@google.com> Modify type of some environmental reverb parameters

Changed type of decay time, reverb delay and reflections delay parameters
from signed to unsigned int to match OpenSL ES interface definition.

Also fixed some type casts in lvm reverb wrapper.

Change-Id: I5ca5e76a87c2590f01f031f3168355586ef22556
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
e521169ff5dc6cbe1762bd7a049d95b56cc657ee 08-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Allow transfering arbitrary file types.

Change-Id: Ib18b93bff4f9993d95b26ca200fe6169b71453ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
3b2a62e5b35ea5f8da9d9bee52f75c9c2ebb4ece 08-Sep-2010 Mike Lockwood <lockwood@android.com> Rename the media database's "objects" table to "files"

We will be using this table for more than just MTP,
so it deserves a more general name.

Change-Id: I4c86d7e37ebe778e39699245b0e08af059e677ea
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
94e6b662375a5f4c5be2cfe5fced6cf8ec95df62 07-Sep-2010 Andreas Huber <andih@google.com> Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log a warning and ignore them instead.

Change-Id: Ia45887df82d66f393520e5a4308f430010402d5e
related-to-bug: 2976248
ibstagefright/colorconversion/SoftwareRenderer.cpp
f5e1faf1ccee6698b7e51cd70ab382ee0c8bc5e1 04-Sep-2010 Nipun Kwatra <nkwatra@google.com> Merge changes I71f5b0fc,I92c7accb

* changes:
Moving decision to use still camera to CameraSourceTimeLapse
pass auxiliary video parameters.
4a857e620fecd91d051d8e58f573b5ff30d81aaf 02-Sep-2010 Nipun Kwatra <nkwatra@google.com> Moving decision to use still camera to CameraSourceTimeLapse

CameraSourceTimeLapse now decides whether to use still or video
camera automatically. It checks if the passed in size is a valid
preview size and if it is, then uses the video camera else uses
the still camera.

Removed from StagefrightRecorder the support to set parameter
useStillCameraForTimeLapse.

Change-Id: I71f5b0fc7080ca524792381efe918d22e41a7f36
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSourceTimeLapse.cpp
bcb284c1960df025dc671c10a97ec0c599ce9a11 04-Sep-2010 Eric Laurent <elaurent@google.com> am ef9e508c: am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread

Merge commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950'

* commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950':
LVM release 1.08 delivery.
c4e7be5be99a0e65ddbad9a85c1311b8e3d7530a 04-Sep-2010 James Dong <jdong@google.com> am d6fd133d: am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread

Merge commit 'd6fd133d18c189ab112daef9dc649d0796df5d99'

* commit 'd6fd133d18c189ab112daef9dc649d0796df5d99':
Not all audio source has the drift time information
ef9e508c2cb3b52d31250ceca3dddace17cec950 04-Sep-2010 Eric Laurent <elaurent@google.com> am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread

Merge commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp

* commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b':
LVM release 1.08 delivery.
7e427934e69db804f3ee803e6ffeef4a339e9b8b 04-Sep-2010 Eric Laurent <elaurent@google.com> Merge "LVM release 1.08 delivery." into gingerbread
d6fd133d18c189ab112daef9dc649d0796df5d99 04-Sep-2010 James Dong <jdong@google.com> am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread

Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp

* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
Not all audio source has the drift time information
9077f8ec931a4c080948a85ce2e0f793f65e9b62 04-Sep-2010 James Dong <jdong@google.com> Merge "Not all audio source has the drift time information" into gingerbread
5fa6df6ebf17fa4386409d4428fc6d1d8d1ebdb1 03-Sep-2010 Eric Laurent <elaurent@google.com> LVM release 1.08 delivery.

- Changed bundle SamplesToExit to 0.1 secs
- Added SamplesToExit to Revreb
- Removed mixer from Core reverb

Change-Id: I675ec22889f20ef35a0ac427600c2654111c397e
ibeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
1ab9d1289b0e31033ba87490f185732e08bed7b5 03-Sep-2010 Andreas Huber <andih@google.com> am 8e11c822: am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.

Merge commit '8e11c82247151085fa165c76bfbc157bc6091ca4'

* commit '8e11c82247151085fa165c76bfbc157bc6091ca4':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
8e11c82247151085fa165c76bfbc157bc6091ca4 03-Sep-2010 Andreas Huber <andih@google.com> am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.

Merge commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp

* commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
a093659dd0ed5b17df1a5d7266345b50e6f1a023 03-Sep-2010 Jamie Gennis <jgennis@google.com> Merge "Add the new Stagefright ANativeWindow OMX codec API."
33a78149e00806d055ff214d300279963965a677 31-Aug-2010 Jamie Gennis <jgennis@google.com> Add the new Stagefright ANativeWindow OMX codec API.

This change defines the two OMX_SetParameter calls that enable OMX codecs to
interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and
OMXNodeInstance classes to use these new APIs.

This is try 2 for this change, after reverting the first one because it broke
the build.

Change-Id: I94249b72bdb5d5719360f03d7935fcca4ece5028
ibmedia/IOMX.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
9fee0b2a02daa6fcf286ed930e45400dd3ba8dba 03-Sep-2010 Andreas Huber <andih@google.com> Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.

Change-Id: Ifb564c6cdf6137eac14869f9ca7d471f05a5556a
related-to-bug: 2974691
ibstagefright/AwesomePlayer.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/include/AwesomePlayer.h
00c88eac9ad991a7a259a485ababc44da46d3d44 03-Sep-2010 Andreas Huber <andih@google.com> am af7a7c34: am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread

Merge commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc'

* commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc 03-Sep-2010 Andreas Huber <andih@google.com> am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread

Merge commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp

* commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
cc4a38c60f52082f3c1970c7eda6756949c6e5d5 03-Sep-2010 Andreas Huber <andih@google.com> Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
87ab9cdd0fde6bfb1205805c6a13423aafadeaaa 03-Sep-2010 Andreas Huber <andih@google.com> Properly buffer a certain amount of data on streaming sources before finishing prepare().

Change-Id: I39bf3c6dafcbe003b51dea4795742dcd8548f207
related-to-bug: 2875110
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
3caa71483ffa7b9d9c0a550429ccce848abeee06 03-Sep-2010 James Dong <jdong@google.com> Not all audio source has the drift time information

Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
9b3569bc42a4c85e86724cea693368693fb76fe7 03-Sep-2010 James Dong <jdong@google.com> am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writer

Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af'

* commit 'bc1452a307ac61ca87bf78722701ac85100952af':
Remove unused/debugging code from MP4 file writer
bc1452a307ac61ca87bf78722701ac85100952af 03-Sep-2010 James Dong <jdong@google.com> am 7755cdd6: Remove unused/debugging code from MP4 file writer

Merge commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp

* commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82':
Remove unused/debugging code from MP4 file writer
7755cdd69690ccbb42c6fd47b3e9c4594d4ade82 02-Sep-2010 James Dong <jdong@google.com> Remove unused/debugging code from MP4 file writer

o also makes nal length in the recorded file modifiable at runtime

Change-Id: I731b4dde7070d8d9628b36b523a5b2c011c7c2cf
ibstagefright/MPEG4Writer.cpp
0e60f5304b51fe168b8c356b0cb3150b321a8d95 03-Sep-2010 James Dong <jdong@google.com> am 3c3fc97e: am 46e63b34: Merge "Better file size estimate" into gingerbread

Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d'

* commit '3c3fc97e104bd17af608727d82e965fc28f2c89d':
Better file size estimate
3c3fc97e104bd17af608727d82e965fc28f2c89d 03-Sep-2010 James Dong <jdong@google.com> am 46e63b34: Merge "Better file size estimate" into gingerbread

Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp

* commit '46e63b346770efa14451b8e67b7f7636c4e5a76c':
Better file size estimate
cb7e65c6cbe75c3fe55af95eba73431394669692 02-Sep-2010 James Dong <jdong@google.com> Better file size estimate

When the recorded file becomes large, the metadata size can
no longer be ignored. This makes it possible to save the
recorded file when the storage becomes almost full at the
end of the recording session.

Change-Id: Ief038080f825c9946ce550949c03e914aec1e31a
ibstagefright/MPEG4Writer.cpp
9f20d3328f84d8979652917e860bcc235bf5fb75 03-Sep-2010 James Dong <jdong@google.com> am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread

Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'

* commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
Calculate audio media drift time from AudioSource
bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3 03-Sep-2010 James Dong <jdong@google.com> am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread

Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp

* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
Calculate audio media drift time from AudioSource
db16e5a673738fbac6ef195659015479f1534fc4 02-Sep-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Implement support for getting/setting device properties"
59e3f0db0855567a95f783f6d1ec36a7cfc4ea83 02-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: Implement support for getting/setting device properties

Added support for the "device friendly name" and "synchonization partner"
properties, which are required by Microsoft.

Change-Id: Ic0443333d75f7d98a2d902a790b9d505a56d4eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDevice.cpp
tp/MtpProperty.cpp
tp/MtpProperty.h
tp/MtpServer.cpp
ab15bce98d44b67f221b6fb8a377744940dda46c 01-Sep-2010 Nipun Kwatra <nkwatra@google.com> pass auxiliary video parameters.

- Added setAuxVideoParameters to pass the auxiliary video paramters.
- Also added enableTimeLapse(). The plan is for this function to replace
setTimeLapseParameters() since we never call setTimeLapseParameters() to
disable time lapse.
- removed calling setParameter for setting useStillCameraForTimeLapse from
setTimeLapseParameters as support has been removed from StagefrightRecorder.
This function needs to be removed when we change the API.

Change-Id: I92c7accbe9ba0b753ce780461ee55208d04703a6
ava/android/media/MediaRecorder.java
602bebd3fc814e8576941f05df11b0507c60fe9a 02-Sep-2010 Mike Lockwood <lockwood@android.com> MTP: try to fix sim build

Change-Id: I25b7bbecf61043e326105c74b2244036beda7c43
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpServer.cpp
4c23815c3986e50f0cfad3976d748e600f1befa2 02-Sep-2010 James Dong <jdong@google.com> Calculate audio media drift time from AudioSource

The problem was that the time to receive an output buffer
from an audio encoder is different because the encoder does not
need to read from the source for all output buffers. This leads
to large fluctuation in terms of wall clock duration between two
neighboring audio sample outputs from the audio encoder. As a
result, the media time for the video track after adjustment using
the drifting changes wildly sometimes.

This patch addresses this issue by only updating the media drift
time when an audio source input buffer is read. the wall clock
for the audio track is also calculated at the same time when
the input audio buffer is read at AudioSource.

bug - 2959800

Change-Id: I3174aa182f744784b540f0a7198524d4eee8bd7b
ibstagefright/AudioSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
53d7765eac58f496355147f167fb345e825d6d54 02-Sep-2010 Andreas Huber <andih@google.com> am fd0eed00: am a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread

Merge commit 'fd0eed007d99178092ede56ec2c4799046615f70'

* commit 'fd0eed007d99178092ede56ec2c4799046615f70':
Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
5aa0adc610d13f0265f03c44a821d63181b99719 02-Sep-2010 James Dong <jdong@google.com> am 3fd01c4d: am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread

Merge commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6'

* commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6':
Make sure that if initialization fails, AudioSource still behaves well.
fd0eed007d99178092ede56ec2c4799046615f70 02-Sep-2010 Andreas Huber <andih@google.com> am a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread

Merge commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef' into gingerbread-plus-aosp

* commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef':
Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6 02-Sep-2010 James Dong <jdong@google.com> am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread

Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp

* commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
Make sure that if initialization fails, AudioSource still behaves well.
5b988318a8f00f24c9de2a0933f592ab3ecb625b 02-Sep-2010 Andreas Huber <andih@google.com> Merge "resolved conflicts for merge of 71c908c4 to master"
ee9c3dbdd04a73d867a1358a8e50848c40d0153f 02-Sep-2010 Andreas Huber <andih@google.com> resolved conflicts for merge of 71c908c4 to master

Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047
a2511da9d65b11be7f59ed3f525f77e85aeb4bef 02-Sep-2010 Andreas Huber <andih@google.com> Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread
8d89cdad48c7e6d7db9fd7a0c3b7d3331d9d79be 02-Sep-2010 Nipun Kwatra <nkwatra@google.com> Merge "Support for auxiliary video parameters."
d3c1bae4eb78404bd1e17b7acf67087a18c83ef3 02-Sep-2010 James Dong <jdong@google.com> Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread
4d8f66bce32fbc8700b4ae5b2f6673a9cf1d20ad 02-Sep-2010 Andreas Huber <andih@google.com> Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.

Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad
related-to-bug: 2556656
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/ARTSPController.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/APacketSource.h
ibstagefright/rtsp/ARTSPController.cpp
2198d7517cf897039c416466aa010abaf89b5846 01-Sep-2010 Jamie Gennis <jgennis@google.com> Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""

This reverts commit 8a643b411e1802977f742709113ce01b06a18e12, reversing
changes made to 73ea9beaf8eb3d0027e78cbc0ac5e626c3f8deb4.
ibmedia/IOMX.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
a87544b35fda354cd24e1b7e803570e8926da918 01-Sep-2010 James Dong <jdong@google.com> Make sure that if initialization fails, AudioSource still behaves well.

Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
ibstagefright/AudioSource.cpp
8a643b411e1802977f742709113ce01b06a18e12 01-Sep-2010 Jamie Gennis <jgennis@google.com> Merge "Add the new Stagefright ANativeWindow OMX codec API."
71c908c475aac03122bee0b764816f09a18ce8aa 01-Sep-2010 Andreas Huber <andih@google.com> am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread

Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp

* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
6c33904ad948cb64245fbc5950c839e4d9e56de3 01-Sep-2010 Andreas Huber <andih@google.com> Merge "Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds." into gingerbread
239f2e5b01a4c03596fbbf9c3b97f358b36cfd8f 01-Sep-2010 Nipun Kwatra <nkwatra@google.com> Support for auxiliary video parameters.

Added support for passing width, height and video bitrate
for the auxiliary video.
Also setting encoder level depending on the video size and bitrate.

Change-Id: I4a90046853f67287c3e7e6babc75b4827f0c3e73
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
52d14be1190809ee6f4274315c98e50a1e6b0231 01-Sep-2010 Andreas Huber <andih@google.com> am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread

Merge commit '47f2cf620731226a9311db0f864a4e1404e54b96'

* commit '47f2cf620731226a9311db0f864a4e1404e54b96':
Keep gtalk video chat specific code consistent with rtsp changes.
47f2cf620731226a9311db0f864a4e1404e54b96 01-Sep-2010 Andreas Huber <andih@google.com> am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread

Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp

* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
Keep gtalk video chat specific code consistent with rtsp changes.
412fc7cdb6a1c4b6afe85b58fcc794fd67271942 01-Sep-2010 Andreas Huber <andih@google.com> Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
8d7d413959b1835a5c96da4a49bfda93f09d208c 01-Sep-2010 Andreas Huber <andih@google.com> Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.

Change-Id: Ia9748691ba60d3c4b5fcaf319ed0b4493d69abc6
related-to-bug: 2963846
ni/Android.mk
ni/android_media_MediaPlayer.cpp
564a9f2434194efc8fa56fd199e1a83c5807ffc1 01-Sep-2010 Andreas Huber <andih@google.com> am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread

Merge commit '021a822e76ab34a6404486e23157db6b6c50ec3e'

* commit '021a822e76ab34a6404486e23157db6b6c50ec3e':
Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
dab357bfd0919e02a842b7edfaf2de6c85c313b3 31-Aug-2010 Jamie Gennis <jgennis@google.com> Add the new Stagefright ANativeWindow OMX codec API.

This change defines the two OMX_SetParameter calls that enable OMX codecs to
interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and
OMXNodeInstance classes to use these new APIs.

Change-Id: Ibfbf893dc3513db0b3d3221bec5708c77287cddc
ibmedia/IOMX.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
021a822e76ab34a6404486e23157db6b6c50ec3e 01-Sep-2010 Andreas Huber <andih@google.com> am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread

Merge commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d' into gingerbread-plus-aosp

* commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d':
Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
4dcc6a10205ec333922be6351cf328871924f239 01-Sep-2010 Andreas Huber <andih@google.com> Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.

Change-Id: I15e21eae50beb6057024ea42a7e9bf3b8d8a0603
related-to-bug: 2368598
ibstagefright/AwesomePlayer.cpp
ibstagefright/mpeg2ts/ATSParser.cpp
27b9c8ec168f0b26a663960c6ee6fb973265d195 01-Sep-2010 Andreas Huber <andih@google.com> Keep gtalk video chat specific code consistent with rtsp changes.

Change-Id: I5f3f46c2150e16b26674432e427f79c04a69cd8e
ibstagefright/rtsp/ARTPSession.cpp
288db3b4998ae2d935feb1cf3cb6dd17707cca53 01-Sep-2010 Eric Laurent <elaurent@google.com> am 55e79374: am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread

Merge commit '55e7937462d107b469a58651d3d51e15086f8e9e'

* commit '55e7937462d107b469a58651d3d51e15086f8e9e':
Audio Effects: fix problems in volume control.
55e7937462d107b469a58651d3d51e15086f8e9e 01-Sep-2010 Eric Laurent <elaurent@google.com> am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread

Merge commit 'f560ceabe11b4f541c568bead61a5ec8f527151c' into gingerbread-plus-aosp

* commit 'f560ceabe11b4f541c568bead61a5ec8f527151c':
Audio Effects: fix problems in volume control.
a92ebfa1cd96dc91174f68baab820dbed8239e4b 31-Aug-2010 Eric Laurent <elaurent@google.com> Audio Effects: fix problems in volume control.

- Fixed click when re-enabling effect during the turn off phase:
make sure the effect states where effect is processed are the same
where volume control is delegated to effect.
- Fixed click when effect is deleted while still active: do not apply
volume ramp if an effect having volume control was just removed from the
effect chain.

Also fixed a crash when PCM dump is enabled in effect bundle wrapper.

Change-Id: Ib562f5cf75c69af75df0e862536262e2514493e4
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
03cf22057a9f494346b0160c1709500741741e03 01-Sep-2010 Andreas Huber <andih@google.com> am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread

Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f'

* commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f':
Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
6b52911cc7ba548fd3a240ca61eba510a8581e6f 31-Aug-2010 Andreas Huber <andih@google.com> am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread

Merge commit '48ac68e1b117b6b55f06daced7d9d5d550853306' into gingerbread-plus-aosp

* commit '48ac68e1b117b6b55f06daced7d9d5d550853306':
Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
48ac68e1b117b6b55f06daced7d9d5d550853306 31-Aug-2010 Andreas Huber <andih@google.com> Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
5f39972aa9cc6c620e3f6187c914082a503a0adc 31-Aug-2010 Andreas Huber <andih@google.com> am e1a3cddd: am 99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread

Merge commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf'

* commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf':
Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
e1a3cddd94749a42457a8f32cf21f663f07e4edf 31-Aug-2010 Andreas Huber <andih@google.com> am 99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread

Merge commit '99fa510e67cb973b45fc216c75bdc817421e14ae' into gingerbread-plus-aosp

* commit '99fa510e67cb973b45fc216c75bdc817421e14ae':
Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
f06a44995142696e5867c50c39be64c03157f5d3 31-Aug-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications"
e536f800c695bcd2ef861b9b9877b2108ed21613 31-Aug-2010 Andreas Huber <andih@google.com> Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.

Change-Id: Ied92ea8c2448a2cb1a732c72c21c69da1913dbc8
related-to-bug: 2556656
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPSource.cpp
d20e80251258c88450ad3b5bd650f1cb6d01bc15 31-Aug-2010 Mike Lockwood <lockwood@android.com> Merge "Add settings option for running MTP server in PTP mode."
2837eefc5459427138c080d445bb491c75630163 31-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Send an Intent after an MTP session that resulted in media database modifications

Change-Id: Ib2796e9155350c67769502935a73cf98d6ae9c08
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpServer.cpp
eabe8bfaf8c45289a4cfd880f4107d1a9b17e38b 31-Aug-2010 Mike Lockwood <lockwood@android.com> Add settings option for running MTP server in PTP mode.

This can be used as a compatibility workaround for host operating systems
without MTP support.

Change-Id: If4f1856206056ca8e40c3ffbfa382f185c413598
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpServer.java
ni/android_media_MtpServer.cpp
3a48d4d7269a37308eee4affd021adfcab7629a1 31-Aug-2010 Andreas Huber <andih@google.com> Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)

Change-Id: I3c1ae79bb9342770e959ebdcdc6b748549b76330
related-to-bug: 2556656
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/MyHandler.h
06a1d619aad17be48f6636b8dd68914da9e9ee53 30-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added VideoSourceDownSampler

VideoSourceDownSampler takes in a real video source. The MediaSource
interface is then implemented by shortcircuiting calls to this real source,
except for the read() function. For read we first call read of the real
source, then downsample the frame to the desired size and return that.

Change-Id: I6e1b377e043e136a70a7b03792eb9165bbe26398
ibstagefright/Android.mk
ibstagefright/VideoSourceDownSampler.cpp
b33a5aea130b025f30966828562fcba56f25b265 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added setAuxiliaryOutputFile to MediaRecorder and JNI

added setAuxiliaryOutputFile to allow setting of an auxiliary output file.
Also added the JNI support.

Change-Id: I8c3335192bd6f7fcbfdfc8552cfd0848f2ad2a5d
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
d7e7a3f98ffb5da7fe070de2e2dc3db338930b57 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> Adding support for parallel recording sessions.

- Added setOutputFileAuxiliary to pass the auxiliary file descriptor. The java
interface through JNI will be checked in next.

- renamed setupCameraSource to setupCamera as the function just sets the camera.
- Added setupCameraSource which sets up the camera source. This functionality
was in setupVideoEncoder before.
- setupVideoEncoder now takes in a cameraSource instead of creating it on it
own.

- Refactored startMPEG4Recording() to use setupMPEG4Recording,
setupMPEG4MetaData.
- setupMPEG4Recording() takes in file descriptor, bitrates to setup a mpeg4
writer. This function can be called multiple times to setup multiple
writers.
- Added setupMPEG4MetaData() for setting up the meta data for mpeg4 writer.
startMPEG4Recording() now calls setupMPEG4Recording, setupMPEG4MetaData for
each recording session.

Change-Id: I07f5334a1ff8e12a36f58e94129fcfa6add2208b
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/Android.mk
2deeff11560b81069ceef89d0268d84f87e603e9 31-Aug-2010 Chia-chi Yeh <chiachi@android.com> am 1577e629: am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.

Merge commit '1577e629866b2700e31c9467478e05ebffcc69a1'

* commit '1577e629866b2700e31c9467478e05ebffcc69a1':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
c855deba16f6b7fa1238b8ca8186b0adece50d3c 31-Aug-2010 Andreas Huber <andih@google.com> Merge "Make sure we only reallocate buffers on a genuine port definition change."
1577e629866b2700e31c9467478e05ebffcc69a1 31-Aug-2010 Chia-chi Yeh <chiachi@android.com> am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.

Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp

* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
12006013cc2cd0a076855ed068f5f782b24631c3 30-Aug-2010 Chia-chi Yeh <chiachi@android.com> fixedfft: Only includes cpu-features.h when __arm__ is defined.

Change-Id: Ifb6c03b38eff3c94a507ceb5043fcc48b364c25c
ibmedia/fixedfft.cpp
29c03c6e7d3eb0196bfec9eac50f0bdeddeca513 31-Aug-2010 Andreas Huber <andih@google.com> Make sure we only reallocate buffers on a genuine port definition change.

Change-Id: I434be98700e5d9333f75a3a9a8c78f1acc7e7247
related-to-bug: 2953523
ibstagefright/OMXCodec.cpp
47416bc4f9beb4147b29bb9d93653a4aa356c37d 31-Aug-2010 Andreas Huber <andih@google.com> am 03e83d4a: am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread

Merge commit '03e83d4ad909f5c07fb2011e03348a413453e909'

* commit '03e83d4ad909f5c07fb2011e03348a413453e909':
Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
03e83d4ad909f5c07fb2011e03348a413453e909 31-Aug-2010 Andreas Huber <andih@google.com> am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread

Merge commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp

* commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
68ae91cbd20939e48ad15c15405048e7ff9fe2f8 31-Aug-2010 Andreas Huber <andih@google.com> Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
0ddf8c09f9610bf0a810c7852681738741802cb9 31-Aug-2010 Andreas Huber <andih@google.com> Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.

Change-Id: Ib8615ce5a89a9a846ee2f9f96cdfb23462f72c7a
ibstagefright/rtsp/ARTPSession.cpp
69245638682dfb310651e37a340153bf7ad52ac0 31-Aug-2010 Andreas Huber <andih@google.com> am 987556bc: am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread

Merge commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30'

* commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30':
Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
987556bc9bc1a61415b6e65bd600b8daf5b24d30 31-Aug-2010 Andreas Huber <andih@google.com> am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread

Merge commit 'abb8398e5ab40a3078902c5333126a0743ba2458' into gingerbread-plus-aosp

* commit 'abb8398e5ab40a3078902c5333126a0743ba2458':
Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
f88ca7a0335c36732a5550c58c073e549c3cb0dd 31-Aug-2010 Andreas Huber <andih@google.com> Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.

Change-Id: Ie8d6a3865a0477e28d4b76bb9038e468451287b1
related-to-bug: 2556656
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/MyHandler.h
2527da00e2dc0f6f52e85abc6b4a09611a8ec16d 30-Aug-2010 Andreas Huber <andih@google.com> am 9aa05ec2: am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread

Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12'

* commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12':
Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
9d01dcbdf2d747cf7d434c12954b672245e3a986 30-Aug-2010 Eric Laurent <elaurent@google.com> am 5762dc19: am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread

Merge commit '5762dc19836e332d3ac1906e5698088a128b362d'

* commit '5762dc19836e332d3ac1906e5698088a128b362d':
LVM release 1.07 delivery.
3678668997f81f49ac52ec4441254e57f322d010 30-Aug-2010 Andreas Huber <andih@google.com> am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants.

Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'

* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
Finetune some rtsp timeout constants.
631025eec0a7d14efb3569f1941a8f8ead5283c4 30-Aug-2010 Andreas Huber <andih@google.com> am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread

Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'

* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
ALoopers can now be named (useful to distinguish threads).
9aa05ec2cd6bc592074c7bd08d22db46649c7f12 30-Aug-2010 Andreas Huber <andih@google.com> am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread

Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp

* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
681c5ff2085a08835c08b97641ebdc1b37489943 30-Aug-2010 Andreas Huber <andih@google.com> Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
30cfa20dfc67583411db58674d3d97bc42fa7951 30-Aug-2010 Andreas Huber <andih@google.com> Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.

Change-Id: I1ca6bd8faba0185f9694f9dc04d2b3e6a7ab5ac3
related-to-bug: 2370115
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
5762dc19836e332d3ac1906e5698088a128b362d 30-Aug-2010 Eric Laurent <elaurent@google.com> am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread

Merge commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229' into gingerbread-plus-aosp

* commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229':
LVM release 1.07 delivery.
7ed9104c3acb172a480ebd7fd456fe69efd1ec3d 30-Aug-2010 Andreas Huber <andih@google.com> am f6639c46: Finetune some rtsp timeout constants.

Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp

* commit 'f6639c46e83a1ccab7b293192c208091d17c61be':
Finetune some rtsp timeout constants.
6df6d60681be9d524ce7fc07f2511008de424d27 30-Aug-2010 Andreas Huber <andih@google.com> am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread

Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp

* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
ALoopers can now be named (useful to distinguish threads).
858bb4f66ea1bd9c48b9817cb44a59c8b0394229 30-Aug-2010 Eric Laurent <elaurent@google.com> Merge "LVM release 1.07 delivery." into gingerbread
f6639c46e83a1ccab7b293192c208091d17c61be 30-Aug-2010 Andreas Huber <andih@google.com> Finetune some rtsp timeout constants.

Change-Id: Ice731c5097c2a2dee8a7f0cd45b547cd34f532c6
ibstagefright/rtsp/MyHandler.h
5367ab6aab2a61aaf534b18576dcdd0bca1b9681 30-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Move all MTP protocol constants for Java to a central location.

Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
ava/android/media/MtpConstants.java
ava/android/media/MtpDatabase.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
df992ac9cc54cedb3e384617ed683a2d1a24d38b 30-Aug-2010 Andreas Huber <andih@google.com> Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
daeeddc5ede07970fcf782611dd98fa057573ec4 30-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Fix build break due to misuse of "git add -i" command

Change-Id: I85528a43a56942dde921603a353383e2c8f8d93d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
af2ba835f5b2da558fa1174984acfa0565352cbc 30-Aug-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Add try/finally handling to finalize overrides"
dbead321daf2c16dc74e182bec591b278cfccb2c 30-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Add try/finally handling to finalize overrides

Change-Id: I23c481d6214ed5f045f903845632c07c11bb42a3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ava/android/media/MtpCursor.java
ava/android/media/MtpDatabase.java
ava/android/media/MtpServer.java
453f2ef14a9de3415f1da818d7c42a3b5e11a62a 28-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "client_id->clientId, bugfix for signaling of read abort on stop."
ea434daf19c30f1a7806f1c7e01e6e2174a7ef5d 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> client_id->clientId, bugfix for signaling of read abort on stop.

- changed client_id->clientId, mClient_id->mClientId
- there was a bug in the condition for calling
signalReadComplete_lock() in stop. We should call it only when
!mLastReadCompleted and also if the current client has not already
completed its read (this second check was missing before).

Change-Id: I9a57cf6b5c6f3260883a6c74d0c7b22f675c422e
ibstagefright/MediaSourceSplitter.cpp
206bf9df4839395e52a6834f9a0a452d355bad36 28-Aug-2010 James Dong <jdong@google.com> am a5fe77d0: am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread

Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc'

* commit 'a5fe77d004091bd9521d087c2572f587191afbfc':
Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
c6ff7a91890305877410c5ddf853bd961a7d11cc 28-Aug-2010 James Dong <jdong@google.com> am 7d3ff384: am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread

Merge commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7'

* commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7':
Suppress the video recording start signal
8abd4256f3b94d5e44583a975603894c52dc039a 28-Aug-2010 Andreas Huber <andih@google.com> am 05c1cada: am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread

Merge commit '05c1cadaeaf272a70acc889bfccd607648058470'

* commit '05c1cadaeaf272a70acc889bfccd607648058470':
Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
84ecebb92217ff42ed34cfd9bce9c13de3635b49 28-Aug-2010 Andreas Huber <andih@google.com> am e25e0361: am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread

Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'

* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
We accidentally always aborted after 10 secs, even if the connection was fine.
c4e0b70a21fadb47d70955c71fc31ce1473da925 28-Aug-2010 Andreas Huber <andih@google.com> ALoopers can now be named (useful to distinguish threads).

Change-Id: Ieabaddb2e3a9e3a7a5bc36e55cd0721b60dbd50e
ibstagefright/AwesomePlayer.cpp
ibstagefright/NuCachedSource2.cpp
ibstagefright/foundation/ALooper.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/MyHandler.h
a5fe77d004091bd9521d087c2572f587191afbfc 27-Aug-2010 James Dong <jdong@google.com> am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread

Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp

* commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad':
Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
90862e2a8b3ea522cf1dace5e93dcec109a1aa85 27-Aug-2010 James Dong <jdong@google.com> Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
is occasionally too small.

bug - 2882917

Change-Id: Id59d8529084c5689a26f272e0cd3b1e955fd8a30
ibstagefright/OMXCodec.cpp
7d3ff3849c830f0136c692b6074f1ba5da288fe7 27-Aug-2010 James Dong <jdong@google.com> am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread

Merge commit 'b86365ad74a197f2af6d70eedeb19083e31a9686' into gingerbread-plus-aosp

* commit 'b86365ad74a197f2af6d70eedeb19083e31a9686':
Suppress the video recording start signal
cf66e47dddee9b1e634e63ab6ed66bccbef57884 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "Added MediaSourceSplitter to split single source to multiple ones."
b86365ad74a197f2af6d70eedeb19083e31a9686 27-Aug-2010 James Dong <jdong@google.com> Merge "Suppress the video recording start signal - bug 2950297" into gingerbread
f83cba77b69b4db2d4db10fafb528196e5590110 27-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added MediaSourceSplitter to split single source to multiple ones.

MediaSourceSplitter provides a way to split a single mediaSource
into multiple sources. It takes in the real mediaSource and multiple
clients can then be created which serve from the same real mediaSource.

Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
ibstagefright/MediaSourceSplitter.cpp
05c1cadaeaf272a70acc889bfccd607648058470 27-Aug-2010 Andreas Huber <andih@google.com> am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread

Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp

* commit '577615c98e390f8417e07844d04304eac5b0e911':
Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
e25e03612e1a2988ed83f24d2658cf0898fd1944 27-Aug-2010 Andreas Huber <andih@google.com> am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread

Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp

* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
We accidentally always aborted after 10 secs, even if the connection was fine.
eeb97d91b97f1fc0b26815f098515e9c06d219b8 27-Aug-2010 Andreas Huber <andih@google.com> Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.

Change-Id: Id491541a6ae501604cda815f8e961a3bfe26db7d
related-to-bug: 2556656
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/ARTSPController.h
ibstagefright/include/AwesomePlayer.h
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AH263Assembler.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/APacketSource.h
ibstagefright/rtsp/ARTPAssembler.cpp
ibstagefright/rtsp/ARTPAssembler.h
ibstagefright/rtsp/ARTSPController.cpp
ibstagefright/rtsp/MyHandler.h
adecf1c1a9bbb471e59adb2bfe98b5bb7a9d21f5 27-Aug-2010 Eric Laurent <elaurent@google.com> LVM release 1.07 delivery.

- Virtualizer now uses the correct control parameter, instead of reverberation
- Volume smoothing for first frame has been added
- Equalizer_setParameter now returns correct error code
- Correcting Non-Linear compressor gain step noise during transitions and effect level changes
- Removed SVN header blocks
- Memory and MIPS values have been added to the API
- Reverb uses a more efficient malloc for input PCM
- Reverb DecayHFRatio now ranges up to 2000
- Logging has been removed for most volume functions

Change-Id: Ib59e7e331263c3811559231b4ae90c82e34a8421
ibeffects/lvm/lib/Bass/lib/LVDBE.h
ibeffects/lvm/lib/Bass/src/LVDBE_Coeffs.h
ibeffects/lvm/lib/Bass/src/LVDBE_Control.c
ibeffects/lvm/lib/Bass/src/LVDBE_Init.c
ibeffects/lvm/lib/Bass/src/LVDBE_Private.h
ibeffects/lvm/lib/Bass/src/LVDBE_Process.c
ibeffects/lvm/lib/Bass/src/LVDBE_Tables.c
ibeffects/lvm/lib/Bass/src/LVDBE_Tables.h
ibeffects/lvm/lib/Bundle/lib/LVM.h
ibeffects/lvm/lib/Bundle/src/LVM_API_Specials.c
ibeffects/lvm/lib/Bundle/src/LVM_Buffers.c
ibeffects/lvm/lib/Bundle/src/LVM_Coeffs.h
ibeffects/lvm/lib/Bundle/src/LVM_Control.c
ibeffects/lvm/lib/Bundle/src/LVM_Init.c
ibeffects/lvm/lib/Bundle/src/LVM_Private.h
ibeffects/lvm/lib/Bundle/src/LVM_Process.c
ibeffects/lvm/lib/Bundle/src/LVM_Tables.c
ibeffects/lvm/lib/Bundle/src/LVM_Tables.h
ibeffects/lvm/lib/Common/lib/AGC.h
ibeffects/lvm/lib/Common/lib/BIQUAD.h
ibeffects/lvm/lib/Common/lib/CompLim.h
ibeffects/lvm/lib/Common/lib/Filter.h
ibeffects/lvm/lib/Common/lib/InstAlloc.h
ibeffects/lvm/lib/Common/lib/LVM_Common.h
ibeffects/lvm/lib/Common/lib/LVM_Macros.h
ibeffects/lvm/lib/Common/lib/LVM_Timer.h
ibeffects/lvm/lib/Common/lib/LVM_Types.h
ibeffects/lvm/lib/Common/lib/Mixer.h
ibeffects/lvm/lib/Common/lib/ScalarArithmetic.h
ibeffects/lvm/lib/Common/lib/VectorArithmetic.h
ibeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.c
ibeffects/lvm/lib/Common/src/Abs_32.c
ibeffects/lvm/lib/Common/src/Add2_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Add2_Sat_32x32.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.c
ibeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/CompLim_private.h
ibeffects/lvm/lib/Common/src/Copy_16.c
ibeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.c
ibeffects/lvm/lib/Common/src/DelayMix_16x16.c
ibeffects/lvm/lib/Common/src/DelayWrite_32.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/Filters.h
ibeffects/lvm/lib/Common/src/From2iToMS_16x16.c
ibeffects/lvm/lib/Common/src/From2iToMono_16.c
ibeffects/lvm/lib/Common/src/From2iToMono_32.c
ibeffects/lvm/lib/Common/src/InstAlloc.c
ibeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.c
ibeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.c
ibeffects/lvm/lib/Common/src/JoinTo2i_32x32.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.c
ibeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Mixer.h
ibeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_Init.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_Private.h
ibeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.c
ibeffects/lvm/lib/Common/src/LVM_FO_HPF.c
ibeffects/lvm/lib/Common/src/LVM_FO_LPF.c
ibeffects/lvm/lib/Common/src/LVM_GetOmega.c
ibeffects/lvm/lib/Common/src/LVM_Mixer_FilterCoeffs.h
ibeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.c
ibeffects/lvm/lib/Common/src/LVM_Polynomial.c
ibeffects/lvm/lib/Common/src/LVM_Power10.c
ibeffects/lvm/lib/Common/src/LVM_Timer.c
ibeffects/lvm/lib/Common/src/LVM_Timer_Init.c
ibeffects/lvm/lib/Common/src/LVM_Timer_Private.h
ibeffects/lvm/lib/Common/src/LoadConst_16.c
ibeffects/lvm/lib/Common/src/LoadConst_32.c
ibeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.c
ibeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.c
ibeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Mixer_private.h
ibeffects/lvm/lib/Common/src/MonoTo2I_16.c
ibeffects/lvm/lib/Common/src/MonoTo2I_32.c
ibeffects/lvm/lib/Common/src/Mult3s_32x16.c
ibeffects/lvm/lib/Common/src/NonLinComp_D16.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.c
ibeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.c
ibeffects/lvm/lib/Common/src/dB_to_Lin32.c
ibeffects/lvm/lib/Common/src/mult3s_16x16.c
ibeffects/lvm/lib/Eq/lib/LVEQNB.h
ibeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Coeffs.h
ibeffects/lvm/lib/Eq/src/LVEQNB_Control.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Init.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Private.h
ibeffects/lvm/lib/Eq/src/LVEQNB_Process.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Tables.c
ibeffects/lvm/lib/Reverb/lib/LVREV.h
ibeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
ibeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.c
ibeffects/lvm/lib/Reverb/src/LVREV_Private.h
ibeffects/lvm/lib/Reverb/src/LVREV_Process.c
ibeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.c
ibeffects/lvm/lib/Reverb/src/LVREV_Tables.c
ibeffects/lvm/lib/Reverb/src/LVREV_Tables.h
ibeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.c
ibeffects/lvm/lib/StereoWidening/lib/LVCS.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Headphone_Coeffs.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Private.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Process.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Tables.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.h
d6a40047412d0269f79e6c992115642f0c65ea96 27-Aug-2010 Andreas Huber <andih@google.com> We accidentally always aborted after 10 secs, even if the connection was fine.

Change-Id: I3f2ae2f46ae62b84b1e253658d7182c04ee3dfae
ibstagefright/rtsp/MyHandler.h
d7f1c3d69274fef8772a663ce1c792fd0466fcc5 27-Aug-2010 James Dong <jdong@google.com> Suppress the video recording start signal
- bug 2950297

Change-Id: I0044d07178691feb904cf81e87c1b6d4b714dc1a
ibstagefright/AudioSource.cpp
178e1d0a59c12f2876a6630ebb400aa1d098833a 27-Aug-2010 Andreas Huber <andih@google.com> am 74ae6973: am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread

Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4'

* commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4':
Support for RTP packets arriving interleaved with RTSP responses.
0a84244d92685a0bef4ec2778b95af3705b1ce16 27-Aug-2010 Eric Laurent <elaurent@google.com> am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread

Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'

* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
Changed type of reverb presets from int to short
8ed880d7765dd2fab7f09d90bc1be1eb86a0f0a3 27-Aug-2010 Andreas Huber <andih@google.com> Merge "Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster."
d222c84047e30260e26c84a8c9294559b31ca9b6 26-Aug-2010 Andreas Huber <andih@google.com> Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster.

Change-Id: Ia41194752ef72feb4ed1d5199e97b1649075b646
ibstagefright/OMXCodec.cpp
74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4 26-Aug-2010 Andreas Huber <andih@google.com> am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread

Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp

* commit '17a765a139f5a0b10768937cb11ecd9e7941b039':
Support for RTP packets arriving interleaved with RTSP responses.
17a765a139f5a0b10768937cb11ecd9e7941b039 26-Aug-2010 Andreas Huber <andih@google.com> Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread
832aa58a30d537b792e25e242345fbf2ba62df60 26-Aug-2010 Eric Laurent <elaurent@google.com> am 2db73305: am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread

Merge commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305'

* commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305':
Added automated tests for reverb audio effect.
8c26c127b7b77953437a3c997f08178769dc6d45 26-Aug-2010 James Dong <jdong@google.com> am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread

Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'

* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
Make sure that timestamp does not go backward in MP4 file writer
0416da73a0addfc7b3eddfea4a6a0a0215e1dd0b 26-Aug-2010 Andreas Huber <andih@google.com> Support for RTP packets arriving interleaved with RTSP responses.

Change-Id: Ib32fba257da32a199134cf8943117cf3eaa07a25
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPConnection.h
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
ibstagefright/rtsp/MyHandler.h
d0faf5a2dd892228bbfbf1e43aba95f60c6bca05 26-Aug-2010 Eric Laurent <elaurent@google.com> am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread

Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp

* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
Changed type of reverb presets from int to short
71450f813991bb76b477aaffd7cad28e8ae8af7c 26-Aug-2010 Eric Laurent <elaurent@google.com> Changed type of reverb presets from int to short

Changed the type of reverb preset constants exposed by the PresetReverb API to
match the type of the setPreset() method parameter.

Change-Id: I786764b5279c60f2368f5a0372f78da65ec54e4f
ava/android/media/PresetReverb.java
2db7330578c1ac4466f4cbbf0f7723df6c2da305 26-Aug-2010 Eric Laurent <elaurent@google.com> am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread

Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp

* commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a':
Added automated tests for reverb audio effect.
dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a 26-Aug-2010 Eric Laurent <elaurent@google.com> Merge "Added automated tests for reverb audio effect." into gingerbread
9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1 26-Aug-2010 James Dong <jdong@google.com> am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread

Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
Make sure that timestamp does not go backward in MP4 file writer
318a759e3c24dd741f8959e2a433150ae88fb8d6 26-Aug-2010 James Dong <jdong@google.com> Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
391e2d0d88c1acd87b1503be276cfa4e7ce66c88 24-Aug-2010 Eric Laurent <elaurent@google.com> Added automated tests for reverb audio effect.

- Added tests for preset and environmental reverb to functional media frame work tests.
- created a new class for energy probing used by all audio effect tests and corrected energy calculation.

Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/EnergyProbe.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEnvReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPresetReverbTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java
05643cc0d8b39d32cf4342124fe424f7653fef2d 26-Aug-2010 Andreas Huber <andih@google.com> am e58cd37d: am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread

Merge commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96'

* commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
53b8f17376e3311d1fcf3fa8747ac51079116c89 26-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Fix build break due to integer constant too large

Change-Id: Ia03ebe171d68bdfb04913abafc11dcb9c9071595
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDataPacket.cpp
48114f72fd927ede7ac757b377cfa9a663265c3f 26-Aug-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: work in progress on expanded property support"
e58cd37d6667c8812ab8d40dd814f77eb7df1b96 26-Aug-2010 Andreas Huber <andih@google.com> am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread

Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp

* commit '8ac0983edafa064126c4480dd31047d1bb4ce111':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
828d19dd96b05fa99abdc517701e5366543c324f 10-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: work in progress on expanded property support

GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.

Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpServer.h
8ac0983edafa064126c4480dd31047d1bb4ce111 26-Aug-2010 Andreas Huber <andih@google.com> Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
ec95d932546186ad7ad1d847a6e8f7529e7c7d83 26-Aug-2010 Eric Laurent <elaurent@google.com> am 8ca5df27: am c14f9ca6: Merge "Added preset reverb." into gingerbread

Merge commit '8ca5df27df8a2b6435486f9b5a163bf222f8fed1'

* commit '8ca5df27df8a2b6435486f9b5a163bf222f8fed1':
Added preset reverb.
bf4c0c88087995db55699ec29b44ede04e432fe8 26-Aug-2010 Andreas Huber <andih@google.com> am cec075cc: am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread

Merge commit 'cec075cc420e601602d6bfe16272c30006d262a6'

* commit 'cec075cc420e601602d6bfe16272c30006d262a6':
Ensure that buffering updates eventually hit 100% after we download everything.
8ca5df27df8a2b6435486f9b5a163bf222f8fed1 26-Aug-2010 Eric Laurent <elaurent@google.com> am c14f9ca6: Merge "Added preset reverb." into gingerbread

Merge commit 'c14f9ca6e5e795b641e7809786b4e51e13493907' into gingerbread-plus-aosp

* commit 'c14f9ca6e5e795b641e7809786b4e51e13493907':
Added preset reverb.
c14f9ca6e5e795b641e7809786b4e51e13493907 26-Aug-2010 Eric Laurent <elaurent@google.com> Merge "Added preset reverb." into gingerbread
cec075cc420e601602d6bfe16272c30006d262a6 26-Aug-2010 Andreas Huber <andih@google.com> am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread

Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp

* commit '235840228b0692b66d854ff499b5c4060f883e03':
Ensure that buffering updates eventually hit 100% after we download everything.
8735f8984ae6a40fd6611243e143743571ed5c43 25-Aug-2010 Andreas Huber <andih@google.com> Fix support for per-frame unsynchronization in ID3V2.4 tags.

Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca
related-to-bug: 2949149
ibstagefright/id3/ID3.cpp
ibstagefright/include/ID3.h
235840228b0692b66d854ff499b5c4060f883e03 25-Aug-2010 Andreas Huber <andih@google.com> Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
a1644109bb68f0c6d7b29d60a06172702d64a964 25-Aug-2010 Andreas Huber <andih@google.com> am 96dc4559: am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread

Merge commit '96dc45597e53742a2c8453f9ce03f7d501a75668'

* commit '96dc45597e53742a2c8453f9ce03f7d501a75668':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
96dc45597e53742a2c8453f9ce03f7d501a75668 25-Aug-2010 Andreas Huber <andih@google.com> am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread

Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp

* commit 'b8814dce287552c1bdf13fa999296ebc7387776d':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
b8814dce287552c1bdf13fa999296ebc7387776d 25-Aug-2010 Andreas Huber <andih@google.com> Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
efdd088a71ddd0a96cf9ca2f58e8703fe8c5c494 25-Aug-2010 Andreas Huber <andih@google.com> Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.

Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a
related-to-bug: 2948754
ibstagefright/AMRExtractor.cpp
ibstagefright/DataSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/include/AMRExtractor.h
ibstagefright/include/MP3Extractor.h
ibstagefright/include/MPEG2TSExtractor.h
ibstagefright/include/MPEG4Extractor.h
ibstagefright/include/OggExtractor.h
ibstagefright/include/WAVExtractor.h
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/MatroskaExtractor.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
c23296ef2d168f29bcfc3c93d33f78e1c393177a 25-Aug-2010 Andreas Huber <andih@google.com> Ensure that buffering updates eventually hit 100% after we download everything.

Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8
related-to-bug: 2844095
ibstagefright/AwesomePlayer.cpp
0ae6d2e8261be77c739527142c59a9d895b02fe1 25-Aug-2010 Eric Laurent <elaurent@google.com> am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'

* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
Fix the simulator build.
74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64 25-Aug-2010 Eric Laurent <elaurent@google.com> am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
Fix the simulator build.
cd295c11abca8efad31e68e39e0de83bc1faba7e 25-Aug-2010 Eric Laurent <elaurent@google.com> Fix the simulator build.

Fixes the sim build broken by commit 58d3bd08107f44cba79938dd8430e69c0fda4202.

Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
ibmedia/fixedfft.cpp
8d9d751a8f09a0199d1d22a3f8267eb51f919cc0 25-Aug-2010 Andreas Huber <andih@google.com> am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread

Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2'

* commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2':
A first shot at proper support for seeking of rtsp streams.
a7e5648d611e6e8bdd4cafe051b5fadf3a20735c 24-Aug-2010 Eric Laurent <elaurent@google.com> Added preset reverb.

Modified lvm reverb wrapper code to expose a preset reverb interface.
Also removed debug log from bundle and reverb wrapper.

Change-Id: If9b95d91e25a6ff834decdfdda34b17df9b46967
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
67ca90b339feb8bb6889ca289a9dbc82c447b0d2 25-Aug-2010 Andreas Huber <andih@google.com> am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread

Merge commit '6b6ae996b2e84af030397cff3a7f0087de93e01c' into gingerbread-plus-aosp

* commit '6b6ae996b2e84af030397cff3a7f0087de93e01c':
A first shot at proper support for seeking of rtsp streams.
6b6ae996b2e84af030397cff3a7f0087de93e01c 25-Aug-2010 Andreas Huber <andih@google.com> Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
ed8188711a794867b47d21bbed3e26827f6c27e3 24-Aug-2010 Neel Parekh <neel@google.com> Have the band tag parsed into album artist.

Some vendors don't use the albumartist tag, but instead put the
album artist tag in the band tag.

Change-Id: Iea3144d55e4db3a28853bcd06bc72366de4421dc
ava/android/media/MediaScanner.java
0e30200ed112388110c33fdf3fa6fa0e6d2b953a 24-Aug-2010 Eric Laurent <elaurent@google.com> am 33e0d834: am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread

Merge commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa'

* commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa':
LVM release 1.05 delivery
e0dd7d396051942ccce0429d7a1fe968d63ac3f7 24-Aug-2010 Andreas Huber <andih@google.com> A first shot at proper support for seeking of rtsp streams.

Change-Id: I9604f2d09feedc0074c0e715be58e719d4483760
related-to-bug: 2556656
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/ARTSPController.h
ibstagefright/include/AwesomePlayer.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/APacketSource.h
ibstagefright/rtsp/ARTSPController.cpp
ibstagefright/rtsp/MyHandler.h
05e80b4c1c52a6dc1f305e26ce67162256d6bcc5 24-Aug-2010 James Dong <jdong@google.com> Make sure that timestamp does not go backward in MP4 file writer

Change-Id: I90745b9df7f19d61f3ab826bf9d2419fe788554e
ibstagefright/MPEG4Writer.cpp
804539bf7617eed7633ac37f15ce4bd8d1a414c4 24-Aug-2010 Andreas Huber <andih@google.com> am 31e71131: am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread

Merge commit '31e71131049c943a388134e796087e109248efcc'

* commit '31e71131049c943a388134e796087e109248efcc':
Better handling of rtsp connection and disconnection.
7741ecc907d98b07c53b6ab1c0b5a20a51d18058 24-Aug-2010 James Dong <jdong@google.com> am 28a92120: am 3f51fa78: Runtime dump support for MediaWriter

Merge commit '28a92120a702289533a9c9d004bd60f83b2fd98b'

* commit '28a92120a702289533a9c9d004bd60f83b2fd98b':
Runtime dump support for MediaWriter
3f6855ba6c87a6f364daed6cb03aec5d735847ae 24-Aug-2010 Chia-chi Yeh <chiachi@android.com> am a102871c: am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread

Merge commit 'a102871c7cbb74ebddc53231a871145de61351b0'

* commit 'a102871c7cbb74ebddc53231a871145de61351b0':
Visualizer: replace the FFT implementation with a faster one.
33e0d8343174339cc9622d63c23d47c0ba0d3baa 24-Aug-2010 Eric Laurent <elaurent@google.com> am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread

Merge commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd' into gingerbread-plus-aosp

* commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd':
LVM release 1.05 delivery
b6d71351c074d5c0bc13a91544d776f1524eaabd 24-Aug-2010 Eric Laurent <elaurent@google.com> Merge "LVM release 1.05 delivery" into gingerbread
d820714e30a53b244d252e77c7922e2c1604adbc 24-Aug-2010 Nipun Kwatra <nkwatra@google.com> am 701b710c: am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread

Merge commit '701b710c194181765616520f6d89d450b4b6c1f5'

* commit '701b710c194181765616520f6d89d450b4b6c1f5':
setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
7802b20586643a4138f8d92b73736ae685a36409 24-Aug-2010 James Dong <jdong@google.com> am 3fc01525: am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread

Merge commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5'

* commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5':
Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
8c68865649fe5ee0faa619a104c2350a20e8f66d 24-Aug-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Check and clear exceptions after calling into Java in MtpDatabase"
0a7fa0a868ccce920827e141cbbe237594e53364 24-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Check and clear exceptions after calling into Java in MtpDatabase

Change-Id: I805858c66fe57208c06aa624d16b72966555e005
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpDatabase.cpp
85cfdd011241a5f2fb7fabc65b5943a39af7e1de 11-Aug-2010 Jamie Gennis <jgennis@google.com> Change the framework to use the new camera preview path.

This change makes the camera HAL interface take an ANativeWindow interface from
which all the camera preview buffers will be allocated. The framework code
running in application processes now passes a Surface object rather than an
ISurface to the camera server via Binder when setting the preview surface. The
camera server then forwards that Surface object (which implements the
ANativeWindow interface) to the camera HAL, which uses it to communicate with
SurfaceFlinger to allocate the camera preview buffers.

Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
ibmedia/IMediaRecorder.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
7fdaa2329e755c0e5c25724a43b8c361b88e9623 23-Aug-2010 Andreas Huber <andih@google.com> Merge "Account for the _ADRENO constant being moved."
c6c9b496aa360e53fca3497964224611aca29e9f 23-Aug-2010 Jamie Gennis <jgennis@google.com> Account for the _ADRENO constant being moved.

Change-Id: I443e2028c06f8b03e864525365c5c38de79314fe
ibstagefright/colorconversion/Android.mk
ibstagefright/colorconversion/SoftwareRenderer.cpp
7f81d4cbf1d17f1c5e5d0f5147c7459733990582 23-Aug-2010 Dima Zavin <dmitriyz@google.com> Merge changes Ic94c18a6,Iff770de1,Ifed6b4dc

* changes:
libstagefright: enable tegra hw audio decoders
libstagefright: Enable tegra hw video decoders
libstagefright: Enable tegra hw encoder
d5350764c9cbb27b91ca0503d6e318dffabe969f 23-Aug-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
e3c01832fc741e9908f047d86cd40db1ea5d78c8 16-Aug-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 35cc68814a9537c31fde146e171e7b0bbdfe211e
Author: Andreas Huber <andih@google.com>
Date: Mon Aug 16 08:48:42 2010 -0700

Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else.

commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 13 13:56:44 2010 -0700

The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise.

commit 684972074b74318bdcb826ed9b5b0864d2d2e273
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 13 09:34:35 2010 -0700

A first shot at supporting the new rendering APIs.

Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/TestPlayerStub.h
ibstagefright/AwesomePlayer.cpp
ibstagefright/colorconversion/Android.mk
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/SoftwareRenderer.h
ibstagefright/omx/OMX.cpp
ests/players/invoke_mock_media_player.cpp
31e71131049c943a388134e796087e109248efcc 23-Aug-2010 Andreas Huber <andih@google.com> am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread

Merge commit '3e22ef1e111966df6ad527632fdc35d105c73916' into gingerbread-plus-aosp

* commit '3e22ef1e111966df6ad527632fdc35d105c73916':
Better handling of rtsp connection and disconnection.
3e22ef1e111966df6ad527632fdc35d105c73916 23-Aug-2010 Andreas Huber <andih@google.com> Merge "Better handling of rtsp connection and disconnection." into gingerbread
37e2592f282d513d40227e027e1b1d3815c98033 23-Aug-2010 James Dong <jdong@google.com> am 3540760d: am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in the MP4 file

Merge commit '3540760d1d68cc883122d44ab1d38f542fb646e6'

* commit '3540760d1d68cc883122d44ab1d38f542fb646e6':
Don't drop a late frame which may lead to missing I frames in the MP4 file
a75d87ffc4a967382bac6fddb698bcec66397447 23-Aug-2010 James Dong <jdong@google.com> am 177a7ad8: am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread

Merge commit '177a7ad825445acaeea38c48c74ad87db935d054'

* commit '177a7ad825445acaeea38c48c74ad87db935d054':
Return error from MPEG4Writer stop() if the check on codec specific data failed
8370be11debc574b4a9fee62009009d999e29fa3 23-Aug-2010 Andreas Huber <andih@google.com> Better handling of rtsp connection and disconnection.

Change-Id: Ib126af6c14c5a212a51a5ee3c4a0a7d1860ad167
ibstagefright/include/ARTSPController.h
ibstagefright/rtsp/ARTSPController.cpp
ibstagefright/rtsp/MyHandler.h
30ba6cb91535c91e858088991b686efa59483427 23-Aug-2010 Dima Zavin <dima@android.com> libstagefright: enable tegra hw audio decoders

Change-Id: Ic94c18a6a6df8e0370dc28634f95561056ed2d02
Signed-off-by: Dima Zavin <dima@android.com>
ibstagefright/OMXCodec.cpp
6ad2c357c37f4736e92f0e24f69d4fcd48f55909 27-Jul-2010 pgudadhe <pgudadhe@nvidia.com> libstagefright: Enable tegra hw video decoders

Change-Id: Iff770de1369e57e7833a8cfa9a30955030d9974c
ibstagefright/OMXCodec.cpp
28a92120a702289533a9c9d004bd60f83b2fd98b 23-Aug-2010 James Dong <jdong@google.com> am 3f51fa78: Runtime dump support for MediaWriter

Merge commit '3f51fa78ada0e064d23db5961337280c267cc2c0' into gingerbread-plus-aosp

* commit '3f51fa78ada0e064d23db5961337280c267cc2c0':
Runtime dump support for MediaWriter
3f51fa78ada0e064d23db5961337280c267cc2c0 18-Aug-2010 James Dong <jdong@google.com> Runtime dump support for MediaWriter

Change-Id: I10b2c474de612ee4cef4b7c9eae2ee1dd8c2e895
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/MPEG4Writer.cpp
a102871c7cbb74ebddc53231a871145de61351b0 23-Aug-2010 Chia-chi Yeh <chiachi@android.com> am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread

Merge commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a' into gingerbread-plus-aosp

* commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a':
Visualizer: replace the FFT implementation with a faster one.
b80e610b070c2cec98a228a8aec450dc24a5f90a 23-Aug-2010 Chia-chi Yeh <chiachi@android.com> Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
349250f3b64421f59439355c80a4540fbb34dda5 21-Aug-2010 James Dong <jdong@google.com> am c8d2fa70: am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread

Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217'

* commit 'c8d2fa704abebdbf0bd8aac185216dc068950217':
Make MediaWriter stop and pause return errors if necessary
83b3e3515aff1bd7618df256345229891ab8a657 21-Aug-2010 Andreas Huber <andih@google.com> am 873ebfb8: am 223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread

Merge commit '873ebfb825cb498d9ff3012d1d31b02e31a79980'

* commit '873ebfb825cb498d9ff3012d1d31b02e31a79980':
Support for MP4V-ES packetization format according to RFC3016.
fc5d0cf56401a56f58b12412617e4b84bea2771b 21-Aug-2010 Andreas Huber <andih@google.com> am b29ebd39: am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread

Merge commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f'

* commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f':
In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
08b352be43845d413086ba1dd48db54fe41a309d 21-Aug-2010 Eric Laurent <elaurent@google.com> am 5aff90a6: am 1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread

Merge commit '5aff90a638da53e66fba90c92d412812760fe8e5'

* commit '5aff90a638da53e66fba90c92d412812760fe8e5':
Audio Effects: fixed "strength supported" parameter size.
a6a0fe436b37693a57d23be99da89024cdc99c9d 21-Aug-2010 Andreas Huber <andih@google.com> am 6bcffcd2: am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread

Merge commit '6bcffcd2dc410db780c152c70a01b22da6ca58be'

* commit '6bcffcd2dc410db780c152c70a01b22da6ca58be':
Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
701b710c194181765616520f6d89d450b4b6c1f5 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread

Merge commit '300b0b7e2b8f0ab922e4a83755ae999da191894e' into gingerbread-plus-aosp

* commit '300b0b7e2b8f0ab922e4a83755ae999da191894e':
setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
a1a96f35701b538dc1ca043719eaa6fd733130c5 04-Aug-2010 Eric Laurent <elaurent@google.com> LVM release 1.05 delivery

- Click have been removed from the HP filter activation in the BassBosst Effect.
- SessionId is now stored as a SessionNo
- Effects now stop being called after a delay
- Unix EOL fixed for .java and .xml
- Updated lines limited to 100 characters.
- Removed the remaining warnings from the wrapper code
- Added reverb

Change-Id: I03a2b3b5ee2286958f4901acc8d9b0daf9e2d7c6
ibeffects/lvm/lib/Android.mk
ibeffects/lvm/lib/Bass/src/LVDBE_Control.c
ibeffects/lvm/lib/Bass/src/LVDBE_Init.c
ibeffects/lvm/lib/Bass/src/LVDBE_Private.h
ibeffects/lvm/lib/Bass/src/LVDBE_Process.c
ibeffects/lvm/lib/Bundle/src/LVM_Control.c
ibeffects/lvm/lib/Reverb/lib/LVREV.h
ibeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
ibeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c
ibeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.c
ibeffects/lvm/lib/Reverb/src/LVREV_Private.h
ibeffects/lvm/lib/Reverb/src/LVREV_Process.c
ibeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.c
ibeffects/lvm/lib/Reverb/src/LVREV_Tables.c
ibeffects/lvm/lib/Reverb/src/LVREV_Tables.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
ibeffects/lvm/wrapper/Android.mk
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
ibeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ibeffects/lvm/wrapper/Reverb/EffectReverb.h
fb45748a1e1d0c4913cec195693c85bfdc45bd26 19-Aug-2010 Nipun Kwatra <nkwatra@google.com> setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.

according to MediaRecorder::setMaxDuration documentation we should disable duration limit
when zero or negative time is passed. Currently setParamMaxFileDurationUs was treating
zero/negative as an error case. Fixed that.

Change-Id: I468c3bcc74cb5a34ee3e172cef5147550d6be096
ibmediaplayerservice/StagefrightRecorder.cpp
3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5 20-Aug-2010 James Dong <jdong@google.com> am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread

Merge commit 'b755e3256510ecd325565d6b461d668d224445b1' into gingerbread-plus-aosp

* commit 'b755e3256510ecd325565d6b461d668d224445b1':
Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
727f658e81acadd082d2a658ece2b0b45e62c0fc 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "Added downsample()"
96624731c31de41968539b7c95b124d0845929e4 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added downsample()

Added a downsample function which downsamples the source image
starting at an offset and skipping every few pixels. Currently
no low pass filtering is done, but it should be added later.

Change-Id: Iec34092c536bfc661a15521e6a1ef2ef3f815c61
ibstagefright/yuv/YUVCanvas.cpp
437e6c49f1052184e01231e6f33ad21c91fc2d36 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "const correctness, validPixel test."
9c3053246c36af998ec4f5910e340f7cc0351ee9 26-Jul-2010 pgudadhe <pgudadhe@nvidia.com> libstagefright: Enable tegra hw encoder

Change-Id: Ifed6b4dc4877e3fcab86ee81c9117a92b1d1ce8f
ibstagefright/OMXCodec.cpp
9767dbf923dbd31d6d1a8316d72591c62490cf2f 20-Aug-2010 James Dong <jdong@google.com> Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder

Change-Id: Ia64c2751b6304e5d5891416bf23ff9b8ec54d5ef
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
d1fbdf1a3f1e0609756f01e7eae5a8334777fa06 20-Aug-2010 Nipun Kwatra <nkwatra@google.com> const correctness, validPixel test.

- made width(), height() const member functions.
- added validPixel() which returns true if pixel is in the allowed range.
- now testing validPixel in get/setPixelValue

Change-Id: I1dee5060bd4f8dcbdcd542ec4647ea328f0185c3
ibstagefright/yuv/YUVImage.cpp
3540760d1d68cc883122d44ab1d38f542fb646e6 20-Aug-2010 James Dong <jdong@google.com> am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in the MP4 file

Merge commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8' into gingerbread-plus-aosp

* commit '0ea4ed3bbb28fb6913392d2bee55621a1290dca8':
Don't drop a late frame which may lead to missing I frames in the MP4 file
177a7ad825445acaeea38c48c74ad87db935d054 20-Aug-2010 James Dong <jdong@google.com> am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread

Merge commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90' into gingerbread-plus-aosp

* commit '439fe407ff75b2c0fc21c66b430cd76e9f29ac90':
Return error from MPEG4Writer stop() if the check on codec specific data failed
0ea4ed3bbb28fb6913392d2bee55621a1290dca8 19-Aug-2010 James Dong <jdong@google.com> Don't drop a late frame which may lead to missing I frames in the MP4 file

Change-Id: I8fef1454264230c1369561670236eb0a19ae4e76
ibstagefright/MPEG4Writer.cpp
62948fa4de09c38f07e4b1853c5711f12bb1c596 19-Aug-2010 James Dong <jdong@google.com> Return error from MPEG4Writer stop() if the check on codec specific data failed

Change-Id: Icbd08eec9b4201facbad56ff2040f0830cfb0115
ibstagefright/MPEG4Writer.cpp
c8d2fa704abebdbf0bd8aac185216dc068950217 19-Aug-2010 James Dong <jdong@google.com> am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread

Merge commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118' into gingerbread-plus-aosp

* commit 'cbd038fe207f183bc7e0a610973473f7c2e9d118':
Make MediaWriter stop and pause return errors if necessary
cbd038fe207f183bc7e0a610973473f7c2e9d118 19-Aug-2010 James Dong <jdong@google.com> Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
d036662470ceb6b20b0591b7d4123f2db911536d 19-Aug-2010 James Dong <jdong@google.com> Make MediaWriter stop and pause return errors if necessary

o Make the API consistent with SF framework, which the MediaSource
provides a return status for stop

o Also, helps to convey errors that occurred right when a
premature stop() is called, leading to a potentially
mal-formed output file.

Change-Id: I52a932345f38570fdf8ea04d67d73dd94ccd30ef
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARTPWriter.h
873ebfb825cb498d9ff3012d1d31b02e31a79980 19-Aug-2010 Andreas Huber <andih@google.com> am 223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread

Merge commit '223e4f732a325e456ca6151f132f1d4c3c625631' into gingerbread-plus-aosp

* commit '223e4f732a325e456ca6151f132f1d4c3c625631':
Support for MP4V-ES packetization format according to RFC3016.
a979ad6739d573b3823b0fe7321f554ef5544753 19-Aug-2010 Andreas Huber <andih@google.com> Support for MP4V-ES packetization format according to RFC3016.

Change-Id: I5e182936c52f9eb80cdcf6132ead03705ee32d61
ibstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
ibstagefright/rtsp/AMPEG4ElementaryAssembler.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/Android.mk
b29ebd397e25a7176bcc1c81980f17b0190ebe7f 19-Aug-2010 Andreas Huber <andih@google.com> am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread

Merge commit 'f0ad54846168f07fc1fd7f18cde93deea1559f86' into gingerbread-plus-aosp

* commit 'f0ad54846168f07fc1fd7f18cde93deea1559f86':
In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
f0ad54846168f07fc1fd7f18cde93deea1559f86 19-Aug-2010 Andreas Huber <andih@google.com> Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
5aff90a638da53e66fba90c92d412812760fe8e5 19-Aug-2010 Eric Laurent <elaurent@google.com> am 1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread

Merge commit '1aaba885def9a3b59edbfe2a0f8c3899948533ff' into gingerbread-plus-aosp

* commit '1aaba885def9a3b59edbfe2a0f8c3899948533ff':
Audio Effects: fixed "strength supported" parameter size.
1aaba885def9a3b59edbfe2a0f8c3899948533ff 19-Aug-2010 Eric Laurent <elaurent@google.com> Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
eef3c33e5604ae6304364b7aa6337616e2d4c61e 19-Aug-2010 Andreas Huber <andih@google.com> In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.

Change-Id: I98c4194593c7e6e24f6fc339c862245111800293
ibstagefright/Android.mk
ibstagefright/avc_utils.cpp
ibstagefright/foundation/ABitReader.cpp
ibstagefright/foundation/Android.mk
ibstagefright/include/avc_utils.h
ibstagefright/mpeg2ts/ABitReader.cpp
ibstagefright/mpeg2ts/ABitReader.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/Android.mk
ibstagefright/rtsp/APacketSource.cpp
6bcffcd2dc410db780c152c70a01b22da6ca58be 19-Aug-2010 Andreas Huber <andih@google.com> am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread

Merge commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a' into gingerbread-plus-aosp

* commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a':
Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a 19-Aug-2010 Andreas Huber <andih@google.com> Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
58d3bd08107f44cba79938dd8430e69c0fda4202 19-Aug-2010 Chia-chi Yeh <chiachi@android.com> Visualizer: replace the FFT implementation with a faster one.

This implementation uses fixed points instead of floating points. It
is slightly inaccurate compared to the old one but still perfect for
visualization purpose. It runs 40% faster on passion, 5 times faster
on sholes, and of course 14 times faster on sapphire.

Change-Id: I1e868417bcffda091becf106a7b941d02813faec
ibmedia/Android.mk
ibmedia/Visualizer.cpp
ibmedia/fixedfft.cpp
ba8da2e61b1d9ebb7a4758f1f7849ff8440bd20c 18-Aug-2010 Eric Laurent <elaurent@google.com> Audio Effects: fixed "strength supported" parameter size.

The "strength supported" parameter for bass boost and virtualizer effect was incorrectly using a
short value whereas it should be an int. This is to comply to the definition of boolean type in OpenSL ES
that is uint32.

Change-Id: I74ccb61dcc70fc9d390524a1ca5bbbd8b13ab1af
ava/android/media/BassBoost.java
ava/android/media/Virtualizer.java
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
f5a36b24ace2d2e6a9bc7f369b09f3bb7bb08f5d 18-Aug-2010 Andreas Huber <andih@google.com> am 00557baf: am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread

Merge commit '00557baf36ab62592ae1c424a7298a21e8588f5a'

* commit '00557baf36ab62592ae1c424a7298a21e8588f5a':
Make the OggExtractor less verbose.
c7dbac57e29cd563b11e82740c3fb557d47907ac 18-Aug-2010 Andreas Huber <andih@google.com> am 31eb1ac1: am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread

Merge commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58'

* commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58':
Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
00557baf36ab62592ae1c424a7298a21e8588f5a 18-Aug-2010 Andreas Huber <andih@google.com> am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread

Merge commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd' into gingerbread-plus-aosp

* commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd':
Make the OggExtractor less verbose.
31eb1ac1db38d0a5cd0b44dd5251941992f74b58 18-Aug-2010 Andreas Huber <andih@google.com> am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread

Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp

* commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
2b2bff5d98ea5038c04ba65ac2bbf77692517ea8 18-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Remove retry loop from MTP server code

This should eliminate the spammy logging that my coworkers have noticed.

Change-Id: Ic0e611f5277dd13651490cbe5f7ded5f6e17db4f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpServer.cpp
9e837861b28b8186da0791c9a4e72f8a128a980c 18-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Compatibility fixes for transferring strings

Change-Id: Ic06d754ee68b0389439cdc34f73adff0f2b33afa
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpStringBuffer.cpp
af063a67b291c4622321a35af6966b8568d5a564 18-Aug-2010 Andreas Huber <andih@google.com> Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.

Change-Id: Ibe71f5941485660510e24d714da3865b9c6f89a2
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/ASessionDescription.h
ibstagefright/rtsp/MyHandler.h
4dda6ddb25e904c17dcb3012dd229df6ae4692cd 18-Aug-2010 Andreas Huber <andih@google.com> Merge "Make the OggExtractor less verbose." into gingerbread
08c94b265c4bf7105b593afb119053a2e16865e9 18-Aug-2010 Andreas Huber <andih@google.com> Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.

Change-Id: Ia29b967cbee9eabb21c6c26508b27b379ff9ba17
ibstagefright/MPEG4Extractor.cpp
09f672509b78344258f1b0d9f021d2ec99942515 18-Aug-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp

Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c
0b7bd95d69763573b87f95d4e9cab7d7358e9b93 17-Aug-2010 Rene Bolldorf <xsecute@googlemail.com> Fix compilation errors in libmedia, libstagefright.
(invalid conversion from 'const char*' to 'char*')

Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
ibmedia/MediaScanner.cpp
ibstagefright/HTTPDataSource.cpp
8ef786bf5648b77685c96d11aae7b6e410ac4169 17-Aug-2010 James Dong <jdong@google.com> am f54da15b: am eff30e3d: Change the default time scale for audio/video track during recording and reduce rounding errors in calculating the sample duration

Merge commit 'f54da15b7c3fa55268451c485544e831832fdf15'

* commit 'f54da15b7c3fa55268451c485544e831832fdf15':
Change the default time scale for audio/video track during recording
4ad5c707fa1501f8aba1391cb79306d49ba66272 17-Aug-2010 James Dong <jdong@google.com> am 4fc2c928: am b7208196: Use audio clock as the reference media clock

Merge commit '4fc2c9280c5262c835a4eb78961241de105313c1'

* commit '4fc2c9280c5262c835a4eb78961241de105313c1':
Use audio clock as the reference media clock
3386c38d59fa837f4876a24af821fb9b35314712 16-Aug-2010 Andreas Huber <andih@google.com> Make the OggExtractor less verbose.

Change-Id: Ieea5f3fa98d93ca6ad8fa7dcd23054e1cd0b6338
ibstagefright/OggExtractor.cpp
f54da15b7c3fa55268451c485544e831832fdf15 16-Aug-2010 James Dong <jdong@google.com> am eff30e3d: Change the default time scale for audio/video track during recording and reduce rounding errors in calculating the sample duration

Merge commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784' into gingerbread-plus-aosp

* commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784':
Change the default time scale for audio/video track during recording
eff30e3d1b005fd0696390d1dd47ec4ff0c52784 13-Aug-2010 James Dong <jdong@google.com> Change the default time scale for audio/video track during recording
and reduce rounding errors in calculating the sample duration

- Default time scale for tracks other than audio is set to 90000.
- Audio track by default uses the audio sampling rate as the time scale.
- Default movie time scale remains to be 1000.
- The default time scale values will be overwritten by a user-supplied value if exits.

Change-Id: I81b40ed0626ea45e9fd24a89e21a2c5a4a2c3415
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/MPEG4Writer.cpp
4fc2c9280c5262c835a4eb78961241de105313c1 14-Aug-2010 James Dong <jdong@google.com> am b7208196: Use audio clock as the reference media clock

Merge commit 'b72081966da3842e27f88045cfa5a67cef3d4220' into gingerbread-plus-aosp

* commit 'b72081966da3842e27f88045cfa5a67cef3d4220':
Use audio clock as the reference media clock
b72081966da3842e27f88045cfa5a67cef3d4220 03-Aug-2010 James Dong <jdong@google.com> Use audio clock as the reference media clock

o Only do this for realtime applications
o Adjust other track clock based on audio clock
o Assume other track uses wall clock as the media clock
o Use some heuristics to reduce the size of stts box by 2/3.

- also
o Remove one unused key from MetaData.h

Change-Id: Ib9432842627b61795b533508158c25258a527332
ibstagefright/MPEG4Writer.cpp
67dfaec8cf5c5cda9a3e2bd1c9d514f9cbfd0e73 13-Aug-2010 James Dong <jdong@google.com> am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:

Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f'

* commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f':
Mainly fix two mistakes that I made:
38a9f4050ac4b299c459e25bfff6b852bc8de54f 13-Aug-2010 James Dong <jdong@google.com> am e95d192f: Mainly fix two mistakes that I made:

Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp

* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
Mainly fix two mistakes that I made:
bf19bce30113f5824ffceb7a339501366bba2332 13-Aug-2010 Mike Dodd <mdodd@google.com> am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread

Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d'

* commit '2f02044944d5c526020d4e8cceaae7e77382d56d':
Support getting codec, width, and height in URL for gtalk playback.
2f02044944d5c526020d4e8cceaae7e77382d56d 13-Aug-2010 Mike Dodd <mdodd@google.com> am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread

Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp

* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
Support getting codec, width, and height in URL for gtalk playback.
e95d192fae5a80ed821c53bfea214a85ea395e90 13-Aug-2010 James Dong <jdong@google.com> Mainly fix two mistakes that I made:

1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized
release it would lead to crash

2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs)

Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
5f96138ba65cecf38d0c752d87ad47d931db8775 13-Aug-2010 Mike Dodd <mdodd@google.com> Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
0e8e269d2981f3567c40676891a934a746c00678 13-Aug-2010 Andreas Huber <andih@google.com> am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS.

Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba'

* commit '73af0a9211d0c4be663d287cefd9bf35746db1ba':
Fix software avc encoder crash at EOS.
73af0a9211d0c4be663d287cefd9bf35746db1ba 13-Aug-2010 Andreas Huber <andih@google.com> am 72ac1f26: Fix software avc encoder crash at EOS.

Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp

* commit '72ac1f26d73bd8e7645365d8d8374fac7a511263':
Fix software avc encoder crash at EOS.
72ac1f26d73bd8e7645365d8d8374fac7a511263 13-Aug-2010 Andreas Huber <andih@google.com> Fix software avc encoder crash at EOS.

Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
8741dfacf2ed0520e06b93af5109fa3b6042e4f6 13-Aug-2010 Mike Dodd <mdodd@google.com> Support getting codec, width, and height in URL for gtalk playback.

Format is rtsp://gtalk/codec/width/height

For example:
rtsp://gtalk/H263-1998/320/200

Change-Id: If7c73fea1e1d0de89b22a8f0d12acba1c862d6fe
ibstagefright/AwesomePlayer.cpp
465206940acade296a1064ac5a1fbcd0419d9eb6 12-Aug-2010 James Dong <jdong@google.com> am b408f549: am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes

Merge commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf'

* commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf':
Add lost preview surface detection in the JNI layer
08c96ec7f52e6951b949a68c9b1f4959c52ebed1 12-Aug-2010 Andreas Huber <andih@google.com> am 3bf8c342: am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread

Merge commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203'

* commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
53fb14ff8e0955ccc52b541dfbefce9d14881442 12-Aug-2010 Andreas Huber <andih@google.com> am 53895c6a: am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread

Merge commit '53895c6a0e8ecb4e835aab7eca7480779c224356'

* commit '53895c6a0e8ecb4e835aab7eca7480779c224356':
APacketSource is too verbose.
9e9cd8865b016b9bf829b49d10989aaf8ba406a7 12-Aug-2010 James Dong <jdong@google.com> am 8473db02: am 708ec39c: Don\'t send late frames to software encoders for encoding

Merge commit '8473db025423632d1145d895fe74af0e976efac4'

* commit '8473db025423632d1145d895fe74af0e976efac4':
Don't send late frames to software encoders for encoding
b408f5490b8591a2799d6b1db91e29e4b203d2bf 12-Aug-2010 James Dong <jdong@google.com> am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes

Merge commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9' into gingerbread-plus-aosp

* commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9':
Add lost preview surface detection in the JNI layer
3bf8c3427f4c728bb88e5e266b85c96e3e727203 12-Aug-2010 Andreas Huber <andih@google.com> am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread

Merge commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4' into gingerbread-plus-aosp

* commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
53895c6a0e8ecb4e835aab7eca7480779c224356 12-Aug-2010 Andreas Huber <andih@google.com> am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread

Merge commit '66aa0f3d950f7f842327b47592baa920e855925c' into gingerbread-plus-aosp

* commit '66aa0f3d950f7f842327b47592baa920e855925c':
APacketSource is too verbose.
8473db025423632d1145d895fe74af0e976efac4 12-Aug-2010 James Dong <jdong@google.com> am 708ec39c: Don\'t send late frames to software encoders for encoding

Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp

* commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad':
Don't send late frames to software encoders for encoding
d790c6485a388a3e8045dbd18b903b20a7dcf0d9 12-Aug-2010 James Dong <jdong@google.com> Add lost preview surface detection in the JNI layer
Throws an IOException if this happens rather than crashes

Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
ni/android_media_MediaRecorder.cpp
ae3a1f45951aeb716e1f6b9a99a09838eb55dab4 12-Aug-2010 Andreas Huber <andih@google.com> Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread
66aa0f3d950f7f842327b47592baa920e855925c 12-Aug-2010 Andreas Huber <andih@google.com> Merge "APacketSource is too verbose." into gingerbread
00237b79a031e95073f7f9ee8f7c022e149a4f3b 12-Aug-2010 Andreas Huber <andih@google.com> Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.

Change-Id: I7cc468a3095537347d86803579001458b62fcadb
ibstagefright/rtsp/AH263Assembler.cpp
ibstagefright/rtsp/ARTPWriter.cpp
708ec39c21568e0c2aa3d20c681f0e14ee6134ad 12-Aug-2010 James Dong <jdong@google.com> Don't send late frames to software encoders for encoding

o Document on what frames will be rejected and what frames will be accepted

Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/include/AVCEncoder.h
ibstagefright/include/M4vH263Encoder.h
e63cccf006166c03f542349908f1c0a7b4d2d9cc 12-Aug-2010 James Dong <jdong@google.com> am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbread

Merge commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff'

* commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff':
Handle large audio lost
387c9ff7047f85234050f3255ee280a86486a983 12-Aug-2010 James Dong <jdong@google.com> am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread

Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'

* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
Fix a crash due to unnecessary check on the codec config data for H263 video track
8aa244eab7ba834439cc919fd1f83d1e4ef49aff 12-Aug-2010 James Dong <jdong@google.com> am 45cb3cfa: Merge "Handle large audio lost" into gingerbread

Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp

* commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261':
Handle large audio lost
f4e26da1af90145564f6065d62cf8efcef0c6f04 12-Aug-2010 James Dong <jdong@google.com> am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread

Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp

* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
Fix a crash due to unnecessary check on the codec config data for H263 video track
45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261 12-Aug-2010 James Dong <jdong@google.com> Merge "Handle large audio lost" into gingerbread
b6541f0af89b1fe85cb53e5dac461587eb040fb0 12-Aug-2010 James Dong <jdong@google.com> Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
aa56ede87936f28f368e14e3b08d31de4005bb30 12-Aug-2010 James Dong <jdong@google.com> am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread

Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c'

* commit '0386d04b19619b03b6bce830010e11d31d3f8a5c':
Fix all fd leaks in authoring engine
0386d04b19619b03b6bce830010e11d31d3f8a5c 12-Aug-2010 James Dong <jdong@google.com> am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread

Merge commit '581581fe1addfac8913c8d4d6c88eed6ded90de4' into gingerbread-plus-aosp

* commit '581581fe1addfac8913c8d4d6c88eed6ded90de4':
Fix all fd leaks in authoring engine
581581fe1addfac8913c8d4d6c88eed6ded90de4 12-Aug-2010 James Dong <jdong@google.com> Merge "Fix all fd leaks in authoring engine" into gingerbread
3f55576e049b7244103f10d03c626c70a195db2d 12-Aug-2010 Andreas Huber <andih@google.com> APacketSource is too verbose.

Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
ibstagefright/rtsp/APacketSource.cpp
c6280bce51b6f970b7c7a0a342f70586316e2722 12-Aug-2010 James Dong <jdong@google.com> Fix all fd leaks in authoring engine

Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
ibmedia/IMediaRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.cpp
7ae08a6d79d5e6e3e0529ee890f5ca3eae249637 12-Aug-2010 James Dong <jdong@google.com> Fix a crash due to unnecessary check on the codec config data for H263 video track

Change-Id: I00e8b65d25731153e4d9be6a443eeed91c8fb605
ibstagefright/MPEG4Writer.cpp
196fc9279d32f7c1270b55cf159a5d5dc372c6e9 11-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "Call startPreview after stopping for mUseStillCameraForTimeLapse=true case."
6b63dce8c9f8ba2d165ed249c873e537516c6b19 11-Aug-2010 Andreas Huber <andih@google.com> am 136d8336: am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread

Merge commit '136d8336b6cb18067cd783185dacef34ae785519'

* commit '136d8336b6cb18067cd783185dacef34ae785519':
This code in CameraSource really should hold the lock.
136d8336b6cb18067cd783185dacef34ae785519 11-Aug-2010 Andreas Huber <andih@google.com> am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread

Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp

* commit '90d1d104272954042d5440f248980e4348e97686':
This code in CameraSource really should hold the lock.
90d1d104272954042d5440f248980e4348e97686 11-Aug-2010 Andreas Huber <andih@google.com> Merge "This code in CameraSource really should hold the lock." into gingerbread
22bd242478fa9c9531cf0b750023db5a513eaa8c 11-Aug-2010 Andreas Huber <andih@google.com> This code in CameraSource really should hold the lock.

Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a
ibstagefright/CameraSource.cpp
e381c4bc39e7e252c83beac9af324c342d187d0c 11-Aug-2010 Yu Shan Emily Lau <yslau@google.com> am 1ded9f95: am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread

Merge commit '1ded9f95636a83298658bfcd840ae8e51127c714'

* commit '1ded9f95636a83298658bfcd840ae8e51127c714':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
1ded9f95636a83298658bfcd840ae8e51127c714 11-Aug-2010 Yu Shan Emily Lau <yslau@google.com> am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread

Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp

* commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
fd4a7c83b2c880ba5b75525ebe3f1845903ada76 11-Aug-2010 Yu Shan Emily Lau <yslau@google.com> Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.

Change-Id: I51008ffdbe60e7e0b298091eb914b74f2d6731f8
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPowerTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/power/MediaPlayerPowerTest.java
afe5305855e2f3d830337f768028615a44d4aa16 11-Aug-2010 James Dong <jdong@google.com> Handle large audio lost

Change-Id: I2687ad855aac758946954d0b3fe7aff9f7b5ae7c
ibstagefright/AudioSource.cpp
c44cf627036f54d14438f5d003542c47d7c417cd 11-Aug-2010 Nipun Kwatra <nkwatra@google.com> Call startPreview after stopping for mUseStillCameraForTimeLapse=true case.

In the case when stop is pressed after takePicture has been called
but the CAMERA_MSG_COMPRESSED_IMAGE message from camera has not yet
been received, preview was not getting restarted. The reason was that
CameraSource::stop sets the camera listener to NULL and hence the
dataCallback() function which handles the CAMERA_MSG_COMPRESSED_IMAGE
message and restarts preview never got called.

Change-Id: Ib8f3bb77d9eab1ed5a67798569025ea0d63d7fd4
ibstagefright/CameraSourceTimeLapse.cpp
a774765686bd61b01b9b0386c35c338c61a46225 10-Aug-2010 Andreas Huber <andih@google.com> am d35498f6: am 1a140bf6: Merge "Remove some obsolete code." into gingerbread

Merge commit 'd35498f6062410e777d6ad41a720db32336e2089'

* commit 'd35498f6062410e777d6ad41a720db32336e2089':
Remove some obsolete code.
d35498f6062410e777d6ad41a720db32336e2089 10-Aug-2010 Andreas Huber <andih@google.com> am 1a140bf6: Merge "Remove some obsolete code." into gingerbread

Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp

* commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5':
Remove some obsolete code.
6fa131105d632b6e6a0110b9db32949964470cad 10-Aug-2010 Andreas Huber <andih@google.com> Remove some obsolete code.

Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
ibstagefright/AwesomePlayer.cpp
c3f20251ebd6fa609ef8faf17e45838679c15df6 10-Aug-2010 James Dong <jdong@google.com> am b9ddd779: am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread

Merge commit 'b9ddd779ae547b020764b89a0cbd96d589717609'

* commit 'b9ddd779ae547b020764b89a0cbd96d589717609':
Add input buffer size check for software video encoders
b9ddd779ae547b020764b89a0cbd96d589717609 10-Aug-2010 James Dong <jdong@google.com> am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread

Merge commit '10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp

* commit '10ed3f7438f6ae797bac32476dc61465c6484c85':
Add input buffer size check for software video encoders
10ed3f7438f6ae797bac32476dc61465c6484c85 10-Aug-2010 James Dong <jdong@google.com> Merge "Add input buffer size check for software video encoders" into gingerbread
3965148396c1dbd70c12ade2cb21c495d99f1ea7 10-Aug-2010 Andreas Huber <andih@google.com> am 4dc41bb4: am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbrea

Merge commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'

* commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28 10-Aug-2010 Andreas Huber <andih@google.com> am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread

Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp

* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
18f0174ff4eef46f121e77a0dc1d7a8271621f48 10-Aug-2010 Andreas Huber <andih@google.com> Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
f5e9018b8043e9a61b51283af6c4aa4738ef6068 10-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "use usleep instead of sleep."
e75504d2c7138b28f1859e15ff2fb78ab98f006f 10-Aug-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix wrong delete operator from previous change."
33ea5a4e860659ccde5f31cb0f1d87f35e0a0032 10-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Fix wrong delete operator from previous change.

Change-Id: I64e8fdc610495f21060727b6bed42d1584833405
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
7913998c4ba9b7d8ff6868b2a8e05a566fbb8042 10-Aug-2010 Nipun Kwatra <nkwatra@google.com> use usleep instead of sleep.

Minor bugfix. sleep doesn't take fractional value for seconds, so use
usleep instead of sleep for sleeping small times.

Change-Id: I40e45c30cc595a54c18601117b9a1a3637652f60
ibstagefright/CameraSourceTimeLapse.cpp
ac4bbc2e181fb9505b38e2410ff9035dddfbab9b 10-Aug-2010 Andreas Huber <andih@google.com> am 193985ff: am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into ginger

Merge commit '193985ffd553c139e8c1094d7798edbe5b0797c5'

* commit '193985ffd553c139e8c1094d7798edbe5b0797c5':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
193985ffd553c139e8c1094d7798edbe5b0797c5 10-Aug-2010 Andreas Huber <andih@google.com> am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread

Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp

* commit '235be391f3b9cd79e525de87757e361ae044940d':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
235be391f3b9cd79e525de87757e361ae044940d 10-Aug-2010 Andreas Huber <andih@google.com> Merge "Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
f88f84414ae7baead03497f1d650ad8ea2f87688 10-Aug-2010 Andreas Huber <andih@google.com> We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.

Change-Id: Idc3df74b42000f7a6aa3eae090718dc9d9c4186f
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPConnection.h
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTPSource.cpp
898d5cdda2967938073d78cf3cd3135831451d3c 10-Aug-2010 James Dong <jdong@google.com> am a0488341: am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread

Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990'

* commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
e6daea5940c38267d24a39fc32bffa119132e852 10-Aug-2010 James Dong <jdong@google.com> Add input buffer size check for software video encoders

Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
a04883412ec1a5dac3e83c3fd3c335ab9579a990 10-Aug-2010 James Dong <jdong@google.com> am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread

Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp

* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
f3b7859fc9b63dded08d470b1c0de3ddc681d9c7 08-Aug-2010 James Dong <jdong@google.com> Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer

o Assume there is only a single output buffer containing such information.
This simplifies the logic in MP4 file writer

o Output SPS and PPS in the very first buffer for software AVC encoder
This is to make AVC encoder work with the MP4 file writer

o Add timestamp value for codec config data

Change-Id: Iad27a04579e6028332429cd0bebd30976041e997
ibstagefright/MPEG4Writer.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
aa92ef7a56604a631b949095cbaa996dc0c835d7 10-Aug-2010 Andreas Huber <andih@google.com> Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.

Change-Id: I51df3b8139b3009565b2271611050700a23cf1d7
ibstagefright/HTTPStream.cpp
4b322ce4fb86b5a7a6e50633a3a9f498ca8d4706 10-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Push queries for supported formats and properties up to Java.

Change-Id: I4f117090340e3916afda3d194521a6092a672ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpTypes.h
fb824581d7c8b4683e26a9c2e34d9023cdbc177d 10-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: turn off verbose logging

Change-Id: Ifd449c4e8c4aec6e5623869e86f8cbedd303972c
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDebug.h
3357ccea7aad71371cb14024e48c53545c6ca8b3 10-Aug-2010 Jean-Michel Trivi <jmtrivi@google.com> am 2f5f154d: am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread

Merge commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54'

* commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54':
Fix bug 2684341 Don't steal the media button event from the phone
6e96f6fc6c4a583cf924cbaf1cdc54198e509e27 10-Aug-2010 James Dong <jdong@google.com> am fa4f57fe: am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread

Merge commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e'

* commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e':
Support multiple PPS and SPS in avcC box
030af3439fd3314b52ba998f89ea1c3acfb6c03e 10-Aug-2010 Andreas Huber <andih@google.com> am e14923b0: am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread

Merge commit 'e14923b0c80b2e73e69b7917c1f170b356592d29'

* commit 'e14923b0c80b2e73e69b7917c1f170b356592d29':
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
f5c35c84fa629b8cda25f1861d91ec89d7a10f90 10-Aug-2010 Eric Laurent <elaurent@google.com> am 18afcee7: am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread

Merge commit '18afcee767694fd1dce1a371769dc898102143ff'

* commit '18afcee767694fd1dce1a371769dc898102143ff':
Added tests for audio effects in MediaFrameworkTest
dbe57fcb497c2bcfd594f4fa003e179751bfeebd 10-Aug-2010 Eric Laurent <elaurent@google.com> am 1ece7d68: am 2a6b80bc: Fixed several audio effects problems.

Merge commit '1ece7d6873027068a3e7b055597045e9387b217c'

* commit '1ece7d6873027068a3e7b055597045e9387b217c':
Fixed several audio effects problems.
2f5f154d6a090b4ea2ee3645857f2fcae88daa54 10-Aug-2010 Jean-Michel Trivi <jmtrivi@google.com> am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread

Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp

* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
Fix bug 2684341 Don't steal the media button event from the phone
fa4f57fe0f85d2340524311f1409e0a1b2864a6e 10-Aug-2010 James Dong <jdong@google.com> am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread

Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp

* commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
Support multiple PPS and SPS in avcC box
e14923b0c80b2e73e69b7917c1f170b356592d29 10-Aug-2010 Andreas Huber <andih@google.com> am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread

Merge commit '4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp

* commit '4edf85abc919b7d0e8db71c0c6166c7994269830':
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
18afcee767694fd1dce1a371769dc898102143ff 10-Aug-2010 Eric Laurent <elaurent@google.com> am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread

Merge commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0' into gingerbread-plus-aosp

* commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0':
Added tests for audio effects in MediaFrameworkTest
1ece7d6873027068a3e7b055597045e9387b217c 10-Aug-2010 Eric Laurent <elaurent@google.com> am 2a6b80bc: Fixed several audio effects problems.

Merge commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee' into gingerbread-plus-aosp

* commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee':
Fixed several audio effects problems.
66edf558a9041eb0b1a7fc0459db1bdafcfca84b 09-Aug-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
959909ef2855b119a9e8cd171dd0ebeb606b3a8f 09-Aug-2010 James Dong <jdong@google.com> Merge "Support multiple PPS and SPS in avcC box" into gingerbread
481e05ea0d4bd9260fa75b3ad73bc936c37515c4 06-Aug-2010 James Dong <jdong@google.com> Support multiple PPS and SPS in avcC box

- Also
o do not use the hard-coded profile and levels.
Instead, we are using the profile and level found in the codec config data
o we are not supporting FRExt profile and levels for now, which requires
additional seq parameter set extension for instance.

Change-Id: If695b4c996d073d8e48aa45fdd7001e9f016f375
ibstagefright/MPEG4Writer.cpp
97c8d9046ea9500ab77970eaa3f66bc1034ff43e 09-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Fix reading and writing property descriptors

We were missing support for the group code, resulting in an off by 4 bytes problem.

Change-Id: I4a640c67b8d36e1bd658b6185178a71966d4b0b6
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpProperty.cpp
tp/MtpProperty.h
e73131a68408a0495ba96a4d5a60799ba293c176 14-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2684341 Don't steal the media button event from the phone
app is the phone is ringing, even in silent mode.

Use the PhoneStateListener to know whether the phone is ringing,
as the mode is not MODE_RINGTONE when ringing in silent mode.

Change-Id: Iede350cecde0b663d50f9b4a57f9a9ef08066c0d
ava/android/media/AudioService.java
4edf85abc919b7d0e8db71c0c6166c7994269830 09-Aug-2010 Andreas Huber <andih@google.com> Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
d3793f38f974f3c661289e4fa140b51655c5ed71 09-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Add debug code for printing names of MTP format and property codes.

Change-Id: Ia95ff014cec8720d01091fa30764011089076fe8
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDebug.cpp
tp/MtpDebug.h
c642e8a44c3dece488f488481fb69eeebd2f3554 09-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Fix some typos

Change-Id: Ib31708c3a925e3c0ab8eea6922ab09e02b740936
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpDatabase.cpp
tp/MtpServer.cpp
tp/mtp.h
67400d492bfd1f1a8a3d03dc93957a1467f4c7d0 09-Aug-2010 Eric Laurent <elaurent@google.com> Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
520b2a7039792f03da11a8d54344f10175cebfbc 09-Aug-2010 Andreas Huber <andih@google.com> Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.

Change-Id: I92685d09456c220b8c09842defb721bd55b0b9f6
related-to-bug: 2900021
ibstagefright/Android.mk
ibstagefright/MediaDefs.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/codecs/g711/Android.mk
ibstagefright/codecs/g711/dec/Android.mk
ibstagefright/codecs/g711/dec/G711Decoder.cpp
ibstagefright/include/G711Decoder.h
ibstagefright/include/WAVExtractor.h
2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee 30-Jul-2010 Eric Laurent <elaurent@google.com> Fixed several audio effects problems.

- Fixed constant inversions in AudioEffect.java
- Do not return error when enabling an already enabled effect
- Update cached effect state in native AudioEffect class when effect is enabled/disabled by command() method
- Remove click when restarting effect during disable sequence
- Fixed problem in master mute management when volume control is delegated to effect.

Change-Id: I6df4ce9fcc54fdc7345df858f639d20d802d6712
ava/android/media/AudioEffect.java
ibmedia/AudioEffect.cpp
441ec6bd106a6ac09ff0ceed1f8d437c33cfc156 28-Jul-2010 Eric Laurent <elaurent@google.com> Added tests for audio effects in MediaFrameworkTest

This CL adds a set of automated functional tests for the AudioEffect class
and the following derived classes:
BassBoost, Equalizer, Virtualizer and Visualizer.

These tests require the following file on the SD card:
/sdcard/media_api/music/sine_200+1000Hz_44K_mo.wav

Change-Id: I6ec3ec6f9ede10ccf2dd3b1e9ee4b08396740dee
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioEffectTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVisualizerTest.java
704f7e64bae065b3b51c0cc1b381f6259bc97fde 07-Aug-2010 Andreas Huber <andih@google.com> am c143ae7e: am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.

Merge commit 'c143ae7eb74205eb2b71e63479988b9913956687'

* commit 'c143ae7eb74205eb2b71e63479988b9913956687':
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
2e0a33f8e6588bea54d67843e6f0c3c3cfa75792 07-Aug-2010 Andreas Huber <andih@google.com> am 4f25d033: am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread

Merge commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55'

* commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55':
Properly skip the 'skip' chunk in mpeg4 files.
c143ae7eb74205eb2b71e63479988b9913956687 07-Aug-2010 Andreas Huber <andih@google.com> am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.

Merge commit 'ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp

* commit 'ad98d383a04fce08a147b200e23b12f12b2681a3':
Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
4f25d03382ca01a00c6f0e0967c5edf302f62b55 07-Aug-2010 Andreas Huber <andih@google.com> am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread

Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp

* commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
Properly skip the 'skip' chunk in mpeg4 files.
ad98d383a04fce08a147b200e23b12f12b2681a3 06-Aug-2010 Andreas Huber <andih@google.com> Support for communicating if a buffer read from the _extractor_ is a sync sample or not.

Change-Id: Ie71506224d937cfff1fa1273bfac31c47db8845f
related-to-bug: 2900534
ibstagefright/AMRExtractor.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleTable.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/include/SampleTable.h
ibstagefright/matroska/MatroskaExtractor.cpp
765b8aa8de9114abb4b4bc64a44910a9f9d66623 07-Aug-2010 Andreas Huber <andih@google.com> Properly skip the 'skip' chunk in mpeg4 files.

Change-Id: I6795347f91f24d5379e8dc80a24ae016a9629c9c
related-to-bug: 2901311
ibstagefright/MPEG4Extractor.cpp
453e92f6e1189f61f1d692c2501029bdb8c12ea2 04-Aug-2010 Nipun Kwatra <nkwatra@google.com> When using still camera for time lapse capture, don't set preview.

Since HD resolution may not be supported by the video camera,
don't set preivew using the HD size. The app should have set the
preview already, just use that.

Change-Id: I2f8e89bf2c7440f7bc8db7e4a228f4c8250d92b4
ibmediaplayerservice/StagefrightRecorder.cpp
84d65c725b07b3a67b35d71690627896508689b3 06-Aug-2010 James Dong <jdong@google.com> am 9c09a605: am 1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread

Merge commit '9c09a60513faf39901bb8e4681d39812204b3f73'

* commit '9c09a60513faf39901bb8e4681d39812204b3f73':
Use the target color format from the camera source if possible
9c09a60513faf39901bb8e4681d39812204b3f73 06-Aug-2010 James Dong <jdong@google.com> am 1441bdfc: Merge "Use the target color format from the camera source if possible" into gingerbread

Merge commit '1441bdfc19d6998607adf1347ed8dafc102908c9' into gingerbread-plus-aosp

* commit '1441bdfc19d6998607adf1347ed8dafc102908c9':
Use the target color format from the camera source if possible
1441bdfc19d6998607adf1347ed8dafc102908c9 06-Aug-2010 James Dong <jdong@google.com> Merge "Use the target color format from the camera source if possible" into gingerbread
3933cb79ec72dd66a393c799a0da225d46e458ed 05-Aug-2010 James Dong <jdong@google.com> am 41b29cb0: am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread

Merge commit '41b29cb0a8e04e553357662b81bffea26f1c2d84'

* commit '41b29cb0a8e04e553357662b81bffea26f1c2d84':
Fix an issue where the track duration does not include the last sample duration
afd97e82cf28d72048c44f78c211a3e9ac6e11e5 04-Aug-2010 James Dong <jdong@google.com> Use the target color format from the camera source if possible

- If the target color format is unavailable, the default
platform-dependent color format will be used.

- Also add some logic to prevent looping forever if the
omx component is buggy supporting color format enumeration.

Change-Id: I119a78f0d6201b4c3621235cca2f523ec14e24e3
ibstagefright/OMXCodec.cpp
2184abfead330a209a9c15eb80d214d0b5985ebb 05-Aug-2010 Andreas Huber <andih@google.com> am 870678a9: am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread

Merge commit '870678a954e1e2a96caf76453c20de808253ffd1'

* commit '870678a954e1e2a96caf76453c20de808253ffd1':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
8776781c89bda0dc000020b9a8446a1be24a9940 05-Aug-2010 Andreas Huber <andih@google.com> am 2405988f: am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread

Merge commit '2405988fa07dfc7f6607cafe75322326628a9f52'

* commit '2405988fa07dfc7f6607cafe75322326628a9f52':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
b2b1a2dc3a97c0dbec4e2af4e6f7c3539b97f658 05-Aug-2010 Andreas Huber <andih@google.com> am c6d1519e: am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread

Merge commit 'c6d1519e549740abd56df7a98b5348bd9095ae46'

* commit 'c6d1519e549740abd56df7a98b5348bd9095ae46':
Specification of codec specific data as part of the session description is now optional.
613d363c96bb304cbedad54004bc99928fcf22df 05-Aug-2010 Scott Main <smain@google.com> am ef9fd39d: am 769f9b89: am 5b86de94: fix doc bugs

Merge commit 'ef9fd39d73877162ba200ef8b2000216133dab2e'

* commit 'ef9fd39d73877162ba200ef8b2000216133dab2e':
fix doc bugs
15e762bd4f2599b475900c7a713b20152ac20c90 05-Aug-2010 Marco Nelissen <marcone@google.com> am 533dc786: am 7d146197: Merge "Fix divide by zero." into gingerbread

Merge commit '533dc7866c19327e31ec6a13e36b997bcc74a650'

* commit '533dc7866c19327e31ec6a13e36b997bcc74a650':
Fix divide by zero.
63ff094e88307a69cad3ed5fc146eeeb2c4ace07 05-Aug-2010 Andreas Huber <andih@google.com> am ac8e7060: am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread

Merge commit 'ac8e7060e09cc8eecc3f959691185bf156939404'

* commit 'ac8e7060e09cc8eecc3f959691185bf156939404':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
0a3858b0de236e262aa9d3906086ea8bfe554a4f 05-Aug-2010 Andreas Huber <andih@google.com> am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread

Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf'

* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
ff43836b8806bbcc2ac8192534cd647c78b7cf03 05-Aug-2010 Eric Laurent <elaurent@google.com> am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbread

Merge commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067'

* commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067':
Fix issue 2876124.
41b29cb0a8e04e553357662b81bffea26f1c2d84 05-Aug-2010 James Dong <jdong@google.com> am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread

Merge commit '3aad8c38520956708e51882f3fad63a7a217e8e4' into gingerbread-plus-aosp

* commit '3aad8c38520956708e51882f3fad63a7a217e8e4':
Fix an issue where the track duration does not include the last sample duration
91b22a94532f337ab9d315840a0e6bdec7974f8e 05-Aug-2010 James Dong <jdong@google.com> Fix an issue where the track duration does not include the last sample duration

Change-Id: Ib6e01c1c84ad9b7404536f9c40bf90a13340ae53
ibstagefright/MPEG4Writer.cpp
870678a954e1e2a96caf76453c20de808253ffd1 05-Aug-2010 Andreas Huber <andih@google.com> am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread

Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp

* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
2405988fa07dfc7f6607cafe75322326628a9f52 05-Aug-2010 Andreas Huber <andih@google.com> am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread

Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp

* commit '407ec58c6604da3255b04aa99577515deba3a26f':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
2c37f3d3a09188f3dc66e177547709e4828918be 05-Aug-2010 Andreas Huber <andih@google.com> Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
1f7fba1ffbf5922d999ab52130efb73a35e72077 05-Aug-2010 Andreas Huber <andih@google.com> A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.

Change-Id: I001fa36d3f5bf385b9f9d086c802673071c65db9
related-to-bug: 2896814
ibstagefright/OggExtractor.cpp
3eaa3006a8230bd607375bedd79b2e328b0fc6b7 05-Aug-2010 Andreas Huber <andih@google.com> Better support for fake timestamps in RTP, H.263 video now also requests FIR.

Change-Id: I2385461887197fe4062d329086e0204f6d6620fc
ibstagefright/AwesomePlayer.cpp
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTPSource.h
c6d1519e549740abd56df7a98b5348bd9095ae46 05-Aug-2010 Andreas Huber <andih@google.com> am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread

Merge commit 'fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp

* commit 'fb861523318710b95c08110b9b2de28f7da74a40':
Specification of codec specific data as part of the session description is now optional.
fb861523318710b95c08110b9b2de28f7da74a40 05-Aug-2010 Andreas Huber <andih@google.com> Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
4e68d506b0d9c7f01bb927ad7be1995392d7d366 05-Aug-2010 Eric Laurent <elaurent@google.com> resolved conflicts for merge of acc4e683 to master

Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8
ef9fd39d73877162ba200ef8b2000216133dab2e 05-Aug-2010 Scott Main <smain@google.com> am 769f9b89: am 5b86de94: fix doc bugs

Merge commit '769f9b8980a774e3493cbd9beac565c6b5d62161' into gingerbread-plus-aosp

* commit '769f9b8980a774e3493cbd9beac565c6b5d62161':
fix doc bugs
769f9b8980a774e3493cbd9beac565c6b5d62161 05-Aug-2010 Scott Main <smain@google.com> am 5b86de94: fix doc bugs

Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread

* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
fix doc bugs
5b86de94a163ce4c52ab08a9820f9d78414e1767 02-Aug-2010 Scott Main <smain@google.com> fix doc bugs

Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
ava/android/media/AudioFormat.java
533dc7866c19327e31ec6a13e36b997bcc74a650 05-Aug-2010 Marco Nelissen <marcone@google.com> am 7d146197: Merge "Fix divide by zero." into gingerbread

Merge commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce' into gingerbread-plus-aosp

* commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce':
Fix divide by zero.
7d146197873e9bd5c1618a4ae10bcd13c821e1ce 05-Aug-2010 Marco Nelissen <marcone@google.com> Merge "Fix divide by zero." into gingerbread
0fc9f34d94b12df9d7eef7d8ea7724f02f2670b1 05-Aug-2010 Marco Nelissen <marcone@google.com> Fix divide by zero.

Change-Id: I3113234aa5936965424dde5b24e448df1be0b603
ibstagefright/OggExtractor.cpp
ac8e7060e09cc8eecc3f959691185bf156939404 04-Aug-2010 Andreas Huber <andih@google.com> am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread

Merge commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp

* commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
86d2c088f15e0df33d5f81bece1c2f088632cc2c 04-Aug-2010 Andreas Huber <andih@google.com> Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
1f513d8821670a33d6361ea521b6756163a3f9bf 04-Aug-2010 Andreas Huber <andih@google.com> am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread

Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp

* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
15644555189965b8dcb422c5f17ae4c7ada91cee 04-Aug-2010 Andreas Huber <andih@google.com> Don't return a decoder error if the encoded stream does not start with SPS/PPS.

Change-Id: I960ada0c53f8ffe413ecd07c2c754a996841f592
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/include/AVCDecoder.h
426b650e1bf18b6fd0df67af323318a9611053f5 04-Aug-2010 Andreas Huber <andih@google.com> Specification of codec specific data as part of the session description is now optional.

Change-Id: Ie1953909e1d241381add3cc82a7a1f7d7d1540f2
ibstagefright/AwesomePlayer.cpp
ibstagefright/rtsp/APacketSource.cpp
c3cc7011c21352b16d8a597df36b9aef59414626 04-Aug-2010 Mike Lockwood <lockwood@android.com> Merge changes I085cb3cf,Ied1cddc6

* changes:
MTP: Add support for syncing MTP playlists
MTP: Fix some thread safety issues in MTP server start/stop sequence.
57648e4eec7dd2593af467877bc7cce4aa654759 04-Aug-2010 Andreas Huber <andih@google.com> Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.

Change-Id: I95b8dd487061add9bade15749e563b01cd99d9a6
ava/android/media/MediaRecorder.java
ibmedia/mediarecorder.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/rtsp/AAMRAssembler.cpp
ibstagefright/rtsp/AAMRAssembler.h
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AAVCAssembler.h
ibstagefright/rtsp/AH263Assembler.cpp
ibstagefright/rtsp/AH263Assembler.h
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/APacketSource.h
ibstagefright/rtsp/ARTPAssembler.h
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPConnection.h
ibstagefright/rtsp/ARTPSession.cpp
ibstagefright/rtsp/ARTPSession.h
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTPSource.h
ibstagefright/rtsp/ARTPWriter.cpp
ibstagefright/rtsp/ARTPWriter.h
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/Android.mk
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/UDPPusher.cpp
ibstagefright/rtsp/UDPPusher.h
ibstagefright/rtsp/rtp_test.cpp
bf3699a55853c4f1ccca7816945f83a1b80a4619 04-Aug-2010 Nipun Kwatra <nkwatra@google.com> Unhide MediaRecorder::setTimeLapseParameters()

This function is used to enable time lapse video capture
and set the related parameters.

Change-Id: Ib6c4c107a92942d8e8fcce935d2c8542f8006cfb
ava/android/media/MediaRecorder.java
13f5b25c627b63f24f50efab39b82b8d8610ccd7 04-Aug-2010 James Dong <jdong@google.com> am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread

Merge commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb'

* commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb':
Replace CHECK with a failure return value when mCamera->setParameters() fails
26d7a6df73d0c434a5a0afac20f49bdda0c48f43 04-Aug-2010 James Dong <jdong@google.com> am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread

Merge commit '246aad12cf2becda5111d03fd1dd8f39712686f2'

* commit '246aad12cf2becda5111d03fd1dd8f39712686f2':
File writer has a designated writer thread now
327c0bd9e2d7a68e163459e93db2a0bbb2c7a526 04-Aug-2010 James Dong <jdong@google.com> am 9b84e8df: am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread

Merge commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80'

* commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80':
Fixed a typo in a method name of MediaPlayerPerformance.java class
eec3fca6277296f354ee2b1af0f4b3dceddb3067 04-Aug-2010 Eric Laurent <elaurent@google.com> am 7629e8dd: Merge "Fix issue 2876124." into gingerbread

Merge commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36' into gingerbread-plus-aosp

* commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36':
Fix issue 2876124.
7629e8dd1426a8a8e38a82e13eb51d1c6af24f36 04-Aug-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2876124." into gingerbread
acc4e6838d1d4030cb65acf0f9adb800a81fb22f 04-Aug-2010 Eric Laurent <elaurent@google.com> am 1340ee8a: Merge "NEW_API: Unhide audio effect APIs." into gingerbread

Merge commit '1340ee8a273a9b25a779f3b18d6f832ce496c68e' into gingerbread-plus-aosp

* commit '1340ee8a273a9b25a779f3b18d6f832ce496c68e':
NEW_API: Unhide audio effect APIs.
1340ee8a273a9b25a779f3b18d6f832ce496c68e 04-Aug-2010 Eric Laurent <elaurent@google.com> Merge "NEW_API: Unhide audio effect APIs." into gingerbread
17cb280e7f1ac3556eac90ab08263712e0348cb9 03-Aug-2010 Eric Laurent <elaurent@google.com> NEW_API: Unhide audio effect APIs.

This change unhides all public APIs for controling audio effects exposed
by the following classes:
- AudioEffect
- BassBoost
- EnvironmentalReverb
- Equalizer
- PresetReverb
- Virtualizer
- Visualizer

Also fixes several problems in javadoc.

Change-Id: I541ee4ad0232312ec720545737cbcdb8c9a82597
ava/android/media/AudioEffect.java
ava/android/media/AudioTrack.java
ava/android/media/BassBoost.java
ava/android/media/EnvironmentalReverb.java
ava/android/media/Equalizer.java
ava/android/media/MediaPlayer.java
ava/android/media/PresetReverb.java
ava/android/media/Virtualizer.java
ava/android/media/Visualizer.java
1d53b2a1779a0976267187e893b02bbfe232fe31 03-Aug-2010 Eric Laurent <elaurent@google.com> Fix issue 2876124.

Allow calls to MediaPlayer::notify() in idle state to signal errors from JNI.

Change-Id: I1515fe69766f0a926b76e15c4971317da2acd6a0
ibmedia/mediaplayer.cpp
d152c1c7534a80b84f6b389efa8a410ea359b3eb 04-Aug-2010 James Dong <jdong@google.com> am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread

Merge commit 'd194f3d68188a0993617ba8cc29d8abd381b6069' into gingerbread-plus-aosp

* commit 'd194f3d68188a0993617ba8cc29d8abd381b6069':
Replace CHECK with a failure return value when mCamera->setParameters() fails
6c8687cf1e52abede549908afe8d8820d24eaecd 04-Aug-2010 James Dong <jdong@google.com> am 51a260d8: am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread

Merge commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef'

* commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef':
Add lost frame handling in AudioSource
af3f29e62b35c0ce100f20f9d96affd5ef6e5e96 04-Aug-2010 James Dong <jdong@google.com> Replace CHECK with a failure return value when mCamera->setParameters() fails
if the camera is locked by someone else.

bug - 2827892

Change-Id: I217d4a00f04ebd57b557d3faef28787c14f23ea0
ibmediaplayerservice/StagefrightRecorder.cpp
9a2046fb5ceeee4d5334274cbff15f1058bb3244 03-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Add support for syncing MTP playlists

MTP playlists now correspond to playlists in the media provider
(like those created by the Music app).

Change-Id: I085cb3cff003037ad62f0e297fb0cfd3047cb3a2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpServer.h
23ee42f904ad6ba4e3d3d569ffd49f4f7d174e1e 03-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Fix some thread safety issues in MTP server start/stop sequence.

Change-Id: Ied1cddc6220fa7394e8de99df9bc37a1208b04ff
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpServer.cpp
246aad12cf2becda5111d03fd1dd8f39712686f2 03-Aug-2010 James Dong <jdong@google.com> am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread

Merge commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp

* commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
File writer has a designated writer thread now
3d84280ccc31d12765e2efe03e2dd3ade1acfc33 03-Aug-2010 James Dong <jdong@google.com> Merge "File writer has a designated writer thread now" into gingerbread
9b84e8df41261abeec7e37bff5f1b0cbf1fbce80 03-Aug-2010 James Dong <jdong@google.com> am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread

Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp

* commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668':
Fixed a typo in a method name of MediaPlayerPerformance.java class
a788026fd35eee2190dc7635e1fdbc781f6ef668 03-Aug-2010 James Dong <jdong@google.com> Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef 03-Aug-2010 James Dong <jdong@google.com> am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread

Merge commit '23796e3b622c6be4feb15d4d57e58645acfa431b' into gingerbread-plus-aosp

* commit '23796e3b622c6be4feb15d4d57e58645acfa431b':
Add lost frame handling in AudioSource
23796e3b622c6be4feb15d4d57e58645acfa431b 03-Aug-2010 James Dong <jdong@google.com> Merge "Add lost frame handling in AudioSource" into gingerbread
da8073c68e63179e1d4f5fb562e5625af686c984 31-Jul-2010 James Dong <jdong@google.com> File writer has a designated writer thread now

+ This reduces the file I/O block time for audio/video track processing
- Since the file writer is buffering some output samples, the memory
usage would go up, depending on how many output samples are buffered.

Change-Id: I780cc5b26f4b53a5efbd643fcf9505dfc19cd4cd
ibstagefright/MPEG4Writer.cpp
17e53043826b28c54bcbef749bf6ed82ef97926a 02-Aug-2010 Nipun Kwatra <nkwatra@google.com> Allowing useStillCameraForTimeLapse to be set through MediaRecorder.java

This will allow apps to make the decision of whether to use still image mode or
video mode for time lapse capture.

- setTimeLapseParameters now takes in a useStillCameraForTimeLapse parameter.
- Added support in StagefrightRecorder for passing through this parameter.

Change-Id: Iafbcb76f9a7903118ea5eb822c81008619630f03
ava/android/media/MediaRecorder.java
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
7d435c5e7e5a953cf0c899bf822b6ca661f5ba31 02-Aug-2010 Nipun Kwatra <nkwatra@google.com> including limits.h to fix simulator build.

Change-Id: I473a62ab8282e4e89e48ee6d7e99aec6ed37076a
ibstagefright/CameraSourceTimeLapse.cpp
16f8c620abd0ea07e704b6997a66a45ad3590dea 02-Aug-2010 Nipun Kwatra <nkwatra@google.com> Merge "Implementing getSupportedPictureSizes"
b1fb6079ef7f005c4be8de76bef57ce10c1efe76 31-Jul-2010 Nipun Kwatra <nkwatra@google.com> Implementing getSupportedPictureSizes

Go through all the supported picture sizes and choose the smallest one with
both dimensions higher than the passed in video width and height.

Change-Id: I4e9fe7a6384a0feeb9e069239ec68c70fb5f3033
ibstagefright/CameraSourceTimeLapse.cpp
7a047c89862febf63ce1bb5873179c7a2ff8d9d3 02-Aug-2010 Mike Lockwood <lockwood@android.com> MTP: Implement GetNumObjects

Change-Id: Iccc3a445f9a1eab7bb76eddd567c6a3a8f155b2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpServer.h
59c777a24a2c639dfd84b7bf17e430e6d3424866 02-Aug-2010 Mike Lockwood <lockwood@android.com> Clean up MtpDatabase API.

Return MTP response codes instead of booleans for success or failure.
Remove some unused code.

Change-Id: I82ce80a4d7779233264e3caf139ebd0cece12f5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpServer.cpp
a9015bb24f09b16f1bd643de3bd844923a4d6c31 31-Jul-2010 James Dong <jdong@google.com> Fixed a typo in a method name of MediaPlayerPerformance.java class

Change-Id: Ice9f931312b738fc62205988891f35907e8733d9
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
e1c5dae372071ff4b69f4e705227c20c1696dc53 30-Jul-2010 James Dong <jdong@google.com> am 7600f934: am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread

Merge commit '7600f934015cff4d678b0f4e8df0eb93749be7bb'

* commit '7600f934015cff4d678b0f4e8df0eb93749be7bb':
Added damr box for AMR (NB and WB) sample entry
7600f934015cff4d678b0f4e8df0eb93749be7bb 30-Jul-2010 James Dong <jdong@google.com> am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread

Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
Added damr box for AMR (NB and WB) sample entry
f0aa24d91d23195f811e317c4cc4ddbe06db8974 30-Jul-2010 James Dong <jdong@google.com> Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
c3ae937a95cbaf4afbe8aa006dc3db4c27f0ad44 30-Jul-2010 James Dong <jdong@google.com> Add lost frame handling in AudioSource

- Also collect stats on lost audio frames instead of time spent on reading

Change-Id: I6380b143e4fbdcd894491aaae523331e90d0f04f
ibstagefright/AudioSource.cpp
aea75231a5af14b6ab0ca57b910d1a2e349f068c 30-Jul-2010 James Dong <jdong@google.com> am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread

Merge commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c'

* commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c':
Lower the lower bound for max file duration check
e915b0ef5d574022dfeffc9b2b61e21c1433c89c 30-Jul-2010 James Dong <jdong@google.com> am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread

Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp

* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
Lower the lower bound for max file duration check
d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec 30-Jul-2010 James Dong <jdong@google.com> Merge "Lower the lower bound for max file duration check" into gingerbread
c80218a9665344a465383fd067f89778d4b6a3f1 30-Jul-2010 James Dong <jdong@google.com> Added damr box for AMR (NB and WB) sample entry

- Some players, like QT, sometimes are picky about the missing sample entry

Change-Id: Ia32d78e48ac9fd8af8285dbc67f0d69142ba98b4
ibstagefright/MPEG4Writer.cpp
8894de6d3e81649b3005bdbd0a95cbada0a6e418 30-Jul-2010 James Dong <jdong@google.com> Lower the lower bound for max file duration check

- This fixed a CTS test where 200 ms is being used

Change-Id: Ib598b7b94be54e98a96703c58c5f244bc379cf7d
ibmediaplayerservice/StagefrightRecorder.cpp
154a320069a316491c25b716f2aeea8c51a758e8 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 27eecb70 to gingerbread

Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
b422107d1d599e5d43cc47cd7e1342976b6b5b1a 30-Jul-2010 Eric Laurent <elaurent@google.com> am e67332f8: am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.

Merge commit 'e67332f879b3f97baaac2252b53ac64686aebdbb'

* commit 'e67332f879b3f97baaac2252b53ac64686aebdbb':
Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
e67332f879b3f97baaac2252b53ac64686aebdbb 30-Jul-2010 Eric Laurent <elaurent@google.com> am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.

Merge commit '92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp

* commit '92e847ed8e455dca3b2d33d92999e3960404d9af':
Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
92e847ed8e455dca3b2d33d92999e3960404d9af 30-Jul-2010 Eric Laurent <elaurent@google.com> Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.

Modified types of some arguments and returned values of the Equalizer class from int to short
to match those defined by OpenSL ES SLEqualizerItf interface.

Also fixed a problem with set properties in equalizer engine implementation.

Change-Id: I75894bad0cb67b01c18ca5e22f9687e75ee491b8
ava/android/media/Equalizer.java
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/testlibs/EffectEqualizer.cpp
8f5d160c92bb03a9156301e0577fa590f1ce0199 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 0c51c98f: am 4506c62a: fix inaccurate copyrights

Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf'

* commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf':
fix inaccurate copyrights
0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 4506c62a: fix inaccurate copyrights

Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp

* commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625':
fix inaccurate copyrights
27eecb704a27c1c73ed3449eba0307d8138b9c2e 30-Jul-2010 The Android Open Source Project <initial-contribution@android.com> Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD
83407b993f79e06470100f605748aba41cbeb966 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> fix inaccurate copyrights

Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
ibmedia/IMediaRecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
4506c62abd5767d6d42a97e8e87793a1b3bcb625 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> fix inaccurate copyrights

Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
ibmedia/IMediaRecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
dce4beb17982faeb6308bd7ee86c684514a3bad3 28-Jul-2010 Nipun Kwatra <nkwatra@google.com> Support for video size to be different from captured picture size.

Adding support to allow video size to be different than the supported
picture sizes. A picture size larger than the demanded video size is
chosen. Captured pictures are then cropped to the size of the desired
video size. Cropping is done from the the center portion of the picture.

Change-Id: I6bcbe16f94b6ecbcf28b7f46826a81b4b6b8cbc3
ibstagefright/Android.mk
ibstagefright/CameraSourceTimeLapse.cpp
a435c1389a149996d14c8a1efefcfb1ae7c7ea70 28-Jul-2010 Nipun Kwatra <nkwatra@google.com> Adding YUVImage and YUVCanvas.

YUVImage is a container class to hold YUV data and provide
various utilities, e.g. to set/get pixel values for different
YUV formats, fast copying routines, etc.
Currently supported YUV420 Planar and YUV420 Semi Planar.

YUVCanvas holds a reference to a YUVImage on which it can do various
drawing operations.

Change-Id: I052a57b7fbc834efe1626914f76c04c091996cac
ibstagefright/yuv/Android.mk
ibstagefright/yuv/YUVCanvas.cpp
ibstagefright/yuv/YUVImage.cpp
26d9b9870e5a387a5b38523387b4fb2d99542fe6 29-Jul-2010 Andreas Huber <andih@google.com> am 42556025: am 6dea6f4e: am 16263d9f: Squashed commit of the following:

Merge commit '425560259c6d41e7f413fdd0f517dc47f350c533'

* commit '425560259c6d41e7f413fdd0f517dc47f350c533':
Squashed commit of the following:
425560259c6d41e7f413fdd0f517dc47f350c533 29-Jul-2010 Andreas Huber <andih@google.com> am 6dea6f4e: am 16263d9f: Squashed commit of the following:

Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp

* commit '6dea6f4e71b53e421564d783c227cbe0a2469183':
Squashed commit of the following:
6dea6f4e71b53e421564d783c227cbe0a2469183 29-Jul-2010 Andreas Huber <andih@google.com> am 16263d9f: Squashed commit of the following:

Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread

* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
16263d9f8cc01392c2f3678b381ce897647c8c81 20-Jul-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 20 09:21:17 2010 -0700

Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug: 2826841

commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date: Sun Jul 18 17:57:01 2010 -0700

Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8

commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date: Thu Jul 8 20:56:13 2010 -0700

Enable the support for decoding audio with AAC+ and eAAC+ features

bug - 282684

Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b

Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
ibstagefright/AudioPlayer.cpp
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/include/AACDecoder.h
16edf317cdf000fe0bd808259703e0341d55df02 29-Jul-2010 James Dong <jdong@google.com> am 8ddb8f81: am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread

Merge commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0'

* commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0':
Eliminate the linear cost associated with mSampleSizes.size()
8ddb8f81902045ec8a53ec14b8fb936fd42517e0 29-Jul-2010 James Dong <jdong@google.com> am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread

Merge commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp

* commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d':
Eliminate the linear cost associated with mSampleSizes.size()
e991e5f334c287737b6d82b050185a20185d7def 28-Jul-2010 James Dong <jdong@google.com> Eliminate the linear cost associated with mSampleSizes.size()

- The linear cost associated with mSampleSizes.size() call causes the
CPU load to increase overtime as more and more audio/video samples
are recorded.

- Other Lists used in the MP4 file writer may have similar issues, but
the size() call is not made for each output audio/video output sample,
or the size of the list is bounded (not linear to the total number
of audio/video output samples). As for now, we can live with the small
cost (tested with 30 minutes long recording).

Change-Id: I23bd93ea4256cb0be0c1649760e39e6809eb4946
ibstagefright/MPEG4Writer.cpp
03a545e5edcd99985d672fba40110d054397d02c 28-Jul-2010 Mike Lockwood <lockwood@android.com> Merge changes I00d6980a,I814221b4,Id88603a5

* changes:
CameraBrowser: Launch itself when a camera is attached to USB.
Send Intents when PTP compatible devices are connected/disconnected to USB
Give system server permission to access USB.
a5e0330db0ca1689917bfaefdca8997f2658bb05 28-Jul-2010 James Dong <jdong@google.com> am 84665f6d: am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested

Merge commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511'

* commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511':
Reduce memory usage by the MP4 file writer
84665f6dc2d0b5dfa6a46463677c51f2b670e511 28-Jul-2010 James Dong <jdong@google.com> am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested

Merge commit '7e397842d53a4242a019daa4b234910273121c30' into gingerbread-plus-aosp

* commit '7e397842d53a4242a019daa4b234910273121c30':
Reduce memory usage by the MP4 file writer
733bfae99bd97cf70df7a5f222d62d61cbde1893 28-Jul-2010 James Dong <jdong@google.com> am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread

Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b'

* commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b':
Interleave the audio and video by default
7e397842d53a4242a019daa4b234910273121c30 28-Jul-2010 James Dong <jdong@google.com> Reduce memory usage by the MP4 file writer
- Don't store timestamp for each output sample
- Don't store timestamp for statistical data collection if the collection of statistical data is not requested

TODO:
1. Reduce CPU load by elimnating the list cost associated with List.size() call.

Change-Id: I590bc17176596a65952c982574b82ee3b15b7d1c
ibstagefright/MPEG4Writer.cpp
cb51115cca81ba47d00aa344f6ed16d1056b056b 28-Jul-2010 James Dong <jdong@google.com> am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread

Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp

* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
Interleave the audio and video by default
5587bb7e375c17c1320918e6f473625af1f5e5ac 28-Jul-2010 James Dong <jdong@google.com> Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
63299c03875f414ff6d5867fbca9a7b11699a644 28-Jul-2010 James Dong <jdong@google.com> Interleave the audio and video by default
- default interleave duration is set to 1 second

This can dramatically reduce the memory usage
by the MP4 file writer.

Change-Id: Ia3ff202cabfcd2d3f183065d31e4596617c2dded
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/MPEG4Writer.cpp
ba2709583d9b759ca7b2aad05dcbeeb2a6c4083e 28-Jul-2010 Eric Laurent <elaurent@google.com> am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread

Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf'

* commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf':
Audio effects: modified command() parameter types.
6fa8888254deb4961dc64c6ac03dc103c9cd8bcf 28-Jul-2010 Eric Laurent <elaurent@google.com> am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread

Merge commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb' into gingerbread-plus-aosp

* commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb':
Audio effects: modified command() parameter types.
a4c72acfbc6c06588dd26cf41e67a834fc0a54f9 28-Jul-2010 Eric Laurent <elaurent@google.com> Audio effects: modified command() parameter types.

The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command()
function have been modified from int to uint32_t. This is more consistent with their role.

Change-Id: I84d289fc262d6753747910f06f485597dfee6591
ni/audioeffect/android_media_AudioEffect.cpp
ibeffects/factory/EffectsFactory.c
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/testlibs/EffectReverb.h
ibeffects/visualizer/EffectVisualizer.cpp
ibmedia/AudioEffect.cpp
ibmedia/IEffect.cpp
ibmedia/IEffectClient.cpp
ibmedia/Visualizer.cpp
725552a0df76ee3b2d45650a25224f46597ad589 28-Jul-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: Launch itself when a camera is attached to USB.

Change-Id: I00d6980a1f8e6607c1368cbf78d8e824514c666b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/AndroidManifest.xml
ests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java
bb2b2a996b2c0bea7e434136e20340f4f1b398ab 27-Jul-2010 Mike Lockwood <lockwood@android.com> MTP host: Reduce buffer size for readObject so we don't clog our pipe.

Change-Id: I24d2b1551af5843e48c0a63b84925b3a6451e36a
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
456d8e6e67d845b6a2b27509e5808c3907f456aa 27-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Turn off excessive logging

Change-Id: Ib0dd8cb99efa324d0b4e742bffeb913d6122ace2
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpCursor.cpp
tp/MtpDebug.h
tp/MtpDevice.cpp
tp/MtpDeviceInfo.cpp
tp/MtpProperty.cpp
ests/CameraBrowser/Android.mk
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
1a987b8e456bd6af49465f40bb3884d63cad3423 27-Jul-2010 Mike Lockwood <lockwood@android.com> Try to fix the sim build.

Change-Id: I6e94c938263b2fd1931ed60c26af1134ff035455
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/mtp/Android.mk
b008e9b1281da871e970e5b4817f78afb4f12d4a 27-Jul-2010 Eric Laurent <elaurent@google.com> resolved conflicts for merge of d306cc81 to master

Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
d306cc8192bf569b2e6e7d58b4d73f6607e9d509 27-Jul-2010 Eric Laurent <elaurent@google.com> am ca57d1cc: Audio Effects: added methods to effects java classes to store and load current effect settings in a single call.

Merge commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3' into gingerbread-plus-aosp

* commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3':
Audio Effects: added methods to effects java classes to store and load current effect settings in
ca57d1cc89d65dfbd59c749c5736574cd08c7bd3 23-Jul-2010 Eric Laurent <elaurent@google.com> Audio Effects: added methods to effects java classes to store and load current effect settings in
a single call.

Addional changes:
- Fixed simulator build
- Use effect interface UUIDs from OpenSL ES includes when available
- Added cleanspec rules to remove now obsolete test effect libraries
- Fixed bug in AudioEffect JNI setParameter function.

Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
ava/android/media/BassBoost.java
ava/android/media/EnvironmentalReverb.java
ava/android/media/Equalizer.java
ava/android/media/PresetReverb.java
ava/android/media/Virtualizer.java
ni/audioeffect/android_media_AudioEffect.cpp
ibeffects/lvm/wrapper/Android.mk
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
ibeffects/testlibs/EffectReverb.c
ibeffects/visualizer/Android.mk
133dfe7e98d4eb6677c900fb3b17cd837ef7401b 27-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "Simple command line test tool for MTP host."
1979628e1e8c272a69b48dc24b2e2173bcf0a13c 27-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "CameraBrowser: Add support for copying files from camera to internal storage."
2f493f0ff1d36e7705e27e60bc849dee36aebda0 27-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor"
f7785521bf9ed9ce24d34b1c9f0e73487eb52f1e 27-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Don't request thumbnails for folder objects in MtpCursor"
bc55034ef9a33685891b3498e1c56caebf7a93cb 27-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Add hard coded support to recognize a couple MTP music players for testing purposes."
5fd1ff0aa370958dfdbabb6026c1d383d17df97f 27-Jul-2010 Mike Lockwood <lockwood@android.com> Simple command line test tool for MTP host.

Change-Id: Ifd13e1ca5d49a5477a9850d94d443a50bbc32ff1
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/mtp/Android.mk
ests/mtp/MtpFile.cpp
ests/mtp/MtpFile.h
ests/mtp/mtp.cpp
ad0643a330db13c8f11b1a71fbb7262570114f4d 27-Jul-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: Add support for copying files from camera to internal storage.

Change-Id: I00b765afec0558dfe27961bd0b2e01473c29fc22
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/AndroidManifest.xml
ests/CameraBrowser/res/menu/object_menu.xml
ests/CameraBrowser/res/values/strings.xml
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
bc4cb0bc79c0d366d6866fe4054a71e00d169ff9 27-Jul-2010 Mike Lockwood <lockwood@android.com> MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor

Also added some support for sending files to the device that hasn't been debugged yet.
Add locking to MtpDevice to prevent it from attempting multiple transactions simultaneously.

Change-Id: I2b995ba0af086cc6920bd6b8c869f540ad78560a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ni/android_media_MtpClient.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDevice.cpp
tp/MtpDevice.h
f78b26a572e3ba5d47009f3a810a15e252b5503c 27-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Don't request thumbnails for folder objects in MtpCursor

Change-Id: I75a0a834ab746bed0a35883539c8dbc104789157
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpCursor.cpp
tp/MtpCursor.h
86187098ce4bf14326493edb95e851078191cbe9 27-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Add hard coded support to recognize a couple MTP music players for testing purposes.

Change-Id: I2d09d78e83d13cfb3edff02372a6fc34b1e4d8b1
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpClient.cpp
037644fbe424315c5a3e9706453ce97413d636ff 26-Jul-2010 Eric Laurent <elaurent@google.com> am e80c30c6: am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread

Merge commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338'

* commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338':
Fixed bug in vlm effect bunde wrapper effect init function.
f4d9a21a4c7775ec4ee4b49f8f2bc10e5bc7c20d 26-Jul-2010 Eric Laurent <elaurent@google.com> am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbread

Merge commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365'

* commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365':
LVM release 1.04.
e80c30c6b557fab2f5fc7a87c51018f5a8074338 26-Jul-2010 Eric Laurent <elaurent@google.com> am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread

Merge commit '00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp

* commit '00de721859ca291d0e212a6970f0bd8b3a2f8428':
Fixed bug in vlm effect bunde wrapper effect init function.
df5c3b5024276af8b44d00bb28ce620ab31e2365 26-Jul-2010 Eric Laurent <elaurent@google.com> am 739bf285: Merge "LVM release 1.04." into gingerbread

Merge commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3' into gingerbread-plus-aosp

* commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3':
LVM release 1.04.
00de721859ca291d0e212a6970f0bd8b3a2f8428 26-Jul-2010 Eric Laurent <elaurent@google.com> Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
3374105cc0660c468c4d74de94e4546495843376 23-Jul-2010 Eric Laurent <elaurent@google.com> LVM release 1.04.

Remaining warnings in the code have been removed
Core components support seamless insertion in the audio stream at playtime (Enabling / Disabling the effect).

Change-Id: Icae7085305fad663faeb5a94cb673b41cec5a9f1
ibeffects/lvm/lib/Bass/src/LVDBE_Control.c
ibeffects/lvm/lib/Bundle/src/LVM_Buffers.c
ibeffects/lvm/lib/Bundle/src/LVM_Control.c
ibeffects/lvm/lib/Bundle/src/LVM_Init.c
ibeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Control.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Private.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
1c454cc4c72c604f90ea43b7bbdd7683e212e44c 26-Jul-2010 Eric Laurent <elaurent@google.com> Fixed bug in vlm effect bunde wrapper effect init function.

The status in the command reply field was not initialized by Effect_command() for
EFFECT_CMD_INIT causing unpredictable failures when initializing an effect.

Change-Id: I7dccb094c9244fad4ed9aea3062a395db295e082
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
d9f7200e218140ec939c813e3f1576cfcb5c0878 23-Jul-2010 Eric Laurent <elaurent@google.com> am 08f2b10c: am 021697ad: Audio effects: lvm bundle wrapper update after first integration tests.

Merge commit '08f2b10c4b2e7fc1c666cc1d896e227289206b24'

* commit '08f2b10c4b2e7fc1c666cc1d896e227289206b24':
Audio effects: lvm bundle wrapper update after first integration tests.
08f2b10c4b2e7fc1c666cc1d896e227289206b24 23-Jul-2010 Eric Laurent <elaurent@google.com> am 021697ad: Audio effects: lvm bundle wrapper update after first integration tests.

Merge commit '021697ad3d4ef981d0deae1fa223ed06f30df738' into gingerbread-plus-aosp

* commit '021697ad3d4ef981d0deae1fa223ed06f30df738':
Audio effects: lvm bundle wrapper update after first integration tests.
021697ad3d4ef981d0deae1fa223ed06f30df738 23-Jul-2010 Eric Laurent <elaurent@google.com> Audio effects: lvm bundle wrapper update after first integration tests.

Change-Id: I20cb55282833bd6e3a160e0dae1cc1fcb6b1ca30
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
e7c51f5144cfbdb8b6cf2169ac59e42322b3bc8b 23-Jul-2010 Nipun Kwatra <nkwatra@google.com> Don't change the public API (adding @hide)

Change-Id: I3f3330472c42932fddb1de2c60e2380e59980995
ava/android/media/MediaRecorder.java
d01371bf691ff04e4957e49805503dbf20b338df 21-Jul-2010 Nipun Kwatra <nkwatra@google.com> Allowing setting of time lapse parameters through MediaRecorder.java

added setTimeLapseParameters() to MediaRecorder.java and SetParameter support
in StagefrightRecorder to allow enabling time lapse and setting the corresponding
parameters.

Change-Id: I509040aa71f8d3fc37337b0894a81d9c0fd7a40a
ava/android/media/MediaRecorder.java
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSourceTimeLapse.cpp
9c9d0684a0e8b8368e649e102063ef48179d58c7 23-Jul-2010 James Dong <jdong@google.com> am 9bc4dc11: am 53d4e0d5: Allows the authoring engine to skip frame.

Merge commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae'

* commit '9bc4dc114fce58606a81d65d4cb31348cc7c1bae':
Allows the authoring engine to skip frame.
9bc4dc114fce58606a81d65d4cb31348cc7c1bae 23-Jul-2010 James Dong <jdong@google.com> am 53d4e0d5: Allows the authoring engine to skip frame.

Merge commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba' into gingerbread-plus-aosp

* commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba':
Allows the authoring engine to skip frame.
6d6b749b24fccfbbab41567fcf1eba1f14f5ad21 23-Jul-2010 Mathias Agopian <mathias@google.com> move native services under services/

moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
ediaserver/Android.mk
53d4e0d58e2d5c18f6e026c705af833b9bdd7aba 21-Jul-2010 James Dong <jdong@google.com> Allows the authoring engine to skip frame.

This is 1st part of the work to allow audio and video resync if
we found out that audio and video are out of sync during authoring

- also fixed a problem in AACEncoder::read() where the buffer acquired
from the buffer group does not release when error out at
reading from source.

Change-Id: I8a2740097fcfdf85e6178869afeb9f3687a99118
ibstagefright/AudioSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/MediaSource.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
8dac3bf922de433bc7d08c9968dfc5087de34b86 22-Jul-2010 Andreas Huber <andih@google.com> am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread

Merge commit 'b72d3180dc8d41d6269664bea808b04410bbe40f'

* commit 'b72d3180dc8d41d6269664bea808b04410bbe40f':
Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
b72d3180dc8d41d6269664bea808b04410bbe40f 22-Jul-2010 Andreas Huber <andih@google.com> am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread

Merge commit '81046c8c42ff3b630c6496deafd44f2a07a25463' into gingerbread-plus-aosp

* commit '81046c8c42ff3b630c6496deafd44f2a07a25463':
Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
4e4173b0af52bdf2b5730a5837476e400c5b2040 22-Jul-2010 Andreas Huber <andih@google.com> Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.

Change-Id: I110e19d5ce33e597add3ffbd3e3ff3815862396d
ibstagefright/foundation/ALooper.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/ARTSPController.cpp
ibstagefright/rtsp/MyHandler.h
9511ab83d6a136a4140ddf78bd4be61b7c3a2bbe 21-Jul-2010 Andreas Huber <andih@google.com> am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread

Merge commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd'

* commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd':
Support finer seek control on MediaSources.
8a9a931fff2d184f7cf77fdd8a425f682f006cfd 21-Jul-2010 Andreas Huber <andih@google.com> am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread

Merge commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce' into gingerbread-plus-aosp

* commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce':
Support finer seek control on MediaSources.
8138e841a5adb3c5629e263f5a8cb2e936d234ce 21-Jul-2010 Andreas Huber <andih@google.com> Merge "Support finer seek control on MediaSources." into gingerbread
0119ba5bd3335fe026927eeb65de535a7bd8c838 21-Jul-2010 Eric Laurent <elaurent@google.com> am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.

Merge commit '34161132030254bac7dd64c9713832e2f961a061'

* commit '34161132030254bac7dd64c9713832e2f961a061':
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
34161132030254bac7dd64c9713832e2f961a061 21-Jul-2010 Eric Laurent <elaurent@google.com> am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.

Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp

* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
6624c9fd0bc5e3858a22a04c05b5059445c1c367 21-Jul-2010 Andreas Huber <andih@google.com> Support finer seek control on MediaSources.

related-to-bug: 2858448

Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
ibstagefright/AMRExtractor.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/JPEGSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaSource.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/SampleTable.cpp
ibstagefright/ShoutcastSource.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwb/AMRWBDecoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
ibstagefright/codecs/on2/dec/VPXDecoder.cpp
ibstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
ibstagefright/include/AVCDecoder.h
ibstagefright/include/M4vH263Decoder.h
ibstagefright/include/SampleTable.h
ibstagefright/include/VPXDecoder.h
ibstagefright/matroska/MatroskaExtractor.cpp
7070b36549d511d6627538c73dfbab23fbae5b43 16-Jul-2010 Eric Laurent <elaurent@google.com> Added support for auxiliary audio effects to AudioTrack and MediaPlayer.

Added methods to AudioTrack and MediaPlayer java classes to enable use of
auxiliary audio effects. The effect can be attached and detached by specifying its
ID and the send level controlled.

Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
ava/android/media/AudioTrack.java
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/AudioTrack.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
c5eeedc93d7b9633d59fae7bc21a22a0e78fa373 21-Jul-2010 James Dong <jdong@google.com> am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread

Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5'

* commit '9049fe60c20640bd606741c8f45f3f781a1684f5':
Progress status notification
9049fe60c20640bd606741c8f45f3f781a1684f5 20-Jul-2010 James Dong <jdong@google.com> am d7514ec6: Merge "Progress status notification" into gingerbread

Merge commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9' into gingerbread-plus-aosp

* commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9':
Progress status notification
d7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9 20-Jul-2010 James Dong <jdong@google.com> Merge "Progress status notification" into gingerbread
87419a2b3d519b9667cbe7c83482939c7ff65414 20-Jul-2010 Nipun Kwatra <nkwatra@google.com> Merge "Restart preview after each takePicture is done."
240677ec68790b9af5fd16a604c0780eb2938bd6 20-Jul-2010 Eric Laurent <elaurent@google.com> resolved conflicts for merge of dd206093 to master

Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
4cd8672662b0e56f6b8b5c7e3cf6ced8c1b15638 19-Jul-2010 Nipun Kwatra <nkwatra@google.com> Restart preview after each takePicture is done.

Preview is called when CAMERA_MSG_COMPRESSED_IMAGE is recieved by
dataCallback(). It needs to be started as a new thread so that the
callback can return, and the camera can know that takePicture() is
done.

Change-Id: I4d0febbc993aac43b37f9f4a824e9c7b8785f19e
ibstagefright/CameraSourceTimeLapse.cpp
077cba41c1e9fc1a156d662ceaf72ea31c6fed82 20-Jul-2010 Nipun Kwatra <nkwatra@google.com> Use software encoder for time lapse capture.

Change-Id: I7f60eb1af95590c84b0cd98134f5a5a8963338dd
ibmediaplayerservice/StagefrightRecorder.cpp
dd2060932a7472ce361faacd340b0ef05b14c6ef 20-Jul-2010 Eric Laurent <elaurent@google.com> am 22a2d718: Merge "Audio policy manager changes for audio effects" into gingerbread

Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp

* commit '22a2d7186d015efcd648dff99500f8467463be82':
Audio policy manager changes for audio effects
22a2d7186d015efcd648dff99500f8467463be82 20-Jul-2010 Eric Laurent <elaurent@google.com> Merge "Audio policy manager changes for audio effects" into gingerbread
f91f2971a8a03026664666c332abe73f70c5b437 20-Jul-2010 Nipun Kwatra <nkwatra@google.com> Merge "Adding support for timelapse capture using still camera's takepicture. Also moving entire implementation into a new class CameraSourceTimeLapse which inherits from CameraSource."
0ef7da159d2dcb469985291aaaedcd717c1c02b8 20-Jul-2010 Andreas Huber <andih@google.com> am ff45709f: am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.

Merge commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe'

* commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe':
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe 20-Jul-2010 Andreas Huber <andih@google.com> am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.

Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp

* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
8ed6ed0b6216a9dfcbcd6a5ba6a62d28a901baec 13-Jul-2010 Eric Laurent <elaurent@google.com> Audio policy manager changes for audio effects

Added methods for audio effects management by audio policy manager.
- control of total CPU load and memory used by effect engines
- selection of output stream for global effects
- added audio session id in parameter list for startOutput() and stopOutput().
this is not used in default audio policy manager implementation.

Modifications of audio effect framework in AudioFlinger to allow moving and reconfiguring
effect engines from one output mixer thread to another when audio tracks in the same session
are moved or when requested by audio policy manager.
Also fixed mutex deadlock problem with effect chains locks.

Change-Id: Ida43484b06e9b890d6b9e53c13958d042720ebdb
ibeffects/factory/EffectsFactory.c
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioPolicyService.cpp
3f15301c06f968c8f1bb8fc88e1c090ab3824bb5 20-Jul-2010 Andreas Huber <andih@google.com> am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread

Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'

* commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
cc14a8393b92cd1ed6cba74829396045605ab211 20-Jul-2010 Andreas Huber <andih@google.com> Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug: 2826841
ibstagefright/AudioPlayer.cpp
ibstagefright/MPEG4Extractor.cpp
4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f 20-Jul-2010 Andreas Huber <andih@google.com> am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread

Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp

* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
faf1d46a60518fcc3e58c91740e673e8a3f2d3cc 20-Jul-2010 Andreas Huber <andih@google.com> Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
30881f68c97125f6bc1dbc7c26ccb3cdb91ebd2a 20-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MTP host fixes:"
3c51d6a9ef4fbc0cd76d72d60ae902a261e62145 20-Jul-2010 Mike Lockwood <lockwood@android.com> MTP host fixes:

Add support for detecting android MTP devices
Fix problem reading data packet with header sent separately from payload.

Change-Id: I07b34af6783ebe2e63a317796ba0c8223df86edf
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpClient.cpp
tp/MtpDataPacket.cpp
85edea79583eb486c8c5c51595a95ddc4ad217f0 16-Jul-2010 James Dong <jdong@google.com> Progress status notification

- Keep track of per-track progress

Change-Id: Ibd36f0e8c78581928c8aa2f5e23c5e7e0615c2cc
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/MPEG4Writer.cpp
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
aecf390618a0417d5ae2016a14016dff88889812 20-Jul-2010 Andy McFadden <fadden@android.com> Fix sim-eng build.

The LOCAL_PATH assignment was not available to the new host library
on simulator builds.

Change-Id: I7727f17ecc8f457f92bd6fa9ec13025dd8a56390
tp/Android.mk
108505b30f2b3ff100edae57b2c472d36c4cd6c4 20-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Remove race condition in initial device enumeration for host mode.

Change-Id: Iee01aaae3f8cca4234daa289bef6631da4d6c2b6
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpClient.cpp
tp/MtpClient.h
9bbc2ea9ad4904f16016941795ba12e2c7a8a439 20-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Fix problems reading and writing arrays in property values.

Change-Id: Idd53b63fd32698a3ffc90f174d16ae597b4feb36
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDataPacket.h
tp/MtpPacket.h
tp/MtpProperty.cpp
bbd9f36efa31bb3794d7126292d18ca40fe4ddf8 19-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: add Linux host library for MTP/PTP host support.

Change-Id: Ie2ce60b957ee428a8e8db46a70c5a0ade8445007
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
tp/MtpEventPacket.cpp
f9b80182bcd32d563c23c12b4ac06517fd6da531 12-Jul-2010 Nipun Kwatra <nkwatra@google.com> Adding support for timelapse capture using still camera's takepicture.
Also moving entire implementation into a new class CameraSourceTimeLapse
which inherits from CameraSource.

For timelapse capture using still camera, we start a thread which runs a
loop in which it calls Camera::takePicture() and then sleeps until the next
frame should be captured.
The function dataCallback() handles the callback from the camera with the
raw image data. This function copies the data and creates an artificial
timestamp corresponding to one frame time ahead of the last encoded frame's
time stamp. It then calls dataCallbackTimestamp() of the base class which
will think that it recieved the frame from a video camera and proceed as usual.

For moving the implementation to the subclass CameraSourceTimeLapse, added a
few virtual functions to CameraSource, which do the current thing for the base
class, but specialized things for CameraSourceTimeLapse.
E.g. startCameraRecording() in the base class just calls mCamera->startRecording(),
while in CameraSourceTimeLapse it may start a thread for the still camera case.

Change-Id: Ib787f24bd2e1f41681513f0257e1c4ca10a2b4de
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/Android.mk
ibstagefright/CameraSource.cpp
ibstagefright/CameraSourceTimeLapse.cpp
0c5f2ec25faf1a34ea336e31086ef8c4047ae51b 19-Jul-2010 James Dong <jdong@google.com> Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
ibstagefright/MPEG4Extractor.cpp
ibstagefright/codecs/aacdec/AACDecoder.cpp
6ef3593c3666dda3718e7e06547498ec33451690 19-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Only send events to host if we have an open session."
f17896df20276ac06e1932b512d3957a829cff4d 19-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "Add MTP_OBJECT_ID column name to MediaStore.MediaColumns"
dc453d4ee70cac0d04ce495fb2de6d5b52c6399b 19-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Only send events to host if we have an open session.

Change-Id: I7b2d0c88c2d2ae0490247703d0fb1b862154db92
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
61636c24f3ec72e6b8ecba06f6f0023281c38f80 19-Jul-2010 Andy McFadden <fadden@android.com> Merge "Fix sim-eng build."
d84f9863afe1401c65de0b863c7a6243bd433166 19-Jul-2010 Andy McFadden <fadden@android.com> Fix sim-eng build.

Different handling of libdl. Added sim handling in one place, corrected
typo in sim handling in another.

Change-Id: I24153ad5b8873083225390ba6a751941d231d092
ibeffects/lvm/wrapper/Android.mk
ibeffects/visualizer/Android.mk
1dfc722c46a3daee5f3abf7d1bd15248f2f32d79 19-Jul-2010 Eric Laurent <elaurent@google.com> am 3c6ea955: am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread

Merge commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57'

* commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57':
Fixed problems in audio effect volume control.
3c6ea95553d3a0e416874c583a41efff3f6fbc57 19-Jul-2010 Eric Laurent <elaurent@google.com> am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread

Merge commit '7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp

* commit '7203272f35e40bf9d4b76f1b2f9b0077738df118':
Fixed problems in audio effect volume control.
cbaea35759791f083735f7a5c43e0dc0ed228ff1 17-Jul-2010 Mike Lockwood <lockwood@android.com> Add MTP_OBJECT_ID column name to MediaStore.MediaColumns

This column will be added to the images, audio_meta, video and audio_playlist
tables to cross reference to the MTP objects table.

Renamed MTP_OBJECT_HANDLE (which is used only by the media scanner) to
MEDIA_SCANNER_NEW_OBJECT_ID to avoid confusion.

Change-Id: I8093485dc0438f408a505e82ffddd0710c7a512c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
0d7e048cf2e38d32568261760aef82d1ee145126 19-Jul-2010 Eric Laurent <elaurent@google.com> Fixed problems in audio effect volume control.

Fixed the following problems in audio effect volume control in AudioFlinger:
- Make sure that the volumes returned by EffectChain::setVolume_l() are correct even is
no change is detected since last call
- Do not use isEnabled() to validate volume control but mState >= ACTIVE instead as the volume control
must be also active in STOPPING and STOPPED states.

Change-Id: Id62da3164fad500ee8a5efd6cd78c77e8fdcb541
ibeffects/visualizer/EffectVisualizer.cpp
4ae577b3f082b17d5cb190dab3ac9d4b4c063ba9 19-Jul-2010 James Dong <jdong@google.com> am 5e782937: am faf775e7: Fix simulator build (1st attempt)

Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74'

* commit '5e782937ead3042255d83f9c1192f2cc7b688d74':
Fix simulator build (1st attempt)
5e782937ead3042255d83f9c1192f2cc7b688d74 19-Jul-2010 James Dong <jdong@google.com> am faf775e7: Fix simulator build (1st attempt)

Merge commit 'faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp

* commit 'faf775e772e329e821d81ba735474df097b1e1e9':
Fix simulator build (1st attempt)
faf775e772e329e821d81ba735474df097b1e1e9 18-Jul-2010 James Dong <jdong@google.com> Fix simulator build (1st attempt)

Change-Id: I65a824c17929170b7b2bc75a13e756e92d8fe50a
ibstagefright/codecs/m4v_h263/enc/src/mp4def.h
cdf8743e2166d96938082c8acbab81583b812293 17-Jul-2010 Eric Laurent <elaurent@google.com> am 2b381aff: am 2c87e9c9: First submission of audio effect library from NXP software.

Merge commit '2b381affda94c5b17e023768f9f2271c69152838'

* commit '2b381affda94c5b17e023768f9f2271c69152838':
First submission of audio effect library from NXP software.
2b381affda94c5b17e023768f9f2271c69152838 17-Jul-2010 Eric Laurent <elaurent@google.com> am 2c87e9c9: First submission of audio effect library from NXP software.

Merge commit '2c87e9c923b0362fabf8c97ff63997542394c428' into gingerbread-plus-aosp

* commit '2c87e9c923b0362fabf8c97ff63997542394c428':
First submission of audio effect library from NXP software.
2c87e9c923b0362fabf8c97ff63997542394c428 09-Jul-2010 Eric Laurent <elaurent@google.com> First submission of audio effect library from NXP software.

This CL contains the first open sourceable version of the audio effect library from NXP software.
The effects implemented are:
- Bass boost
- Virtualizer (stereo widening)
- Equalizer
- Spectrum analyzer

Source file for the effect engines are located under libeffects/lvm/lib
The wrapper implementing the interface with the audio effect framework in under libeffects/lvm/wrapper

The code of other effect libraries has also been reorganized fo clarity:
- the effect factory is now under libeffects/factory
- the test equalizer and reverb effects are under libeffect/testlibs
- the visualizer is under libeffects/virtualizer

Change-Id: I8d91e2181f81b89f8fc0c1e1e6bf552c5809b2eb
ibeffects/Android.mk
ibeffects/AudioBiquadFilter.cpp
ibeffects/AudioBiquadFilter.h
ibeffects/AudioCoefInterpolator.cpp
ibeffects/AudioCoefInterpolator.h
ibeffects/AudioCommon.h
ibeffects/AudioEqualizer.cpp
ibeffects/AudioEqualizer.h
ibeffects/AudioFormatAdapter.h
ibeffects/AudioHighShelfFilterCoef.inl
ibeffects/AudioLowShelfFilterCoef.inl
ibeffects/AudioPeakingFilter.cpp
ibeffects/AudioPeakingFilter.h
ibeffects/AudioPeakingFilterCoef.inl
ibeffects/AudioShelvingFilter.cpp
ibeffects/AudioShelvingFilter.h
ibeffects/EffectEqualizer.cpp
ibeffects/EffectReverb.c
ibeffects/EffectReverb.h
ibeffects/EffectVisualizer.cpp
ibeffects/EffectsFactory.c
ibeffects/EffectsFactory.h
ibeffects/EffectsMath.c
ibeffects/EffectsMath.h
ibeffects/factory/Android.mk
ibeffects/factory/EffectsFactory.c
ibeffects/factory/EffectsFactory.h
ibeffects/lvm/lib/Android.mk
ibeffects/lvm/lib/Bass/lib/LVDBE.h
ibeffects/lvm/lib/Bass/src/LVDBE_Coeffs.h
ibeffects/lvm/lib/Bass/src/LVDBE_Control.c
ibeffects/lvm/lib/Bass/src/LVDBE_Init.c
ibeffects/lvm/lib/Bass/src/LVDBE_Private.h
ibeffects/lvm/lib/Bass/src/LVDBE_Process.c
ibeffects/lvm/lib/Bass/src/LVDBE_Tables.c
ibeffects/lvm/lib/Bass/src/LVDBE_Tables.h
ibeffects/lvm/lib/Bundle/lib/LVM.h
ibeffects/lvm/lib/Bundle/src/LVM_API_Specials.c
ibeffects/lvm/lib/Bundle/src/LVM_Buffers.c
ibeffects/lvm/lib/Bundle/src/LVM_Coeffs.h
ibeffects/lvm/lib/Bundle/src/LVM_Control.c
ibeffects/lvm/lib/Bundle/src/LVM_Init.c
ibeffects/lvm/lib/Bundle/src/LVM_Private.h
ibeffects/lvm/lib/Bundle/src/LVM_Process.c
ibeffects/lvm/lib/Bundle/src/LVM_Tables.c
ibeffects/lvm/lib/Bundle/src/LVM_Tables.h
ibeffects/lvm/lib/Common/lib/AGC.h
ibeffects/lvm/lib/Common/lib/BIQUAD.h
ibeffects/lvm/lib/Common/lib/CompLim.h
ibeffects/lvm/lib/Common/lib/Filter.h
ibeffects/lvm/lib/Common/lib/InstAlloc.h
ibeffects/lvm/lib/Common/lib/LVM_Common.h
ibeffects/lvm/lib/Common/lib/LVM_Macros.h
ibeffects/lvm/lib/Common/lib/LVM_Timer.h
ibeffects/lvm/lib/Common/lib/LVM_Types.h
ibeffects/lvm/lib/Common/lib/Mixer.h
ibeffects/lvm/lib/Common/lib/ScalarArithmetic.h
ibeffects/lvm/lib/Common/lib/VectorArithmetic.h
ibeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.c
ibeffects/lvm/lib/Common/src/Abs_32.c
ibeffects/lvm/lib/Common/src/Add2_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Add2_Sat_32x32.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.c
ibeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.c
ibeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/CompLim_private.h
ibeffects/lvm/lib/Common/src/Copy_16.c
ibeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.c
ibeffects/lvm/lib/Common/src/DelayMix_16x16.c
ibeffects/lvm/lib/Common/src/DelayWrite_32.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/Filters.h
ibeffects/lvm/lib/Common/src/From2iToMS_16x16.c
ibeffects/lvm/lib/Common/src/From2iToMono_16.c
ibeffects/lvm/lib/Common/src/From2iToMono_32.c
ibeffects/lvm/lib/Common/src/InstAlloc.c
ibeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.c
ibeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.c
ibeffects/lvm/lib/Common/src/JoinTo2i_32x32.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.c
ibeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.c
ibeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.c
ibeffects/lvm/lib/Common/src/LVC_Mixer.h
ibeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_Init.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_Private.h
ibeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.c
ibeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.c
ibeffects/lvm/lib/Common/src/LVM_FO_HPF.c
ibeffects/lvm/lib/Common/src/LVM_FO_LPF.c
ibeffects/lvm/lib/Common/src/LVM_GetOmega.c
ibeffects/lvm/lib/Common/src/LVM_Mixer_FilterCoeffs.h
ibeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.c
ibeffects/lvm/lib/Common/src/LVM_Polynomial.c
ibeffects/lvm/lib/Common/src/LVM_Power10.c
ibeffects/lvm/lib/Common/src/LVM_Timer.c
ibeffects/lvm/lib/Common/src/LVM_Timer_Init.c
ibeffects/lvm/lib/Common/src/LVM_Timer_Private.h
ibeffects/lvm/lib/Common/src/LoadConst_16.c
ibeffects/lvm/lib/Common/src/LoadConst_32.c
ibeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.c
ibeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.c
ibeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.c
ibeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c
ibeffects/lvm/lib/Common/src/Mixer_private.h
ibeffects/lvm/lib/Common/src/MonoTo2I_16.c
ibeffects/lvm/lib/Common/src/MonoTo2I_32.c
ibeffects/lvm/lib/Common/src/Mult3s_32x16.c
ibeffects/lvm/lib/Common/src/NonLinComp_D16.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.c
ibeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Private.h
ibeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.c
ibeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.c
ibeffects/lvm/lib/Common/src/dB_to_Lin32.c
ibeffects/lvm/lib/Common/src/mult3s_16x16.c
ibeffects/lvm/lib/Eq/lib/LVEQNB.h
ibeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Coeffs.h
ibeffects/lvm/lib/Eq/src/LVEQNB_Control.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Init.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Private.h
ibeffects/lvm/lib/Eq/src/LVEQNB_Process.c
ibeffects/lvm/lib/Eq/src/LVEQNB_Tables.c
ibeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.c
ibeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.c
ibeffects/lvm/lib/StereoWidening/lib/LVCS.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Headphone_Coeffs.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Private.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Process.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h
ibeffects/lvm/lib/StereoWidening/src/LVCS_Tables.c
ibeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h
ibeffects/lvm/wrapper/Android.mk
ibeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ibeffects/lvm/wrapper/Bundle/EffectBundle.h
ibeffects/testlibs/Android.mk_
ibeffects/testlibs/AudioBiquadFilter.cpp
ibeffects/testlibs/AudioBiquadFilter.h
ibeffects/testlibs/AudioCoefInterpolator.cpp
ibeffects/testlibs/AudioCoefInterpolator.h
ibeffects/testlibs/AudioCommon.h
ibeffects/testlibs/AudioEqualizer.cpp
ibeffects/testlibs/AudioEqualizer.h
ibeffects/testlibs/AudioFormatAdapter.h
ibeffects/testlibs/AudioHighShelfFilterCoef.inl
ibeffects/testlibs/AudioLowShelfFilterCoef.inl
ibeffects/testlibs/AudioPeakingFilter.cpp
ibeffects/testlibs/AudioPeakingFilter.h
ibeffects/testlibs/AudioPeakingFilterCoef.inl
ibeffects/testlibs/AudioShelvingFilter.cpp
ibeffects/testlibs/AudioShelvingFilter.h
ibeffects/testlibs/EffectEqualizer.cpp
ibeffects/testlibs/EffectReverb.c
ibeffects/testlibs/EffectReverb.h
ibeffects/testlibs/EffectsMath.c
ibeffects/testlibs/EffectsMath.h
ibeffects/visualizer/Android.mk
ibeffects/visualizer/EffectVisualizer.cpp
085d0f55e6a2e8449961174673d43a5868874639 16-Jul-2010 James Dong <jdong@google.com> am 10f8baa4: am 42ef0c71: Initial check-in for software m4v_h263 encoder

Merge commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd'

* commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd':
Initial check-in for software m4v_h263 encoder
10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd 15-Jul-2010 James Dong <jdong@google.com> am 42ef0c71: Initial check-in for software m4v_h263 encoder

Merge commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae' into gingerbread-plus-aosp

* commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae':
Initial check-in for software m4v_h263 encoder
42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae 13-Jul-2010 James Dong <jdong@google.com> Initial check-in for software m4v_h263 encoder

Change-Id: I4b49fa5c3a5e6e21cfd2419441d98dd784046367
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/m4v_h263/enc/Android.mk
ibstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
ibstagefright/codecs/m4v_h263/enc/include/cvei.h
ibstagefright/codecs/m4v_h263/enc/include/mp4enc_api.h
ibstagefright/codecs/m4v_h263/enc/src/bitstream_io.cpp
ibstagefright/codecs/m4v_h263/enc/src/bitstream_io.h
ibstagefright/codecs/m4v_h263/enc/src/combined_encode.cpp
ibstagefright/codecs/m4v_h263/enc/src/datapart_encode.cpp
ibstagefright/codecs/m4v_h263/enc/src/dct.cpp
ibstagefright/codecs/m4v_h263/enc/src/dct.h
ibstagefright/codecs/m4v_h263/enc/src/dct_inline.h
ibstagefright/codecs/m4v_h263/enc/src/fastcodemb.cpp
ibstagefright/codecs/m4v_h263/enc/src/fastcodemb.h
ibstagefright/codecs/m4v_h263/enc/src/fastidct.cpp
ibstagefright/codecs/m4v_h263/enc/src/fastquant.cpp
ibstagefright/codecs/m4v_h263/enc/src/fastquant_inline.h
ibstagefright/codecs/m4v_h263/enc/src/findhalfpel.cpp
ibstagefright/codecs/m4v_h263/enc/src/m4venc_oscl.h
ibstagefright/codecs/m4v_h263/enc/src/me_utils.cpp
ibstagefright/codecs/m4v_h263/enc/src/motion_comp.cpp
ibstagefright/codecs/m4v_h263/enc/src/motion_est.cpp
ibstagefright/codecs/m4v_h263/enc/src/mp4def.h
ibstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp
ibstagefright/codecs/m4v_h263/enc/src/mp4enc_lib.h
ibstagefright/codecs/m4v_h263/enc/src/mp4lib_int.h
ibstagefright/codecs/m4v_h263/enc/src/rate_control.cpp
ibstagefright/codecs/m4v_h263/enc/src/rate_control.h
ibstagefright/codecs/m4v_h263/enc/src/sad.cpp
ibstagefright/codecs/m4v_h263/enc/src/sad_halfpel.cpp
ibstagefright/codecs/m4v_h263/enc/src/sad_halfpel_inline.h
ibstagefright/codecs/m4v_h263/enc/src/sad_inline.h
ibstagefright/codecs/m4v_h263/enc/src/sad_mb_offset.h
ibstagefright/codecs/m4v_h263/enc/src/vlc_enc_tab.h
ibstagefright/codecs/m4v_h263/enc/src/vlc_encode.cpp
ibstagefright/codecs/m4v_h263/enc/src/vlc_encode.h
ibstagefright/codecs/m4v_h263/enc/src/vlc_encode_inline.h
ibstagefright/codecs/m4v_h263/enc/src/vop.cpp
ibstagefright/include/M4vH263Encoder.h
aaa7a0ce4792b6726dc67976da738b2085772e31 15-Jul-2010 Dave Sparks <davidsparks@android.com> Merge "Add some javadoc to AudioRecord, plus updates based on code review comments."
3864d243a91474c6c410969944d99e379a1da121 15-Jul-2010 Mike Lockwood <lockwood@android.com> Merge changes I93364c74,I5ca831b8

* changes:
Exclude MTP implementation from simulator build
Fixes for simulator build on lucid
ff164a7d6f839c194a52572136cfa320609598e0 15-Jul-2010 Mike Lockwood <lockwood@android.com> Exclude MTP implementation from simulator build

Change-Id: I93364c74c26ba6e2bf6b08f1bd82802b966c8dfb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/Android.mk
ni/android_media_MtpClient.cpp
ni/android_media_MtpCursor.cpp
ni/android_media_MtpDatabase.cpp
ni/android_media_MtpServer.cpp
tp/Android.mk
5a23f8c41ee83a0316ae8265841beaf6d97a66d9 15-Jul-2010 Mike Lockwood <lockwood@android.com> Fixes for simulator build on lucid

strchr and strrchr now return const char* instead of char*

Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibmedia/MediaScanner.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/MyHandler.h
892681e56ee6da6e8d4fb9ec41e75e814ae9e099 15-Jul-2010 James Dong <jdong@google.com> am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread

Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'

* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
Support user-supplied timescales for authoring
b068b47c6d0214256116a0c661740bddf7acc18c 15-Jul-2010 James Dong <jdong@google.com> am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread

Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp

* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
Support user-supplied timescales for authoring
d6a85a21418338a7797bff731fa7a551f62a9e86 15-Jul-2010 James Dong <jdong@google.com> Merge "Support user-supplied timescales for authoring" into gingerbread
9c7fdf521b09860ef0e2f20cf0769cd15d8018e8 15-Jul-2010 Mike Lockwood <lockwood@android.com> Remove our copy of the f_mtp.h kernel header, now that it is in bionic.

Change-Id: I2b5e72bf25b3525ace4b919c6e8b6bd6750f6dfa
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpEventPacket.cpp
tp/MtpServer.cpp
tp/f_mtp.h
0779682a490f12f102cd0cf1e768e3c68cfdc512 15-Jul-2010 Mathias Agopian <mathias@google.com> am 78983a91: am 4055b780: Merge "move native services under services/" into gingerbread

Merge commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f'

* commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f':
move native services under services/
78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f 15-Jul-2010 Mathias Agopian <mathias@google.com> am 4055b780: Merge "move native services under services/" into gingerbread

Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp

* commit '4055b780bb7e85abcf4754b84e50bf407c45bec8':
move native services under services/
08e83bb3b7cc41f603867acbeb1168019cf535fe 15-Jul-2010 Mathias Agopian <mathias@google.com> move native services under services/

moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8
ediaserver/Android.mk
52d13f01a60f04d5a8a181ceb5400e32aee5637d 02-Jul-2010 James Dong <jdong@google.com> Support user-supplied timescales for authoring

- also, change all the real time unit to microseconds in MPEG4Writer

Change-Id: I260f512f2eb670ade7b8858a56335a5d639de756
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
635fefec06458224750170e7ce127bc2c8e4215b 14-Jul-2010 Dan Tasse <dantasse@google.com> Add some javadoc to AudioRecord, plus updates based on code review comments.

Change-Id: I0087e7df7541b336f87c7af512c3e8f3897be72c
ava/android/media/AudioFormat.java
ava/android/media/AudioRecord.java
e31135a05eba2f881fbd7988a1febad45c563656 14-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MtpDatabase: Implement getObjectProperty"
b2cada9034436b4ea4bac218da7a1e29460d15b2 14-Jul-2010 Mike Lockwood <lockwood@android.com> MtpDatabase: Implement getObjectProperty

Change-Id: Iab5f2c0e0b2b3effa3eaa3cb18415d28db5c790a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
0224a004210d8096faa0964a1311c490398338d0 14-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> am 5473434f: am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.

Merge commit '5473434f060d8c036a30a1992b036a2f70da265d'

* commit '5473434f060d8c036a30a1992b036a2f70da265d':
Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
5473434f060d8c036a30a1992b036a2f70da265d 14-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.

Merge commit '97eb728aef51646b86925557a36732598e3fbaa1' into gingerbread-plus-aosp

* commit '97eb728aef51646b86925557a36732598e3fbaa1':
Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
97eb728aef51646b86925557a36732598e3fbaa1 09-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
effect UUID instead of defining it locally.

Change-Id: Id6018fef20d286899cf7503fec3521dcd56db7e0
ibeffects/Android.mk
e2ce2616743e83a765893eaf93952e5bc1cc23e0 14-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Add support for sending events to the host when objects are added and removed"
be125a50b41f15810145671e0fcbdaf13b363e03 13-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Add support for sending events to the host when objects are added and removed

Change-Id: Ia1d5232b919c644c670ff9ca651eca92b3f9ad42
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpServer.java
ni/android_media_MtpServer.cpp
tp/Android.mk
tp/MtpEventPacket.cpp
tp/MtpEventPacket.h
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpTypes.h
tp/f_mtp.h
c9cf223dd004cf411235508e4fb0b7199910c1c7 13-Jul-2010 James Dong <jdong@google.com> am 7a72f848: am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__

Merge commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911'

* commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911':
Fix simulator build
7a72f84801c3ad74f00f5d3d0da7e2212d07a911 13-Jul-2010 James Dong <jdong@google.com> am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__

Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp

* commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4':
Fix simulator build
70c6c9a1e2240e82d8eb442b34efa9629ef2bba4 13-Jul-2010 James Dong <jdong@google.com> Fix simulator build
- missing header file <string.h>
- need to define -D__arm__

Change-Id: I18d2f1908684150784cf728234b5aedbc02447d1
ibstagefright/codecs/avc/enc/Android.mk
ibstagefright/codecs/avc/enc/src/avcenc_api.h
405278954f3a328026e3037c6d9b4ba8d200da45 13-Jul-2010 Eric Laurent <elaurent@google.com> am 66fa2b44: am 8e886be4: Merge "Modifications in audio effect engine state management." into gingerbread

Merge commit '66fa2b44cadf8694cc1b7e2aae1f8abaff4fc547'

* commit '66fa2b44cadf8694cc1b7e2aae1f8abaff4fc547':
Modifications in audio effect engine state management.
66fa2b44cadf8694cc1b7e2aae1f8abaff4fc547 13-Jul-2010 Eric Laurent <elaurent@google.com> am 8e886be4: Merge "Modifications in audio effect engine state management." into gingerbread

Merge commit '8e886be413570fab6c623930a5775dd36a6d11e1' into gingerbread-plus-aosp

* commit '8e886be413570fab6c623930a5775dd36a6d11e1':
Modifications in audio effect engine state management.
8e886be413570fab6c623930a5775dd36a6d11e1 13-Jul-2010 Eric Laurent <elaurent@google.com> Merge "Modifications in audio effect engine state management." into gingerbread
7d850f23c857fe0c0deec9b9ea593d3029665a16 09-Jul-2010 Eric Laurent <elaurent@google.com> Modifications in audio effect engine state management.

- Separate the updating of effect engine state from the process call in EffectModule so that the state
of all effects in the same effect chain is updated simultaneusly before all process functions are called.
- Added a mechanism for the effect engine to continue being called for processing after receiving the disable
commands untils it considers that the framework can stop calling the process function without causing
a glitch or loosing some effect tail.
- Updated test reverb and equalizer to support this new feature

Change-Id: Icb56ae2c84c076d4dbad6cf733b1a62f823febe7
ibeffects/EffectEqualizer.cpp
ibeffects/EffectReverb.c
ibeffects/EffectReverb.h
ibeffects/EffectVisualizer.cpp
fc0d81c64221a1a332f31d106df95e492416fe27 13-Jul-2010 James Dong <jdong@google.com> am f6bdc764: am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread

Merge commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea'

* commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea':
Initial checkin for software AVC encoder
f6bdc764b7a21f8037504e1dc4f81227ea2bedea 13-Jul-2010 James Dong <jdong@google.com> am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread

Merge commit '9d8bea11892a43eeab2a1119d68740845a8894e5' into gingerbread-plus-aosp

* commit '9d8bea11892a43eeab2a1119d68740845a8894e5':
Initial checkin for software AVC encoder
1cc31e629e8132df390ae692873c847d1c2f62c0 03-Jul-2010 James Dong <jdong@google.com> Initial checkin for software AVC encoder

- Since the software encoder assumes the input is YUV420 planar,
color conversion needs to be added when the input color format
does not meet the requirement. With this patch, I only added
a single color conversion from YUV420 semi planar to YUV420
planar. We can add more as we go.

Change-Id: If8640c9e5a4f73d385ae9bb2022e57f7f62b91b9
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/avc/enc/AVCEncoder.cpp
ibstagefright/codecs/avc/enc/Android.mk
ibstagefright/codecs/avc/enc/src/avcenc_api.cpp
ibstagefright/codecs/avc/enc/src/avcenc_api.h
ibstagefright/codecs/avc/enc/src/avcenc_int.h
ibstagefright/codecs/avc/enc/src/avcenc_lib.h
ibstagefright/codecs/avc/enc/src/bitstream_io.cpp
ibstagefright/codecs/avc/enc/src/block.cpp
ibstagefright/codecs/avc/enc/src/findhalfpel.cpp
ibstagefright/codecs/avc/enc/src/header.cpp
ibstagefright/codecs/avc/enc/src/init.cpp
ibstagefright/codecs/avc/enc/src/intra_est.cpp
ibstagefright/codecs/avc/enc/src/motion_comp.cpp
ibstagefright/codecs/avc/enc/src/motion_est.cpp
ibstagefright/codecs/avc/enc/src/rate_control.cpp
ibstagefright/codecs/avc/enc/src/residual.cpp
ibstagefright/codecs/avc/enc/src/sad.cpp
ibstagefright/codecs/avc/enc/src/sad_halfpel.cpp
ibstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
ibstagefright/codecs/avc/enc/src/sad_inline.h
ibstagefright/codecs/avc/enc/src/sad_mb_offset.h
ibstagefright/codecs/avc/enc/src/slice.cpp
ibstagefright/codecs/avc/enc/src/vlc_encode.cpp
ibstagefright/include/AVCEncoder.h
d815f79766984fce499e147ecbacc01914683f74 12-Jul-2010 Mike Lockwood <lockwood@android.com> Integrate host to device file transfer with the media provider.

MTP file transfers happen in two stages. The SendObjectInfo command sends
some information about the file and reserves an ObjectHandle for the new file.
The file transfer is then performed using the SendObject command.

To support this in the media provider, MtpDatabase.beginSendObject receives
the information from SendObjectInfo and creates an row for it in the MTP objects
table for the new file. After the file transfer has completed, then
MtpDatabase.endSendObject is called. In endSendObject, we run the media scanner
on the new file, which will add a row to the images, audio, video
or audio playlist table.

To avoid the media scanner creating a second row for the file in the MTP objects
table, we pass the ObjectHandle created in beginSendObject to the media scanner,
which then passes it to the media provider via the content values when it
performs its insert.

Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
ava/android/media/MediaScanner.java
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpServer.h
90787e053aa71694dbe61f4c64b2632446fd4c5d 09-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread

Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f'

* commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f':
Fix swap of sessionId and output in audio effect API.
bd3f8b711643a172703537e34a0fa7c21c5b953f 09-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread

Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp

* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
Fix swap of sessionId and output in audio effect API.
e7b790f1f77a0950c163fc82d8833072ccf6f3c5 09-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
4cb15cf15dfc9d9c6c8dc34911a4ed6bf53e8e4c 09-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix swap of sessionId and output in audio effect API.

Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7
ni/audioeffect/android_media_AudioEffect.cpp
ibmedia/AudioEffect.cpp
020057bd534a41080af8edbe6c6565d478ef256c 09-Jul-2010 James Dong <jdong@google.com> am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread

Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'

* commit 'a60337ce578f91926a5e8ea30cb47740b994fc96':
Enable the support for decoding audio with AAC+ and eAAC+ features
a60337ce578f91926a5e8ea30cb47740b994fc96 09-Jul-2010 James Dong <jdong@google.com> am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread

Merge commit '6bb14e08da82e72197f35548ff77a2f817c52a58' into gingerbread-plus-aosp

* commit '6bb14e08da82e72197f35548ff77a2f817c52a58':
Enable the support for decoding audio with AAC+ and eAAC+ features
5fe0ae8c2033a8ce6dc2add1394ef77dafe7b1ad 09-Jul-2010 James Dong <jdong@google.com> am 4f440632: am 929642ee: Add runtime dumpsys support for media recorder client

Merge commit '4f4406322dafd6e128b437edbc541327f0b38d04'

* commit '4f4406322dafd6e128b437edbc541327f0b38d04':
Add runtime dumpsys support for media recorder client
c5c7853b633144ae6344f989ea14eee8b2d0938b 09-Jul-2010 Mike Lockwood <lockwood@android.com> Remove some scafolding and test code that is no longer worth maintaining.

Change-Id: I9ee62d2463d8df1246a84774e8ac7e674778279a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpDatabase.java
ni/android_media_MtpDatabase.cpp
ni/android_media_MtpServer.cpp
tp/Android.mk
tp/MtpDatabase.h
tp/MtpMediaScanner.cpp
tp/MtpMediaScanner.h
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpSqliteDatabase.cpp
tp/MtpSqliteDatabase.h
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/MtpTypes.h
tp/SqliteDatabase.cpp
tp/SqliteDatabase.h
tp/SqliteStatement.cpp
tp/SqliteStatement.h
tp/mtptest.cpp
tp/scantest.cpp
a7c14078afb156cc61779de8084c7fdb35aa8f44 09-Jul-2010 James Dong <jdong@google.com> Enable the support for decoding audio with AAC+ and eAAC+ features

bug - 282684

Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/include/AACDecoder.h
4f4406322dafd6e128b437edbc541327f0b38d04 09-Jul-2010 James Dong <jdong@google.com> am 929642ee: Add runtime dumpsys support for media recorder client

Merge commit '929642ee003895b6e4e85ad7e43c7c6f01b29020' into gingerbread-plus-aosp

* commit '929642ee003895b6e4e85ad7e43c7c6f01b29020':
Add runtime dumpsys support for media recorder client
929642ee003895b6e4e85ad7e43c7c6f01b29020 08-Jul-2010 James Dong <jdong@google.com> Add runtime dumpsys support for media recorder client

Change-Id: I4c8a81720f3be2db54678a7e84fe12849255046b
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/OMXCodec.cpp
0f399ec640f223dd372741832b1b98f2ee449379 09-Jul-2010 Eric Laurent <elaurent@google.com> am b4b0f67a: am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.

Merge commit 'b4b0f67a4743503a024b1dce758acf53d9fb86f7'

* commit 'b4b0f67a4743503a024b1dce758acf53d9fb86f7':
Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
b4b0f67a4743503a024b1dce758acf53d9fb86f7 09-Jul-2010 Eric Laurent <elaurent@google.com> am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.

Merge commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2' into gingerbread-plus-aosp

* commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2':
Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
fd84f97af4b44d54bba53bb85b31a6dbce07f6e2 09-Jul-2010 Eric Laurent <elaurent@google.com> Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.

Defined the following JAVA classes on top of AudioEffect class to facilitate control
off built-in audio effects with APIs aligned with interfaces defined in OpenSL ES
specification:
- BastBoot.java
- Equalizer.java
- PresetReverb.java
- EnvironmentalReverb.java
- Virtualizer.java

Split reverb API header file in two, one for preset reverb and one for environmental reverb.
Some changes in test reverb to support preset reverb.

Change-Id: Ie0a5ba06002e63dfd6da22cace5568c1e0b76ea1
ava/android/media/BassBoost.java
ava/android/media/EnvironmentalReverb.java
ava/android/media/Equalizer.java
ava/android/media/PresetReverb.java
ava/android/media/Virtualizer.java
ibeffects/EffectReverb.c
ibeffects/EffectReverb.h
d21eac9c70940f2c73da5faaf401dbbc44b70a15 03-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Use media provider database to implement MTP device support.

Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaFile.java
ava/android/media/MtpDatabase.java
ava/android/media/MtpServer.java
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_media_MtpDatabase.cpp
ni/android_media_MtpServer.cpp
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpSqliteDatabase.cpp
tp/mtptest.cpp
2d6c9e9c4e5f261b252962bf8ce04c50000a8e2c 03-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: remove separate audio table from prototype MTP database

Change-Id: I5e4b49b741a0a3c6ddf5afcbb20a0d7c9515c8ce
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
tp/MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpMediaScanner.cpp
tp/MtpMediaScanner.h
tp/MtpServer.cpp
tp/MtpSqliteDatabase.cpp
tp/MtpSqliteDatabase.h
tp/MtpTypes.h
98449546fa33f420e2aef7d0d1c1afb538af4069 08-Jul-2010 Eric Laurent <elaurent@google.com> am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbread

Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9'

* commit 'b91881fdd1608cc922f105ec552b5505da1fecb9':
Added Visualizer effect.
b91881fdd1608cc922f105ec552b5505da1fecb9 08-Jul-2010 Eric Laurent <elaurent@google.com> am dacabf97: Merge "Added Visualizer effect." into gingerbread

Merge commit 'dacabf97c609a040ada857a7da6c560097448ae3' into gingerbread-plus-aosp

* commit 'dacabf97c609a040ada857a7da6c560097448ae3':
Added Visualizer effect.
dacabf97c609a040ada857a7da6c560097448ae3 08-Jul-2010 Eric Laurent <elaurent@google.com> Merge "Added Visualizer effect." into gingerbread
0920b1cd7d75f4708f6224b0d956d5ec8897db7a 08-Jul-2010 James Dong <jdong@google.com> am b3598832: am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread

Merge commit 'b35988329ac1a574898db9226039e37e352c57a8'

* commit 'b35988329ac1a574898db9226039e37e352c57a8':
Allow application to set two more encoding paramters: video profile and level
1193ef6c325acde843b748df474794118ec67641 08-Jul-2010 James Dong <jdong@google.com> am 7b3f3048: am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread

Merge commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e'

* commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e':
Fix some bugs in the MediaProfileReader
b35988329ac1a574898db9226039e37e352c57a8 07-Jul-2010 James Dong <jdong@google.com> am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread

Merge commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8' into gingerbread-plus-aosp

* commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8':
Allow application to set two more encoding paramters: video profile and level
7b3f3048725dcb217599590fcb55a5b26b93dc4e 07-Jul-2010 James Dong <jdong@google.com> am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread

Merge commit '58c35573cc677b736efefa267eba8727d4411999' into gingerbread-plus-aosp

* commit '58c35573cc677b736efefa267eba8727d4411999':
Fix some bugs in the MediaProfileReader
c42433427a7ed51b5577b2587bf6cb0af903ebf8 07-Jul-2010 James Dong <jdong@google.com> Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread
58c35573cc677b736efefa267eba8727d4411999 07-Jul-2010 James Dong <jdong@google.com> Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread
620a4240366f13c3359c6825c92e831563cc11b6 07-Jul-2010 James Dong <jdong@google.com> Fix some bugs in the MediaProfileReader
Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name.

Change-Id: I3857422bfe9173baae53e4f3d258b055f51ad9f2
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
c9880beb2dbd0c7f425ca94a3bb4a248bc6753ea 07-Jul-2010 Andreas Huber <andih@google.com> am dcf872dc: am c34c8c3f: Merge "Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbrea

Merge commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85'

* commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85':
Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
dcf872dcfa6439514c886f8b9bf997beeeb3be85 07-Jul-2010 Andreas Huber <andih@google.com> am c34c8c3f: Merge "Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbread

Merge commit 'c34c8c3fe7fef15b410b0544d5436fcbefccd610' into gingerbread-plus-aosp

* commit 'c34c8c3fe7fef15b410b0544d5436fcbefccd610':
Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
971305d4af1c4058596c5a3feac301585682d15c 07-Jul-2010 Andreas Huber <andih@google.com> Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.

Change-Id: Icac8104d14f18b719aa0b8f1ab3215f24003b152
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
81c929a684aefd7e18e04bcfd54407235b89a37d 02-Jul-2010 James Dong <jdong@google.com> Allow application to set two more encoding paramters: video profile and level

Change-Id: I673e681cefe184d5c556c612c54600a24a2143e5
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/OMXCodec.cpp
df9b81ced437b11f8a3fcf4ba3ea6af703d121e2 02-Jul-2010 Eric Laurent <elaurent@google.com> Added Visualizer effect.

The visualizer enables application to retrieve part of the currently playing audio for visualization purpose.
It is not an audio recording interface and only returns partial and low quality audio content as a waveform or
a frequency representation (FFT).

Removed temporary hack made in MediaPlayer for animated wall papers based on audio visualization (snoop() method.

This commit also includes a change in AudioEffect class:
- the enable()/disable() methods have been replaced bya more standard setEnabled() method.
- some fixes in javadoc

Change-Id: Id092a1340e9e38dae68646ade7be054e3a36980e
ava/android/media/AudioEffect.java
ava/android/media/Visualizer.java
ni/android_media_MediaPlayer.cpp
ni/audioeffect/Android.mk
ni/audioeffect/android_media_AudioEffect.cpp
ni/audioeffect/android_media_Visualizer.cpp
ibeffects/Android.mk
ibeffects/EffectVisualizer.cpp
ibmedia/Android.mk
ibmedia/AudioEffect.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/Visualizer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
c832baa107f36740e462c83e7525ba2e9f01f086 07-Jul-2010 Andreas Huber <andih@google.com> am f5b4e342: am 2e6aff8e: Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread

Merge commit 'f5b4e342b581a6e219b49141861b353fb139d00b'

* commit 'f5b4e342b581a6e219b49141861b353fb139d00b':
ALooperRoster no longer holds strong references to handlers and loopers.
a87843704107d6da82fa64bcab2635a2cacad8b4 07-Jul-2010 Andreas Huber <andih@google.com> am ff119e74: am 6615defd: Make sure the OMX callback thread is properly shutdown after the node goes away.

Merge commit 'ff119e746afe834040afb1631caee355d94237e8'

* commit 'ff119e746afe834040afb1631caee355d94237e8':
Make sure the OMX callback thread is properly shutdown after the node goes away.
f5b4e342b581a6e219b49141861b353fb139d00b 07-Jul-2010 Andreas Huber <andih@google.com> am 2e6aff8e: Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread

Merge commit '2e6aff8e19ce8292a36fe211f8051dccf1fb9670' into gingerbread-plus-aosp

* commit '2e6aff8e19ce8292a36fe211f8051dccf1fb9670':
ALooperRoster no longer holds strong references to handlers and loopers.
2e6aff8e19ce8292a36fe211f8051dccf1fb9670 07-Jul-2010 Andreas Huber <andih@google.com> Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread
ff119e746afe834040afb1631caee355d94237e8 07-Jul-2010 Andreas Huber <andih@google.com> am 6615defd: Make sure the OMX callback thread is properly shutdown after the node goes away.

Merge commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd' into gingerbread-plus-aosp

* commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd':
Make sure the OMX callback thread is properly shutdown after the node goes away.
57576c1cae63bebfa7ed880ab510e06f312586ee 07-Jul-2010 Andreas Huber <andih@google.com> ALooperRoster no longer holds strong references to handlers and loopers.

Change-Id: I038d69b0a34eda1bfc5216d92c837a5ddf4fb802
ibstagefright/foundation/ALooperRoster.cpp
bce1f2ae9f558f907a2bf15cd31825a031882f86 07-Jul-2010 Andreas Huber <andih@google.com> am 877045aa: am 9406f626: Merge "An AHandler can now find its associated ALooper." into gingerbread

Merge commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae'

* commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae':
An AHandler can now find its associated ALooper.
877045aa853aaf6e58ca3ac7bfa2bde9165b55ae 07-Jul-2010 Andreas Huber <andih@google.com> am 9406f626: Merge "An AHandler can now find its associated ALooper." into gingerbread

Merge commit '9406f626b2d8f64a084d41f6ea379e539b162a55' into gingerbread-plus-aosp

* commit '9406f626b2d8f64a084d41f6ea379e539b162a55':
An AHandler can now find its associated ALooper.
6615defd4b8ae627e7f0bbb2382c4d86481f76bd 07-Jul-2010 Andreas Huber <andih@google.com> Make sure the OMX callback thread is properly shutdown after the node goes away.

Change-Id: Ib0b25855b0dfc191e5529193b4cb519f644a8412
ibstagefright/omx/OMX.cpp
9406f626b2d8f64a084d41f6ea379e539b162a55 07-Jul-2010 Andreas Huber <andih@google.com> Merge "An AHandler can now find its associated ALooper." into gingerbread
058319eb73aa1d5c3b3b4b79316198e7a49484f1 03-Jul-2010 Andreas Huber <andih@google.com> An AHandler can now find its associated ALooper.

Change-Id: Ic7087b8dcbc0d9abda272df0cb01b04b006f82ad
ibstagefright/foundation/AHandler.cpp
ibstagefright/foundation/ALooperRoster.cpp
ibstagefright/foundation/Android.mk
44f687063111e22ce9b79d9a54c2bdb99f2e3178 02-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Fix ownership and file permissions for transferred files and folders"
dad69277b7fdcc2759bec5a35ac45dae8f61ec9b 02-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Fix ownership and file permissions for transferred files and folders

All new files and folders are created with group sdcard_rw
Permissions for new files are 0664 and directories 0775

Change-Id: I6d508231150f687e2e529112fd47f10e30fa594f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ni/android_media_MtpServer.cpp
tp/MtpServer.cpp
tp/MtpServer.h
tp/mtptest.cpp
45d7927dbcab48c7e76b6dd33a4ce67ba1be7da0 02-Jul-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Make MtpDatabase class abstract so we can have multiple implementations"
8dd2a39bae441143ebbb65237db63f65fdc1c645 02-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Make MtpDatabase class abstract so we can have multiple implementations

Rename existing test database to MtpSqliteDatabase
This is the first step in transitioning to using the media provider database

Change-Id: I5f36c854c6e76a79137c267b000a52ced803776c
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
tp/MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpSqliteDatabase.cpp
tp/MtpSqliteDatabase.h
tp/SqliteDatabase.h
tp/scantest.cpp
5d1724767354c5f203aa815d85c64898d92e03a3 02-Jul-2010 Andreas Huber <andih@google.com> am c4be155a: am 2cfd8198: Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread

Merge commit 'c4be155a540695c42bcd6589604f86d300f4548f'

* commit 'c4be155a540695c42bcd6589604f86d300f4548f':
Add an option to ALooper::start that allows it to call back into java or not.
c4be155a540695c42bcd6589604f86d300f4548f 02-Jul-2010 Andreas Huber <andih@google.com> am 2cfd8198: Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread

Merge commit '2cfd8198cc4e1dcdcae52ae8a0c86b871c87a27e' into gingerbread-plus-aosp

* commit '2cfd8198cc4e1dcdcae52ae8a0c86b871c87a27e':
Add an option to ALooper::start that allows it to call back into java or not.
2cfd8198cc4e1dcdcae52ae8a0c86b871c87a27e 02-Jul-2010 Andreas Huber <andih@google.com> Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread
763c962278fb2fb6c1f4218af221b31180fa053c 02-Jul-2010 Andreas Huber <andih@google.com> am 9f8c490e: am 5460d126: Merge "Added AMessage::debugString() for debugging purposes." into gingerbread

Merge commit '9f8c490e05f86cca1d60d6b6f383a1a98d7985fb'

* commit '9f8c490e05f86cca1d60d6b6f383a1a98d7985fb':
Added AMessage::debugString() for debugging purposes.
9f8c490e05f86cca1d60d6b6f383a1a98d7985fb 02-Jul-2010 Andreas Huber <andih@google.com> am 5460d126: Merge "Added AMessage::debugString() for debugging purposes." into gingerbread

Merge commit '5460d126f024a8d6597ce4eb127b51c101724960' into gingerbread-plus-aosp

* commit '5460d126f024a8d6597ce4eb127b51c101724960':
Added AMessage::debugString() for debugging purposes.
4f104d99d8657fd3fef675eb2a3e84ba9f5870e4 02-Jul-2010 Andreas Huber <andih@google.com> Add an option to ALooper::start that allows it to call back into java or not.

Change-Id: Iec172901a04a575d8d350bd162565f04677c3f26
ibstagefright/foundation/ALooper.cpp
5460d126f024a8d6597ce4eb127b51c101724960 02-Jul-2010 Andreas Huber <andih@google.com> Merge "Added AMessage::debugString() for debugging purposes." into gingerbread
03431d2fa6ee51c122a987322cf1dbd4f89a077b 01-Jul-2010 Andreas Huber <andih@google.com> Added AMessage::debugString() for debugging purposes.

Change-Id: Id43ffd2c56d659dc29f37e277f8c7b38f11c1591
ibstagefright/foundation/AMessage.cpp
c03befe3d62eb2a3e1d56fec0ca188a6094d53dd 01-Jul-2010 Eric Laurent <elaurent@google.com> Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.

Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.

The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()

Change-Id: I7086424301fc63a5666da61c38169349d3e078f4
ava/android/media/AudioService.java
d26920ada05843e736d78709812e03797eedee55 01-Jul-2010 Nipun Kwatra <nkwatra@google.com> Adding timelapse capture from videocamera.

Current implementation looks at the timestamps of all incoming frames in
CameraSource::dataCallbackTimestamp().
It drops all frames until enough time has elapsed to get the next time lapse frame.
When enough time has passed to capture the next time lapse frame, the frame is no longer dropped
and the timestamp of this frame is modified to be one frame time (1/framerate) ahead of the
last encoded frame's time stamp.

Change-Id: I82b9d5e96113dffa6901aac3b8a8ef999ffc1d0b
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSource.cpp
3bf8430e05de4d80eec39019f67614dfe3a449ef 01-Jul-2010 James Dong <jdong@google.com> am d6ec2175: am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread

Merge commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083'

* commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083':
Refactor Stagefright::StartMPEG4Recording()
d6ec21751b26a35fc8c912940a2c4720bdbf1083 01-Jul-2010 James Dong <jdong@google.com> am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread

Merge commit '65c83b906d01c3c1493d0547757dbb16d4c3722a' into gingerbread-plus-aosp

* commit '65c83b906d01c3c1493d0547757dbb16d4c3722a':
Refactor Stagefright::StartMPEG4Recording()
65c83b906d01c3c1493d0547757dbb16d4c3722a 01-Jul-2010 James Dong <jdong@google.com> Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
e822c99511128db118d4192733e9cc0415fa155d 01-Jul-2010 Eric Laurent <elaurent@google.com> am eba857d1: am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread

Merge commit 'eba857d126e2b76a368f41d3169a56fe28029674'

* commit 'eba857d126e2b76a368f41d3169a56fe28029674':
Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2d3dcac183da7601664a8f7245b1348de9658b00 01-Jul-2010 Andreas Huber <andih@google.com> am d51c2cac: am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.

Merge commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2'

* commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2':
Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
eba857d126e2b76a368f41d3169a56fe28029674 01-Jul-2010 Eric Laurent <elaurent@google.com> am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread

Merge commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2' into gingerbread-plus-aosp

* commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2':
Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
4024ddcf66912128e1f2b6b17e63f6f9f1e3a00a 01-Jul-2010 Chih-Chung Chang <chihchung@google.com> am bda93c4c: am 09b90057: Add multiple camera support for in MediaProfiles.

Merge commit 'bda93c4cb94b47c86251d22df16e46a514c191ef'

* commit 'bda93c4cb94b47c86251d22df16e46a514c191ef':
Add multiple camera support for in MediaProfiles.
a0c2b53966238125143dec01d3f2598a8b9e33a2 01-Jul-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread
7b06de6d5a3128cc58e85b705e877d236cd32450 30-Jun-2010 James Dong <jdong@google.com> Refactor Stagefright::StartMPEG4Recording()

- Also, better error handling

Change-Id: Ic18d08dc6489adf92c6a588efa4baca66429b175
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
d51c2cacce4ad945bea4c00cea4326cf76b49cd2 01-Jul-2010 Andreas Huber <andih@google.com> am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.

Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp

* commit '45bac57aa00281e6b45756c691c588bdaf762521':
Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
45bac57aa00281e6b45756c691c588bdaf762521 01-Jul-2010 Andreas Huber <andih@google.com> Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.

Change-Id: I972324a8fc9757e6e8116b0270ec0882106f8733
ibstagefright/MPEG4Writer.cpp
d0e1a9f40e4d9b41d83be3b3c62d6849cb37d6a6 01-Jul-2010 Mike Lockwood <lockwood@android.com> MTP: Remove an unnecessary thread from the MtpClient class.

Now a single thread is used for passing USB host events up to MtpClient.

Change-Id: I0e3a277956cb3d1036da122ea10acb03a27844d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ni/android_media_MtpClient.cpp
tp/MtpClient.cpp
tp/MtpClient.h
bda93c4cb94b47c86251d22df16e46a514c191ef 01-Jul-2010 Chih-Chung Chang <chihchung@google.com> am 09b90057: Add multiple camera support for in MediaProfiles.

Merge commit '09b9005769f2b717f637131578ce6cfa6bd62bd9' into gingerbread-plus-aosp

* commit '09b9005769f2b717f637131578ce6cfa6bd62bd9':
Add multiple camera support for in MediaProfiles.
09b9005769f2b717f637131578ce6cfa6bd62bd9 22-Jun-2010 Chih-Chung Chang <chihchung@google.com> Add multiple camera support for in MediaProfiles.

Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
ava/android/media/CamcorderProfile.java
ava/android/media/CameraProfile.java
ni/android_media_MediaProfiles.cpp
ibmedia/MediaProfiles.cpp
e2dd8c4592762414c2c27e4589be7edc91a5ecae 01-Jul-2010 Eric Laurent <elaurent@google.com> Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.

Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.

The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()

Change-Id: I29a28fcce1a579217cea271956a55778e05d3e37
ava/android/media/AudioService.java
072339405191492e85e12e164a36c4cd15858790 01-Jul-2010 Mike Lockwood <lockwood@android.com> Try to fix the simulator build.

Change-Id: I3640e9eba433e711e23af1c6182e38c86c5b60bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
7f35403a7ac5cf637e10cceb5ca100fb532f2880 01-Jul-2010 Andreas Huber <andih@google.com> am 86405cbd: am caad0a5c: Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread

Merge commit '86405cbd53f43529898000112bc9346c21569d26'

* commit '86405cbd53f43529898000112bc9346c21569d26':
Support for vanilla YUV420sp => RGB565 color conversion.
86405cbd53f43529898000112bc9346c21569d26 01-Jul-2010 Andreas Huber <andih@google.com> am caad0a5c: Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread

Merge commit 'caad0a5c6318678902402362df1791d286636344' into gingerbread-plus-aosp

* commit 'caad0a5c6318678902402362df1791d286636344':
Support for vanilla YUV420sp => RGB565 color conversion.
81ea83d10883886013bc95eac2fe032acf1e7aa9 30-Jun-2010 Mike Lockwood <lockwood@android.com> Move MTP JNI code from libandroid_runtime to libmedia_jni

Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_media_MtpClient.cpp
ni/android_media_MtpCursor.cpp
ni/android_media_MtpServer.cpp
767c5e4be0a4bddc815efe5a4cb2cd0fdd584429 30-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Implement GetObjectPropDesc

Change-Id: I283651257254fc9cd9d93eab4605c5e33d3db93e
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDevice.cpp
tp/MtpProperty.cpp
tp/MtpProperty.h
tp/MtpServer.cpp
tp/MtpServer.h
98ef64e4a89ced79094d4ff3dc0123c1989f9e10 29-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Add MtpServer Java class to wrap MTP device support.

Change-Id: I818c2d3b3f52ad5bb515acc4d3288b2b43e11908
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ava/android/media/MtpServer.java
tp/Android.mk
tp/MtpTypes.h
3e6616dd3dc4d8b4a8a5c832d5a66965c19648d3 30-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: replace printfs with logcat

Change-Id: I2c30921098e2dc049dc5fc1e0a548ead33c363e0
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpClient.cpp
tp/MtpCursor.cpp
tp/MtpDataPacket.cpp
tp/MtpDatabase.cpp
tp/MtpDebug.h
tp/MtpDevice.cpp
tp/MtpDevice.h
tp/MtpDeviceInfo.cpp
tp/MtpMediaScanner.cpp
tp/MtpObjectInfo.cpp
tp/MtpPacket.cpp
tp/MtpProperty.cpp
tp/MtpRequestPacket.cpp
tp/MtpResponsePacket.cpp
tp/MtpServer.cpp
tp/MtpStorage.cpp
tp/MtpStorageInfo.cpp
tp/MtpStringBuffer.cpp
tp/MtpUtils.cpp
tp/SqliteDatabase.cpp
tp/SqliteStatement.cpp
tp/mtptest.cpp
c543a21a4021bf0e2f3817852d75184d01b76d62 30-Jun-2010 Andreas Huber <andih@google.com> Support for vanilla YUV420sp => RGB565 color conversion.

Change-Id: I22e5b554909e169eaf153d1f25b636f6f04a1871
ibstagefright/colorconversion/ColorConverter.cpp
bd800f40ace12e2a218e93255411dc1d4c3f5266 30-Jun-2010 James Dong <jdong@google.com> am 42dd9908: am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread

Merge commit '42dd99084d0069ccd90f0305ce374fd943a09de7'

* commit '42dd99084d0069ccd90f0305ce374fd943a09de7':
Added encoding parameters set up for H263 video encoder
42dd99084d0069ccd90f0305ce374fd943a09de7 30-Jun-2010 James Dong <jdong@google.com> am f7679a04: Merge "Added encoding parameters set up for H263 video encoder" into gingerbread

Merge commit 'f7679a0493d59da8c759a6be639be5110c50fb98' into gingerbread-plus-aosp

* commit 'f7679a0493d59da8c759a6be639be5110c50fb98':
Added encoding parameters set up for H263 video encoder
c0ab2a64589b4cd49734a122b6ef976c7ef530e5 30-Jun-2010 James Dong <jdong@google.com> Added encoding parameters set up for H263 video encoder

Also:
- Allowed start() call when encoder already starts and stop() call when encoder has not started yet
- Handled default value for audio/video sources/encoders and file output format

Change-Id: I03b2f7d3cf570baa0fd011a8c0ad200f2f2a5da1
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
f42c181ecece995e23f91ac13d67f1a597340e98 29-Jun-2010 Andreas Huber <andih@google.com> am d6dcec4f: am fd751426: Merge "Add qcom\'s new OMX components to the list." into gingerbread

Merge commit 'd6dcec4f79737623051378cb99858a4032fa8005'

* commit 'd6dcec4f79737623051378cb99858a4032fa8005':
Add qcom's new OMX components to the list.
d6dcec4f79737623051378cb99858a4032fa8005 29-Jun-2010 Andreas Huber <andih@google.com> am fd751426: Merge "Add qcom\'s new OMX components to the list." into gingerbread

Merge commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5' into gingerbread-plus-aosp

* commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5':
Add qcom's new OMX components to the list.
8ef64c9606a6160db9fe2832e8063a5bc3dcf3e1 29-Jun-2010 Andreas Huber <andih@google.com> Add qcom's new OMX components to the list.

Change-Id: Ic8d261aaa5b15c1be7e6d57aee6be51cecb10bb1
ibstagefright/OMXCodec.cpp
8f704d89dc38c6e25b23721f6a784956521f283a 29-Jun-2010 James Dong <jdong@google.com> am b1e165eb: am d4760c24: Collect statistical data from authoring engine (second part)

Merge commit 'b1e165ebae798431e3569c28dc5d7c2e584834a6'

* commit 'b1e165ebae798431e3569c28dc5d7c2e584834a6':
Collect statistical data from authoring engine (second part)
b1e165ebae798431e3569c28dc5d7c2e584834a6 29-Jun-2010 James Dong <jdong@google.com> am d4760c24: Collect statistical data from authoring engine (second part)

Merge commit 'd4760c243fb129ebda43972c0fadf43a02c9849f' into gingerbread-plus-aosp

* commit 'd4760c243fb129ebda43972c0fadf43a02c9849f':
Collect statistical data from authoring engine (second part)
d4760c243fb129ebda43972c0fadf43a02c9849f 26-Jun-2010 James Dong <jdong@google.com> Collect statistical data from authoring engine (second part)

- added sample duration to the statistcal log messages.
- fixed the bug on miscalcuting the average frame rate.

- also fixed an issue where both frame and time progress status notifications
are sent out even though only one of them is explicitly requsted.

Change-Id: Ib86f15a85fad3dbeabde120c3c782b79c16da46c
ibstagefright/MPEG4Writer.cpp
68d42e3887fc0ccd02c74a7abe9697f1dc94fad6 29-Jun-2010 James Dong <jdong@google.com> am c2c59f69: am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread

Merge commit 'c2c59f690deafe34c7701b01b612fd777cee8d4b'

* commit 'c2c59f690deafe34c7701b01b612fd777cee8d4b':
Separate MediaRecorderClient with MediaPlayerClient
c2c59f690deafe34c7701b01b612fd777cee8d4b 29-Jun-2010 James Dong <jdong@google.com> am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread

Merge commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587' into gingerbread-plus-aosp

* commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587':
Separate MediaRecorderClient with MediaPlayerClient
fe1bafecdecd49533c46521057c7c9eeb788d0fa 26-Jun-2010 James Dong <jdong@google.com> Separate MediaRecorderClient with MediaPlayerClient

- An alternative would be to define a common base class that
both MediaRecorderClient and MediaPlayerClient can derive.
But since the common code, onTransact() and notify() uses
some Binder code, having a common base class may not gain
us too much in terms of code reuse.

Change-Id: Ibc06720278ad173fceacff3d267b7060856c6316
ibmedia/Android.mk
ibmedia/IMediaRecorder.cpp
ibmedia/IMediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
a2312efff1446150518b85b53feaa6850b349769 26-Jun-2010 James Dong <jdong@google.com> am fd45c1e6: am 41debbc6: Merge "Provide progress status report during authoring" into gingerbread

Merge commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798'

* commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798':
Provide progress status report during authoring
fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798 26-Jun-2010 James Dong <jdong@google.com> am 41debbc6: Merge "Provide progress status report during authoring" into gingerbread

Merge commit '41debbc613ec57aa892f604229df376402942687' into gingerbread-plus-aosp

* commit '41debbc613ec57aa892f604229df376402942687':
Provide progress status report during authoring
09936ed19263854e937198af03d9805a8b669ca1 25-Jun-2010 James Dong <jdong@google.com> Provide progress status report during authoring

- Track either the number of A/V frames authored, or the time elapsed
- Track the completion of the authoring
- Add multiple camera support for authoring by accepting a camera id parameter
- Set file type based on the OUTPUT_FORMAT requested

Change-Id: I0f9d31b3b7a8fa43eb53f572410fb0ebd4fa0bb7
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
cf3a2b79f3f1bbd249a147c1626a6da4a419c270 25-Jun-2010 Eric Laurent <elaurent@google.com> am cdf1357b: am 8e103da1: Merge "Various fixes and improvements in audio effects implementation" into gingerbread

Merge commit 'cdf1357b6e0152280dcd611b5f096db4887d8126'

* commit 'cdf1357b6e0152280dcd611b5f096db4887d8126':
Various fixes and improvements in audio effects implementation
be4f149ff1ad7a46041594785f024e75d5ae2c35 25-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am f29fbc58: merge from froyo-plus-aosp

Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c'

* commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c':
Change in media scanner to set correct date
216416489ae27a4c48f3b8839e44a7ca6bb656f7 25-Jun-2010 Andreas Huber <andih@google.com> am 75fb44b2: am 357f8209: Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread

Merge commit '75fb44b2344b900485aaf4506531010a8335b5a7'

* commit '75fb44b2344b900485aaf4506531010a8335b5a7':
Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
b472798045c7dc0cd0cb5c365612ff4ac68e5fdf 25-Jun-2010 James Dong <jdong@google.com> am bc704ddd: am 6feaa464: Enable passing parameters to the MediaWriter at runtime (at start() call).

Merge commit 'bc704dddb6d1239c55f6cd0f93d349f7cc3d1219'

* commit 'bc704dddb6d1239c55f6cd0f93d349f7cc3d1219':
Enable passing parameters to the MediaWriter at runtime (at start() call).
8f855611ccd0bda1441333ac1a8294760173044b 25-Jun-2010 James Dong <jdong@google.com> am d115304c: am 5a905ceb: Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread

Merge commit 'd115304c0900713d6f8d4033722d9c647f40ceae'

* commit 'd115304c0900713d6f8d4033722d9c647f40ceae':
Track maximum amplitude and fix getMaxAmplitude()
cdf1357b6e0152280dcd611b5f096db4887d8126 25-Jun-2010 Eric Laurent <elaurent@google.com> am 8e103da1: Merge "Various fixes and improvements in audio effects implementation" into gingerbread

Merge commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5' into gingerbread-plus-aosp

* commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5':
Various fixes and improvements in audio effects implementation
8e103da1f1b0656e3427b34b75f02d7ddf6073d5 25-Jun-2010 Eric Laurent <elaurent@google.com> Merge "Various fixes and improvements in audio effects implementation" into gingerbread
53334cdb81bab4a4dfd0a41d2ef50709015a36c8 24-Jun-2010 Eric Laurent <elaurent@google.com> Various fixes and improvements in audio effects implementation

Effect API:
- Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi:
Removed media/AudioCommon.h file created for initial version of EffectApi
- Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize
the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware.
- Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode:
now an index is passed for the queried effect instead of implicitly querying the next one.
- Added CPU load and memory usage indication in effects descriptor
- Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine
- Added flag to indicate hardware accelerated effect implementation.
- Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h

Effect libraries:
- Reflected changes in Effect API
- Several fixes in reverb implementation
- Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library.
- Replaced pointer by integer identifier for library handle returned by effects factory

Audio effect framework:
- Added support for audio session -1 in preparation of output stage effects configuration.
- Reflected changes in Effect API
- Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines.
- Added some overflow verification on indexes used for deferred parameter updates via shared memory
- Added hardcoded CPU and memory limit check when creating a new effect instance

Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
ni/audioeffect/android_media_AudioEffect.cpp
ibeffects/Android.mk
ibeffects/AudioCoefInterpolator.cpp
ibeffects/AudioCommon.h
ibeffects/AudioFormatAdapter.h
ibeffects/AudioShelvingFilter.cpp
ibeffects/EffectEqualizer.cpp
ibeffects/EffectReverb.c
ibeffects/EffectReverb.h
ibeffects/EffectsFactory.c
ibeffects/EffectsFactory.h
ibmedia/AudioEffect.cpp
ibmedia/IAudioFlinger.cpp
f29fbc58ec6a85115322100ed86c61679ac09c1c 25-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp

Change-Id: Ibaa84571e3b5a7ea29e55d41f773aa5f301086de
357f8209f3aec63fa2779da4eeab8825f80b0a41 25-Jun-2010 Andreas Huber <andih@google.com> Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread
909a8cf62cd3c7ddbb14740b733966f43dd3c361 25-Jun-2010 Andreas Huber <andih@google.com> Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers

Change-Id: Iaedfb5645e3052a63789244c90900573f8449bac
ibstagefright/include/NuCachedSource2.h
6feaa46496bae85adbe10e84611592612f898081 20-Jun-2010 James Dong <jdong@google.com> Enable passing parameters to the MediaWriter at runtime (at start() call).

- estimate the moov box size for mp4 file writer based on the file
size/duration limit and target bit rate.
- can switch to use 64 bit file offset at runtime

rebased

Change-Id: Ibbe1f57e91ab2605820d5d96e8048d11e5559c53
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
5a905ceb063bd31170d3d869efcd051cbd8e4e13 25-Jun-2010 James Dong <jdong@google.com> Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread
57e7f83c0336db3f03666f077bce4c2692a88cf6 25-Jun-2010 James Dong <jdong@google.com> Track maximum amplitude and fix getMaxAmplitude()

- only start to track the max amplitude after the first call to getMaxAmplitude()

Change-Id: I64d3d9ca0542202a8535a211425e8bccceca50fc
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/AudioSource.cpp
3fef4f5a0ae8c1b6863044e88af96930f8e09060 24-Jun-2010 Andreas Huber <andih@google.com> am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread

Merge commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493'

* commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493':
Properly identify malformed (too short) chunks in mpeg4 files.
7b5b27ada12d3680dec20274fa655fd7f73f839e 24-Jun-2010 Andreas Huber <andih@google.com> Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread
736c22d3e0b96a45e46ce43ac20a48ecbc373db7 24-Jun-2010 Andreas Huber <andih@google.com> Properly identify malformed (too short) chunks in mpeg4 files.

Change-Id: Id2efb1bba195c4ad6f132cd706cc813135ead8a4
ibstagefright/MPEG4Extractor.cpp
b6ecd6c9232fde0633babc01f5dc66aed12e08e4 24-Jun-2010 James Dong <jdong@google.com> am 40d9f010: am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerbread

Merge commit '40d9f0105f0a8f484724619154b18c5d85589eff'

* commit '40d9f0105f0a8f484724619154b18c5d85589eff':
Fixed the software AAC encoder
7fd22aab4506f65b7929ed1030bdd71c56f7db77 24-Jun-2010 James Dong <jdong@google.com> Merge "Fixed the software AAC encoder" into gingerbread
15149f2ef8609899f187b691054194ec50b9a0ee 24-Jun-2010 Andreas Huber <andih@google.com> am 0d964c94: am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread

Merge commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd'

* commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd':
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
a2549bb644d8ca4b0209d6d2f0c4160521789aa9 24-Jun-2010 Andreas Huber <andih@google.com> Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
438e4f62adf5094d7125f83dcc517d7502e85b9f 24-Jun-2010 James Dong <jdong@google.com> Fixed the software AAC encoder

Make sure that each input frame contains at least 1024 samples, as
required by the AAC encoder, and fix the incorrect timestamp.

Change-Id: I344cafe8c89be51d6e64552fab70539990ff6049
ibstagefright/MPEG4Writer.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/include/AACEncoder.h
8d65dd26530c7559082bd738cf930e2806158ab2 24-Jun-2010 Andreas Huber <andih@google.com> Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.

Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
ni/Android.mk
ni/android_media_MediaScanner.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/VorbisMetadataRetriever.cpp
ibmediaplayerservice/VorbisMetadataRetriever.h
ibmediaplayerservice/VorbisPlayer.cpp
ibmediaplayerservice/VorbisPlayer.h
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/id3/Android.mk
ibstagefright/omx/tests/Android.mk
ests/omxjpegdecoder/Android.mk
7d77a0ac899b16fa71af6acf612a664de8813235 24-Jun-2010 James Dong <jdong@google.com> am 90ade3f2: am 9afc1b3e: Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread

Merge commit '90ade3f25d16afe8fd64ec1fcc5fede466256719'

* commit '90ade3f25d16afe8fd64ec1fcc5fede466256719':
Fixed some meta data issues in the recorded mp4 file
9afc1b3ed3eb8dbfb440600495d92def88934f54 24-Jun-2010 James Dong <jdong@google.com> Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
39a0b21c65c3bbadc9a3c6b5346b45fac842d0f7 23-Jun-2010 James Dong <jdong@google.com> Fixed some meta data issues in the recorded mp4 file

- Mainly correcting the location of stbl box which should be a child of minf box.
This resolved the issue where the mis-muxed encoded file could not be played by QT/VLC.

- Enabled the the recorded tracks by setting the flags to 0x07 by default

- Allows for encoding either 32-bit or 64-bit offsets. By default encoding
32-bit offsets to reduce the metadata overhead

- Fixed a edts box issue where an empty elst box was used at the end

Change-Id: I570621a26714a81dc9400271aa5d3a07b483172f
ibstagefright/MPEG4Writer.cpp
230f5c1cfb898430c12eee40b8321385bc495e9c 23-Jun-2010 Andreas Huber <andih@google.com> am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread

Merge commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97'

* commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97':
Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
58e9402b12218ca498ea3b932e16819612b1ea87 23-Jun-2010 Andreas Huber <andih@google.com> Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
565879dc8655f37a0f55e59c98c5cad6314a9c4b 23-Jun-2010 Andreas Huber <andih@google.com> am 800af390: am b64af9a2: Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.

Merge commit '800af39038dcded12b66eccb8932a761e20b1976'

* commit '800af39038dcded12b66eccb8932a761e20b1976':
Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
c6a2cb0b5a4997a71ddc94969a799f2def184fbf 23-Jun-2010 Eric Laurent <elaurent@google.com> am 845f5414: am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread

Merge commit '845f541454d1fa9f328c0b0bf79acf2fba363177'

* commit '845f541454d1fa9f328c0b0bf79acf2fba363177':
Added support for audio sessions in MediaPlayer and AudioTrack.
c19d494d48dfa1e2b5a6af348f4adb741b8901c1 23-Jun-2010 Chia-chi Yeh <chiachi@android.com> am da9269af: am 3238302b: Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread

Merge commit 'da9269af5e94e25c142c519429aa77eb40f68e58'

* commit 'da9269af5e94e25c142c519429aa77eb40f68e58':
media: add AudioRecord::getMinFrameCount().
79ec54789dd31bf7ae06f3b199e7bdc7465f36d4 23-Jun-2010 Eric Laurent <elaurent@google.com> am 7d329785: am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread

Merge commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f'

* commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f':
Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call.
fb41d59595a09f60fd2fa3618e9d5a4937c4555b 23-Jun-2010 Andreas Huber <andih@google.com> Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp

Change-Id: I863651619f84b2b66e9a926ce1fef8ce6a53a42d
related-to-bug: 2639116
ibmedia/MediaScanner.cpp
ibstagefright/omx/OMXMaster.cpp
b64af9a221c1df4853ab7c7766d5f956c61b8765 23-Jun-2010 Andreas Huber <andih@google.com> Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.

Change-Id: I11abc05b62a958ffbc99ca997cd184a2f2199352
related-to-bug: 2667479
ibstagefright/MP3Extractor.cpp
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
ibstagefright/include/MP3Decoder.h
84d000e3c4d8883afec1e47662f719c6119cfefc 23-Jun-2010 James Dong <jdong@google.com> am 9666d3c0: am 750600a1: Merge "Single track optimization" into gingerbread

Merge commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698'

* commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698':
Single track optimization
9b1c2a50d221d7fb69842e6dd4c86c2c11e73f5e 23-Jun-2010 Andreas Huber <andih@google.com> am 6adf0c4d: am ef1c48d6: Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread

Merge commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296'

* commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296':
Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
fc667dabcfec3d1903b0058aff158bd7b687ab4d 23-Jun-2010 James Dong <jdong@google.com> am 06967683: am e5671bfe: Merge "Audio/video sync during recording (second part)" into gingerbread

Merge commit '0696768374567afa4fe58c2ef0af948b72e83e5d'

* commit '0696768374567afa4fe58c2ef0af948b72e83e5d':
Audio/video sync during recording (second part)
6bab6cebdcbac7bebc217b13e283ef5bd0c442df 23-Jun-2010 James Dong <jdong@google.com> am d076b590: am 875500b4: Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore\'s code" into gingerbread

Merge commit 'd076b59012f93fa3a3f1fa2d0893629126a4f13b'

* commit 'd076b59012f93fa3a3f1fa2d0893629126a4f13b':
AmrInputStream refresh: eliminate the dependency upon OpenCore's code
2c2ce8e53f5eb94916a5d0f40b2877cc7551870d 23-Jun-2010 Eric Laurent <elaurent@google.com> Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
3238302b1819bb384b79402c0106a2bdfc3f35d0 23-Jun-2010 Chia-chi Yeh <chiachi@android.com> Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread
619346f902241736d933657a4fe10f10c50a1ba8 21-Jun-2010 Eric Laurent <elaurent@google.com> Added support for audio sessions in MediaPlayer and AudioTrack.

Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks.

Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
ava/android/media/AudioTrack.java
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/AudioTrack.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
d1559d6b2db1d7e1718a15dc43a82450de2934db 23-Jun-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread
97d61f751899d3d68f53fb14d0025766bf1be3f7 22-Jun-2010 Chia-chi Yeh <chiachi@android.com> media: add AudioRecord::getMinFrameCount().

Change-Id: I952071ab10aa49aa96b727d157b68470d69fff3d
ibmedia/AudioRecord.cpp
3c652ca5a546e7227a5f4bdbf0f81552b2c91383 22-Jun-2010 Eric Laurent <elaurent@google.com> Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call.

Use setParameters() API to indicate to audio HAL that we are restarting the media server after a crash.
The use made by audio HAL implementation of this indication is platform specific.

Change-Id: I085b174fa1474575da0e4d295921079b6b68efb8
ava/android/media/AudioService.java
42dbfa51aefa2abe9e732b5161316deb28134759 22-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Use a fd instead of a file path in file transfer ioctls.

This restricts the driver to the client's permissions when copying files
to avoid potential security problems.

Change-Id: I9b3151168d334fe4374875804d4ba82bef44db3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
tp/f_mtp.h
dff6e6e3781de219472589e9629b75de42b624d8 15-Jun-2010 Mike Lockwood <lockwood@android.com> mtptest: Add option to specify storage path at the command line.

Change-Id: Iac8a34ffb8177018a9164b3f2f97b2e84c3d8f1c
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpStorage.cpp
tp/mtptest.cpp
b54a91784291bf14b1f486f7d4349774073593c5 22-Jun-2010 James Dong <jdong@google.com> Single track optimization

We don't need to do interleave when the total number of tracks to be recorded is one.
Metadata-wise, we only need to have one chunk in chunk offset table, and a
single entry in the stsc table.

Change-Id: I46f0e4b3860620311e7a91b68a9067acaa137bb2
ibstagefright/MPEG4Writer.cpp
ef1c48d6a976f56bf7f7a41a5b2e8725af988362 22-Jun-2010 Andreas Huber <andih@google.com> Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
e5671bfe51aeaac823cd94f8e04f01e37b4c2cd6 22-Jun-2010 James Dong <jdong@google.com> Merge "Audio/video sync during recording (second part)" into gingerbread
a4867540534568e3fbd06e142c62834b2bde8834 22-Jun-2010 Andreas Huber <andih@google.com> Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.

Change-Id: I7d022ac494e1cecdd7f656806b7ed45979c02840
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/NuCachedSource2.h
875500b47ac74a164f7792ce89a16d600ea72695 22-Jun-2010 James Dong <jdong@google.com> Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore's code" into gingerbread
36e573bf7db5888f92c52eda26e0771aaa2406e4 19-Jun-2010 James Dong <jdong@google.com> Audio/video sync during recording (second part)

Change-Id: Iba0b35f57fdeac7ee1da16899406bf4b957a2c8c
ibstagefright/AudioSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
f23729a0e3be6aeb19b3b8a2daddaa845f865e9b 21-Jun-2010 Chia-chi Yeh <chiachi@android.com> am d9e9132e: am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount().

Merge commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d'

* commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d':
media: add AudioTrack::getMinFrameCount().
2ce999fce785eb34b3a157db5ab5e17d31e2ea33 21-Jun-2010 Chia-chi Yeh <chiachi@android.com> am bd240c27: media: add AudioTrack::getMinFrameCount().

Merge commit 'bd240c2737913d6ed1982788699f93bbc52330c0' into gingerbread

* commit 'bd240c2737913d6ed1982788699f93bbc52330c0':
media: add AudioTrack::getMinFrameCount().
bd240c2737913d6ed1982788699f93bbc52330c0 16-Jun-2010 Chia-chi Yeh <chiachi@android.com> media: add AudioTrack::getMinFrameCount().

Change-Id: If15162583d1d16d89f59be0793106afe77417f35
ibmedia/AudioTrack.cpp
49b6fbaebd5413b92c6dcff423da95d5525455ee 18-Jun-2010 James Dong <jdong@google.com> AmrInputStream refresh: eliminate the dependency upon OpenCore's code

Change-Id: I0e66bc0a16fcdcf70136012ae1cd4138506cc94b
ni/Android.mk
ni/android_media_AmrInputStream.cpp
d398e7a4932acbc317483fdfdf362838c5a3b52a 18-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
6ab8346a03965d065b36dfbc91edf0bc2f73db1c 17-Jun-2010 Dave Sparks <davidsparks@android.com> am c05c83e2: am f3c6c982: am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly hig

Merge commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2'

* commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2':
TimedEventQueue is apparently important for glitch-free media playback, and so
f3c6c982f68e6ada3cded6923301d2f6236f3c17 17-Jun-2010 Dave Sparks <davidsparks@android.com> am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro

Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
TimedEventQueue is apparently important for glitch-free media playback, and so
a94e11429a52c639f83942d0720514426bf5d95d 17-Jun-2010 James Dong <jdong@google.com> am 39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo

Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp

* commit '39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.
9883af6a83e70bd2e60b6489dae33a771f3c1517 17-Jun-2010 Dave Sparks <davidsparks@android.com> am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro

Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
TimedEventQueue is apparently important for glitch-free media playback, and so
a05d4d886a1b0441e056f89d40e297b14f27478a 17-Jun-2010 James Dong <jdong@google.com> am 48a7c1d2: am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder

Merge commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c'

* commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c':
Check and clip some video encoding parameters against media profiles before passing them to video encoder
42a18c09e7bb9c372382e88053409c25563ae7c9 17-Jun-2010 James Dong <jdong@google.com> Check and clip some video encoding parameters against media profiles before passing them to video encoder

Change-Id: I69e0e7411806a4ece6c0bf0e02c74eaaf48a17ac
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
99cc3295cf2abed2e21f2196c986930119d22d7e 17-Jun-2010 James Dong <jdong@google.com> am d8402d78: am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread

Merge commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783'

* commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783':
Remove hard-coded number of audio channels in AudioSource
cd677a30851e4ba8b79a41c20e20220a81719378 17-Jun-2010 James Dong <jdong@google.com> Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
39e876ad743f203fe005333947c61383772b0d14 17-Jun-2010 James Dong <jdong@google.com> Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
1c8bc7bb999a7b7b02d1e99f21610cfca67433bb 16-Jun-2010 James Dong <jdong@google.com> When filling the cache, we always time out waiting for a condition that won't occur.
We are actually improving the power consumption for streaming applications like Pandora.

Change-Id: Id32bacbc962e8c69c056599479b308d6a07b7a20
ibstagefright/Prefetcher.cpp
cad5726e3a0920d09cac391121314e0e40f38fd2 15-Jun-2010 Marco Nelissen <marcone@google.com> TimedEventQueue is apparently important for glitch-free media playback, and so
having it inherit its priority from the thread that created it is a bad idea.
Instead, set the priority explicitly, and bump it to slightly higher than normal.

Change-Id: I01843f24905790ce2e2cde5d11a99346cfbf968d
ibstagefright/TimedEventQueue.cpp
7e28c0108b2926832f29503682f950ab7506f684 15-Jun-2010 James Dong <jdong@google.com> am 56b64c75: am ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread

Merge commit '56b64c75c3809c55c2053f77802344a9e035343f'

* commit '56b64c75c3809c55c2053f77802344a9e035343f':
This patch enables each omx instance to have a separate message dispatcher, and
15d3e0a9f44eed212c1c2d416b3448843637e7d1 15-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Use stat.st_mode instead of dirent.d_type to determine file type."
8071de90961cc65bf420007e3b504abacd6d4796 15-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "MediaScanner: Fix handling of files with dirent.d_type == DT_UNKNOWN"
9eb5ac9cc731774e17205a5d755a149d1508478d 15-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Use stat.st_mode instead of dirent.d_type to determine file type.

dirent.d_type is not implemented on all file systems.

Change-Id: I50a01fd77a9f976f215e7ff98dd04f0f2611bbce
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpMediaScanner.cpp
f30218bea72cfa605796a703abf2f423e9becc48 15-Jun-2010 Mike Lockwood <lockwood@android.com> MediaScanner: Fix handling of files with dirent.d_type == DT_UNKNOWN

The previous code was calling stat() on the parent directory rather than the actual file.

Change-Id: If64552cb37552c77618a81ae4333307a018efe13
Signed-off-by: Mike Lockwood <lockwood@android.com>
ibmedia/MediaScanner.cpp
7028db3beda25f9b8142f126cc124764b1e2f8a3 15-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "MTP device: Read manufacturer name and serial number from system properties."
622ccdc2184ff3f3b8d159cf585cb13608c98d0b 15-Jun-2010 Mike Lockwood <lockwood@android.com> MTP device: Read manufacturer name and serial number from system properties.

Change-Id: I8d1ad79f38aaaa50fa8899e6b614096af95fdf39
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
tp/MtpStorage.cpp
d77d2a980c6fbdc00b7d62a34d9b799dcf8c9514 15-Jun-2010 James Dong <jdong@google.com> Remove hard-coded number of audio channels in AudioSource

Change-Id: I5f362252c25e2251bbfa9818b711ee23b4975248
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/AudioSource.cpp
c52ced072667c1d43c1dfd688d85c5d139aada39 15-Jun-2010 James Dong <jdong@google.com> This patch enables each omx instance to have a separate message dispatcher, and
thus eliminates the sharing of the message dispatches between omx instances.

If the omx audio and video encoders share the same dispatcher, when the audio read
blocks in the AudioSource, the message dispatcher thread gets blocked. As a result,
the message for the omx video encoder can not be dispatched, hence gets blocked too.
If the blocking time is long enough, the video frame rate decreases significantly.
This is the case when we read 2048 bytes by default each time. Reading smaller blocks
of audio data helps mitigate the above-mentioned problem, but it is not an ideal
solution for two reasons: a) it is not efficient, and thus can cause a lot of overhead
passing buffers between the frame work and the omx encoders; b) also, the audio record
thread can overflow as a result, which lead to the loss of recorded audio frames.

This patch affects both authoring engine and the playback engine.

Change-Id: I26dfde7ac46c8752cf1793ce1bfcc7be7724580e
ibstagefright/include/OMX.h
ibstagefright/omx/OMX.cpp
40287c8f11860c67802360b806898e9bf77ab627 14-Jun-2010 James Dong <jdong@google.com> am 814f430c: am dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?

Merge commit '814f430cb5e313316600fd6694ed338edd5fff7d'

* commit '814f430cb5e313316600fd6694ed338edd5fff7d':
Fixed a typo - maybe we should do comparison ignoring the case?
dca66e1c3bc8842b0d44e0cb004e507a456e4b8f 14-Jun-2010 James Dong <jdong@google.com> Fixed a typo - maybe we should do comparison ignoring the case?

Change-Id: I498f8242e6ba3e3e8b8c7b714ed49bff51a3010b
ibstagefright/OMXCodec.cpp
44cf0a06827d08d8dca35b51ea29be384aa32517 14-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Fix uninitialized pointer bug.

Change-Id: Ia07ebd48aeb483e66957f5a174992d200494a744
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpDatabase.cpp
7f5ee3b58d3dc07b88b313aae83ae424d131b355 14-Jun-2010 Eric Laurent <elaurent@google.com> am 184a3ff6: am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken

Merge commit '184a3ff64ba71e7e860b70b9a836c0132b447138'

* commit '184a3ff64ba71e7e860b70b9a836c0132b447138':
Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
e0219539c6c3e60de4a35cd836df3b68c963e9e0 14-Jun-2010 Eric Laurent <elaurent@google.com> am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken

Merge commit '01f7ac64488027492b2909b99d70491e7a391015' into gingerbread

* commit '01f7ac64488027492b2909b99d70491e7a391015':
Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
01f7ac64488027492b2909b99d70491e7a391015 14-Jun-2010 Eric Laurent <elaurent@google.com> Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
70bd2f2099fe2808bf0e4e5acc7fccde72186d41 13-Jun-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: Requery the device list when MTP devices are added and removed.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java
74f094fe22ca1cde637210e023874ab740a7a8d7 13-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Add interface to MtpClient for receiving device added/removed events.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
30d5ca398da4d6f417fe7c000dc9b20ae6ad8e37 12-Jun-2010 Andreas Huber <andih@google.com> am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread

Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'

* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
Must hold lock here...
126ca6f9ecab6f912ea9f4f00af35c410aae504b 12-Jun-2010 Andreas Huber <andih@google.com> Merge "Must hold lock here..." into gingerbread
5bd667a3a7a66518ffe6e71b1224f3ad2558be3e 12-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "CameraBrowser: Support for deleting pictures."
0cd0e797dac6aa59f411d35bcec8d6ae7ced485a 12-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Add host support for deleting objects."
147717c2671e34e0b2aef1570bcc9498f1074a0e 11-Jun-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: Support for deleting pictures.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/res/menu/object_menu.xml
ests/CameraBrowser/res/values/strings.xml
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
e0a89f611d952d477acaae0316f2ccba7237466b 11-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Add host support for deleting objects.

For example, deleting pictures on a digital camera.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ava/android/media/MtpCursor.java
tp/MtpDevice.cpp
tp/MtpDevice.h
188c432c700b2ada707a8e2b9fd3c075cef1fd06 11-Jun-2010 James Dong <jdong@google.com> am ae2c4774: am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken

Merge commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3'

* commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3':
Initial checkin for pause and resume control
f62c57d684b83df7d2817db976c0afdb500ae92a 11-Jun-2010 James Dong <jdong@google.com> Merge "Initial checkin for pause and resume control" into kraken
9e937269a6ae45435fe7a66e998177bf5a16171c 11-Jun-2010 Andreas Huber <andih@google.com> Must hold lock here...

Change-Id: I179a5582c9246f78c988f85e2f969f32d547ac89
ibstagefright/NuCachedSource2.cpp
08c7473ce9b601e170fd79c530f106bf74277a0f 10-Jun-2010 James Dong <jdong@google.com> Initial checkin for pause and resume control

Change-Id: Ibdcf7bea5fb66baa81878704ba4091dfcfe382ee
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/AMRWriter.cpp
ibstagefright/AudioSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
4fee974adf4dae7da4a756fcb50c000a4a0aa94f 11-Jun-2010 Andreas Huber <andih@google.com> am 0905ba7b: am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken

Merge commit '0905ba7ba62567c1d1b5b0567827c35d40390b52'

* commit '0905ba7ba62567c1d1b5b0567827c35d40390b52':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9 11-Jun-2010 Andreas Huber <andih@google.com> Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
20b35c70466f55a796f2c1da003ece3268be82d6 11-Jun-2010 Andreas Huber <andih@google.com> am b165719e: am e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.

Merge commit 'b165719e93dd390b4f71f5d5e993880529cc841f'

* commit 'b165719e93dd390b4f71f5d5e993880529cc841f':
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
3a53dc5ad9c2fa808b87195cfde9f3a065d6fa5b 11-Jun-2010 Andreas Huber <andih@google.com> Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.

Change-Id: I506dc501faec60e974bf4968d8ba661df7a49aa8
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/NuHTTPDataSource.h
e577e87a2d80890190f14edc4a5caf70d7c566bf 11-Jun-2010 Andreas Huber <andih@google.com> Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.

Change-Id: I963ad7074b830d553b67c8925efd5369d0b7a5b9
ibstagefright/NuCachedSource2.cpp
948235c06ed0d49190b2f49d9299b473c4dd61a9 09-Jun-2010 Eric Laurent <elaurent@google.com> Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.

Added AudioEffect C++ class. AudioEffect is the base class for effect specific implementations,
OpenSL ES effect interfaces and audio effect JNI.

Added the AudioEffect JNI and AudioEffect JAVA class. AudioEffect is the base class
to implement more specific JAVA classes to control audio effects from JAVA applications.

Change-Id: If300a1b708f2e6605891261e67bfb4f8330a4624
ava/android/media/AudioEffect.java
ni/Android.mk
ni/audioeffect/Android.mk
ni/audioeffect/android_media_AudioEffect.cpp
ibmedia/Android.mk
ibmedia/AudioEffect.cpp
2dabef2f4e945c30372425cfe4f93744ac56c76c 11-Jun-2010 Andreas Huber <andih@google.com> am 627a0019: am 4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
422c5a14081af631ad4b61817f88ff436d7a8fe9 11-Jun-2010 Andreas Huber <andih@google.com> am 566e64af: am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
6ee780de7f72e124f7244ad8534fefa07d0bee0a 11-Jun-2010 Andreas Huber <andih@google.com> am 960a0ff1: am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
4d61f602bf67fe61256c23f090d6119992ad5160 10-Jun-2010 Andreas Huber <andih@google.com> Switch stagefright's approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.

Change-Id: If8185ba329ce8b6663b1ad39a4efb0ad3be81df2
ava/android/media/MediaPlayer.java
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/CachingDataSource.cpp
ibstagefright/DataSource.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/Prefetcher.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/Prefetcher.h
fbdb5f1bb6c2ad96c36086a20715119fdb3dc4de 11-Jun-2010 Andreas Huber <andih@google.com> Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
c81d2c12de7e5c7097f5332f8ece295b9a699e28 11-Jun-2010 Andreas Huber <andih@google.com> Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
99b3452f404e1574508665ebb71362766d362603 10-Jun-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: Display thumbnails for camera images.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/res/layout/object_info.xml
ests/CameraBrowser/res/layout/object_list.xml
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
dda568609232cdf82a2f050b0d0727627f49d448 10-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Add support for retrieving thumbnails to MTP content provider.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpCursor.java
tp/MtpCursor.cpp
tp/MtpCursor.h
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDevice.cpp
tp/MtpDevice.h
a9aaf8ffcecf294c8da9785b5c5e1f055ee4d245 10-Jun-2010 Andreas Huber <andih@google.com> am c90e35c1: am 8d300280: Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
815758ba7d04fe3e3618204adba0fd76ad717e8a 10-Jun-2010 Andreas Huber <andih@google.com> am 3ee447e4: am 75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken
8d3002806593f090ee570c04e4620b90df4d5c8b 10-Jun-2010 Andreas Huber <andih@google.com> Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
75c1c8e3f555b2f1977224c0a2fa19675e8e1e1d 10-Jun-2010 Andreas Huber <andih@google.com> Merge "Initial check in of a new http data source implementation." into kraken
82f8fd6a4928ca52703caaffb7629c0be3c8089a 10-Jun-2010 Andreas Huber <andih@google.com> Switch LiveSource to use the new http data source instead of the old one.

Change-Id: I9623c480628c495dbfbe02bdc6372724a107e2e8
ibstagefright/httplive/LiveSource.cpp
ibstagefright/include/LiveSource.h
1f24b30fe4b5d8e4050d30c92cf81cfa599cf991 10-Jun-2010 Andreas Huber <andih@google.com> Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek.

Change-Id: Ie4153a10ab36c1135f5fcfb572958129d886bcc3
ibstagefright/OMXCodec.cpp
b206319122c73c487ad2798b8090c9edcd41f4e5 10-Jun-2010 Andreas Huber <andih@google.com> Initial check-in of new caching/prefetching data source implementation.

Change-Id: I97a6e3f03c69c9b1219f1f06bd109c0102f2c504
ibstagefright/NuCachedSource2.cpp
ibstagefright/include/NuCachedSource2.h
163c493b50bb8473319a942c8feb4528cdc56c11 10-Jun-2010 Andreas Huber <andih@google.com> Initial check in of a new http data source implementation.

Change-Id: I17c358288ffe9ef690d702c58723c766d0a0cf21
ibstagefright/NuHTTPDataSource.cpp
ibstagefright/include/NuHTTPDataSource.h
0809c0e4c61fb1f64925081c811df86c73f7070f 10-Jun-2010 Mike Lockwood <lockwood@android.com> CameraBrowser: New test app for the MTP content provider.

Change-Id: I8423d728b13ed8ac87bd2792eefddce3287598bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ests/CameraBrowser/Android.mk
ests/CameraBrowser/AndroidManifest.xml
ests/CameraBrowser/res/layout/object_info.xml
ests/CameraBrowser/res/values/strings.xml
ests/CameraBrowser/res/values/styles.xml
ests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java
ests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java
ests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java
f724eed5669762fdb0071e11ab3b38de77dd5c33 08-Jun-2010 Mike Lockwood <lockwood@android.com> MTP provider: Add columns for MTP ObjectInfo dataset to the MTP objects table

Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: Ife0563ad1c3b3dbc2461e1a9e784cbb4653b3435
ava/android/media/MtpCursor.java
tp/MtpCursor.cpp
tp/MtpObjectInfo.cpp
f3e969a3bb507258a844434af59a60a929426726 10-Jun-2010 James Dong <jdong@google.com> am 3aede37f: am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
c8105742ffcc2cd104506f05e99f69f7841ecb58 10-Jun-2010 Andreas Huber <andih@google.com> am 7b909c05: am 66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
3a0b37a04e8c8cc2e1e2386023bc5ce77cd91625 10-Jun-2010 James Dong <jdong@google.com> Merge "Remove the lock/unlock workaround from CameraService" into kraken
66b89a62aa6d5599ad4d11d891b5028587d4c6be 10-Jun-2010 Andreas Huber <andih@google.com> Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
e2f85077a25bcde1f041b6d085cfd50cfc0eeaed 10-Jun-2010 Andreas Huber <andih@google.com> Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed.

Change-Id: I4a9aa80f392dbef72f81e25c67e5bd0654848b2c
ibstagefright/OMXCodec.cpp
71d714ccbf03948d67ab6cebad49703160e5895e 10-Jun-2010 James Dong <jdong@google.com> Remove the lock/unlock workaround from CameraService

bug - 2677772

Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/CameraSource.cpp
86de46125cef4769e6c21092c01ac7db5a1e1f8e 09-Jun-2010 James Dong <jdong@google.com> am 689497fb: am 457d5ae3: Fix a potential(observed sometimes) media server crash
457d5ae3c9e40c8336b65ea954d1bd5ae1622917 09-Jun-2010 James Dong <jdong@google.com> Fix a potential(observed sometimes) media server crash

The problem is that we are referring an temp object returned from a function call.
When the function call returned, the temp object is gone; and thus the reference
may be invalidated.

-- rebased

bug - 2734946

Change-Id: I1993c4462df95610ca478f816adc30058af5850e
ni/android_media_MediaRecorder.cpp
70eeab74120f1f4a335412bb849812cbc998c285 09-Jun-2010 Mathias Agopian <mathias@google.com> am 34e5d967: am 55f8209d: Merge "allow re-targetting of surfaces" into kraken
5e14010b1fc066dfcbc0a577d59492687c99667d 09-Jun-2010 Mathias Agopian <mathias@google.com> allow re-targetting of surfaces

Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.

Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
ni/android_media_MediaRecorder.cpp
30bb8f89ada3f4484fc5e3bb977667282f3b8a9d 08-Jun-2010 James Dong <jdong@google.com> am d49c9818: am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken
1244eab2cea41df1db4eeb930fddbb9e67ff7691 08-Jun-2010 James Dong <jdong@google.com> Remove some hard-coded encoding parameters

Change-Id: I7a8ccd5d57891a6a585c8da2ee53acb094955913
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSource.cpp
ibstagefright/OMXCodec.cpp
7cbc12b9ce23f71be2d98a57840fc2786c22b976 08-Jun-2010 James Dong <jdong@google.com> am 15c0c098: am dae9fd31: Initial check-in for collecting stats from authoring engine at runtime
dae9fd31907c62712f7a96bb2a8e288b0cca57c2 04-Jun-2010 James Dong <jdong@google.com> Initial check-in for collecting stats from authoring engine at runtime

Change-Id: I93a9d8bd260efc5e7fc135b726e3f1307c6df794
ibstagefright/AudioSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
cda2af1080c6823b764be49f18e5ada1f92a3d89 08-Jun-2010 James Dong <jdong@google.com> am ef2ad683: am 31b19758: Merge "Second part of speeding up video recording frame rate" into kraken
1f06de3102825bc6c412b4a14f87cc3d50691d7f 08-Jun-2010 Andreas Huber <andih@google.com> am ae9348bc: am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
31b1975890d0159ab5ee060c94084461f8b74bd8 08-Jun-2010 James Dong <jdong@google.com> Merge "Second part of speeding up video recording frame rate" into kraken
4f501f0f2b71b69cadbdb96c71e83a06751e7f0e 07-Jun-2010 James Dong <jdong@google.com> Second part of speeding up video recording frame rate

1. Avoid copying the input recording frames to the encoder via OMX interface
for TI video encoder
This is a missing change for part one which help reduces the CPU load.

2. Release output buffers as early as possible. This is a little bit helpful, but not critical.

TODO:
We should save the underlying pointers allocated by the OMX component before we replace them
and restore them before we call OMX_FreeBuffer()!

Change-Id: Ib3a88978f4c3b1153808872eaa7ac4c265a811ff
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
36a685d70f07d0d96e571b9c2f78194c6ef54c6a 08-Jun-2010 Kenny Root <kroot@google.com> Include stdlib to fix sim build

Change-Id: I7732461a9351f53f9ddadcfb26485f2e553e056b
tp/mtp.h
7a747b8e0dadf909ea4ac0b67fd88fc14b4eb3f8 08-Jun-2010 Andreas Huber <andih@google.com> Initial checkin of preliminary rtsp support for stagefright.

Change-Id: I0722aa888098c0c1361c97a4c1b123d910afc207
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/ARTSPController.h
ibstagefright/include/AwesomePlayer.h
ibstagefright/rtsp/AAVCAssembler.cpp
ibstagefright/rtsp/AAVCAssembler.h
ibstagefright/rtsp/AMPEG4AudioAssembler.cpp
ibstagefright/rtsp/AMPEG4AudioAssembler.h
ibstagefright/rtsp/APacketSource.cpp
ibstagefright/rtsp/APacketSource.h
ibstagefright/rtsp/ARTPAssembler.cpp
ibstagefright/rtsp/ARTPAssembler.h
ibstagefright/rtsp/ARTPConnection.cpp
ibstagefright/rtsp/ARTPConnection.h
ibstagefright/rtsp/ARTPSource.cpp
ibstagefright/rtsp/ARTPSource.h
ibstagefright/rtsp/ARTSPConnection.cpp
ibstagefright/rtsp/ARTSPConnection.h
ibstagefright/rtsp/ARTSPController.cpp
ibstagefright/rtsp/ASessionDescription.cpp
ibstagefright/rtsp/ASessionDescription.h
ibstagefright/rtsp/Android.mk
ibstagefright/rtsp/MyHandler.h
ibstagefright/rtsp/MyTransmitter.h
ibstagefright/rtsp/VideoSource.h
9258ad7d7865dc854889ef24d274717296a60446 08-Jun-2010 Andreas Huber <andih@google.com> am 6fa5360e: am 2cbff0ed: Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken
2cbff0edb67e47fb75f4142dce7ba104c6336fc7 08-Jun-2010 Andreas Huber <andih@google.com> Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken
202348e0d4aa07e81fc5b2fb2fd6340131d752ce 07-Jun-2010 Andreas Huber <andih@google.com> Initial checkin of preliminary support for "http live" streaming in stagefright.

Change-Id: I20399f63d63af86a3ba22641c0e43385a108fb3f
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/httplive/Android.mk
ibstagefright/httplive/LiveSource.cpp
ibstagefright/httplive/M3UParser.cpp
ibstagefright/include/LiveSource.h
ibstagefright/include/M3UParser.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
daa595e733c628fa9b2ff6ce17f12fbd41379293 07-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> am 8984d144: am a8c2514e: Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken
a8c2514eddd39eb1d486d7bfa616178c45f2adea 07-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken
2ccb2eba46a4773066940e597270705de871921b 07-Jun-2010 Andreas Huber <andih@google.com> am f7d1c542: am a557b24a: Initial checkin of mpeg2 transport stream parser for stagefright.
a557b24ac4dd568d86b08753f7c0361d04f80d46 07-Jun-2010 Andreas Huber <andih@google.com> Initial checkin of mpeg2 transport stream parser for stagefright.

Change-Id: I328ce77404daf7127933b48c9d58ed504fb8fc6f
ava/android/media/MediaFile.java
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/include/MPEG2TSExtractor.h
ibstagefright/mpeg2ts/ABitReader.cpp
ibstagefright/mpeg2ts/ABitReader.h
ibstagefright/mpeg2ts/ATSParser.cpp
ibstagefright/mpeg2ts/ATSParser.h
ibstagefright/mpeg2ts/Android.mk
ibstagefright/mpeg2ts/AnotherPacketSource.cpp
ibstagefright/mpeg2ts/AnotherPacketSource.h
ibstagefright/mpeg2ts/MPEG2TSExtractor.cpp
1e1df1c8a942c711ba5c650aeb914a6c0d01a7ca 07-Jun-2010 Andreas Huber <andih@google.com> am cd4961d9: am 455d4100: Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
455d41002e17de93b1486b2b2a97a71a0d62903b 07-Jun-2010 Andreas Huber <andih@google.com> Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
b4912f9b2d722ea69f68076ccf10747544415d28 07-Jun-2010 James Dong <jdong@google.com> am f520c763: am 7a68d368: Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken
7d2f703649e270b635018f8b7219bb0e1d62a2e5 07-Jun-2010 Andreas Huber <andih@google.com> Initial checkin of "foundation" library for future stagefright development.

Change-Id: I11714dcaa647d0437a13e4c5b953b35e712da8f3
ibstagefright/foundation/AAtomizer.cpp
ibstagefright/foundation/ABuffer.cpp
ibstagefright/foundation/ADebug.cpp
ibstagefright/foundation/ALooper.cpp
ibstagefright/foundation/ALooperRoster.cpp
ibstagefright/foundation/AMessage.cpp
ibstagefright/foundation/AString.cpp
ibstagefright/foundation/Android.mk
ibstagefright/foundation/base64.cpp
ibstagefright/foundation/hexdump.cpp
7a68d3686aace4781ee6c25d8ab8704bebee34af 07-Jun-2010 James Dong <jdong@google.com> Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken
90f4873446b08980102e3bc8893a220dec5ebf2e 06-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: host support for retrieving device property descriptors

Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDevice.cpp
tp/MtpDevice.h
tp/MtpDeviceInfo.cpp
tp/MtpObjectInfo.cpp
tp/MtpProperty.cpp
tp/MtpProperty.h
tp/MtpStorageInfo.cpp
tp/MtpTypes.h
ec74abb71f79cdc573c536115acc7ff26a02680a 01-Jun-2010 Mikael2 Svensson <mikael2.svensson@sonyericsson.com> Change in media scanner to set correct date

When the media scanner scanned a single file, the modified
date (DATE_MODIFIED) was not correctly set in the content
provider. It was set as milliseconds but should have been
set as seconds. This caused downloaded media items to display
wrongly in the camera album, since the date was wrong.

Change-Id: I24cd92215c26f579eb33a4a3890f96c6ef9ec8c0
ava/android/media/MediaScanner.java
b0ccc7ca7512410739f260be0777d7161971c081 04-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: Add support for host cancellation of file transfers."
a82d3c550b5732293657e8b567daa381354688a1 04-Jun-2010 Mike Lockwood <lockwood@android.com> MTP: Add support for host cancellation of file transfers.

Change-Id: I72df423f8017286e41adae525e6fbcb6b8440687
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpServer.cpp
tp/MtpServer.h
4b18200b9cc97d22ac4b77634195ec5f48004568 04-Jun-2010 Eric Laurent <elaurent@google.com> am 030a1553: am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
2ea200c5a7c13e6a7e8bfdb04e96066a38b19240 04-Jun-2010 Eric Laurent <elaurent@google.com> Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
bebfb6aa0cc15eea0787c08b1247f53c7f0cd55b 04-Jun-2010 Doug Kwan <dougkwan@google.com> Add missing library to linker command line.

Change-Id: Ia9ddf6e6bb5e72c32372a2f460806b6cbb7ec660
tp/Android.mk
42006894ed20eed29729fcbbd7e39f64f5eaf3fc 04-Jun-2010 Jing Yu <jingyu@google.com> Add missing libraries, in order for gold to work.

gold is more strict than ld. If building A depends on libB directly,
we must specify -lB at link time.

Change-Id: Iac7cec58cbae5e0cbcfc9adab924db6733192d20
tp/Android.mk
8fd2913a7d893f7b0c07217df246876318739db5 04-Jun-2010 Andreas Huber <andih@google.com> am 17dabbdf: am b8c7548d: am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
b8c7548df6a6708b8f06033f0790929e91558e95 04-Jun-2010 Andreas Huber <andih@google.com> am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo

Merge commit 'e896d41699ffe7be932102d7ccc9566f41ddb447' into kraken

* commit 'e896d41699ffe7be932102d7ccc9566f41ddb447':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
e896d41699ffe7be932102d7ccc9566f41ddb447 04-Jun-2010 Andreas Huber <andih@google.com> am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo

Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp

* commit '2e3761ba43f634e97ac493f4b79e5e53954a1491':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
2e3761ba43f634e97ac493f4b79e5e53954a1491 04-Jun-2010 Andreas Huber <andih@google.com> Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
3c460f3da0d0f633d392776a635fe940d5373626 03-Jun-2010 Andreas Huber <andih@google.com> Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.

Change-Id: I03dbdac3cd250340059ea43b341129b30acce4e2
related-to-bug: 2736779
ibstagefright/Prefetcher.cpp
c2f328d0d2821e402823d6e17589da2849b67d0d 03-Jun-2010 James Dong <jdong@google.com> Remove hard-coded pixel format for recording frames in CameraSource.
Retrieve the pixel format from Camera HAL at runtime.

Change-Id: I63f820f54c59c2019dfd195320b9928da3362536
ibstagefright/CameraSource.cpp
e4c8aa60e3b62e8e05e2ec935ca785da2aa1e727 03-Jun-2010 James Dong <jdong@google.com> am a3d1c3cd: am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
57ad07039a63e8454d8a73cdce9c5e269f13205c 03-Jun-2010 James Dong <jdong@google.com> am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo

Merge commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken

* commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
c40209ac60a64a7c08b0d0028060d5308fd7a0b8 03-Jun-2010 James Dong <jdong@google.com> am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo

Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp

* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
9d96354d7055cd165d7d5625990f810f46339e52 03-Jun-2010 James Dong <jdong@google.com> Fix a Javadoc to clarify when setAudioStreamType() should be called.

bug - 2737926

Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
ava/android/media/MediaPlayer.java
b4985e0e69a42518fa15f5d1ed679135925d5f24 03-Jun-2010 Mike Lockwood <lockwood@android.com> Merge "Prototype Content Provider support for MTP/PTP devices."
65b65459e6ac59f8a257009df8014467ae0838ee 02-Jun-2010 Eric Laurent <elaurent@google.com> Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications.

First drop of audio framework modifications for audio effects support.

- AudioTrack/AudioRecord:
Added support for auxiliary effects in AudioTrack
Added support for audio sessions
Fixed left right channel inversion in setVolume()

- IAudioFlinger:
Added interface methods for effect enumeraiton and instantiation
Added support for audio sessions.

- IAudioTrack:
Added method to attach auxiliary effect.

- AudioFlinger
Created new classes to control effect engines in effect library and manage effect connections to tracks or
output mix:
EffectModule: wrapper object controlling the effect engine implementation in the effect library. There
is one EffectModule per instance of an effect in a given audio session
EffectChain: group of effects associated to one audio session. There is one EffectChain per audio session.
EffectChain for session 0 is for output mix effects, other chains are attached to audio tracks
with same session ID. Each chain contains a variable number of EffectModules
EffectHandle: implements the IEffect interface. There is one EffectHandle object for each application
controlling (or using) an effect module. THe EffectModule maintians a list of EffectHandles.

Added support for effect modules and effect chains creation in PlaybackThread.
modified mixer thread loop to allow track volume control by effect modules and call effect processing.

-AudioMixer
Each track now specifies its output buffer used by mixer for accumulation
Modified mixer process functions to process tracks by groups of tracks with same buffer
Modified track process functions to support accumulation to auxiliary channel

Change-Id: I26d5f7c9e070a89bdd383e1a659f8b7ca150379c
ibeffects/EffectEqualizer.cpp
ibeffects/EffectReverb.c
ibeffects/EffectReverb.h
ibeffects/EffectsFactory.c
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioTrack.cpp
740e39be6af3e366a4b82c030b5ea67ab144b42a 02-Jun-2010 Jaikumar Ganesh <jaikumar@google.com> Pass BluetoothDevice to the Bluetooth Headset calls.

This is to support multiple headsets at the same time, atleast
at the framework level.

Change-Id: I91d05c6c2828c9a09d00806d5e79f1e9c9c7cf84
ava/android/media/AudioService.java
755fd617258d3f1731b2829d681cab680db0fdd5 26-May-2010 Mike Lockwood <lockwood@android.com> Prototype Content Provider support for MTP/PTP devices.

At this point much of the plumbing is in place, but only a few simple queries
are supported.
This is enough to support a proof of concept sample program that navigates
the file hierarchy of a digital camera connected via USB.

Also removed obsolete ptptest host test program.

Change-Id: I17644344b9f0ce1ecc302bc0478c1f3d44a1647f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MtpClient.java
ava/android/media/MtpCursor.java
tp/Android.mk
tp/MtpClient.cpp
tp/MtpClient.h
tp/MtpCursor.cpp
tp/MtpCursor.h
tp/MtpDevice.cpp
tp/MtpDevice.h
tp/MtpTypes.h
tp/ptptest.cpp
06ea15984921bffa3f1e207a738a00aa616a5d19 02-Jun-2010 Andreas Huber <andih@google.com> am 7bd9a6a5: am eaeae4ab: A debugging DataSource artifically limiting the available bandwidth.
eaeae4ab60a9a48b93a74fd363ec23fb7e882a78 01-Jun-2010 Andreas Huber <andih@google.com> A debugging DataSource artifically limiting the available bandwidth.

Change-Id: I4ca75337a52599d211ea066fd94e649748df052d
ibstagefright/Android.mk
ibstagefright/ThrottledSource.cpp
ibstagefright/include/ThrottledSource.h
5f95da7a1786e06bf9ec2931ed151868582ad37c 28-May-2010 James Dong <jdong@google.com> am 46e70361: am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken
464411983a4dcafd19853d188a958fdc4f120d7c 28-May-2010 James Dong <jdong@google.com> Merge "Avoid copying for input recording frames in CameraSource" into kraken
dfb1dd6a8c0c0b0ecde302fae266d9a37617dfda 28-May-2010 James Dong <jdong@google.com> Avoid copying for input recording frames in CameraSource

This is the part one.

- Let CameraSource be a MediaBufferObserver. It releases the recording frame when the ref count of a MediaBuffer containing
the recording frame drops to 0.

This reduces the CPU load from 90+% down to 50-60%.

Part two is related to the avoidance of copying the input video frames to the video encoder.
However, we are not able to use OMX_UseBuffer directly. Still work on the second part.

Change-Id: I906f1d054ae8bdcf82e1617f1fc120152f2eb2eb
ibstagefright/CameraSource.cpp
56a72f80b88b2e93c5892acaf11f0f2c42ca724e 28-May-2010 Andreas Huber <andih@google.com> am 2b4bc19e: am 1a35e612: Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
261eb0cbef1f3f7d3cde49d628b9c1e82dabcb76 27-May-2010 Andreas Huber <andih@google.com> Better sniffing of MPEG4 content by checking for a compatible sub-brand.

Change-Id: I076908822ad0e663b9932e61fb33edc12c2e1948
related-to-bug: 2673192
ibstagefright/MPEG4Extractor.cpp
7d39a1b2e8d18e24e7c386e43a61ffed6d24ec60 27-May-2010 Andreas Huber <andih@google.com> am 215aeda9: am 2cb138db: Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
2cb138dbe89c493547066679e1a8ef1ae0a848de 27-May-2010 Andreas Huber <andih@google.com> Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
b8fbe1f21ea40a60fd76ddd4c7f95acfe53c3a71 27-May-2010 James Dong <jdong@google.com> am cd9cdf8d: am 407f98bf: Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
407f98bfcd4c7ba71acf9ec7b7c170ebec8c490b 27-May-2010 James Dong <jdong@google.com> Remove the logic in CameraSource using CameraParameters class to find out the buffer size.

Change-Id: I76eea76bda49529d08b46241d3dded1a804f891c
ibstagefright/CameraSource.cpp
65f1f81d769e5fbb6f5cbf40192de1991d4883e9 27-May-2010 Wu-cheng Li <wuchengli@google.com> am 81192f85: am c109190b: Add support for gps altitude EXIF tags.
c109190b6984da6cba4cea44a0304b6da12d77e6 20-May-2010 Wu-cheng Li <wuchengli@google.com> Add support for gps altitude EXIF tags.

Also improve the precision of getLatLong().

Change-Id: Id2c60f0d1d19e9da173b5ec1228f03c2195e189f
ava/android/media/ExifInterface.java
c82f4519e047c702fd0c6f40514ed3834f3fafa3 27-May-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO."
efb6b574dee3bd897e842dc43a02fa7b8230c1e7 27-May-2010 James Dong <jdong@google.com> am 9407fb80: am 1090a29d: Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
1090a29d4e2d81f88f3ab51fbe5cf8d8264148af 27-May-2010 James Dong <jdong@google.com> Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
aed15e785607b90b4819773650cdb164fa9a7f59 20-May-2010 James Dong <jdong@google.com> Avoid repeatedly allocating and freeing memory in CameraSource

Change-Id: Ia3760820da0559e4e908dedae1f1df05f9a6a242
ibstagefright/CameraSource.cpp
c6b9311afa79292b755d19d042ae4ce65e132243 26-May-2010 Andreas Huber <andih@google.com> am 1c12511f: am a08d8523: Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
5fb03b876b6749c17d7ee6f41f62c4e5e7d6367e 26-May-2010 Andreas Huber <andih@google.com> After failing to create an AudioTrack, only stop the source if we were the ones starting it.

Change-Id: I1820c2634cfeb01af9eaf11b6473c5d7b87d1fa3
related-to-bug: 2716035
ibstagefright/AudioPlayer.cpp
eae953bfd4ea86a51f7fdd845de9f3d82646dff8 26-May-2010 Andreas Huber <andih@google.com> Convert a number of assertions into runtime errors (OggExtractor)

Change-Id: I8fcaec927d7b72e9d61cb7283e54523711980268
ibstagefright/OggExtractor.cpp
7760ef5a3078e1e8b77838364261e32325876c15 26-May-2010 Andreas Huber <andih@google.com> am e08d5ccf: am a581a776: Merge "Squashed commit of the following:" into kraken
84440ee9aa6bc7fa349020104c2193e4920e400e 26-May-2010 Eric Laurent <elaurent@google.com> am 83904eb5: am 27a308d3: Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken
cbc8270c7e20a9d1b898200dcd72a2a5af2c74b2 26-May-2010 Yu Shan Emily Lau <yslau@google.com> am 393f5698: am f35ce7f8: am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
a581a7764041e1444da42a287abef88fd1db5b66 26-May-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:" into kraken
c6ea35372854521ea059eccaba5958a920228959 26-May-2010 Eric Laurent <elaurent@google.com> Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.

The problem is that when an input stream is opened for record over bluetooth SCO, the kernel
mono audio device should be opened in RW mode to allow further use of this same device by an output stream
also routed to bluetooth SCO.
This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true
when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO).

Change-Id: I9100e972931d8142295c7d64ec06e31304407586
ibmedia/AudioSystem.cpp
27a308d309efb0fe6beacbdc92fb12cfecec9b37 26-May-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken
f35ce7f8ee2d14b6cf0785fc671fcdfeeb1682cb 26-May-2010 Yu Shan Emily Lau <yslau@google.com> am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo

Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken

* commit '6e0967b3c4561e188df72f478baf16c6627b12be':
Added the runtime parameters for the mediarecorder stress test.
6e0967b3c4561e188df72f478baf16c6627b12be 26-May-2010 Yu Shan Emily Lau <yslau@google.com> am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo

Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp

* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
Added the runtime parameters for the mediarecorder stress test.
48584d7b8f5e56b73bb13180bf6546b2647c1b28 25-May-2010 Yu Shan Emily Lau <yslau@google.com> Added the runtime parameters for the mediarecorder stress test.
Set the total number of the stress loops of camera preview memory test to 200.

Change-Id: I5a0278095155afd669ffee9bd599ddfffdcc42bf
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
5f3004c1f5f389eaf977923cf1310402b3abf2fc 25-May-2010 Andreas Huber <andih@google.com> am 779b9b82: am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
f7617d3601519464400e8f6e9cf7030944b94d0c 25-May-2010 Andreas Huber <andih@google.com> Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
6bdf2edba4de7f971639e8a50e938d218b6d7299 25-May-2010 Andreas Huber <andih@google.com> Support for thumbnail extraction in the Matroska extractor.

Change-Id: I56f13fc4868baffe0bb8c2484d2753c766a73960
related-to-bug: 2483739
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/MatroskaExtractor.h
2bdc3e1a2f172c4e7de3e31cdd80c9ab5a605ce1 25-May-2010 Eric Laurent <elaurent@google.com> am e205dd34: am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
0616976128b9bc24729a79034c3902492dc9e573 25-May-2010 Eric Laurent <elaurent@google.com> Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
a9d635d6085e769b1e7ef43fa595a77af28366a1 25-May-2010 Eric Laurent <elaurent@google.com> Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f

Change-Id: Ibf6aebfec60cd7f807c3e49f0dbb5ab8e86bcdc1
ibeffects/EffectEqualizer.cpp
ibeffects/EffectsFactory.c
19a0913a5bc46e79614c59d735684a1e9c77782a 25-May-2010 Andreas Huber <andih@google.com> am 1a777cd4: am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art.
c6c62e12c930b137e62c16931cfe340bc93aa8f4 25-May-2010 Andreas Huber <andih@google.com> Support for ogg(vorbis) metadata in stagefright including album art.

Change-Id: I0c8c0136cebe2d2d97caabb7bc0c65be86329dbb
related-to-bug: 2713414
ibstagefright/OggExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
752b14705eac60fcd40e475189f632b1087ecf35 25-May-2010 Mike Lockwood <lockwood@android.com> Merge "MTP: adjust ptptest app for changes in libusbhost API."
4f92fffc71224ad8edcd2d1d3e8037e5e28b2896 25-May-2010 Mike Lockwood <lockwood@android.com> MTP: adjust ptptest app for changes in libusbhost API.

Change-Id: I775e08c851a55d775b532129be11fb19515fbf6e
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/ptptest.cpp
c0f34386d6ab075aced829996ea357c31abdddac 21-May-2010 Eric Laurent <elaurent@google.com> Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control.

Added IEffect and IEffectClient binder interfaces to exchange effect module control
and status information between application and media server processes.

Change-Id: I10e8e894898e52ed9956a765d0ef7075eb2593af
ibmedia/Android.mk
ibmedia/IEffect.cpp
ibmedia/IEffectClient.cpp
2ce0a831d66238e21523f0020c1284bfc3f891ed 25-May-2010 Eric Laurent <elaurent@google.com> am 1b88fb16: am cf3fa85c: Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
cf3fa85cdb6881827a379632c905f86fab2edc34 25-May-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
47ba30e863d7271053e1ce2d316c0e1735824bb0 24-May-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit a2194ecc341fa0c530d0007d8561286c8b8f2d15
Author: Andreas Huber <andih@google.com>
Date: Fri May 21 12:50:09 2010 -0700

Instead of including the libvpx libraries prebuilt in our tree, build them from sources.

Change-Id: I5ec57decf1200cf9137fe13ff77d06f47950c3d7

commit 711098ca3f16800a22ccdb26a07e57e471cca438
Author: Andreas Huber <andih@google.com>
Date: Thu May 20 15:00:27 2010 -0700

Support for VPX/VP8 decoding in stagefright

Change-Id: I16d93faf3f56a5f8ec39c14367704469f914db9e
related-to-bug: 2483739

Change-Id: Ibc124f6af540c2715cb2325151eecdd6edf085ec
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/on2/Android.mk
ibstagefright/codecs/on2/dec/Android.mk
ibstagefright/codecs/on2/dec/VPXDecoder.cpp
ibstagefright/include/VPXDecoder.h
dd5993a4e9ff8500945bda213810c1c08a920151 24-May-2010 James Dong <jdong@google.com> am f09cab8c: am 6c537e53: Merge "Properly handle start code in H264/AVC encoder output" into kraken
6c537e53cef1b0177a1734e2a5f302d80c0a26f8 24-May-2010 James Dong <jdong@google.com> Merge "Properly handle start code in H264/AVC encoder output" into kraken
c21c1900e52d9eb14bab66159a667e51ccca1c66 24-May-2010 Andreas Huber <andih@google.com> am ec5f8241: am cbcf8f63: Interestingly, a call to fseek with a NULL file handle now blocks forever...
cbcf8f6311e28a1bc74b780dc72adecbcfe61d44 24-May-2010 Andreas Huber <andih@google.com> Interestingly, a call to fseek with a NULL file handle now blocks forever...

Change-Id: Ic80c579abcf2bdb73f7fd1da713649b7c7f25f56
ibstagefright/FileSource.cpp
33f2a8b4a34338dbb9e86da2f437db9f6e062b7b 21-May-2010 Andreas Huber <andih@google.com> am 132f46ff: am df17b084: Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
df17b084bc29a06373e37a8938646069af84b23c 21-May-2010 Andreas Huber <andih@google.com> Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f 21-May-2010 Eric Laurent <elaurent@google.com> Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries.

First effect factory and effect library API implementation.
Also added default effect libraries for reverb and equalizer effects.
These libraries are for functional test only and are not fine tuned with
regard to audio quality. They will probably be replaced by other implementations
before the release.

Change-Id: I6868f8612146ae282c64052765c61a52ec789ec8
ibeffects/Android.mk
ibeffects/AudioBiquadFilter.cpp
ibeffects/AudioBiquadFilter.h
ibeffects/AudioCoefInterpolator.cpp
ibeffects/AudioCoefInterpolator.h
ibeffects/AudioCommon.h
ibeffects/AudioEqualizer.cpp
ibeffects/AudioEqualizer.h
ibeffects/AudioFormatAdapter.h
ibeffects/AudioHighShelfFilterCoef.inl
ibeffects/AudioLowShelfFilterCoef.inl
ibeffects/AudioPeakingFilter.cpp
ibeffects/AudioPeakingFilter.h
ibeffects/AudioPeakingFilterCoef.inl
ibeffects/AudioShelvingFilter.cpp
ibeffects/AudioShelvingFilter.h
ibeffects/EffectEqualizer.cpp
ibeffects/EffectReverb.c
ibeffects/EffectReverb.h
ibeffects/EffectsFactory.c
ibeffects/EffectsFactory.h
ibeffects/EffectsMath.c
ibeffects/EffectsMath.h
c6161722ad4361ba034c327c56b650c6c3bfbc3d 21-May-2010 James Dong <jdong@google.com> Properly handle start code in H264/AVC encoder output

- Some H264/AVC encoder output start code in each output buffer, and others don't.
This patch always strips the start code first so that the sample contains the correct size.
- Also properly initialize the interleave duration.

Change-Id: I692043ce7e38f0215e1097aad9e847a57907b6e4
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/MPEG4Writer.cpp
aa2abcd3a967fb39166fefb5b906c04d2fcb8650 21-May-2010 Andreas Huber <andih@google.com> am e932ea5d: am c05ab485: Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken
c05ab485e415ffd84e4790a17699b4503fa3fdfb 21-May-2010 Andreas Huber <andih@google.com> Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken
072f5247ef893e683728263a540bb93daafda376 20-May-2010 Andreas Huber <andih@google.com> Support for media extraction from .mkv/.mka Matroska files in stagefright.

Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca
related-to-bug: 2483739
ava/android/media/MediaFile.java
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/matroska/Android.mk
ibstagefright/matroska/MatroskaExtractor.cpp
ibstagefright/matroska/MatroskaExtractor.h
ibstagefright/matroska/mkvparser.cpp
ibstagefright/matroska/mkvparser.hpp
940203809590378e7f24b5d1e4684945a0660fcb 13-May-2010 Andreas Huber <andih@google.com> Update software AVC decoder to no longer require the kWantsNALFragments hack.

Change-Id: I7f1882530a891a57d0cd76cbbd7084ee31c59bd1
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
3ba577e65324ea0d0e33517cd07d0e34aa009bda 20-May-2010 James Dong <jdong@google.com> am 91b9e5fb: am 85bc1192: Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffe
85bc1192cea5806a8c8860b5e11c6a4da6a09422 20-May-2010 James Dong <jdong@google.com> Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974" into kraken
ec9e76f92155a454ab07ff2cdcbe20283613830d 20-May-2010 James Dong <jdong@google.com> Workaround for preview frame rate setting and encoder profile and level settings on passion
1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282
2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974

Change-Id: Id01d94bb77dc242c4712d56a91b0d69a96ba6c2f
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/OMXCodec.cpp
3ec26bdef956623cc58d6b0a73910bd6314aa097 20-May-2010 Andreas Huber <andih@google.com> am 2130fc82: am c6a16327: am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
c6a16327328cf04066ce948c3fbad34fdf1fbff4 20-May-2010 Andreas Huber <andih@google.com> am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo

Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken

* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
3c16154a3309fe250177d69f3fcd5b6e9a82d1b3 20-May-2010 Andreas Huber <andih@google.com> am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo

Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp

* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
1919e5af3d8eb8bcf08e50efae2e79eaf065cf6b 20-May-2010 Andreas Huber <andih@google.com> Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.

Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4
related-to-bug: 2699505
ibstagefright/AwesomePlayer.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
e24a605d510622ce0de33b22652874e98647a9b7 19-May-2010 James Dong <jdong@google.com> am 84b6cd92: am 4414b9ad: Merge "Initial software encoder checkins" into kraken
3743365114cc31d29e54354518a631a01461513e 19-May-2010 Mike Lockwood <lockwood@android.com> PTP host: Implement getObjectHandles and getObjectInfo commands

Change-Id: I3ff6e52237f400b4e50c534a1f964c80789bfe98
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
tp/MtpClient.cpp
tp/MtpClient.h
tp/MtpObjectInfo.cpp
tp/MtpObjectInfo.h
tp/MtpPacket.cpp
tp/MtpServer.cpp
tp/MtpTypes.h
tp/mtp.h
tp/ptptest.cpp
5bae7f615b6375820f61b28f6792cb2d01aab54b 19-May-2010 Mike Lockwood <mike@spruce.(none)> More work on PTP host support.

Change-Id: Ifbd5bd5efa3cdb750ae1a2aae38181457554d34d
Signed-off-by: Mike Lockwood <mike@spruce.(none)>
tp/Android.mk
tp/MtpClient.cpp
tp/MtpClient.h
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpDebug.h
tp/MtpDeviceInfo.cpp
tp/MtpDeviceInfo.h
tp/MtpMediaScanner.cpp
tp/MtpPacket.cpp
tp/MtpPacket.h
tp/MtpStorageInfo.cpp
tp/MtpStorageInfo.h
tp/MtpTypes.h
tp/MtpUtils.cpp
tp/MtpUtils.h
tp/mtp.h
tp/ptptest.cpp
17299ab50ceb70d904e610e3b2d7fb2361a11e03 15-May-2010 James Dong <jdong@google.com> Initial software encoder checkins

Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
ibstagefright/Android.mk
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/aacenc/AACEncoder.cpp
ibstagefright/codecs/aacenc/Android.mk
ibstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
ibstagefright/codecs/aacenc/SampleCode/Android.mk
ibstagefright/codecs/aacenc/SampleCode/eclair/Makefile
ibstagefright/codecs/aacenc/SampleCode/ms.mk
ibstagefright/codecs/aacenc/Tools/doit.mk
ibstagefright/codecs/aacenc/Tools/eclair.mk
ibstagefright/codecs/aacenc/basic_op/basic_op.h
ibstagefright/codecs/aacenc/basic_op/basicop2.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.c
ibstagefright/codecs/aacenc/basic_op/oper_32b.h
ibstagefright/codecs/aacenc/basic_op/typedef.h
ibstagefright/codecs/aacenc/basic_op/typedefs.h
ibstagefright/codecs/aacenc/build/eclair/ARMV5E/Makefile
ibstagefright/codecs/aacenc/build/eclair/ARMV7/Makefile
ibstagefright/codecs/aacenc/build/eclair/makefile
ibstagefright/codecs/aacenc/build/ms.mk
ibstagefright/codecs/aacenc/doc/voAACEncoderSDK.pdf
ibstagefright/codecs/aacenc/inc/aac_rom.h
ibstagefright/codecs/aacenc/inc/aacenc_core.h
ibstagefright/codecs/aacenc/inc/adj_thr.h
ibstagefright/codecs/aacenc/inc/adj_thr_data.h
ibstagefright/codecs/aacenc/inc/band_nrg.h
ibstagefright/codecs/aacenc/inc/bit_cnt.h
ibstagefright/codecs/aacenc/inc/bitbuffer.h
ibstagefright/codecs/aacenc/inc/bitenc.h
ibstagefright/codecs/aacenc/inc/block_switch.h
ibstagefright/codecs/aacenc/inc/channel_map.h
ibstagefright/codecs/aacenc/inc/config.h
ibstagefright/codecs/aacenc/inc/dyn_bits.h
ibstagefright/codecs/aacenc/inc/grp_data.h
ibstagefright/codecs/aacenc/inc/interface.h
ibstagefright/codecs/aacenc/inc/line_pe.h
ibstagefright/codecs/aacenc/inc/memalign.h
ibstagefright/codecs/aacenc/inc/ms_stereo.h
ibstagefright/codecs/aacenc/inc/pre_echo_control.h
ibstagefright/codecs/aacenc/inc/psy_configuration.h
ibstagefright/codecs/aacenc/inc/psy_const.h
ibstagefright/codecs/aacenc/inc/psy_data.h
ibstagefright/codecs/aacenc/inc/psy_main.h
ibstagefright/codecs/aacenc/inc/qc_data.h
ibstagefright/codecs/aacenc/inc/qc_main.h
ibstagefright/codecs/aacenc/inc/quantize.h
ibstagefright/codecs/aacenc/inc/sf_estim.h
ibstagefright/codecs/aacenc/inc/spreading.h
ibstagefright/codecs/aacenc/inc/stat_bits.h
ibstagefright/codecs/aacenc/inc/tns.h
ibstagefright/codecs/aacenc/inc/tns_func.h
ibstagefright/codecs/aacenc/inc/tns_param.h
ibstagefright/codecs/aacenc/inc/transform.h
ibstagefright/codecs/aacenc/patent_disclaimer.txt
ibstagefright/codecs/aacenc/src/aac_rom.c
ibstagefright/codecs/aacenc/src/aacenc.c
ibstagefright/codecs/aacenc/src/aacenc_core.c
ibstagefright/codecs/aacenc/src/adj_thr.c
ibstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
ibstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
ibstagefright/codecs/aacenc/src/band_nrg.c
ibstagefright/codecs/aacenc/src/bit_cnt.c
ibstagefright/codecs/aacenc/src/bitbuffer.c
ibstagefright/codecs/aacenc/src/bitenc.c
ibstagefright/codecs/aacenc/src/block_switch.c
ibstagefright/codecs/aacenc/src/channel_map.c
ibstagefright/codecs/aacenc/src/dyn_bits.c
ibstagefright/codecs/aacenc/src/grp_data.c
ibstagefright/codecs/aacenc/src/interface.c
ibstagefright/codecs/aacenc/src/line_pe.c
ibstagefright/codecs/aacenc/src/memalign.c
ibstagefright/codecs/aacenc/src/ms_stereo.c
ibstagefright/codecs/aacenc/src/pre_echo_control.c
ibstagefright/codecs/aacenc/src/psy_configuration.c
ibstagefright/codecs/aacenc/src/psy_main.c
ibstagefright/codecs/aacenc/src/qc_main.c
ibstagefright/codecs/aacenc/src/quantize.c
ibstagefright/codecs/aacenc/src/sf_estim.c
ibstagefright/codecs/aacenc/src/spreading.c
ibstagefright/codecs/aacenc/src/stat_bits.c
ibstagefright/codecs/aacenc/src/tns.c
ibstagefright/codecs/aacenc/src/transform.c
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
ibstagefright/codecs/amrwbenc/Android.mk
ibstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
ibstagefright/codecs/amrwbenc/SampleCode/Android.mk
ibstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile
ibstagefright/codecs/amrwbenc/SampleCode/ms.mk
ibstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile
ibstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile
ibstagefright/codecs/amrwbenc/build/eclair/makefile
ibstagefright/codecs/amrwbenc/build/eclair/ms.mk
ibstagefright/codecs/amrwbenc/doc/voAMRWBEncoderSDK.pdf
ibstagefright/codecs/amrwbenc/inc/acelp.h
ibstagefright/codecs/amrwbenc/inc/basic_op.h
ibstagefright/codecs/amrwbenc/inc/bits.h
ibstagefright/codecs/amrwbenc/inc/cnst.h
ibstagefright/codecs/amrwbenc/inc/cod_main.h
ibstagefright/codecs/amrwbenc/inc/dtx.h
ibstagefright/codecs/amrwbenc/inc/grid100.tab
ibstagefright/codecs/amrwbenc/inc/ham_wind.tab
ibstagefright/codecs/amrwbenc/inc/homing.tab
ibstagefright/codecs/amrwbenc/inc/isp_isf.tab
ibstagefright/codecs/amrwbenc/inc/lag_wind.tab
ibstagefright/codecs/amrwbenc/inc/log2.h
ibstagefright/codecs/amrwbenc/inc/log2_tab.h
ibstagefright/codecs/amrwbenc/inc/main.h
ibstagefright/codecs/amrwbenc/inc/math_op.h
ibstagefright/codecs/amrwbenc/inc/mem_align.h
ibstagefright/codecs/amrwbenc/inc/mime_io.tab
ibstagefright/codecs/amrwbenc/inc/oper_32b.h
ibstagefright/codecs/amrwbenc/inc/p_med_o.h
ibstagefright/codecs/amrwbenc/inc/p_med_ol.tab
ibstagefright/codecs/amrwbenc/inc/q_gain2.tab
ibstagefright/codecs/amrwbenc/inc/q_pulse.h
ibstagefright/codecs/amrwbenc/inc/qisf_ns.tab
ibstagefright/codecs/amrwbenc/inc/qpisf_2s.tab
ibstagefright/codecs/amrwbenc/inc/stream.h
ibstagefright/codecs/amrwbenc/inc/typedef.h
ibstagefright/codecs/amrwbenc/inc/typedefs.h
ibstagefright/codecs/amrwbenc/inc/wb_vad.h
ibstagefright/codecs/amrwbenc/inc/wb_vad_c.h
ibstagefright/codecs/amrwbenc/patent_disclaimer.txt
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
ibstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
ibstagefright/codecs/amrwbenc/src/autocorr.c
ibstagefright/codecs/amrwbenc/src/az_isp.c
ibstagefright/codecs/amrwbenc/src/bits.c
ibstagefright/codecs/amrwbenc/src/c2t64fx.c
ibstagefright/codecs/amrwbenc/src/c4t64fx.c
ibstagefright/codecs/amrwbenc/src/cmnMemory.c
ibstagefright/codecs/amrwbenc/src/convolve.c
ibstagefright/codecs/amrwbenc/src/cor_h_x.c
ibstagefright/codecs/amrwbenc/src/decim54.c
ibstagefright/codecs/amrwbenc/src/deemph.c
ibstagefright/codecs/amrwbenc/src/dtx.c
ibstagefright/codecs/amrwbenc/src/g_pitch.c
ibstagefright/codecs/amrwbenc/src/gpclip.c
ibstagefright/codecs/amrwbenc/src/homing.c
ibstagefright/codecs/amrwbenc/src/hp400.c
ibstagefright/codecs/amrwbenc/src/hp50.c
ibstagefright/codecs/amrwbenc/src/hp6k.c
ibstagefright/codecs/amrwbenc/src/hp_wsp.c
ibstagefright/codecs/amrwbenc/src/int_lpc.c
ibstagefright/codecs/amrwbenc/src/isp_az.c
ibstagefright/codecs/amrwbenc/src/isp_isf.c
ibstagefright/codecs/amrwbenc/src/lag_wind.c
ibstagefright/codecs/amrwbenc/src/levinson.c
ibstagefright/codecs/amrwbenc/src/log2.c
ibstagefright/codecs/amrwbenc/src/lp_dec2.c
ibstagefright/codecs/amrwbenc/src/math_op.c
ibstagefright/codecs/amrwbenc/src/mem_align.c
ibstagefright/codecs/amrwbenc/src/oper_32b.c
ibstagefright/codecs/amrwbenc/src/p_med_ol.c
ibstagefright/codecs/amrwbenc/src/pit_shrp.c
ibstagefright/codecs/amrwbenc/src/pitch_f4.c
ibstagefright/codecs/amrwbenc/src/pred_lt4.c
ibstagefright/codecs/amrwbenc/src/preemph.c
ibstagefright/codecs/amrwbenc/src/q_gain2.c
ibstagefright/codecs/amrwbenc/src/q_pulse.c
ibstagefright/codecs/amrwbenc/src/qisf_ns.c
ibstagefright/codecs/amrwbenc/src/qpisf_2s.c
ibstagefright/codecs/amrwbenc/src/random.c
ibstagefright/codecs/amrwbenc/src/residu.c
ibstagefright/codecs/amrwbenc/src/scale.c
ibstagefright/codecs/amrwbenc/src/stream.c
ibstagefright/codecs/amrwbenc/src/syn_filt.c
ibstagefright/codecs/amrwbenc/src/updt_tar.c
ibstagefright/codecs/amrwbenc/src/util.c
ibstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
ibstagefright/codecs/amrwbenc/src/voicefac.c
ibstagefright/codecs/amrwbenc/src/wb_vad.c
ibstagefright/codecs/amrwbenc/src/weight_a.c
ibstagefright/codecs/common/Android.mk
ibstagefright/codecs/common/Config.mk
ibstagefright/codecs/common/cmnMemory.c
ibstagefright/codecs/common/include/cmnMemory.h
ibstagefright/codecs/common/include/voAAC.h
ibstagefright/codecs/common/include/voAMRWB.h
ibstagefright/codecs/common/include/voAudio.h
ibstagefright/codecs/common/include/voIndex.h
ibstagefright/codecs/common/include/voMem.h
ibstagefright/codecs/common/include/voType.h
ibstagefright/include/AACEncoder.h
ibstagefright/include/AMRNBEncoder.h
ibstagefright/include/AMRWBEncoder.h
d0782678df0b23b06c8687372b58994ed252a61a 14-May-2010 Mike Lockwood <lockwood@android.com> MTP: More prototyping work:

New media scanner test program
Media scanner now cleans up after files that no longer exist
Separate database table for audio files
Extract metadata from audio files with libstagefright

Change-Id: I2bd0fe877836c741658e72fcfeb89c11be0d9b41
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
tp/MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpMediaScanner.cpp
tp/MtpMediaScanner.h
tp/MtpServer.cpp
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/mtp.h
tp/scantest.cpp
38a9544825c6f3482237f9e29cddee58ebc093c3 17-May-2010 Eric Laurent <elaurent@google.com> am f62b6ff9: am eb8f850d: Fix issue 2553359: Pandora does not work well with Passion deskdock / Cardock.
f7fb5331e5635ee5b16ba77170229eb7e59ca5ea 17-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
9eff99e9d54aa8238a803f4410b5883e47334fd5 16-May-2010 Mike Lockwood <lockwood@android.com> Add -p option to mtptest program to run in PTP mode instead of MTP

Change-Id: Idbd1437756daab8d6141db49b07d4eb0814c9e7e
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/f_mtp.h
tp/mtptest.cpp
eb8f850d0b7e53956e917fd9645f808c1a09bc88 14-May-2010 Eric Laurent <elaurent@google.com> Fix issue 2553359: Pandora does not work well with Passion deskdock / Cardock.

The problem is due to a too big difference between the buffer size used at the hardware interface and at the A2DP interface.
When no resampling occurs we don't notice problems but the timing is very tight. As soon as resampling is activated, the AudioTrack underruns.
This is because the AudioTrack buffers are not resized when moving the AudioTrack from hardware to A2DP output.
The AudioTrack buffers are calculated based on a hardware output buffer size of 3072 bytes. Which is much less than the A2DP output buffer size (10240).

The solution consists in creating new tracks with new buffers in AudioFlinger when the A2DP output is opened
instead of just transfering active tracks from hardware output mixer thread to the new A2DP output mixer thread.
To avoid synchronization issues between mixer threads and client processes, this is done by invalidating tracks
by setting a flag in their control block and having AudioTrack release the handle on this track (IAudioTrack)
and create a new IAudioTrack when this flag is detected next time obtainBuffer() or start() is executed.

AudioFlinger modifications:
- invalidate the tracks when setStreamOutput() is called
- make sure that notifications of output opening/closing and change of stream type to output mapping are sent synchronously to client process.
This is necessary so that AudioSystem has the new stream to output mapping when the AudioTrack detects the invalidate flag in the client process.
Previously their were sent when the corresponding thread loop was executed.

AudioTrack modifications:
- move frame count calculation and verification from set() to createTrack() so that is is updated every time a new IAudioTrack is created.
- detect track invalidate flag in obtainBuffer() and start() and create a new IAudioTrack.

AudioTrackShared modifications
- group all flags (out, flowControlFlag, forceReady...) into a single bit filed to save space.

Change-Id: I9ac26b6192230627d35084e1449640caaf7d56ee
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
2c07e7b926db2c677b0a1fb9495d663c1aeb79ec 15-May-2010 Jeff Hamilton <jham@android.com> Merge "Modified libdrm to support SuperH platform"
14d8db969bb01e51b67c4c38ae2bb44baf25fe49 15-May-2010 Andreas Huber <andih@google.com> am bc30d1d8: am 5d75a181: am a5cd816c: am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
5d75a181884ad8dbcdf238af422e5c38467b4410 15-May-2010 Andreas Huber <andih@google.com> am a5cd816c: am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.

Merge commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453' into kraken

* commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
a5cd816c720ed87b91a33aa5d000a0d308c74453 15-May-2010 Andreas Huber <andih@google.com> am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.

Merge commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp

* commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
eb9128f9b0ee660504621381fd96f82d5bf8a3fd 15-May-2010 Andreas Huber <andih@google.com> Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.

Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511
related-to-bug: 2686604
QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http
ibstagefright/MPEG4Extractor.cpp
8196e00d867404aac7e48c001d3595ea751b24d4 14-May-2010 James Dong <jdong@google.com> am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken
d95266c6a8f059770b1799958530156a2f537468 14-May-2010 James Dong <jdong@google.com> Merge "Detect and handle premature termination of a recording session" into kraken
0fcfca195ff5830834966f01bb85658d11a07113 14-May-2010 Ray Chen <raychen@google.com> am f4ca2ad0: am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/sdcard\' in camera related codes." into kraken
f55e322216c816d7876ca98521497c58520ebf08 14-May-2010 Ray Chen <raychen@google.com> Merge "Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes." into kraken
68510e60f9671ee08f3cc18bd93400cafb7703bb 14-May-2010 James Dong <jdong@google.com> Detect and handle premature termination of a recording session

Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
f75e370e127b7c7bb6b6d5cebaa07abec36794b2 30-Apr-2010 Ray Chen <raychen@google.com> Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes.

Change-Id: I8a509d957a7b67ee1f59dc4ef5139c4e28adeb9c
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
7d4b6673486bb5a143029bff9103d8e7e465172c 14-May-2010 James Dong <jdong@google.com> am 612058d1: am 9db798d0: Audio/video initial recording time synchronization
d39c6a16764e4ab7069442d39e3d5cf73a60f7be 14-May-2010 James Dong <jdong@google.com> am 8b3611ee: am 1824486e: Handle recording file size and/or duration limit
9db798d0f07213071a65237e9ece758c9e8c7b99 13-May-2010 James Dong <jdong@google.com> Audio/video initial recording time synchronization

Change-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a
ibstagefright/MPEG4Writer.cpp
1824486e044f4f09640fbd7bef74a20e4efb35ae 11-May-2010 James Dong <jdong@google.com> Handle recording file size and/or duration limit

Change-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
41b5fc5c888b1e34379661736c991a331fbf9633 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am 63c93077: am 21a534d9: am 1d628c5d: merge from open-source master
21a534d955c8d45c50dafaf05cf2afbb8cf3696c 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am 1d628c5d: merge from open-source master

Merge commit '1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken

* commit '1d628c5d3dd7998b29c339292a2dc391015d0782':
Accept media files by file extension in case insensitive manner.
1d628c5d3dd7998b29c339292a2dc391015d0782 14-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
7a3784976159f6c3bb0d963717dde4273b6a372f 14-May-2010 Nick Kralevich <nnk@google.com> am b9381956: am ead68d5c: Merge "Remove libdrm2. This code appears to be unused." into kraken
ead68d5cd6126ad4a686e33342005db114ab18fe 14-May-2010 Nick Kralevich <nnk@google.com> Merge "Remove libdrm2. This code appears to be unused." into kraken
75e181b633ec94dde4a5a62d28040289ad645e74 14-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Accept media files by file extension in case insensitive manner."
8d3257a7dc10e1b3fda03e00f40d1b65d699ff23 14-May-2010 Mike Lockwood <lockwood@android.com> Move MTP code to the android namespace

Change-Id: I5da48038fd5e4cdeefaeba42cdc74eb588b3448d
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/MtpClient.cpp
tp/MtpClient.h
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpDebug.cpp
tp/MtpDebug.h
tp/MtpPacket.cpp
tp/MtpPacket.h
tp/MtpRequestPacket.cpp
tp/MtpRequestPacket.h
tp/MtpResponsePacket.cpp
tp/MtpResponsePacket.h
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/MtpStringBuffer.cpp
tp/MtpStringBuffer.h
tp/MtpUtils.cpp
tp/MtpUtils.h
tp/SqliteDatabase.cpp
tp/SqliteDatabase.h
tp/SqliteStatement.cpp
tp/SqliteStatement.h
tp/mtptest.cpp
tp/ptptest.cpp
76922d2ff8b7a1a31c8a77245564b975270314f1 14-May-2010 James Dong <jdong@google.com> am 79dfb675: am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken
18ff7b4c37d9cd230687269d8b65330d9b78db4a 13-May-2010 Mike Lockwood <lockwood@android.com> Exclude mtptest program from simulator builds.

Change-Id: Ia9751a06d7607363e8c16b71f6f3c524833395a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
56118b5b385adad0ff301f67be2cf601432d94ba 11-May-2010 Mike Lockwood <lockwood@android.com> Checkpoint work on MTP and PTP investigation.

This change includes work in progress on a C++ library for both host and device
MTP and PTP support.
Currently the makefile builds two test programs:

mtptest - a command line test program that implements a small subset of device side MTP.
Requires a kernel driver that has not been checked in yet.

ptptest - a host tool to test USB host support for detecting and communicating with
digital cameras over PTP. Runs on Linux host.

Later this will be reformulated as a native library that will be used in the media process.

Change-Id: I81aab279975b600b59d99013ab97f9adf0b58da7
Signed-off-by: Mike Lockwood <lockwood@android.com>
tp/Android.mk
tp/MtpClient.cpp
tp/MtpClient.h
tp/MtpDataPacket.cpp
tp/MtpDataPacket.h
tp/MtpDatabase.cpp
tp/MtpDatabase.h
tp/MtpDebug.cpp
tp/MtpDebug.h
tp/MtpPacket.cpp
tp/MtpPacket.h
tp/MtpRequestPacket.cpp
tp/MtpRequestPacket.h
tp/MtpResponsePacket.cpp
tp/MtpResponsePacket.h
tp/MtpServer.cpp
tp/MtpServer.h
tp/MtpStorage.cpp
tp/MtpStorage.h
tp/MtpStringBuffer.cpp
tp/MtpStringBuffer.h
tp/MtpUtils.cpp
tp/MtpUtils.h
tp/SqliteDatabase.cpp
tp/SqliteDatabase.h
tp/SqliteStatement.cpp
tp/SqliteStatement.h
tp/f_mtp.h
tp/mtp.h
tp/mtptest.cpp
tp/ptptest.cpp
ef8a3ed1b8dfcba1cd77c4c105aabfa4f5b2e467 13-May-2010 Nick Kralevich <nnk@google.com> Remove libdrm2. This code appears to be unused.

This code generates warnings when compiled with -Wformat-security,
and since it isn't being used, I figured it's better
to just delete it. As always, this code can be restored
by reverting this change.

Change-Id: I1da2049f41312b6eae5fa42892beb4a2036eb12f
ibdrm/mobile2/Android.mk
ibdrm/mobile2/include/Drm2CommonTypes.h
ibdrm/mobile2/include/dcf/DrmDcfCommon.h
ibdrm/mobile2/include/dcf/DrmDcfContainer.h
ibdrm/mobile2/include/dcf/DrmIStream.h
ibdrm/mobile2/include/dcf/DrmRawContent.h
ibdrm/mobile2/include/drmmanager/DrmManager.h
ibdrm/mobile2/include/rights/Asset.h
ibdrm/mobile2/include/rights/Constraint.h
ibdrm/mobile2/include/rights/OperationPermission.h
ibdrm/mobile2/include/rights/Right.h
ibdrm/mobile2/include/rights/Ro.h
ibdrm/mobile2/include/rights/RoManager.h
ibdrm/mobile2/include/roap/Registration.h
ibdrm/mobile2/include/roap/RoapMessageHandler.h
ibdrm/mobile2/include/util/crypto/DrmCrypto.h
ibdrm/mobile2/include/util/domcore/CharacterDataImpl.h
ibdrm/mobile2/include/util/domcore/DOMException.h
ibdrm/mobile2/include/util/domcore/DOMString.h
ibdrm/mobile2/include/util/domcore/DocumentImpl.h
ibdrm/mobile2/include/util/domcore/ElementImpl.h
ibdrm/mobile2/include/util/domcore/NodeImpl.h
ibdrm/mobile2/include/util/domcore/NodeIterator.h
ibdrm/mobile2/include/util/domcore/NodeListImpl.h
ibdrm/mobile2/include/util/domcore/NodeType.h
ibdrm/mobile2/include/util/domcore/TextImpl.h
ibdrm/mobile2/include/util/domcore/Vector.h
ibdrm/mobile2/include/util/domcore/stack.h
ibdrm/mobile2/include/util/xml/DomExpatAgent.h
ibdrm/mobile2/include/util/xml/ExpatWrapper.h
ibdrm/mobile2/include/util/xml/XMLDocumentImpl.h
ibdrm/mobile2/include/util/xml/XMLElementImpl.h
ibdrm/mobile2/src/dcf/DrmDcfCommon.cpp
ibdrm/mobile2/src/dcf/DrmDcfContainer.cpp
ibdrm/mobile2/src/dcf/DrmIStream.cpp
ibdrm/mobile2/src/dcf/DrmRawContent.cpp
ibdrm/mobile2/src/drmmanager/DrmManager.cpp
ibdrm/mobile2/src/rights/Asset.cpp
ibdrm/mobile2/src/rights/Constraint.cpp
ibdrm/mobile2/src/rights/OperationPermission.cpp
ibdrm/mobile2/src/rights/Right.cpp
ibdrm/mobile2/src/rights/Ro.cpp
ibdrm/mobile2/src/rights/RoManager.cpp
ibdrm/mobile2/src/roap/Registration.cpp
ibdrm/mobile2/src/roap/RoapMessageHandler.cpp
ibdrm/mobile2/src/util/crypto/DrmCrypto.cpp
ibdrm/mobile2/src/util/domcore/CharacterDataImpl.cpp
ibdrm/mobile2/src/util/domcore/DOMException.cpp
ibdrm/mobile2/src/util/domcore/DocumentImpl.cpp
ibdrm/mobile2/src/util/domcore/ElementImpl.cpp
ibdrm/mobile2/src/util/domcore/NodeImpl.cpp
ibdrm/mobile2/src/util/domcore/NodeIterator.cpp
ibdrm/mobile2/src/util/domcore/NodeListImpl.cpp
ibdrm/mobile2/src/util/domcore/TextImpl.cpp
ibdrm/mobile2/src/util/ustl-1.0/bktrace.cpp
ibdrm/mobile2/src/util/ustl-1.0/bktrace.h
ibdrm/mobile2/src/util/ustl-1.0/bsconf.h
ibdrm/mobile2/src/util/ustl-1.0/cmemlink.cpp
ibdrm/mobile2/src/util/ustl-1.0/cmemlink.h
ibdrm/mobile2/src/util/ustl-1.0/config.h
ibdrm/mobile2/src/util/ustl-1.0/fstream.cpp
ibdrm/mobile2/src/util/ustl-1.0/fstream.h
ibdrm/mobile2/src/util/ustl-1.0/memblock.cpp
ibdrm/mobile2/src/util/ustl-1.0/memblock.h
ibdrm/mobile2/src/util/ustl-1.0/memlink.cpp
ibdrm/mobile2/src/util/ustl-1.0/memlink.h
ibdrm/mobile2/src/util/ustl-1.0/mistream.cpp
ibdrm/mobile2/src/util/ustl-1.0/mistream.h
ibdrm/mobile2/src/util/ustl-1.0/mostream.h
ibdrm/mobile2/src/util/ustl-1.0/ofstream.cpp
ibdrm/mobile2/src/util/ustl-1.0/ofstream.h
ibdrm/mobile2/src/util/ustl-1.0/simd.h
ibdrm/mobile2/src/util/ustl-1.0/sistream.cpp
ibdrm/mobile2/src/util/ustl-1.0/sistream.h
ibdrm/mobile2/src/util/ustl-1.0/sostream.cpp
ibdrm/mobile2/src/util/ustl-1.0/sostream.h
ibdrm/mobile2/src/util/ustl-1.0/strmsize.h
ibdrm/mobile2/src/util/ustl-1.0/ualgo.h
ibdrm/mobile2/src/util/ustl-1.0/ualgobase.cpp
ibdrm/mobile2/src/util/ustl-1.0/ualgobase.h
ibdrm/mobile2/src/util/ustl-1.0/uassert.h
ibdrm/mobile2/src/util/ustl-1.0/ubitset.cpp
ibdrm/mobile2/src/util/ustl-1.0/ubitset.h
ibdrm/mobile2/src/util/ustl-1.0/uctralgo.h
ibdrm/mobile2/src/util/ustl-1.0/uctrstrm.h
ibdrm/mobile2/src/util/ustl-1.0/uexception.cpp
ibdrm/mobile2/src/util/ustl-1.0/uexception.h
ibdrm/mobile2/src/util/ustl-1.0/ufunction.h
ibdrm/mobile2/src/util/ustl-1.0/uheap.h
ibdrm/mobile2/src/util/ustl-1.0/uios.h
ibdrm/mobile2/src/util/ustl-1.0/uiosfunc.h
ibdrm/mobile2/src/util/ustl-1.0/uiterator.h
ibdrm/mobile2/src/util/ustl-1.0/ulaalgo.h
ibdrm/mobile2/src/util/ustl-1.0/ulimits.h
ibdrm/mobile2/src/util/ustl-1.0/ulist.h
ibdrm/mobile2/src/util/ustl-1.0/umap.h
ibdrm/mobile2/src/util/ustl-1.0/umatrix.h
ibdrm/mobile2/src/util/ustl-1.0/umemory.h
ibdrm/mobile2/src/util/ustl-1.0/umultimap.h
ibdrm/mobile2/src/util/ustl-1.0/umultiset.h
ibdrm/mobile2/src/util/ustl-1.0/unew.cpp
ibdrm/mobile2/src/util/ustl-1.0/unew.h
ibdrm/mobile2/src/util/ustl-1.0/unumeric.h
ibdrm/mobile2/src/util/ustl-1.0/upair.h
ibdrm/mobile2/src/util/ustl-1.0/upredalgo.h
ibdrm/mobile2/src/util/ustl-1.0/uqueue.h
ibdrm/mobile2/src/util/ustl-1.0/uset.h
ibdrm/mobile2/src/util/ustl-1.0/uspecial.h
ibdrm/mobile2/src/util/ustl-1.0/ustack.h
ibdrm/mobile2/src/util/ustl-1.0/ustdxept.cpp
ibdrm/mobile2/src/util/ustl-1.0/ustdxept.h
ibdrm/mobile2/src/util/ustl-1.0/ustl.tbff
ibdrm/mobile2/src/util/ustl-1.0/ustring.cpp
ibdrm/mobile2/src/util/ustl-1.0/ustring.h
ibdrm/mobile2/src/util/ustl-1.0/utf8.h
ibdrm/mobile2/src/util/ustl-1.0/utuple.h
ibdrm/mobile2/src/util/ustl-1.0/utypes.h
ibdrm/mobile2/src/util/ustl-1.0/uutility.h
ibdrm/mobile2/src/util/ustl-1.0/uvector.h
ibdrm/mobile2/src/util/xml/DomExpatAgent.cpp
ibdrm/mobile2/src/util/xml/ExpatWrapper.cpp
ibdrm/mobile2/src/util/xml/XMLDocumentImpl.cpp
ibdrm/mobile2/src/util/xml/XMLElementImpl.cpp
e292b3bc9c28e47bb8411728ad40efb84d0471e8 13-May-2010 James Dong <jdong@google.com> Remove dummy surface in CameraSource

bug - 2680919

Change-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/CameraSource.cpp
05a5205b935f6a3fc1a1379a3c4d1bb54a81cf81 13-May-2010 Andreas Huber <andih@google.com> am 9df829bf: am fae47fd0: am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
fae47fd008974fb78f38ae4a6d539cd8246d3159 13-May-2010 Andreas Huber <andih@google.com> am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.

Merge commit '28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken

* commit '28fadef2ede2d74e9526266e779553bbd1dc66f4':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
28fadef2ede2d74e9526266e779553bbd1dc66f4 13-May-2010 Andreas Huber <andih@google.com> am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.

Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp

* commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
3c78a1b58957e31d2991fb6a609abecbb1987b3b 13-May-2010 Andreas Huber <andih@google.com> Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.

Change-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a
related-to-bug: 2682221
QA-impact: none
ibstagefright/AwesomePlayer.cpp
ibstagefright/codecs/aacdec/AACDecoder.cpp
8aa3d7d8a123baa7a1ee5df71f32fd0af774d859 13-May-2010 Mathias Agopian <mathias@google.com> am fb6bd833: am 7406eafe: should fix the build
7406eafe7f9774e095383d4ea14f776808da562e 13-May-2010 Mathias Agopian <mathias@google.com> should fix the build

Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
ibstagefright/CameraSource.cpp
c5c16f5f60f5091c29edb7d83a8fbc3e53b1ee7d 12-May-2010 Xavier Ducrohet <xav@android.com> am 6914e17a: am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
725d2c7e6dd83c89d0ca11816a99a991bad2bc59 12-May-2010 Marco Nelissen <marcone@google.com> am 11291901: am 550884e2: am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
d974b80fe10235a4d8f8efe689d1569da944db77 12-May-2010 Andreas Huber <andih@google.com> am 1d0e5599: am 11777d6f: am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
e21aa3b154204e9b0945dc14ad32f3361680d185 12-May-2010 Andreas Huber <andih@google.com> am 286a6355: am b076e6f3: am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
1e438357f0db23d590501af3a3e3006684541c75 12-May-2010 Jean-Michel Trivi <jmtrivi@google.com> am 4f9c9aa8: am fd5a747f: am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
9f7c4112acb06f7a2ec817c682202d469a13d547 12-May-2010 Jean-Michel Trivi <jmtrivi@google.com> am 11e26c28: am 9f35d39a: am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play not
08eff49f09c4f4a725979166e61085f8bb30fb1f 12-May-2010 Xavier Ducrohet <xav@android.com> am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo

Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken

* commit 'd9712b69ce529fbf50b3b837032c1dc40e623381':
Hide two audio focus methods.
550884e2f3b551cd05ff669cab08348e053ee29b 12-May-2010 Marco Nelissen <marcone@google.com> am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo

Merge commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken

* commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b':
Don't clear the _data column in the audio_meta table, since it isn't
11777d6fa27b368eee75c46aeb0da2c609943c9d 12-May-2010 Andreas Huber <andih@google.com> am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken

* commit 'b003ad17bffeba7875b9708ffeef2300ef28c916':
Support for customizable socket-read timeouts through the HTTP response.
b076e6f3e03d146cc7e76e423077a2dfe901c898 12-May-2010 Andreas Huber <andih@google.com> am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo

Merge commit '227e443a43d70b9463b2e685688f73cfb1b72096' into kraken

* commit '227e443a43d70b9463b2e685688f73cfb1b72096':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
fd5a747fc8bb12d16224e7d961813bb2d795239f 12-May-2010 Jean-Michel Trivi <jmtrivi@google.com> am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo

Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken

* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
Update javadoc in android.media.AudioManager to not hide the
9f35d39a05bbf02ded519c1a4b3bf50f933a0cad 12-May-2010 Jean-Michel Trivi <jmtrivi@google.com> am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the comp

Merge commit 'ea37d9b489aac1a4a8de71887581fe712e26e144' into kraken

* commit 'ea37d9b489aac1a4a8de71887581fe712e26e144':
Fix bug 2670395 and 2599698
d9712b69ce529fbf50b3b837032c1dc40e623381 12-May-2010 Xavier Ducrohet <xav@android.com> am b1235a57: Merge "Hide two audio focus methods." into froyo

Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp

* commit 'b1235a57a09174179553acecef2370354bdcbf41':
Hide two audio focus methods.
bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b 12-May-2010 Marco Nelissen <marcone@google.com> am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo

Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp

* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
Don't clear the _data column in the audio_meta table, since it isn't
b003ad17bffeba7875b9708ffeef2300ef28c916 12-May-2010 Andreas Huber <andih@google.com> am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp

* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
Support for customizable socket-read timeouts through the HTTP response.
227e443a43d70b9463b2e685688f73cfb1b72096 12-May-2010 Andreas Huber <andih@google.com> am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo

Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp

* commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
0c73adb1dead4097b9c7dc04b8a547aaab817e85 12-May-2010 Jean-Michel Trivi <jmtrivi@google.com> am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo

Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp

* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
Update javadoc in android.media.AudioManager to not hide the
ea37d9b489aac1a4a8de71887581fe712e26e144 12-May-2010 Jean-Michel Trivi <jmtrivi@google.com> am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen

Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
Fix bug 2670395 and 2599698
b1235a57a09174179553acecef2370354bdcbf41 11-May-2010 Xavier Ducrohet <xav@android.com> Merge "Hide two audio focus methods." into froyo
5f53f0883a507b9d4b9b9891af560a64f746d149 11-May-2010 Xavier Ducrohet <xav@android.com> Hide two audio focus methods.

Change-Id: I53ddf736892cde8edfaffa7d69dd9c234df52efa
ava/android/media/AudioManager.java
f4589e97c478d299663ad39bf3542ea80d3e6bdf 11-May-2010 James Dong <jdong@google.com> am 144bb4fa: am 2cd841d4: Added initial validation on video/audio encoding parameters before/at start()
723b72c2e9dffa9bfd4d9d561d7f2da42202ccdc 11-May-2010 James Dong <jdong@google.com> am 6d111efe: am b5e74239: Output streamable MP4 file during MP4 file recording
2cd841d485968181eb362338b9e66067767bd2eb 11-May-2010 James Dong <jdong@google.com> Added initial validation on video/audio encoding parameters before/at start()

Change-Id: I1a40dd247202f70e3e5429d74533d349b88f1d54
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
33f49c8377ea9ffebaca9c398fb3c0f9585f9fe8 11-May-2010 Marco Nelissen <marcone@google.com> Don't clear the _data column in the audio_meta table, since it isn't
needed, and causes a sqlite constraint exception.
Bug 2671792.

Change-Id: Ie6e5d0369c3750739fa155e651be4d87c016a41f
ava/android/media/MediaScanner.java
e0dc80f878b56ed744bd06d341716fcfff4e3acc 11-May-2010 Andreas Huber <andih@google.com> Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
d6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e 11-May-2010 Andreas Huber <andih@google.com> Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
46b3a1808a8e6fc60079af3c2292fd784a7bb0fc 11-May-2010 Jean-Michel Trivi <jmtrivi@google.com> Update javadoc in android.media.AudioManager to not hide the
registerAudioFocusListener() methods.

Change-Id: I8df37bd89df6f492aeb70fa636200552140578f9
ava/android/media/AudioManager.java
e67c1607ccab2702ea745f962b5354be8f45c733 11-May-2010 Andreas Huber <andih@google.com> Support for customizable socket-read timeouts through the HTTP response.

Specify a response header of "X-SocketTimeout: 15" to override the default timeout
of 5 secs with a timeout of 15 seconds. Specify a negative value to disable the
timeout altogether.

Change-Id: I545adf3d8b3f7efe5f8d081a641c6404440a77db
related-to-bug: 2675721
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
ibstagefright/include/HTTPStream.h
b5e742397d4129e191d65d51da55302b504f3c99 07-May-2010 James Dong <jdong@google.com> Output streamable MP4 file during MP4 file recording

When the reserved moov box space is not big enough,
fall back to non-streamable MP4 file.

Change-Id: I93382d037d657a3f3fe2af31e4ea26e1898b4d95
ibstagefright/MPEG4Writer.cpp
34c70709a69fbf29dbde2c106d9db5f522f25268 11-May-2010 Andreas Huber <andih@google.com> Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)

Change-Id: I3c76d35da48e0964f7a0fa2816f8573b5e1a9436
related-to-bug: 2674036
QA-impact: low, only affects ogg-vorbis playback through http
ibstagefright/OggExtractor.cpp
ibstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
392a2bbb52688ebd25768a7784d9edca7f498110 11-May-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2670395 and 2599698
When the user selects a "Silent" notification sound, the Uri encoded
path is an empty string. Setting this Uri as the data source of the
MediaPlayer used to play notifications caused the completion listener
to not be called, which with the AudioFocus logic causes the Music
app to pause and never resume. The NotificationPlayer modifications
cause the MediaPlayer for the notification to only request audio
focus when the data source is not empty.
The audio focus code in AudioService is defensively synchronized
against a unique lock, and the exception observed in bug 2670395
is explicitely caught in case another edge case wasn't caught by
this fix.
The AudioFocus handling in AudioManager is modified so only the
requestAudioFocus and abandonAudioFocus methods are meant to be
used, as registerAudioFocusListener and unregisterAudioFocusListener
provided no additional functionality over the request/abandon
methods. abandonAudioFocus() also removes the listener from the
map in AudioManager since after abandonning focus, the listener
would no longer be called.

Change-Id: I3b553ee8a8163c25e01117d7e5479dd5fdfa7c6b
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
76017b809f1b57fea229c94c8345c58f7d3b39e4 10-May-2010 James Dong <jdong@google.com> am 98bb3eeb: am 4000e06e: Merge "Metadata construction optimization" into kraken
4000e06ef69bb1523532b73c469c52b8b8d317ce 10-May-2010 James Dong <jdong@google.com> Merge "Metadata construction optimization" into kraken
6aa19bb7d28395dede5943d6f67fea614c5b407d 10-May-2010 Andreas Huber <andih@google.com> am 23796f1e: am 248597ae: am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
248597ae6493ff68fc52db26b095de620a26924a 10-May-2010 Andreas Huber <andih@google.com> am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo

Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken

* commit '1707851090e6512a77247b0c260dd673ef687589':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
1707851090e6512a77247b0c260dd673ef687589 10-May-2010 Andreas Huber <andih@google.com> am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo

Merge commit 'd13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp

* commit 'd13efb20089e44e6958cb9704864c03821f19e1c':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
fdaa7790e8a81b165333e3cd7ecc7c238f53f6fa 10-May-2010 Chih-Chung Chang <chihchung@google.com> am c2ed1817: am e25cc656: Support multiple cameras in framework.
e25cc656392d8866e163f78b60c7791455d0fb44 06-May-2010 Chih-Chung Chang <chihchung@google.com> Support multiple cameras in framework.

Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
ibstagefright/CameraSource.cpp
388379f8b4cabe7bccf280d450a6db2c3149796b 07-May-2010 Andreas Huber <andih@google.com> A new OggExtractor/VorbisDecoder combo to support approximate seeking.

Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95
related-to-bug: 2654400
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OggExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/Utils.cpp
ibstagefright/VorbisExtractor.cpp
ibstagefright/codecs/vorbis/Android.mk
ibstagefright/codecs/vorbis/dec/Android.mk
ibstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
ibstagefright/include/OggExtractor.h
ibstagefright/include/VorbisDecoder.h
ibstagefright/include/VorbisExtractor.h
2a4767e2fa1c9d04ffee851e30768ce603d025ad 20-Apr-2010 James Dong <jdong@google.com> Metadata construction optimization

- Potentially much shorter stts box if samples have roughly the same duration
- Potentially much shorter stsz box if all samples have the same size

Change-Id: I4f7663dd64285070995585a02bb3ba1e1049a0cf
ibstagefright/MPEG4Writer.cpp
973573d01a110d90c21d8b75e441a88589425bca 06-May-2010 Andreas Huber <andih@google.com> am 54928ce4: am 8a1c0934: am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
8a1c0934b0622be6f7c451aa8773567e797ab397 06-May-2010 Andreas Huber <andih@google.com> am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo

Merge commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken

* commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
Disable vorbis seek when streaming from localhost.
71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c 06-May-2010 Andreas Huber <andih@google.com> am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo

Merge commit '100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp

* commit '100ef9bee48c9beb83d885d233de6a42c64f55af':
Disable vorbis seek when streaming from localhost.
100ef9bee48c9beb83d885d233de6a42c64f55af 06-May-2010 Andreas Huber <andih@google.com> Merge "Disable vorbis seek when streaming from localhost." into froyo
62f7ffe106a7126ef31b199552c5cfc6599bc3d1 06-May-2010 Andreas Huber <andih@google.com> Disable vorbis seek when streaming from localhost.

Change-Id: Icda523ae1c89e26482f1c1767fe3a8b9222bb30f
related-to-bug: 2654400
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibstagefright/AwesomePlayer.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/VorbisExtractor.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/VorbisExtractor.h
9af0ac627fc15ed7693c9f38eb8af035af76d621 06-May-2010 Dan Bornstein <danfuzz@android.com> am 8391a3f4: am ebd2890b: am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.
ebd2890b71ea95dd67f6d550adb07e62df800f94 06-May-2010 Dan Bornstein <danfuzz@android.com> am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.

Merge commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8' into kraken

* commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8':
For issue #2651381, allow library prelinking.
2a1674b1d00fda68980ec834d6ce61aacd379bc8 06-May-2010 Dan Bornstein <danfuzz@android.com> am 2d315667: For issue #2651381, allow library prelinking.

Merge commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp

* commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2':
For issue #2651381, allow library prelinking.
2d315667ab733375d8c696f8c2f155bc1de9e4a2 05-May-2010 Dan Bornstein <danfuzz@android.com> For issue #2651381, allow library prelinking.

Change-Id: I119348b55ad0015a286e9c94709977cd1973a7e1
ibstagefright/Android.mk
ibstagefright/codecs/amrnb/common/Android.mk
ibstagefright/codecs/avc/common/Android.mk
ibstagefright/colorconversion/Android.mk
ibstagefright/omx/Android.mk
c6055132cfe3197b10ff0e66d5b5d1a88de64d39 05-May-2010 James Dong <jdong@google.com> am 2518cd95: am 0835f067: Merge "Support audio and video track interleaving in the recorded mp4 file" into kraken
3300e9667e3daa374659b4a8b97dd92c4d34e501 22-Apr-2010 James Dong <jdong@google.com> Support audio and video track interleaving in the recorded mp4 file

Change-Id: Ifa27eb23ee265f84fe06773b29b0eb2b0b075b60
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
9222ba4dc78200a66f9971bc48cbb9f82f3e1444 05-May-2010 James Dong <jdong@google.com> am b8a8f850: am 8d30b2d2: Merge "Support AAC recording" into kraken
2d0cf42db2018b086c2d4d05e945365e83b5f7a5 05-May-2010 Andreas Huber <andih@google.com> am d818d52f: am ce0bd717: am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
8d30b2d284fee002242dd412ddda39ce91845faf 04-May-2010 James Dong <jdong@google.com> Merge "Support AAC recording" into kraken
ce0bd71735532f53014cc299f684302f357c471a 04-May-2010 Andreas Huber <andih@google.com> am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo

Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken

* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
Support for Ogg Vorbis decoding in stagefright.
8ea45aad100ee25067b2e83703454c71a968ba4f 04-May-2010 Andreas Huber <andih@google.com> am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo

Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp

* commit 'e083d0a2f50906423ab548047d436c74648fc488':
Support for Ogg Vorbis decoding in stagefright.
eb5eef38198b38d97b573be550657ba64ccba299 04-May-2010 Andreas Huber <andih@google.com> Support for Ogg Vorbis decoding in stagefright.

Set the magic property media.stagefright.enable-vorbis to true to use the new implementation instead of the standalon vorbis player for file-based playback. HTTP streaming of vorbis content will always go through stagefright.

Change-Id: Ie3843a99fadb22372f89540d0f8d65196e0c2af8
related-to-bug: 2654400
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/VorbisExtractor.cpp
ibstagefright/include/VorbisExtractor.h
abed93a51b6b476ecb23a2c22faa43a219eb60a7 23-Apr-2010 James Dong <jdong@google.com> Support AAC recording

- Extend the audio recording to AAC format
- Add support for setting some recording parameters
- Add stss box to the meta data in the recorded file

Change-Id: I41167bfd9d70ef9cd33906f8437b39c232b6d3b7
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/AudioSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
509f1c0d6fc0287319945b64ddb8d447187bdd29 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 32de26bb: am c8652199: merge from open-source master
32de26bbe7a8b50e129c23cef0fc226537c74e72 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am c8652199: merge from open-source master

Merge commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d' into kraken

* commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d':
speling fix
c8652199d14dc42edf882a8eb9e48a5fe0b6101d 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
dcc05ca9710bd51209a79b18b8b87c412876f06c 28-Apr-2010 James Dong <jdong@google.com> am b30bf6ef: Merge "Use timestamp from camera driver for CameraSource" into kraken
c6f8ea4cf26aadc0da765585d37f7850596af6de 28-Apr-2010 hugh kennedy <kennedyh@umich.edu> speling fix

Change-Id: Ia9db6e1c5d1cd31fd028d551cc357a76049ce137
ava/android/media/MediaPlayer.java
b00e246669a1da84b1dd7e3f014eedc21747562f 27-Apr-2010 James Dong <jdong@google.com> Use timestamp from camera driver for CameraSource

Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
ibmediaplayerservice/Android.mk
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSource.cpp
ibstagefright/OMXCodec.cpp
b0d9d0bffd463b7945e116ac317cb2ce8f3d557e 26-Apr-2010 James Dong <jdong@google.com> am 40eb3f7b: am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.
40eb3f7b1bcb1c44df8aad75e1cba1a74884bbc8 26-Apr-2010 James Dong <jdong@google.com> am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.

Merge commit '31431b34f895862ae13efba30bb5771085572687' into kraken

* commit '31431b34f895862ae13efba30bb5771085572687':
Switch to use software MP3 decoder
374aee6888edddc5bcac9a644ad3de812404d3bc 26-Apr-2010 James Dong <jdong@google.com> Switch to use software MP3 decoder
Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.

bug - 2608400

Change-Id: Ia0b5b6521015fc8d3e086117fa914dcc20ace5bd
ibstagefright/OMXCodec.cpp
5b7e2488e01c7b4fa7da76dc71b4095568875212 24-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am 460587e9: am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
460587e9e654ee4d6055dcc208e6923a1fb47e7c 23-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo

Merge commit 'f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken

* commit 'f6adae7866e893afa05b5838bdd244648a66ac3f':
Fix bug 2619062 Music is routed to Phone speaker, though it is
a847ba4080675d395de725cfac5dfd9d5a993d4e 23-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2619062 Music is routed to Phone speaker, though it is
connected to A2DP media profile

When the phone is docked and using the dock A2DP, and the user
connects another A2DP device, make the dock unavailable immediately
before connecting the new A2DP device.

Change-Id: I82d53836fb509ee4ea7cdb68f467dfb946c634f8
ava/android/media/AudioService.java
0408f3d4d09a958e753f075dc2a03e9453220dbc 21-Apr-2010 Andreas Huber <andih@google.com> am f5e20801: am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
f5e208018b07bf16419a9763771942604d5b9b28 21-Apr-2010 Andreas Huber <andih@google.com> am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo

Merge commit '89e28cbefaff6ae9499032bb446ae7e72e019466' into kraken

* commit '89e28cbefaff6ae9499032bb446ae7e72e019466':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
9e609b0dfa155fbe8ba3b5abd4faa188e2270dde 21-Apr-2010 Andreas Huber <andih@google.com> Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
399eb1f00eb1f79c5b7be3d88fed43affbb4c5d7 21-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am 219dbb67: am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack
219dbb67a6cd4a64abd6e9ec2f376eb982a032d3 21-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clie

Merge commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab' into kraken

* commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab':
Update AudioService to reflect phone state changes with AudioFocus.
63fbd5ab8fee9db73077d10c9b5ac61625588624 21-Apr-2010 Andreas Huber <andih@google.com> Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.

Change-Id: Ic2d4a8f5b6bbf16772fba39377809ec68d249c1f
related-to-bug: 2611257
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
b4bccb6d8df16a2c5235cead187156bc721cf074 20-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> Update AudioService to reflect phone state changes with AudioFocus.
Phone calls and rings are treated as a new client, with a dedicated
client ID that identifies it in the audio focus stack. When it is
present in the stack, others clients cannot request audio focus
(request is denied).
Because the phone state is now mostly handled like a new client,
there is no need monitor mode changes and to keep track of
undispatched focus changes, as those will delayed focus gains
will now automatically happen at the end of the call when the
phone client is removed from the focus stack.

Change-Id: I11ff73b015ab93f07040755fd8ee75c8d675e025
ava/android/media/AudioService.java
1a0a7160e0cc88f5cb2aeb197d4ed43d0804007f 21-Apr-2010 Andreas Huber <andih@google.com> am c9553f2e: am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into fro
c9553f2ed0ae15bd75e16fff513b922bb1d307a8 20-Apr-2010 Andreas Huber <andih@google.com> am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo

Merge commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken

* commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
25dc5f30b2a8276c5790c7152a801fcd905c7281 20-Apr-2010 Andreas Huber <andih@google.com> Merge "Don't coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
2dd8ff8c4f068f9a5f31510d502abea5dbed9819 20-Apr-2010 Andreas Huber <andih@google.com> Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place.

In certain edge cases (encoded audio track contains silence), each buffer would turn out to be an amazing 6(!!!) bytes, we'd spend lots and lots of time streaming network data to fill the codec's buffers of size 6144 bytes with .. silence.

Change-Id: I9f449f310fc64ca384bd02e4a783e33cf5b46fcc
related-to-bug: 2609049
QA-Impact: streamed (http) playback of aac audio content on Droid.
ibstagefright/OMXCodec.cpp
03e4b571ea4b92da67b0e88e4f342410524df8bd 20-Apr-2010 Marco Nelissen <marcone@google.com> am fe13eebe: am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-I
fe13eebee964cd9e91270403e3910c08d898ad31 20-Apr-2010 Marco Nelissen <marcone@google.com> am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d

Merge commit '9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken

* commit '9d14e3ea22f48173070789951ee6dc64b507e13f':
When updating existing entries in the media database, don't update
9b8b417cd1ddfb81c1b0314f033a1439fd627aa2 20-Apr-2010 Marco Nelissen <marcone@google.com> Merge "When updating existing entries in the media database, don't update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2" into froyo
7dc9bcea533f396bcd3b96cb028893f50e728fe0 20-Apr-2010 Eric Laurent <elaurent@google.com> am 5b550c9e: am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.
5b550c9efc2cc10e376ae20c1947a7ce769e9660 20-Apr-2010 Eric Laurent <elaurent@google.com> am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.

Merge commit '11bae14009d91c063780b2cafee2fc4fb660c08c' into kraken

* commit '11bae14009d91c063780b2cafee2fc4fb660c08c':
Fix issue 2602879: camera shutter sound not playing.
1a8597cb519cb96a1738ec54f569b16aeb31a6ed 20-Apr-2010 Eric Laurent <elaurent@google.com> am e33e9db6: am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
c066557378c2305625a7bad3d25f084ad647ef27 20-Apr-2010 Marco Nelissen <marcone@google.com> When updating existing entries in the media database, don't update
the is_music, is_ringtone, etc columns. This ensures that custom
ringtones will still be shown in the ringtone picker after a rescan.
Bug 2594125
Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2
ava/android/media/MediaScanner.java
3891c4cc918e8062abb97c542a8625d556dccc59 20-Apr-2010 Eric Laurent <elaurent@google.com> Fix issue 2602879: camera shutter sound not playing.

The problem occurs if the device is powered down in silent mode. When the device restarts,
AudioService reads current ringer mode from saved settings but does not call setRingerModeInt()
to perform actions required when ringer mode changes.
The volumes of streams affected by ringer mode are actually at 0 because they are also read from settings
but their mute state is not applied correclty. When we later exit from silent mode, the streams
other than STREAM_RING that are affected by ringer mode are not restored as they are not considered
muted. This applies to STREAM_SYSTEM but also to STREAM_NOTIFICATION if its volume is controlled independently
from STREAM_RING.

The fix consists in calling setRingerModeInt() when AudioService starts.

Change-Id: Ica75b9874938dda1bc1b634c3e97db4a650d295c
ava/android/media/AudioService.java
e33e9db6b075adba78dba072550d8d04c81473f8 20-Apr-2010 Eric Laurent <elaurent@google.com> am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.

Merge commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd' into kraken

* commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd':
Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
3b5912602bec6ccbe8eef8a576730b1565f0067c 20-Apr-2010 Eric Laurent <elaurent@google.com> Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.

There was a regression introduced by change 4c637b9e34f4c8db69a64ad21a4e2bcfa7485b5f
fixing issue 2578813. As the A2DP device disconnection is notified to the audio policy manager
after a delay, there is a period during which the A2DP device is actually not connected but the
A2DP output is considered present by audio framework. If a playback is started during this period,
The A2DP output requests the activation of the A2DP sink which in turn triggers a reconnection
of the A2DP sink.

The fix consists in suspending the A2DP output immediately when receiving the A2DP disconnection
intent so that any activity on A2DP output is ignored until the output is actually closed by the
audio policy manager.

Change-Id: I16eaace45e12bfc970f50836b46a73b756b493f0
ava/android/media/AudioService.java
36b763e95290b231f614ab2fd0cab5eaecf16daa 15-Apr-2010 Eric Laurent <elaurent@google.com> am 5c14f2d0: am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
491f250583e5a96fb50046bded15f53b012849cc 15-Apr-2010 Eric Laurent <elaurent@google.com> am 5db9adfd: am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
e3fcad3432fc8b18e2b1c4e9f880bff6a8baab7b 15-Apr-2010 James Dong <jdong@google.com> am fff02afa: am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
c716307594d932dd7f54699aea098a0f14a5b10f 15-Apr-2010 Jean-Baptiste Queru <jbq@google.com> am 31a17033: fix unintentional drift
5c14f2d08fb01be02b4952904c0f07464882653d 14-Apr-2010 Eric Laurent <elaurent@google.com> am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.

Merge commit 'def7db5b79e5c178834375020ef6b590e80af42f' into kraken

* commit 'def7db5b79e5c178834375020ef6b590e80af42f':
Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
5db9adfd405f940b325bbc88d8f6ec4b25bd9a80 14-Apr-2010 Eric Laurent <elaurent@google.com> am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo

Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken

* commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
fff02afa01afafa6edeb0cc547a8e5e19f04cd98 14-Apr-2010 James Dong <jdong@google.com> am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo

Merge commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken

* commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677':
Use PV_PLAYER to handle RTSP streaming
758dd527f64f1e827adfe09f0141ab213733ca22 13-Apr-2010 Eric Laurent <elaurent@google.com> Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.

This is a regression introduced by change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7 for issue 2472495.
When AudioService changes audio mode, setMode() reapplies current volume for the default active stream
which in this case is STREAM_RING.
Because the new implementation of silent mode actually mutes the ringer stream,
setStreamVolumeInt() now applies the volume change received while in silent mode
to the last audible value and we end up clearing the last audible volume for ringer.

The fix consists in not modifying last audible value when the new value is 0.

Also removed obsolete code in setStreamVolumeInt() since new implementation of setRingerModeInt()
in change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7.

Change-Id: I746f3bc1af39a602ce12d130ce592007b2d0ebb6
ava/android/media/AudioService.java
31a17033dcb3551e2964aa6b89041ad9b0317015 14-Apr-2010 Jean-Baptiste Queru <jbq@google.com> fix unintentional drift

Change-Id: I0bbf3d3f95296a41d71558d8de1ed2ed021f21cf
ibstagefright/AwesomePlayer.cpp
ibstagefright/codecs/aacdec/AACDecoder.cpp
745b43c28fd6bb82c72a15b28be75c55dd115171 14-Apr-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
527c3ab51e258dfa15c6240f701693cf914e8e93 13-Apr-2010 Eric Laurent <elaurent@google.com> Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.

The problem happens only if volume down key is pressed while
already in silent or vibrate mode. In this case, AudioService accepts
changing the last audible index for ringer volume from 1 to 0.
When volume up is pressed, current ringer volume value is restored from 0
instead of 1.

The fix consists in keeping last audible index at 1 once in silent of vibrate
mode even is volume down key is pressed.

Change-Id: Id08edd12ce985c22233124545eba2c3e4b8cdc8e
ava/android/media/AudioService.java
42d66573ffd9338ba5a5664ac14f2aa1bf15bff4 14-Apr-2010 James Dong <jdong@google.com> Use PV_PLAYER to handle RTSP streaming

bug - 2594865

Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
ibmediaplayerservice/MediaPlayerService.cpp
10628bb57a7e83bf39d58576063fec5a6b12bf09 14-Apr-2010 James Dong <jdong@google.com> am 748a8df0: am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo
76531828c7244b22ab06cb9e1b6c2e44a6701942 14-Apr-2010 Andreas Huber <andih@google.com> am 5ab60ba0: am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o
c488e161b51ade107e420c14059c4b103541f7e4 14-Apr-2010 James Dong <jdong@google.com> am eee53a7d: am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
7558905bdf464f788d78963613b264767fa30940 14-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am 824ca797: am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
e2693174a41ff4258f6e43f9e6459ffd4c44cc7f 14-Apr-2010 Gloria Wang <gwang@google.com> am ce387505: am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
57e6f58bb7be7a489afe02b68693520127ca613c 14-Apr-2010 Daniel Sandler <dsandler@android.com> am cd3f349f: am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.
748a8df0cd0730340e3212511bfe35cc926d83d6 14-Apr-2010 James Dong <jdong@google.com> am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo
5ab60ba0c136c2eaeb52b4cf0b21f70f3371278c 14-Apr-2010 Andreas Huber <andih@google.com> am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition
eee53a7dfa80c78a42da2c0de80e72d02e730458 14-Apr-2010 James Dong <jdong@google.com> am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
824ca797f0eee2793756c3ee5dbda800244ea4cb 14-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
ce3875055e217c0c5480112a3b070255685b6f21 14-Apr-2010 Gloria Wang <gwang@google.com> am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
cd3f349f32d07c0175844a103ffb63575a845539 14-Apr-2010 Daniel Sandler <dsandler@android.com> am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.
c33f583b7c58eace87f9ef40b38759c6f0be0747 14-Apr-2010 James Dong <jdong@google.com> am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo

Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken

* commit '4f3257cf4667aa28908c401634db849fd2e516af':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
e1130662d0455231853e7d6880bb84d8547d7229 14-Apr-2010 James Dong <jdong@google.com> Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html

bug - 2575956

Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
ibstagefright/MPEG4Extractor.cpp
d760afc3b59cdeaa866261f5acc27510510d69d1 13-Apr-2010 Andreas Huber <andih@google.com> am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." in

Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken

* commit '30e9c2d4db145e02b5312ce29606b03dd78349d3':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
ebaa935e2dd534d46ae79091679e9c2d36710f81 13-Apr-2010 James Dong <jdong@google.com> am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo

Merge commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken

* commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
Don't set encoder component role while we query decoders
db281311a0e957ba989509cf11f2085b4db12074 13-Apr-2010 Andreas Huber <andih@google.com> Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." into froyo
c15f48d7d6047f4f7d7809673fc9728b368f9b0b 13-Apr-2010 James Dong <jdong@google.com> Merge "Don't set encoder component role while we query decoders" into froyo
662292ae2d4f50990d3f2a944b9d9059775b3cc0 13-Apr-2010 Andreas Huber <andih@google.com> Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".

related-to-bug: 2553359
Change-Id: Ic49eb89feb62474d9513bc21571e0e8fe3a15e0b
ibstagefright/AudioPlayer.cpp
b8430335665517181a28d2fbdf706d295be4abf2 13-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo

Merge commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7' into kraken

* commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7':
Fix bug 2578813 Delay pausing music and routing audio for car docks
465934d1e59e95db28cae9a5125ea7dd37b9fa96 13-Apr-2010 Gloria Wang <gwang@google.com> am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.

Merge commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527' into kraken

* commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527':
Fix for 2581725. Keep the last frame after resume(), and delete it
a32efedd26a6a0a249704adcbbf82ac68bd12546 13-Apr-2010 Daniel Sandler <dsandler@android.com> am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.

Merge commit 'de3601e05cf551e24eee50d4c1e70b5037792679' into kraken

* commit 'de3601e05cf551e24eee50d4c1e70b5037792679':
Honor the "Never vibrate" setting for incoming calls.
722d5918420a8524f81670fde9540648e9b5f3e7 13-Apr-2010 James Dong <jdong@google.com> Don't set encoder component role while we query decoders

bug - 2558515

Change-Id: I29683507d234d963994c782c07508034ea807739
ibstagefright/OMXCodec.cpp
f221b6324d8f3b0c8c4e78eafbc1d83867860946 13-Apr-2010 Mathias Agopian <mathias@google.com> am e73a100f: am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken
e73a100feb9598da0ce17ed50a1446a4d9598e47 13-Apr-2010 Mathias Agopian <mathias@google.com> am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken
c30890e102cbae24e4c821ba4274f6ac8b18f1db 13-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
b19da8e187db1cf223463809148b7cb2d9e9751a 13-Apr-2010 Gloria Wang <gwang@google.com> Fix for 2581725. Keep the last frame after resume(), and delete it
in the next suspend() or reuse it if no new frame is available.

Change-Id: I84286030eaae9061077d6ccb485b7dd53ef05341
ibstagefright/AwesomePlayer.cpp
4c637b9e34f4c8db69a64ad21a4e2bcfa7485b5f 13-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2578813 Delay pausing music and routing audio for car docks

Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService
to AudioService.
Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP
device.
Disconnect from A2DP docks with a delay to handle transient
disconnections.
Cancel delayed A2DP disconnections when connecting to a dock as this
can be a reconnection after a transient disconnection.

Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
ava/android/media/AudioService.java
bcac496076ef6f439147e7a2be71e8a2b76ddede 12-Apr-2010 Daniel Sandler <dsandler@android.com> Honor the "Never vibrate" setting for incoming calls.

Bug: 2579295
Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8
ava/android/media/AudioService.java
445a97855480acecaa53c648be47337d19b4297d 13-Apr-2010 Mathias Agopian <mathias@google.com> Merge "don't hardcode "mSurface" throughout our source code" into kraken
275e0662c1fb96d5b0ceeb9b84e2db239b29ea27 13-Apr-2010 Andreas Huber <andih@google.com> am 63642b12: am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
63642b1202aebe27a8b19b8458b68b4d5339c978 13-Apr-2010 Andreas Huber <andih@google.com> am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
7853c8988fe30d1a150dcf62887506f36ea75242 13-Apr-2010 Andreas Huber <andih@google.com> am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo

Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken

* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
8b138323d54e36fd66b22a634494648e20c53373 13-Apr-2010 Mathias Agopian <mathias@google.com> don't hardcode "mSurface" throughout our source code

this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.

Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ibmedia/IOMX.cpp
d0332ad8d212d87fbf909fc780e6378b4d2c20c1 13-Apr-2010 Andreas Huber <andih@google.com> Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.

Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af
related-to-bug: 2587341
ibstagefright/AwesomePlayer.cpp
ibstagefright/ESDS.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/include/ESDS.h
36ce643dbe3ae09d6b94dbd6e3cfbf27442f593e 13-Apr-2010 Jean-Baptiste Queru <jbq@google.com> am cd839752: manual merge
cd8397524a92a13654be3c35bd0e2c827a8d8d9c 13-Apr-2010 Jean-Baptiste Queru <jbq@google.com> manual merge

Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774
fac0c29e5aed4b467cf98ff350a0538ebba9573b 12-Apr-2010 Andreas Huber <andih@google.com> am 98c5bd55: am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo

Merge commit '98c5bd5556f32a237d3483fb7298284869e32a40' into kraken

* commit '98c5bd5556f32a237d3483fb7298284869e32a40':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
6dbf80d086d03d95c5f6331719edd6dd6dac0361 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo
ea1d6712fe11f59ee9a89cc1cfec3aaa114a5233 12-Apr-2010 Andreas Huber <andih@google.com> Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.

Change-Id: I4e42e318fd5373d1f352f54027d4bf823126266d
related-to-bug: 2585276
ibstagefright/TimedEventQueue.cpp
ibstagefright/include/TimedEventQueue.h
9448d6f4dd5e6035c5a28c529c9b4f58df8a4520 12-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am 54419a4f: am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack.

Merge commit '54419a4fc908eab8408f39f3eae97c4315135d84' into kraken

* commit '54419a4fc908eab8408f39f3eae97c4315135d84':
Fix monkey bug 2586534 java.util.ConcurrentModificationException
12221b6f7c86349e3dcf89f814355e41f9e58cbf 12-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo
26a46c4ff66b0736f60c961f85e74d692efce5ca 12-Apr-2010 Andreas Huber <andih@google.com> am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo

Merge commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293' into kraken

* commit 'f0a49f68f0edc98fefbe14e3ddcf0d6853519293':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
967a263d70746c0a6e5b64cdf5a37f9ad2d1052a 12-Apr-2010 Andreas Huber <andih@google.com> Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken
4501f62d7acb2fc754b89e77e4cec2e6c5b46037 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Remove unnecessary lock from AMRWriter." into kraken
a7f57ef707077a005a65b025bebda2a5459d81bd 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Various fixes to enable recording on passion and nexus1." into kraken
4b2bc736b134685b4db8bdda09438c8fb6525e38 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken
1d7a8b448e9371685894b6b02d29bcd3ae959545 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
8f14c55248f88ebb85fb64bbb8e4f07ddb481952 12-Apr-2010 Andreas Huber <andih@google.com> Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.

Change-Id: I4cabd18709c29db0a2763a01cc86525ba0b0aeb7
related-to-bug: 2575976
ibstagefright/OMXCodec.cpp
cdded187d20bdc6379c5a09bdd2002fa070b745d 12-Apr-2010 Andreas Huber <andih@google.com> Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
3f26cade6275d1a55fdae7c7b3fa44bf30a4337e 12-Apr-2010 Andreas Huber <andih@google.com> Ignore corrupt aac audio frames and substitute silence.

Change-Id: I544f98a5c00d912061db7921fc4518435209b168
related-to-bug: 2575976
ibstagefright/codecs/aacdec/AACDecoder.cpp
040301cad17e447d760e7b7e54b79c8c294415ea 12-Apr-2010 Andreas Huber <andih@google.com> Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.

Change-Id: Ieaa90cc9b54bd56963aa5f4daced2ba243801acf
related-to-bug: 2585913
ibstagefright/AwesomePlayer.cpp
f026c381632f4c41a7641d37a48fac4ac20792ce 10-Apr-2010 Yu Shan Emily Lau <yslau@google.com> am 5b1b4993: am 45c566e9: am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
2930bb2d47be279dd228ba8c749c1e39e5da8be1 10-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix monkey bug 2586534 java.util.ConcurrentModificationException
Unlike the other audio focus and media button stack handling
methods, abandonAudioFocus() and unregisterAudioFocusClient() were
not synchronized around their focus stack. This CL corrects this.

Change-Id: I5ada574e4e163fa95da9dad2fefe610b48303320
ava/android/media/AudioService.java
15b02f04c7b5e895dd8ebbb9448863a7d608b00f 10-Apr-2010 Yu Shan Emily Lau <yslau@google.com> Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
f4e5baa1e9ba464de8c1cd8cfeda29c95f3fe81f 09-Apr-2010 Andreas Huber <andih@google.com> I accidentally broken passion encoding while working around problems with the sholes encoder.

Change-Id: Id91b837ed17083cb21efb08e1c1ab9cc3ff3fa8f
ibstagefright/MPEG4Writer.cpp
42349d03bf1971e56a6845441ac89fb232c011d0 09-Apr-2010 Yu Shan Emily Lau <yslau@google.com> Remove the checkStremingServer checking as it is unstable and introduce the flakiness.

Change-Id: I26e48366998e3692ad8a3394a0a0241832e99a6d
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
e2018ca9ff9234876bb5ba63d2f51b72396c5fca 23-Mar-2010 Andreas Huber <andih@google.com> Remove unnecessary lock from AMRWriter.

Change-Id: Ia02966d936dd8cbb31e92051578a3fa816885710
ibstagefright/AMRWriter.cpp
71c27d991ad9f07cc7e28545bf6cd2b133668cd5 19-Mar-2010 Andreas Huber <andih@google.com> Various fixes to enable recording on passion and nexus1.

Change-Id: I75a461c9882e2449082ad754ee7b231c1ceec039
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ab88ea9503e0d84d739e6f232ebe740a5b8959a8 05-Apr-2010 Andreas Huber <andih@google.com> Remove legacy NO_OPENCORE code bypass from MediaPlayerService.

Change-Id: I72db73c91673e0d7f1090e3b033ae915337dc16e
ibmediaplayerservice/MediaPlayerService.cpp
222813545275c36ef7d832e6ee1cdaec81da9e16 09-Apr-2010 Andreas Huber <andih@google.com> am 0e9a439b: am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
4be2461f06de3cf70a3126d2e4590d35210b8397 09-Apr-2010 Andreas Huber <andih@google.com> Merge "Support for ID3 V2.4 tags." into froyo
c944cbe28ed052d53f634c8e3df1b6d717a64eae 08-Apr-2010 Andreas Huber <andih@google.com> Support for ID3 V2.4 tags.

Change-Id: I74ee02451bdfd7e50f0d5ff6fa5da5147b683e4c
related-to-bug: 2581869
ibstagefright/id3/ID3.cpp
ibstagefright/include/ID3.h
6bd70017bd3cffe2af1d2740f87e602f7691a0a2 08-Apr-2010 Andreas Huber <andih@google.com> am 3bf36221: am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
aba965fdd86dfe4c817f4d272deb24fd1fcc1446 08-Apr-2010 Andreas Huber <andih@google.com> Refactor connection/redirection code, support redirects on reconnection.

Change-Id: Id2517568000e028b01553c06a4893813a6883168
related-to-bug: 2580785
ibstagefright/HTTPDataSource.cpp
2b330b448debb693fb786e7e99ae71e182787633 08-Apr-2010 Andreas Huber <andih@google.com> am 604c0371: am c63c6e97: am d06c435c: am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in
a51250bdc753c02b0cae1dd83750ae6e2c1036c7 08-Apr-2010 Andreas Huber <andih@google.com> Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.

Change-Id: Ic9a6ef204362bc9afdc61e081c76bc62e5ef92ad
related-to-bug: 2580785
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/HTTPDataSource.cpp
b4c1d0edea3e9d5a3a1149cf2587a0a5dc399aa2 07-Apr-2010 Marco Nelissen <marcone@google.com> am 92431300: am 724f3008: am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
f974b84b547f6a0f239dec79363fe0fc4a57b417 07-Apr-2010 Ray Chen <raychen@google.com> am e4b62c23: am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo
e43e563e73ab6b1af2b3276a4917976b112f5cda 07-Apr-2010 Marco Nelissen <marcone@google.com> Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
25c2dd60d43298c18b9459abd6ff33046d675fe6 07-Apr-2010 Ray Chen <raychen@google.com> Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo
5294f14ce24a1eea2c56893a91da9d4ec954c1e9 07-Apr-2010 Andreas Huber <andih@google.com> am 1bf6cb72: am 1e6edab6: am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
97a9c6a7bb242fa09ef15b5d044b49d746a105c7 07-Apr-2010 Marco Nelissen <marcone@google.com> Don't check whether a specific named activity supports mp3 playback,
just that there is at least one that does.
Fixes bug 2534382.
Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java
ddb709c45e6b1a2127db7f34f6a4f1c09402d76b 07-Apr-2010 Andreas Huber <andih@google.com> Report the requested seek time while seek is in progress.

Change-Id: I862bfb801701f9ce54dede51c492e4eb37591894
related-to-bug: 2576102
ibstagefright/AwesomePlayer.cpp
b7c8c76180dc1abbf55c734ab121a7a2469060f6 31-Mar-2010 Ray Chen <raychen@google.com> Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
http://2553871

Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
ava/android/media/MediaScannerConnection.java
ba56799fb92a672fabcd57c0f13ca0870288bf11 06-Apr-2010 Andreas Huber <andih@google.com> am b93ae7ea: am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
548b7999fe330042e2a085b37e5efdedf529ffe7 06-Apr-2010 Andreas Huber <andih@google.com> Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.

Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491
ibstagefright/OMXCodec.cpp
505a318eae20606696a56a10920605b56cab0d36 05-Apr-2010 Ray Chen <raychen@google.com> am 507748e9: am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent.
44dcf658718fcc0b563dcad50fb59e8fe507cd0a 05-Apr-2010 Ray Chen <raychen@google.com> Make createVideoThumbnail and createImageThumbnail look consistent.

Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
ava/android/media/ThumbnailUtils.java
04506177a3cd23a0170377046987ba408b413d19 02-Apr-2010 Andreas Huber <andih@google.com> am e47009aa: am 0f7c543c: am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo
eb6e3edc0f21c5c8a574f8086f9622c44c0ff866 02-Apr-2010 Andreas Huber <andih@google.com> Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo
a4357addf609c4a88867c93db135d531b2c40352 02-Apr-2010 Andreas Huber <andih@google.com> Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.

Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064
related-to-bug: 2548426
ibstagefright/OMXCodec.cpp
9702a03b75693842100c07b38b0003f69d7ea377 02-Apr-2010 Andreas Huber <andih@google.com> am 1f857164: am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo
29039deea99a5529d92f7add3f9077ab247d3acd 02-Apr-2010 Andreas Huber <andih@google.com> Merge "Support another kind of iso mpeg4 file." into froyo
5a3a3b16baba25f1f3f3be182a79b3ec691e8f8a 02-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> am 055897ac: am 28525488: am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
6f9ff5d2260e174f5f3b809b396e4971d35a94d2 02-Apr-2010 Dave Sparks <davidsparks@android.com> am 4cd79e3c: am 6c8770df: am d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo
9ab05fff41e983c9b3175096c320aefced81276b 02-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
aae05df08acd55d3fd9e990e80f4697ad6f387b8 02-Apr-2010 Yu Shan Emily Lau <yslau@google.com> am 05e7aedd: am 948e7dc0: am e11bafec: Add the test template for the media audio manager test.
db6cc0ba71a873ad0258e850cb939639b7857c26 02-Apr-2010 Dave Sparks <davidsparks@android.com> Use local lock for most MediaMetadataRetriever methods. Bug 2560834.

MediaMetadataRetriever uses a single static lock for all operations.
This effectively serializes all metadata retrieval operations in a
single process. This patch uses the object level lock for all normal
operations and only uses the static lock to serialize calls to
release.

Change-Id: I81c9f234c2f0007a26d18e1398c709b41a4dbbd7
ni/android_media_MediaMetadataRetriever.cpp
ibmedia/mediametadataretriever.cpp
55d1bb3483e17a11d122e68044e552d96ab55ff4 02-Apr-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2565463 Ensure an object cannot appear twice in the
AudioFocus stack.
Enforce parameter check in AudioManager.requestAudioFocus()
Typo correction in AudioService.unregisterMediaButtonEventReceiver()

Change-Id: Iedd6081a2a096bd7effbaeb9f888a31691201b3b
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
e11bafec8d6c887c6ae95fa3d39c202859e86d48 02-Apr-2010 Yu Shan Emily Lau <yslau@google.com> Add the test template for the media audio manager test.

Change-Id: I55b5de0c55dbfded8d972f7378da3c19a613978c
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioManagerTest.java
eea1eefeada90ec54488e1742e81e4226fc6ace5 01-Apr-2010 Andreas Huber <andih@google.com> Support another kind of iso mpeg4 file.

Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7
related-to-bug: 2558114
ibstagefright/MPEG4Extractor.cpp
bf3b4985b67e50188b7a9359b7f5a8cf5aa05df8 01-Apr-2010 James Dong <jdong@google.com> am 85bc2ae1: am d12d6c30: am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4 01-Apr-2010 James Dong <jdong@google.com> Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
43c754271a37a1265fa55b346f2c8b9a01f5428a 01-Apr-2010 Dave Sparks <davidsparks@android.com> am a74a751c: am 5100df84: am 49e5a4c5: Update AMR codec.
49e5a4c5be2e8ba114efff8d0634a34867cb2c26 01-Apr-2010 Dave Sparks <davidsparks@android.com> Update AMR codec.

Change-Id: I8ecd2712863f6962b762f26898002912d1c77afb
ibstagefright/codecs/amrnb/dec/src/dec_amr.cpp
e64d9a236e4704abf53d3b7eea2eb066f23cf402 31-Mar-2010 James Dong <jdong@google.com> Public API changes for CameraProfile and CamcorderProfile classes

1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final”
2. CamcorderProfile.Quality: use an int rather than an enum
3. Add API on MediaRecorder to pass in a CamcorderProfile
4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile
5. Remove a convenient method and instead let the (mms) app do that task

bug - 2553862

Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
ava/android/media/CamcorderProfile.java
ava/android/media/CameraProfile.java
ava/android/media/MediaRecorder.java
7f9b1fa6719dde575f8ea9858313358733fbd6c9 31-Mar-2010 Glenn Kasten <gkasten@google.com> Add isSilentMode initially hidden before API council approval, test case to be added separately.

Change-Id: Id9384a2caf45b8775705cde6c990c3c65c7c6312
ava/android/media/AudioManager.java
3ce1648fce73496c6ea6a208e5d13141ff7f34e1 31-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
7f7e67f1b60b7840011236097baad9df6dd74c20 31-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2553575 API REVIEW: android.media Change 1 of 3
Notes from API Council review:
Rename onAudioFocusChanged -> onAudioFocusChange

Change-Id: I8296cc84381506dabe8a9ceb1b5e3c0ab6d4af25
ava/android/media/AudioManager.java
804878f3a3ea40ace5bd572cee98f9e13a0dbf0b 31-Mar-2010 Andreas Huber <andih@google.com> Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
0d34d8b4d5ad8695daef2e0db9e8316fab8942d4 31-Mar-2010 Andreas Huber <andih@google.com> Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.

Change-Id: I30b93b21de9bd5509b617cca21f46331562c30ac
related-to-bug: 2553445
ibstagefright/MP3Extractor.cpp
5c1e96bbc7f71fc3512706af878599fdfbdb7690 31-Mar-2010 Andreas Huber <andih@google.com> Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
8e2b941e7bc44dbe392aa220d28c2182aa023035 31-Mar-2010 Andreas Huber <andih@google.com> Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).

Change-Id: I64da5eb97c75b269b4668b3628ed0f05f2e36e51
related-to-bug: 2557482
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc 31-Mar-2010 Andreas Huber <andih@google.com> Merge "Properly fill in the component name for the software decoders." into froyo
7167472d843335f05fd7c9db2d44277677976097 30-Mar-2010 Andreas Huber <andih@google.com> Properly fill in the component name for the software decoders.

Change-Id: I92071481f7ed94922b10856c981e507a9eec4c0c
related-to-bug: 2557787
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrwb/AMRWBDecoder.cpp
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
b75d137faf2e719b389edd5c1d64ab31cc34fb32 30-Mar-2010 Andreas Huber <andih@google.com> Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.

Change-Id: I749859dae28356080fe72ba035719754e7339c7f
related-to-bug: 2492187
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
c2eeb2f52ed907d9502981759e9f30c35cea683d 30-Mar-2010 Andreas Huber <andih@google.com> Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.

Change-Id: I3f9bbcdd4f563bac27c4ccae58e4179656c264b6
related-to-bug: 1903971
ibstagefright/id3/ID3.cpp
1e64e52c8f25ab08605ee445d91bb745f1f3f2d7 29-Mar-2010 Andreas Huber <andih@google.com> Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
62141b430f4d934df712c21a32136e943d2a5d3a 29-Mar-2010 Andreas Huber <andih@google.com> Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.

Change-Id: I50e8976ce8d0ecc47ee0eb497296930877ce306a
related-to-bug: 2549465
ibstagefright/TimedEventQueue.cpp
252573cb821259e883843630e6d69317cfb76850 26-Mar-2010 Andreas Huber <andih@google.com> Finer-grained locking in AwesomePlayer, position and duration are now protected by a separate mutex that's only held for brief moments of time.

Change-Id: I989baf5a0ea8923985c560c2ec274abda0780242
related-to-bug: 2546577
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
bb961a05d70a1d36651da20cd79879e06e72ddb0 25-Mar-2010 Wu-cheng Li <wuchengli@google.com> Merge "Fix testCameraPreviewMemoryUsage test."
59411b3373dca7582aa1a248d4cff4c2330ee224 25-Mar-2010 Wu-cheng Li <wuchengli@google.com> Fix testCameraPreviewMemoryUsage test.

Looper.quit() is asynchronous. The looper may still has some
preview callbacks in the queue after quit is called. The preview
callback still uses the camera object (setHasPreviewCallback).
After camera is released, RuntimeException will be thrown from
the method. So we need to join the looper thread here.

This change also fixes a potential race condition.

bug:2521202
Change-Id: If69bbb3125d1d30192563559579b87c20fa5aac8
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ad069eb1d63ccd801b09f7996530227671bf9651 24-Mar-2010 Andreas Huber <andih@google.com> Merge "QueryCodecs now returns the names of the software codecs (non-OpenMax) as well."
1a189a8232d9765e184ba4eef72c651bc868814f 24-Mar-2010 Andreas Huber <andih@google.com> QueryCodecs now returns the names of the software codecs (non-OpenMax) as well.

Change-Id: Ic4cd61f4dd722fb0dda544ffaa5615e87e3a4d40
related-to-bug: 2541647
ibstagefright/OMXCodec.cpp
f71daba4cd68882442c043b636c754acf8fd942f 24-Mar-2010 Andreas Huber <andih@google.com> Enable early termination of the prefetcher's preparation phase.

Change-Id: I929ac9b0fd0b6ebd98c1bc56be18ac8f8378d48c
related-to-bug: 2537407
ibstagefright/AwesomePlayer.cpp
ibstagefright/Prefetcher.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/Prefetcher.h
9b732dec07b506acd4a78c3377c4c003c4b4d857 23-Mar-2010 Andreas Huber <andih@google.com> Clear the local prefetcher strong reference before signalling that prepare() was cancelled early in order to avoid a race condition that occasionally triggered an assertion from the main thread.

Change-Id: I0db198fe5fd0fbe9a6c90a8e5924a2df05432c4c
related-to-bug: 2538486
ibstagefright/AwesomePlayer.cpp
5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7 20-Mar-2010 Eric Laurent <elaurent@google.com> Fix issue 2472495: Phone cannot be set to silent mode via volume keys while Driveabout is taking.

The problem is that AudioService.adjustStreamVolume() only handles the ringer mode change when the
STREAM_RING volume changes from 1 to 0 or 0 to 1. If another stream is soloed, the STREAM_RING stream
volume is forced to 0 and then never transits from 0 to 0 when volume down key is pressed.

The fix consists in considering the saved value instead of current value when ajusting or setting
the volume of a muted stream: only the saved value is adjusted too, leaving the stream muted but updating
the value that will be restored when it will be unmuted.

Also changed implementation of stream volume control by setRingerModeInt() to use stream mute feature
instead of direct volume control.

Change-Id: Id85d76450b36d61a0fe8195eb4bffe63ffbd427c
ava/android/media/AudioService.java
bbbb1dc3c33f8fe3ed24bd0baacf1f196cb5addd 18-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Unhide the MediaButton receiver API in android.media.AudioManager

Change-Id: Ic9222b0bf6e2ff481c6aa5f16ac0259fa7a52355
ava/android/media/AudioManager.java
90f8680f41525e5e5d9b811af60793a0396a32e3 22-Mar-2010 James Dong <jdong@google.com> Update MediaRecorder.java documentation to mention it does not work on the emulator yet.

bug - 2532726

Change-Id: If6dbf0d89c4681a647419e1911213a4c22dc3dab
ava/android/media/MediaRecorder.java
c2662bf9b98ff1dea1079f7fbf3aee9120aec4f1 20-Mar-2010 Mathias Agopian <mathias@google.com> Merge "libutils Condition are now PRIVATE by default"
9f3168b327dbacd99874fb1c423e926b228dd792 20-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix two AudioFocus issues: - if a focus owner abandons audio focus during a call, the next focus owner in the stack was never notified - if a focus owner requests the focus while alread owning it, and the type of focus request changes, the previous focus owner was not notified that the type of focus loss had changed."
a729f97e8bfba67a94b1cde26d0d78d84528de85 20-Mar-2010 Mathias Agopian <mathias@google.com> libutils Condition are now PRIVATE by default

Condition must be initialized with SHARED for the old behavior, where
they can be used accross processes.

Updated the two places android that require SHARED conditions.

PRIVATE conditions (and mutexes) use more efficient syscalls.

Change-Id: I9a281a4b88206e92ac559c66554e886b9c62db3a
ibmedia/AudioTrack.cpp
983ac2b8cff85dda1f55b0d7779a33248b3fa7cf 19-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Unhide new constants used in AudioFocus API to denote a situation
where a new focus owner signals it allows other audio apps to keep
playing by ducking their audio streams.

Change-Id: I1109f44546f3cbcff8ad33ee21cfff50f4f12177
ava/android/media/AudioManager.java
e5e1e870fdb35f5291790e6d178bde7126f6fe35 19-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix two AudioFocus issues:
- if a focus owner abandons audio focus during a call, the next
focus owner in the stack was never notified
- if a focus owner requests the focus while alread owning it, and
the type of focus request changes, the previous focus owner was
not notified that the type of focus loss had changed.

Change-Id: Iee6c6e17bcdd3c225a4b600f40ba434294870f17
ava/android/media/AudioService.java
aac4bfb49b4706a21b7ae7318409d8c7e2de9917 19-Mar-2010 Marco Nelissen <marcone@google.com> Merge "We should pass null for the album artist if it was not set, instead of a copy of the artist, since the media provider needs to know whether the album artist was actually set."
0096b8d7d119281466763160d5c88c5f9832d005 19-Mar-2010 Marco Nelissen <marcone@google.com> We should pass null for the album artist if it was not set, instead of a copy
of the artist, since the media provider needs to know whether the album artist
was actually set.

Change-Id: I29b885c8293609299a55babadf9ca2a30e20e5bd
ava/android/media/MediaScanner.java
ebcc51d39c340f6fdafa828bb0fe715ffaa8658d 19-Mar-2010 Atsushi Eno <atsushieno+android@gmail.com> Accept media files by file extension in case insensitive manner.

Change-Id: I8e246010c96802ae87960797607fc8f8f2ab6031
ibmediaplayerservice/MediaPlayerService.cpp
4b55d496dd9899731b26327e4cb71c9ef4a1137a 19-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix SDK build Remove links to hidden constant in javadoc.

Change-Id: I21495f0ef64b3dc154ce0e0ca2d44686afd752e9
ava/android/media/AudioManager.java
95b88fbe744d8ce53b5f54f6fcd90c55094a8d14 19-Mar-2010 Eric Laurent <elaurent@google.com> Attempt to fix the SDK build.

Change-Id: I024df1b513da117057a21c27e6c0cd134cdd8023
ava/android/media/AudioManager.java
078fd47e91d495175927d1a4a8b9aad039a7ba4e 19-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Support focus requests where ducking of the loser of audio focus
is acceptable for the new audio focus owner.

Change-Id: I965483f12eeb717115a8f6992d8f1ab7fafa4e45
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
c04cfa35968783f5af007db95680f0087201d9ea 18-Mar-2010 Eric Laurent <elaurent@google.com> Unhide AudioManager API to control bluetooth SCO audio connection.

Needed for issue 2416481 in order to allow unbundled applications to play and record
audio to/from a bluetooth SCO headset while not in call.

Change-Id: Ie1f96ded991e65da538c2c4a58bfa1e548d58a01
ava/android/media/AudioManager.java
42a9c537885cb7e846af8383e83796f63ba8f1b1 19-Mar-2010 Marco Nelissen <marcone@google.com> Merge "Include "album artist" when inserting items in the media provider."
abc2819328c32f2f66506d342c5f560da5107889 19-Mar-2010 Marco Nelissen <marcone@google.com> Include "album artist" when inserting items in the media provider.

Change-Id: Ic34e2d54557409866dc35c29ee397afdfe874762
ava/android/media/MediaScanner.java
099e3e7eedef0e4446b84ef169412a80244fc325 18-Mar-2010 Andreas Huber <andih@google.com> Merge "Report a runtime error rather than asserting if the amr software decoder reads more data than it was given(!)"
bd278758ef81ac2829eb8c0aba477e31e8ca3efd 18-Mar-2010 Andreas Huber <andih@google.com> Report a runtime error rather than asserting if the amr software decoder reads more data than it was given(!)

Change-Id: I0a7ad65051a6663a583ea82da5fc75227dcdbbfa
ibstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
d92820070b5911a2f624986dfdf595463ed43f2e 18-Mar-2010 Andreas Huber <andih@google.com> Tweak the omx tests to always do a seek-beyond-EOS on the first iteration, followed by a linear read on the second iteration.

Change-Id: I16fc9e42ee9f8e4cb120ab41364cae6dd4544634
related-to-bug: 2338792
ibstagefright/omx/tests/OMXHarness.cpp
43595bc268d181748a96b7d421aebaa9ee2df022 18-Mar-2010 Andreas Huber <andih@google.com> Either the software mp3 decoder's CRC computation is wrong (and PV never enabled it before) or there are files in the wild with wrong CRCs that nonetheless decode correctly, either way, opt out of CRC verification.

Change-Id: I1d9bd78f4efb53faa82c67110cf61f78122e40f8
related-to-bug: 2511393
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
cbf1840f4c8bb7f9be3c15fcc4b4c18eb69fe949 18-Mar-2010 Eric Laurent <elaurent@google.com> Merge "Issue 2416481: Support Voice Dialer over BT SCO."
cf74ceea5982930dfaa88992a3fe594a28a2dbe2 18-Mar-2010 Andreas Huber <andih@google.com> Merge "While streaming media data, upon a socket-read error, try reconnecting to the server and attempt to re-read for at most 3 times."
3def1eec2baed0b8845ec32c871e249dc533a9d9 18-Mar-2010 Eric Laurent <elaurent@google.com> Issue 2416481: Support Voice Dialer over BT SCO.

Added public methods to AudioManager API so that unbundled applications can use bluetooth
SCO audio when the phone is not incall.
Without this change, the only way to activate and use bluetooth SCO is via the BluetoothHeadset API
which is not public yet.

Change-Id: Ia1680f219ea1d0943092d475d5be7d6638983ebb
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
a378de742f6da53db442722894c5d68259593ef1 18-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix bug where the ID stored for an OnAudioFocusChangeListener is an empty string when audio focus is requested or abandonned with a null listener."
878342993276a1a98f35f3ccda24c675ed09b7eb 18-Mar-2010 Andreas Huber <andih@google.com> While streaming media data, upon a socket-read error, try reconnecting to the server and attempt to re-read for at most 3 times.

Change-Id: I7534905e07a6456d18b26d5d60fa8915f25ae99e
related-to-bug: 2492187
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
aa773543c4b93e0396eac39d31bdb85f8465688e 17-Mar-2010 James Dong <jdong@google.com> Merge "Don't stop a test case when the test case failed for some of the sample files. Instead, only check against failure or success at the end of the test case."
454f69c84c294b8e0875788653a9c7d4fd80b233 17-Mar-2010 James Dong <jdong@google.com> Don't stop a test case when the test case failed for some of the sample files.
Instead, only check against failure or success at the end of the test case.

bug - 2338793

Change-Id: I6c2f4fa2f48795d7efaba603688853d8d59b42ed
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
2babee6604476c80385e70b67612a96663a19244 17-Mar-2010 Yu Shan Emily Lau <yslau@google.com> Merge "Inserted a 1.5s wait time between the camera release and new camrea."
308e9a5d0975489982f93fd1f3728e6ed7a778d0 17-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug where the ID stored for an OnAudioFocusChangeListener is an
empty string when audio focus is requested or abandonned with a
null listener.

Change-Id: I7709b75c6092aefc002806343298bc679d42d6c6
ava/android/media/AudioManager.java
d1f78767fc2be65ae4dc213b4f3a3e6abec0810d 17-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Implementation of the policing of transport control key press events among multiple applications competing for the remote control focus. AudioManager defines a new API for applications to use in order to register their BroadcastReceiver for the media button as the one to receive the corresponding intent, but all applications at the same time (in an ordered broadcast). AudioService handles a stack of remote control focus owners. It traps ACTION_MEDIA_BUTTON intents and sends a new intent to the remote control focus owner."
65c8a7a1c1cdd0b617057ddb7b0a7f59d8fc73d5 17-Mar-2010 Andreas Huber <andih@google.com> Merge "Instead of asserting that nothing bad happened during (software-)AAC decoding, return a runtime error if appropriate."
fe1dee83ed31e8e03a2a5268779bcf79e6e42f24 17-Mar-2010 Andreas Huber <andih@google.com> Instead of asserting that nothing bad happened during (software-)AAC decoding, return a runtime error if appropriate.

Change-Id: I175492aba8fd6cc1320d047bd2608750d7b193f9
related-to-bug: 2492187
ibstagefright/codecs/aacdec/AACDecoder.cpp
d327f21626217aa3c9c0cdb7a84a742c531e59a3 17-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Implementation of the policing of transport control key press
events among multiple applications competing for the remote control
focus.
AudioManager defines a new API for applications to use in order to
register their BroadcastReceiver for the media button as the one
to receive the corresponding intent, but all applications at the
same time (in an ordered broadcast).
AudioService handles a stack of remote control focus owners. It
traps ACTION_MEDIA_BUTTON intents and sends a new intent to the
remote control focus owner.

Change-Id: I3c109221ecfb160cbb1ec0e40a71b241aad73812
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
4889fb75d463278241d5174baac05a41dbef25a8 17-Mar-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2416481: Support Voice Dialer over BT SCO."
1cffa446ee92314a09ef767970ee93fa8758c95a 17-Mar-2010 Yu Shan Emily Lau <yslau@google.com> Inserted a 1.5s wait time between the camera release and new camrea.

Change-Id: I7540064a6e5229be1ef0fe266cd3050ae36b33a4
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ef9500fe53b6ec67b610207832b52f8bfbb20cd5 11-Mar-2010 Eric Laurent <elaurent@google.com> Fix issue 2416481: Support Voice Dialer over BT SCO.

- AudioPolicyManager: allow platform specific choice for opening a direct output.
Also fixed problems in direct output management.
- AudioFliinger: use shorter standby delay and track inactivity grace period for direct output
thread to free hardware resources as soon as possible.
- AudioSystem: do not use cached output selection in getOutput() when a direct output
can be selected.

Change-Id: If44b50d29237b8402ffd7a5ba1dc43c56f903e9b
ibmedia/AudioSystem.cpp
1fbf63abf41ca1fb9ae2c5d82088e74475279414 16-Mar-2010 Andreas Huber <andih@google.com> "isPlaying" should never block, acquiring the mutex here is unnecessary, rather than investing in a separate mutex guarding just "mFlags" we accept returning "true" from isPlaying one too many times.

Change-Id: I597577cbb3ad1afd3cb3ca91979ef24cc1a44658
related-to-bug: 2518319
ibstagefright/AwesomePlayer.cpp
7f83e10c2358ff4cf12833ed3e7fc4e225eba21a 16-Mar-2010 Andreas Huber <andih@google.com> Merge "Properly handle errors during the codec configuration phase, attempt to revert to next available (likely software-) codec if configuration fails."
2a09c7e042d6a3ae600b25f606d584368a6e3f3a 16-Mar-2010 Andreas Huber <andih@google.com> Properly handle errors during the codec configuration phase, attempt to revert to next available (likely software-) codec if configuration fails.

Change-Id: Id1c699711e30139c9cc29df972254b5ba026e6fb
related-to-bug: 2517098
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMXNodeInstance.cpp
0543a5abd45d72499669383153dcd79182ff23ff 16-Mar-2010 Glenn Kasten <gkasten@google.com> Merge "Fixes bug 2502132, and masks bug 2518313."
0d4726a28e4633c1ccd7942db21bf9a7faa025d9 16-Mar-2010 Kenny Root <kroot@google.com> Merge "Fix regression in directory scanning"
f62dd66a8aa100079e0f6db0c8557234d67453e3 16-Mar-2010 Glenn Kasten <gkasten@google.com> Fixes bug 2502132, and masks bug 2518313.

Change-Id: I5c5ecf1c10763f7b3f3d1e5c57dc5ce77cc344fd
ibstagefright/AMRExtractor.cpp
0c2ab24b9406b803a6993513de208113092bb597 16-Mar-2010 Kenny Root <kroot@google.com> Adjust expected text frame length in ID3

When encountering a null character in an ID3 text frame, adjust the
expected size accordingly so it isn't misidentified as ASCII.

This fixes http://b/2517444

Change-Id: I19a3284d378e882c33b28ecee528a434716c7707
ibstagefright/id3/ID3.cpp
a8c02d77e492798356141ddc128e365aeed61064 16-Mar-2010 Kenny Root <kroot@google.com> Fix regression in directory scanning

Previous range-checking fix removed an inequality check. This change
restores it.

Offending change was I5eb310ced58c3c64a7af2d11b80326efe5adbcab

Change-Id: Ic952c3ba5a4f7e5ab2148ec623b6f083cb7495fb
ibmedia/MediaScanner.cpp
b06a68b9c43e7cb1e8cce81cc9a89627a96cf616 15-Mar-2010 Steve Howard <showard@google.com> Merge "Add a name to the previously-unnamed thread created by SoundPoolThread."
43f0e8e9641fd04486322eb4c3daa959ab2dbfb2 15-Mar-2010 Andreas Huber <andih@google.com> We no longer do sanity checks based on "hdlr" tags in .mp4 files. Pretty soon we'll play any bytestream that even vaguely resembles the spec...

Change-Id: I43e05404860d8856b8aa566cc9b256bb3fa57e6f
related-to-bug: 2483328
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/MPEG4Extractor.h
74d4843641ca1f810e27989873697cba1f41338a 12-Mar-2010 Ray Chen <raychen@google.com> Fix #2509370 ThumbnailUtils.createThumbnailFromEXIF crashes media provider.

Change-Id: Ia2cd00fb0fbdb32e9fb89b4d33ad3c1410eb40d3
ava/android/media/ThumbnailUtils.java
7d740861415523feb239d94d805fa985835663c0 15-Mar-2010 Andreas Huber <andih@google.com> Merge "Hack to "support" "enhanced" podcasts... slang for malformed .mp4 files."
174de8ea46b8440e9c5d888f4769be6c44f553e3 15-Mar-2010 Andreas Huber <andih@google.com> Merge "Fix the media metadata retriever (tests). The native constants must match those published at the java layer."
2d6f709b932be9ac97116d581854f680655a7cfe 15-Mar-2010 Andreas Huber <andih@google.com> Merge "Tag the "testid3" commandline tool as "debug-only". It doesn't need to be included in release builds."
9fbaca94373b944ea304a3be845266b3d5d6cad3 15-Mar-2010 Andreas Huber <andih@google.com> Tag the "testid3" commandline tool as "debug-only". It doesn't need to be included in release builds.

Change-Id: I7e489af3d569015e2a93d340088e059e984f8153
related-to-bug: 2513148
ibstagefright/id3/Android.mk
4d60fc5b43b74cdb45e1d1ba55972d48ebed37ee 13-Mar-2010 Andreas Huber <andih@google.com> Hack to "support" "enhanced" podcasts... slang for malformed .mp4 files.

Change-Id: I690b9f336062a0ff1a667d6461d66b1386db866d
related-to-bug: 2511744
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/MPEG4Extractor.h
122ff04c696b823289dac772da1ba29776c29c01 15-Mar-2010 Andreas Huber <andih@google.com> Fixing the sim build.

Change-Id: I307f6d59f473471adcf855e66b4e8275ab1b3b74
ibstagefright/omx/OMX.cpp
e3452d3fe1da014a6db9a326df08230e0d5339ec 13-Mar-2010 Andreas Huber <andih@google.com> Fix the media metadata retriever (tests). The native constants must match those published at the java layer.

Change-Id: Ic1efed709e4d93c61913b231a8cd3ef1074f8ca0
ibstagefright/StagefrightMetadataRetriever.cpp
d27e8d2befddf8fb57e00f57bbd807b1b693447b 12-Mar-2010 Andreas Huber <andih@google.com> Merge "Boost OMX callback dispatcher thread priority to prevent audio playback stuttering under increased system load"
98b29565b9292790b422b5f4e1b28c73b0e0e09b 12-Mar-2010 Andreas Huber <andih@google.com> Boost OMX callback dispatcher thread priority to prevent audio playback stuttering under increased system load

Change-Id: I1b5339b4d39bd964f286cdf1369d0e0492a465d7
related-to-bug: 2492002
ibstagefright/omx/OMX.cpp
adc238a97cfbff4405c800994c14e147bc7df2bb 12-Mar-2010 Yu Shan Emily Lau <yslau@google.com> Fix the bug that it should write the zero diff to the output file when the actual diff is negative.

Change-Id: I5d7c12b0ad9c0286658067cacb7f385626a3107f
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
d3d9b85ef4e2991480201df91455c2ad7b8e0b78 12-Mar-2010 Yu Shan Emily Lau <yslau@google.com> Merge "Update the new activity name."
34ec95de2f96a5f85d5e4e0f99252b99c0aca14f 12-Mar-2010 Andreas Huber <andih@google.com> Merge "HTTPStream and HTTPDataSource now support cancellation of the connection process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership."
edbb4d8f398dfbce7b766d4bd207685dab582847 12-Mar-2010 Andreas Huber <andih@google.com> HTTPStream and HTTPDataSource now support cancellation of the connection process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership.

Change-Id: I6d73defe6d276693853a469db267bb2668d07af5
related-to-bugs: 2475845,2414536
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/HTTPStream.h
2fe4c096ef94fad6d2bf63d5dae90d7cdae37304 12-Mar-2010 Kenny Root <kroot@google.com> Merge "Add correct copyright headers to multiple files"
eff8dae0a93fa2ad67493ac36b592ef8924717d9 12-Mar-2010 Ray Chen <raychen@google.com> Merge "Add GPSProcessingMethod tag to ExifInterface."
15a4d2ffd04dc6c70f2cd17dae12ac6bc14c69ab 12-Mar-2010 Kenny Root <kroot@google.com> Add correct copyright headers to multiple files

Format for the list of changes shows the origin commit reference followed
by the file name.

33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java
53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java
93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java
328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java
eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java
49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java
a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java
3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java
e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java

Copyright header moved to top in following file:

core/tests/coretests/src/android/widget/ListViewTest.java

Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
e208377fbab6b90f41e68699700942a81f4caaeb 11-Mar-2010 Ray Chen <raychen@google.com> Add GPSProcessingMethod tag to ExifInterface.

Change-Id: I7575ae3195dc510e7020368794a66bb064839104
ava/android/media/ExifInterface.java
806cdd82f0b5b1f720ee26ef3f20c8c1ec034f12 12-Mar-2010 Yu Shan Emily Lau <yslau@google.com> Update the new activity name.

Change-Id: I94d986a5a7f3f8ebf0b7491adf3887b21f1de1eb
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java
6be9c162d67b4298e846e105c54d127ea17cc840 11-Mar-2010 Marco Nelissen <marcone@google.com> Merge "Revert "Do autodetection even if no locale was specified, and use the""
09468dbbe9d91214a171a2b2f43bd37795f0b8c1 11-Mar-2010 Steve Howard <showard@google.com> Add a name to the previously-unnamed thread created by SoundPoolThread.

SoundPool itself also creates a thread, which was called "SoundPoolThread", unrelated to the SoundPoolThread class. The SoundPoolThread class then created an unnamed thread, which showed up as "android:unnamed_thread". That's confusing, so this change renames the SoundPool thread to "SoundPool" and then names the SoundPoolThread thread as "SoundPoolThread". Say that ten times fast :)

Change-Id: I67b7e644a30c94b6eda44bf970764a52a1c2958b
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPoolThread.cpp
dea009ab8e693c60965742e42756482aa089972c 11-Mar-2010 Marco Nelissen <marcone@google.com> Revert "Do autodetection even if no locale was specified, and use the"

This reverts commit b45b0845a6db32848ad08ac1037ef67a68ec2d39.
ibmedia/MediaScannerClient.cpp
7bd3d7d19670932f9edcb637d30d6b141ab8b51a 10-Mar-2010 Nicolas Catania <niko@google.com> Allow invoke in all the player states except idle and error.

Previously invoke would work only after prepare but not
when the player is in play or pause state (for instance).
This new change just check that the player has been initialized
and is not in the error state.

Bug:2488931
Change-Id: I9b9f3679593a3b7697c1a84d993fdcd7e1693a90
ibmedia/mediaplayer.cpp
35e611fb8f38600830713f73a2a32330934544eb 11-Mar-2010 Andreas Huber <andih@google.com> Merge "Reduce buffer sizes related to HTTP media data transfer in order to reduce the probability of a connection timeout/reset due to long periods of time between socket activity."
df2d3cdca77edc309fccf8097a1682b1ef72443a 11-Mar-2010 Nicolas Catania <niko@google.com> Revert "Allow invoke in all the player states except idle and error."

This reverts commit 88f3b81d065d4bec6f69a25eda99158e254f55b1.
ibmedia/mediaplayer.cpp
2e401836382bb58b07887dd0b4764222677b9462 11-Mar-2010 Nicolas Catania <niko@google.com> Merge "Allow invoke in all the player states except idle and error."
a6f9e38b7fe5e2b567ae420cf8a2511b0c4e0f18 11-Mar-2010 Yu Shan Emily Lau <yslau@google.com> Modified the expected metadata result as the behavior of Stagefright.

Change-Id: Id86e262f0d3375eeda68d5df04e4ebd2f21ffc4f
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
fb1eb6fbc90f130365a978fa883209b25928870a 11-Mar-2010 Andreas Huber <andih@google.com> Reduce buffer sizes related to HTTP media data transfer in order to reduce the probability of a connection timeout/reset due to long periods of time between socket activity.

Change-Id: I799ce1d58d56a31088a89603d8a18d24780f5b57
related-to-bug: 2492187
ibstagefright/DataSource.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
88f3b81d065d4bec6f69a25eda99158e254f55b1 10-Mar-2010 Nicolas Catania <niko@google.com> Allow invoke in all the player states except idle and error.

Previously invoke would work only after prepare but not
when the player is in play or pause state (for instance).
This new change just check that the player has been initialized
and is not in the error state.

Bug:2488931

Change-Id: I7a69d1b6e3eec1e5dbdf7378ff2085329062595a
ibmedia/mediaplayer.cpp
b94b52b94e63a77a20a7ea907bea49485091bbf7 10-Mar-2010 Andreas Huber <andih@google.com> Merge "Instead of instantiating StagefrightMetadataRetriever directly, instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files."
1ce986767ae5998ece6810c2933d0b274c529744 10-Mar-2010 Andreas Huber <andih@google.com> Instead of instantiating StagefrightMetadataRetriever directly, instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files.

Change-Id: Ibda4b5268514934f14a3d49a564902bc670f4384
related-to-bug: 2074137
ibstagefright/StagefrightMediaScanner.cpp
e44b41badac8014ec4447aef4d1ef23464f4555c 10-Mar-2010 Marco Nelissen <marcone@google.com> MEDIA_PLAYER_STATE_ERROR is not a bitmask
(b/2502881)

Change-Id: I08e427eb2c36f5d70e40f9aeb8638fa8262de989
ibmedia/mediaplayer.cpp
b4ca6ef9941701502a9ea4d298d7fe5602ba8e7a 09-Mar-2010 Ray Chen <raychen@google.com> Avoid overriding DATE_TAKEN by unreliable file time. MediaProvider will calculate it if needed.

Change-Id: I05cb8628f2333c26de5c05ee1c7676b8f79a5e9a
ava/android/media/MediaScanner.java
758559e6b7e310cf46cc269437f44decd58d68d6 09-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2329540
Part 1 of the fix: when the user doesn't elect to use the car dock
for music and media, the APM was not aware of the device being
docked.
This is fixed by dissociating the notification for the APM of
the docking to the dock from the sink state change of the A2DP
device.
Also missing was forcing the volumes to be reevaluated whenever
the device is docked or undocked, as volumes for docks may
differ, even when the same output device is being used.

Change-Id: If5314e27821a71adbd6df6fdf887c45208241d96
ava/android/media/AudioService.java
a9fb0a2497e563c2066e10a816ff1f7baaf8aa9b 09-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "Unhide API additions to AudioManager for AudioFocus support."
eabb6df2fac57134b82f90a63730b2371589bded 09-Mar-2010 Jean-Michel Trivi <jmtrivi@google.com> Unhide API additions to AudioManager for AudioFocus support.

Change-Id: Ifc7d764703632eb91db11587675ae70ec14510e8
ava/android/media/AudioManager.java
29a02a95cb6b24da3aefc2c7df8b13caeec59b03 09-Mar-2010 Andreas Huber <andih@google.com> Use a more descriptive user-agent string (similar to PV's before) in stagefright http requests.

Change-Id: I4e8ea856327bdb65989f75dab3673baeaf9637c8
ibstagefright/HTTPDataSource.cpp
147113ee54e18094d3a8829c37a1041ec0e9dd7c 09-Mar-2010 Andreas Huber <andih@google.com> Merge "The audio track was accidentally not participating in the prefetch since it wasn't started at the time prepare() was called. Also, properly report the cached duration even near the end when the source has no more data to fetch."
dc9927d4641066fc966c9c69856167b8410abf90 09-Mar-2010 Andreas Huber <andih@google.com> The audio track was accidentally not participating in the prefetch since it wasn't started at the time prepare() was called. Also, properly report the cached duration even near the end when the source has no more data to fetch.

Change-Id: I66a92fec24c9bfb25f1c186f1c877127bae2b4f9
related-to-bug: 2444425
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/Prefetcher.cpp
0e0b0c9e3d2c2edf8deff1f02b7856ad47db3ff9 08-Mar-2010 Andreas Huber <andih@google.com> Merge "Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers."
4c987433da6df0a42dc5643e11bff5f955f53fdc 08-Mar-2010 Andreas Huber <andih@google.com> Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers.

Change-Id: I86916a14c6cf9e65145711c6ded433b864f84456
related-to-bug: 2474091
ibstagefright/colorconversion/SoftwareRenderer.cpp
55864df7b64d14a79fe3a193f3bb0005f64b9452 08-Mar-2010 Andreas Huber <andih@google.com> Increase the amount of data buffered at preparation time. Make sure to start preparing after the codecs have been started, otherwise no buffering will happen.

Change-Id: I2c54db085cc76f4069ab381177e94e1b81005b02
related-to-bug: 2474091
ibstagefright/AwesomePlayer.cpp
ibstagefright/Prefetcher.cpp
3c53c69a4e7bf19907f9ee0dbe4029965e2cfa05 08-Mar-2010 Andreas Huber <andih@google.com> The prefetched source was unnecessarily holding a lock while receiving data from the network, sometimes blocking for seconds over 2G networks with corresponding drops in audio playback. Also, if the cache was full we'd report a cache duration of 0 instead of maximum size.

Change-Id: I46c8083f12f2dd728302095369197ca7e6b78bf8
related-to-bugs: 2492187, 2444425
ibstagefright/Prefetcher.cpp
29855801de083e82b76dee18e5e161d154bdb60c 06-Mar-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2428563: Camera rendered inoperable by voice call interruption."
ba8811f5528404527b0cbad584a836f0b1807d26 03-Mar-2010 Eric Laurent <elaurent@google.com> Fix issue 2428563: Camera rendered inoperable by voice call interruption.

The problem is that AudioRecord never exits read() when a timeout occurs while trying
to get new PCM data from audio hardware input buffer: it just keeps waiting and retrying until stop() is called.
In the same time, opencore AndroidAudioInput::audin_thread_func() loop cannot be exited when stuck
in AudioRecord::read() because the iExitAudioThread flag can only be sampled when AudioRecord::read()
returns. We remain stuck with the audio input thread running.

The fix consists in modifying AudioRecord behavior in case of timeout when getting new PCM samples.
We now wait only one timeout period and try to restart audio record, in case the problem is due to a media_server
process crash. If this fails, we exit read() with a number of bytes read equals to 0 so that
AndroidAudioInput::audin_thread_func() loop can exit.

Also modified Audioflinger::RecordThread() loop so that we attempt to recover from HAL read errors.
In case of read error, the input stream is forced to standby so that next read attempt does a
reconfiguration and restart of the audio input device.
ibmedia/AudioRecord.cpp
bda5780d39d5483dea938f2b64f6b2e0fb383e22 05-Mar-2010 Andreas Huber <andih@google.com> Merge "Instead of allocating the decoder instances in response to a call to setDataSource, postpone allocation to the preparation phase where it belongs."
3ac94efc21c9dbcdf83ab2c630ab35dce229c9dc 05-Mar-2010 Andreas Huber <andih@google.com> Instead of allocating the decoder instances in response to a call to setDataSource, postpone allocation to the preparation phase where it belongs.

related-to-bug: 2492205
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
d197431279c20df6c0c667d747e62867ffc7c4d5 05-Mar-2010 Andreas Huber <andih@google.com> Merge "NPR's audio streams start with a 30sec segment whose mp3 headers are subtly different from those following. Allow certain bits to vary that were thought to be fixed before."
ff846009ecb6df669feeb5d5feecf4b304b8b9a5 01-Mar-2010 James Dong <jdong@google.com> Unhide CamcorderProfile and CameraProfile Java API

bug - 2375978
ava/android/media/CamcorderProfile.java
ava/android/media/CameraProfile.java
1d200e3b959f7562b21a6e9d94910ddd051cfe10 05-Mar-2010 Andreas Huber <andih@google.com> NPR's audio streams start with a 30sec segment whose mp3 headers are subtly different from those following. Allow certain bits to vary that were thought to be fixed before.

related-to-bug: 2490385
ibstagefright/MP3Extractor.cpp
7a67f156fb5b84c072c0b2bce30c78e55c96db84 11-Feb-2010 Ray Chen <raychen@google.com> Remove native options.
ava/android/media/ThumbnailUtils.java
0fc6bc4cac6391f048f0f2748b3e979effe0924b 27-Feb-2010 James Dong <jdong@google.com> Clean up MediaRecorder for public Java SDK
- update comments and fix a check in setAudioChannels()

bug - 2362412
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
6be0fc100e46bc1cd4d9eda6c63a962d1c24dbd4 04-Mar-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2456968: Alarm rings in "silent mode and when Alarm in silent mode is turned off"."
31951ca52aa007891b0be975318199e207c70e02 03-Mar-2010 Eric Laurent <elaurent@google.com> Fix issue 2456968: Alarm rings in "silent mode and when Alarm in silent mode is turned off".

The problem is that even if silent mode is active, changing the alarm volume will change current
alarm stream volume. This is true for other stream types affected by ringer mode (ring, notification...) but
the UI design is such that it is not possible to change these volumes while in silent mode.

The fix consists in modifying AudioService.setStreamVolumeInt() so that when a stream is affected by ringer mode
and we are in silent mode, only the saved volume value is modified, current value remaining to unchanged (0).
ava/android/media/AudioService.java
945a9df6e31cf951d6f323a85a7e75c19c7f60f6 03-Mar-2010 Mike Reed <reed@google.com> add optional preftable to image codecs, for more control over the resulting bitmap config
ests/omxjpegdecoder/jpeg_decoder_bench.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.h
fde67f492519f489cdc0ba158b5814a676ad0dc2 03-Mar-2010 Yu Shan Emily Lau <yslau@google.com> Merge "Added the Camera Preveiw memory test which can help to isolate the memory leak issue."
30a13908197c03c7f660f443064575c7baa889bb 02-Mar-2010 Yu Shan Emily Lau <yslau@google.com> Added the Camera Preveiw memory test which can help to isolate the memory leak issue.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
6c26fe4e8e224c4360a4291742cd4f7f12f69e82 02-Mar-2010 Dave Sparks <davidsparks@android.com> Fix build. I screwed up a merge.
ibmediaplayerservice/MediaPlayerService.cpp
16433e2fe309f759fec3266db56232f55114beb2 02-Mar-2010 Dave Sparks <davidsparks@android.com> Add locking to signal in AudioCache::notify(). Bug 2317844.
ibmediaplayerservice/MediaPlayerService.cpp
2ffeeed87ebce07776c38d6f6d56c10fe57ed1c0 02-Mar-2010 Eric Laurent <elaurent@google.com> Merge "Issue 2071329: audio track is shorter than video track for video capture on sholes"
d5176cfe6eae954e9cef1e2ec17859a5089e1330 28-Jan-2010 Jean-Michel Trivi <jmtrivi@google.com> First implementation of the audio focus management as an extension
of AudioManager and AudioService.
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioFocusDispatcher.aidl
ava/android/media/IAudioService.aidl
47d0a9264fa5297db6333697ad750e6bc06822aa 26-Feb-2010 Eric Laurent <elaurent@google.com> Issue 2071329: audio track is shorter than video track for video capture on sholes

Add API to retrieve number of frames dropped by audio input kernel driver.

Submitted on behalf of Masaki Sato <masaki.sato@motorola.com>
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
7491d8757ffb8ddd34cf02c5dd35e7c3da415c34 02-Mar-2010 Daniel Sandler <dsandler@google.com> Merge "New vibrate/silent mode behavior."
5f0d5ce38a4f01ca986e6fe514c57a17b83dd841 01-Mar-2010 Andreas Huber <andih@google.com> Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly.
ibstagefright/AudioPlayer.cpp
039db81d53e9be1c8f6a9b569fc4d4df5313cd0b 27-Feb-2010 James Dong <jdong@google.com> Merge "Don't allow MediaRecorder.setParameter() to be invoked in the following states: error, prepared or recording"
465faa925d3446cacb05b2fef8607cfb3502a0ff 26-Feb-2010 Marco Nelissen <marcone@google.com> When we're in the 'playback complete' state, don't consider pausing
an error. This makes 'playback complete' essentially equivalent to
being paused at the end, and treats it the same as being paused at
any other position.
ibmedia/mediaplayer.cpp
6329bf7b1e2217c6c9477bd57349a1edade18417 26-Feb-2010 Daniel Sandler <dsandler@google.com> New vibrate/silent mode behavior.

In earlier versions of Android, "vibrate mode" (in which
only alarms and media produce sound, but notifications may
operate the vibe motor) was only accessible by adjusting the
ringer volume (via the device's volume rocker) down until
the "vibrate" icon appeared (between the lowest ring volume
and silent mode).

Many users prefer that "silent mode" always allow vibration.
Others prefer Android's historical behavior, in which silent
mode stops the vibes as well.

To accommodate these two distinct usage patterns, we now
allow the user to decide whether vibration is allowed in
"silent mode", a user interface abstraction that now spans
both AudioManager.RINGER_MODE_VIBRATE and
AudioManager.RINGER_MODE_SILENT.

To minimize API impact (and therefore maximize backward
compatibility), RINGER_MODE_VIBRATE and RINGER_MODE_SILENT
remain unchanged. What has changed is what happens when the
user activates silent mode, either via Settings,
GlobalActions (longpress on power), volume rocker, or the
keyguard tab. In essence, there is now only one "silent"
position in these controls, and whether RINGER_MODE_VIBRATE
or RINGER_MODE_SILENT is actually set on the AudioService is
determined by a new one-off setting
(System.VIBRATE_IN_SILENT). This new setting isn't meant to
be a long-term API, however: in the future we hope to
replace and extend this design with a much more
sophisticated set of systemwide feedback profiles. ETA TBD.

Related changes:
* I09ad7d69 (GlobalActions and keyguard)
* I22ba7bcf (Settings app)

Bug: 2457183
Change-Id: I14cf91b0910261ffdfd1bf302423f41ec747d057
ava/android/media/AudioService.java
16f6354be4bd649c0da66cf75f11f1088293aca2 26-Feb-2010 Andreas Huber <andih@google.com> Merge "The PV aac software decoder screws up if playing a mono-AACplus stream unless we output stereo data. Now we always output stereo data as the legacy OMX nodes did."
3d6c986d02850096d1f0a6032cb0c039a2fb91fb 26-Feb-2010 Marco Nelissen <marcone@google.com> Merge "Make AsyncPlayer.startSound catch all exceptions instead of only a few. Two reasons for this: - it's used in the system process - it's run in a separate thread, so the user of AsyncPlayer cannot catch these exceptions"
749c570be1ed496b4fe2b48c421b7b82ab141f86 26-Feb-2010 Andreas Huber <andih@google.com> The PV aac software decoder screws up if playing a mono-AACplus stream unless we output stereo data. Now we always output stereo data as the legacy OMX nodes did.

related-to-bug: 2472545
ibstagefright/codecs/aacdec/AACDecoder.cpp
4ba297f3ed2def2845edb18723e43379984bc9ff 26-Feb-2010 Marco Nelissen <marcone@google.com> Make AsyncPlayer.startSound catch all exceptions instead of only a few.
Two reasons for this:
- it's used in the system process
- it's run in a separate thread, so the user of AsyncPlayer cannot catch these exceptions
ava/android/media/AsyncPlayer.java
61701ced749232165a96112f579ab82ba5040e38 26-Feb-2010 James Dong <jdong@google.com> Don't allow MediaRecorder.setParameter() to be invoked in the following states:
error, prepared or recording

bug - 2362412
ibmedia/mediarecorder.cpp
7bc58b07e285067618bb2de78fbdf1545dcf01a6 26-Feb-2010 Andreas Huber <andih@google.com> Merge "Support vendor MPEG4 test content with apparently malformed chunks in them."
dfb8eee5bd1359d8042c1fd2f5143b416c09dfdd 26-Feb-2010 Andreas Huber <andih@google.com> Support vendor MPEG4 test content with apparently malformed chunks in them.

related-to-bug: 2472211
ibstagefright/MPEG4Extractor.cpp
5be65ab5b9c57028f9af70b283b4e43515f5bd04 26-Feb-2010 James Dong <jdong@google.com> Merge "Add some space and total memory amount to the memory dump from the media server process."
b93003649d0d58e6824b54d6e9e1386912c34448 26-Feb-2010 James Dong <jdong@google.com> Merge "Image encoding settings java API through xml configuration file"
3d23a61588e0aefc80cda44ed323ea205f24ebbf 25-Feb-2010 James Dong <jdong@google.com> Add some space and total memory amount to the memory dump from the media server process.
ibmediaplayerservice/MediaPlayerService.cpp
9b433f0b654d32530b0b48a7a653216ae0bb94d8 24-Feb-2010 James Dong <jdong@google.com> Image encoding settings java API through xml configuration file

- I decided to completely remove jpeg decoding related stuff from this change
I think that setting is better off if it is specified by the system properties.
We don't have to include MediaProfiles.h header in skia files
ava/android/media/CamcorderProfile.java
ava/android/media/CameraProfile.java
ni/android_media_MediaProfiles.cpp
ibmedia/MediaProfiles.cpp
ff0c5c1929f37f2b8034cd7be8831d9a06e6a322 24-Feb-2010 Andreas Huber <andih@google.com> Recover from a certain mp3 decoder error instead of signalling an error and thereby stopping decoding.
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
c23844c60452a337a87875cd7d9d8ceb638fb36c 24-Feb-2010 James Dong <jdong@google.com> Merge "Use Java API from xml configuration in the test application"
d7d22eba3c1bb7212ccc566fedb16dbee44f51a2 23-Feb-2010 Andreas Huber <andih@google.com> Propagate errors all the way through the MediaSources and send either MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR depending on the final reason for running out of buffers to play back.

related-to-bug: 2463749
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/Prefetcher.cpp
ibstagefright/include/AwesomePlayer.h
42ddfc949504347902fc40a363e5d72c51111d7f 23-Feb-2010 Andreas Huber <andih@google.com> Merge "Return runtime errors instead of asserting in MPEG4 file format validation, also add more validation to ensure presence of codec specific data for avc, aac and mpeg4."
5ee0bce5e006610a06d6d8f3572098b1ccaded6d 23-Feb-2010 Andreas Huber <andih@google.com> Return runtime errors instead of asserting in MPEG4 file format validation, also add more validation to ensure presence of codec specific data for avc, aac and mpeg4.

related-to-bug: 2431967
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/MPEG4Extractor.h
f82c76656b29059e2d28b9ca4bdad11d7cba038b 23-Feb-2010 James Dong <jdong@google.com> Merge "Replace system property retrieval calls with DecoderCapabilities Java API calls."
d6b6bf93219c8f7b3a780174d03e42174c32f38a 23-Feb-2010 Andreas Huber <andih@google.com> Merge "Properly unload the renderer shared library after the renderer goes away."
582ae172a4e9784f377c9935b47160fba1764142 23-Feb-2010 Gloria Wang <gwang@google.com> Merge "Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE, but when it calls GetByteArrayRegion, it multiplies it by 2 which defeats the "// safety first" check at the beginning."
196863d27407e23c69debdd061df58ce8fe76c20 23-Feb-2010 Gloria Wang <gwang@google.com> Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE,
but when it calls GetByteArrayRegion, it multiplies it by 2 which
defeats the "// safety first" check at the beginning.
ni/android_media_ResampleInputStream.cpp
078f7f05d53ba8e92f4a72992edab732125af79f 22-Feb-2010 Andreas Huber <andih@google.com> Properly unload the renderer shared library after the renderer goes away.
ibstagefright/omx/OMX.cpp
b8de9578dcb672d92b407d7a24c77af13f85c353 22-Feb-2010 Andreas Huber <andih@google.com> This hardware video decoder lies about its required input buffer sizes allocating 2.7 MB of memory instead of the required 176 KB... Added another quirk.

related-to-bug: 2281327
ibstagefright/OMXCodec.cpp
1b7babd2cce5bb10adac7b061cf7ba065d480edb 16-Feb-2010 James Dong <jdong@google.com> Use Java API from xml configuration in the test application
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
9a56aaf12b462a064e81e02386eca8a1e77fe737 22-Feb-2010 Eric Laurent <elaurent@google.com> am 8978547f: am f5fe3949: Fix issue 2459650.

Merge commit '8978547f254b6b6ba2e322794aa044803f3edc2a'

* commit '8978547f254b6b6ba2e322794aa044803f3edc2a':
Fix issue 2459650.
8978547f254b6b6ba2e322794aa044803f3edc2a 22-Feb-2010 Eric Laurent <elaurent@google.com> am f5fe3949: Fix issue 2459650.

Merge commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b' into eclair-plus-aosp

* commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b':
Fix issue 2459650.
f5fe3949f5db69b19ce3fac7abce2088106f2e2b 22-Feb-2010 Eric Laurent <elaurent@google.com> Fix issue 2459650.

This change fixes a problem where an unwanted tone is generated by audio policy manager when a MT call is answered.
This is because of a policy that replaces high visibility system sounds (ringtones, alarms...) by a beep when in call.
There is a transitory phase while the call is being answered where the phone state is changed to IN_CALL but the
ringtone is still playing. The audio policy manager then mutes the end of the ringtone and starts playing a beep
in replacement because the ringtone is categorized as high visibility.

The fix consists in changing the ringtone stream type from high visibility to low visibility. This is not a problem as
the only actual use case where a ringtone would be generated while in call is if another call is received.
But in this case, the phone system does not generate a ringtone but a call waiting tone instead.
It is therefore not required to handle a ringtone as a high visibiltiy tone that must be somehow signaled to the user
while in call.
ibmedia/AudioSystem.cpp
b427a7b0e4f335b27484d4b46cfa48c0cc601755 22-Feb-2010 Wu-cheng Li <wuchengli@google.com> Merge "Increase the sleep time to fix testTakePicture."
620144029819df06bda2452fa3ec15334f66bd65 22-Feb-2010 Wu-cheng Li <wuchengli@google.com> Increase the sleep time to fix testTakePicture.

One of the build needs 5 seconds for snapshot in low light. I don't want to
increase the sleep time, but this is what we have now.

bug:2141755
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
fda25347b8aaa860e0fdbc972c0f4411c85f8fa3 20-Feb-2010 San Mehat <san@google.com> sdutils: Get rid of sdutils - use vdc for similar low level functions

Signed-off-by: San Mehat <san@google.com>
dutils/Android.mk
dutils/sdutil.cpp
e49268af9e4639b6472048d03df0f6a72194790f 20-Feb-2010 Marco Nelissen <marcone@google.com> Merge "Make sure that the event callback thread is Java capable in the simulator."
7691af90625eaad79de639e61cd2e6b5566f2e0b 20-Feb-2010 Marco Nelissen <marcone@google.com> Make sure that the event callback thread is Java capable in the simulator.
ibstagefright/Android.mk
ibstagefright/TimedEventQueue.cpp
b2d69e3d7742840fe3b2fb86ded8bec510e7a9ca 19-Feb-2010 Andreas Huber <andih@google.com> The MediaScanner is way too obsessed with restricting the files to be scanned.

related-to-bug: 2326148
ava/android/media/MediaScanner.java
b52188ee57279181dec7f7f22f2b163f62b1ddad 19-Feb-2010 Andreas Huber <andih@google.com> Merge "Implement legacy behaviour for MediaPlayer's behaviour of starting from the start of the media on a start() call instead of resuming at the current position, if previously reached the end of the stream. Also properly report number of frames played to audio flinger. Finally, delay spawing the queue thread until actually used."
406a18b5b3d53466a3e03b66413ff3a50243a6a8 19-Feb-2010 Andreas Huber <andih@google.com> Implement legacy behaviour for MediaPlayer's behaviour of starting from the start of the media on a start() call instead of resuming at the current position, if previously reached the end of the stream. Also properly report number of frames played to audio flinger. Finally, delay spawing the queue thread until actually used.

related-to-bug: 2453220
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
397afb54649d30b2710a6620b08c3565500f2ed7 19-Feb-2010 Andreas Huber <andih@google.com> Fix a race condition in the prefetcher, the source may be shutdown while we're reading data from it.

related-to-bug: 2453414
ibstagefright/Prefetcher.cpp
a6fe26c58ff6810264222212ab3d641a077733e7 18-Feb-2010 Kenny Root <kroot@google.com> Merge "Range check in MediaScanner::processDirectory"
7fe4fe68fad547bab4bbd8133d14aeed427f5b96 18-Feb-2010 Kenny Root <kroot@google.com> Range check in MediaScanner::processDirectory

Make sure we don't have an empty string before checking if it's a
directory since this string is tainted.

Change-Id: I5eb310ced58c3c64a7af2d11b80326efe5adbcab
ibmedia/MediaScanner.cpp
75bbe2b7c7b404c203d9ec79880ea57e22fc9523 18-Feb-2010 Kenny Root <kroot@google.com> Merge "Store AudioTrack return value for error condition"
3cbd62c3cebf0c0c62a50ccc736ac4caa3a4bf64 18-Feb-2010 Kenny Root <kroot@google.com> Store AudioTrack return value for error condition

Store AudioTrack->initCheck()'s return value so we can return it after
the AudioTrack is deleted.

Change-Id: Ie042a7d6a54d7f9afd8a5767cfd167dbeb2e5c04
ibstagefright/AudioPlayer.cpp
c0178f10972304027c990a930d6c81060e772abe 18-Feb-2010 Andreas Huber <andih@google.com> We are cancelling this event during reset, but the event may have already been dispatched at the time, blocking on the mutex. While it's blocking, reset() cancels the event, we're then unblocked and bad things(tm) happen.

related-to-bug: 2451174
ibstagefright/AwesomePlayer.cpp
0a026cff9ef28b973a86e0503f510b6f9935d880 18-Feb-2010 Andreas Huber <andih@google.com> Merge "Disable the TI AMR hardware decoder for audio decoding until its issues are resolved."
4727040c5c40e095c28da620d6b31504aa68b694 18-Feb-2010 Andreas Huber <andih@google.com> Disable the TI AMR hardware decoder for audio decoding until its issues are resolved.

related-to-bug: 2450938
ibstagefright/OMXCodec.cpp
05513119803845c11d845cbc376759cddcfe13bb 17-Feb-2010 Dave Sparks <davidsparks@android.com> Unhide new SoundPool API's. Bug 2415373.
ava/android/media/SoundPool.java
af6fdfa4bbeb0700b042694b5832752eec3600eb 17-Feb-2010 Dave Sparks <davidsparks@android.com> Merge "Fix logging in SoundPool."
afdf85d435eb37cba307aa259d5064a8e3c662e1 17-Feb-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Fix issue 2440226: Car dock volume synchronization."
7bef5a58f1166c0e2509e27ace07c7af7c5d1d20 17-Feb-2010 Dave Sparks <davidsparks@android.com> Fix logging in SoundPool.
ni/soundpool/SoundPool.cpp
68db99ef761456ffaa0c4b918ce75dfc0892784a 17-Feb-2010 James Dong <jdong@google.com> Replace system property retrieval calls with DecoderCapabilities Java API calls.
ava/android/media/MediaFile.java
675ee6ac3641e75a1496b06bdbc89fb4f5476647 17-Feb-2010 Dave Sparks <davidsparks@android.com> Merge "Add SoundPool API to pause and resume all active streams. Bug 2426531."
f992cbb9aae593c7787ac9c5f6b475e7bb0a92c5 09-Feb-2010 Dave Sparks <davidsparks@android.com> Add SoundPool API to pause and resume all active streams. Bug 2426531.
ava/android/media/SoundPool.java
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/android_media_SoundPool.cpp
ests/SoundPoolTest/src/com/android/SoundPoolTest.java
9f564858235aff2eca67b59c12b20ffb14a33439 16-Feb-2010 Andreas Huber <andih@google.com> Merge "If we never triggered a range request but know the content length make sure to not read more data than there could be, otherwise we'd block indefinitely if the server doesn't close the connection."
67e8dfb2576e7492d6ff61f3da91d33a48125786 16-Feb-2010 Andreas Huber <andih@google.com> Merge "Don't hold the prefetcher mutex while prefetching a single source, the lock protects the list of sources and does not guard access to the individual sources."
2ae13a9c48c2aa37423bfb272736da207ae588ac 16-Feb-2010 Andreas Huber <andih@google.com> Don't hold the prefetcher mutex while prefetching a single source, the lock protects the list of sources and does not guard access to the individual sources.

related-to- bug: 2413024
ibstagefright/Prefetcher.cpp
57f790f96d5ed1f1dad8179a110143e9d3df808b 16-Feb-2010 Andreas Huber <andih@google.com> If we never triggered a range request but know the content length make sure to not read more data than there could be, otherwise we'd block indefinitely if the server doesn't close the connection.

related-to-bug: 2442307
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
cf06dd0a8a4321ea640e7d1ebe5dffcd69324a04 16-Feb-2010 Andreas Huber <andih@google.com> Merge "The AMRSource failed to properly release a media buffer in case of error."
62ed7a6d4a20d1efb151315b104805ce445e7346 16-Feb-2010 James Dong <jdong@google.com> Merge "Support decoder queries from media profiles xml configuration file"
bc8342721d9e32cac624587e8e5c64372ceaff18 16-Feb-2010 Andreas Huber <andih@google.com> The AMRSource failed to properly release a media buffer in case of error.

related-to-bug: 2441307
ibstagefright/AMRExtractor.cpp
9ce379aef155e0c21b5d82d8dc713c62792e4f30 16-Feb-2010 Eric Laurent <elaurent@google.com> Fix issue 2440226: Car dock volume synchronization.

AudioService now sends intent AudioManager.VOLUME_CHANGED_ACTION when the volume is changed
on any stream type (previously the intent was sent only for STREAM_BLUETOOTH_SCO stream).
A new extra for previous volume value is added to the intent.
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
d32fba411f2710ad66681466674c8243f2ca3454 11-Feb-2010 James Dong <jdong@google.com> Support decoder queries from media profiles xml configuration file
ava/android/media/DecoderCapabilities.java
ni/android_media_MediaProfiles.cpp
190dd57fb843b1b5019ebdba32e44617c6bbc3d0 13-Feb-2010 Gloria Wang <gwang@google.com> Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
8d00b53cc408a7fce541fa076a55c9b7239ce590 13-Feb-2010 Gloria Wang <gwang@google.com> Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
bab28017a56a770a97b2da770deaf6649b30766e 12-Feb-2010 Andreas Huber <andih@google.com> Merge "Preserve a preview frame to be restored after resuming the playback session."
7b73cfcc7530114ac81556bb9c58aff4181da92d 12-Feb-2010 Andreas Huber <andih@google.com> Preserve a preview frame to be restored after resuming the playback session.

related-to-bug: 2231576
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
acc63512e90630e79446980c4c2966fd8a701d60 12-Feb-2010 Andreas Huber <andih@google.com> Merge "New API on java's MediaPlayer to suspend/resume a session."
fbb3885024ac9c90f322b6259d7e519c8927e6ff 12-Feb-2010 Andreas Huber <andih@google.com> New API on java's MediaPlayer to suspend/resume a session.

related-to-bug: 2231576
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ba7ec917ea91364598de1ba7a29910cec08fd5de 12-Feb-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 427e927298449826bb5b98327b0c05957aa051e6
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 12 10:39:07 2010 -0800

Fixing a race condition in AwesomePlayer and support for suspend/resume.

commit 96201a04b6657b6bd69ec6100f4de66aebcaa0b4
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 12 10:36:15 2010 -0800

Protect MPEG4Source's sanity by properly locking.

related-to-bug: 2231576
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/Prefetcher.cpp
ibstagefright/include/AwesomePlayer.h
6015a9715421a339c2b7bb63f9166504e3488179 12-Feb-2010 Eric Laurent <elaurent@google.com> Fix issue 2418668: AudioManager isWiredHeadsetOn() always returns false for headset without mic.
ava/android/media/AudioManager.java
8b799a323cfc2dfb1c7da18467e21cc4e19504f6 11-Feb-2010 Marco Nelissen <marcone@google.com> Merge "Add support for "album artist" tag."
c5d5ee34d7c1026ca8d5cd8b186e5a73c5230247 11-Feb-2010 Marco Nelissen <marcone@google.com> Add support for "album artist" tag.
ava/android/media/MediaMetadataRetriever.java
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
000479f9e325b4e426a67033abd92d47da412725 10-Feb-2010 Mathias Agopian <mathias@google.com> split libsurfaceflinger_client and libcamera_client out of libui
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ibmedia/Android.mk
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/IOMX.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/colorconversion/Android.mk
ibstagefright/colorconversion/SoftwareRenderer.cpp
28a5dc229ed25c771cde25668928edc788073029 11-Feb-2010 Andreas Huber <andih@google.com> Merge "Support for rendering through an overlay on the droid even if a software renderer is active."
4ab5a6fe78fafff9b409a6008f3ac51fecc5281d 11-Feb-2010 Andreas Huber <andih@google.com> Support for rendering through an overlay on the droid even if a software renderer is active.
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
49ffc0ff72a29f000b56deb34b0706cbfc5624bf 05-Feb-2010 Ray Chen <raychen@google.com> Revise ThumbnailUtils API.
ava/android/media/ThumbnailUtils.java
aa82768b8c6b6e81bb048d2d72b6586eb66b5b5d 11-Feb-2010 Andreas Huber <andih@google.com> Merge "Fixing AMR recording code."
259b7c1c1bc40a4a47214944b8a0587c36e8c144 11-Feb-2010 Andreas Huber <andih@google.com> Fixing AMR recording code.
ibmediaplayerservice/StagefrightRecorder.cpp
ibstagefright/AMRWriter.cpp
d2e6af66ce9fdf7bfa72efe18b74260901a944a6 10-Feb-2010 Marco Nelissen <marcone@google.com> Merge "Do autodetection even if no locale was specified, and use the detected encoding if it is unambiguous."
4c48cb72ffc975c2a94473efb529d559aacaff17 10-Feb-2010 Andreas Huber <andih@google.com> Merge "Properly detect Adobe's .f4v file format as an mp4 ISO compliant file."
01830a0814ae2db9141f49720d9e5aa2457854f0 10-Feb-2010 Andreas Huber <andih@google.com> Properly detect Adobe's .f4v file format as an mp4 ISO compliant file.
ibstagefright/MPEG4Extractor.cpp
7d574137946ea59a0f01dfda62ab46911d366a52 10-Feb-2010 Andreas Huber <andih@google.com> TI does not want the hardware H.263 decoder to be enabled.
ibstagefright/OMXCodec.cpp
b45b0845a6db32848ad08ac1037ef67a68ec2d39 10-Feb-2010 Marco Nelissen <marcone@google.com> Do autodetection even if no locale was specified, and use the
detected encoding if it is unambiguous.
ibmedia/MediaScannerClient.cpp
6ed937ebe99088b5671a645060340a558b02fefb 10-Feb-2010 Andreas Huber <andih@google.com> Implementation of stagefright-enabled MediaPlayerService::decode functionality

related-to-bug: 2359268
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/AudioPlayer.cpp
ests/SoundPoolTest/src/com/android/SoundPoolTest.java
bfcb22a207499c7ecd4aef9bea2ac778d8be8fc8 10-Feb-2010 Marco Nelissen <marcone@google.com> Don't create a genre in the database for genre code 255 (unknown)
ava/android/media/MediaScanner.java
4eaef139cf72e8f260ec4cf165c42f579cf6127d 09-Feb-2010 Andreas Huber <andih@google.com> Merge "Defer actual work of setDataSource given a URI to the prepare phase in order to not block the calling thread for any significant amount of time..."
ffdf4782d43df5fc59808de60c346f1edd695bd9 09-Feb-2010 Andreas Huber <andih@google.com> Defer actual work of setDataSource given a URI to the prepare phase in order to not block the calling thread for any significant amount of time...

related-to-bug: 2431117
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
0dd4df27adaa8c034195451fd2c372ebcbf4db48 09-Feb-2010 Andreas Huber <andih@google.com> Merge "If the codec's input buffer size is too small to accomodate the buffer read from the source, report and error instead of asserting."
632aa76422fcd4d1fca906b13203df62131f40e1 09-Feb-2010 Dianne Hackborn <hackbod@google.com> Merge "New external storage APIs."
42c444a8b18730614426a3c28193ae5fd59bab80 09-Feb-2010 Andreas Huber <andih@google.com> If the codec's input buffer size is too small to accomodate the buffer read from the source, report and error instead of asserting.
ibstagefright/OMXCodec.cpp
e83cefcef07f9ac025642c1ffec76b4c7ab39cf2 05-Feb-2010 Dianne Hackborn <hackbod@google.com> New external storage APIs.

This implements the spec for external storage organization, and
properly reflects how the media scanner organizes the files it finds.

Also includes package manager support for removing app private
files from external storage when the application is uninstalled.

For the new APIs and paths, the main place to look is Environment
and Context.
ava/android/media/MediaScannerConnection.java
fe3b8e9fe5e68ef307fdac3ad94b15215038dbc3 09-Feb-2010 Marco Nelissen <marcone@google.com> Support the disc number and custom genre tags for mp4.
ibstagefright/MPEG4Extractor.cpp
e33813dfaba83afa4bbda4ddbc210cf11f332a88 09-Feb-2010 Andreas Huber <andih@google.com> Merge "A little less verbosity in stagefright and special treatment for the error state while shutting down."
4a9375ef2a06fc36ec308835ef9e7e4eea2ba69f 09-Feb-2010 Andreas Huber <andih@google.com> A little less verbosity in stagefright and special treatment for the error state while shutting down.
ibstagefright/AwesomePlayer.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OMXCodec.cpp
fdcba38ccf3231fb10ce649e9f985c0b44d39d92 09-Feb-2010 Andreas Huber <andih@google.com> Merge "During shutdown, don't loop forever on a state transition to OMX_StateInvalid."
e56b7e6c3506f1963c75dcf80c9c90f0c8d710ff 09-Feb-2010 Marco Nelissen <marcone@google.com> Use bswap_16 instead of swap16, because swap16 is not available in glibc
ibstagefright/id3/ID3.cpp
9be54d400d68c735013bc8069fbcb66c3f98c3ee 08-Feb-2010 Andreas Huber <andih@google.com> ID3v1 tag's strings are ISO8859, not UTF-8, so do the proper conversion when extracting metadata.

related-to-bug: 2399408
ibstagefright/id3/ID3.cpp
ba5306824519ed12c15be28a3e46bd92773266fe 09-Feb-2010 Andreas Huber <andih@google.com> Merge "Properly implement asynchronous preparation of media playback."
7499ef3e68e920c07e990deb600ceb6cf9b0c4c2 09-Feb-2010 Marco Nelissen <marcone@google.com> Merge "Skip the endianness marker when converting UCS-2 to UTF-8, since it ends up in the UTF-8 string otherwise."
6be780ebd4d5733857e539b5dd30b532cd0fad80 08-Feb-2010 Andreas Huber <andih@google.com> Properly implement asynchronous preparation of media playback.

related-to-bug: 2413002
ibmediaplayerservice/StagefrightPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/Prefetcher.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/Prefetcher.h
3887ac7eb473b2cb6da37ed360c836adf0a479f3 09-Feb-2010 Marco Nelissen <marcone@google.com> Skip the endianness marker when converting UCS-2 to UTF-8, since it
ends up in the UTF-8 string otherwise.
ibstagefright/id3/ID3.cpp
7723c94d3295de4e9a2b14cbf9f3a9a999f201d2 09-Feb-2010 Gloria Wang <gwang@google.com> Merge "Use Tremor for sim-eng, and Tremolo for other targets."
655306f8a80b3e9fc52daf458ef319a8ed8c564c 08-Feb-2010 Marco Nelissen <marcone@google.com> Add support for the TPOS/TPA (disc number) id3 tag.
ibstagefright/MP3Extractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
2c510140507bb19097688a58c3ac7eca3aa638c0 08-Feb-2010 Gloria Wang <gwang@google.com> Use Tremor for sim-eng, and Tremolo for other targets.
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
9f4557ed0b29c85df1f2219408bad91ae4e29cbb 08-Feb-2010 Andreas Huber <andih@google.com> During shutdown, don't loop forever on a state transition to OMX_StateInvalid.

related-to-bug: 2420917
ibstagefright/omx/OMXNodeInstance.cpp
5a84386ae3a5935a91c628a3e1084a71aa95850a 08-Feb-2010 Gloria Wang <gwang@google.com> Merge "Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first."
96827283dfb58dbe39bc241598177ed164e2dc0a 06-Feb-2010 Gloria Wang <gwang@google.com> Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"

This reverts commit 2f46c062b05254671aec96a98b431f91ae7b270c.
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
75ed81427dce09fb3091f80585d3615f0efaf815 06-Feb-2010 Gloria Wang <gwang@google.com> Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
9446c5046872e8ae44120d4057ae724875aba1a4 05-Feb-2010 James Dong <jdong@google.com> Merge "When the extractor is not able to be created successfully, don't crash"
e4cfcb82a86e1546474c3fd25101ab561063a1bd 05-Feb-2010 James Dong <jdong@google.com> When the extractor is not able to be created successfully, don't crash
ibstagefright/omx/tests/OMXHarness.cpp
760dcecd9d0aad300c7af1e232156a9ad1399a71 05-Feb-2010 James Dong <jdong@google.com> Merge "Camcorder profile Java API support - Use Enum for Quality instead of int - Use static values() method from Enum, rather than if-else"
2b7bb21a5c96caf16b8a13691fd7c3971ff3c7bd 05-Feb-2010 Gloria Wang <gwang@google.com> Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first.
ibstagefright/AudioPlayer.cpp
2f46c062b05254671aec96a98b431f91ae7b270c 04-Feb-2010 Gloria Wang <gwang@google.com> Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
e7038ace44ed6e6cd27be35b003e6dd0412e936f 04-Feb-2010 James Dong <jdong@google.com> Camcorder profile Java API support
- Use Enum for Quality instead of int
- Use static values() method from Enum, rather than if-else

bug - 2417312
ava/android/media/CamcorderProfile.java
ni/android_media_MediaProfiles.cpp
acfbc801a8886f8c78997c192838355f4ba2978c 04-Feb-2010 Andreas Huber <andih@google.com> Stop using the PV software decoders and use ours (based on PV code) instead even in non-FULL_STAGEFRIGHT builds.
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/Android.mk
ibstagefright/id3/Android.mk
5d9661be8eaa2a4702a4d3c0fa0fd07a8638b503 31-Jan-2010 Wu-cheng Li <wuchengli@google.com> Add getAttributeDouble() and focal length tag.

bug:2375989
ava/android/media/ExifInterface.java
5258919fab561508a2154a38b933e975bd2e07cd 04-Feb-2010 Andreas Huber <andih@google.com> Merge "Defer creating the video renderer until we see the first video frame."
7085b684c6e1dcd87686fd32d72498ffabd22677 04-Feb-2010 Andreas Huber <andih@google.com> Defer creating the video renderer until we see the first video frame.

This avoids having to instantiate the renderer twice in case the video decoder sends a format change before the first frame.

related-to-bug: 2375037
ibstagefright/AwesomePlayer.cpp
065f69ef53f88bd0dcdb36e543c9d1cae1d6b628 04-Feb-2010 Andreas Huber <andih@google.com> Previous change broke A/V sync, this is a better change to eliminate negative media positions.

related-to-bug: 2414900
ibstagefright/AudioPlayer.cpp
70d10c0156f5d2d1c639d0ebe62de8ec950d4306 03-Feb-2010 Andreas Huber <andih@google.com> Fix a deadlock caused by the AudioPlayer notifying the observer that the stream had ended at the same time the observer was shutting down the AudioPlayer.

related-to-bug: 2414536
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
c119f7ea23d7cffc5dcac49ec4c41a0c68290549 03-Feb-2010 Andreas Huber <andih@google.com> AudioPlayer didn't properly account for the latency when calculating the current media time.

related-to-bug: 2414900
ibstagefright/AudioPlayer.cpp
3a8cab88e7747dc280ce85895af014f98e80a6cc 15-Jan-2010 Ray Chen <raychen@google.com> Add GpsDateTime support to ExifInterface and correct images table's date_taken value to UTC timestamp.
http://b/2376777
ava/android/media/ExifInterface.java
ava/android/media/MediaScanner.java
9763f64925cd04a684b014085f0a148bb9cc40fe 02-Feb-2010 Andreas Huber <andih@google.com> Workaround for misbehaving HTTP servers that terminate header lines with a single newline instead of the required CRLF sequence.

related-to-bug: 2414022
ibstagefright/HTTPStream.cpp
23a6b4425f16b339385d803da4193f66887436ce 02-Feb-2010 Andreas Huber <andih@google.com> Merge "Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream."
b777bf3100ca752d5f2d0533f053dfda397bda84 02-Feb-2010 Andreas Huber <andih@google.com> Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream.

related-to-bug: 2403674
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
716582e9da61dc7e271e82b1ed5df489e434a0d7 02-Feb-2010 Andreas Huber <andih@google.com> Properly report the duration of a recording into .mp4 files.

related-to-bug: 2295468
ibstagefright/MPEG4Writer.cpp
2d65817f17d0bfabac3849892c8a0f959b8dadc1 02-Feb-2010 Andreas Huber <andih@google.com> Merge "Properly advertise the content length of the HTTP stream if available."
b339ac3d3e23713640aa9615dec84cff7ef727d6 29-Jan-2010 San Mehat <san@google.com> sdutil: Refactor for new APIs

Signed-off-by: San Mehat <san@google.com>
dutils/sdutil.cpp
8cc1b2a32c434b237fa95dc9f81261887fdb1cf4 02-Feb-2010 Andreas Huber <andih@google.com> Properly advertise the content length of the HTTP stream if available.

related-to-bug: 2312941
ibstagefright/CachingDataSource.cpp
ibstagefright/HTTPDataSource.cpp
705300b8429b7ee468e79dd3aa98e904b29f4ceb 02-Feb-2010 James Dong <jdong@google.com> Merge "Initial check-in for xml-based encoder capabilities retrieval - Changed the Java API as suggested - Treat /etc/media_profiles.xml as the default xml configurtion file"
c371194e4e0651c328f1870a90bbfd4e217c747b 20-Jan-2010 James Dong <jdong@google.com> Initial check-in for xml-based encoder capabilities retrieval
- Changed the Java API as suggested
- Treat /etc/media_profiles.xml as the default xml configurtion file
ava/android/media/EncoderCapabilities.java
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaProfiles.cpp
ibmedia/Android.mk
ibmedia/MediaProfiles.cpp
5fdff9e6c50faa6196349e8aecc08d0b9bc5467d 01-Feb-2010 Andreas Huber <andih@google.com> Merge "Use physical memory for software rendering to take a fast path through surface flinger if possible."
8ef96af97e200a62a3205085c79c6ca7b0e873ee 01-Feb-2010 Andreas Huber <andih@google.com> Merge "The TI MP3 decoder lies about the number of channels it outputs, add a quirk for that."
cfde87ba10df8a5b071102c79b54a34ebd3ddf45 29-Jan-2010 Andreas Huber <andih@google.com> Use physical memory for software rendering to take a fast path through surface flinger if possible.

related-to-bug: 2386023
ibstagefright/colorconversion/SoftwareRenderer.cpp
e331c7b2c4d9449c23e70067edeb0deadb95aa6e 01-Feb-2010 Andreas Huber <andih@google.com> The TI MP3 decoder lies about the number of channels it outputs, add a quirk for that.
ibstagefright/OMXCodec.cpp
1875b7e2cf9f5d4fd4ae0cf672e7f4de7f89a6a3 30-Jan-2010 Mathias Agopian <mathias@google.com> Don't use MemoryDealer in MetadataRetrieverClient as it's not necessary.

Use a MemoryHeapBase directly instead.
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
239d5b3638ae486f715f44a8c1a71420f486049c 30-Jan-2010 Mathias Agopian <mathias@google.com> Merge "Simplify the MemoryDealer implementation"
0c9698ea9764c409d253635a255fa8b1ccbb7141 30-Jan-2010 Andreas Huber <andih@google.com> Merge "Apparently the generic mpeg4 file header does not describe the actual samplerate and channel count of the content in the case of mpeg4 audio, instead the 'ESDS' atom must be consulted."
e6c73c2018bcd61aa1f9c1ce735a6813d40fe84d 29-Jan-2010 Andreas Huber <andih@google.com> Merge "Support 24-bit LE PCM wave files in stagefright."
6faf7893b6307a3295993380d61af49f2cda965c 26-Jan-2010 Mathias Agopian <mathias@google.com> Simplify the MemoryDealer implementation

At some point the implementation became complicated because of
SurfaceFlinger's special needs, since we are now relying on gralloc
we can go back to much simpler MemoryDealer.

Removed HeapInterface and AllocatorInterface, since those don't need
to be paramterized anymore. Merged SimpleMemory and Allocation.
Made SimplisticAllocator non virtual.

Removed MemoryDealer flags (READ_ONLY, PAGE_ALIGNED)

Removed a lot of unneeded code.
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/omx/tests/OMXHarness.cpp
d2315967b4075875cd6681327ae3043fa2adfbcf 29-Jan-2010 Andreas Huber <andih@google.com> Apparently the generic mpeg4 file header does not describe the actual samplerate and channel count of the content in the case of mpeg4 audio, instead the 'ESDS' atom must be consulted.

related-to-bug: 2407094
ibstagefright/MPEG4Extractor.cpp
ibstagefright/include/MPEG4Extractor.h
bf124e7e41f7850ac1b7be808221a462db6f3447 26-Jan-2010 Ray Chen <raychen@google.com> Unhide ThumbnailUtils to support Camera unbundling.
http://b/2375978
ava/android/media/MiniThumbFile.java
ava/android/media/ThumbnailUtil.java
ava/android/media/ThumbnailUtils.java
00aa8ec727cd3027942e5c150523484d7e2e3c5d 29-Jan-2010 Andreas Huber <andih@google.com> Support 24-bit LE PCM wave files in stagefright.

related-to-bug: 2300197
ibstagefright/WAVExtractor.cpp
8b6c5410979ca94c02cd05966e7eaacce0e8d2ae 29-Jan-2010 Andreas Huber <andih@google.com> Merge "Properly forward errors returned by AudioTrack up to the player."
7ff292c8527ecbab292dc703aae227360e39ba3e 29-Jan-2010 Andreas Huber <andih@google.com> The AVC software decoder always aligns the decoded dimensions to 16 pixel boundaries, report this properly to callers.
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
62eac008504fefd05fa53bc74f7e001bf0a51975 29-Jan-2010 Andreas Huber <andih@google.com> Properly forward errors returned by AudioTrack up to the player.

related-to-bug: 2300197
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
85fb658b4bcca319f022f34a1de78a9463c9df11 29-Jan-2010 Andreas Huber <andih@google.com> Merge "Make sure the OMX component is synchronously shutdown before we try to instantiate another one. Also properly cleanup the software AVC decoder to avoid leaking memory."
98b48dee325bd22ae73029cd6a42047036ed5ab1 29-Jan-2010 Andreas Huber <andih@google.com> Make sure the OMX component is synchronously shutdown before we try to instantiate another one. Also properly cleanup the software AVC decoder to avoid leaking memory.

related-to-bug: 2404786
ibstagefright/AwesomePlayer.cpp
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
affa99c52957685f5a5652ab5254b92e729651c7 28-Jan-2010 Andreas Huber <andih@google.com> For mpeg4 files streamed through HTTP, cache the entire sampletable metadata chunk in memory if possible.

related-to-bug: 2295438
ibstagefright/HTTPDataSource.cpp
ibstagefright/MPEG4Extractor.cpp
433c9acaf7715eec080426af03cf1bf288076fe8 28-Jan-2010 Andreas Huber <andih@google.com> Support the specification of additional HTTP headers in the creation of a DataSource.

related-to-bug: 2393577
ibmediaplayerservice/StagefrightPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/omx/tests/OMXHarness.cpp
256430093679e1d62b54fb0c852126e54d162f6f 28-Jan-2010 Andreas Huber <andih@google.com> API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.

related-to-bug: 2393577

Original change by Andrei Popescu <andreip@google.com>
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/MidiMetadataRetriever.cpp
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/TestPlayerStub.cpp
ibmediaplayerservice/TestPlayerStub.h
ibmediaplayerservice/VorbisMetadataRetriever.cpp
ibmediaplayerservice/VorbisPlayer.cpp
ibmediaplayerservice/VorbisPlayer.h
ests/players/invoke_mock_media_player.cpp
9cf5b455d95ff2024b6d23e3416aca4abf93ff8c 28-Jan-2010 Yu Shan Emily Lau <yslau@google.com> am 47f1d4d5: am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair

Merge commit '47f1d4d509b271ddb2f158c761e572413f39f1a8'

* commit '47f1d4d509b271ddb2f158c761e572413f39f1a8':
Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
46ce847a62412b4253efb1430bcb558875bdc275 28-Jan-2010 Andreas Huber <andih@google.com> Fix http streaming for shoutcast servers that do not support http ranges.

related-to-bug: 2295438
ibstagefright/HTTPDataSource.cpp
0ebff76e95aab7f6827ce1a8c25f1b4ad87a9029 27-Jan-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V sync"
9ecaf8b8da6a556be6143b74b9e77cf4e08ff1e8 27-Jan-2010 Andreas Huber <andih@google.com> Merge "Attempt to fix the build ... again."
55e99c61005b6c9b463f8069a71a7d8540fb8895 27-Jan-2010 Andreas Huber <andih@google.com> Attempt to fix the build ... again.
ni/Android.mk
2d4d919e2913e8093a26b54621ce7dfc61c8dd04 27-Jan-2010 Andreas Huber <andih@google.com> Merge "Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available."
37105cc7710f988984e92b65989b78ed59693b8b 27-Jan-2010 Andreas Huber <andih@google.com> Fixing the build. Why is this suddenly necessary and didn't break the build before???
ni/Android.mk
fc22d932353504e24e5ed32809420f6db8355795 27-Jan-2010 Andreas Huber <andih@google.com> Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available.

related-to-bug: 2295438
ibstagefright/Prefetcher.cpp
a6f266ca5789501144b317aed0782d592dd2d023 27-Jan-2010 Yu Shan Emily Lau <yslau@google.com> Merge "Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different."
8258879fe85b8f1e0304f023c2c6465f85bedd26 27-Jan-2010 Andreas Huber <andih@google.com> Merge "Better support for HTTP streaming media content, fixes to the way HTTPDataSource streams the data, prefetcher implementation."
0986e7907ffc8387b04fb201e285784bcd11b9b7 20-Jan-2010 Eric Laurent <elaurent@google.com> Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V sync

Added getRenderPosition() API to IAudioFlinger to retreive number of audio frames
written by AudioFlinger to audio HAL and by DSP to DAC.

Added getRenderPosition() API to AudioHardwareInterface to retreive number of audio frames
written by DSP to DAC.

Exposed AudioTrack::getPosition() to AudioSink() to make it available to media player.

Removed excessive log in AudioHardwareGeneric.
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
b9e63830c69231c53dc23a5e29f5b58a1d9d3668 27-Jan-2010 Andreas Huber <andih@google.com> Better support for HTTP streaming media content, fixes to the way HTTPDataSource streams the data, prefetcher implementation.

related-to-bug: 2295438
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/CachingDataSource.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/Prefetcher.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/include/Prefetcher.h
996dddff64f90d8469e24107c44bfd618cf0c2dd 26-Jan-2010 Andreas Huber <andih@google.com> Support for audio recording into AMR NB/WB files as well as audio tracks in MPEG4 files.

related-to-bug: 2295449
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/AMRWriter.cpp
ibstagefright/MPEG4Writer.cpp
0c8569f2a345b8321ff842d76191b5d72b4bdb54 26-Jan-2010 San Mehat <san@google.com> Merge "MountService: Add support for renaming secure containers"
eea6ecdfce33178cee3c4b20fe230d659421e72c 26-Jan-2010 Yu Shan Emily Lau <yslau@google.com> Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
473bd7767593cdd16669a220cf6f1a7c885e4e85 26-Jan-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active."
e2b38863265b8b4622b9bb173a4337f8f6f17ce5 26-Jan-2010 Andreas Huber <andih@google.com> Merge "Initial checkin of AudioSource and AMRWriter, a pair of classes supporting pure-audio recording in stagefright."
07bf09da4a365282fc35f800b62a83e0fa5533e2 25-Jan-2010 Andreas Huber <andih@google.com> Initial checkin of AudioSource and AMRWriter, a pair of classes supporting pure-audio recording in stagefright.

related-to-bug: 2295449
ibstagefright/AMRWriter.cpp
ibstagefright/Android.mk
ibstagefright/AudioSource.cpp
23f25cda0c73f8eb878844dea32fb0bd419edca2 25-Jan-2010 Eric Laurent <elaurent@google.com> Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active.

Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream
type is playing.

Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
bb04b631b60e0286c02e0fd4dd7ab764a001e0ce 25-Jan-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2349345: Media sound output stuck on earpiece rather than speaker."
b1cbc3525fd9cbef63510907251e6feaba151862 25-Jan-2010 Eric Laurent <elaurent@google.com> Merge "Fix issue 2363154: Speech synthesis fails to start over A2DP after media server process crash."
52733b83a736b500f72f72733b06258601c966f8 25-Jan-2010 Andreas Huber <andih@google.com> The qcom OMX video decoders do not allocate output buffer memory at the time OMX_AllocateBuffer is called, wait until we received the first FILL_BUFFER_DONE notification until we rely on the buffer data ptr.
ibstagefright/OMXCodec.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/omx/OMX.cpp
787aa597d497ffd3019fb64c244a1e944a5f8453 25-Jan-2010 Eric Laurent <elaurent@google.com> Fix issue 2363154: Speech synthesis fails to start over A2DP after media server process crash.

The problem is that after a media_server crash, the value of the A2DP output handle can change.
As this value is cached in AudioSystem for all client processes there can be a mismatch between the cached
and actual value after a media_server restart.

The fix consists in clearing the cached output handles and output to stream map values cached
in AudioSystem in AudioFlingerClient::binderDied() which is called when the media_server crashes.
ibmedia/AudioSystem.cpp
9272b4b4a44fe1f33e3030810618194f817caaec 24-Jan-2010 Eric Laurent <elaurent@google.com> Fix issue 2349345: Media sound output stuck on earpiece rather than speaker.

This change fixes a problem occuring when an application (for instance a VoIP application)
changes the audio mode to MODE_IN_CALL and crashes. In this case, the audio routing policy
remains as if we were in call until the audio mode is changed back to MODE_NORMAL, for instance when a new call
made or received and terminated.

The fix consists in registering a death receipient to the binder that made the setMode() request and resetting the audio
mode in case of client process crash.
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
45f61040823d8c442838f75cde8760f236603dae 23-Jan-2010 San Mehat <san@google.com> MountService: Add support for renaming secure containers

Signed-off-by: San Mehat <san@google.com>
dutils/sdutil.cpp
ddce5766a385f654aa82161726a867f6dd0d8a39 22-Jan-2010 Andreas Huber <andih@google.com> Merge "Make sure to release the renderer before shutting down the hardware codec, qcom's hardware decoder will otherwise crash."
3522b5a579090f09ec4d304ee4b8fca6c755d39c 22-Jan-2010 Andreas Huber <andih@google.com> Make sure to release the renderer before shutting down the hardware codec, qcom's hardware decoder will otherwise crash.

related-to-bug: 2387981
ibstagefright/AwesomePlayer.cpp
7c45147f3537bc777a04545a6f0bc70550df5269 22-Jan-2010 Marco Nelissen <marcone@google.com> Merge "Make the media scanner disregard database entries that do not have absolute path names. This allows us to store other things (perhaps with http or content URIs) in the database, without the media scanner removing them again."
e1ceec234c618729cc7bd35fecb11744b52c1cc8 22-Jan-2010 Chih-Chung Chang <chihchung@google.com> Add an orientation parameter for overlay, so we can do camera preview in portrait mode.
ibstagefright/CameraSource.cpp
35b002a9c873fb40116179c8626b9841b0abae74 22-Jan-2010 Marco Nelissen <marcone@google.com> Make the media scanner disregard database entries that do not have
absolute path names. This allows us to store other things (perhaps
with http or content URIs) in the database, without the media scanner
removing them again.
ava/android/media/MediaScanner.java
47f1d4d509b271ddb2f158c761e572413f39f1a8 22-Jan-2010 Yu Shan Emily Lau <yslau@google.com> am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair

Merge commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp

* commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
f465dc0367534bf38c2c655cd147437848b67907 21-Jan-2010 Yu Shan Emily Lau <yslau@google.com> Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
48da344cf0c23a8a383957326605c73cd9fa7bf2 21-Jan-2010 Andreas Huber <andih@google.com> Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup."
2cb5c9c633c7f8ffea10360fc029bc3e88172ca1 21-Jan-2010 Andreas Huber <andih@google.com> Special-case .wmv and .wma metadata retrieval and playback to use PV if available.

related-to-bug: 2381874
ibmediaplayerservice/MediaPlayerService.cpp
a3f4384ce829132d7ffcd3d284d641e73a8896a6 21-Jan-2010 Andreas Huber <andih@google.com> Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup.

related-to-bug: 2355922
ibstagefright/AwesomePlayer.cpp
ibstagefright/include/AwesomePlayer.h
703f0614f3111957c0bda4e3595c10c413255894 21-Jan-2010 Andreas Huber <andih@google.com> Merge "Fix no-copy-overhead OMXCodec implementation to actually work."
c712b9fe2859435ce142b90ddcb46c5bed33eea8 21-Jan-2010 Andreas Huber <andih@google.com> Fix no-copy-overhead OMXCodec implementation to actually work.
ibmedia/IOMX.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
06b3ff7d5a7903d6804d295110820c121629ee4d 20-Jan-2010 Andreas Huber <andih@google.com> Make the MediaMetadataTest a little more lenient when it comes to verifying the duration of media files, only require that the returned duration is within 100ms of the expected one, as the PV and stagefright implementations differ slightly.

related-to-bug: 2377534
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
9b42b8168c698ccb3234861cea9edc281d2bdd08 20-Jan-2010 Andreas Huber <andih@google.com> Merge "Adds support for 8-bit (unsigned) PCM wave files."
e9999cfea449223f308e25ba7a0d9a9e9e0ac3c0 20-Jan-2010 Andreas Huber <andih@google.com> Adds support for 8-bit (unsigned) PCM wave files.

related-to-bug: 2382428
ibstagefright/WAVExtractor.cpp
ibstagefright/include/WAVExtractor.h
c2c9dd32511b555c637b8cadb8091eaa6088f92b 20-Jan-2010 Andreas Huber <andih@google.com> Support for 'iTunes-style' metadata in .mp4 and .3gp files.

related-to-bug: 2368967
ibstagefright/MPEG4Extractor.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/include/MPEG4Extractor.h
5b5ae13e9e8607d26269077d3781b3628eb7b875 19-Jan-2010 Andreas Huber <andih@google.com> Fix trailing garbage after UCS-2 encoded strings in ID3 V2.

related-to-bug: 2381919
ibstagefright/id3/ID3.cpp
43782d3bc9883885f1650bdd74f0bcfc8d7ad3fe 19-Jan-2010 Andreas Huber <andih@google.com> Support for ID3 version 1 (and 1.1) tags in .mp3 files.

related-to-bug: 2375219
ibstagefright/id3/ID3.cpp
ibstagefright/id3/testid3.cpp
ibstagefright/include/ID3.h
cb6ffa28244e491b2ae8e3b1c68ba7c93a08e560 19-Jan-2010 Andreas Huber <andih@google.com> Merge "Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process."
bfa05732a9b791ce49f3db2bb5c9ee30638fd6bb 19-Jan-2010 Doug Kwan <dougkwan@google.com> Merge "Add missing libjpeg in linker option. Currently this library is used by the main executable but is included implicitly via inter-library dependency."
e73b46ef7f1405d7ac0035dfc392519f1b53dc71 19-Jan-2010 James Dong <jdong@google.com> Merge "Media server death nodification"
474a97a428bcee2e1bd8d299d6dd378e2f4c0a5c 19-Jan-2010 Doug Kwan <dougkwan@google.com> Add missing libjpeg in linker option. Currently this library is used by the
main executable but is included implicitly via inter-library dependency.
ests/omxjpegdecoder/Android.mk
f1fe064d735698b09e4bc7b3a10e4dc3dba9a1d9 16-Jan-2010 Andreas Huber <andih@google.com> Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process.
ibmedia/IOMX.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/OMX.h
ibstagefright/omx/OMX.cpp
0a2d8709e4badeeb892b325c1b6fd52ad16f9c7d 19-Jan-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
0d41be3a291bfefefea178b18df1fb2b3019e886 19-Jan-2010 Andreas Huber <andih@google.com> Merge "Remove totally unused code from OMX.cpp"
1faa92a1e93f311e86dca483ed7702091137de66 19-Jan-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 6689350d7e4dad6d873c1ed95f0a356e3bfd79d1
Author: Andreas Huber <andih@google.com>
Date: Tue Jan 19 09:23:02 2010 -0800

Some tweaks to the SampleIterator.

commit 5638bff6d31442a219806445c3106d47b081fcab
Author: Andreas Huber <andih@google.com>
Date: Fri Jan 15 14:46:29 2010 -0800

A much improved implementation of MPEG4 sample table operations through an iterator.
ibstagefright/Android.mk
ibstagefright/MPEG4Extractor.cpp
ibstagefright/SampleIterator.cpp
ibstagefright/SampleTable.cpp
ibstagefright/include/SampleIterator.h
ibstagefright/include/SampleTable.h
fed1a1c9c05d033301ad3fe4c20b854deada2408 15-Jan-2010 Andreas Huber <andih@google.com> Remove totally unused code from OMX.cpp
ibstagefright/omx/OMX.cpp
5a12413331c8bf9ebb62f84771aaac36baa5fa95 19-Jan-2010 Andreas Huber <andih@google.com> Merge "Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong."
9dba709d4439d8cdb464a3dcccbddffdbe4b10ff 18-Jan-2010 San Mehat <san@google.com> MountService: Add new 'unmountSecureContainer' API call

Signed-off-by: San Mehat <san@google.com>
dutils/sdutil.cpp
34bbc22cbca0004475788f06be2300fef23c6a52 16-Jan-2010 James Dong <jdong@google.com> Media server death nodification
ibmedia/Android.mk
ibmedia/IMediaDeathNotifier.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
cf7aa68e11571ecd8e989f8105080d3eac0f86bc 15-Jan-2010 San Mehat <san@google.com> sdutil: Use new MountService api method names

Signed-off-by: San Mehat <san@google.com>
dutils/sdutil.cpp
f2275078bd5ba6bc0b184098573341c5958289ab 15-Jan-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
5a37232239100e1079f8c1b0b8eb14b7791ff339 15-Jan-2010 Andreas Huber <andih@google.com> Merge "Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation."
34d30d334221a08994ad364eae806d6592a96161 15-Jan-2010 Andreas Huber <andih@google.com> Merge "Squashed commit of the following:"
140d4edf9b6524d04da5a3856408ab1372659089 14-Jan-2010 Andreas Huber <andih@google.com> Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation.
ibstagefright/SampleTable.cpp
0ffc90f6edd5f09a49e2f97351723ef1e1a3128a 14-Jan-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit cb11364feefc200f10af6a01f776803acba2792a
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 14 14:05:36 2010 -0800

Even if the decoder didn't extract the thumbnail at the specified time, accept it for now.

commit a54c0244b305caf11e67db49b7d3d8dba5f77751
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 14 11:37:15 2010 -0800

Add some checks to make sure we extract the correct thumbnail frame, also revert to the hardware decoders for thumnbail extraction if the software decoders failed.
ibstagefright/StagefrightMetadataRetriever.cpp
909255a9cf425534e4a8b582a320686852dc59dc 14-Jan-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 0014ab17f2e0986044327a5ab22159de50b81e0a
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 14 14:05:09 2010 -0800

Another instance of returning an error instead of asserting makes sense.

commit d2cac8c498a65b449a25ec216601830d23c165e7
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 14 13:34:33 2010 -0800

Instead of asserting on invalid data (incomplete NAL unit), return an error.
ibstagefright/MPEG4Extractor.cpp
dbcb2c68ee64f3c949079f126b8531c067fafbf7 14-Jan-2010 Andreas Huber <andih@google.com> Workaround for some hardware decoders not properly signaling end-of-output-stream properly.
ibstagefright/OMXCodec.cpp
f91f1b4718c122ce88921de962ca9368800dcd90 14-Jan-2010 Andreas Huber <andih@google.com> Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong.
ibstagefright/omx/tests/OMXHarness.cpp
1cb02bf661807ffc6525dcc13e16d7ce027bef00 13-Jan-2010 Andreas Huber <andih@google.com> Support for determining the mime type of media via metadata extraction.
ava/android/media/MediaMetadataRetriever.java
ibstagefright/AMRExtractor.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/include/AMRExtractor.h
ibstagefright/include/MPEG4Extractor.h
ibstagefright/include/WAVExtractor.h
3a3656ce8a34bf4a17e806c1db1073848de2728f 13-Jan-2010 Andreas Huber <andih@google.com> More metadata support.
ibstagefright/MP3Extractor.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
85fbfee4c90ccc06a0671e3e2969dd95edc6d2da 13-Jan-2010 Andreas Huber <andih@google.com> Merge "Properly respect NALLengthSize in the AVC Configuration header to determine how many bits encode the nal unit size."
db5d662254f2ed788d32e2466739adc8d655c732 13-Jan-2010 Andreas Huber <andih@google.com> Properly respect NALLengthSize in the AVC Configuration header to determine how many bits encode the nal unit size.

related-to-bug: 2363596
ibstagefright/MPEG4Extractor.cpp
9643b1e49c31c13fe0ac4bd9d8bb39e5859287f2 13-Jan-2010 Marco Nelissen <marcone@google.com> Merge "b/2353646 Fix music visualizations to also work with audiotrack callbacks, which stagefright uses. This slightly changes the way the data is stored, since before we were relying on the buffers being written always being at least 4K, whereas the callbacks are generally for smaller amounts of data. Now we append all the data to a big circular buffer, then return chunks of that buffer for visualization. When there are multiple things playing at the same time, this will give the wrong result, but (1) that was the case before as well, and (2) will be fixed once we start visualizing the mixer output instead of the mixer inputs."
5c1fe318ebc5dbd699d9b73cf26c87b928bd6b34 12-Jan-2010 Andreas Huber <andih@google.com> Make sure to release the buffer we're not using in case of an error.

related-to-bug: 2366606
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
e274db1efd73ec8444fa70b64a226d2efa71af87 12-Jan-2010 Marco Nelissen <marcone@google.com> b/2353646
Fix music visualizations to also work with audiotrack callbacks, which
stagefright uses. This slightly changes the way the data is stored,
since before we were relying on the buffers being written always
being at least 4K, whereas the callbacks are generally for smaller
amounts of data. Now we append all the data to a big circular buffer,
then return chunks of that buffer for visualization. When there are
multiple things playing at the same time, this will give the wrong
result, but (1) that was the case before as well, and (2) will be
fixed once we start visualizing the mixer output instead of the
mixer inputs.
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
aee3c6394a367abf283936cb8b8bd85ed028c050 12-Jan-2010 Andreas Huber <andih@google.com> Squashed commit of the following:

commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 11 14:55:56 2010 -0800

Support for duration metadata, midi and ogg-vorbis files (in mediascanner)

commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39
Author: Andreas Huber <andih@google.com>
Date: Mon Jan 11 14:20:45 2010 -0800

Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor.

commit f9818dfac39c96e5fefe8c8295e60580692d5990
Author: Andreas Huber <andih@google.com>
Date: Fri Jan 8 14:26:09 2010 -0800

A first pass at supporting metadata through ID3 tags.

commit 476e9e253633336ab790f943e2d6c0cd8991d76a
Author: Andreas Huber <andih@google.com>
Date: Thu Jan 7 15:48:44 2010 -0800

Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright.

related-to-bug: 2295456
ibstagefright/Android.mk
ibstagefright/AudioPlayer.cpp
ibstagefright/DataSource.cpp
ibstagefright/FileSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/id3/Android.mk
ibstagefright/id3/ID3.cpp
ibstagefright/id3/testid3.cpp
ibstagefright/include/ID3.h
ibstagefright/include/MP3Extractor.h
ibstagefright/include/StagefrightMetadataRetriever.h
593c6a551663efb33802fa4aaa475f3be6a6d1b4 12-Jan-2010 Andreas Huber <andih@google.com> Merge "The mp3 decoder should not assert that decoding was successful but return an error instead."
b6d5d1b7b3d545f5716db2612b91c84f277724e9 11-Jan-2010 Andreas Huber <andih@google.com> Merge "Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string."
afce2158a26a7aca66a6ea8344cc7bc73ab965d3 11-Jan-2010 Andreas Huber <andih@google.com> The mp3 decoder should not assert that decoding was successful but return an error instead.
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
5ebc8898d765321eafbbb7a12cfa529defcd484a 11-Jan-2010 Andreas Huber <andih@google.com> Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string.

related-to-bug: 2366619
ibstagefright/MP3Extractor.cpp
0f5525ad3b9b341a6c288ded8a8a08572fc657c6 11-Jan-2010 San Mehat <san@google.com> framework: asec: Rename 'Cache' -> 'Container'

Signed-off-by: San Mehat <san@google.com>
dutils/sdutil.cpp
84b42b836845a921c853a3f8aa93227e1177f61d 09-Jan-2010 Eric Laurent <elaurent@google.com> am d31d7397: am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.

Merge commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629'

* commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629':
Fix issue 2361949: A2DP suspend parameters set wrongly.
980a938c1c9a6a5791a8240e5a1e6638ab28dc77 09-Jan-2010 Romain Guy <romainguy@android.com> Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
ests/MediaFrameworkTest/res/layout/movie_view.xml
ests/MediaFrameworkTest/res/layout/surface_view.xml
d31d7397ba26dcd913e96d06f0a8fd593780d629 08-Jan-2010 Eric Laurent <elaurent@google.com> am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.

Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp

* commit '663ec308801a34de82db9ab993f0e906da690f89':
Fix issue 2361949: A2DP suspend parameters set wrongly.
e4a838051de5e56f44c71117073a035b804b5d04 08-Jan-2010 Andreas Huber <andih@google.com> Reorganize some of the stagefright implementation related to metadata.
ni/Android.mk
ni/android_media_MediaScanner.cpp
ibmedia/Android.mk
ibmedia/StagefrightMediaScanner.cpp
ibmedia/StagefrightMediaScanner.h
ibmediaplayerservice/Android.mk
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibmediaplayerservice/StagefrightMetadataRetriever.h
ibstagefright/Android.mk
ibstagefright/StagefrightMediaScanner.cpp
ibstagefright/StagefrightMetadataRetriever.cpp
ibstagefright/include/StagefrightMetadataRetriever.h
663ec308801a34de82db9ab993f0e906da690f89 08-Jan-2010 Eric Laurent <elaurent@google.com> Fix issue 2361949: A2DP suspend parameters set wrongly.

Move reset of A2DP suspend state from handleSinkStateChange() in BluetoothA2dpService to
BluetoothA2dp.ACTION_SINK_STATE_CHANGED intent receiver in AudioService.
Previous implementation could cause a false reset of suspend state if a new sink attempted to
connect while A2DP was suspended.
New implementation only resets A2DP suspend state when a new sink is actually connected.
ava/android/media/AudioService.java
a3452ad9be2f203aa5fd319eb923b448c7042e69 07-Jan-2010 James Dong <jdong@google.com> Merge "Add MPEG to the file extensions that scanner cares"
d1265febc4ae20b0e709177735b175acd94b286a 06-Jan-2010 San Mehat <san@google.com> Merge "framework: MountService: Add initial support for Android Secure External Caches"
f66de3cd8eb8df996ac53f6008cd0dbd71157935 06-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Fix typo: test -> tests in makefile tags

Change-Id: Icf23b5ae5d84f6ba9032d1707635a75352f920d2
ests/players/Android.mk
3697229cc7adfd89493e87ba8b6401c8b68bdd71 06-Jan-2010 San Mehat <san@google.com> framework: MountService: Add initial support for Android Secure External Caches

Signed-off-by: San Mehat <san@google.com>
dutils/sdutil.cpp
1b50044a271208bdb0893ed941bd21168faf90c4 16-Dec-2009 James Dong <jdong@google.com> Add MPEG to the file extensions that scanner cares
ava/android/media/MediaFile.java
89e91f76965858a071088d0b5ddef3e9c5ff0967 05-Jan-2010 Andreas Huber <andih@google.com> Quick and dirty implementation to follow http redirects in stagefright.
ibstagefright/HTTPDataSource.cpp
ibstagefright/string.cpp
364b42170dd9bd730897b89e25c8105bce738a30 05-Jan-2010 Andreas Huber <andih@google.com> Merge "Protect against possible temporary objects going away before we get at their data."
dd0359f7a20c940160b2f93d3c332aaab3ffd7d1 05-Jan-2010 Andreas Huber <andih@google.com> Protect against possible temporary objects going away before we get at their data.
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
6b39ab4c5251d29914e4901ee66fc2e3b682e377 05-Jan-2010 Andreas Huber <andih@google.com> Merge "I must have broken raw-audio decoding in the recent past, this fixes it."
c79827a76f91fd36c2f3d598dc7288f6abb86745 05-Jan-2010 Andreas Huber <andih@google.com> I must have broken raw-audio decoding in the recent past, this fixes it.

related-to-bug: http://b/issue?id=2352199
ibstagefright/AwesomePlayer.cpp
67aee053ba449522e65346a5095a571edcf676ea 05-Jan-2010 Andreas Huber <andih@google.com> Use stagefright for http streaming if the right property is set.
ibmediaplayerservice/MediaPlayerService.cpp
7eca5014339c62eaefe4c78246a24887e3face0b 05-Jan-2010 Marco Nelissen <marcone@google.com> Merge "MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING"
9a488b44cb479bc42375d2cfcdd4aa6161dc17cf 05-Jan-2010 Marco Nelissen <marcone@google.com> MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING
ava/android/media/MediaFile.java
ava/android/media/MediaScanner.java
1a08ad1cae432edf8b55bbef8855fb3f492ca32e 05-Jan-2010 Andreas Huber <andih@google.com> Merge "Make metadata support through stagefright property dependent until it's ready."
c4273482e0f728cdab2a63831ce05d010ac5b626 05-Jan-2010 Andreas Huber <andih@google.com> Merge "Fix mpeg4/h.263 software decoder."
7782fdf5b78aecd078eb0d35c23dd77bc4c3ec6e 05-Jan-2010 Andreas Huber <andih@google.com> Make metadata support through stagefright property dependent until it's ready.
ibmediaplayerservice/MetadataRetrieverClient.cpp
2039bd93ed9801927bffce43698b29645482b188 04-Jan-2010 Andreas Huber <andih@google.com> Fix mpeg4/h.263 software decoder.
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
ibstagefright/include/M4vH263Decoder.h
6be8b14e25718372e37bf9f1e09db37215db666e 04-Jan-2010 Andreas Huber <andih@google.com> Fix avc software decoder to properly handle SEI nalType and access unit delimiter.
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
a0b517609dfd8436a98bdebb31466f19ffec6cb5 28-Dec-2009 Eric Laurent <elaurent@google.com> am 68e9014e: am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.

Merge commit '68e9014e47f7350b3889e1704dde809b2a926968'

* commit '68e9014e47f7350b3889e1704dde809b2a926968':
Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
3c56221af7160355f5265bc2dc14322636d945fc 24-Dec-2009 Dave Sparks <davidsparks@android.com> Fix SoundPool restart problem CheckJNI issue.
ni/soundpool/android_media_SoundPool.cpp
1905530bb1316674f9bc9794bad98f439f8df232 23-Dec-2009 Dave Sparks <davidsparks@android.com> Replace sine with organ for some SoundPool tests.
ests/SoundPoolTest/res/raw/organ441.ogg
ests/SoundPoolTest/src/com/android/SoundPoolTest.java
d94466c4c8054cbe68cffb132d0ad90d924dca01 15-Dec-2009 Dave Sparks <davidsparks@android.com> Add SoundPool test
ests/SoundPoolTest/Android.mk
ests/SoundPoolTest/AndroidManifest.xml
ests/SoundPoolTest/res/raw/sine441.ogg
ests/SoundPoolTest/res/raw/test1.mp3
ests/SoundPoolTest/res/raw/test2.ogg
ests/SoundPoolTest/res/raw/test3.ogg
ests/SoundPoolTest/res/raw/test4.ogg
ests/SoundPoolTest/res/raw/test5.ogg
ests/SoundPoolTest/src/com/android/SoundPoolTest.java
011a3dfd8502aba17fb9c5b202ea2267880213d4 23-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I9120be33

* changes:
Add OnLoadCompleteListener to SoundPool.
f6e43bf29084760b39257b2273e0f04c2815fdc5 08-Dec-2009 Dave Sparks <davidsparks@android.com> Add OnLoadCompleteListener to SoundPool.
ava/android/media/SoundPool.java
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/SoundPoolThread.cpp
ni/soundpool/SoundPoolThread.h
ni/soundpool/android_media_SoundPool.cpp
cf4fc6263c1c24ffa91a65a75edb126143a2617e 23-Dec-2009 Eric Laurent <elaurent@google.com> am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclair

Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a'

* commit 'f31f365a7708c931e955670bc6213fdc8f91a87a':
Fix issues 2333450 and 2333559:
f31f365a7708c931e955670bc6213fdc8f91a87a 23-Dec-2009 Eric Laurent <elaurent@google.com> am eb5ffc23: Merge change Id8e98194 into eclair

Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp

* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
Fix issues 2333450 and 2333559:
68e9014e47f7350b3889e1704dde809b2a926968 23-Dec-2009 Eric Laurent <elaurent@google.com> am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.

Merge commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e' into eclair-mr2-plus-aosp

* commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e':
Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
eb14a783be073b5fd6e8c8c9bc87d2d1919f2c9e 17-Dec-2009 Eric Laurent <elaurent@google.com> Fix issues 2333450 and 2333559:

Add new config values to AudioSystem::FOR_DOCK force usage to differenciate car and desk docks.
Use a receiver for the sticky Intent.ACTION_DOCK_EVENT in AudioService to detect the type
of dock and select force usage accordingly.
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
5038c78f1373bf97bcb8fd030928b3cde2051ac6 22-Dec-2009 Doug Kwan <dougkwan@google.com> Add missing shared libraries in linker commands. Currently these libraries are
linked implicitly via dependencies of other shared libraries.
ibstagefright/omx/tests/Android.mk
ests/omxjpegdecoder/Android.mk
484d2888680e18e6ad8c3fcc51e3b70a705a096e 08-Dec-2009 Eric Laurent <elaurent@google.com> Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.

Add a separate system settings entry for bluetooth SCO volume.
ava/android/media/AudioService.java
11b04a6e76a15ee6796b16cb181a4ce191d8a373 19-Dec-2009 James Dong <jdong@google.com> am 122fe7e1: am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc

Merge commit '122fe7e10297ce51d63b6076a33573d217f3f1cc'

* commit '122fe7e10297ce51d63b6076a33573d217f3f1cc':
Attempt to fix simular build break.
122fe7e10297ce51d63b6076a33573d217f3f1cc 19-Dec-2009 James Dong <jdong@google.com> am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc

Merge commit '4d0e827d0be6085893428b420ec5800f1973a43b' into eclair-mr2-plus-aosp

* commit '4d0e827d0be6085893428b420ec5800f1973a43b':
Attempt to fix simular build break.
4d0e827d0be6085893428b420ec5800f1973a43b 19-Dec-2009 James Dong <jdong@google.com> Attempt to fix simular build break.
Missing header file stdlib.h for free, malloc, etc
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
ibstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
8852a67e3af387652b61e533a4ac4579e17da676 19-Dec-2009 James Dong <jdong@google.com> am 2473eb4a: am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable

Merge commit '2473eb4a33b226758e1f5db322cb8d687ce01602'

* commit '2473eb4a33b226758e1f5db322cb8d687ce01602':
Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
2473eb4a33b226758e1f5db322cb8d687ce01602 19-Dec-2009 James Dong <jdong@google.com> am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable

Merge commit '4e4795c8c0934eb063048471037ecb8a713e85fd' into eclair-mr2-plus-aosp

* commit '4e4795c8c0934eb063048471037ecb8a713e85fd':
Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
4e4795c8c0934eb063048471037ecb8a713e85fd 19-Dec-2009 James Dong <jdong@google.com> Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
ibstagefright/include/M4vH263Decoder.h
e48ad1af0ff1fcc264a34a75f8998b63aa5cf7c4 18-Dec-2009 Gloria Wang <gwang@google.com> am 254e0025: am 791c626a: Merge change Ibac388a3 into eclair-mr2

Merge commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542'

* commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542':
Add support for XING header
254e00253ce72ee7252c26aab3a9ec6fb72e0542 18-Dec-2009 Gloria Wang <gwang@google.com> am 791c626a: Merge change Ibac388a3 into eclair-mr2

Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp

* commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233':
Add support for XING header
791c626addcb30c6fbe3522aa7e1afe86ce4d233 18-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ibac388a3 into eclair-mr2

* changes:
Add support for XING header
254d160dd8c0e5dc6392f98938ada76810265449 18-Dec-2009 James Dong <jdong@google.com> am 5614c2c6: am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV

Merge commit '5614c2c677ce08561c93c6385dc3090dbf5760dc'

* commit '5614c2c677ce08561c93c6385dc3090dbf5760dc':
Initial checkins of the mpeg4 and h263 software decoders based on PV
1ba307d3c5800705e3fda10fb6c809f811c0f275 10-Dec-2009 Gloria Wang <gwang@google.com> Add support for XING header
ibstagefright/MP3Extractor.cpp
ibstagefright/include/MP3Extractor.h
913730739f89ddf64439251d0d8c6b503c3b9d04 18-Dec-2009 Andreas Huber <andih@google.com> Attempt to fix the simulator build by including stdlib.h for NULL.
ibstagefright/codecs/avc/common/include/avclib_common.h
72012ea6004e5c0bb044b56ce8f81cefe7385f21 17-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I2278137e

* changes:
Disable HTTP playback and metadata support in stagefright, use PV instead.
6a3a018f91c51b5cc223d1d081144354362f87b5 17-Dec-2009 Andreas Huber <andih@google.com> Disable HTTP playback and metadata support in stagefright, use PV instead.
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
5614c2c677ce08561c93c6385dc3090dbf5760dc 17-Dec-2009 James Dong <jdong@google.com> am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV

Merge commit '02f5b5447de349216a40086ca6061efefb5a3025' into eclair-mr2-plus-aosp

* commit '02f5b5447de349216a40086ca6061efefb5a3025':
Initial checkins of the mpeg4 and h263 software decoders based on PV
02f5b5447de349216a40086ca6061efefb5a3025 16-Dec-2009 James Dong <jdong@google.com> Initial checkins of the mpeg4 and h263 software decoders based on PV
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/m4v_h263/Android.mk
ibstagefright/codecs/m4v_h263/dec/Android.mk
ibstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
ibstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
ibstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h
ibstagefright/codecs/m4v_h263/dec/include/visual_header.h
ibstagefright/codecs/m4v_h263/dec/src/adaptive_smooth_no_mmx.cpp
ibstagefright/codecs/m4v_h263/dec/src/bitstream.cpp
ibstagefright/codecs/m4v_h263/dec/src/bitstream.h
ibstagefright/codecs/m4v_h263/dec/src/block_idct.cpp
ibstagefright/codecs/m4v_h263/dec/src/cal_dc_scaler.cpp
ibstagefright/codecs/m4v_h263/dec/src/chv_filter.cpp
ibstagefright/codecs/m4v_h263/dec/src/chvr_filter.cpp
ibstagefright/codecs/m4v_h263/dec/src/combined_decode.cpp
ibstagefright/codecs/m4v_h263/dec/src/conceal.cpp
ibstagefright/codecs/m4v_h263/dec/src/datapart_decode.cpp
ibstagefright/codecs/m4v_h263/dec/src/dcac_prediction.cpp
ibstagefright/codecs/m4v_h263/dec/src/dec_pred_intra_dc.cpp
ibstagefright/codecs/m4v_h263/dec/src/deringing_chroma.cpp
ibstagefright/codecs/m4v_h263/dec/src/deringing_luma.cpp
ibstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp
ibstagefright/codecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp
ibstagefright/codecs/m4v_h263/dec/src/get_pred_outside.cpp
ibstagefright/codecs/m4v_h263/dec/src/idct.cpp
ibstagefright/codecs/m4v_h263/dec/src/idct.h
ibstagefright/codecs/m4v_h263/dec/src/idct_vca.cpp
ibstagefright/codecs/m4v_h263/dec/src/max_level.h
ibstagefright/codecs/m4v_h263/dec/src/mb_motion_comp.cpp
ibstagefright/codecs/m4v_h263/dec/src/mb_utils.cpp
ibstagefright/codecs/m4v_h263/dec/src/mbtype_mode.h
ibstagefright/codecs/m4v_h263/dec/src/motion_comp.h
ibstagefright/codecs/m4v_h263/dec/src/mp4dec_lib.h
ibstagefright/codecs/m4v_h263/dec/src/mp4def.h
ibstagefright/codecs/m4v_h263/dec/src/mp4lib_int.h
ibstagefright/codecs/m4v_h263/dec/src/packet_util.cpp
ibstagefright/codecs/m4v_h263/dec/src/post_filter.cpp
ibstagefright/codecs/m4v_h263/dec/src/post_proc.h
ibstagefright/codecs/m4v_h263/dec/src/post_proc_semaphore.cpp
ibstagefright/codecs/m4v_h263/dec/src/pp_semaphore_chroma_inter.cpp
ibstagefright/codecs/m4v_h263/dec/src/pp_semaphore_luma.cpp
ibstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
ibstagefright/codecs/m4v_h263/dec/src/scaling.h
ibstagefright/codecs/m4v_h263/dec/src/scaling_tab.cpp
ibstagefright/codecs/m4v_h263/dec/src/vlc_dec_tab.h
ibstagefright/codecs/m4v_h263/dec/src/vlc_decode.cpp
ibstagefright/codecs/m4v_h263/dec/src/vlc_decode.h
ibstagefright/codecs/m4v_h263/dec/src/vlc_dequant.cpp
ibstagefright/codecs/m4v_h263/dec/src/vlc_tab.cpp
ibstagefright/codecs/m4v_h263/dec/src/vop.cpp
ibstagefright/codecs/m4v_h263/dec/src/zigzag.h
ibstagefright/codecs/m4v_h263/dec/src/zigzag_tab.cpp
ibstagefright/codecs/m4v_h263/patent_disclaimer.txt
ibstagefright/include/M4vH263Decoder.h
4f471648e976d4f0000bd0dbcd0b4ebc4e0b16dd 17-Dec-2009 Andreas Huber <andih@google.com> am b5c6be6d: am 082e5171: Merge change I895fb7d7 into eclair-mr2

Merge commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb'

* commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb':
Squashed commit of the following:
b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb 17-Dec-2009 Andreas Huber <andih@google.com> am 082e5171: Merge change I895fb7d7 into eclair-mr2

Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp

* commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d':
Squashed commit of the following:
2ea14e231945afb6581fa8f54015b33bc74a19e5 16-Dec-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 144b1c40e9cf08a584c50e1bef7ba3f287e81a4f
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 16 09:28:23 2009 -0800

This H264 file shows a certain problem even better.

commit 3245f1f3b7471975aeeb824a756c987abd610f55
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 16 09:20:08 2009 -0800

Using only the QA testfiles now.

commit 074817eb3816c5dd70858a3594e3b92d799d873b
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 15 16:17:39 2009 -0800

Yay, roles are back again now that the API is in place.

commit 6d847e4932cc38301ae27cb7283b7f1553a95457
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 15 13:01:20 2009 -0800

Added commandline option for specifying the random seed for reproducable tests.

commit 62ab37b26336eaa67e49791c41c996acb6acee3f
Author: Andreas Huber <andih@google.com>
Date: Mon Dec 14 10:53:27 2009 -0800

When issuing a seek it is important that only the first MediaSource::read call has the seek option.

commit e77c46644b2fb6862bafa3569f7d304252074f1e
Author: Andreas Huber <andih@google.com>
Date: Mon Dec 7 16:39:07 2009 -0800

Make sure the tests are actually built, sp<OMXCodec> becomes sp<MediaSource>

commit 6df56915bd55a9445b3c6f953d3cc251d81579b8
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 14:25:36 2009 -0800

Temporarily disable support for querying the roles of OMX components.

commit 31bb26930df9e3658dea684cedb4b0f1a06a4a88
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 1 13:36:52 2009 -0800

Disregard EOS events, slightly change the way the EOS flag on output buffers is handled.

commit 4c382fbc9aebee8197d5988d04378062809e7c48
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 1 09:37:24 2009 -0800

New random seek test for the codec tests. Fixed "sticky" end-of-output-buffers flag behaviour in OMXCodec.

commit c762eac3e44309592b61a168d66e091cf609fa03
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 3 14:13:43 2009 -0800

Fix a typo.

commit 50540a59b65c7d476b0193c7494cd75895e6ca6d
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 3 09:48:35 2009 -0800

Some more fine tuning of the unit tests, make MPEG4Extractor less verbose.

commit 1157a7e52a0636706caa235abe16d2ff8a0b8140
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 28 12:01:01 2009 -0700

Changes to the IOMX::listNodes API, this now returns the component's roles as well, unit tests now test all components in all supported roles by default.

commit 30fbf2d8c6cb927689f7ba75eb550a81e9df488a
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 09:45:26 2009 -0700

Initial check-in of unit tests for OMX components.
ibmedia/IOMX.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/tests/Android.mk
ibstagefright/omx/tests/OMXHarness.cpp
ibstagefright/omx/tests/OMXHarness.h
987dbde838014e5f0c55a63acdd2a9a002b140cc 16-Dec-2009 Andreas Huber <andih@google.com> Fix full stagefright build in master, various warnings/errors in omx_jpeg_decoder
ests/omxjpegdecoder/SkOmxPixelRef.cpp
ests/omxjpegdecoder/SkOmxPixelRef.h
ests/omxjpegdecoder/jpeg_decoder_bench.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.h
cef27ee7dc147018196577eaa4e7293f09c37ab1 16-Dec-2009 Andreas Huber <andih@google.com> am d9344791: am d980e656: Merge change Ic7e91eee into eclair-mr2

Merge commit 'd93447910055565726836a1cdcfc3bad7c95f98c'

* commit 'd93447910055565726836a1cdcfc3bad7c95f98c':
Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
3d4c89cce1d526a59c2298e16ac13e067f41b589 16-Dec-2009 Andreas Huber <andih@google.com> am e065696c: am ae77561b: Merge change I7f11a67a into eclair-mr2

Merge commit 'e065696cd93a454877b44de9b96a033a7553b5ff'

* commit 'e065696cd93a454877b44de9b96a033a7553b5ff':
Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
d93447910055565726836a1cdcfc3bad7c95f98c 16-Dec-2009 Andreas Huber <andih@google.com> am d980e656: Merge change Ic7e91eee into eclair-mr2

Merge commit 'd980e656baa842592944c6fed371c9b37b2feea9' into eclair-mr2-plus-aosp

* commit 'd980e656baa842592944c6fed371c9b37b2feea9':
Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
c7e91eee2e79e3e4c8f84fd6b8a753215955d4e8 16-Dec-2009 Andreas Huber <andih@google.com> Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXMaster.cpp
ibstagefright/omx/OMXMaster.h
ibstagefright/omx/OMXPVCodecsPlugin.cpp
ibstagefright/omx/OMXPVCodecsPlugin.h
ibstagefright/omx/OMXSoftwareCodecsPlugin.cpp
ibstagefright/omx/OMXSoftwareCodecsPlugin.h
c333133107fb492de481a96ed1277e71daf2dd8c 16-Dec-2009 Dave Sparks <davidsparks@android.com> am b5fc8ffc: am 91487425: Merge change I0448ef20 into eclair

Merge commit 'b5fc8ffcff6b8e1747af5c6ba1176a81986b55a8'

* commit 'b5fc8ffcff6b8e1747af5c6ba1176a81986b55a8':
Fix SoundPool buffer size rounding error. Bug 2327620.
e065696cd93a454877b44de9b96a033a7553b5ff 15-Dec-2009 Andreas Huber <andih@google.com> am ae77561b: Merge change I7f11a67a into eclair-mr2

Merge commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a' into eclair-mr2-plus-aosp

* commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a':
Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
fb1c2f8d8d8a7ae9cd1f5288f8845485f72a9a91 15-Dec-2009 Andreas Huber <andih@google.com> Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
ibstagefright/OMXCodec.cpp
b5fc8ffcff6b8e1747af5c6ba1176a81986b55a8 15-Dec-2009 Dave Sparks <davidsparks@android.com> am 91487425: Merge change I0448ef20 into eclair

Merge commit '9148742546defc66a23ca1a0fc8f5515ff2c6c61' into eclair-plus-aosp

* commit '9148742546defc66a23ca1a0fc8f5515ff2c6c61':
Fix SoundPool buffer size rounding error. Bug 2327620.
66d28cedd92dcc1669ace23231da1b8c1374ff2f 15-Dec-2009 Dave Sparks <davidsparks@android.com> Fix SoundPool buffer size rounding error. Bug 2327620.

AudioTrack was modified earlier to calculate minimum buffer size
based on the hardware reported latency. Previously, it was a
hard-coded value. As a result of this change, the minimum buffer
size is now variable based on hardware latency. On Passion, this
brought out a subtle rounding error in the buffer size calculation
in SoundPool. This can cause AudioTrack creation to fail based on
the requested sample rate. This fix calculates the total buffer
size first, and then does rounding before dividing by the number
of buffers.
ni/soundpool/SoundPool.cpp
74a76d5e071ba11eb92c92933fa5de338010374d 15-Dec-2009 Dianne Hackborn <hackbod@google.com> am 83652ebf: am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2

Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'

* commit '83652ebfe1963bcecdcf24383165904223baca6e':
Implement API to have new broadcasts replace existing broadcasts.
83652ebfe1963bcecdcf24383165904223baca6e 15-Dec-2009 Dianne Hackborn <hackbod@google.com> am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2

Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp

* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
Implement API to have new broadcasts replace existing broadcasts.
3a3fd2ba1ffc6171725375396cc59711a34bb39e 15-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Iaf1f0918 into eclair-mr2

* changes:
Implement API to have new broadcasts replace existing broadcasts.
96610668869cd1c8c614d0c0eab3b79218da7cd7 15-Dec-2009 Andreas Huber <andih@google.com> am 08e2106a: am 67f1db1c: Merge change Ib1f5ee41 into eclair-mr2

Merge commit '08e2106a19a034670287374d96d671495e4ffc5f'

* commit '08e2106a19a034670287374d96d671495e4ffc5f':
It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
08e2106a19a034670287374d96d671495e4ffc5f 15-Dec-2009 Andreas Huber <andih@google.com> am 67f1db1c: Merge change Ib1f5ee41 into eclair-mr2

Merge commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85' into eclair-mr2-plus-aosp

* commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85':
It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
00cda269b56a2ae846b74f68f832302f53fe3607 15-Dec-2009 Andreas Huber <andih@google.com> am dc7294d9: am 19553241: Merge change I1314e737 into eclair-mr2

Merge commit 'dc7294d94dba213727c1956774466707e58a8784'

* commit 'dc7294d94dba213727c1956774466707e58a8784':
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
ee49747efaf6984ce2bcfbbaa7dd9b617755baaf 15-Dec-2009 Andreas Huber <andih@google.com> am 354cf967: am 0483f1c1: Merge change Ib5ae1c87 into eclair-mr2

Merge commit '354cf96792196ce0fec358a573d2621ad2ab0788'

* commit '354cf96792196ce0fec358a573d2621ad2ab0788':
The software AVCDecoder now properly seeks as requested.
b1f5ee41e9326dff132ad59de169cb3e79930f07 15-Dec-2009 Andreas Huber <andih@google.com> It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
ibstagefright/AwesomePlayer.cpp
dc7294d94dba213727c1956774466707e58a8784 15-Dec-2009 Andreas Huber <andih@google.com> am 19553241: Merge change I1314e737 into eclair-mr2

Merge commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc' into eclair-mr2-plus-aosp

* commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc':
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
354cf96792196ce0fec358a573d2621ad2ab0788 15-Dec-2009 Andreas Huber <andih@google.com> am 0483f1c1: Merge change Ib5ae1c87 into eclair-mr2

Merge commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb' into eclair-mr2-plus-aosp

* commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb':
The software AVCDecoder now properly seeks as requested.
1c633fc89bae9bf0af6fe643ac7ad2e744f27bed 09-Dec-2009 Dianne Hackborn <hackbod@google.com> Implement API to have new broadcasts replace existing broadcasts.

Use this in various places where it should serve no purpose to deliver
both broadcasts. This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
ava/android/media/AudioService.java
19553241513bd2ee2610026ebbce8c45c7ae0dbc 14-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I1314e737 into eclair-mr2

* changes:
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
1314e73786afacb49ddbff7c3d0c1cf9d2c688c9 14-Dec-2009 Andreas Huber <andih@google.com> AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
ibstagefright/AwesomePlayer.cpp
ibstagefright/colorconversion/Android.mk
ibstagefright/colorconversion/ColorConverter.cpp
ibstagefright/colorconversion/SoftwareRenderer.cpp
ibstagefright/include/AwesomePlayer.h
ibstagefright/omx/Android.mk
ibstagefright/omx/ColorConverter.cpp
ibstagefright/omx/SoftwareRenderer.cpp
b5ae1c8712ee74ae30a115b80ecde9990bdb9a9f 14-Dec-2009 Andreas Huber <andih@google.com> The software AVCDecoder now properly seeks as requested.
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/include/AVCDecoder.h
184f8f52e7d8712c469f3718d7eb291366cd7b7d 12-Dec-2009 Andreas Huber <andih@google.com> am 28fdcf93: am 08945576: Merge change I9ac0777e into eclair-mr2

Merge commit '28fdcf93bd4150299d1b7eda0c9bdcf4ae75069a'

* commit '28fdcf93bd4150299d1b7eda0c9bdcf4ae75069a':
Initial checkin of software AMR NB encoder based on PV source code.
28fdcf93bd4150299d1b7eda0c9bdcf4ae75069a 12-Dec-2009 Andreas Huber <andih@google.com> am 08945576: Merge change I9ac0777e into eclair-mr2

Merge commit '089455760c05289c1315268a6cb896577ceebc64' into eclair-mr2-plus-aosp

* commit '089455760c05289c1315268a6cb896577ceebc64':
Initial checkin of software AMR NB encoder based on PV source code.
d49b526dd2009270cb15f7fe4e70b74673950608 12-Dec-2009 Andreas Huber <andih@google.com> Initial checkin of software AMR NB encoder based on PV source code.
ibstagefright/Android.mk
ibstagefright/MP3Extractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
ibstagefright/codecs/amrnb/enc/Android.mk
ibstagefright/codecs/amrnb/enc/src/amrencode.cpp
ibstagefright/codecs/amrnb/enc/src/amrencode.h
ibstagefright/codecs/amrnb/enc/src/autocorr.cpp
ibstagefright/codecs/amrnb/enc/src/autocorr.h
ibstagefright/codecs/amrnb/enc/src/c1035pf.cpp
ibstagefright/codecs/amrnb/enc/src/c1035pf.h
ibstagefright/codecs/amrnb/enc/src/c2_11pf.cpp
ibstagefright/codecs/amrnb/enc/src/c2_11pf.h
ibstagefright/codecs/amrnb/enc/src/c2_9pf.cpp
ibstagefright/codecs/amrnb/enc/src/c2_9pf.h
ibstagefright/codecs/amrnb/enc/src/c3_14pf.cpp
ibstagefright/codecs/amrnb/enc/src/c3_14pf.h
ibstagefright/codecs/amrnb/enc/src/c4_17pf.cpp
ibstagefright/codecs/amrnb/enc/src/c4_17pf.h
ibstagefright/codecs/amrnb/enc/src/c8_31pf.cpp
ibstagefright/codecs/amrnb/enc/src/c8_31pf.h
ibstagefright/codecs/amrnb/enc/src/calc_cor.cpp
ibstagefright/codecs/amrnb/enc/src/calc_cor.h
ibstagefright/codecs/amrnb/enc/src/calc_en.cpp
ibstagefright/codecs/amrnb/enc/src/calc_en.h
ibstagefright/codecs/amrnb/enc/src/cbsearch.cpp
ibstagefright/codecs/amrnb/enc/src/cbsearch.h
ibstagefright/codecs/amrnb/enc/src/cl_ltp.cpp
ibstagefright/codecs/amrnb/enc/src/cl_ltp.h
ibstagefright/codecs/amrnb/enc/src/cod_amr.cpp
ibstagefright/codecs/amrnb/enc/src/cod_amr.h
ibstagefright/codecs/amrnb/enc/src/convolve.cpp
ibstagefright/codecs/amrnb/enc/src/convolve.h
ibstagefright/codecs/amrnb/enc/src/cor_h.cpp
ibstagefright/codecs/amrnb/enc/src/cor_h.h
ibstagefright/codecs/amrnb/enc/src/cor_h_x.cpp
ibstagefright/codecs/amrnb/enc/src/cor_h_x.h
ibstagefright/codecs/amrnb/enc/src/cor_h_x2.cpp
ibstagefright/codecs/amrnb/enc/src/cor_h_x2.h
ibstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp
ibstagefright/codecs/amrnb/enc/src/dtx_enc.cpp
ibstagefright/codecs/amrnb/enc/src/dtx_enc.h
ibstagefright/codecs/amrnb/enc/src/enc_lag3.cpp
ibstagefright/codecs/amrnb/enc/src/enc_lag3.h
ibstagefright/codecs/amrnb/enc/src/enc_lag6.cpp
ibstagefright/codecs/amrnb/enc/src/enc_lag6.h
ibstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp
ibstagefright/codecs/amrnb/enc/src/ets_to_if2.cpp
ibstagefright/codecs/amrnb/enc/src/ets_to_if2.h
ibstagefright/codecs/amrnb/enc/src/ets_to_wmf.cpp
ibstagefright/codecs/amrnb/enc/src/ets_to_wmf.h
ibstagefright/codecs/amrnb/enc/src/g_adapt.cpp
ibstagefright/codecs/amrnb/enc/src/g_adapt.h
ibstagefright/codecs/amrnb/enc/src/g_code.cpp
ibstagefright/codecs/amrnb/enc/src/g_code.h
ibstagefright/codecs/amrnb/enc/src/g_pitch.cpp
ibstagefright/codecs/amrnb/enc/src/g_pitch.h
ibstagefright/codecs/amrnb/enc/src/gain_q.cpp
ibstagefright/codecs/amrnb/enc/src/gain_q.h
ibstagefright/codecs/amrnb/enc/src/gsmamr_enc.h
ibstagefright/codecs/amrnb/enc/src/hp_max.cpp
ibstagefright/codecs/amrnb/enc/src/hp_max.h
ibstagefright/codecs/amrnb/enc/src/inter_36.cpp
ibstagefright/codecs/amrnb/enc/src/inter_36.h
ibstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp
ibstagefright/codecs/amrnb/enc/src/inter_36_tab.h
ibstagefright/codecs/amrnb/enc/src/l_comp.cpp
ibstagefright/codecs/amrnb/enc/src/l_extract.cpp
ibstagefright/codecs/amrnb/enc/src/l_negate.cpp
ibstagefright/codecs/amrnb/enc/src/lag_wind.cpp
ibstagefright/codecs/amrnb/enc/src/lag_wind.h
ibstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp
ibstagefright/codecs/amrnb/enc/src/lag_wind_tab.h
ibstagefright/codecs/amrnb/enc/src/levinson.cpp
ibstagefright/codecs/amrnb/enc/src/levinson.h
ibstagefright/codecs/amrnb/enc/src/lpc.cpp
ibstagefright/codecs/amrnb/enc/src/lpc.h
ibstagefright/codecs/amrnb/enc/src/ol_ltp.cpp
ibstagefright/codecs/amrnb/enc/src/ol_ltp.h
ibstagefright/codecs/amrnb/enc/src/p_ol_wgh.cpp
ibstagefright/codecs/amrnb/enc/src/pitch_fr.cpp
ibstagefright/codecs/amrnb/enc/src/pitch_fr.h
ibstagefright/codecs/amrnb/enc/src/pitch_ol.cpp
ibstagefright/codecs/amrnb/enc/src/pitch_ol.h
ibstagefright/codecs/amrnb/enc/src/pre_big.cpp
ibstagefright/codecs/amrnb/enc/src/pre_big.h
ibstagefright/codecs/amrnb/enc/src/pre_proc.cpp
ibstagefright/codecs/amrnb/enc/src/pre_proc.h
ibstagefright/codecs/amrnb/enc/src/prm2bits.cpp
ibstagefright/codecs/amrnb/enc/src/prm2bits.h
ibstagefright/codecs/amrnb/enc/src/q_gain_c.cpp
ibstagefright/codecs/amrnb/enc/src/q_gain_c.h
ibstagefright/codecs/amrnb/enc/src/q_gain_p.cpp
ibstagefright/codecs/amrnb/enc/src/q_gain_p.h
ibstagefright/codecs/amrnb/enc/src/qgain475.cpp
ibstagefright/codecs/amrnb/enc/src/qgain475.h
ibstagefright/codecs/amrnb/enc/src/qgain795.cpp
ibstagefright/codecs/amrnb/enc/src/qgain795.h
ibstagefright/codecs/amrnb/enc/src/qua_gain.cpp
ibstagefright/codecs/amrnb/enc/src/s10_8pf.cpp
ibstagefright/codecs/amrnb/enc/src/s10_8pf.h
ibstagefright/codecs/amrnb/enc/src/set_sign.cpp
ibstagefright/codecs/amrnb/enc/src/set_sign.h
ibstagefright/codecs/amrnb/enc/src/sid_sync.cpp
ibstagefright/codecs/amrnb/enc/src/sid_sync.h
ibstagefright/codecs/amrnb/enc/src/sp_enc.cpp
ibstagefright/codecs/amrnb/enc/src/sp_enc.h
ibstagefright/codecs/amrnb/enc/src/spreproc.cpp
ibstagefright/codecs/amrnb/enc/src/spreproc.h
ibstagefright/codecs/amrnb/enc/src/spstproc.cpp
ibstagefright/codecs/amrnb/enc/src/spstproc.h
ibstagefright/codecs/amrnb/enc/src/ton_stab.cpp
ibstagefright/codecs/amrnb/enc/src/ton_stab.h
ibstagefright/include/AMRNBEncoder.h
b99349e1d33a4ab3cd03b4ca5cc495a7ae65fca1 11-Dec-2009 Andreas Huber <andih@google.com> am e86a37c6: am 8eac1637: Merge change I85adf5e5 into eclair-mr2

Merge commit 'e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8'

* commit 'e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8':
Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8 11-Dec-2009 Andreas Huber <andih@google.com> am 8eac1637: Merge change I85adf5e5 into eclair-mr2

Merge commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23' into eclair-mr2-plus-aosp

* commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23':
Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
85adf5e56235bcea2f8991d983b94f4199e28faa 11-Dec-2009 Andreas Huber <andih@google.com> Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
ibstagefright/codecs/amrwb/AMRWBDecoder.cpp
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
97f2578e8cf154ba08f2f4219a8ff1cd97613192 11-Dec-2009 Andreas Huber <andih@google.com> am ea113f30: am d8729c59: Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.

Merge commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e'

* commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e':
Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
ea113f307d459577e9ed3ea2cbbbb77c92235a6e 11-Dec-2009 Andreas Huber <andih@google.com> am d8729c59: Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.

Merge commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b' into eclair-mr2-plus-aosp

* commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b':
Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
d8729c597b9fe8cbdbf145bea0dbaec4f075015b 11-Dec-2009 Andreas Huber <andih@google.com> Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h
ibstagefright/include/AVCDecoder.h
0a57ac4b4bf178c463850be6d4264cbf49bcb023 11-Dec-2009 Andreas Huber <andih@google.com> am 554647e9: am 6ddcf01a: remote destructors are not synchronously executed by the binder...

Merge commit '554647e963432d34c41e69e4c6c0c6e4cb08e80e'

* commit '554647e963432d34c41e69e4c6c0c6e4cb08e80e':
remote destructors are not synchronously executed by the binder...
fe7923aa92922b8a2f7784acedfea4b8fc3997bb 11-Dec-2009 Andreas Huber <andih@google.com> am 63b3a29d: am c1d5c921: Fix seek-on-startup behaviour in AwesomePlayer.

Merge commit '63b3a29d4fe85d709403c1030d221d97f89b9744'

* commit '63b3a29d4fe85d709403c1030d221d97f89b9744':
Fix seek-on-startup behaviour in AwesomePlayer.
2cdbc03e47eecf3622c2ad047bf4c707f5864d62 11-Dec-2009 Andreas Huber <andih@google.com> am 9ec965e4: am b78599b7: Merge change Ia67d5388 into eclair-mr2

Merge commit '9ec965e4fb242c9c570e43980425b8f275eb2159'

* commit '9ec965e4fb242c9c570e43980425b8f275eb2159':
remote destructors are not synchronously executed by the binder...
554647e963432d34c41e69e4c6c0c6e4cb08e80e 11-Dec-2009 Andreas Huber <andih@google.com> am 6ddcf01a: remote destructors are not synchronously executed by the binder...

Merge commit '6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1' into eclair-mr2-plus-aosp

* commit '6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1':
remote destructors are not synchronously executed by the binder...
63b3a29d4fe85d709403c1030d221d97f89b9744 11-Dec-2009 Andreas Huber <andih@google.com> am c1d5c921: Fix seek-on-startup behaviour in AwesomePlayer.

Merge commit 'c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2' into eclair-mr2-plus-aosp

* commit 'c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2':
Fix seek-on-startup behaviour in AwesomePlayer.
9ec965e4fb242c9c570e43980425b8f275eb2159 11-Dec-2009 Andreas Huber <andih@google.com> am b78599b7: Merge change Ia67d5388 into eclair-mr2

Merge commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740' into eclair-mr2-plus-aosp

* commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740':
remote destructors are not synchronously executed by the binder...
6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1 11-Dec-2009 Andreas Huber <andih@google.com> remote destructors are not synchronously executed by the binder...
ibstagefright/AwesomePlayer.cpp
c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2 11-Dec-2009 Andreas Huber <andih@google.com> Fix seek-on-startup behaviour in AwesomePlayer.
ibstagefright/AwesomePlayer.cpp
2a12359515c8621f2fb54f954eaa7ef581f21f01 11-Dec-2009 Andreas Huber <andih@google.com> am fd672a8a: am fd499830: Merge change I595c2d60 into eclair-mr2

Merge commit 'fd672a8a8cde8d1d22878e966e8f10470966541f'

* commit 'fd672a8a8cde8d1d22878e966e8f10470966541f':
Initial checkin of software AVC video decoder based on PV source code.
b78599b738b7a66f5bd1bed815e9cb433b2fe740 11-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ia67d5388 into eclair-mr2

* changes:
remote destructors are not synchronously executed by the binder...
fd672a8a8cde8d1d22878e966e8f10470966541f 11-Dec-2009 Andreas Huber <andih@google.com> am fd499830: Merge change I595c2d60 into eclair-mr2

Merge commit 'fd49983009e9e68de5d3f7f5c93689c8da1a9b6c' into eclair-mr2-plus-aosp

* commit 'fd49983009e9e68de5d3f7f5c93689c8da1a9b6c':
Initial checkin of software AVC video decoder based on PV source code.
a67d538881413c4b73e7c9854e293b71b407e9c2 11-Dec-2009 Andreas Huber <andih@google.com> remote destructors are not synchronously executed by the binder...
ibstagefright/AwesomePlayer.cpp
fd49983009e9e68de5d3f7f5c93689c8da1a9b6c 11-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I595c2d60 into eclair-mr2

* changes:
Initial checkin of software AVC video decoder based on PV source code.
8bc1800dba1f01ad083d79ceed33eb27e49d38ac 11-Dec-2009 Dave Sparks <davidsparks@android.com> am f63779b3: am 9472b35b: am 14f89404: Fix media player decode function. Bug 2317821.

Merge commit 'f63779b392275265b3b13728c78a0a5f4ac10c01'

* commit 'f63779b392275265b3b13728c78a0a5f4ac10c01':
Fix media player decode function. Bug 2317821.
f63779b392275265b3b13728c78a0a5f4ac10c01 11-Dec-2009 Dave Sparks <davidsparks@android.com> am 9472b35b: am 14f89404: Fix media player decode function. Bug 2317821.

Merge commit '9472b35ba190b24f811ff7b025a93b2023dbd58d' into eclair-mr2-plus-aosp

* commit '9472b35ba190b24f811ff7b025a93b2023dbd58d':
Fix media player decode function. Bug 2317821.
9472b35ba190b24f811ff7b025a93b2023dbd58d 11-Dec-2009 Dave Sparks <davidsparks@android.com> am 14f89404: Fix media player decode function. Bug 2317821.

Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-mr2

* commit '14f8940472217e8b0164d8f213679710d623d528':
Fix media player decode function. Bug 2317821.
595acee989c68e01142b7449144840b36ec9ab0e 11-Dec-2009 Jean-Michel Trivi <jmtrivi@google.com> am 899858a3: am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair

Merge commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9'

* commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9':
Partially fix bug 2111240 Detect docking / undocking event by reporting
899858a39647803c0cb506d2320fdaf2e4d3b8b9 11-Dec-2009 Jean-Michel Trivi <jmtrivi@google.com> am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair

Merge commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b' into eclair-mr2-plus-aosp

* commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b':
Partially fix bug 2111240 Detect docking / undocking event by reporting
6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b 11-Dec-2009 Jean-Michel Trivi <jmtrivi@google.com> am 86ed86d2: Merge change I0f73439a into eclair

Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-mr2

* commit '86ed86d2260932bdf2217b1d8431ac9e04d47534':
Partially fix bug 2111240 Detect docking / undocking event by reporting
4a0ec3fda9c0e8e74b36e4e201b65ced80263b1f 10-Dec-2009 Andreas Huber <andih@google.com> Initial checkin of software AVC video decoder based on PV source code.
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/amrnb/common/Android.mk
ibstagefright/codecs/amrnb/dec/Android.mk
ibstagefright/codecs/amrwb/Android.mk
ibstagefright/codecs/avc/Android.mk
ibstagefright/codecs/avc/common/Android.mk
ibstagefright/codecs/avc/common/include/avc_types.h
ibstagefright/codecs/avc/common/include/avcapi_common.h
ibstagefright/codecs/avc/common/include/avcint_common.h
ibstagefright/codecs/avc/common/include/avclib_common.h
ibstagefright/codecs/avc/common/src/deblock.cpp
ibstagefright/codecs/avc/common/src/dpb.cpp
ibstagefright/codecs/avc/common/src/fmo.cpp
ibstagefright/codecs/avc/common/src/mb_access.cpp
ibstagefright/codecs/avc/common/src/reflist.cpp
ibstagefright/codecs/avc/dec/AVCDecoder.cpp
ibstagefright/codecs/avc/dec/Android.mk
ibstagefright/codecs/avc/dec/include/avcdec_api.h
ibstagefright/codecs/avc/dec/include/pvavcdecoder.h
ibstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h
ibstagefright/codecs/avc/dec/include/pvavcdecoderinterface.h
ibstagefright/codecs/avc/dec/src/avc_bitstream.cpp
ibstagefright/codecs/avc/dec/src/avcdec_api.cpp
ibstagefright/codecs/avc/dec/src/avcdec_bitstream.h
ibstagefright/codecs/avc/dec/src/avcdec_int.h
ibstagefright/codecs/avc/dec/src/avcdec_lib.h
ibstagefright/codecs/avc/dec/src/header.cpp
ibstagefright/codecs/avc/dec/src/itrans.cpp
ibstagefright/codecs/avc/dec/src/pred_inter.cpp
ibstagefright/codecs/avc/dec/src/pred_intra.cpp
ibstagefright/codecs/avc/dec/src/residual.cpp
ibstagefright/codecs/avc/dec/src/slice.cpp
ibstagefright/codecs/avc/dec/src/vlc.cpp
ibstagefright/codecs/avc/patent_disclaimer.txt
ibstagefright/codecs/mp3dec/Android.mk
ibstagefright/include/AVCDecoder.h
eab53392ae25be197283942934596500e4186d39 10-Dec-2009 Andreas Huber <andih@google.com> am b95ea9ec: am 6ae24d93: Merge change I3c01bb62 into eclair-mr2

Merge commit 'b95ea9ecb2a7b0028c02e096589397e00fdef67a'

* commit 'b95ea9ecb2a7b0028c02e096589397e00fdef67a':
Adding copyright headers to recently introduced decoder source files.
b9015da87cece3d80f11e547ff2338200307ae29 10-Dec-2009 Andreas Huber <andih@google.com> am 5c5c85a5: am 987e7fb2: Merge change I9a275773 into eclair-mr2

Merge commit '5c5c85a5050d5512e437be65ec00d3f31b8bf004'

* commit '5c5c85a5050d5512e437be65ec00d3f31b8bf004':
Initial check in of AMR (NB and WB) decoders based on PV source code.
b95ea9ecb2a7b0028c02e096589397e00fdef67a 10-Dec-2009 Andreas Huber <andih@google.com> am 6ae24d93: Merge change I3c01bb62 into eclair-mr2

Merge commit '6ae24d9365e21ac2770f2354cc1631751bffe3e6' into eclair-mr2-plus-aosp

* commit '6ae24d9365e21ac2770f2354cc1631751bffe3e6':
Adding copyright headers to recently introduced decoder source files.
6ae24d9365e21ac2770f2354cc1631751bffe3e6 10-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I3c01bb62 into eclair-mr2

* changes:
Adding copyright headers to recently introduced decoder source files.
5c5c85a5050d5512e437be65ec00d3f31b8bf004 10-Dec-2009 Andreas Huber <andih@google.com> am 987e7fb2: Merge change I9a275773 into eclair-mr2

Merge commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb' into eclair-mr2-plus-aosp

* commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb':
Initial check in of AMR (NB and WB) decoders based on PV source code.
3c01bb627a2c02f351d288dfb7c77acbd69c76ca 10-Dec-2009 Andreas Huber <andih@google.com> Adding copyright headers to recently introduced decoder source files.
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
a30d40083856cb4edd225faf8b488fab156e5976 09-Dec-2009 Andreas Huber <andih@google.com> Initial check in of AMR (NB and WB) decoders based on PV source code.
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/amrnb/Android.mk
ibstagefright/codecs/amrnb/common/Android.mk
ibstagefright/codecs/amrnb/common/include/abs_s.h
ibstagefright/codecs/amrnb/common/include/add.h
ibstagefright/codecs/amrnb/common/include/az_lsp.h
ibstagefright/codecs/amrnb/common/include/basic_op.h
ibstagefright/codecs/amrnb/common/include/basic_op_arm_gcc_v5.h
ibstagefright/codecs/amrnb/common/include/basic_op_arm_v5.h
ibstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h
ibstagefright/codecs/amrnb/common/include/basicop_malloc.h
ibstagefright/codecs/amrnb/common/include/bitno_tab.h
ibstagefright/codecs/amrnb/common/include/bitreorder_tab.h
ibstagefright/codecs/amrnb/common/include/bits2prm.h
ibstagefright/codecs/amrnb/common/include/bytesused.h
ibstagefright/codecs/amrnb/common/include/cnst.h
ibstagefright/codecs/amrnb/common/include/cnst_vad.h
ibstagefright/codecs/amrnb/common/include/copy.h
ibstagefright/codecs/amrnb/common/include/d_gain_c.h
ibstagefright/codecs/amrnb/common/include/d_gain_p.h
ibstagefright/codecs/amrnb/common/include/d_plsf.h
ibstagefright/codecs/amrnb/common/include/div_32.h
ibstagefright/codecs/amrnb/common/include/div_s.h
ibstagefright/codecs/amrnb/common/include/dtx_common_def.h
ibstagefright/codecs/amrnb/common/include/extract_h.h
ibstagefright/codecs/amrnb/common/include/extract_l.h
ibstagefright/codecs/amrnb/common/include/frame.h
ibstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
ibstagefright/codecs/amrnb/common/include/gc_pred.h
ibstagefright/codecs/amrnb/common/include/gmed_n.h
ibstagefright/codecs/amrnb/common/include/gsm_amr_typedefs.h
ibstagefright/codecs/amrnb/common/include/int_lpc.h
ibstagefright/codecs/amrnb/common/include/int_lsf.h
ibstagefright/codecs/amrnb/common/include/inv_sqrt.h
ibstagefright/codecs/amrnb/common/include/l_abs.h
ibstagefright/codecs/amrnb/common/include/l_add.h
ibstagefright/codecs/amrnb/common/include/l_add_c.h
ibstagefright/codecs/amrnb/common/include/l_comp.h
ibstagefright/codecs/amrnb/common/include/l_deposit_h.h
ibstagefright/codecs/amrnb/common/include/l_deposit_l.h
ibstagefright/codecs/amrnb/common/include/l_extract.h
ibstagefright/codecs/amrnb/common/include/l_mac.h
ibstagefright/codecs/amrnb/common/include/l_msu.h
ibstagefright/codecs/amrnb/common/include/l_mult.h
ibstagefright/codecs/amrnb/common/include/l_negate.h
ibstagefright/codecs/amrnb/common/include/l_shl.h
ibstagefright/codecs/amrnb/common/include/l_shr.h
ibstagefright/codecs/amrnb/common/include/l_shr_r.h
ibstagefright/codecs/amrnb/common/include/l_sub.h
ibstagefright/codecs/amrnb/common/include/log2.h
ibstagefright/codecs/amrnb/common/include/log2_norm.h
ibstagefright/codecs/amrnb/common/include/lsfwt.h
ibstagefright/codecs/amrnb/common/include/lsp.h
ibstagefright/codecs/amrnb/common/include/lsp_az.h
ibstagefright/codecs/amrnb/common/include/lsp_lsf.h
ibstagefright/codecs/amrnb/common/include/lsp_tab.h
ibstagefright/codecs/amrnb/common/include/mac_32.h
ibstagefright/codecs/amrnb/common/include/mode.h
ibstagefright/codecs/amrnb/common/include/mpy_32.h
ibstagefright/codecs/amrnb/common/include/mpy_32_16.h
ibstagefright/codecs/amrnb/common/include/mult.h
ibstagefright/codecs/amrnb/common/include/mult_r.h
ibstagefright/codecs/amrnb/common/include/n_proc.h
ibstagefright/codecs/amrnb/common/include/negate.h
ibstagefright/codecs/amrnb/common/include/norm_l.h
ibstagefright/codecs/amrnb/common/include/norm_s.h
ibstagefright/codecs/amrnb/common/include/oper_32b.h
ibstagefright/codecs/amrnb/common/include/p_ol_wgh.h
ibstagefright/codecs/amrnb/common/include/pow2.h
ibstagefright/codecs/amrnb/common/include/pred_lt.h
ibstagefright/codecs/amrnb/common/include/pvgsmamr.h
ibstagefright/codecs/amrnb/common/include/q_plsf.h
ibstagefright/codecs/amrnb/common/include/q_plsf_3_tbl.h
ibstagefright/codecs/amrnb/common/include/q_plsf_5_tbl.h
ibstagefright/codecs/amrnb/common/include/qgain475_tab.h
ibstagefright/codecs/amrnb/common/include/qua_gain.h
ibstagefright/codecs/amrnb/common/include/qua_gain_tbl.h
ibstagefright/codecs/amrnb/common/include/reorder.h
ibstagefright/codecs/amrnb/common/include/residu.h
ibstagefright/codecs/amrnb/common/include/reverse_bits.h
ibstagefright/codecs/amrnb/common/include/round.h
ibstagefright/codecs/amrnb/common/include/set_zero.h
ibstagefright/codecs/amrnb/common/include/shl.h
ibstagefright/codecs/amrnb/common/include/shr.h
ibstagefright/codecs/amrnb/common/include/shr_r.h
ibstagefright/codecs/amrnb/common/include/sqrt_l.h
ibstagefright/codecs/amrnb/common/include/sub.h
ibstagefright/codecs/amrnb/common/include/syn_filt.h
ibstagefright/codecs/amrnb/common/include/typedef.h
ibstagefright/codecs/amrnb/common/include/vad.h
ibstagefright/codecs/amrnb/common/include/vad1.h
ibstagefright/codecs/amrnb/common/include/vad2.h
ibstagefright/codecs/amrnb/common/include/weight_a.h
ibstagefright/codecs/amrnb/common/include/window_tab.h
ibstagefright/codecs/amrnb/common/include/wmf_to_ets.h
ibstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h
ibstagefright/codecs/amrnb/common/src/add.cpp
ibstagefright/codecs/amrnb/common/src/az_lsp.cpp
ibstagefright/codecs/amrnb/common/src/bitno_tab.cpp
ibstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp
ibstagefright/codecs/amrnb/common/src/bits2prm.cpp
ibstagefright/codecs/amrnb/common/src/bytesused.cpp
ibstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp
ibstagefright/codecs/amrnb/common/src/copy.cpp
ibstagefright/codecs/amrnb/common/src/div_32.cpp
ibstagefright/codecs/amrnb/common/src/div_s.cpp
ibstagefright/codecs/amrnb/common/src/extract_h.cpp
ibstagefright/codecs/amrnb/common/src/extract_l.cpp
ibstagefright/codecs/amrnb/common/src/gains_tbl.cpp
ibstagefright/codecs/amrnb/common/src/gc_pred.cpp
ibstagefright/codecs/amrnb/common/src/gmed_n.cpp
ibstagefright/codecs/amrnb/common/src/gray_tbl.cpp
ibstagefright/codecs/amrnb/common/src/grid_tbl.cpp
ibstagefright/codecs/amrnb/common/src/int_lpc.cpp
ibstagefright/codecs/amrnb/common/src/inv_sqrt.cpp
ibstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp
ibstagefright/codecs/amrnb/common/src/l_abs.cpp
ibstagefright/codecs/amrnb/common/src/l_deposit_h.cpp
ibstagefright/codecs/amrnb/common/src/l_deposit_l.cpp
ibstagefright/codecs/amrnb/common/src/l_shr_r.cpp
ibstagefright/codecs/amrnb/common/src/log2.cpp
ibstagefright/codecs/amrnb/common/src/log2_norm.cpp
ibstagefright/codecs/amrnb/common/src/log2_tbl.cpp
ibstagefright/codecs/amrnb/common/src/lsfwt.cpp
ibstagefright/codecs/amrnb/common/src/lsp.cpp
ibstagefright/codecs/amrnb/common/src/lsp_az.cpp
ibstagefright/codecs/amrnb/common/src/lsp_lsf.cpp
ibstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp
ibstagefright/codecs/amrnb/common/src/lsp_tab.cpp
ibstagefright/codecs/amrnb/common/src/mult_r.cpp
ibstagefright/codecs/amrnb/common/src/negate.cpp
ibstagefright/codecs/amrnb/common/src/norm_l.cpp
ibstagefright/codecs/amrnb/common/src/norm_s.cpp
ibstagefright/codecs/amrnb/common/src/overflow_tbl.cpp
ibstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp
ibstagefright/codecs/amrnb/common/src/pow2.cpp
ibstagefright/codecs/amrnb/common/src/pow2_tbl.cpp
ibstagefright/codecs/amrnb/common/src/pred_lt.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_3.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_3_tbl.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_5.cpp
ibstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp
ibstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp
ibstagefright/codecs/amrnb/common/src/reorder.cpp
ibstagefright/codecs/amrnb/common/src/residu.cpp
ibstagefright/codecs/amrnb/common/src/round.cpp
ibstagefright/codecs/amrnb/common/src/set_zero.cpp
ibstagefright/codecs/amrnb/common/src/shr.cpp
ibstagefright/codecs/amrnb/common/src/shr_r.cpp
ibstagefright/codecs/amrnb/common/src/sqrt_l.cpp
ibstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp
ibstagefright/codecs/amrnb/common/src/sub.cpp
ibstagefright/codecs/amrnb/common/src/syn_filt.cpp
ibstagefright/codecs/amrnb/common/src/vad1.cpp
ibstagefright/codecs/amrnb/common/src/weight_a.cpp
ibstagefright/codecs/amrnb/common/src/window_tab.cpp
ibstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
ibstagefright/codecs/amrnb/dec/Android.mk
ibstagefright/codecs/amrnb/dec/include/pvamrnbdecoder_api.h
ibstagefright/codecs/amrnb/dec/src/a_refl.cpp
ibstagefright/codecs/amrnb/dec/src/a_refl.h
ibstagefright/codecs/amrnb/dec/src/agc.cpp
ibstagefright/codecs/amrnb/dec/src/agc.h
ibstagefright/codecs/amrnb/dec/src/amrdecode.cpp
ibstagefright/codecs/amrnb/dec/src/amrdecode.h
ibstagefright/codecs/amrnb/dec/src/b_cn_cod.cpp
ibstagefright/codecs/amrnb/dec/src/b_cn_cod.h
ibstagefright/codecs/amrnb/dec/src/bgnscd.cpp
ibstagefright/codecs/amrnb/dec/src/bgnscd.h
ibstagefright/codecs/amrnb/dec/src/c_g_aver.cpp
ibstagefright/codecs/amrnb/dec/src/c_g_aver.h
ibstagefright/codecs/amrnb/dec/src/d1035pf.cpp
ibstagefright/codecs/amrnb/dec/src/d1035pf.h
ibstagefright/codecs/amrnb/dec/src/d2_11pf.cpp
ibstagefright/codecs/amrnb/dec/src/d2_11pf.h
ibstagefright/codecs/amrnb/dec/src/d2_9pf.cpp
ibstagefright/codecs/amrnb/dec/src/d2_9pf.h
ibstagefright/codecs/amrnb/dec/src/d3_14pf.cpp
ibstagefright/codecs/amrnb/dec/src/d3_14pf.h
ibstagefright/codecs/amrnb/dec/src/d4_17pf.cpp
ibstagefright/codecs/amrnb/dec/src/d4_17pf.h
ibstagefright/codecs/amrnb/dec/src/d8_31pf.cpp
ibstagefright/codecs/amrnb/dec/src/d8_31pf.h
ibstagefright/codecs/amrnb/dec/src/d_gain_c.cpp
ibstagefright/codecs/amrnb/dec/src/d_gain_p.cpp
ibstagefright/codecs/amrnb/dec/src/d_plsf.cpp
ibstagefright/codecs/amrnb/dec/src/d_plsf_3.cpp
ibstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp
ibstagefright/codecs/amrnb/dec/src/dec_amr.cpp
ibstagefright/codecs/amrnb/dec/src/dec_amr.h
ibstagefright/codecs/amrnb/dec/src/dec_gain.cpp
ibstagefright/codecs/amrnb/dec/src/dec_gain.h
ibstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp
ibstagefright/codecs/amrnb/dec/src/dec_lag3.cpp
ibstagefright/codecs/amrnb/dec/src/dec_lag3.h
ibstagefright/codecs/amrnb/dec/src/dec_lag6.cpp
ibstagefright/codecs/amrnb/dec/src/dec_lag6.h
ibstagefright/codecs/amrnb/dec/src/dtx_dec.cpp
ibstagefright/codecs/amrnb/dec/src/dtx_dec.h
ibstagefright/codecs/amrnb/dec/src/ec_gains.cpp
ibstagefright/codecs/amrnb/dec/src/ec_gains.h
ibstagefright/codecs/amrnb/dec/src/ex_ctrl.cpp
ibstagefright/codecs/amrnb/dec/src/ex_ctrl.h
ibstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
ibstagefright/codecs/amrnb/dec/src/if2_to_ets.cpp
ibstagefright/codecs/amrnb/dec/src/if2_to_ets.h
ibstagefright/codecs/amrnb/dec/src/int_lsf.cpp
ibstagefright/codecs/amrnb/dec/src/lsp_avg.cpp
ibstagefright/codecs/amrnb/dec/src/lsp_avg.h
ibstagefright/codecs/amrnb/dec/src/ph_disp.cpp
ibstagefright/codecs/amrnb/dec/src/ph_disp.h
ibstagefright/codecs/amrnb/dec/src/post_pro.cpp
ibstagefright/codecs/amrnb/dec/src/post_pro.h
ibstagefright/codecs/amrnb/dec/src/preemph.cpp
ibstagefright/codecs/amrnb/dec/src/preemph.h
ibstagefright/codecs/amrnb/dec/src/pstfilt.cpp
ibstagefright/codecs/amrnb/dec/src/pstfilt.h
ibstagefright/codecs/amrnb/dec/src/pvgsmamrdecoder.cpp
ibstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp
ibstagefright/codecs/amrnb/dec/src/sp_dec.cpp
ibstagefright/codecs/amrnb/dec/src/sp_dec.h
ibstagefright/codecs/amrnb/dec/src/wmf_to_ets.cpp
ibstagefright/codecs/amrnb/patent_disclaimer.txt
ibstagefright/codecs/amrwb/AMRWBDecoder.cpp
ibstagefright/codecs/amrwb/Android.mk
ibstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h
ibstagefright/codecs/amrwb/patent_disclaimer.txt
ibstagefright/codecs/amrwb/src/agc2_amr_wb.cpp
ibstagefright/codecs/amrwb/src/band_pass_6k_7k.cpp
ibstagefright/codecs/amrwb/src/dec_acelp_2p_in_64.cpp
ibstagefright/codecs/amrwb/src/dec_acelp_4p_in_64.cpp
ibstagefright/codecs/amrwb/src/dec_alg_codebook.cpp
ibstagefright/codecs/amrwb/src/dec_gain2_amr_wb.cpp
ibstagefright/codecs/amrwb/src/deemphasis_32.cpp
ibstagefright/codecs/amrwb/src/dtx.h
ibstagefright/codecs/amrwb/src/dtx_decoder_amr_wb.cpp
ibstagefright/codecs/amrwb/src/e_pv_amrwbdec.h
ibstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp
ibstagefright/codecs/amrwb/src/get_amr_wb_bits.h
ibstagefright/codecs/amrwb/src/highpass_400hz_at_12k8.cpp
ibstagefright/codecs/amrwb/src/highpass_50hz_at_12k8.cpp
ibstagefright/codecs/amrwb/src/homing_amr_wb_dec.cpp
ibstagefright/codecs/amrwb/src/interpolate_isp.cpp
ibstagefright/codecs/amrwb/src/isf_extrapolation.cpp
ibstagefright/codecs/amrwb/src/isp_az.cpp
ibstagefright/codecs/amrwb/src/isp_isf.cpp
ibstagefright/codecs/amrwb/src/lagconceal.cpp
ibstagefright/codecs/amrwb/src/low_pass_filt_7k.cpp
ibstagefright/codecs/amrwb/src/median5.cpp
ibstagefright/codecs/amrwb/src/mime_io.cpp
ibstagefright/codecs/amrwb/src/mime_io.h
ibstagefright/codecs/amrwb/src/noise_gen_amrwb.cpp
ibstagefright/codecs/amrwb/src/normalize_amr_wb.cpp
ibstagefright/codecs/amrwb/src/normalize_amr_wb.h
ibstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
ibstagefright/codecs/amrwb/src/phase_dispersion.cpp
ibstagefright/codecs/amrwb/src/pit_shrp.cpp
ibstagefright/codecs/amrwb/src/pred_lt4.cpp
ibstagefright/codecs/amrwb/src/preemph_amrwb_dec.cpp
ibstagefright/codecs/amrwb/src/pv_amr_wb_type_defs.h
ibstagefright/codecs/amrwb/src/pvamrwb_math_op.cpp
ibstagefright/codecs/amrwb/src/pvamrwb_math_op.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder.cpp
ibstagefright/codecs/amrwb/src/pvamrwbdecoder.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_acelp.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_cequivalent.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_cnst.h
ibstagefright/codecs/amrwb/src/pvamrwbdecoder_mem_funcs.h
ibstagefright/codecs/amrwb/src/q_gain2_tab.cpp
ibstagefright/codecs/amrwb/src/q_pulse.h
ibstagefright/codecs/amrwb/src/qisf_ns.cpp
ibstagefright/codecs/amrwb/src/qisf_ns.h
ibstagefright/codecs/amrwb/src/qisf_ns_tab.cpp
ibstagefright/codecs/amrwb/src/qpisf_2s.cpp
ibstagefright/codecs/amrwb/src/qpisf_2s.h
ibstagefright/codecs/amrwb/src/qpisf_2s_tab.cpp
ibstagefright/codecs/amrwb/src/scale_signal.cpp
ibstagefright/codecs/amrwb/src/synthesis_amr_wb.cpp
ibstagefright/codecs/amrwb/src/synthesis_amr_wb.h
ibstagefright/codecs/amrwb/src/voice_factor.cpp
ibstagefright/codecs/amrwb/src/wb_syn_filt.cpp
ibstagefright/codecs/amrwb/src/weight_amrwb_lpc.cpp
ibstagefright/include/AMRNBDecoder.h
ibstagefright/include/AMRWBDecoder.h
0ea7e7f6ac968b5b0e2fd2e9684858b923f51a9b 10-Dec-2009 Andreas Huber <andih@google.com> am 30807a45: am 7c55c3f5: Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.

Merge commit '30807a4500fab8b46ee661db2ba99286049a8adc'

* commit '30807a4500fab8b46ee661db2ba99286049a8adc':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
4accf80fa8aa9b908266c2f4b0282067266c7508 10-Dec-2009 Andreas Huber <andih@google.com> am b16cf676: am 6d35d4c2: Merge change Ib16e5543 into eclair-mr2

Merge commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1'

* commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
c860ff22e871e2a66c25641dec44094ca3b7ccbb 10-Dec-2009 Andreas Huber <andih@google.com> am a42b8f16: am 3f5b2867: Merge change I8f658214 into eclair-mr2

Merge commit 'a42b8f160fb5906638e978a470972d1f50d749ac'

* commit 'a42b8f160fb5906638e978a470972d1f50d749ac':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
53513d22a74809a8a7fed279dff94312ded42fe2 10-Dec-2009 Andreas Huber <andih@google.com> am 42be7440: am ee3a2443: Merge change Ic532c956 into eclair-mr2

Merge commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff'

* commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff':
Note to self: Don't reverse the arguments to fseek(o)...
bb3e1e3b8d1caa9c673a62f08a38792b7c205364 10-Dec-2009 Dave Sparks <davidsparks@android.com> am 14f89404: Fix media player decode function. Bug 2317821.

Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-plus-aosp

* commit '14f8940472217e8b0164d8f213679710d623d528':
Fix media player decode function. Bug 2317821.
14f8940472217e8b0164d8f213679710d623d528 10-Dec-2009 Dave Sparks <davidsparks@android.com> Fix media player decode function. Bug 2317821.

There was a recent change to OpenCORE that broke the MediaPlayer::decode()
function for all OpenCORE supported formats (MP3, AAC, and AMR-NB/WB). The
affect is that SoundPool is unreliable for all of these formats. This patch
changes the logic in the AudioCache object that processes messages from the
media player. The old logic was fragile. This change should make it more
robust against changes.
ibmediaplayerservice/MediaPlayerService.cpp
30807a4500fab8b46ee661db2ba99286049a8adc 10-Dec-2009 Andreas Huber <andih@google.com> am 7c55c3f5: Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.

Merge commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1' into eclair-mr2-plus-aosp

* commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
b16cf676bd3304bc0c5da4210d689f4e680219b1 10-Dec-2009 Andreas Huber <andih@google.com> am 6d35d4c2: Merge change Ib16e5543 into eclair-mr2

Merge commit '6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5' into eclair-mr2-plus-aosp

* commit '6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
a42b8f160fb5906638e978a470972d1f50d749ac 10-Dec-2009 Andreas Huber <andih@google.com> am 3f5b2867: Merge change I8f658214 into eclair-mr2

Merge commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc' into eclair-mr2-plus-aosp

* commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
42be7440ee2a3a360c83802e4e7a2ecf40220eff 10-Dec-2009 Andreas Huber <andih@google.com> am ee3a2443: Merge change Ic532c956 into eclair-mr2

Merge commit 'ee3a2443deb39ad9ce65293c045d34b9198cc57a' into eclair-mr2-plus-aosp

* commit 'ee3a2443deb39ad9ce65293c045d34b9198cc57a':
Note to self: Don't reverse the arguments to fseek(o)...
ed3e7ab3bf15bc1eefaade7e1f641d02d04c80c2 09-Dec-2009 Jean-Michel Trivi <jmtrivi@google.com> am 86ed86d2: Merge change I0f73439a into eclair

Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-plus-aosp

* commit '86ed86d2260932bdf2217b1d8431ac9e04d47534':
Partially fix bug 2111240 Detect docking / undocking event by reporting
7c55c3f5f5997ca572d70ad513099a5af20a23c1 08-Dec-2009 Andreas Huber <andih@google.com> Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
ibstagefright/codecs/mp3dec/Android.mk
6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5 08-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib16e5543 into eclair-mr2

* changes:
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc 08-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I8f658214 into eclair-mr2

* changes:
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
6154412ee8e07e9cde129cccb944dd7ed9dcef53 08-Dec-2009 Jean-Michel Trivi <jmtrivi@google.com> Partially fix bug 2111240 Detect docking / undocking event by reporting
to the AudioPolicyManager a new forced usage AudioSystem::FOR_DOCK
which can take the FORCE_NONE, FORCE_BT_DOCK or FORCE_WIRED_ACCESSORY
values. This CL is complemented by an update of the APM to take into
account the FOR_DOCK usage.
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
169e2bb0fbfd0f176a9b952f224beb628108e4ed 08-Dec-2009 Andreas Huber <andih@google.com> am 9659126d: am 247003be: Merge change I250f2433 into eclair-mr2

Merge commit '9659126db10f65b6e502b2175d34c75b301fb7e9'

* commit '9659126db10f65b6e502b2175d34c75b301fb7e9':
Initial checkin of stagefright MP3 audio decoder based on PV source code.
e1fb7e9419a1e7a23fd58f10f18031e18d473fe4 08-Dec-2009 Dave Sparks <davidsparks@android.com> am 610e50cc: am 62679112: Merge change I3c256cf3 into eclair-mr2

Merge commit '610e50ccd2a342fbc75e3b30a2057dbca8fb92fd'

* commit '610e50ccd2a342fbc75e3b30a2057dbca8fb92fd':
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
1877375cbc0c7ffb40021cc28906fa682b1738e5 08-Dec-2009 Dave Sparks <davidsparks@android.com> am 5ac5cd73: am 9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2

Merge commit '5ac5cd7300fda7cb80ae0fb3d66594abd4f91939'

* commit '5ac5cd7300fda7cb80ae0fb3d66594abd4f91939':
Remove unused Java object reference in native SoundPool code.
dd3e79014151614a80f3f30b68cecb894502e514 08-Dec-2009 Andreas Huber <andih@google.com> am 2109e680: am 8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.

Merge commit '2109e6801199b10460330027f3537d406b6a0149'

* commit '2109e6801199b10460330027f3537d406b6a0149':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
26fa3dcb9d3a4fc283f543689253d71af1be5227 08-Dec-2009 Andreas Huber <andih@google.com> am 81a005d0: am 73abc2ea: Merge change I9c6e1f90 into eclair-mr2

Merge commit '81a005d070bec3a756f5caa48cdda25bcc732ce9'

* commit '81a005d070bec3a756f5caa48cdda25bcc732ce9':
Initial check in of stagefright software AAC decoder based on PV source code.
feab08b9014a049c3bcd54f4e57ca36095a75593 08-Dec-2009 Eric Laurent <elaurent@google.com> am e30bae7f: am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair

Merge commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5'

* commit 'e30bae7f8ef0489788c155ae44d9a57beca1acf5':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
e204b9f84fd9924f70bd4d1e2171873ad9c42f6d 08-Dec-2009 Yu Shan Emily Lau <yslau@google.com> am a3d15d3b: am 8e6d79e2: am 8445f367: Merge change Ibb9b1de1 into eclair

Merge commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23'

* commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23':
1) Capture the start memory before the test started
1d44bea4443050ef39604032dc88334f69e87aa7 08-Dec-2009 Andreas Huber <andih@google.com> am f553a584: am 5921fb51: Merge change I91eb0354 into eclair-mr2

Merge commit 'f553a58425c66a990dbc5f4579c976a0636fc573'

* commit 'f553a58425c66a990dbc5f4579c976a0636fc573':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
c532c956954a68207660c7d3de1745348851536c 08-Dec-2009 Andreas Huber <andih@google.com> Note to self: Don't reverse the arguments to fseek(o)...
ibstagefright/FileSource.cpp
8f658214537c08e91616a3a283f940f759b65674 08-Dec-2009 Andreas Huber <andih@google.com> Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
ibstagefright/include/AACDecoder.h
b16e5543713cc557bdc7ceef7c0a5a8b61f3232d 08-Dec-2009 Andreas Huber <andih@google.com> Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
ibstagefright/MP3Extractor.cpp
c4349603b96ea595c6de9b3bd78b56e8fad20290 07-Dec-2009 Andreas Huber <andih@google.com> am 5d676ad5: am 52f410e2: Merge change Ifef6435a into eclair-mr2

Merge commit '5d676ad5d94c3d4f831c2084012f955fe56a8af8'

* commit '5d676ad5d94c3d4f831c2084012f955fe56a8af8':
Enable proper cleanup of OMX nodes managed through stagefright.
9659126db10f65b6e502b2175d34c75b301fb7e9 07-Dec-2009 Andreas Huber <andih@google.com> am 247003be: Merge change I250f2433 into eclair-mr2

Merge commit '247003be9ea69928e35ce2f1bd1fab652920a3f2' into eclair-mr2-plus-aosp

* commit '247003be9ea69928e35ce2f1bd1fab652920a3f2':
Initial checkin of stagefright MP3 audio decoder based on PV source code.
247003be9ea69928e35ce2f1bd1fab652920a3f2 07-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I250f2433 into eclair-mr2

* changes:
Initial checkin of stagefright MP3 audio decoder based on PV source code.
250f2433c6e1cf2727a79971fdc6ce0f8677037a 07-Dec-2009 Andreas Huber <andih@google.com> Initial checkin of stagefright MP3 audio decoder based on PV source code.
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/mp3dec/Android.mk
ibstagefright/codecs/mp3dec/MP3Decoder.cpp
ibstagefright/codecs/mp3dec/include/mp3_decoder_selection.h
ibstagefright/codecs/mp3dec/include/pvmp3_audio_type_defs.h
ibstagefright/codecs/mp3dec/include/pvmp3decoder_api.h
ibstagefright/codecs/mp3dec/patent_disclaimer.txt
ibstagefright/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_dct_9_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_dct_9_gcc.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_wm.asm
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_arm.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
ibstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_wm.asm
ibstagefright/codecs/mp3dec/src/mp3_mem_funcs.h
ibstagefright/codecs/mp3dec/src/pv_mp3_huffman.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm_gcc.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
ibstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_msc_evc.h
ibstagefright/codecs/mp3dec/src/pvmp3_alias_reduction.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_alias_reduction.h
ibstagefright/codecs/mp3dec/src/pvmp3_crc.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_crc.h
ibstagefright/codecs/mp3dec/src/pvmp3_dct_16.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_dct_16.h
ibstagefright/codecs/mp3dec/src/pvmp3_dct_6.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_dct_9.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_dec_defs.h
ibstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_decode_header.h
ibstagefright/codecs/mp3dec/src/pvmp3_decode_huff_cw.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_decode_huff_cw.h
ibstagefright/codecs/mp3dec/src/pvmp3_dequantize_sample.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_dequantize_sample.h
ibstagefright/codecs/mp3dec/src/pvmp3_equalizer.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_equalizer.h
ibstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_framedecoder.h
ibstagefright/codecs/mp3dec/src/pvmp3_get_main_data_size.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_get_main_data_size.h
ibstagefright/codecs/mp3dec/src/pvmp3_get_scale_factors.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_get_scale_factors.h
ibstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_get_side_info.h
ibstagefright/codecs/mp3dec/src/pvmp3_getbits.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_getbits.h
ibstagefright/codecs/mp3dec/src/pvmp3_huffman_decoding.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_huffman_parsing.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_imdct_synth.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_imdct_synth.h
ibstagefright/codecs/mp3dec/src/pvmp3_mdct_18.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mdct_18.h
ibstagefright/codecs/mp3dec/src/pvmp3_mdct_6.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mdct_6.h
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.h
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.h
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.h
ibstagefright/codecs/mp3dec/src/pvmp3_normalize.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_normalize.h
ibstagefright/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.h
ibstagefright/codecs/mp3dec/src/pvmp3_polyphase_filter_window.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_polyphase_filter_window.h
ibstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_reorder.h
ibstagefright/codecs/mp3dec/src/pvmp3_seek_synch.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_seek_synch.h
ibstagefright/codecs/mp3dec/src/pvmp3_stereo_proc.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_stereo_proc.h
ibstagefright/codecs/mp3dec/src/pvmp3_tables.cpp
ibstagefright/codecs/mp3dec/src/pvmp3_tables.h
ibstagefright/codecs/mp3dec/src/s_huffcodetab.h
ibstagefright/codecs/mp3dec/src/s_mp3bits.h
ibstagefright/codecs/mp3dec/src/s_tmp3dec_chan.h
ibstagefright/codecs/mp3dec/src/s_tmp3dec_file.h
ibstagefright/include/MP3Decoder.h
ibstagefright/omx/Android.mk
ibstagefright/omx/OMXSoftwareCodecsPlugin.cpp
ibstagefright/omx/mp3dec/Android.mk
ibstagefright/omx/mp3dec/MP3Decoder.cpp
ibstagefright/omx/mp3dec/MP3Decoder.h
610e50ccd2a342fbc75e3b30a2057dbca8fb92fd 07-Dec-2009 Dave Sparks <davidsparks@android.com> am 62679112: Merge change I3c256cf3 into eclair-mr2

Merge commit '62679112a2ac98f6b73e9a5f6e92b3cb5728703c' into eclair-mr2-plus-aosp

* commit '62679112a2ac98f6b73e9a5f6e92b3cb5728703c':
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
3c256cf321f820f9d87399b9e254e4400c354c31 07-Dec-2009 Dave Sparks <davidsparks@android.com> More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
ni/soundpool/SoundPool.h
5ac5cd7300fda7cb80ae0fb3d66594abd4f91939 07-Dec-2009 Dave Sparks <davidsparks@android.com> am 9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2

Merge commit '9d5b7aca742f44e4b16db66a4a372eb71325470f' into eclair-mr2-plus-aosp

* commit '9d5b7aca742f44e4b16db66a4a372eb71325470f':
Remove unused Java object reference in native SoundPool code.
c0e3ddf8f2f30dc9593f0a1bfd46335823e25d65 07-Dec-2009 Dave Sparks <davidsparks@android.com> Remove unused Java object reference in native SoundPool code.
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/android_media_SoundPool.cpp
2109e6801199b10460330027f3537d406b6a0149 07-Dec-2009 Andreas Huber <andih@google.com> am 8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.

Merge commit '8c7ab034692eea550b97bebd7746e1a82735bbbd' into eclair-mr2-plus-aosp

* commit '8c7ab034692eea550b97bebd7746e1a82735bbbd':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
8c7ab034692eea550b97bebd7746e1a82735bbbd 07-Dec-2009 Andreas Huber <andih@google.com> Fixing the build, only instantiate the software aac decoder in full stagefright builds.
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
81a005d070bec3a756f5caa48cdda25bcc732ce9 07-Dec-2009 Andreas Huber <andih@google.com> am 73abc2ea: Merge change I9c6e1f90 into eclair-mr2

Merge commit '73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a' into eclair-mr2-plus-aosp

* commit '73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a':
Initial check in of stagefright software AAC decoder based on PV source code.
e30bae7f8ef0489788c155ae44d9a57beca1acf5 07-Dec-2009 Eric Laurent <elaurent@google.com> am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair

Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp

* commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
a3d15d3b01146df40e72d67b79dd1f9368398f23 07-Dec-2009 Yu Shan Emily Lau <yslau@google.com> am 8e6d79e2: am 8445f367: Merge change Ibb9b1de1 into eclair

Merge commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477' into eclair-mr2-plus-aosp

* commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477':
1) Capture the start memory before the test started
a4dde1da5f8663fea34fe538900e78611cb48f4f 07-Dec-2009 Eric Laurent <elaurent@google.com> am 6d42d806: Merge change I9cc489a2 into eclair

Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-plus-aosp

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a 07-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I9c6e1f90 into eclair-mr2

* changes:
Initial check in of stagefright software AAC decoder based on PV source code.
b8341cf7c8b0b4af14ea87a4c2335e28865adff1 07-Dec-2009 Eric Laurent <elaurent@google.com> am 6d42d806: Merge change I9cc489a2 into eclair

Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
dacaa73ae5010b66f4224d70a520945e5b653544 07-Dec-2009 Andreas Huber <andih@google.com> Initial check in of stagefright software AAC decoder based on PV source code.
ibstagefright/Android.mk
ibstagefright/OMXCodec.cpp
ibstagefright/codecs/Android.mk
ibstagefright/codecs/aacdec/AACDecoder.cpp
ibstagefright/codecs/aacdec/Android.mk
ibstagefright/codecs/aacdec/aac_mem_funcs.h
ibstagefright/codecs/aacdec/analysis_sub_band.cpp
ibstagefright/codecs/aacdec/analysis_sub_band.h
ibstagefright/codecs/aacdec/apply_ms_synt.cpp
ibstagefright/codecs/aacdec/apply_ms_synt.h
ibstagefright/codecs/aacdec/apply_tns.cpp
ibstagefright/codecs/aacdec/apply_tns.h
ibstagefright/codecs/aacdec/bit_reversal_swap.h
ibstagefright/codecs/aacdec/buf_getbits.cpp
ibstagefright/codecs/aacdec/buf_getbits.h
ibstagefright/codecs/aacdec/buffer_normalization.h
ibstagefright/codecs/aacdec/byte_align.cpp
ibstagefright/codecs/aacdec/calc_auto_corr.cpp
ibstagefright/codecs/aacdec/calc_auto_corr.h
ibstagefright/codecs/aacdec/calc_gsfb_table.cpp
ibstagefright/codecs/aacdec/calc_sbr_anafilterbank.cpp
ibstagefright/codecs/aacdec/calc_sbr_anafilterbank.h
ibstagefright/codecs/aacdec/calc_sbr_envelope.cpp
ibstagefright/codecs/aacdec/calc_sbr_envelope.h
ibstagefright/codecs/aacdec/calc_sbr_synfilterbank.cpp
ibstagefright/codecs/aacdec/calc_sbr_synfilterbank.h
ibstagefright/codecs/aacdec/chans.h
ibstagefright/codecs/aacdec/check_crc.cpp
ibstagefright/codecs/aacdec/check_crc.h
ibstagefright/codecs/aacdec/dct16.cpp
ibstagefright/codecs/aacdec/dct16.h
ibstagefright/codecs/aacdec/dct64.cpp
ibstagefright/codecs/aacdec/dct64.h
ibstagefright/codecs/aacdec/decode_huff_cw_binary.cpp
ibstagefright/codecs/aacdec/decode_noise_floorlevels.cpp
ibstagefright/codecs/aacdec/decode_noise_floorlevels.h
ibstagefright/codecs/aacdec/deinterleave.cpp
ibstagefright/codecs/aacdec/digit_reversal_tables.cpp
ibstagefright/codecs/aacdec/digit_reversal_tables.h
ibstagefright/codecs/aacdec/dst16.cpp
ibstagefright/codecs/aacdec/dst16.h
ibstagefright/codecs/aacdec/dst32.cpp
ibstagefright/codecs/aacdec/dst32.h
ibstagefright/codecs/aacdec/dst8.cpp
ibstagefright/codecs/aacdec/dst8.h
ibstagefright/codecs/aacdec/e_adif_const.h
ibstagefright/codecs/aacdec/e_blockswitching.h
ibstagefright/codecs/aacdec/e_coupling_mode.h
ibstagefright/codecs/aacdec/e_elementid.h
ibstagefright/codecs/aacdec/e_huffmanconst.h
ibstagefright/codecs/aacdec/e_infoinitconst.h
ibstagefright/codecs/aacdec/e_invf_mode.h
ibstagefright/codecs/aacdec/e_maskstatus.h
ibstagefright/codecs/aacdec/e_mp4ff_const.h
ibstagefright/codecs/aacdec/e_progconfigconst.h
ibstagefright/codecs/aacdec/e_rawbitstreamconst.h
ibstagefright/codecs/aacdec/e_sbr_element_id.h
ibstagefright/codecs/aacdec/e_sbr_error.h
ibstagefright/codecs/aacdec/e_sbr_header_status.h
ibstagefright/codecs/aacdec/e_sbr_master_status.h
ibstagefright/codecs/aacdec/e_sbr_sync_state.h
ibstagefright/codecs/aacdec/e_sr_mode.h
ibstagefright/codecs/aacdec/e_tmp4audioobjecttype.h
ibstagefright/codecs/aacdec/e_tns_const.h
ibstagefright/codecs/aacdec/e_window_sequence.h
ibstagefright/codecs/aacdec/e_window_shape.h
ibstagefright/codecs/aacdec/esc_iquant_scaling.cpp
ibstagefright/codecs/aacdec/esc_iquant_scaling.h
ibstagefright/codecs/aacdec/extractframeinfo.cpp
ibstagefright/codecs/aacdec/extractframeinfo.h
ibstagefright/codecs/aacdec/fft_rx4.h
ibstagefright/codecs/aacdec/fft_rx4_long.cpp
ibstagefright/codecs/aacdec/fft_rx4_short.cpp
ibstagefright/codecs/aacdec/fft_rx4_tables_fxp.cpp
ibstagefright/codecs/aacdec/find_adts_syncword.cpp
ibstagefright/codecs/aacdec/find_adts_syncword.h
ibstagefright/codecs/aacdec/fwd_long_complex_rot.cpp
ibstagefright/codecs/aacdec/fwd_long_complex_rot.h
ibstagefright/codecs/aacdec/fwd_short_complex_rot.cpp
ibstagefright/codecs/aacdec/fwd_short_complex_rot.h
ibstagefright/codecs/aacdec/fxp_mul32.h
ibstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h
ibstagefright/codecs/aacdec/fxp_mul32_arm_v4.h
ibstagefright/codecs/aacdec/fxp_mul32_arm_v4_gcc.h
ibstagefright/codecs/aacdec/fxp_mul32_arm_v5.h
ibstagefright/codecs/aacdec/fxp_mul32_c_equivalent.h
ibstagefright/codecs/aacdec/fxp_mul32_c_msc_evc.h
ibstagefright/codecs/aacdec/fxp_mul32_c_msc_evc_armv5.h
ibstagefright/codecs/aacdec/fxp_mul32_pentium.h
ibstagefright/codecs/aacdec/gen_rand_vector.cpp
ibstagefright/codecs/aacdec/gen_rand_vector.h
ibstagefright/codecs/aacdec/get_adif_header.cpp
ibstagefright/codecs/aacdec/get_adif_header.h
ibstagefright/codecs/aacdec/get_adts_header.cpp
ibstagefright/codecs/aacdec/get_adts_header.h
ibstagefright/codecs/aacdec/get_audio_specific_config.cpp
ibstagefright/codecs/aacdec/get_audio_specific_config.h
ibstagefright/codecs/aacdec/get_dse.cpp
ibstagefright/codecs/aacdec/get_dse.h
ibstagefright/codecs/aacdec/get_ele_list.cpp
ibstagefright/codecs/aacdec/get_ele_list.h
ibstagefright/codecs/aacdec/get_ga_specific_config.cpp
ibstagefright/codecs/aacdec/get_ga_specific_config.h
ibstagefright/codecs/aacdec/get_ics_info.cpp
ibstagefright/codecs/aacdec/get_ics_info.h
ibstagefright/codecs/aacdec/get_prog_config.cpp
ibstagefright/codecs/aacdec/get_prog_config.h
ibstagefright/codecs/aacdec/get_pulse_data.cpp
ibstagefright/codecs/aacdec/get_pulse_data.h
ibstagefright/codecs/aacdec/get_sbr_bitstream.cpp
ibstagefright/codecs/aacdec/get_sbr_bitstream.h
ibstagefright/codecs/aacdec/get_sbr_startfreq.cpp
ibstagefright/codecs/aacdec/get_sbr_startfreq.h
ibstagefright/codecs/aacdec/get_sbr_stopfreq.cpp
ibstagefright/codecs/aacdec/get_sbr_stopfreq.h
ibstagefright/codecs/aacdec/get_sign_bits.h
ibstagefright/codecs/aacdec/get_tns.cpp
ibstagefright/codecs/aacdec/get_tns.h
ibstagefright/codecs/aacdec/getbits.h
ibstagefright/codecs/aacdec/getfill.cpp
ibstagefright/codecs/aacdec/getfill.h
ibstagefright/codecs/aacdec/getgroup.cpp
ibstagefright/codecs/aacdec/getics.cpp
ibstagefright/codecs/aacdec/getmask.cpp
ibstagefright/codecs/aacdec/hcbtables.h
ibstagefright/codecs/aacdec/hcbtables_binary.cpp
ibstagefright/codecs/aacdec/huffcb.cpp
ibstagefright/codecs/aacdec/huffdecode.cpp
ibstagefright/codecs/aacdec/hufffac.cpp
ibstagefright/codecs/aacdec/huffman.h
ibstagefright/codecs/aacdec/huffspec_fxp.cpp
ibstagefright/codecs/aacdec/ibstream.h
ibstagefright/codecs/aacdec/idct16.cpp
ibstagefright/codecs/aacdec/idct16.h
ibstagefright/codecs/aacdec/idct32.cpp
ibstagefright/codecs/aacdec/idct32.h
ibstagefright/codecs/aacdec/idct8.cpp
ibstagefright/codecs/aacdec/idct8.h
ibstagefright/codecs/aacdec/imdct_fxp.cpp
ibstagefright/codecs/aacdec/imdct_fxp.h
ibstagefright/codecs/aacdec/infoinit.cpp
ibstagefright/codecs/aacdec/init_sbr_dec.cpp
ibstagefright/codecs/aacdec/init_sbr_dec.h
ibstagefright/codecs/aacdec/intensity_right.cpp
ibstagefright/codecs/aacdec/intensity_right.h
ibstagefright/codecs/aacdec/inv_long_complex_rot.cpp
ibstagefright/codecs/aacdec/inv_long_complex_rot.h
ibstagefright/codecs/aacdec/inv_short_complex_rot.cpp
ibstagefright/codecs/aacdec/inv_short_complex_rot.h
ibstagefright/codecs/aacdec/iquant_table.cpp
ibstagefright/codecs/aacdec/iquant_table.h
ibstagefright/codecs/aacdec/long_term_prediction.cpp
ibstagefright/codecs/aacdec/long_term_prediction.h
ibstagefright/codecs/aacdec/long_term_synthesis.cpp
ibstagefright/codecs/aacdec/long_term_synthesis.h
ibstagefright/codecs/aacdec/lt_decode.cpp
ibstagefright/codecs/aacdec/lt_decode.h
ibstagefright/codecs/aacdec/lt_prediction.h
ibstagefright/codecs/aacdec/ltp_common_internal.h
ibstagefright/codecs/aacdec/mdct_fxp.cpp
ibstagefright/codecs/aacdec/mdct_fxp.h
ibstagefright/codecs/aacdec/mdct_tables_fxp.cpp
ibstagefright/codecs/aacdec/mdst.cpp
ibstagefright/codecs/aacdec/mdst.h
ibstagefright/codecs/aacdec/mix_radix_fft.cpp
ibstagefright/codecs/aacdec/mix_radix_fft.h
ibstagefright/codecs/aacdec/ms_map_mask.h
ibstagefright/codecs/aacdec/ms_synt.cpp
ibstagefright/codecs/aacdec/ms_synt.h
ibstagefright/codecs/aacdec/pns_corr.cpp
ibstagefright/codecs/aacdec/pns_corr.h
ibstagefright/codecs/aacdec/pns_intensity_right.cpp
ibstagefright/codecs/aacdec/pns_intensity_right.h
ibstagefright/codecs/aacdec/pns_left.cpp
ibstagefright/codecs/aacdec/pns_left.h
ibstagefright/codecs/aacdec/ps_all_pass_filter_coeff.cpp
ibstagefright/codecs/aacdec/ps_all_pass_filter_coeff.h
ibstagefright/codecs/aacdec/ps_all_pass_fract_delay_filter.cpp
ibstagefright/codecs/aacdec/ps_all_pass_fract_delay_filter.h
ibstagefright/codecs/aacdec/ps_allocate_decoder.cpp
ibstagefright/codecs/aacdec/ps_allocate_decoder.h
ibstagefright/codecs/aacdec/ps_applied.cpp
ibstagefright/codecs/aacdec/ps_applied.h
ibstagefright/codecs/aacdec/ps_bstr_decoding.cpp
ibstagefright/codecs/aacdec/ps_bstr_decoding.h
ibstagefright/codecs/aacdec/ps_channel_filtering.cpp
ibstagefright/codecs/aacdec/ps_channel_filtering.h
ibstagefright/codecs/aacdec/ps_constants.h
ibstagefright/codecs/aacdec/ps_decode_bs_utils.cpp
ibstagefright/codecs/aacdec/ps_decode_bs_utils.h
ibstagefright/codecs/aacdec/ps_decorrelate.cpp
ibstagefright/codecs/aacdec/ps_decorrelate.h
ibstagefright/codecs/aacdec/ps_fft_rx8.cpp
ibstagefright/codecs/aacdec/ps_fft_rx8.h
ibstagefright/codecs/aacdec/ps_hybrid_analysis.cpp
ibstagefright/codecs/aacdec/ps_hybrid_analysis.h
ibstagefright/codecs/aacdec/ps_hybrid_filter_bank_allocation.cpp
ibstagefright/codecs/aacdec/ps_hybrid_filter_bank_allocation.h
ibstagefright/codecs/aacdec/ps_hybrid_synthesis.cpp
ibstagefright/codecs/aacdec/ps_hybrid_synthesis.h
ibstagefright/codecs/aacdec/ps_init_stereo_mixing.cpp
ibstagefright/codecs/aacdec/ps_init_stereo_mixing.h
ibstagefright/codecs/aacdec/ps_pwr_transient_detection.cpp
ibstagefright/codecs/aacdec/ps_pwr_transient_detection.h
ibstagefright/codecs/aacdec/ps_read_data.cpp
ibstagefright/codecs/aacdec/ps_read_data.h
ibstagefright/codecs/aacdec/ps_stereo_processing.cpp
ibstagefright/codecs/aacdec/ps_stereo_processing.h
ibstagefright/codecs/aacdec/pulse_nc.cpp
ibstagefright/codecs/aacdec/pulse_nc.h
ibstagefright/codecs/aacdec/pv_audio_type_defs.h
ibstagefright/codecs/aacdec/pv_div.cpp
ibstagefright/codecs/aacdec/pv_div.h
ibstagefright/codecs/aacdec/pv_log2.cpp
ibstagefright/codecs/aacdec/pv_log2.h
ibstagefright/codecs/aacdec/pv_normalize.cpp
ibstagefright/codecs/aacdec/pv_normalize.h
ibstagefright/codecs/aacdec/pv_pow2.cpp
ibstagefright/codecs/aacdec/pv_pow2.h
ibstagefright/codecs/aacdec/pv_sine.cpp
ibstagefright/codecs/aacdec/pv_sine.h
ibstagefright/codecs/aacdec/pv_sqrt.cpp
ibstagefright/codecs/aacdec/pv_sqrt.h
ibstagefright/codecs/aacdec/pvmp4audiodecoder_api.h
ibstagefright/codecs/aacdec/pvmp4audiodecoderconfig.cpp
ibstagefright/codecs/aacdec/pvmp4audiodecoderframe.cpp
ibstagefright/codecs/aacdec/pvmp4audiodecodergetmemrequirements.cpp
ibstagefright/codecs/aacdec/pvmp4audiodecoderinitlibrary.cpp
ibstagefright/codecs/aacdec/pvmp4audiodecoderresetbuffer.cpp
ibstagefright/codecs/aacdec/pvmp4setaudioconfig.cpp
ibstagefright/codecs/aacdec/q_normalize.cpp
ibstagefright/codecs/aacdec/q_normalize.h
ibstagefright/codecs/aacdec/qmf_filterbank_coeff.cpp
ibstagefright/codecs/aacdec/qmf_filterbank_coeff.h
ibstagefright/codecs/aacdec/s_adif_header.h
ibstagefright/codecs/aacdec/s_bit_buffer.h
ibstagefright/codecs/aacdec/s_bits.h
ibstagefright/codecs/aacdec/s_ch_info.h
ibstagefright/codecs/aacdec/s_crc_buffer.h
ibstagefright/codecs/aacdec/s_elelist.h
ibstagefright/codecs/aacdec/s_frameinfo.h
ibstagefright/codecs/aacdec/s_hcb.h
ibstagefright/codecs/aacdec/s_huffman.h
ibstagefright/codecs/aacdec/s_hybrid.h
ibstagefright/codecs/aacdec/s_lt_pred_status.h
ibstagefright/codecs/aacdec/s_mc_info.h
ibstagefright/codecs/aacdec/s_mixdown.h
ibstagefright/codecs/aacdec/s_patch.h
ibstagefright/codecs/aacdec/s_progconfig.h
ibstagefright/codecs/aacdec/s_ps_dec.h
ibstagefright/codecs/aacdec/s_pulseinfo.h
ibstagefright/codecs/aacdec/s_sbr_channel.h
ibstagefright/codecs/aacdec/s_sbr_dec.h
ibstagefright/codecs/aacdec/s_sbr_element_stream.h
ibstagefright/codecs/aacdec/s_sbr_frame_data.h
ibstagefright/codecs/aacdec/s_sbr_header_data.h
ibstagefright/codecs/aacdec/s_sbrbitstream.h
ibstagefright/codecs/aacdec/s_sectinfo.h
ibstagefright/codecs/aacdec/s_sr_info.h
ibstagefright/codecs/aacdec/s_tdec_int_chan.h
ibstagefright/codecs/aacdec/s_tdec_int_file.h
ibstagefright/codecs/aacdec/s_tns_frame_info.h
ibstagefright/codecs/aacdec/s_tnsfilt.h
ibstagefright/codecs/aacdec/s_wnd_shape.h
ibstagefright/codecs/aacdec/sbr_aliasing_reduction.cpp
ibstagefright/codecs/aacdec/sbr_aliasing_reduction.h
ibstagefright/codecs/aacdec/sbr_applied.cpp
ibstagefright/codecs/aacdec/sbr_applied.h
ibstagefright/codecs/aacdec/sbr_code_book_envlevel.cpp
ibstagefright/codecs/aacdec/sbr_code_book_envlevel.h
ibstagefright/codecs/aacdec/sbr_constants.h
ibstagefright/codecs/aacdec/sbr_crc_check.cpp
ibstagefright/codecs/aacdec/sbr_crc_check.h
ibstagefright/codecs/aacdec/sbr_create_limiter_bands.cpp
ibstagefright/codecs/aacdec/sbr_create_limiter_bands.h
ibstagefright/codecs/aacdec/sbr_dec.cpp
ibstagefright/codecs/aacdec/sbr_dec.h
ibstagefright/codecs/aacdec/sbr_decode_envelope.cpp
ibstagefright/codecs/aacdec/sbr_decode_envelope.h
ibstagefright/codecs/aacdec/sbr_decode_huff_cw.cpp
ibstagefright/codecs/aacdec/sbr_decode_huff_cw.h
ibstagefright/codecs/aacdec/sbr_downsample_lo_res.cpp
ibstagefright/codecs/aacdec/sbr_downsample_lo_res.h
ibstagefright/codecs/aacdec/sbr_envelope_calc_tbl.cpp
ibstagefright/codecs/aacdec/sbr_envelope_calc_tbl.h
ibstagefright/codecs/aacdec/sbr_envelope_unmapping.cpp
ibstagefright/codecs/aacdec/sbr_envelope_unmapping.h
ibstagefright/codecs/aacdec/sbr_extract_extended_data.cpp
ibstagefright/codecs/aacdec/sbr_extract_extended_data.h
ibstagefright/codecs/aacdec/sbr_find_start_andstop_band.cpp
ibstagefright/codecs/aacdec/sbr_find_start_andstop_band.h
ibstagefright/codecs/aacdec/sbr_generate_high_freq.cpp
ibstagefright/codecs/aacdec/sbr_generate_high_freq.h
ibstagefright/codecs/aacdec/sbr_get_additional_data.cpp
ibstagefright/codecs/aacdec/sbr_get_additional_data.h
ibstagefright/codecs/aacdec/sbr_get_cpe.cpp
ibstagefright/codecs/aacdec/sbr_get_cpe.h
ibstagefright/codecs/aacdec/sbr_get_dir_control_data.cpp
ibstagefright/codecs/aacdec/sbr_get_dir_control_data.h
ibstagefright/codecs/aacdec/sbr_get_envelope.cpp
ibstagefright/codecs/aacdec/sbr_get_envelope.h
ibstagefright/codecs/aacdec/sbr_get_header_data.cpp
ibstagefright/codecs/aacdec/sbr_get_header_data.h
ibstagefright/codecs/aacdec/sbr_get_noise_floor_data.cpp
ibstagefright/codecs/aacdec/sbr_get_noise_floor_data.h
ibstagefright/codecs/aacdec/sbr_get_sce.cpp
ibstagefright/codecs/aacdec/sbr_get_sce.h
ibstagefright/codecs/aacdec/sbr_inv_filt_levelemphasis.cpp
ibstagefright/codecs/aacdec/sbr_inv_filt_levelemphasis.h
ibstagefright/codecs/aacdec/sbr_open.cpp
ibstagefright/codecs/aacdec/sbr_open.h
ibstagefright/codecs/aacdec/sbr_read_data.cpp
ibstagefright/codecs/aacdec/sbr_read_data.h
ibstagefright/codecs/aacdec/sbr_requantize_envelope_data.cpp
ibstagefright/codecs/aacdec/sbr_requantize_envelope_data.h
ibstagefright/codecs/aacdec/sbr_reset_dec.cpp
ibstagefright/codecs/aacdec/sbr_reset_dec.h
ibstagefright/codecs/aacdec/sbr_update_freq_scale.cpp
ibstagefright/codecs/aacdec/sbr_update_freq_scale.h
ibstagefright/codecs/aacdec/set_mc_info.cpp
ibstagefright/codecs/aacdec/set_mc_info.h
ibstagefright/codecs/aacdec/sfb.cpp
ibstagefright/codecs/aacdec/sfb.h
ibstagefright/codecs/aacdec/shellsort.cpp
ibstagefright/codecs/aacdec/shellsort.h
ibstagefright/codecs/aacdec/stereo_2_mono.h
ibstagefright/codecs/aacdec/synthesis_sub_band.cpp
ibstagefright/codecs/aacdec/synthesis_sub_band.h
ibstagefright/codecs/aacdec/tns_ar_filter.cpp
ibstagefright/codecs/aacdec/tns_ar_filter.h
ibstagefright/codecs/aacdec/tns_decode_coef.cpp
ibstagefright/codecs/aacdec/tns_decode_coef.h
ibstagefright/codecs/aacdec/tns_inv_filter.cpp
ibstagefright/codecs/aacdec/tns_inv_filter.h
ibstagefright/codecs/aacdec/trans4m_freq_2_time_fxp.cpp
ibstagefright/codecs/aacdec/trans4m_time_2_freq_fxp.cpp
ibstagefright/codecs/aacdec/unpack_idx.cpp
ibstagefright/codecs/aacdec/unpack_idx.h
ibstagefright/codecs/aacdec/window_block_fxp.h
ibstagefright/codecs/aacdec/window_tables_fxp.cpp
ibstagefright/codecs/aacdec/write_output.h
ibstagefright/include/AACDecoder.h
6d42d80653f2c41f3e72a878a1d9a6f9693b89f7 07-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I9cc489a2 into eclair

* changes:
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
8e6d79e2b570d73b620a4f5a98d461329e5f2477 07-Dec-2009 Yu Shan Emily Lau <yslau@google.com> am 8445f367: Merge change Ibb9b1de1 into eclair

Merge commit '8445f367070514dce3154be73827107b8a93f234' into eclair-mr2

* commit '8445f367070514dce3154be73827107b8a93f234':
1) Capture the start memory before the test started
6d58cf0d3d2f69a5451058b7ac5d74d59be0be54 07-Dec-2009 Yu Shan Emily Lau <yslau@google.com> am 8445f367: Merge change Ibb9b1de1 into eclair

Merge commit '8445f367070514dce3154be73827107b8a93f234' into eclair-plus-aosp

* commit '8445f367070514dce3154be73827107b8a93f234':
1) Capture the start memory before the test started
8445f367070514dce3154be73827107b8a93f234 07-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ibb9b1de1 into eclair

* changes:
1) Capture the start memory before the test started 2) Report the mem diff to zero if it is negative.
f553a58425c66a990dbc5f4579c976a0636fc573 07-Dec-2009 Andreas Huber <andih@google.com> am 5921fb51: Merge change I91eb0354 into eclair-mr2

Merge commit '5921fb51e0219ddd7cad439a73495f320c57d50e' into eclair-mr2-plus-aosp

* commit '5921fb51e0219ddd7cad439a73495f320c57d50e':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
91eb0354043842d96bf3ef201ce68046db70df74 07-Dec-2009 Andreas Huber <andih@google.com> Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
ibstagefright/OMXCodec.cpp
9cc489a2196e449dbe090ad9bdbc5cedd0b8334f 05-Dec-2009 Eric Laurent <elaurent@google.com> Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.

Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to openOutput().
Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes
the record start to fail.
Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function.

Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account
and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
ava/android/media/AudioRecord.java
ibmedia/AudioRecord.cpp
30daf09cb6e74be45c5b594569002c0eb9f9ed7d 04-Dec-2009 Yu Shan Emily Lau <yslau@google.com> 1) Capture the start memory before the test started
2) Report the mem diff to zero if it is negative.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
5d676ad5d94c3d4f831c2084012f955fe56a8af8 04-Dec-2009 Andreas Huber <andih@google.com> am 52f410e2: Merge change Ifef6435a into eclair-mr2

Merge commit '52f410e2ebba103220cffce05b895f0c38a56665' into eclair-mr2-plus-aosp

* commit '52f410e2ebba103220cffce05b895f0c38a56665':
Enable proper cleanup of OMX nodes managed through stagefright.
52f410e2ebba103220cffce05b895f0c38a56665 04-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ifef6435a into eclair-mr2

* changes:
Enable proper cleanup of OMX nodes managed through stagefright.
fef6435a0692f3c9b6055903dfb7699e90e19d46 04-Dec-2009 Andreas Huber <andih@google.com> Enable proper cleanup of OMX nodes managed through stagefright.
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXMaster.cpp
ibstagefright/omx/OMXMaster.h
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/OMXPVCodecsPlugin.cpp
ibstagefright/omx/OMXPVCodecsPlugin.h
ibstagefright/omx/OMXSoftwareCodecsPlugin.cpp
ibstagefright/omx/OMXSoftwareCodecsPlugin.h
840459e843ad57ce00fe15e00f3bffac2c053d24 04-Dec-2009 Ray Chen <raychen@google.com> am da324195: am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371

Merge commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe'

* commit 'da32419584d6761bfcbcad6a72275dbc3cea50fe':
Images.Media.DATE_TAKEN should be in milliseconds.
da32419584d6761bfcbcad6a72275dbc3cea50fe 04-Dec-2009 Ray Chen <raychen@google.com> am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371

Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp

* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
Images.Media.DATE_TAKEN should be in milliseconds.
d9fae01d5a26408a41b6260f18a33003c6c7d98f 04-Dec-2009 Ray Chen <raychen@google.com> am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371

Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-plus-aosp

* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
Images.Media.DATE_TAKEN should be in milliseconds.
8a576620cdc7257fc026026c77f7c946bfb760d1 04-Dec-2009 Ray Chen <raychen@google.com> am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371

Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2

* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
Images.Media.DATE_TAKEN should be in milliseconds.
052d9c8b414dc9eb1c70d849660592d9bc3b2644 04-Dec-2009 Ray Chen <raychen@google.com> Images.Media.DATE_TAKEN should be in milliseconds.
http://b/2297371
ava/android/media/ExifInterface.java
ava/android/media/MediaScanner.java
7570576e7d681db3256ea5d0934883920f545bf3 04-Dec-2009 Naveen Kalla <nkalla@quicinc.com> am f345a094: am 104d3f75: Merge change I6c84d731 into eclair-mr2

Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f'

* commit 'f345a094e90be664f7390d12d505a052ac4b064f':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
8f8e65271558ca03fd0986eec03ebef3cbd644d0 04-Dec-2009 Andreas Huber <andih@google.com> am f4eb754b: am 2a428fd4: Merge change I85e5d39e into eclair-mr2

Merge commit 'f4eb754b1810a60e640401396c1f9a10be65dffa'

* commit 'f4eb754b1810a60e640401396c1f9a10be65dffa':
Two more uses of strlcpy that break the sim build. Now fixed.
6eacdea7afb55f3b5ced7b487197585e24bff2e7 04-Dec-2009 Scott Main <smain@google.com> am 06ef1d21: am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2

Merge commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17'

* commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
d1a8532c84f3c57677954d3d9345dd88925bb036 04-Dec-2009 Andreas Huber <andih@google.com> am b8fb6c0b: am 8d670d34: Merge change I1f1c7bad into eclair-mr2

Merge commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4'

* commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
a3e509c2b70d95605199283c760c0de523952cc9 04-Dec-2009 Andreas Huber <andih@google.com> am 9ee55cc1: am 2d6d609c: Merge change I74bf38a0 into eclair-mr2

Merge commit '9ee55cc1bc6878b243134a558d583786d9215958'

* commit '9ee55cc1bc6878b243134a558d583786d9215958':
Squashed commit of the following:
54be356f740d869d8e776d446757afcf47899f13 04-Dec-2009 Andreas Huber <andih@google.com> am 874c508c: am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.

Merge commit '874c508c5352936c0640317ef44b81c9b632dfd6'

* commit '874c508c5352936c0640317ef44b81c9b632dfd6':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
87256a28fdfc64dabba154d68778c479bd383a27 04-Dec-2009 Dave Sparks <davidsparks@android.com> am b06ecc40: am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2

Merge commit 'b06ecc401160c5906fd1f4c85f61163bc2875200'

* commit 'b06ecc401160c5906fd1f4c85f61163bc2875200':
Remove old hack A/V sync hack that is no longer needed.
ba343d6427e2bdd8f9b0c97f122c294a0c131047 04-Dec-2009 Ray Chen <raychen@google.com> am 29d503c6: am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair

Merge commit '29d503c6cc9df7882859c689d23609a543b24d8a'

* commit '29d503c6cc9df7882859c689d23609a543b24d8a':
Fix timezone issue to comply with EXIF standard.
f345a094e90be664f7390d12d505a052ac4b064f 04-Dec-2009 Naveen Kalla <nkalla@quicinc.com> am 104d3f75: Merge change I6c84d731 into eclair-mr2

Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp

* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
104d3f755e5ebc15d66154526c2c149beb33a7ee 04-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I6c84d731 into eclair-mr2

* changes:
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
f4eb754b1810a60e640401396c1f9a10be65dffa 04-Dec-2009 Andreas Huber <andih@google.com> am 2a428fd4: Merge change I85e5d39e into eclair-mr2

Merge commit '2a428fd463431e2b3d3680faf2e9640989ca7791' into eclair-mr2-plus-aosp

* commit '2a428fd463431e2b3d3680faf2e9640989ca7791':
Two more uses of strlcpy that break the sim build. Now fixed.
06ef1d2104b4c90d5b134ae17e2562fd6bedda17 04-Dec-2009 Scott Main <smain@google.com> am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2

Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp

* commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4 04-Dec-2009 Andreas Huber <andih@google.com> am 8d670d34: Merge change I1f1c7bad into eclair-mr2

Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp

* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
9ee55cc1bc6878b243134a558d583786d9215958 04-Dec-2009 Andreas Huber <andih@google.com> am 2d6d609c: Merge change I74bf38a0 into eclair-mr2

Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp

* commit '2d6d609c9ede7ed8924001df00af9c13effab8ad':
Squashed commit of the following:
874c508c5352936c0640317ef44b81c9b632dfd6 04-Dec-2009 Andreas Huber <andih@google.com> am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.

Merge commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp

* commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
b06ecc401160c5906fd1f4c85f61163bc2875200 04-Dec-2009 Dave Sparks <davidsparks@android.com> am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2

Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp

* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
Remove old hack A/V sync hack that is no longer needed.
29d503c6cc9df7882859c689d23609a543b24d8a 04-Dec-2009 Ray Chen <raychen@google.com> am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair

Merge commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp

* commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497':
Fix timezone issue to comply with EXIF standard.
85e5d39e608f9499a7fe46a80434c3aee7d338e7 04-Dec-2009 Andreas Huber <andih@google.com> Two more uses of strlcpy that break the sim build. Now fixed.
ibstagefright/omx/mp3dec/MP3Decoder.cpp
805cc709b7852d209b122dfe7bf5d42dbd44e393 04-Dec-2009 Andreas Huber <andih@google.com> Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
ibstagefright/omx/OMXSoftwareCodecsPlugin.cpp
1f1c7bad42522db99f9ac4e1a6442a08e4e593d9 04-Dec-2009 Andreas Huber <andih@google.com> I accidentally broke this code while refactoring MediaScanner. This is the fix.
ibmedia/StagefrightMediaScanner.cpp
2d6d609c9ede7ed8924001df00af9c13effab8ad 03-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I74bf38a0 into eclair-mr2

* changes:
Squashed commit of the following:
bfb9fb143b67c2d0307af2bce9af3c08f362b29a 03-Dec-2009 Andreas Huber <andih@google.com> Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaScanner.cpp
ibmedia/Android.mk
ibmedia/MediaScanner.cpp
ibmedia/MediaScannerClient.cpp
ibmedia/StagefrightMediaScanner.cpp
ibmedia/StagefrightMediaScanner.h
ibmedia/autodetect.cpp
ibmedia/autodetect.h
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaRecorderClient.cpp
b0caf946b7ae9be519c0cede935ea2ecb44f9bd0 03-Dec-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 11:33:57 2009 -0800

stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...

commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 2 12:39:07 2009 -0800

More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
ibstagefright/include/OMX.h
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXComponentBase.cpp
ibstagefright/omx/OMXComponentBase.h
ibstagefright/omx/OMXMaster.cpp
ibstagefright/omx/OMXMaster.h
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/omx/OMXPVCodecsPlugin.cpp
ibstagefright/omx/OMXPVCodecsPlugin.h
ibstagefright/omx/OMXSoftwareCodecsPlugin.cpp
ibstagefright/omx/OMXSoftwareCodecsPlugin.h
ibstagefright/omx/mp3dec/Android.mk
ibstagefright/omx/mp3dec/MP3Decoder.cpp
ibstagefright/omx/mp3dec/MP3Decoder.h
6c84d7313eb42d31449446cfb86ff71ee4a02bf5 14-Oct-2009 Naveen Kalla <nkalla@quicinc.com> Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER

Tone format for TONE_CDMA_ANSWER should be 660Hz + 1000Hz, with a 500ms ON
duration.
ibmedia/ToneGenerator.cpp
7c09a0ff365d6df96e880422a7b389ddf63401da 03-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib904c2a4 into eclair-mr2

* changes:
Remove old hack A/V sync hack that is no longer needed.
1b794bbbdc961558a9f0ee956d9d3f684d1f0497 03-Dec-2009 Ray Chen <raychen@google.com> am e12de4d5: Merge change Id5fa58cf into eclair

Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-mr2

* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
Fix timezone issue to comply with EXIF standard.
3bd0a4843a0738dc68cabf7fb35bab332179d770 03-Dec-2009 Ray Chen <raychen@google.com> am e12de4d5: Merge change Id5fa58cf into eclair

Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-plus-aosp

* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
Fix timezone issue to comply with EXIF standard.
e12de4d5041e05f77cc4376a6bfc953a48e2c3c1 03-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Id5fa58cf into eclair

* changes:
Fix timezone issue to comply with EXIF standard.
b904c2a452c43c0de591159f159d3b0e521e466e 03-Dec-2009 Dave Sparks <davidsparks@android.com> Remove old hack A/V sync hack that is no longer needed.
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
b355012797dfd503eee9f80ed06bc30a17cc3318 03-Dec-2009 Wei-Ta Chen <weita@google.com> Fix the broken build of omxjpegdecoder: http://b/2299035.

1) Add the include path for jni.h.

2) Rename InitCheck() and read_at() to initCheck() and readAt(),
repectively in StreamSource, as done in DataSource.

3) Add back the definition of SkJPEGImageDecoder to jpeg_decoder_bench.cpp.
Need to do so because SkJPEGImageDecoder is not defined in a header file.
ests/omxjpegdecoder/Android.mk
ests/omxjpegdecoder/StreamSource.cpp
ests/omxjpegdecoder/StreamSource.h
ests/omxjpegdecoder/jpeg_decoder_bench.cpp
9495f8a1547b14590e901bc9420889b380e39a0c 03-Dec-2009 Ray Chen <raychen@google.com> am cb6203cd: am 9db1a37c: am f27eb326: Merge change I0b6ee9fc into eclair

Merge commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4'

* commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4':
DATE_TAKEN should be in millisecond instead of second.
cb6203cdcbfbcb0c2909964b9173d0a873f086c4 02-Dec-2009 Ray Chen <raychen@google.com> am 9db1a37c: am f27eb326: Merge change I0b6ee9fc into eclair

Merge commit '9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp

* commit '9db1a37cc48a01a66ee8026de303faaf4a83667d':
DATE_TAKEN should be in millisecond instead of second.
9db1a37cc48a01a66ee8026de303faaf4a83667d 02-Dec-2009 Ray Chen <raychen@google.com> am f27eb326: Merge change I0b6ee9fc into eclair

Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.
ed2168524b37c4124fd084b0e92f51b681773a75 02-Dec-2009 Eric Laurent <elaurent@google.com> am e77d4083: am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair

Merge commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b'

* commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
e77d40834589ec70abcf71d93a82d24ca6e5535b 02-Dec-2009 Eric Laurent <elaurent@google.com> am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair

Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp

* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
4612a9c53c00943d9a8c2c2b95f4bdfcea17a011 02-Dec-2009 Andreas Huber <andih@google.com> am ae34cf92: am 781ac162: Merge change I8768f2cc into eclair-mr2

Merge commit 'ae34cf92db9c54ba72fdcac33a8ba855a2215e4e'

* commit 'ae34cf92db9c54ba72fdcac33a8ba855a2215e4e':
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
ae34cf92db9c54ba72fdcac33a8ba855a2215e4e 02-Dec-2009 Andreas Huber <andih@google.com> am 781ac162: Merge change I8768f2cc into eclair-mr2

Merge commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb' into eclair-mr2-plus-aosp

* commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb':
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
6f762b2d8475f9e2b05340b5300e969718a482e6 02-Dec-2009 Ray Chen <raychen@google.com> am f27eb326: Merge change I0b6ee9fc into eclair

Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-plus-aosp

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.
5e392e2b028fb0f92b2efe6de24b60a57cd4c565 02-Dec-2009 Eric Laurent <elaurent@google.com> am bb3bb57a: Merge change I524dc046 into eclair

Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
8768f2ccefdd7862a248995055aa04fd2d5a4dfe 02-Dec-2009 Andreas Huber <andih@google.com> A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
ibstagefright/OMXCodec.cpp
d5fa58cf3d71f2cf94299584050b2698fa3753ec 30-Nov-2009 Ray Chen <raychen@google.com> Fix timezone issue to comply with EXIF standard.
ava/android/media/ExifInterface.java
0b6ee9fc5e9da370e31dce686e7062e5d255fcda 30-Nov-2009 Ray Chen <raychen@google.com> DATE_TAKEN should be in millisecond instead of second.
ava/android/media/MediaScanner.java
55da000c1d2e0f50bf96953ea967d69b27d70ea3 30-Nov-2009 Eric Laurent <elaurent@google.com> am bb3bb57a: Merge change I524dc046 into eclair

Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-plus-aosp

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
524dc046b1225087f481878a5c3ae7f733c9f0e2 27-Nov-2009 Eric Laurent <elaurent@google.com> Fix issue 2192673: Music Pausing Even when notifications are set to silent.

Do not play ringtones, notifications or camera sounds if ringer mode is silent.
ava/android/media/Ringtone.java
54b9a7c9f1b5def5ee1bde515b3fecaafc238014 25-Nov-2009 Gloria Wang <gwang@google.com> am 03c185bf: am c61b0de8: Merge change Id6ccc9bc into eclair-mr2

Merge commit '03c185bf763fd2a289131d64e4b14d4a5461d80f'

* commit '03c185bf763fd2a289131d64e4b14d4a5461d80f':
Update documentation: The width of the image for face detection must be even.
03c185bf763fd2a289131d64e4b14d4a5461d80f 25-Nov-2009 Gloria Wang <gwang@google.com> am c61b0de8: Merge change Id6ccc9bc into eclair-mr2

Merge commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa' into eclair-mr2-plus-aosp

* commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa':
Update documentation: The width of the image for face detection must be even.
c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa 25-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Id6ccc9bc into eclair-mr2

* changes:
Update documentation: The width of the image for face detection must be even.
d6ccc9bcf0bdbca315d0c57c69f26df975eb5264 25-Nov-2009 Gloria Wang <gwang@google.com> Update documentation: The width of the image for face detection must be even.
ava/android/media/FaceDetector.java
9f14b6a5210f187015d28c3faea0e14dc71b016b 24-Nov-2009 Dave Sparks <davidsparks@android.com> am 3d14b1a1: am 1e914ac7: am 16cc72bd: Fix simulator build.

Merge commit '3d14b1a17066b57b579859c246da1397f4e0a123'

* commit '3d14b1a17066b57b579859c246da1397f4e0a123':
Fix simulator build.
53fbe69a486191f9e869865acead33faff522467 24-Nov-2009 Dave Sparks <davidsparks@android.com> am 551e1a76: am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclair

Merge commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80'

* commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80':
Set metadata retriever thread group to the caller's group.
3d14b1a17066b57b579859c246da1397f4e0a123 24-Nov-2009 Dave Sparks <davidsparks@android.com> am 1e914ac7: am 16cc72bd: Fix simulator build.

Merge commit '1e914ac7fce9523b5a932389798589eba91ca4dd' into eclair-mr2-plus-aosp

* commit '1e914ac7fce9523b5a932389798589eba91ca4dd':
Fix simulator build.
551e1a7608887c5bb29b65f3b4aab058fdd06c80 24-Nov-2009 Dave Sparks <davidsparks@android.com> am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclair

Merge commit 'ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp

* commit 'ebcb7c3167e76c19d4721dbc472772744918e868':
Set metadata retriever thread group to the caller's group.
0b1a97637aa8c0d14c658b349e64d78ec1f74757 24-Nov-2009 Dave Sparks <davidsparks@android.com> am 16cc72bd: Fix simulator build.

Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-plus-aosp

* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
Fix simulator build.
e444cae5d7218293751531d43c6dbefeb5c6dccf 24-Nov-2009 Dave Sparks <davidsparks@android.com> am 8424ec32: Merge change I0f9a53d4 into eclair

Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-plus-aosp

* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
Set metadata retriever thread group to the caller's group.
1e914ac7fce9523b5a932389798589eba91ca4dd 24-Nov-2009 Dave Sparks <davidsparks@android.com> am 16cc72bd: Fix simulator build.

Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2

* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
Fix simulator build.
ebcb7c3167e76c19d4721dbc472772744918e868 24-Nov-2009 Dave Sparks <davidsparks@android.com> am 8424ec32: Merge change I0f9a53d4 into eclair

Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2

* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
Set metadata retriever thread group to the caller's group.
16cc72bdef471ffeee3f61eba8262783de248b04 24-Nov-2009 Dave Sparks <davidsparks@android.com> Fix simulator build.
ibmedia/IMediaMetadataRetriever.cpp
0f9a53d499b4ff56071c5d7862e00027eb11e9d4 24-Nov-2009 Dave Sparks <davidsparks@android.com> Set metadata retriever thread group to the caller's group.

This patch modifies the native binder interface to the metadata
retriever to pass the caller's thread group across the binder
interface. On the server side, the thread scheduler group is
set to the caller's scheduler group temporarily and restored
after the request has completed. This patch also reverts a
previous patch where the priority of the thread was forced to
a low priority foreground thread.

This should give apps more control over the priority of their
metadata retrieval, particularly allow background process to
run without hogging the CPU.
ibmedia/IMediaMetadataRetriever.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
f0de482c0296ddaf9f55adb00ec59932e6a44c0b 24-Nov-2009 Andreas Huber <andih@google.com> am 4bbdf934: am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.

Merge commit '4bbdf934458253dbdb331d2b614a085256ba8d6c'

* commit '4bbdf934458253dbdb331d2b614a085256ba8d6c':
Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2fadaf5634cb3e41aea09a24fee99f0e2afa00b3 24-Nov-2009 Andreas Huber <andih@google.com> am 5884468b: am 1f522294: Merge change I24b0a95d into eclair-mr2

Merge commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5'

* commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5':
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
19cbbb8b0fbda8f88a4635c7c3462793f52241ef 24-Nov-2009 Andreas Huber <andih@google.com> am d1f11997: am e71a6408: Merge change I1bceff91 into eclair-mr2

Merge commit 'd1f11997e5845938b50a58dd3aecbc966ee00373'

* commit 'd1f11997e5845938b50a58dd3aecbc966ee00373':
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
4bbdf934458253dbdb331d2b614a085256ba8d6c 24-Nov-2009 Andreas Huber <andih@google.com> am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.

Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
44e15c44ad10b36bd3649b21ea7432348e2f05f8 23-Nov-2009 Andreas Huber <andih@google.com> Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
ibstagefright/OMXCodec.cpp
5884468b448a5e2810d2ae421b69cc9c18a1a2f5 23-Nov-2009 Andreas Huber <andih@google.com> am 1f522294: Merge change I24b0a95d into eclair-mr2

Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp

* commit '1f52229453c3df8eaeda64133bd332b01589354f':
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
1f52229453c3df8eaeda64133bd332b01589354f 23-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I24b0a95d into eclair-mr2

* changes:
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
d1f11997e5845938b50a58dd3aecbc966ee00373 23-Nov-2009 Andreas Huber <andih@google.com> am e71a6408: Merge change I1bceff91 into eclair-mr2

Merge commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp

* commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e':
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
1bceff916a72246fa208605d50615823d7f1688b 23-Nov-2009 Andreas Huber <andih@google.com> Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OMXCodec.cpp
24b0a95de7d1e8b57aa2cda1a04a0e40e80a4372 23-Nov-2009 Andreas Huber <andih@google.com> The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
ibstagefright/AwesomePlayer.cpp
e21fb343872286a02cd2574334c78fa85ff923f4 23-Nov-2009 Andreas Huber <andih@google.com> am 5493df91: am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2

Merge commit '5493df919b01952857eb3b78fad3fe2cff573935'

* commit '5493df919b01952857eb3b78fad3fe2cff573935':
Squashed commit of the following:
5493df919b01952857eb3b78fad3fe2cff573935 23-Nov-2009 Andreas Huber <andih@google.com> am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2

Merge commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54' into eclair-mr2-plus-aosp

* commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54':
Squashed commit of the following:
27366fc9540cb642ee4856957dabffe7ddf1f901 20-Nov-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 1efc38dc3c33fef57b759002db3965ed07a28cb0
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 19 14:36:14 2009 -0800

Sending the SEEK-COMPLETE notification temporarily broke seeking backwards in time behaviour. This is now fixed.

Also, get rid of the semi-random delay after posting buffers to surface flinger in favour of delaying the buffer release until the next frame is displayed.

commit 51973062eb5ee63fd64b845d72bac517cc3369cf
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 14:01:43 2009 -0800

Fix one more unit test, properly send seek-complete notification only after seek actually completed.

commit cb22250b34b1fcfe1bf459723a761fd003950229
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 12:31:36 2009 -0800

Fix seek-while-paused in AwesomePlayer, revert to using FileSource if MmapSource fails.

commit 25eb9241138ddf7bb27ce90657116c5f8a94d880
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 12:30:40 2009 -0800

Support seeking and duration in AMRExtractor, assuming all frames are the same size.

commit 44192f2ebb7ea3bbd3ba5910025692dbc6a08faa
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 10:21:44 2009 -0800

MediaPlayerImpl is dead, long live AwesomePlayer.

commit c5b52d3c0674f5dc94db506afbce52401cceddac
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 09:42:23 2009 -0800

New implementation of the stagefright mediaplayer.
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibstagefright/AMRExtractor.cpp
ibstagefright/Android.mk
ibstagefright/AudioPlayer.cpp
ibstagefright/AwesomePlayer.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/MmapSource.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/include/AMRExtractor.h
ibstagefright/include/AwesomePlayer.h
0b74d40ac13ae2162dca4519935fc0805d9aa8c5 21-Nov-2009 Eric Laurent <elaurent@google.com> am 86526461: am 949c572a: am e7800946: Merge change I49f02be9 into eclair

Merge commit '8652646105a6ace559280b579ee8935541ada6c1'

* commit '8652646105a6ace559280b579ee8935541ada6c1':
Issue 2265163: Audio still reported routed through earpiece on sholes
8652646105a6ace559280b579ee8935541ada6c1 21-Nov-2009 Eric Laurent <elaurent@google.com> am 949c572a: am e7800946: Merge change I49f02be9 into eclair

Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp

* commit '949c572a16881aa40079a42bf7682637b23eb16a':
Issue 2265163: Audio still reported routed through earpiece on sholes
7d4cc41ad22e07c15667d853905f1b7b4a4c1a7a 21-Nov-2009 Eric Laurent <elaurent@google.com> am e7800946: Merge change I49f02be9 into eclair

Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-plus-aosp

* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
Issue 2265163: Audio still reported routed through earpiece on sholes
949c572a16881aa40079a42bf7682637b23eb16a 21-Nov-2009 Eric Laurent <elaurent@google.com> am e7800946: Merge change I49f02be9 into eclair

Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2

* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
Issue 2265163: Audio still reported routed through earpiece on sholes
e7800946a42c0ebe8e0b3f6eba04a96a9641aaff 21-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I49f02be9 into eclair

* changes:
Issue 2265163: Audio still reported routed through earpiece on sholes
ea1862bbf459e5af0222d9bb49741b45ab10791a 20-Nov-2009 Yu Shan Emily Lau <yslau@google.com> am c6bb089d: am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair

Merge commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568'

* commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568':
Add the checking for mediaplayer stress test.
c6bb089df15c25948757f6dbd9007fc0d49bb568 20-Nov-2009 Yu Shan Emily Lau <yslau@google.com> am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair

Merge commit '507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp

* commit '507322ca5c5b678714314ae87e27d07c89c40785':
Add the checking for mediaplayer stress test.
d66b63c2660fb4c97df8b8c0bdbacf08c4d86633 20-Nov-2009 Yu Shan Emily Lau <yslau@google.com> am 9ed314ce: Merge change Ib3191441 into eclair

Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-plus-aosp

* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
507322ca5c5b678714314ae87e27d07c89c40785 20-Nov-2009 Yu Shan Emily Lau <yslau@google.com> am 9ed314ce: Merge change Ib3191441 into eclair

Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2

* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
9ed314cefb5ec711dfcb5527a2a0a6b87a643c24 20-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib3191441 into eclair

* changes:
Add the checking for mediaplayer stress test.
b1ce51fb73b6d7ad5773e06ec32dedc6e4d42f4a 20-Nov-2009 Yu Shan Emily Lau <yslau@google.com> Add the checking for mediaplayer stress test.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
49f02be9d7fafb8841f75394a90f1409c6f82c1f 19-Nov-2009 Eric Laurent <elaurent@google.com> Issue 2265163: Audio still reported routed through earpiece on sholes

This is a second attempt to fix the audio routed to earpiece syndrom.
The root cause identified this time is the crash of an application having an active AudioTrack playing on the VOICE_CALL stream type.
When this happens, the AudioTrack destructor is not called and the audio policy manager is not notified of the track stop.
Results a situation where the VOICE_CALL stream is considered as always in use by audio policy manager which makes that audio is routed to earpiece.

The fix consists in moving the track start/stop/close notification to audio policiy manager from AudioTrack to AudioFlinger Track objet.
The net result is that in the case of a client application crash, the AudioFlinger TrackHandle object (which implements the remote side of the IAudioTrack binder interface) destructor is called which in turn destroys the Track object and we can notify the audio policy manager of the track stop and removal.

The same modification is made for AudioRecord although no bug related to record has been reported yet.
Also fixed a potential problem if record stop is called while the record thread is exiting.
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
8b49e97db9c46c63192989172ea03cd8751f2551 20-Nov-2009 Andreas Huber <andih@google.com> am f854e077: Merge change I8134d6ed into eclair

Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-plus-aosp

* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
d66a901e6a932e62358ee963831e663a8c655b8e 19-Nov-2009 Andreas Huber <andih@google.com> DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
ibstagefright/MediaPlayerImpl.cpp
f86d0d0ef055b0ad9320f5bea8f63073c2c236b0 19-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 15b0bd2e: am 4eaf35b9: am a0e37e9d: Merge change I941136fd into eclair

Merge commit '15b0bd2e6efd0960c85320b1d7dfae3b8bc4e008'

* commit '15b0bd2e6efd0960c85320b1d7dfae3b8bc4e008':
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
15b0bd2e6efd0960c85320b1d7dfae3b8bc4e008 19-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 4eaf35b9: am a0e37e9d: Merge change I941136fd into eclair

Merge commit '4eaf35b99deb2abbb350383dd6458f1ea12e5bee' into eclair-mr2-plus-aosp

* commit '4eaf35b99deb2abbb350383dd6458f1ea12e5bee':
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
e78c72663eb8450614bbac653a99c83888bbb90c 19-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am a0e37e9d: Merge change I941136fd into eclair

Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-plus-aosp

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
4eaf35b99deb2abbb350383dd6458f1ea12e5bee 19-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am a0e37e9d: Merge change I941136fd into eclair

Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-mr2

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
941136fd089d40a80d63fcaf99b4a0bdeb6e349c 19-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
to define how the two new audio sources behave when used on devices
that don't support them.
ava/android/media/MediaRecorder.java
78bcc8660e126c1950295f78ccb6623f2f89c6a3 18-Nov-2009 Ray Chen <raychen@google.com> am edc1b064: am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair

Merge commit 'edc1b064ee1da7bca9d9a6114e984962b2633530'

* commit 'edc1b064ee1da7bca9d9a6114e984962b2633530':
Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database.
edc1b064ee1da7bca9d9a6114e984962b2633530 18-Nov-2009 Ray Chen <raychen@google.com> am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair

Merge commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc' into eclair-mr2-plus-aosp

* commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc':
Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database.
4788b3148bc618db1401388484f015fa3de24ea4 18-Nov-2009 Andreas Huber <andih@google.com> am 39dc5104: am 2c766498: Merge change Iea6a38c6 into eclair-mr2

Merge commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916'

* commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916':
Squashed commit of the following:
3fc9f51494033c1472e1bc332288f2d17b7d2a6c 18-Nov-2009 Andreas Huber <andih@google.com> am ed9880f3: am a35f1c63: Merge change Ib64ea2dd into eclair-mr2

Merge commit 'ed9880f399015782c9f635db744d25281d0deeb4'

* commit 'ed9880f399015782c9f635db744d25281d0deeb4':
Improvements to TimedEventQueue.
4ed0fab49dbc27a480897a5c4ede8d141277e134 18-Nov-2009 Andreas Huber <andih@google.com> am 775508d9: am 744043fc: Update FileSource to also accept a file descriptor and a range.

Merge commit '775508d97f709e621f9d1540aca819224fbdcebf'

* commit '775508d97f709e621f9d1540aca819224fbdcebf':
Update FileSource to also accept a file descriptor and a range.
ae9dd9b77d37b430459b55120c13553dc5e67cfc 17-Nov-2009 Ray Chen <raychen@google.com> am b3f35041: Merge change I86db22ef into eclair

Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-mr2

* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database.
1c8270001b4e499ebc6b1277d82237b853961f0d 17-Nov-2009 Ray Chen <raychen@google.com> am b3f35041: Merge change I86db22ef into eclair

Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-plus-aosp

* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database.
39dc51040f9b766adaa9ee487bb0568a2ed1c916 17-Nov-2009 Andreas Huber <andih@google.com> am 2c766498: Merge change Iea6a38c6 into eclair-mr2

Merge commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be' into eclair-mr2-plus-aosp

* commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be':
Squashed commit of the following:
2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be 17-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Iea6a38c6 into eclair-mr2

* changes:
Squashed commit of the following:
05df33ea748d1c497206302f62886f73c7ff1f93 17-Nov-2009 Ray Chen <raychen@google.com> Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database.
ava/android/media/MediaScanner.java
ed9880f399015782c9f635db744d25281d0deeb4 17-Nov-2009 Andreas Huber <andih@google.com> am a35f1c63: Merge change Ib64ea2dd into eclair-mr2

Merge commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398' into eclair-mr2-plus-aosp

* commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398':
Improvements to TimedEventQueue.
775508d97f709e621f9d1540aca819224fbdcebf 17-Nov-2009 Andreas Huber <andih@google.com> am 744043fc: Update FileSource to also accept a file descriptor and a range.

Merge commit '744043fcbf48c32c2051f222eca552fa2df5dfcb' into eclair-mr2-plus-aosp

* commit '744043fcbf48c32c2051f222eca552fa2df5dfcb':
Update FileSource to also accept a file descriptor and a range.
a35f1c63a67df0832d9b3f1aed3e2376367d4398 17-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib64ea2dd into eclair-mr2

* changes:
Improvements to TimedEventQueue.
9c54010f7647a0b52c21c92259a8f38ac381babd 17-Nov-2009 Andreas Huber <andih@google.com> Improvements to TimedEventQueue.

Events are now cancelled given their "unique" event_id instead of the event pointer
itself (which may be reallocated in place if we're unlucky). Also the ability to
cancel multiple events matching a predicate has been added.
ibstagefright/TimedEventQueue.cpp
ibstagefright/include/TimedEventQueue.h
744043fcbf48c32c2051f222eca552fa2df5dfcb 17-Nov-2009 Andreas Huber <andih@google.com> Update FileSource to also accept a file descriptor and a range.
ibstagefright/FileSource.cpp
ea6a38c63b9e9aeb45aa22587c069bd3c5d83df8 17-Nov-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 333057b355f8c260c549553b9a0634755c838b6a
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 13 15:35:48 2009 -0800

Some more tweaks to AVC encoding on sholes.

commit 9981d0ee52ec5b8b0182aae733d1571e3ebb8390
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 12 16:36:57 2009 -0800

Support for avc encoding, including sholes specific tweaks to pick the right colorspace for the camera to not require transcoding.

commit 5ba0ebbbd4efca51f3ae1f60e2ca31e7d2cf136d
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 11 09:50:03 2009 -0800

Enable actual (camera) video-only recording using h.263 or mpeg4 encoding.

commit 3fd59c3526a37fe7c696f4a978925d1831c09313
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 10 14:57:48 2009 -0800

Allow switching between the PV recorder implementation and one supported by stagefright.

This is controlled through the property "media.stagefright.enable-record".
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/StagefrightRecorder.cpp
ibmediaplayerservice/StagefrightRecorder.h
ibstagefright/CameraSource.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXCodec.cpp
4f2ef8c857ae0cf8964aeaa451a2c751d416f38f 13-Nov-2009 Eric Laurent <elaurent@google.com> am 99e03a3f: am 6efdbcc3: am fddfb9ae: Merge change Iad79689a into eclair

Merge commit '99e03a3f94ff8bbd68599e7f43517dbc25421fe9'

* commit '99e03a3f94ff8bbd68599e7f43517dbc25421fe9':
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
bfdece49cf34eda8d5f1e8bfb9437ccaf62ebe41 13-Nov-2009 Eric Laurent <elaurent@google.com> am 355743c7: am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair

Merge commit '355743c70d9810fda3e59d718d055f9513fb05b7'

* commit '355743c70d9810fda3e59d718d055f9513fb05b7':
Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
99e03a3f94ff8bbd68599e7f43517dbc25421fe9 13-Nov-2009 Eric Laurent <elaurent@google.com> am 6efdbcc3: am fddfb9ae: Merge change Iad79689a into eclair

Merge commit '6efdbcc3c1afafe2f9401668ce252167600b498f' into eclair-mr2-plus-aosp

* commit '6efdbcc3c1afafe2f9401668ce252167600b498f':
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
355743c70d9810fda3e59d718d055f9513fb05b7 13-Nov-2009 Eric Laurent <elaurent@google.com> am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair

Merge commit '609acfd2a1067f49e51925776484b070a24d8301' into eclair-mr2-plus-aosp

* commit '609acfd2a1067f49e51925776484b070a24d8301':
Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
6efdbcc3c1afafe2f9401668ce252167600b498f 13-Nov-2009 Eric Laurent <elaurent@google.com> am fddfb9ae: Merge change Iad79689a into eclair

Merge commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f' into eclair-mr2

* commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f':
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
609acfd2a1067f49e51925776484b070a24d8301 13-Nov-2009 Eric Laurent <elaurent@google.com> am 1aa9f3ca: Merge change I923d7d72 into eclair

Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-mr2

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
4a85d71fb6fa9426124bd9e016d5131a5a2a014e 13-Nov-2009 Eric Laurent <elaurent@google.com> am fddfb9ae: Merge change Iad79689a into eclair

Merge commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f' into eclair-plus-aosp

* commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f':
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f 13-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Iad79689a into eclair

* changes:
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
e8302a64c7fb2e12bd04ac70114682c3a1260d03 13-Nov-2009 Eric Laurent <elaurent@google.com> am 1aa9f3ca: Merge change I923d7d72 into eclair

Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-plus-aosp

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54 13-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I923d7d72 into eclair

* changes:
Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
923d7d721d37f6ba5148e7d79d61a4fa48e79df2 12-Nov-2009 Eric Laurent <elaurent@google.com> Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.

The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.

Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
c20da0b8db63f8b66d068748dc48f9002dede7a1 12-Nov-2009 Andreas Huber <andih@google.com> am bfdb1e88: am d0f3228d: resolved conflicts for merge of c66d53f9 to eclair-mr2

Merge commit 'bfdb1e88ef796969efc906e7648b552078c82aee'

* commit 'bfdb1e88ef796969efc906e7648b552078c82aee':
Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
bfdb1e88ef796969efc906e7648b552078c82aee 12-Nov-2009 Andreas Huber <andih@google.com> am d0f3228d: resolved conflicts for merge of c66d53f9 to eclair-mr2

Merge commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8' into eclair-mr2-plus-aosp

* commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8':
Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
d0f3228daa9ea26ec959cb79451e6f150648bce8 12-Nov-2009 Andreas Huber <andih@google.com> resolved conflicts for merge of c66d53f9 to eclair-mr2
4719963c86f40a56d0b7682d9d43ebd36a6b2f56 12-Nov-2009 Andreas Huber <andih@google.com> am c66d53f9: Merge change I880541a8 into eclair

Merge commit 'c66d53f97b1fe635f576642d5720dcd441e34cce' into eclair-plus-aosp

* commit 'c66d53f97b1fe635f576642d5720dcd441e34cce':
Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
c8d7c1492eece9fb382424dfe63dcd1387c43314 12-Nov-2009 Andreas Huber <andih@google.com> Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/QComHardwareRenderer.cpp
ibstagefright/omx/SoftwareRenderer.cpp
ibstagefright/omx/TIHardwareRenderer.cpp
059b4be2a5a5b3fd410f8263e5f5928689c97af7 10-Nov-2009 Eric Laurent <elaurent@google.com> Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes

This change goes with a kernel driver change that reduces the audio buffer size from 4800 bytes (~27ms) to 3072 bytes (~17ms).
- The AudioFlinger modifcations in change 0bca68cfff161abbc992fec82dc7c88079dd1a36 have been removed: the short sleep period was counter productive when the AudioTrack is using the call back thread as it causes to many preemptions.
- AudioFlinger mixer thread now detects long standby exit time and in this case anticipates start by writing 0s as soon as a track is enabled even if not ready for mixing.
- AudioTrack::start() is modified to start call back thread before starting the IAudioTrack so that thread startup time is masked by IAudioTrack start and mixer thread wakeup time.
ibmedia/AudioTrack.cpp
7ddad6159c9652e06f8a1b8fb7e37bbccffbce40 10-Nov-2009 Andreas Huber <andih@google.com> am 555ecc7d: am 6780d8c0: Make MediaPlayerImpl less verbose by default.

Merge commit '555ecc7d8e3f4983517c056f6f5c14a24e082363'

* commit '555ecc7d8e3f4983517c056f6f5c14a24e082363':
Make MediaPlayerImpl less verbose by default.
555ecc7d8e3f4983517c056f6f5c14a24e082363 10-Nov-2009 Andreas Huber <andih@google.com> am 6780d8c0: Make MediaPlayerImpl less verbose by default.

Merge commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6' into eclair-mr2-plus-aosp

* commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6':
Make MediaPlayerImpl less verbose by default.
6780d8c006c9381919c0ee4de3d2bdc6d7a728d6 10-Nov-2009 Andreas Huber <andih@google.com> Make MediaPlayerImpl less verbose by default.
ibstagefright/MediaPlayerImpl.cpp
19d494549bf42788577da8e09739d213584ef05f 10-Nov-2009 Andreas Huber <andih@google.com> am 00443d66: am d533ca61: am cfe45c77: Merge change I96c4d4b3 into eclair

Merge commit '00443d661de7d8a06f5126a735d832045a827110'

* commit '00443d661de7d8a06f5126a735d832045a827110':
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
00443d661de7d8a06f5126a735d832045a827110 10-Nov-2009 Andreas Huber <andih@google.com> am d533ca61: am cfe45c77: Merge change I96c4d4b3 into eclair

Merge commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7' into eclair-mr2-plus-aosp

* commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7':
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
cad4d807f942b4538da0e183816a2499b69cb12c 10-Nov-2009 Andreas Huber <andih@google.com> am cfe45c77: Merge change I96c4d4b3 into eclair

Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-plus-aosp

* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
d533ca61fa1e6a456f93a790cdb9b4eb5893a5a7 10-Nov-2009 Andreas Huber <andih@google.com> am cfe45c77: Merge change I96c4d4b3 into eclair

Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-mr2

* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
da440f137fbae90d4c1709e499198d6cd4effdf6 10-Nov-2009 Andreas Huber <andih@google.com> Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
ibmediaplayerservice/StagefrightPlayer.cpp
5cfcedc540e05c6581322260eed7f0791609d6cc 10-Nov-2009 Gloria Wang <gwang@google.com> am 28b0e311: am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair

Merge commit '28b0e311959baa55e0c6c9762831165dbafb5046'

* commit '28b0e311959baa55e0c6c9762831165dbafb5046':
Check whether test server is up before running tests which use streaming files.
28b0e311959baa55e0c6c9762831165dbafb5046 10-Nov-2009 Gloria Wang <gwang@google.com> am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair

Merge commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331' into eclair-mr2-plus-aosp

* commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331':
Check whether test server is up before running tests which use streaming files.
76acb3195fbb24ef9e87db03fc87c2ad12bffaf8 10-Nov-2009 Gloria Wang <gwang@google.com> am bf964e6a: Merge change Ic060d86f into eclair

Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-plus-aosp

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
Check whether test server is up before running tests which use streaming files.
9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331 10-Nov-2009 Gloria Wang <gwang@google.com> am bf964e6a: Merge change Ic060d86f into eclair

Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
Check whether test server is up before running tests which use streaming files.
c060d86f7dcc2759b94867e5c0c1105b31af5309 10-Nov-2009 Gloria Wang <gwang@google.com> Check whether test server is up before running tests which use streaming files.
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
4f2a1f56796bd454c7b6a1fc5cdd29af67933871 06-Nov-2009 Andreas Huber <andih@google.com> am 3c452e36: am f28e0c2a: Merge change I9a50fdf4 into eclair-mr2

Merge commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67'

* commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67':
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
3c452e366001521b2ea07dcc2bd2aaa51c5ffd67 06-Nov-2009 Andreas Huber <andih@google.com> am f28e0c2a: Merge change I9a50fdf4 into eclair-mr2

Merge commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6' into eclair-mr2-plus-aosp

* commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6':
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
f28e0c2ac75bf630a595d442a7ddefcc1f8386f6 06-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I9a50fdf4 into eclair-mr2

* changes:
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
3f2dfc35dfb4706c013fee359b9edb3b99344e0a 06-Nov-2009 Andreas Huber <andih@google.com> am 5959228b: am be364022: am fde273ba: Merge change Ic997acac into eclair

Merge commit '5959228b6cfcbcbc7d27cc969ff49a330398018f'

* commit '5959228b6cfcbcbc7d27cc969ff49a330398018f':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
5959228b6cfcbcbc7d27cc969ff49a330398018f 06-Nov-2009 Andreas Huber <andih@google.com> am be364022: am fde273ba: Merge change Ic997acac into eclair

Merge commit 'be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5' into eclair-mr2-plus-aosp

* commit 'be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5 06-Nov-2009 Andreas Huber <andih@google.com> am fde273ba: Merge change Ic997acac into eclair

Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2

* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
4b4d1b89805fa22754da8998a2b7f3d4733c04d3 06-Nov-2009 Andreas Huber <andih@google.com> am fde273ba: Merge change Ic997acac into eclair

Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-plus-aosp

* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
9a50fdf467fdd56bb97efc3bc0931a9e52b990a7 06-Nov-2009 Andreas Huber <andih@google.com> Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
ibstagefright/omx/OMXNodeInstance.cpp
fde273baf6592a5fde15ee4dd4d798d90368e440 06-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ic997acac into eclair

* changes:
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
88760cf50ef47954f8d31ea6f0ca7eaf9b25a834 06-Nov-2009 Wei-Ta Chen <weita@google.com> am fa43c063: am d512a3b3: Merge change Ic1d72f56 into eclair-mr2

Merge commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624'

* commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624':
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
b09c8ba082a50dabf65f7e037d453ada50c06a10 06-Nov-2009 James Dong <jdong@google.com> am 421a32fb: am 99588d59: am 1e495da1: Merge change I4b03c2cd into eclair

Merge commit '421a32fb31f46860ce77b0e8131178a0af52d087'

* commit '421a32fb31f46860ce77b0e8131178a0af52d087':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
76dfdad08f6a87256a9d810178562f118844eb91 06-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 5a76b6df: am 571529f8: am d94ed379: Merge change I1dc2ae28 into eclair

Merge commit '5a76b6dfcb8223cd156a8580fa0fc4ded97983db'

* commit '5a76b6dfcb8223cd156a8580fa0fc4ded97983db':
Fix bug 2242585 to unhide the new audio recording sources.
fa43c063a3263e9c6c7363d62aff7d93a69b5624 06-Nov-2009 Wei-Ta Chen <weita@google.com> am d512a3b3: Merge change Ic1d72f56 into eclair-mr2

Merge commit 'd512a3b3a8d0adb37bd0208181a02c91dc8025fb' into eclair-mr2-plus-aosp

* commit 'd512a3b3a8d0adb37bd0208181a02c91dc8025fb':
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
d512a3b3a8d0adb37bd0208181a02c91dc8025fb 06-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ic1d72f56 into eclair-mr2

* changes:
Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif to from the full image, if both can generate of a thumbnail of same size.
c1d72f56974c113e01a76c80e673277cbb74c44a 06-Nov-2009 Wei-Ta Chen <weita@google.com> Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
to from the full image, if both can generate of a thumbnail of same size.
ava/android/media/ThumbnailUtil.java
421a32fb31f46860ce77b0e8131178a0af52d087 06-Nov-2009 James Dong <jdong@google.com> am 99588d59: am 1e495da1: Merge change I4b03c2cd into eclair

Merge commit '99588d590f0965beb899606a79db0889601c7ec0' into eclair-mr2-plus-aosp

* commit '99588d590f0965beb899606a79db0889601c7ec0':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
5a76b6dfcb8223cd156a8580fa0fc4ded97983db 06-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 571529f8: am d94ed379: Merge change I1dc2ae28 into eclair

Merge commit '571529f82159a3205547a61d1b720b695dc066be' into eclair-mr2-plus-aosp

* commit '571529f82159a3205547a61d1b720b695dc066be':
Fix bug 2242585 to unhide the new audio recording sources.
99588d590f0965beb899606a79db0889601c7ec0 06-Nov-2009 James Dong <jdong@google.com> am 1e495da1: Merge change I4b03c2cd into eclair

Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-mr2

* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
c997acacd54e30293920a7e2bda80a3d9a7d76c6 06-Nov-2009 Andreas Huber <andih@google.com> Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
ibstagefright/AudioPlayer.cpp
ibstagefright/MediaPlayerImpl.cpp
4bcff01e430be2373a727bde7f5ed44f175c85e7 06-Nov-2009 James Dong <jdong@google.com> am 1e495da1: Merge change I4b03c2cd into eclair

Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-plus-aosp

* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
1e495da19f3f0061de38821a4ac733dca833b3eb 06-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I4b03c2cd into eclair

* changes:
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
571529f82159a3205547a61d1b720b695dc066be 06-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am d94ed379: Merge change I1dc2ae28 into eclair

Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-mr2

* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
eb918b0da4891b90d1331081be4e9a34bd254970 06-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am d94ed379: Merge change I1dc2ae28 into eclair

Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp

* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
1dc2ae2871aa3e958229e08ccf34099dff2fa402 06-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2242585 to unhide the new audio recording sources.
Unhide CAMCORDER and VOICE_RECOGNITION in android.media.MediaRecorder
ava/android/media/MediaRecorder.java
0939e7ac03eef4a33fa7a81aa629d568055bcf0e 05-Nov-2009 Andreas Huber <andih@google.com> am db858540: am 2fe3e3a7: am 818a9cf8: Merge change Ia4eedace into eclair

Merge commit 'db8585402f6b4ca219d5d73735a11cee115f50b7'

* commit 'db8585402f6b4ca219d5d73735a11cee115f50b7':
Now that UseBuffer on this component is fixed, let's use it.
db8585402f6b4ca219d5d73735a11cee115f50b7 05-Nov-2009 Andreas Huber <andih@google.com> am 2fe3e3a7: am 818a9cf8: Merge change Ia4eedace into eclair

Merge commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6' into eclair-mr2-plus-aosp

* commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6':
Now that UseBuffer on this component is fixed, let's use it.
76bd517ed2f9ff9c655b2355a09a75c99dc18941 05-Nov-2009 Andreas Huber <andih@google.com> am 05eca1d4: Merge change Ie80e2381 into eclair

Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp

* commit '05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6 05-Nov-2009 Andreas Huber <andih@google.com> am 818a9cf8: Merge change Ia4eedace into eclair

Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-mr2

* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
9744959eb2ca3033d7203560d84a515a68fba417 05-Nov-2009 Andreas Huber <andih@google.com> am 818a9cf8: Merge change Ia4eedace into eclair

Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-plus-aosp

* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
dcaa220ff5f360a29ac8be0eb12a8238ecaa080f 05-Nov-2009 Andreas Huber <andih@google.com> DO NOT MERGE: Squashed commit of the following:

commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 12:02:31 2009 -0800

DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback.

commit 991832fe4dc012e51d3d9ed8d647c7f09991858f
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:24:11 2009 -0800

DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though.

commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 16:11:54 2009 -0700

DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.

commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:10:49 2009 -0800

DO NOT MERGE: Fix heap corruptin in OMXNodeInstance.

commit 5a47f7439a1298b330541a7e4e647a8b44487388
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:08:19 2009 -0800

DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec.

commit 45bed64722501b9f411a2940aff5aff4cc4d2e98
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 5 11:02:23 2009 -0800

DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts.

commit 6738e306a50196f31a73d4fc7b7c45faff639903
Author: Andreas Huber <andih@google.com>
Date: Thu Oct 15 13:46:54 2009 -0700

DO NOT MERGE: Reimplement the OMX backend for stagefright.

Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.

Changed APIs to conform to the rest of the system.
ibmedia/IMediaPlayerService.cpp
ibmedia/IOMX.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibstagefright/Android.mk
ibstagefright/HTTPDataSource.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/ShoutcastSource.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMX.h
ibstagefright/omx/OMXNodeInstance.cpp
ibstagefright/stagefright_string.cpp
ibstagefright/string.cpp
a4eedace9998c77aca90c5238c0a4f09fdd2eabb 05-Nov-2009 Andreas Huber <andih@google.com> Now that UseBuffer on this component is fixed, let's use it.
ibstagefright/OMXCodec.cpp
c8990cb9bb0b009e132a079cc2523728a2ee002b 05-Nov-2009 Wei-Ta Chen <weita@google.com> am 940bc05b: am 97f96ef9: Merge change I7f9db307 into eclair-mr2

Merge commit '940bc05b38f5295b31fb80e820a98e32200e492f'

* commit '940bc05b38f5295b31fb80e820a98e32200e492f':
Modify the behavior of createThumbnailForEXIF() to:
e7c6644778d872a4736fff3eeeae44c914f1d773 05-Nov-2009 Eric Laurent <elaurent@google.com> am 653d5d41: am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair

Merge commit '653d5d415c3447a4250120548bf32d1ee63fe36f'

* commit '653d5d415c3447a4250120548bf32d1ee63fe36f':
Fix issue 2203561: Sholes: audio playing out of earpiece.
940bc05b38f5295b31fb80e820a98e32200e492f 05-Nov-2009 Wei-Ta Chen <weita@google.com> am 97f96ef9: Merge change I7f9db307 into eclair-mr2

Merge commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c' into eclair-mr2-plus-aosp

* commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c':
Modify the behavior of createThumbnailForEXIF() to:
653d5d415c3447a4250120548bf32d1ee63fe36f 05-Nov-2009 Eric Laurent <elaurent@google.com> am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair

Merge commit 'fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp

* commit 'fcae6c71794696a074cabf20beeb02fd87853e30':
Fix issue 2203561: Sholes: audio playing out of earpiece.
97f96ef9f795e0fe0058251bd696fb4a4d747d3c 05-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I7f9db307 into eclair-mr2

* changes:
Modify the behavior of createThumbnailForEXIF() to: returning SizedThumbnailBitmap, which contains the downsampled bitmap either from the thumbnail in EXIF or the full image.
6706caf937bf39571b8e315d1a1e9ae4c6b27a41 29-Oct-2009 Wei-Ta Chen <weita@google.com> Modify the behavior of createThumbnailForEXIF() to:
returning SizedThumbnailBitmap, which contains the downsampled
bitmap either from the thumbnail in EXIF or the full image.
ava/android/media/ThumbnailUtil.java
d889f189b5982d55e64ceb96713b46b2b99b3222 05-Nov-2009 Eric Laurent <elaurent@google.com> am 67b69292: Merge change I93f500a5 into eclair

Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
fcae6c71794696a074cabf20beeb02fd87853e30 05-Nov-2009 Eric Laurent <elaurent@google.com> am 67b69292: Merge change I93f500a5 into eclair

Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue 2203561: Sholes: audio playing out of earpiece.
67b692920c18f99b096dce285adc6f7439fa866c 05-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I93f500a5 into eclair

* changes:
Fix issue 2203561: Sholes: audio playing out of earpiece.
bda7469d9b1ec6d9c9d6da40ddf64dc39ff271a9 04-Nov-2009 Eric Laurent <elaurent@google.com> Fix issue 2203561: Sholes: audio playing out of earpiece.

Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/ToneGenerator.cpp
b1c85ec47a6ee026a5d7ee4c0e683b9cbd6599e5 04-Nov-2009 James Dong <jdong@google.com> Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
fc078b13075b3586a8d2cbc46c7dfc8be19b39c2 04-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am bd38397b: am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair

Merge commit 'bd38397bc4f754c040d4abf5435c2469c3357924'

* commit 'bd38397bc4f754c040d4abf5435c2469c3357924':
Add new audio sources to support the A1026 recording configurations.
bd38397bc4f754c040d4abf5435c2469c3357924 04-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair

Merge commit '3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp

* commit '3d2d155a87cdd3038a2e6df8741181431cb250e1':
Add new audio sources to support the A1026 recording configurations.
39995fdf3104b5e7c0cf1306f1b90aea49f56cec 04-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 7ed0ceeb: Merge change I6869df3a into eclair

Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-plus-aosp

* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
Add new audio sources to support the A1026 recording configurations.
3d2d155a87cdd3038a2e6df8741181431cb250e1 04-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> am 7ed0ceeb: Merge change I6869df3a into eclair

Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2

* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
Add new audio sources to support the A1026 recording configurations.
b4ff8629af761f94ddd9752b3af8f3cc69b7b61c 04-Nov-2009 Andreas Huber <andih@google.com> am 84953593: am ad278f22: Merge change I6bce6d87 into eclair-mr2

Merge commit '8495359382bc7c94a776e51c596e807448796476'

* commit '8495359382bc7c94a776e51c596e807448796476':
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
afd80d96c50b55d2d80c1c73b7f2612f676974a9 04-Nov-2009 Andreas Huber <andih@google.com> am 7146332e: am 0533aade: Merge change I313953dc into eclair-mr2

Merge commit '7146332e9999443e22296d6d0968f95b80e79af6'

* commit '7146332e9999443e22296d6d0968f95b80e79af6':
Support raw audio sources in MediaPlayerImpl.
79d4002734bda76e00801cea01e209fbc394d730 04-Nov-2009 Andreas Huber <andih@google.com> am 5a58de8b: am 2f133015: Merge change I5126e183 into eclair-mr2

Merge commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de'

* commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de':
Fix MP3Extractor duration overflows...
8495359382bc7c94a776e51c596e807448796476 04-Nov-2009 Andreas Huber <andih@google.com> am ad278f22: Merge change I6bce6d87 into eclair-mr2

Merge commit 'ad278f2276de23197571e486ad387dacc7f346ee' into eclair-mr2-plus-aosp

* commit 'ad278f2276de23197571e486ad387dacc7f346ee':
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
7146332e9999443e22296d6d0968f95b80e79af6 04-Nov-2009 Andreas Huber <andih@google.com> am 0533aade: Merge change I313953dc into eclair-mr2

Merge commit '0533aadef6d93dec868d648402f5ec326161de57' into eclair-mr2-plus-aosp

* commit '0533aadef6d93dec868d648402f5ec326161de57':
Support raw audio sources in MediaPlayerImpl.
5a58de8b3bb1b6cc5304f83c8a3d527f952b91de 04-Nov-2009 Andreas Huber <andih@google.com> am 2f133015: Merge change I5126e183 into eclair-mr2

Merge commit '2f1330155153e590548e711d619765edc8ebb62f' into eclair-mr2-plus-aosp

* commit '2f1330155153e590548e711d619765edc8ebb62f':
Fix MP3Extractor duration overflows...
ad278f2276de23197571e486ad387dacc7f346ee 04-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I6bce6d87 into eclair-mr2

* changes:
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
0533aadef6d93dec868d648402f5ec326161de57 04-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I313953dc into eclair-mr2

* changes:
Support raw audio sources in MediaPlayerImpl.
2f1330155153e590548e711d619765edc8ebb62f 04-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I5126e183 into eclair-mr2

* changes:
Fix MP3Extractor duration overflows...
6869df3a5db0ca0037394f0fd14aecc1d80b5b42 04-Nov-2009 Jean-Michel Trivi <jmtrivi@google.com> Add new audio sources to support the A1026 recording configurations.
ava/android/media/MediaRecorder.java
6bce6d87b3fd98e68fb54328fb4dc8e40cd2c293 04-Nov-2009 Andreas Huber <andih@google.com> Adds a WAVExtractor for 16-bit signed PCM audio wave files.
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/WAVExtractor.cpp
ibstagefright/include/WAVExtractor.h
313953dccb55987d519281990f274d4c1c0d21a5 04-Nov-2009 Andreas Huber <andih@google.com> Support raw audio sources in MediaPlayerImpl.
ibstagefright/MediaPlayerImpl.cpp
5126e183620af7344544f15824967d8313642c9a 04-Nov-2009 Andreas Huber <andih@google.com> Fix MP3Extractor duration overflows...
ibstagefright/MP3Extractor.cpp
4cbb490fde8dd0967e16fe7f2bc485e154852641 03-Nov-2009 Andreas Huber <andih@google.com> am 4d4e9856: am d6e54a90: am 338ccf43: Merge change Id2906ad8 into eclair

Merge commit '4d4e985673de1fa0bae72df3485af86381c3ec12'

* commit '4d4e985673de1fa0bae72df3485af86381c3ec12':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
4d4e985673de1fa0bae72df3485af86381c3ec12 03-Nov-2009 Andreas Huber <andih@google.com> am d6e54a90: am 338ccf43: Merge change Id2906ad8 into eclair

Merge commit 'd6e54a902368885072975dd0bad78dcd1cafaaea' into eclair-mr2-plus-aosp

* commit 'd6e54a902368885072975dd0bad78dcd1cafaaea':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
f716b0e34787f276a5cff42adb4d3565aaf77eb0 03-Nov-2009 Andreas Huber <andih@google.com> am 338ccf43: Merge change Id2906ad8 into eclair

Merge commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d' into eclair-plus-aosp

* commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
d6e54a902368885072975dd0bad78dcd1cafaaea 03-Nov-2009 Andreas Huber <andih@google.com> am 338ccf43: Merge change Id2906ad8 into eclair

Merge commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d' into eclair-mr2

* commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
d2906ad8350017e6a58564a3c827ef0286d75894 03-Nov-2009 Andreas Huber <andih@google.com> Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
ibstagefright/omx/QComHardwareRenderer.cpp
ffca7606120da2e1b36873cc79776f66cc7e0e3a 03-Nov-2009 James Dong <jdong@google.com> am 76370140: am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair

Merge commit '763701408b09195a2b82bd088fc83c61b27c9be4'

* commit '763701408b09195a2b82bd088fc83c61b27c9be4':
Add windows media support check in MediaMetadataRetrieverTest
a98c5675d2e669a2f863c9d83c8a33c3387286c4 03-Nov-2009 Brett Chabot <brettchabot@android.com> am 64e648fd: am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair

Merge commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1'

* commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1':
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
763701408b09195a2b82bd088fc83c61b27c9be4 03-Nov-2009 James Dong <jdong@google.com> am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair

Merge commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8' into eclair-mr2-plus-aosp

* commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8':
Add windows media support check in MediaMetadataRetrieverTest
64e648fdd93c9642bdbda3e44082e50f4baeb0c1 03-Nov-2009 Brett Chabot <brettchabot@android.com> am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair

Merge commit 'b580d53e7517e6020ee42c4f0fcda21bf381c74e' into eclair-mr2-plus-aosp

* commit 'b580d53e7517e6020ee42c4f0fcda21bf381c74e':
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
d4048822ef32de070ea981e7cb53bc41bf0f5a6a 03-Nov-2009 James Dong <jdong@google.com> am f67eff17: Merge change Ib0036762 into eclair

Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-plus-aosp

* commit 'f67eff177515baa421d8717ee20efdc516fde580':
Add windows media support check in MediaMetadataRetrieverTest
9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8 03-Nov-2009 James Dong <jdong@google.com> am f67eff17: Merge change Ib0036762 into eclair

Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-mr2

* commit 'f67eff177515baa421d8717ee20efdc516fde580':
Add windows media support check in MediaMetadataRetrieverTest
acb3676f92f55d38f5b135d1c8d65726f7b715de 03-Nov-2009 Brett Chabot <brettchabot@android.com> am d6af2e0c: Merge change I43a335c3 into eclair

Merge commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-plus-aosp

* commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80':
Suppress takePicture test from continuous DO NOT MERGE.
7cf85c8ebd9fb9968d98a0045a6ca8f4e71d4ba1 03-Nov-2009 Brett Chabot <brettchabot@android.com> am 774d956d: Merge change Ic8c7ca7b into eclair

Merge commit '774d956d5d2f6bece15c10c0db275596148c7ef8' into eclair-plus-aosp

* commit '774d956d5d2f6bece15c10c0db275596148c7ef8':
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
b580d53e7517e6020ee42c4f0fcda21bf381c74e 03-Nov-2009 Brett Chabot <brettchabot@android.com> am 774d956d: Merge change Ic8c7ca7b into eclair

Merge commit '774d956d5d2f6bece15c10c0db275596148c7ef8' into eclair-mr2

* commit '774d956d5d2f6bece15c10c0db275596148c7ef8':
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
f67eff177515baa421d8717ee20efdc516fde580 03-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib0036762 into eclair

* changes:
Add windows media support check in MediaMetadataRetrieverTest bug 2232274
d6af2e0cbf144b091d9c9d1bf2f3061547220c80 03-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I43a335c3 into eclair

* changes:
Suppress takePicture test from continuous DO NOT MERGE.
774d956d5d2f6bece15c10c0db275596148c7ef8 03-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ic8c7ca7b into eclair

* changes:
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
5d66d7fc27bfc3cc9fad356927ffc74b4fe013c6 03-Nov-2009 Marco Nelissen <marcone@google.com> am fb1d992f: am 1166ff76: am 1d9246e8: Merge change Id095e180 into eclair

Merge commit 'fb1d992f4b8addad729a94cb006a732a40b62756'

* commit 'fb1d992f4b8addad729a94cb006a732a40b62756':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
fb1d992f4b8addad729a94cb006a732a40b62756 03-Nov-2009 Marco Nelissen <marcone@google.com> am 1166ff76: am 1d9246e8: Merge change Id095e180 into eclair

Merge commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577' into eclair-mr2-plus-aosp

* commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
1166ff76eb3dbb5304dc40b3056e48c2c9dc7577 02-Nov-2009 Marco Nelissen <marcone@google.com> am 1d9246e8: Merge change Id095e180 into eclair

Merge commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8' into eclair-mr2

* commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
f48d2e87b1c41369f59b1ebcdf89657bd736f330 02-Nov-2009 Marco Nelissen <marcone@google.com> am 1d9246e8: Merge change Id095e180 into eclair

Merge commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8' into eclair-plus-aosp

* commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
758613de2829f92122d3b684733a5fe815e488c1 02-Nov-2009 Marco Nelissen <marcone@google.com> Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
ibmediaplayerservice/MediaPlayerService.cpp
38b03a76616edffabb97f4131e268c701dffb00f 02-Nov-2009 James Dong <jdong@google.com> Add windows media support check in MediaMetadataRetrieverTest
bug 2232274
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
43a335c3cc8c78d64703b9f4755c3cef595e3839 31-Oct-2009 Brett Chabot <brettchabot@android.com> Suppress takePicture test from continuous DO NOT MERGE.

Bug 2141755
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
c8c7ca7bd769df9288575b322e10ebf1fb22e4a5 31-Oct-2009 Brett Chabot <brettchabot@android.com> Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.

This test causes the whole suite to hang.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java
146742b1a20602d03932213c5ccb60b4d2b502c8 30-Oct-2009 Gloria Wang <gwang@google.com> am a3763b85: am 9cf96280: am 3a814141: Merge change Iee0486e2 into eclair

Merge commit 'a3763b85d4d95a0316df9718bb0d132cf458374d'

* commit 'a3763b85d4d95a0316df9718bb0d132cf458374d':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
a3763b85d4d95a0316df9718bb0d132cf458374d 30-Oct-2009 Gloria Wang <gwang@google.com> am 9cf96280: am 3a814141: Merge change Iee0486e2 into eclair

Merge commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1' into eclair-mr2-plus-aosp

* commit '9cf962809dc5d26d91fd7e9bbfeb7266867216d1':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
9cf962809dc5d26d91fd7e9bbfeb7266867216d1 30-Oct-2009 Gloria Wang <gwang@google.com> am 3a814141: Merge change Iee0486e2 into eclair

Merge commit '3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-mr2

* commit '3a8141416a0b1d517d4729eba4bcf914c468e20b':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
a242ecf4d29ba346e07020d2190281d34b4e4e9b 30-Oct-2009 Gloria Wang <gwang@google.com> am 3a814141: Merge change Iee0486e2 into eclair

Merge commit '3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-plus-aosp

* commit '3a8141416a0b1d517d4729eba4bcf914c468e20b':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
608a2630bb1eec63431cf065a76962e138aa1dc2 29-Oct-2009 Gloria Wang <gwang@google.com> Dump media recorder PID in dumpsys media.player, and fix minor bugs.
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
86505755529b413dedccb32d9e035576774c679d 29-Oct-2009 Andreas Huber <andih@google.com> am 5647eebc: am 9dba1f92: Merge change Ib482ce88 into eclair-mr2

Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314'

* commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314':
Revive support for video encoding in OMXCodec.
5647eebc3aeef6e644b8c7587a36206d8f0d6314 29-Oct-2009 Andreas Huber <andih@google.com> am 9dba1f92: Merge change Ib482ce88 into eclair-mr2

Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp

* commit '9dba1f928021450f101013e03deacc9a0506772e':
Revive support for video encoding in OMXCodec.
9dba1f928021450f101013e03deacc9a0506772e 29-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib482ce88 into eclair-mr2

* changes:
Revive support for video encoding in OMXCodec.
b482ce8837a2d85a2a907d7ea89deaa6610a8333 29-Oct-2009 Andreas Huber <andih@google.com> Revive support for video encoding in OMXCodec.
ibstagefright/OMXCodec.cpp
590dfffe1ab99a9e7889aa7729c1a4cb7b2274ec 29-Oct-2009 Patrick Scott <phanna@android.com> am 9ad42745: am 9d73409e: Merge change Ic5e3d73f into eclair-mr2

Merge commit '9ad4274588374df796f7fb9f35d44476fc50c8de'

* commit '9ad4274588374df796f7fb9f35d44476fc50c8de':
LOG_ASSERT needs a message.
9ad4274588374df796f7fb9f35d44476fc50c8de 29-Oct-2009 Patrick Scott <phanna@android.com> am 9d73409e: Merge change Ic5e3d73f into eclair-mr2

Merge commit '9d73409e76000f06a7ee3395241154a029152483' into eclair-mr2-plus-aosp

* commit '9d73409e76000f06a7ee3395241154a029152483':
LOG_ASSERT needs a message.
9d73409e76000f06a7ee3395241154a029152483 29-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ic5e3d73f into eclair-mr2

* changes:
LOG_ASSERT needs a message.
c5e3d73f92f33b3fffef57f95d017211f4169c49 29-Oct-2009 Patrick Scott <phanna@android.com> LOG_ASSERT needs a message.

This fails to build when asserts are turned on.
ibmediaplayerservice/TestPlayerStub.cpp
cd54683ef918aa309592b356db0f4f2d0f42abb1 29-Oct-2009 Jean-Michel Trivi <jmtrivi@google.com> am 5fc26f60: am ee507eb5: am 89889733: Merge change I4e83a76a into eclair

Merge commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8'

* commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8':
Fix bug 2201417. Whenever the System setting that indicates
e1513b14e78bb4782c66e4394bf8a3ba49eab406 29-Oct-2009 Dave Sparks <davidsparks@android.com> am a628d54d: am 63733498: am 98de26e0: Merge change I8cc42c52 into eclair

Merge commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc'

* commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
5fc26f609aaf0a878bd821e9d8df96be025fe2f8 29-Oct-2009 Jean-Michel Trivi <jmtrivi@google.com> am ee507eb5: am 89889733: Merge change I4e83a76a into eclair

Merge commit 'ee507eb560319643946d73627bc7ad3e13591f2a' into eclair-mr2-plus-aosp

* commit 'ee507eb560319643946d73627bc7ad3e13591f2a':
Fix bug 2201417. Whenever the System setting that indicates
a628d54d108b365b66934e4b83aac739ee5ad9cc 29-Oct-2009 Dave Sparks <davidsparks@android.com> am 63733498: am 98de26e0: Merge change I8cc42c52 into eclair

Merge commit '6373349836237abffc3de8a3632234170bc1cfca' into eclair-mr2-plus-aosp

* commit '6373349836237abffc3de8a3632234170bc1cfca':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
ee507eb560319643946d73627bc7ad3e13591f2a 29-Oct-2009 Jean-Michel Trivi <jmtrivi@google.com> am 89889733: Merge change I4e83a76a into eclair

Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2

* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
Fix bug 2201417. Whenever the System setting that indicates
6373349836237abffc3de8a3632234170bc1cfca 29-Oct-2009 Dave Sparks <davidsparks@android.com> am 98de26e0: Merge change I8cc42c52 into eclair

Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-mr2

* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
79e56a215ece6bd51026b4ffde10cb33c4b4a461 29-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am f97dec83: am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair

Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695'

* commit 'f97dec837c1fa47250af023bbaea0566a0ec9695':
Fixed the H263 video duation which caused the incorrect video validation.
52fc3989c5774523f1dd9c723068fa33e37ea69d 29-Oct-2009 Dave Sparks <davidsparks@android.com> am 687545fc: am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair

Merge commit '687545fc9ee79124229152df1236c53ba7d71215'

* commit '687545fc9ee79124229152df1236c53ba7d71215':
Run the metadataretriever at background priority. Bug 2187133.
d7100526c8646704b1920f105d4e04c495245375 29-Oct-2009 Andreas Huber <andih@google.com> am 7373755a: am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair

Merge commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674'

* commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
d6d6db484d0f59f55ded9f3548324af82d461055 29-Oct-2009 Andreas Huber <andih@google.com> am e113d6af: am 76a54294: Merge change I155e2ad0 into eclair-mr2

Merge commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3'

* commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3':
Re-enable CameraSource.
9e8ae3dfbea2ef8f07a2e1b4ade62291a737a0ca 29-Oct-2009 Andreas Huber <andih@google.com> am b1a8f54b: am 27123468: Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we\'re examining it (leak checker).

Merge commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6'

* commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6':
Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
f97dec837c1fa47250af023bbaea0566a0ec9695 28-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair

Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp

* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
Fixed the H263 video duation which caused the incorrect video validation.
687545fc9ee79124229152df1236c53ba7d71215 28-Oct-2009 Dave Sparks <davidsparks@android.com> am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair

Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp

* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
Run the metadataretriever at background priority. Bug 2187133.
7373755ac391468c413f8ce4ba1f1bcc60bb1674 28-Oct-2009 Andreas Huber <andih@google.com> am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair

Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp

* commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
42ea8dc732b8231df497a7a21fb3b55e1346fd63 28-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am adf4b4f5: Merge change I96458368 into eclair

Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
Fixed the H263 video duation which caused the incorrect video validation.
5a7691f0e13620322103d61c9f2b1eeb908fd37b 28-Oct-2009 Dave Sparks <davidsparks@android.com> am e8543418: Merge change I7c0d20a7 into eclair

Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2

* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
Run the metadataretriever at background priority. Bug 2187133.
013ecbfca236f3b4c2fd0eedd89c70f116f641ed 28-Oct-2009 Andreas Huber <andih@google.com> am 54620b1a: Merge change I6e50a8c6 into eclair

Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
e113d6af6204dac03b13b324852fe7f741ebb3d3 28-Oct-2009 Andreas Huber <andih@google.com> am 76a54294: Merge change I155e2ad0 into eclair-mr2

Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp

* commit '76a5429407e821c22508eca92e7475b6433cd668':
Re-enable CameraSource.
76a5429407e821c22508eca92e7475b6433cd668 28-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I155e2ad0 into eclair-mr2

* changes:
Re-enable CameraSource.
155e2ad04c9e15562149772fbbaa39004d4778a7 14-Oct-2009 Andreas Huber <andih@google.com> Re-enable CameraSource.
ibstagefright/Android.mk
ibstagefright/CameraSource.cpp
b029bd69ce58ab6775949aacd6a70abae997b655 28-Oct-2009 Jean-Michel Trivi <jmtrivi@google.com> am 89889733: Merge change I4e83a76a into eclair

Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-plus-aosp

* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
Fix bug 2201417. Whenever the System setting that indicates
898897338dfd62a268a89fb55ee900a9bd5a683f 28-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I4e83a76a into eclair

* changes:
Fix bug 2201417. Whenever the System setting that indicates whether the notifcation stream uses the ring volume changes, the table of stream volume aliases in AudioService is updated. But the name of the alias stored in VolumeStreamState.mVolumeIndexSettingName was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting was updated. This caused the wrong volume setting to be persisted. This change ensures the setting name is updated whenever the volume alias is, and persists the notification volume change right away (instead of after a delay), so that registered observers are notified right away. The notification seekbar in the sound settings is an example of such an observer.
11a74a75653197a3d31fe91590cd8312f5270c44 28-Oct-2009 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2201417. Whenever the System setting that indicates
whether the notifcation stream uses the ring volume changes, the
table of stream volume aliases in AudioService is updated. But the
name of the alias stored in VolumeStreamState.mVolumeIndexSettingName
was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting
was updated. This caused the wrong volume setting to be persisted.
This change ensures the setting name is updated whenever the volume
alias is, and persists the notification volume change right away
(instead of after a delay), so that registered observers are notified
right away. The notification seekbar in the sound settings is an
example of such an observer.
ava/android/media/AudioService.java
b1a8f54bf62c3974831bf3c866275425127cf7b6 28-Oct-2009 Andreas Huber <andih@google.com> am 27123468: Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we\'re examining it (leak checker).

Merge commit '27123468b33cb61a1600079d583302b1b078b2ee' into eclair-mr2-plus-aosp

* commit '27123468b33cb61a1600079d583302b1b078b2ee':
Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
27123468b33cb61a1600079d583302b1b078b2ee 27-Oct-2009 Andreas Huber <andih@google.com> Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
ibmediaplayerservice/MediaPlayerService.cpp
97949b8f8bc1967306e71d2e07ac06ab250bfe74 27-Oct-2009 Dave Sparks <davidsparks@android.com> am 98de26e0: Merge change I8cc42c52 into eclair

Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-plus-aosp

* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
8cc42c5230eb02db8c28391dd15f83851df4f948 27-Oct-2009 Dave Sparks <davidsparks@android.com> Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
ava/android/media/AsyncPlayer.java
dab3a50abc6bff5c1b138f28e66c159c8e183a46 27-Oct-2009 Andreas Huber <andih@google.com> am fdde959c: am dfdf9453: Merge change I3085c83e into eclair-mr2

Merge commit 'fdde959c22b5758db15293bc442e01674727fa61'

* commit 'fdde959c22b5758db15293bc442e01674727fa61':
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
fdde959c22b5758db15293bc442e01674727fa61 27-Oct-2009 Andreas Huber <andih@google.com> am dfdf9453: Merge change I3085c83e into eclair-mr2

Merge commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1' into eclair-mr2-plus-aosp

* commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1':
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
c1209b8ffa269b6bc0e39f56ff69ed4411200a73 27-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am adf4b4f5: Merge change I96458368 into eclair

Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-plus-aosp

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
Fixed the H263 video duation which caused the incorrect video validation.
adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd 27-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I96458368 into eclair

* changes:
Fixed the H263 video duation which caused the incorrect video validation.
d86cfa2e998a7823243b390f9c70e6c963bbdcfd 27-Oct-2009 Dave Sparks <davidsparks@android.com> am e8543418: Merge change I7c0d20a7 into eclair

Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-plus-aosp

* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
Run the metadataretriever at background priority. Bug 2187133.
49f909bf8dae2599d9cd155c773eae9eb595ce4a 27-Oct-2009 Andreas Huber <andih@google.com> am 54620b1a: Merge change I6e50a8c6 into eclair

Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-plus-aosp

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
13b93713f36d64783f3199c83b37ca58d8ff35bd 27-Oct-2009 Yu Shan Emily Lau <yslau@google.com> Fixed the H263 video duation which caused the incorrect video validation.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
e8543418783f8f8f9a6bafdaa1dd6289661eac85 27-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I7c0d20a7 into eclair

* changes:
Run the metadataretriever at background priority. Bug 2187133.
7c0d20a753a930507bec09d7f89da83acc86d0da 27-Oct-2009 Dave Sparks <davidsparks@android.com> Run the metadataretriever at background priority. Bug 2187133.

This change forces metadata retreiver threads to background priority.
Uses an inner class to encapsulate the priority change so that it
automatically restores priority when returning to the client.
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
3085c83e0015f019c960bc76f9689dfbfc9f5bb8 27-Oct-2009 Andreas Huber <andih@google.com> When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMXNodeInstance.cpp
6e50a8c6f59307cb9fc688f9c3e7aec3fa4b69eb 26-Oct-2009 Andreas Huber <andih@google.com> Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."

This reverts commit 7a03b074a554ba3fd08dbc20cfd4b2f37c5f3aaa.
ibstagefright/OMXCodec.cpp
97d9af295d14f01156483654c766d371c4fccbd8 24-Oct-2009 Eric Laurent <elaurent@google.com> am 848f9c99: am 7ed70c95: am bf96aaad: Merge change Icf10db28 into eclair

Merge commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527'

* commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
848f9c99af9c1f3fe0cc30717ea4c73e6fefb527 24-Oct-2009 Eric Laurent <elaurent@google.com> am 7ed70c95: am bf96aaad: Merge change Icf10db28 into eclair

Merge commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6' into eclair-mr2-plus-aosp

* commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
7ed70c9515fe3df6eb1796717d73f23e7286b3e6 24-Oct-2009 Eric Laurent <elaurent@google.com> am bf96aaad: Merge change Icf10db28 into eclair

Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-mr2

* commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
0c4ba3e1a4a10d804b59eaf7d66646107f4821b3 24-Oct-2009 Eric Laurent <elaurent@google.com> am bf96aaad: Merge change Icf10db28 into eclair

Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-plus-aosp

* commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
bf96aaadd46fb5b0884070177faa16ec4f22e2ba 24-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Icf10db28 into eclair

* changes:
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
fdfb6674a0e55569efc3f64235d5e141fb70e181 23-Oct-2009 Andreas Huber <andih@google.com> am c91e3d8d: am d9f3d60d: Merge change I3b1b7873 into eclair-mr2

Merge commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1'

* commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1':
New API to instantiate a MediaExtractor given a URI and optional MIME type.
c91e3d8d897f7299269e177c2891fde31cfc6ae1 23-Oct-2009 Andreas Huber <andih@google.com> am d9f3d60d: Merge change I3b1b7873 into eclair-mr2

Merge commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff' into eclair-mr2-plus-aosp

* commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff':
New API to instantiate a MediaExtractor given a URI and optional MIME type.
d437ac6a7c4fde988f7d737bafd30744137f3af8 23-Oct-2009 Andreas Huber <andih@google.com> am d919aa74: am 9069aa31: Merge change I57515f33 into eclair-mr2

Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af'

* commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af':
Moving the individual extractor headers files to the private include directory.
9a12baf929ea803915d7ab626b200ffefb4fbac7 23-Oct-2009 Andreas Huber <andih@google.com> New API to instantiate a MediaExtractor given a URI and optional MIME type.

Also DataSources now must provide a method initCheck()
and DataSource::reat_at has been renamed to readAt to conform to
standard API naming guidelines.
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibstagefright/AMRExtractor.cpp
ibstagefright/CachingDataSource.cpp
ibstagefright/DataSource.cpp
ibstagefright/FileSource.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/JPEGSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/MmapSource.cpp
ibstagefright/SampleTable.cpp
d919aa74927fcabd18a9ea14a57f44240aecc7af 23-Oct-2009 Andreas Huber <andih@google.com> am 9069aa31: Merge change I57515f33 into eclair-mr2

Merge commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56' into eclair-mr2-plus-aosp

* commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56':
Moving the individual extractor headers files to the private include directory.
57515f334bcc1f66f95e342bfcaa13bf9ca802ad 23-Oct-2009 Andreas Huber <andih@google.com> Moving the individual extractor headers files to the private include directory.
ibstagefright/AMRExtractor.cpp
ibstagefright/DataSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/include/AMRExtractor.h
ibstagefright/include/MP3Extractor.h
ibstagefright/include/MPEG4Extractor.h
0220192211c297d8af30ad4d13f2687ba2cac8f4 23-Oct-2009 Andreas Huber <andih@google.com> am f57b07df: am ad285430: Make stagefright a little less verbose. Fix heap corruption for real.

Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9'

* commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9':
Make stagefright a little less verbose. Fix heap corruption for real.
4601d3080451d8a856b2e82faae304a21c89c8e4 23-Oct-2009 Andreas Huber <andih@google.com> am 871e4ee8: am e8472900: Merge change Ie13526ad into eclair-mr2

Merge commit '871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc'

* commit '871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc':
Prefer software decoders over hardware for thumbnail extraction.
f57b07dfa82aba5397e54d741ce6de0d1dcd73c9 23-Oct-2009 Andreas Huber <andih@google.com> am ad285430: Make stagefright a little less verbose. Fix heap corruption for real.

Merge commit 'ad28543022101d0b01845e3f53dcd57e524816ef' into eclair-mr2-plus-aosp

* commit 'ad28543022101d0b01845e3f53dcd57e524816ef':
Make stagefright a little less verbose. Fix heap corruption for real.
0371a4d78388e7ef003e8240083dc33f66e414b7 23-Oct-2009 Andreas Huber <andih@google.com> am 1f04c836: am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2

Merge commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c'

* commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c':
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
37c72552ea4a60efd35a353a781c9c89b44082b2 23-Oct-2009 Eric Laurent <elaurent@google.com> am bae0d0d4: am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.

Merge commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476'

* commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc 23-Oct-2009 Andreas Huber <andih@google.com> am e8472900: Merge change Ie13526ad into eclair-mr2

Merge commit 'e84729002102622b40bd6efddffb76909615c12a' into eclair-mr2-plus-aosp

* commit 'e84729002102622b40bd6efddffb76909615c12a':
Prefer software decoders over hardware for thumbnail extraction.
ad28543022101d0b01845e3f53dcd57e524816ef 22-Oct-2009 Andreas Huber <andih@google.com> Make stagefright a little less verbose. Fix heap corruption for real.
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/omx/OMXNodeInstance.cpp
1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c 23-Oct-2009 Andreas Huber <andih@google.com> am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2

Merge commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead' into eclair-mr2-plus-aosp

* commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead':
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476 23-Oct-2009 Eric Laurent <elaurent@google.com> am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.

Merge commit '470687e251ecb298bda17f3e3978ffeaf05622a9' into eclair-mr2-plus-aosp

* commit '470687e251ecb298bda17f3e3978ffeaf05622a9':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
e84729002102622b40bd6efddffb76909615c12a 23-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ie13526ad into eclair-mr2

* changes:
Prefer software decoders over hardware for thumbnail extraction.
e13526ad926bfee99778a4f21ea5e4f8a6c8984f 22-Oct-2009 Andreas Huber <andih@google.com> Prefer software decoders over hardware for thumbnail extraction.

While our hardware decoders clearly outperform the software decoders in terms
of raw throughput, their startup latency makes them less suitable for thumbnail
extraction.
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibstagefright/OMXCodec.cpp
1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead 23-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Icb64cd2c into eclair-mr2

* changes:
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
470687e251ecb298bda17f3e3978ffeaf05622a9 23-Oct-2009 Eric Laurent <elaurent@google.com> am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.

Merge commit 'dd28d56368441537ec5eb42150516416fdbf10ad' into eclair-mr2

* commit 'dd28d56368441537ec5eb42150516416fdbf10ad':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
f627debdd0d025b3ec9f83ad209dfa4c44bf4df7 23-Oct-2009 Eric Laurent <elaurent@google.com> am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.

Merge commit 'dd28d56368441537ec5eb42150516416fdbf10ad' into eclair-plus-aosp

* commit 'dd28d56368441537ec5eb42150516416fdbf10ad':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
dd28d56368441537ec5eb42150516416fdbf10ad 23-Oct-2009 Eric Laurent <elaurent@google.com> Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.

Unlock mLock mutex when exiting upon wait stop timeout condition.
Increase timeout delays to avoid timing out when A2DP exits standby.
ibmedia/ToneGenerator.cpp
4d5d6c0f3fbe3e7fe584caf7a0e7eed4150027e4 23-Oct-2009 Andreas Huber <andih@google.com> am 7453da3f: am e981c334: Extract video thumbnails from the largest sync sample among the first 20.

Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3'

* commit '7453da3f420b74f5bb135d5895b82dca9c015bb3':
Extract video thumbnails from the largest sync sample among the first 20.
7453da3f420b74f5bb135d5895b82dca9c015bb3 22-Oct-2009 Andreas Huber <andih@google.com> am e981c334: Extract video thumbnails from the largest sync sample among the first 20.

Merge commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732' into eclair-mr2-plus-aosp

* commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732':
Extract video thumbnails from the largest sync sample among the first 20.
e981c33446a98d5ccc0d73c1a840696d77cf0732 22-Oct-2009 Andreas Huber <andih@google.com> Extract video thumbnails from the largest sync sample among the first 20.

Also fixes OMXCodec seek behaviour on the very first call to OMXCodec::read()
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibstagefright/AMRExtractor.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/SampleTable.cpp
ibstagefright/include/SampleTable.h
83a4e86179a485879139eb8310dd2bb030ff74c7 22-Oct-2009 Andreas Huber <andih@google.com> am 0c012efa: am f7f671ed: am b0e6a9a0: Merge change I7a03b074 into eclair

Merge commit '0c012efaab175a46df0cb217e639f414495e4a1b'

* commit '0c012efaab175a46df0cb217e639f414495e4a1b':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
ccf29cd39e77e74cb257981481657060d491913a 22-Oct-2009 Andreas Huber <andih@google.com> am b0e6a9a0: Merge change I7a03b074 into eclair

Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-plus-aosp

* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
0c012efaab175a46df0cb217e639f414495e4a1b 22-Oct-2009 Andreas Huber <andih@google.com> am f7f671ed: am b0e6a9a0: Merge change I7a03b074 into eclair

Merge commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b' into eclair-mr2-plus-aosp

* commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
f7f671edefceefaf68ab28a81ff2dffa54883b6b 22-Oct-2009 Andreas Huber <andih@google.com> am b0e6a9a0: Merge change I7a03b074 into eclair

Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2

* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
cb64cd2c3f3fefda0bc6ab16618f8223ccc2e78d 22-Oct-2009 Andreas Huber <andih@google.com> Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
ibstagefright/omx/OMXNodeInstance.cpp
77f3ca360e7339ae837df578b1eb55d30b977fc9 22-Oct-2009 Andreas Huber <andih@google.com> am 917d0aec: am bfd5b386: Merge change If68c168d into eclair-mr2

Merge commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330'

* commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
917d0aece5c9395892c3a8e7191f04a1e2ca6330 22-Oct-2009 Andreas Huber <andih@google.com> am bfd5b386: Merge change If68c168d into eclair-mr2

Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp

* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
7a03b074a554ba3fd08dbc20cfd4b2f37c5f3aaa 22-Oct-2009 Andreas Huber <andih@google.com> Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
ibstagefright/OMXCodec.cpp
f68c168d366e8aad58454917f96344398a02efd8 21-Oct-2009 Andreas Huber <andih@google.com> Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibstagefright/OMXCodec.cpp
415f3e2875b8b0b860d0dd6a69ff6868571c36bb 21-Oct-2009 Eric Laurent <elaurent@google.com> Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.

Added setVoiceVolume() method to AudioSystem, AudioFlinger, IAudioFlinger, AudioPolicyService.
Removed call to AudioHardwareInterface::setVoiceVolume() from AudioFlinger::setStreamVolume().
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
bfe2a8f3ed8a9e916e96ffac18ce079b5a013e21 20-Oct-2009 Andreas Huber <andih@google.com> am ca404dfb: Merge change Ie3ffb526 into eclair

Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-plus-aosp

* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
f16a0b73993c5a8cc14a36521abaa50d501d9044 20-Oct-2009 Andreas Huber <andih@google.com> do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.

Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
ibstagefright/OMXCodec.cpp
ibstagefright/omx/QComHardwareRenderer.cpp
5f72500ffa7df77d10e26e7a9d7f220f17116e9f 19-Oct-2009 Andreas Huber <andih@google.com> am ec6c6dcf: am 8cca3a6e: Merge change Ib1678609 into eclair-mr2

Merge commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd'

* commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd':
Avoid signaling a format change to the client if its insubstantial.
53f5c0446ea7183afd2d1a9f520d8da508a8c5e4 19-Oct-2009 Andreas Huber <andih@google.com> am b27849d3: am eaa91ed1: Merge change I63d524fd into eclair-mr2

Merge commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1'

* commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1':
Fixing the build by renaming private "string.h" header file.
ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd 19-Oct-2009 Andreas Huber <andih@google.com> am 8cca3a6e: Merge change Ib1678609 into eclair-mr2

Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp

* commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba':
Avoid signaling a format change to the client if its insubstantial.
b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1 19-Oct-2009 Andreas Huber <andih@google.com> am eaa91ed1: Merge change I63d524fd into eclair-mr2

Merge commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f' into eclair-mr2-plus-aosp

* commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f':
Fixing the build by renaming private "string.h" header file.
b1678609cadd0207188d5bb94ef71ce3a8603e5f 19-Oct-2009 Andreas Huber <andih@google.com> Avoid signaling a format change to the client if its insubstantial.

For example, the original port settings change may just indicate a change
in the number of buffers to allocate, which won't be visible to the client
in any case.
ibstagefright/OMXCodec.cpp
63d524fdf0572c821bb1daed099d1b400db4ae3d 19-Oct-2009 Andreas Huber <andih@google.com> Fixing the build by renaming private "string.h" header file.
ibstagefright/HTTPDataSource.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/ShoutcastSource.cpp
ibstagefright/include/HTTPStream.h
ibstagefright/include/stagefright_string.h
ibstagefright/include/string.h
ibstagefright/string.cpp
c2f945c047496584f4fdc6b4c76653f6c628c951 17-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am c3d8f16a: am 720ac1d4: am da2ecbeb: Merge change Idcaa1ef8 into eclair

Merge commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d'

* commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d':
1) Add 10 seconds wait time before collecting the end memory.
c3d8f16a72fe803494d68ab53442afbfb5c5ad8d 17-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am 720ac1d4: am da2ecbeb: Merge change Idcaa1ef8 into eclair

Merge commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f' into eclair-mr2-plus-aosp

* commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f':
1) Add 10 seconds wait time before collecting the end memory.
4831079dd3c6498babe01d2582a6fa2c92302f67 17-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am da2ecbeb: Merge change Idcaa1ef8 into eclair

Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-plus-aosp

* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
1) Add 10 seconds wait time before collecting the end memory.
720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f 17-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am da2ecbeb: Merge change Idcaa1ef8 into eclair

Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2

* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
1) Add 10 seconds wait time before collecting the end memory.
07914840dfd18e34fd4789cfc21522a0f4e0970d 16-Oct-2009 Andreas Huber <andih@google.com> am 4b9dbdfa: am d96f6e85: Merge change I8176f35e into eclair-mr2

Merge commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a'

* commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a':
Reimplement the OMX backend for stagefright.
4b9dbdfa1805cfb5be1eca2d26ca18a01724839a 16-Oct-2009 Andreas Huber <andih@google.com> am d96f6e85: Merge change I8176f35e into eclair-mr2

Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp

* commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d':
Reimplement the OMX backend for stagefright.
784202ea115603004b067aacf6a57bf5d2a7d53b 15-Oct-2009 Andreas Huber <andih@google.com> Reimplement the OMX backend for stagefright.

Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.

Changed APIs to conform to the rest of the system.
ibmedia/IMediaPlayerService.cpp
ibmedia/IOMX.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/include/OMX.h
ibstagefright/include/OMXNodeInstance.h
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMX.h
ibstagefright/omx/OMXNodeInstance.cpp
999101368fc6b8163e0b9e320239e49ca62f3e4a 16-Oct-2009 Yu Shan Emily Lau <yslau@google.com> 1) Add 10 seconds wait time before collecting the end memory.
2) Modified the player stress test, shorten the plabyack time.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
b7463eb0c739d3d28c96c644f98f7f685027b62e 14-Oct-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
7ebee2f9e7a8b0301409d84868d04fc99564eb2a 14-Oct-2009 Ray Chen <raychen@google.com> am 34cc5292: am b65a90d7: Merge change I73b00501 into eclair-mr2

Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5'

* commit '34cc52922d4268633b3730dfd73658be6a06a2c5':
Check cursor and URI value for nullity to prevent NPE.
c69cfdbace93413f42e0b452687918b4727e7442 14-Oct-2009 Andreas Huber <andih@google.com> am 28af587a: am c642199d: Merge change Ibd7b43bb into eclair-mr2

Merge commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3'

* commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3':
Separated private from public header files.
ee19004b464ce08598a7d9d2f970c89f77d58529 14-Oct-2009 Andreas Huber <andih@google.com> am b7a69ce8: am fe324a61: Merge change I8d87cd98 into eclair-mr2

Merge commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420'

* commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420':
Fix various compiler warnings accumulated over time.
5dc13b769fa42ca227967a81a5fdeadfb55b6055 14-Oct-2009 Andreas Huber <andih@google.com> am 9550e289: am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.

Merge commit '9550e2892f88194c9abbb85616bb55db67231d6e'

* commit '9550e2892f88194c9abbb85616bb55db67231d6e':
OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
9f6ff40c57e97d21e786634169d9e268497e5f7a 14-Oct-2009 Andreas Huber <andih@google.com> am 96c1dfcc: am 63f20ec1: Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.

Merge commit '96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e'

* commit '96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e':
Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
0b4acfcc6045a1b8177487fd312be9b4d62a408f 14-Oct-2009 Andreas Huber <andih@google.com> am c55bb59e: am ef703f60: Merge change I98276091 into eclair-mr2

Merge commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7'

* commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7':
Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
023648648636a2377cd3e763eea251c3346e599e 13-Oct-2009 Ray Chen <raychen@google.com> am 7c86fc06: am 23a2d92f: Merge change Ib01005ea into eclair-mr2

Merge commit '7c86fc066a010ed50877ee3066d542f873d762c2'

* commit '7c86fc066a010ed50877ee3066d542f873d762c2':
Avoid extracting EXIF data for non-JPEG images.
e25adeaf41fa52a956f0b7836b2b7461ccc247c5 13-Oct-2009 Andreas Huber <andih@google.com> am e1ba4226: am 936fff36: Merge change Ib64cab41 into eclair-mr2

Merge commit 'e1ba422636937ee1ca84938d018282344d319543'

* commit 'e1ba422636937ee1ca84938d018282344d319543':
Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
74ae80b623d72d7fab1999fb9ce4b759419f4553 13-Oct-2009 Andreas Huber <andih@google.com> am 1c83540e: am 2d295a96: Merge change Iedebfe8d into eclair-mr2

Merge commit '1c83540e3829dc9664728f1f017686f16f61a4ea'

* commit '1c83540e3829dc9664728f1f017686f16f61a4ea':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
fccdd7aee8617538ccb73b2686a0a53a0f39259e 13-Oct-2009 Andreas Huber <andih@google.com> am 39c923a9: am 23bccd6c: Merge change I729c3938 into eclair-mr2

Merge commit '39c923a94c377a75e34153f6dddb83fc9883d2a7'

* commit '39c923a94c377a75e34153f6dddb83fc9883d2a7':
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
c2370c424bacec70f6b95408d340fe394a4d8f9e 13-Oct-2009 Andreas Huber <andih@google.com> am a6b76c35: am cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed

Merge commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0'

* commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0':
The vendor is about to check in a fix for this issue, the workaround is no longer needed
34cc52922d4268633b3730dfd73658be6a06a2c5 13-Oct-2009 Ray Chen <raychen@google.com> am b65a90d7: Merge change I73b00501 into eclair-mr2

Merge commit 'b65a90d76ff486208974f0b1dac8e880ba29174b' into eclair-mr2-plus-aosp

* commit 'b65a90d76ff486208974f0b1dac8e880ba29174b':
Check cursor and URI value for nullity to prevent NPE.
b65a90d76ff486208974f0b1dac8e880ba29174b 13-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I73b00501 into eclair-mr2

* changes:
Check cursor and URI value for nullity to prevent NPE.
28af587a0587bc3975230a9ed4a2a44be1f31ad3 13-Oct-2009 Andreas Huber <andih@google.com> am c642199d: Merge change Ibd7b43bb into eclair-mr2

Merge commit 'c642199d1d60176980e2781bb78f42dce93e1c84' into eclair-mr2-plus-aosp

* commit 'c642199d1d60176980e2781bb78f42dce93e1c84':
Separated private from public header files.
b7a69ce8f2d05c523ad964e98f490fe3c060a420 13-Oct-2009 Andreas Huber <andih@google.com> am fe324a61: Merge change I8d87cd98 into eclair-mr2

Merge commit 'fe324a61c39d5db59f09fdae81c808d7851841e6' into eclair-mr2-plus-aosp

* commit 'fe324a61c39d5db59f09fdae81c808d7851841e6':
Fix various compiler warnings accumulated over time.
bd7b43bb02852e51b3000185fa66e10c56b120e0 13-Oct-2009 Andreas Huber <andih@google.com> Separated private from public header files.
ibstagefright/ESDS.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/SampleTable.cpp
ibstagefright/ShoutcastSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/include/ESDS.h
ibstagefright/include/HTTPStream.h
ibstagefright/include/QComHardwareRenderer.h
ibstagefright/include/SampleTable.h
ibstagefright/include/SoftwareRenderer.h
ibstagefright/include/TIHardwareRenderer.h
ibstagefright/include/TimedEventQueue.h
ibstagefright/include/string.h
ibstagefright/omx/OMX.cpp
ibstagefright/omx/QComHardwareRenderer.cpp
ibstagefright/omx/SoftwareRenderer.cpp
ibstagefright/omx/TIHardwareRenderer.cpp
ibstagefright/string.cpp
8d87cd98a8b6a6ff25d45c9e34907fecd1810575 13-Oct-2009 Andreas Huber <andih@google.com> Fix various compiler warnings accumulated over time.
ibstagefright/HTTPDataSource.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/SampleTable.cpp
9550e2892f88194c9abbb85616bb55db67231d6e 13-Oct-2009 Andreas Huber <andih@google.com> am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.

Merge commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e' into eclair-mr2-plus-aosp

* commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e':
OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
cfd55579c2e20514b181809dfaf30bd6f7e04c7e 09-Oct-2009 Andreas Huber <andih@google.com> OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/OMXCodec.cpp
96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e 13-Oct-2009 Andreas Huber <andih@google.com> am 63f20ec1: Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.

Merge commit '63f20ec1a8d31c85261056c6c171140b93bcde0a' into eclair-mr2-plus-aosp

* commit '63f20ec1a8d31c85261056c6c171140b93bcde0a':
Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
c55bb59e542368500937d6737ce2ea2d3524d6d7 13-Oct-2009 Andreas Huber <andih@google.com> am ef703f60: Merge change I98276091 into eclair-mr2

Merge commit 'ef703f60d5c00527048fdaf1c24984762f6fd434' into eclair-mr2-plus-aosp

* commit 'ef703f60d5c00527048fdaf1c24984762f6fd434':
Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
63f20ec1a8d31c85261056c6c171140b93bcde0a 13-Oct-2009 Andreas Huber <andih@google.com> Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.

related-to-bug: 1986192
ibstagefright/MP3Extractor.cpp
fa8de752507feaca695123911915070c1ce463b2 08-Oct-2009 Andreas Huber <andih@google.com> Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
ibstagefright/AMRExtractor.cpp
ibstagefright/AudioPlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/MetaData.cpp
ibstagefright/OMXCodec.cpp
73b0050111452a71c9d2aecb10f8089b1061efb5 12-Oct-2009 Ray Chen <raychen@google.com> Check cursor and URI value for nullity to prevent NPE.
ava/android/media/ThumbnailUtil.java
ea745866dec0acb49a772f54bbf8ad7311c109c8 12-Oct-2009 Andreas Huber <andih@google.com> am 1e988a04: am f894d111: Merge change I6c32aa75 into eclair-mr2

Merge commit '1e988a04b55fcaab6116b8d565b68b4f62d01633'

* commit '1e988a04b55fcaab6116b8d565b68b4f62d01633':
Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
b0b3c14d8934228fc3c24fbf5f12b58f7594a635 12-Oct-2009 Eric Laurent <elaurent@google.com> am 82162049: am 4e362817: am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).

Merge commit '821620494f0f073a27124e96139d5320df79d7e4'

* commit '821620494f0f073a27124e96139d5320df79d7e4':
Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
bf7ffe9782a29552c7cc986bf5dfb60eeb9ad179 12-Oct-2009 Josh Guilfoyle <jasta00@gmail.com> am 35a82b6b: am 1b7ad876: Merge change I6b51a98a into eclair-mr2

Merge commit '35a82b6b5be55287589028e1f8874b65f50245f4'

* commit '35a82b6b5be55287589028e1f8874b65f50245f4':
Fixed issue #4098: Ringtone#getTitle does not close its cursor.
80df8cd8df57e3176653e705862ec14df5cbb422 12-Oct-2009 gwang@google.com <gwang@google.com> am ed2247dc: am 3e655688: am 521f4f3a: Merge change I3d6cf8aa into eclair

Merge commit 'ed2247dc685233b82c7769a5e17f103c1c603ab9'

* commit 'ed2247dc685233b82c7769a5e17f103c1c603ab9':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
82387365e139f01da871396efa5fec570c7f1453 12-Oct-2009 Marco Nelissen <marcone@google.com> am 2c3dc14a: am a97402e1: am c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by

Merge commit '2c3dc14acb7308570b9d695ba9ac904a9502b043'

* commit '2c3dc14acb7308570b9d695ba9ac904a9502b043':
Music visualizer support hack.
7c86fc066a010ed50877ee3066d542f873d762c2 09-Oct-2009 Ray Chen <raychen@google.com> am 23a2d92f: Merge change Ib01005ea into eclair-mr2

Merge commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0' into eclair-mr2-plus-aosp

* commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0':
Avoid extracting EXIF data for non-JPEG images.
23a2d92f2dd122a6f7ba39580b1d7be088ce6de0 09-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib01005ea into eclair-mr2

* changes:
Avoid extracting EXIF data for non-JPEG images.
e1ba422636937ee1ca84938d018282344d319543 09-Oct-2009 Andreas Huber <andih@google.com> am 936fff36: Merge change Ib64cab41 into eclair-mr2

Merge commit '936fff36882764ec031ae4fb8338273cc2abccd5' into eclair-mr2-plus-aosp

* commit '936fff36882764ec031ae4fb8338273cc2abccd5':
Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
53a76bd0c918082847e52570c307ed3ba325992d 07-Oct-2009 Andreas Huber <andih@google.com> Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/StagefrightMetadataRetriever.cpp
ibmediaplayerservice/StagefrightMetadataRetriever.h
ibstagefright/MmapSource.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/omx/Android.mk
ibstagefright/omx/ColorConverter.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/SoftwareRenderer.cpp
b01005ea21be2aedd0871fb4d41301dd09ef428a 08-Oct-2009 Ray Chen <raychen@google.com> Avoid extracting EXIF data for non-JPEG images.
ava/android/media/ThumbnailUtil.java
1c83540e3829dc9664728f1f017686f16f61a4ea 08-Oct-2009 Andreas Huber <andih@google.com> am 2d295a96: Merge change Iedebfe8d into eclair-mr2

Merge commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5' into eclair-mr2-plus-aosp

* commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
39c923a94c377a75e34153f6dddb83fc9883d2a7 08-Oct-2009 Andreas Huber <andih@google.com> am 23bccd6c: Merge change I729c3938 into eclair-mr2

Merge commit '23bccd6c25f581860487835bf7b5442589897352' into eclair-mr2-plus-aosp

* commit '23bccd6c25f581860487835bf7b5442589897352':
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
3f42707c62e2833ab9d437652f5ea25925cc58af 08-Oct-2009 Andreas Huber <andih@google.com> Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
ibmedia/IOMX.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMX.h
23bccd6c25f581860487835bf7b5442589897352 08-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I729c3938 into eclair-mr2

* changes:
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
a6b76c35a482bd7f2cbab186aca9ea6e74a375d0 08-Oct-2009 Andreas Huber <andih@google.com> am cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed

Merge commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp

* commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9':
The vendor is about to check in a fix for this issue, the workaround is no longer needed
cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9 08-Oct-2009 Andreas Huber <andih@google.com> The vendor is about to check in a fix for this issue, the workaround is no longer needed
ibstagefright/OMXCodec.cpp
729c39381da86cf7756530f3ff2f750550ffef93 08-Oct-2009 Andreas Huber <andih@google.com> Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.

Since we cannot tell how long it'll take until surface flinger
has displayed the data onscreen, we'll just have to guess...
We must not return the buffer to the decoder before it's been displayed.
ibstagefright/omx/QComHardwareRenderer.cpp
1e988a04b55fcaab6116b8d565b68b4f62d01633 07-Oct-2009 Andreas Huber <andih@google.com> am f894d111: Merge change I6c32aa75 into eclair-mr2

Merge commit 'f894d111c8c1ad9038c2d434e1cd78616a6bda0a' into eclair-mr2-plus-aosp

* commit 'f894d111c8c1ad9038c2d434e1cd78616a6bda0a':
Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
8b432b1d85259a463198db3efa5c50e59c254686 07-Oct-2009 Andreas Huber <andih@google.com> Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
ibstagefright/OMXCodec.cpp
555e032b1a8204bb9cfc0b478270e4241b1592fb 07-Oct-2009 Eric Laurent <elaurent@google.com> am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).

Merge commit '62443f5f4517ba17d911975e695f1ab75bfdbf77' into eclair-plus-aosp

* commit '62443f5f4517ba17d911975e695f1ab75bfdbf77':
Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
15097318640591f9e582dbdd57ec0e9d97a7683e 07-Oct-2009 gwang@google.com <gwang@google.com> am 521f4f3a: Merge change I3d6cf8aa into eclair

Merge commit '521f4f3af94e3a093a37af887d3e317a526b61a1' into eclair-plus-aosp

* commit '521f4f3af94e3a093a37af887d3e317a526b61a1':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
38729e69ad641f82ca3bc8b604aeb954a8935ded 07-Oct-2009 Marco Nelissen <marcone@google.com> am c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.

Merge commit 'c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-plus-aosp

* commit 'c39d2e3c012fb96999991e30659a474f9f30f789':
Music visualizer support hack.
821620494f0f073a27124e96139d5320df79d7e4 07-Oct-2009 Eric Laurent <elaurent@google.com> am 4e362817: am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).

Merge commit '4e362817ab49da3325531e1213e70ec6bbe32084' into eclair-mr2-plus-aosp

* commit '4e362817ab49da3325531e1213e70ec6bbe32084':
Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
4e362817ab49da3325531e1213e70ec6bbe32084 07-Oct-2009 Eric Laurent <elaurent@google.com> am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).

Merge commit '62443f5f4517ba17d911975e695f1ab75bfdbf77' into eclair-mr2

* commit '62443f5f4517ba17d911975e695f1ab75bfdbf77':
Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
62443f5f4517ba17d911975e695f1ab75bfdbf77 06-Oct-2009 Eric Laurent <elaurent@google.com> Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).

This change is a complement to the main fix in kernel driver for the same issue (partner change #1250).
It removes clicks sometimes heard after the end of the tones while audio flinger is sending 0s to the audio output stream.
The problem was that the sleep time between two writes was more than the duration of one audio output stream buffer which could cause some underrun.

Also fixed a recent regression in ToneGenerator that made that the end of previous tone was repeated at the beginning of current one under certain timing circumstances when the maximum tone duration was specified.
ibmedia/ToneGenerator.cpp
35a82b6b5be55287589028e1f8874b65f50245f4 07-Oct-2009 Josh Guilfoyle <jasta00@gmail.com> am 1b7ad876: Merge change I6b51a98a into eclair-mr2

Merge commit '1b7ad876f1274787d7609a31e4a2a852adb94c3c' into eclair-mr2-plus-aosp

* commit '1b7ad876f1274787d7609a31e4a2a852adb94c3c':
Fixed issue #4098: Ringtone#getTitle does not close its cursor.
1b7ad876f1274787d7609a31e4a2a852adb94c3c 07-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I6b51a98a into eclair-mr2

* changes:
Fixed issue #4098: Ringtone#getTitle does not close its cursor.
ed2247dc685233b82c7769a5e17f103c1c603ab9 07-Oct-2009 gwang@google.com <gwang@google.com> am 3e655688: am 521f4f3a: Merge change I3d6cf8aa into eclair

Merge commit '3e655688728e352e51dc9718490589f1bfb8622d' into eclair-mr2-plus-aosp

* commit '3e655688728e352e51dc9718490589f1bfb8622d':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
3b49e9b52558b5c45240d098410bd5afbd29e1fe 03-Oct-2009 gwang@google.com <gwang@google.com> Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
ava/android/media/MediaPlayer.java
ava/android/media/ToneGenerator.java
6b51a98acbc710a4e1a1656d85bb5d3c92f82fe9 03-Oct-2009 Josh Guilfoyle <jasta00@gmail.com> Fixed issue #4098: Ringtone#getTitle does not close its cursor.

http://code.google.com/p/android/issues/detail?id=4098
ava/android/media/Ringtone.java
2c3dc14acb7308570b9d695ba9ac904a9502b043 06-Oct-2009 Marco Nelissen <marcone@google.com> am a97402e1: am c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.

Merge commit 'a97402e1cbadbdc874afa9ffdbd23f1c62fb8177' into eclair-mr2-plus-aosp

* commit 'a97402e1cbadbdc874afa9ffdbd23f1c62fb8177':
Music visualizer support hack.
c39d2e3c012fb96999991e30659a474f9f30f789 20-Sep-2009 Marco Nelissen <marcone@google.com> Music visualizer support hack.
This currently assumes 44k stereo (won't crash on other formats, but won't give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/Android.mk
ibmedia/IMediaPlayerService.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
b1bb6cfe91c97fccd720de565fa69ed787ae1cbc 05-Oct-2009 Doug Kwan <dougkwan@google.com> Add back missing shared libraries used in executables in link commands. These
executables have calls to some shared libraries without explicitly linking
them. Currently it works as linker links these libraries via dependencies of
other libraries. This is fragile and not the right thing to do.
dutils/Android.mk
336a0ee90fd1dad9874af752c076523313aa0e6b 03-Oct-2009 Josh Guilfoyle <jasta00@gmail.com> Fixed issue #4098: Ringtone#getTitle does not close its cursor.

http://code.google.com/p/android/issues/detail?id=4098
ava/android/media/Ringtone.java
df197471cccb00884bd1910f267e97067d32a1ee 01-Oct-2009 Dianne Hackborn <hackbod@google.com> am 943c8e7d: am 29e4a3c5: Update from API review.

Merge commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae'

* commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae':
Update from API review.
6a1262e2108bf21ef6cea73b0260f59337c8ffad 01-Oct-2009 Ray Chen <raychen@google.com> am a6715ca6: am f09edd60: Merge change Id60fa26a into eclair

Merge commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa'

* commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa':
Fix issue 2152541 thumbnail images stretched.
554d35ccbd42cb35255f741a61179ca8d8e7d432 01-Oct-2009 Eric Laurent <elaurent@google.com> am 46c5fdf6: am 3f56d21b: Merge change I89e74ba1 into eclair

Merge commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15'

* commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15':
Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
0cdb0e76372850624aa1951b8536de5f04ec304e 01-Oct-2009 Jianhong Jiang <jianhong@google.com> am 722eba00: am 37b0f279: Merge change I999f1aeb into eclair

Merge commit '722eba008c20d545ff8f17584cda282ab2800e29'

* commit '722eba008c20d545ff8f17584cda282ab2800e29':
Remove audio latency fudge factor 96 msec.
f2496dc8b90262063e09ca07ebc1f43e7fb68f02 01-Oct-2009 Yu Shan Emily Lau <yslau@google.com> am f1fa1eac: am edd942c2: Merge change I55a6ac8c into eclair

Merge commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11'

* commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11':
Fixed the long recorder time and reduce the number of loops.
1c628eba63a31e197f226b7969608a4ff96f8ff8 01-Oct-2009 Chih-Chung Chang <chihchung@google.com> am 41293323: am 8bbba0e3: Merge change If5722b3f into eclair

Merge commit '412933234ad114c0fbb237f068b07821afb6e484'

* commit '412933234ad114c0fbb237f068b07821afb6e484':
Dont NPE if the thumbnail file cannot be opened.
f4a764bf08b6ad5b5e556d141278bf7d53b3ca93 01-Oct-2009 Eric Laurent <elaurent@google.com> am efc42d3a: am 7d987180: Merge change I19f2928b into eclair

Merge commit 'efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad'

* commit 'efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad':
Fix issue 2141503: Keyclick sound doesn't honor volume settings.
e8b93da7f798efc47322411dbb7b753d00d9e3e8 01-Oct-2009 James Dong <jdong@google.com> am b8bf70ac: am 4c232c5b: Merge change Idd16976f into eclair

Merge commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2'

* commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2':
Fix some metadata retriever issues:
6dd52bbf2d9561b77765ce183a7031768da3210b 01-Oct-2009 Ray Chen <raychen@google.com> am 06e5b766: am 0167263b: Merge change Ide90d0cc into eclair

Merge commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477'

* commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477':
Unify Java NIO to read/write MiniThumbFile.
943c8e7de682eb0d55167fe4c434e9f1c532a5ae 01-Oct-2009 Dianne Hackborn <hackbod@google.com> am 29e4a3c5: Update from API review.

Merge commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba' into eclair-plus-aosp

* commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba':
Update from API review.
29e4a3c566f435c32f0b95e4ac8e8b33cac6faba 01-Oct-2009 Dianne Hackborn <hackbod@google.com> Update from API review.

Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
ava/android/media/ExifInterface.java
a6715ca6f9e2125f2ea5db5cf71714e75618e9fa 01-Oct-2009 Ray Chen <raychen@google.com> am f09edd60: Merge change Id60fa26a into eclair

Merge commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c' into eclair-plus-aosp

* commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c':
Fix issue 2152541 thumbnail images stretched.
f09edd60376f6ad755ebaaf0c1f89f561f78468c 01-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Id60fa26a into eclair

* changes:
Fix issue 2152541 thumbnail images stretched.
ef093cd6c4ab4d3c8a1c8be5ed7147d5f06d7027 30-Sep-2009 Ray Chen <raychen@google.com> Fix issue 2152541 thumbnail images stretched.
ava/android/media/MiniThumbFile.java
ava/android/media/ThumbnailUtil.java
46c5fdf60be5ba31ed7f31da42afdee639cddf15 01-Oct-2009 Eric Laurent <elaurent@google.com> am 3f56d21b: Merge change I89e74ba1 into eclair

Merge commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e' into eclair-plus-aosp

* commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e':
Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
89e74ba1419732dd5c7f939e48d4aa7989fd3a51 01-Oct-2009 Eric Laurent <elaurent@google.com> Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.

The problem comes from the fact that the AudioSystem callback indicating that the media server is active again is ignored if it is received before the delayed message indicating media server death. This happens if another application or service running in the system server process makes a request to the AudioSystem in the interval between the death of the media server and the reception of the corresponding delayed message.

The fix consists in resetting mMediaServerOk flags immediately when the death callback is received and not when the delayed message is received.
ava/android/media/AudioService.java
722eba008c20d545ff8f17584cda282ab2800e29 30-Sep-2009 Jianhong Jiang <jianhong@google.com> am 37b0f279: Merge change I999f1aeb into eclair

Merge commit '37b0f279a6a237ae366c4861cde3f774f5ab811c' into eclair-plus-aosp

* commit '37b0f279a6a237ae366c4861cde3f774f5ab811c':
Remove audio latency fudge factor 96 msec.
37b0f279a6a237ae366c4861cde3f774f5ab811c 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I999f1aeb into eclair

* changes:
Remove audio latency fudge factor 96 msec.
999f1aebf780d0efd55554ac0198b1c6182bb9c0 30-Sep-2009 Jianhong Jiang <jianhong@google.com> Remove audio latency fudge factor 96 msec.
ibmediaplayerservice/MediaPlayerService.cpp
f1fa1eacaa36c80c2094ba679b8384d9f4541e11 30-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am edd942c2: Merge change I55a6ac8c into eclair

Merge commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69' into eclair-plus-aosp

* commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69':
Fixed the long recorder time and reduce the number of loops.
edd942c2de8f9b75d22f89eb160fe0e0f6191c69 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I55a6ac8c into eclair

* changes:
Fixed the long recorder time and reduce the number of loops.
55a6ac8c542ae831b0d041360cab4bbc7212ade5 30-Sep-2009 Yu Shan Emily Lau <yslau@google.com> Fixed the long recorder time and reduce the number of loops.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
412933234ad114c0fbb237f068b07821afb6e484 30-Sep-2009 Chih-Chung Chang <chihchung@google.com> am 8bbba0e3: Merge change If5722b3f into eclair

Merge commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0' into eclair-plus-aosp

* commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0':
Dont NPE if the thumbnail file cannot be opened.
8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change If5722b3f into eclair

* changes:
Dont NPE if the thumbnail file cannot be opened.
f5722b3f22e016a8f21c628776cd0746ef164c19 30-Sep-2009 Chih-Chung Chang <chihchung@google.com> Dont NPE if the thumbnail file cannot be opened.
ava/android/media/MiniThumbFile.java
efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad 30-Sep-2009 Eric Laurent <elaurent@google.com> am 7d987180: Merge change I19f2928b into eclair

Merge commit '7d9871805beef4ea5e319f1a11ab32f610031845' into eclair-plus-aosp

* commit '7d9871805beef4ea5e319f1a11ab32f610031845':
Fix issue 2141503: Keyclick sound doesn't honor volume settings.
7d9871805beef4ea5e319f1a11ab32f610031845 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I19f2928b into eclair

* changes:
Fix issue 2141503: Keyclick sound doesn't honor volume settings.
a2ef57dba9ac77d8eccacd646b2b8a8d99fe9d8b 28-Sep-2009 Eric Laurent <elaurent@google.com> Fix issue 2141503: Keyclick sound doesn't honor volume settings.

Use music stream volume minus 3 dB for sound effects if volume is not explicitly requested by application.
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2 29-Sep-2009 James Dong <jdong@google.com> am 4c232c5b: Merge change Idd16976f into eclair

Merge commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068' into eclair-plus-aosp

* commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068':
Fix some metadata retriever issues:
06e5b76667f02e4e45b2689d56d7d0596b4ef477 29-Sep-2009 Ray Chen <raychen@google.com> am 0167263b: Merge change Ide90d0cc into eclair

Merge commit '0167263bf457164a17f612ec551313f1b9e42972' into eclair-plus-aosp

* commit '0167263bf457164a17f612ec551313f1b9e42972':
Unify Java NIO to read/write MiniThumbFile.
4c232c5b3f7fcbea73cd3cec2d3befe06e85c068 29-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Idd16976f into eclair

* changes:
Fix some metadata retriever issues: 1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource 2. cached the mode so that setMode can still be called before setDataSource. mRetriever won't be initialized until data source is set; thus we have to do this
ecc97cc9491f40c507e372a30bcd58a9e08066a8 29-Sep-2009 Ray Chen <raychen@google.com> Unify Java NIO to read/write MiniThumbFile.
ava/android/media/MiniThumbFile.java
67fc234a2f717e4bc979e2cb148115a0e73b0877 29-Sep-2009 James Dong <jdong@google.com> Fix some metadata retriever issues:
1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource
2. cached the mode so that setMode can still be called before setDataSource.
mRetriever won't be initialized until data source is set; thus we have to do this
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
d4a97110575b26af629137804ad8ab7f4238fa38 28-Sep-2009 James Dong <jdong@google.com> am 9365c8fa: am 99638e74: Merge change 27466 into eclair

Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'

* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
Turn on thubmnail capture unit test for media metadata retriever
9365c8fa7c66c62de98b859f08c881ea2ad65980 28-Sep-2009 James Dong <jdong@google.com> am 99638e74: Merge change 27466 into eclair

Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp

* commit '99638e747251929191f7773d2a81bbea223f1e09':
Turn on thubmnail capture unit test for media metadata retriever
99638e747251929191f7773d2a81bbea223f1e09 28-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27466 into eclair

* changes:
Turn on thubmnail capture unit test for media metadata retriever
525ad18663bdac0b378f5ae1db4de66ca71d907e 28-Sep-2009 James Dong <jdong@google.com> Turn on thubmnail capture unit test for media metadata retriever
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
3089841a4d409ab5ab674bc13f48ad453652c8b5 28-Sep-2009 Marco Nelissen <marcone@google.com> am 14e8e988: am 7d973514: Merge change 27449 into eclair

Merge commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660'

* commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660':
Always consider m4a files as audio, even when they contain a video track.
7425821ff002fbc04c76f6620c98f55cbaeca41d 28-Sep-2009 Marco Nelissen <marcone@google.com> am aa507136: am dba93b68: Merge change 27318 into eclair

Merge commit 'aa507136493b24a899b270367b08a7158085c9b8'

* commit 'aa507136493b24a899b270367b08a7158085c9b8':
Check that playlist entries refer to a row in the audio table.
14e8e988cfdd01b665f5b49fb6f95a6c11ce3660 28-Sep-2009 Marco Nelissen <marcone@google.com> am 7d973514: Merge change 27449 into eclair

Merge commit '7d9735142f75c3bf30b420fdd006dc356f32fede' into eclair-plus-aosp

* commit '7d9735142f75c3bf30b420fdd006dc356f32fede':
Always consider m4a files as audio, even when they contain a video track.
7d9735142f75c3bf30b420fdd006dc356f32fede 28-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27449 into eclair

* changes:
Always consider m4a files as audio, even when they contain a video track.
1851db6804cbdf8d2c8ede0725e73be6fda0f3c0 28-Sep-2009 Marco Nelissen <marcone@google.com> Always consider m4a files as audio, even when they contain a video track.
ava/android/media/MediaScanner.java
df6276ad401315e56bc64250c3ef86006606a6f8 28-Sep-2009 Ray Chen <raychen@google.com> am 1055e0d8: am cc96652c: Remove fflush when storing thumbanil to sdcard.

Merge commit '1055e0d830f9e594721ee8e64fa3f2c29dd163dd'

* commit '1055e0d830f9e594721ee8e64fa3f2c29dd163dd':
Remove fflush when storing thumbanil to sdcard.
32eb22c03a1a66d347204b300dc86829bd89a2e0 28-Sep-2009 Marco Nelissen <marcone@google.com> am c46f886b: am 0faa5c6c: Merge change 27271 into eclair

Merge commit 'c46f886b63772be33c6e6864475140606a79e126'

* commit 'c46f886b63772be33c6e6864475140606a79e126':
Only scan windows media files when those codecs are enabled.
aa507136493b24a899b270367b08a7158085c9b8 28-Sep-2009 Marco Nelissen <marcone@google.com> am dba93b68: Merge change 27318 into eclair

Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp

* commit 'dba93b68326f139f669aefa6770d50daff032746':
Check that playlist entries refer to a row in the audio table.
dba93b68326f139f669aefa6770d50daff032746 28-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27318 into eclair

* changes:
Check that playlist entries refer to a row in the audio table.
0a63934d9707ecbec59b7e32bedee47a779c43f2 28-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 20f8fcd9: am 7756cbee: Merge change 27073 into eclair

Merge commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63'

* commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63':
Removed the device type checking
d4f3586c93cd9c29056e95cd79f3cb19ac456f3b 28-Sep-2009 Marco Nelissen <marcone@google.com> Check that playlist entries refer to a row in the audio table.
ava/android/media/MediaScanner.java
1055e0d830f9e594721ee8e64fa3f2c29dd163dd 27-Sep-2009 Ray Chen <raychen@google.com> am cc96652c: Remove fflush when storing thumbanil to sdcard.

Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp

* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
Remove fflush when storing thumbanil to sdcard.
cc96652c7049569c1bc7b1f93ba454a7cb891fd8 25-Sep-2009 Ray Chen <raychen@google.com> Remove fflush when storing thumbanil to sdcard.
ava/android/media/MiniThumbFile.java
c46f886b63772be33c6e6864475140606a79e126 27-Sep-2009 Marco Nelissen <marcone@google.com> am 0faa5c6c: Merge change 27271 into eclair

Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp

* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
Only scan windows media files when those codecs are enabled.
0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2 27-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27271 into eclair

* changes:
Only scan windows media files when those codecs are enabled.
0ddbc35dc4974fbe18a4191e579b1eda5a7ef2b1 27-Sep-2009 Marco Nelissen <marcone@google.com> Only scan windows media files when those codecs are enabled.
ava/android/media/MediaFile.java
20f8fcd9fe2a1c034113431ecbab8aa03114bb63 26-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 7756cbee: Merge change 27073 into eclair

Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp

* commit '7756cbeef475127ed56bfeabecb3c291366a952f':
Removed the device type checking
7756cbeef475127ed56bfeabecb3c291366a952f 26-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27073 into eclair

* changes:
Removed the device type checking
34831c9330d4f2993ac1d698a7e176c4b8848b48 25-Sep-2009 Yu Shan Emily Lau <yslau@google.com> Removed the device type checking
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
df13a337e107c2e3163c9756e7a4e921fe19ae7a 25-Sep-2009 Eric Laurent <elaurent@google.com> am df9879bf: am e9bd4788: Merge change 26881 into eclair

Merge commit 'df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd'

* commit 'df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd':
Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
f5171c13a1fbb3fcef59826949a8dd720e54e045 25-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 384350e8: am 3f790d87: Merge change 27011 into eclair

Merge commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb'

* commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb':
Added the checking for the wma in the memory test.
7945105cc1b06fd3aacad4e1e72066e4341aac64 25-Sep-2009 Ray Chen <raychen@google.com> am d503453c: am 80d8ace4: Merge change 26997 into eclair

Merge commit 'd503453ca093a1aac3781cdf6d86fd0700de6600'

* commit 'd503453ca093a1aac3781cdf6d86fd0700de6600':
Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
50ee15793b85546187ad6117de9ee52bb03833b5 25-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 99c156cd: am 7d0bdfaf: Merge change 26948 into eclair

Merge commit '99c156cd9ff67119e20d4ebc851998d68492da05'

* commit '99c156cd9ff67119e20d4ebc851998d68492da05':
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
43363176872306b3215f31307ff975dc253c2815 25-Sep-2009 Dianne Hackborn <hackbod@google.com> am 74468de2: am 9d31e1be: Merge change 26686 into eclair

Merge commit '74468de20b53a3ecea666b5557ec1a0e27f8946d'

* commit '74468de20b53a3ecea666b5557ec1a0e27f8946d':
Fix broken build.
4298f3e3b9ad23bbe8e601b83237a2f69a4d6196 25-Sep-2009 Ray Chen <raychen@google.com> am 94cdc3d0: am 830207ca: Merge change 25635 into eclair

Merge commit '94cdc3d0e2c7f4f001177829f6bbf3b52ce07b98'

* commit '94cdc3d0e2c7f4f001177829f6bbf3b52ce07b98':
Add new thumbnail API.
df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd 25-Sep-2009 Eric Laurent <elaurent@google.com> am e9bd4788: Merge change 26881 into eclair

Merge commit 'e9bd4788d4370714374d833aed1339d17c5ded09' into eclair-plus-aosp

* commit 'e9bd4788d4370714374d833aed1339d17c5ded09':
Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
384350e8043b02e332ad4bea0a0c1e9b26f2e1bb 25-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 3f790d87: Merge change 27011 into eclair

Merge commit '3f790d87838114a71bff96b4a0a51537ca879597' into eclair-plus-aosp

* commit '3f790d87838114a71bff96b4a0a51537ca879597':
Added the checking for the wma in the memory test.
e9bd4788d4370714374d833aed1339d17c5ded09 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26881 into eclair

* changes:
Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
3f790d87838114a71bff96b4a0a51537ca879597 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27011 into eclair

* changes:
Added the checking for the wma in the memory test.
a56e653130f2253edb97fe3a5feb18789c29ec9e 25-Sep-2009 Yu Shan Emily Lau <yslau@google.com> Added the checking for the wma in the memory test.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
af141d529f76a3e3bccf67de798f13568e37f3cf 24-Sep-2009 Eric Laurent <elaurent@google.com> Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.

When the AudioTrack callback notification size is relatively high (Which is the case on Sholes and over A2DP), it is likely that the end of tone is reached during the first callback. In this case, the AudioTrack is stopped before exiting the callback which causes 2 problems:
- 1: If the AudioFlinger thread is scheduled before we exit the ToneGenerator callback, the track can be stopped and reset before the data is actually marked as present in the buffer by the AudioTrack callback => no audio will be processed by AudioFlinger.
- 2: In this case, the data write index in the AudioTrack buffer is incremented after the track was reset by the AudioFlinger which leaves unplayed data in the buffer. This data will be played the next time the AudioTrack is started if not flushed in between.

The fix consists in adding an intermediate state to ToneGenerator state machine so that we exit the callback function when the stop condition is reached and stop the AudioTrack the next time we execute the callback.
ibmedia/ToneGenerator.cpp
d503453ca093a1aac3781cdf6d86fd0700de6600 25-Sep-2009 Ray Chen <raychen@google.com> am 80d8ace4: Merge change 26997 into eclair

Merge commit '80d8ace484525f0272b8a56142ef838f5f4d38e4' into eclair-plus-aosp

* commit '80d8ace484525f0272b8a56142ef838f5f4d38e4':
Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
343449f018e255fbea1806b394151868a5174e63 25-Sep-2009 Ray Chen <raychen@google.com> Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
ava/android/media/ThumbnailUtil.java
99c156cd9ff67119e20d4ebc851998d68492da05 25-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 7d0bdfaf: Merge change 26948 into eclair

Merge commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9' into eclair-plus-aosp

* commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9':
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26948 into eclair

* changes:
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
5b0b63b67489ae3fb14ad2fb000f0ad8977f8f30 25-Sep-2009 Yu Shan Emily Lau <yslau@google.com> Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java
74468de20b53a3ecea666b5557ec1a0e27f8946d 24-Sep-2009 Dianne Hackborn <hackbod@google.com> am 9d31e1be: Merge change 26686 into eclair

Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp

* commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd':
Fix broken build.
a52b4d764ebd79b29eac296a5c3a629cff1990c4 24-Sep-2009 Dianne Hackborn <hackbod@google.com> Fix broken build.

I -did- run it... why did this later break on me?!?

Change-Id: I70db0279f9a1b499496f9808525d2b112495d6c7
ni/android_media_MediaMetadataRetriever.cpp
94cdc3d0e2c7f4f001177829f6bbf3b52ce07b98 23-Sep-2009 Ray Chen <raychen@google.com> am 830207ca: Merge change 25635 into eclair

Merge commit '830207cab4047431d7a38443531a3a912bfecf3a' into eclair-plus-aosp

* commit '830207cab4047431d7a38443531a3a912bfecf3a':
Add new thumbnail API.
f97eb8f932e28a5e56041d0725b421674e0b0f6e 23-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 5653e41e: am 008fc5d1: Merge change 26332 into eclair

Merge commit '5653e41e71a07c104da3f01e5a022198ee39dafe'

* commit '5653e41e71a07c104da3f01e5a022198ee39dafe':
1) Add the wma / wmv profile reader.
00c575a3fccb9d3065e913f1b8fcf93e18d44eaf 28-Aug-2009 Ray Chen <raychen@google.com> Add new thumbnail API.
ava/android/media/MediaScanner.java
ava/android/media/MiniThumbFile.java
ava/android/media/ThumbnailUtil.java
5653e41e71a07c104da3f01e5a022198ee39dafe 22-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 008fc5d1: Merge change 26332 into eclair

Merge commit '008fc5d142b58688a3827a544c524dff11204c62' into eclair-plus-aosp

* commit '008fc5d142b58688a3827a544c524dff11204c62':
1) Add the wma / wmv profile reader.
008fc5d142b58688a3827a544c524dff11204c62 22-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26332 into eclair

* changes:
1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
dc1af5befaa21e92c41dd6e173b2d6fb859cdd23 22-Sep-2009 Yu Shan Emily Lau <yslau@google.com> 1) Add the wma / wmv profile reader.
2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases.
3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
e82fff6eafc321a623f4a85726cede83c347d46d 22-Sep-2009 Chih-Chung Chang <chihchung@google.com> am 1e577ced: am 7b7029e0: Merge change 26236 into eclair

Merge commit '1e577ced7dcd973267f38351616d28f8a090f013'

* commit '1e577ced7dcd973267f38351616d28f8a090f013':
Make media scanner read the jpeg orientation tag.
1e577ced7dcd973267f38351616d28f8a090f013 22-Sep-2009 Chih-Chung Chang <chihchung@google.com> am 7b7029e0: Merge change 26236 into eclair

Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
Make media scanner read the jpeg orientation tag.
b8f4725d1bb750e3358a5b5dfcec7b1c5d3b9939 21-Sep-2009 Chih-Chung Chang <chihchung@google.com> Make media scanner read the jpeg orientation tag.
ava/android/media/MediaScanner.java
f7e88720362cb3fecb91b5652365f7c59033bad0 19-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 58c24345: am 92b27daf: Merge change 25858 into eclair

Merge commit '58c243450d054893c234159ea62262c7f2c0a139'

* commit '58c243450d054893c234159ea62262c7f2c0a139':
There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
58c243450d054893c234159ea62262c7f2c0a139 19-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 92b27daf: Merge change 25858 into eclair

Merge commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676' into eclair-plus-aosp

* commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676':
There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
92b27dafe9418c5fdf63d23c6b19772fbcd74676 19-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25858 into eclair

* changes:
There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
ac11ffad0b37310380f2cd05ac0d30bd2dfcd707 19-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 5813b309: am e785d180: Merge change 25826 into eclair

Merge commit '5813b3097451dc4d061eb75e5479e4ea15d886c7'

* commit '5813b3097451dc4d061eb75e5479e4ea15d886c7':
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
17d7ea4947dfad101ae689f3b717ba0a52945155 19-Sep-2009 Yu Shan Emily Lau <yslau@google.com> There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
5813b3097451dc4d061eb75e5479e4ea15d886c7 19-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am e785d180: Merge change 25826 into eclair

Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp

* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
e785d1804dbf67913aeb25896a420abebe731e80 19-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25826 into eclair

* changes:
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
9d7b2fa80858dada3013af47007046c0cf5ec2ea 18-Sep-2009 Yu Shan Emily Lau <yslau@google.com> Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
d93ee52927c40f50dec801a245fce585a75f18c3 18-Sep-2009 Chih-Chung Chang <chihchung@google.com> am 87012028: am f22b7410: Merge change 25464 into eclair

Merge commit '87012028344dae6e9a0b0ad4615797284ce6c83f'

* commit '87012028344dae6e9a0b0ad4615797284ce6c83f':
Improve ExifInterface API.
87012028344dae6e9a0b0ad4615797284ce6c83f 18-Sep-2009 Chih-Chung Chang <chihchung@google.com> am f22b7410: Merge change 25464 into eclair

Merge commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776' into eclair-plus-aosp

* commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776':
Improve ExifInterface API.
872a30ec723ebdd97de764406544516545d7c9d4 17-Sep-2009 Chih-Chung Chang <chihchung@google.com> Improve ExifInterface API.

Change-Id: Ic6c4df8244b51b9a0d1c73c3797847220d86604d
ava/android/media/ExifInterface.java
ava/android/media/MediaScanner.java
baf71a65ab4717496fc976a3715c7a86a7e6e1d6 18-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 667bc1e8: am b39dcb79: Merge change 25722 into eclair

Merge commit '667bc1e862c5e6b2a703846e786bf0b624830da8'

* commit '667bc1e862c5e6b2a703846e786bf0b624830da8':
Modified the validation to use singal media player instance.
667bc1e862c5e6b2a703846e786bf0b624830da8 18-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am b39dcb79: Merge change 25722 into eclair

Merge commit 'b39dcb796ddf40fb87724ac28932a687756c91bd' into eclair-plus-aosp

* commit 'b39dcb796ddf40fb87724ac28932a687756c91bd':
Modified the validation to use singal media player instance.
bc95d663adf047116d0286b4a797e60ae2410fec 18-Sep-2009 Yu Shan Emily Lau <yslau@google.com> Modified the validation to use singal media player instance.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
dd74c01efcb8ebe6d37a0084f327314e3b1bddd2 18-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 64ea3d3f: am 56af9e9f: Merge change 25452 into eclair

Merge commit '64ea3d3fd847d5055a8a39b0cd7ff89c4beea042'

* commit '64ea3d3fd847d5055a8a39b0cd7ff89c4beea042':
Modified the new stream video url.
64ea3d3fd847d5055a8a39b0cd7ff89c4beea042 18-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 56af9e9f: Merge change 25452 into eclair

Merge commit '56af9e9f9cbc3626acf55558d581efd2de3caa03' into eclair-plus-aosp

* commit '56af9e9f9cbc3626acf55558d581efd2de3caa03':
Modified the new stream video url.
56af9e9f9cbc3626acf55558d581efd2de3caa03 18-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25452 into eclair

* changes:
Modified the new stream video url.
d76ca9578feb15ec957dab17b9e360ef09b8c957 17-Sep-2009 Andreas Huber <andih@google.com> am b66fb498: am 3065a3ca: Merge change 25528 into eclair

Merge commit 'b66fb4988320b1b8ad79823713b3e0d8acb4d24f'

* commit 'b66fb4988320b1b8ad79823713b3e0d8acb4d24f':
Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
182d75ec0957c09257949d8b8bc4fe4182bf05d9 17-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 00e6beb6: am c82e65ae: Merge change 25228 into eclair

Merge commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1'

* commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
e910ef22586104ed09d372ffb2f6ca827198fa4c 17-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am e525eef4: merge from open-source master

Merge commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b'

* commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b':
Update comment in mediaplayer.h.
Update documentation for getVideoWidth and getVideoHeight.
Make Uri.parseUserPart, parseHost, and parsePort symmetric
Javadoc used startApplication() which doesnt exists, changed to createApplication()
b66fb4988320b1b8ad79823713b3e0d8acb4d24f 17-Sep-2009 Andreas Huber <andih@google.com> am 3065a3ca: Merge change 25528 into eclair

Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp

* commit '3065a3cad069b847165c99a38a251c072950d07f':
Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
3065a3cad069b847165c99a38a251c072950d07f 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25528 into eclair

* changes:
Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
1a77b68e90537047da8249b742fa062375b4ea4e 17-Sep-2009 Andreas Huber <andih@google.com> Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
ibstagefright/OMXCodec.cpp
8441c267dc0c919892a30ef6a20e09802f7a5f91 17-Sep-2009 Chih-Chung Chang <chihchung@google.com> am d5423a9f: am fc5f1026: Merge change 25291 into eclair

Merge commit 'd5423a9fc8c0caebdd29d1c673cf14725ad7205e'

* commit 'd5423a9fc8c0caebdd29d1c673cf14725ad7205e':
Try to fix sdk build again.
903c2cc47f6a65ab7bbe866e56393ace94ff7aa9 17-Sep-2009 Chih-Chung Chang <chihchung@google.com> am 8bc2495e: am de88c515: Merge change 25286 into eclair

Merge commit '8bc2495e5ee83d2815b3e7ed151271dae057db67'

* commit '8bc2495e5ee83d2815b3e7ed151271dae057db67':
Fix sdk build.
181a6ebed6da3c1c30caeab5ef11560e8405a2c4 17-Sep-2009 Andreas Huber <andih@google.com> am 51173401: am f7c3679f: Merge change 25158 into eclair

Merge commit '51173401f4742d92d46af602190a98372f10bda9'

* commit '51173401f4742d92d46af602190a98372f10bda9':
Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
696605ad77339b6323167c97be2b765e4f9326c6 17-Sep-2009 Chih-Chung Chang <chihchung@google.com> am 53a67366: am d3ba4811: Merge change 25272 into eclair

Merge commit '53a673661cebc93649532a716b19cc22497c5bb6'

* commit '53a673661cebc93649532a716b19cc22497c5bb6':
Make ExifInterface public.
09a11afd40c3f6f597b277e4261ed93fd07bbfbd 17-Sep-2009 Jean-Michel Trivi <jmtrivi@google.com> am 2edbd217: am b53eaac6: Merge change 25155 into eclair

Merge commit '2edbd217af15ce3e1e3632da1e679db5153111b8'

* commit '2edbd217af15ce3e1e3632da1e679db5153111b8':
Fix bug 2115258 where the AudioManager javadoc doesn't warn against
d52c5672856fb1905c628cdf1cab0edac39c3867 17-Sep-2009 Chih-Chung Chang <chihchung@google.com> am e1c64f8f: am ccd064d4: Merge change 25255 into eclair

Merge commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de'

* commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de':
Clean ExifInterface. Prepare to make it public.
3aea463e3dfd817a09a1969671e97297c4abaeb3 17-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 036033fc: am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration

Merge commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b'

* commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
00e6beb6ea58516cf2ff03c03a4e9e35998432d1 17-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am c82e65ae: Merge change 25228 into eclair

Merge commit 'c82e65aed57592d40009a9695f513ebf402e687c' into eclair-plus-aosp

* commit 'c82e65aed57592d40009a9695f513ebf402e687c':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
934d2d03f0ebd8957aa4d0461e039a74a7461ff5 17-Sep-2009 Andreas Huber <andih@google.com> am 39b3bb95: am 781a5dd5: Merge change 25142 into eclair

Merge commit '39b3bb95a7ab2488a6a07417b045ddfd36b5a950'

* commit '39b3bb95a7ab2488a6a07417b045ddfd36b5a950':
The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
dab775454b551c696c5967ac6c40d77067a13eb3 17-Sep-2009 Andreas Huber <andih@google.com> am ecbcbf32: am a4fe2aca: Merge change 25128 into eclair

Merge commit 'ecbcbf32b0e0231225ec8370002c72be7a94d085'

* commit 'ecbcbf32b0e0231225ec8370002c72be7a94d085':
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
c66fa908c4b8ccea9ad0251ac88394718a2c454c 17-Sep-2009 Andreas Huber <andih@google.com> am 1198aa27: am 0edada08: Merge change 25101 into eclair

Merge commit '1198aa27f1c1952199dac8b59a14ab76a8fde607'

* commit '1198aa27f1c1952199dac8b59a14ab76a8fde607':
Added an API IOMX::createRendererFromJavaSurface.
46a01f6303f57f8c7827cd4b60695dec7beba16f 17-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 44934f30: am 4d445d68: Merge change 24955 into eclair

Merge commit '44934f3042939decc61ab6335acbf111e3ca09d9'

* commit '44934f3042939decc61ab6335acbf111e3ca09d9':
new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
7b6add235702c1f30e85764aa16e14ab12ea3f15 17-Sep-2009 Andreas Huber <andih@google.com> am 1ff4cdad: am 0d558113: Merge change 24932 into eclair

Merge commit '1ff4cdadd5d704764bd6f822c42a2517b9b675b1'

* commit '1ff4cdadd5d704764bd6f822c42a2517b9b675b1':
Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
208ad8e4135a5aba9274ce157d6323fa190b4dbe 17-Sep-2009 Yu Shan Emily Lau <yslau@google.com> Modified the new stream video url.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
b88ce51f1bc00cb0320225f9221328bc7e433e19 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24674

* changes:
Implement OmxJpegImageDecoder.
c82e65aed57592d40009a9695f513ebf402e687c 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25228 into eclair

* changes:
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java Added the error callback to handle the media server crash.
e525eef4b8e284ac8eb023bd0df4eeed37916d4b 17-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
ea5f767246ad201a9e2bba0d657404e002cd7c70 17-Sep-2009 Jean-Baptiste Queru <jbq@google.com> Update documentation for getVideoWidth and getVideoHeight.

Ref: http://code.google.com/p/android/issues/detail?id=3024
ava/android/media/MediaPlayer.java
d5423a9fc8c0caebdd29d1c673cf14725ad7205e 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> am fc5f1026: Merge change 25291 into eclair

Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp

* commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70':
Try to fix sdk build again.
fc5f10265fd676c14554a3c85fb665dfed5efe70 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25291 into eclair

* changes:
Try to fix sdk build again.
8bc2495e5ee83d2815b3e7ed151271dae057db67 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> am de88c515: Merge change 25286 into eclair

Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp

* commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df':
Fix sdk build.
9081aec61fede12049fa9adbad41a0b35813ed64 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> Try to fix sdk build again.
ava/android/media/ExifInterface.java
de88c515ce3ba2ca15cfeff632ef80d01bfac4df 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25286 into eclair

* changes:
Fix sdk build.
7b886f9e8cc6e59643ead376a13c374a4d975568 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> Fix sdk build.
ava/android/media/ExifInterface.java
51173401f4742d92d46af602190a98372f10bda9 16-Sep-2009 Andreas Huber <andih@google.com> am f7c3679f: Merge change 25158 into eclair

Merge commit 'f7c3679f898cdcb208bc1675c79573e1d637083a' into eclair-plus-aosp

* commit 'f7c3679f898cdcb208bc1675c79573e1d637083a':
Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
f7c3679f898cdcb208bc1675c79573e1d637083a 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25158 into eclair

* changes:
Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
53a673661cebc93649532a716b19cc22497c5bb6 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> am d3ba4811: Merge change 25272 into eclair

Merge commit 'd3ba4811d48e01e85b4faa57da159471022e6daa' into eclair-plus-aosp

* commit 'd3ba4811d48e01e85b4faa57da159471022e6daa':
Make ExifInterface public.
d3ba4811d48e01e85b4faa57da159471022e6daa 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25272 into eclair

* changes:
Make ExifInterface public.
2edbd217af15ce3e1e3632da1e679db5153111b8 16-Sep-2009 Jean-Michel Trivi <jmtrivi@google.com> am b53eaac6: Merge change 25155 into eclair

Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp

* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
Fix bug 2115258 where the AudioManager javadoc doesn't warn against
b53eaac659f93ae41cac8963c58a12d38e33eac8 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25155 into eclair

* changes:
Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
017bb4ccf75375b359662932432cc61bd08fec24 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> Make ExifInterface public.
ava/android/media/ExifInterface.java
e1c64f8f14700c5ef090fbbc231b971b9cd6e8de 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> am ccd064d4: Merge change 25255 into eclair

Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp

* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
Clean ExifInterface. Prepare to make it public.
700beb484624a9a34649cb6ff088468e78b758ff 16-Sep-2009 Chih-Chung Chang <chihchung@google.com> Clean ExifInterface. Prepare to make it public.

Change-Id: Ibff719d02f525c1e8583d1892737224a0cc42c37
ava/android/media/ExifInterface.java
ava/android/media/MediaScanner.java
20a6b955fe4ea5ba4025f16ba2da013df176c035 16-Sep-2009 Yu Shan Emily Lau <yslau@google.com> modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
Added the error callback to handle the media server crash.

modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
036033fc6dcce36550f2d7fc9a0f64bc3b8d285b 16-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration

Merge commit '610e3595d250f78c857126cd08ef2a82ee650415' into eclair-plus-aosp

* commit '610e3595d250f78c857126cd08ef2a82ee650415':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
610e3595d250f78c857126cd08ef2a82ee650415 16-Sep-2009 Yu Shan Emily Lau <yslau@google.com> modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Fixed the meta data duration
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
39b3bb95a7ab2488a6a07417b045ddfd36b5a950 16-Sep-2009 Andreas Huber <andih@google.com> am 781a5dd5: Merge change 25142 into eclair

Merge commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715' into eclair-plus-aosp

* commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715':
The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
4f234579587ce2367153148d39e83244a808e2c8 16-Sep-2009 Andreas Huber <andih@google.com> Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
ibstagefright/omx/SoftwareRenderer.cpp
fccb25d2074358c54d4c60eb321aeaa08a5de59a 16-Sep-2009 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 2115258 where the AudioManager javadoc doesn't warn against
misuse of some of the methods that should only be used to implement
the Settings and Phone apps, and the audio service.
ava/android/media/AudioManager.java
0446b826177bd484e2fd6b814cb65f7de40c3b68 16-Sep-2009 Andreas Huber <andih@google.com> The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.

If they aren't, a later call to OMX_FreeBuffer crashes...
ibstagefright/OMXCodec.cpp
ecbcbf32b0e0231225ec8370002c72be7a94d085 15-Sep-2009 Andreas Huber <andih@google.com> am a4fe2aca: Merge change 25128 into eclair

Merge commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp

* commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379':
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
1198aa27f1c1952199dac8b59a14ab76a8fde607 15-Sep-2009 Andreas Huber <andih@google.com> am 0edada08: Merge change 25101 into eclair

Merge commit '0edada085e175e81b6d38a48b5b022917b410a98' into eclair-plus-aosp

* commit '0edada085e175e81b6d38a48b5b022917b410a98':
Added an API IOMX::createRendererFromJavaSurface.
a4fe2aca527ee45ddde6ace2316cad27dd487379 15-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25128 into eclair

* changes:
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
0edada085e175e81b6d38a48b5b022917b410a98 15-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25101 into eclair

* changes:
Added an API IOMX::createRendererFromJavaSurface.
c966a3c255652ba30a7b457663c874da24e7fb6e 15-Sep-2009 Andreas Huber <andih@google.com> Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
ibstagefright/omx/OMX.cpp
ibstagefright/omx/SoftwareRenderer.cpp
44934f3042939decc61ab6335acbf111e3ca09d9 15-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 4d445d68: Merge change 24955 into eclair

Merge commit '4d445d682e6380b26fbe5cd06cb0ca4c532739e7' into eclair-plus-aosp

* commit '4d445d682e6380b26fbe5cd06cb0ca4c532739e7':
new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
4d445d682e6380b26fbe5cd06cb0ca4c532739e7 15-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24955 into eclair

* changes:
new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.
9f9afef3d5da3be6812192e60797b1c035445c3c 15-Sep-2009 Andreas Huber <andih@google.com> Added an API IOMX::createRendererFromJavaSurface.

This api allows to instantiate a renderer by specifying the hosting java Surface object. This hides the implementation details of (java-)Surface, (native-)Surface and friends.
ibmedia/Android.mk
ibmedia/IOMX.cpp
ibmediaplayerservice/Android.mk
ibstagefright/Android.mk
ibstagefright/omx/Android.mk
4b6f4942fcef3300b407d9a07a680c07b162333f 01-Sep-2009 Wei-Ta Chen <weita@google.com> Implement OmxJpegImageDecoder.

Add StreamSource, which wraps a SkStream to a DataSource.
Add SkOmxPixelRef, which holds a MediaBuffer.
Test OmxJpegImageDecoder by a Jpeg decoder bench.
ests/omxjpegdecoder/Android.mk
ests/omxjpegdecoder/SkOmxPixelRef.cpp
ests/omxjpegdecoder/SkOmxPixelRef.h
ests/omxjpegdecoder/StreamSource.cpp
ests/omxjpegdecoder/StreamSource.h
ests/omxjpegdecoder/jpeg_decoder_bench.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.cpp
ests/omxjpegdecoder/omx_jpeg_decoder.h
1619367ab823150fa8856d419abe02ceb75886f1 15-Sep-2009 Yu Shan Emily Lau <yslau@google.com> new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.

new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
1ff4cdadd5d704764bd6f822c42a2517b9b675b1 15-Sep-2009 Andreas Huber <andih@google.com> am 0d558113: Merge change 24932 into eclair

Merge commit '0d5581133285cef4d7582b531e0bf09cee86aa90' into eclair-plus-aosp

* commit '0d5581133285cef4d7582b531e0bf09cee86aa90':
Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
92022857fbfb47941e50522151f123751e7fc4cb 15-Sep-2009 Andreas Huber <andih@google.com> Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
ibstagefright/OMXCodec.cpp
5962166750355c36efb9f209fcff33edf837186c 14-Sep-2009 Andreas Huber <andih@google.com> am 714ec136: Merge change 24742 into eclair

Merge commit '714ec1360cde8b1cbf6e6b8572256e4100f11560' into eclair-plus-aosp

* commit '714ec1360cde8b1cbf6e6b8572256e4100f11560':
Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
714ec1360cde8b1cbf6e6b8572256e4100f11560 14-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24742 into eclair

* changes:
Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
6fc35e3e7e6c61f2f7f5176d6979ae860f471e83 14-Sep-2009 Eric Laurent <elaurent@google.com> am 91e2d865: Merge change 24337 into eclair

Merge commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430' into eclair-plus-aosp

* commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430':
Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
91e2d8651fe38a921b37a8bf8b3148c572cf9430 14-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24337 into eclair

* changes:
Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
f23eb2839a0e10b71f38f003e97d568dea476dbc 12-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am 9a7efa45: Merge change 24789 into eclair

Merge commit '9a7efa452909b7a4f12840c44291c51a699acade' into eclair-plus-aosp

* commit '9a7efa452909b7a4f12840c44291c51a699acade':
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
147a0c270b5a6078218496b17df9eab70b358b67 12-Sep-2009 Yu Shan Emily Lau <yslau@google.com> modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
Fix the m4a1 duration and the also fix the random_seek time error in the stress test.

modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
2dc64d80e3c395ca3ff06ce45e08f5fceae92874 11-Sep-2009 Andreas Huber <andih@google.com> Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
ibstagefright/OMXCodec.cpp
2d1c327eb91073881cd6b902d7209d4938e2bd5f 11-Sep-2009 Andreas Huber <andih@google.com> am e1a9de7a: Merge change 24702 into eclair

Merge commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d' into eclair-plus-aosp

* commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
2aa39c45072537739873ae6d0d79264fc5fb7349 11-Sep-2009 Andreas Huber <andih@google.com> Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/Android.mk
348816109a33e082bf8a95af5cb46496f3a394b6 11-Sep-2009 Andreas Huber <andih@google.com> am 6026a514: Move JPEGSource.{cpp,h} into libstagefright.

Merge commit '6026a514248f0c603d0e8c4a3f542abab3fa1509' into eclair-plus-aosp

* commit '6026a514248f0c603d0e8c4a3f542abab3fa1509':
Move JPEGSource.{cpp,h} into libstagefright.
6026a514248f0c603d0e8c4a3f542abab3fa1509 11-Sep-2009 Andreas Huber <andih@google.com> Move JPEGSource.{cpp,h} into libstagefright.
ibstagefright/Android.mk
ibstagefright/JPEGSource.cpp
e7eb85cae02375b8bc486d71f429ca0c60980d79 11-Sep-2009 Nick Pelly <npelly@google.com> am 005b228c: API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.

Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp

* commit '005b228cdfb369d9b3b325884c0337ba5968bf8c':
API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
005b228cdfb369d9b3b325884c0337ba5968bf8c 10-Sep-2009 Nick Pelly <npelly@google.com> API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.

This is a large batch, and covers:

-- Bluetooth Device Discovery --
BluetoothAdapter.ACTION_DISCOVERY_STARTED
BluetoothAdapter.ACTION_DISCOVERY_FINISHED
BluetoothAdapter.startDiscovery()
BluetoothAdapter.cancelDiscovery()
BluetoothAdapter.isDiscovering()

-- Bluetooth bonding (pairing) --
BluetoothAdapter.getBondedDevices()
BluetoothDevice.ACTION_BOND_STATE_CHANGED
BluetoothDevice.EXTRA_BOND_STATE
BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE
BluetoothDevice.BOND_NONE
BluetoothDevice.BOND_BONDING
BluetoothDevice.BOND_BONDED
BluetoothDevice.getBondState()
BluetoothDevice.createBond()
BluetoothDevice.cancelBondProcess()
BluetoothDevice.removeBond()

-- BluetoothClass --
BluetoothDevice.ACTION_CLASS_CHANGED
BluetoothDevice.EXTRA_CLASS
BluetoothDevice.getBluetoothClass()
BluetoothClass.Service.*
BluetoothClass.Device.Major.*
BluetoothClass.Device.*
BluetoothClass.getDeviceClass()
BluetoothClass.getMajorDeviceClass()
BluetoothClass.hasService()

-- Misc BluetoothDevice --
BluetoothDevice.ACTION_ACL_CONNECTED
BluetoothDevice.ACTION_ACL_DISCONNECTED_REQUESTED
BluetoothDevice.ACTION_ACL_DISCONNECTED
BluetoothDevice.ACTION_DISCOVERED
BluetoothDevice.ACTION_NAME_CHANGED
BluetoothDevice.EXTRA_DEVICE
BluetoothDevice.EXTRA_NAME
BluetoothDevice.EXTRA_RSSI

-- Misc BluetoothAdapter --
BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED
BluetoothAdapter.EXTRA_LOCAL_NAME
BluetoothAdapter.checkBluetoothAddress()

I deprecated BluetoothIntent and moved each intent into the class it relates
to.

Change-Id: I877b1280428ab46278b2bc25668bb44cda22dc36
ava/android/media/AudioService.java
52646559afa672dc261c02067771501bdfb77783 11-Sep-2009 Andreas Huber <andih@google.com> am c06307cc: Merge change 24583 into eclair

Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp

* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
e6c409632f773e41f33188272a0072be9fcb783f 10-Sep-2009 Andreas Huber <andih@google.com> Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
ibstagefright/AMRExtractor.cpp
ibstagefright/Android.mk
ibstagefright/AudioPlayer.cpp
ibstagefright/CameraSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaDefs.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/ShoutcastSource.cpp
0cb94317d7460dadd4032a3596b27c9d03184941 10-Sep-2009 Andreas Huber <andih@google.com> am d9ca6a79: Merge change 24530 into eclair

Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp

* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
Add component name to informational logging in OMXCodec.cpp
e087373d0b29c29bbb734d6dfb4d6259c68cf6d0 10-Sep-2009 Andreas Huber <andih@google.com> Add component name to informational logging in OMXCodec.cpp
ibstagefright/OMXCodec.cpp
6f208f448c49792e1dae6b9866b2e812e48b3945 10-Sep-2009 Andreas Huber <andih@google.com> am 466dbbfd: Merge change 24450 into eclair

Merge commit '466dbbfd4595d714127a4bc92dd9235807b88be6' into eclair-plus-aosp

* commit '466dbbfd4595d714127a4bc92dd9235807b88be6':
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
26c131006c01a6034e75f7ebcc6f517ad9d1007a 10-Sep-2009 Andreas Huber <andih@google.com> am 546f3cd5: Merge change 24448 into eclair

Merge commit '546f3cd579b80299307d82a769aca8e8f68484ec' into eclair-plus-aosp

* commit '546f3cd579b80299307d82a769aca8e8f68484ec':
Support for amr-wb tracks in MPEG4Extractor.
b71e9b4e03f23d262f1ab665873f15e1a51e2a11 10-Sep-2009 Andreas Huber <andih@google.com> am 18ed7601: Merge change 24447 into eclair

Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp

* commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993':
Added some more verbose output for AMR formats. Properly fill out the output format.
466dbbfd4595d714127a4bc92dd9235807b88be6 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24450 into eclair

* changes:
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
546f3cd579b80299307d82a769aca8e8f68484ec 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24448 into eclair

* changes:
Support for amr-wb tracks in MPEG4Extractor.
18ed7601d2b5d9c3e1c610fb77499900f0c74993 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24447 into eclair

* changes:
Added some more verbose output for AMR formats. Properly fill out the output format.
c6f6253ad2095b7d23735ed484706630a080ea8f 10-Sep-2009 Eric Laurent <elaurent@google.com> am f63e3f3c: Merge change 24512 into eclair

Merge commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79' into eclair-plus-aosp

* commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79':
Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
dc1d17a1dbfc2ae01c20012133a836b62f5b6930 10-Sep-2009 Eric Laurent <elaurent@google.com> Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.

Add audio permission checks in setSpeakerphoneOn() and setBluetoothScoOn() methods.
ava/android/media/AudioService.java
033e6c3a680cd42fb05738c87a8c514bb7e4963d 10-Sep-2009 Andreas Huber <andih@google.com> Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
ibstagefright/MPEG4Writer.cpp
2a651177be1d29e8b4bdc84c84060514b15350f0 10-Sep-2009 Andreas Huber <andih@google.com> Support for amr-wb tracks in MPEG4Extractor.
ibstagefright/MPEG4Extractor.cpp
7ae02c885594e91ec4cc279a4144bb6fd1fbe5de 10-Sep-2009 Andreas Huber <andih@google.com> Added some more verbose output for AMR formats. Properly fill out the output format.
ibstagefright/OMXCodec.cpp
7ff0d9a60ab6af7025eb283d01158f0fd4736173 09-Sep-2009 James Stokebrand <stokebrand@pv.com> am 16b72bbb: Merge change 24391 into eclair

Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp

* commit '16b72bbbc985cba7c59f52bf6969b4015f185830':
RIO-7461: Update media scanner to scan AAC files.
16b72bbbc985cba7c59f52bf6969b4015f185830 09-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24391 into eclair

* changes:
RIO-7461: Update media scanner to scan AAC files. (Change in frameworks/base git)
e180af0335b9423bd7c0d764ac3819bd4ee88d37 09-Sep-2009 Andreas Huber <andih@google.com> am 201511cf: Calculate proper output buffer size for some more 16-bit RGB color spaces.

Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp

* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
Calculate proper output buffer size for some more 16-bit RGB color spaces.
13a26677816cf2b66b34eab2cedb0cdfe541a17c 09-Sep-2009 Andreas Huber <andih@google.com> am 5a65a6e2: Added a .amr file extractor (for AMR-NB and AMR-WB content).

Merge commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c' into eclair-plus-aosp

* commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c':
Added a .amr file extractor (for AMR-NB and AMR-WB content).
201511cf8a004d386ec9f592041ad3e3d4107184 08-Sep-2009 Andreas Huber <andih@google.com> Calculate proper output buffer size for some more 16-bit RGB color spaces.
ibstagefright/OMXCodec.cpp
a79da2e9b4b57ca72aa9634f80a7a975b9d7a877 09-Sep-2009 James Stokebrand <stokebrand@pv.com> RIO-7461: Update media scanner to scan AAC files.
(Change in frameworks/base git)
ava/android/media/MediaScanner.java
5a65a6e22017e51ebcebb0f41510c54f1085f82c 09-Sep-2009 Andreas Huber <andih@google.com> Added a .amr file extractor (for AMR-NB and AMR-WB content).
ibstagefright/AMRExtractor.cpp
ibstagefright/Android.mk
ibstagefright/DataSource.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/OMXCodec.cpp
022ed17cddb0bfb47e587e9b0db93f7b342d2b65 09-Sep-2009 Andreas Huber <andih@google.com> am 4e60d7e6: Merge change 24179 into eclair

Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp

* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
Support encoding amr-wb content in stagefright.
4e60d7e60b29c42c6745dd23ff90dced8834fa7c 09-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24179 into eclair

* changes:
Support encoding amr-wb content in stagefright.
8a77a995c961c7c9a3888f4212f7be87d08afae1 09-Sep-2009 Eric Laurent <elaurent@google.com> Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.

AudioFlinger: verify that mCblk is not null before using it in Track and RecordTrack contructors.
IAudioFlinger: check result of remote transaction before reading IAudioTrack and IAudioRecord.
IAudioTrack and IAudioRecord: check result of remote transaction before reading IMemory.
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
d3a31996e6ef915bc25ff67f1f35274447a14862 09-Sep-2009 Eric Laurent <elaurent@google.com> am db603b0b: Merge change 24114 into eclair

Merge commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d' into eclair-plus-aosp

* commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d':
Fix issue 1992233: DTMF tones on Sholes is really long.
96c08a69ea0b95d1d8a8edb67f73bd9548e09f16 07-Sep-2009 Eric Laurent <elaurent@google.com> Fix issue 1992233: DTMF tones on Sholes is really long.

Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
ava/android/media/ToneGenerator.java
ibmedia/ToneGenerator.cpp
ec00bcbe544c342a6de892a7d5427acfe7579a1a 09-Sep-2009 Yu Shan Emily Lau <yslau@google.com> am bde54df0: modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the incorrect expected druation

Merge commit 'bde54df0209e6b3db720b14f5c7b8bd6e6372757' into eclair-plus-aosp

* commit 'bde54df0209e6b3db720b14f5c7b8bd6e6372757':
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
bde54df0209e6b3db720b14f5c7b8bd6e6372757 09-Sep-2009 Yu Shan Emily Lau <yslau@google.com> modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Fixed the incorrect expected druation
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
04cae64ed10454c549f19b22560459f36861d0c6 08-Sep-2009 Andreas Huber <andih@google.com> am e0f64aae: Merge change 24178 into eclair

Merge commit 'e0f64aae8c02088be1c67bd97afc495e9098561c' into eclair-plus-aosp

* commit 'e0f64aae8c02088be1c67bd97afc495e9098561c':
The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
366f2e61fe78488f1a01187cbdb2e1a8e776777c 08-Sep-2009 James Dong <jdong@google.com> am e05e02e1: Merge change 24094 into eclair

Merge commit 'e05e02e17463616c885784a1f0e57eeb22b13f93' into eclair-plus-aosp

* commit 'e05e02e17463616c885784a1f0e57eeb22b13f93':
Add basic metadata retrieval support for midi, ogg, etc.
e0f64aae8c02088be1c67bd97afc495e9098561c 08-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24178 into eclair

* changes:
The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
ee606e66b0c1bc3527ecaffbbe95486d2ff5009e 08-Sep-2009 Andreas Huber <andih@google.com> Support encoding amr-wb content in stagefright.
ibstagefright/OMXCodec.cpp
a7d0cf490a81ba2fc75b50fbf53b1fabcf6bb631 04-Sep-2009 Andreas Huber <andih@google.com> The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
ibstagefright/OMXCodec.cpp
392ff3b5296e0cee8d5db386d2ef72e2719890c8 06-Sep-2009 James Dong <jdong@google.com> Add basic metadata retrieval support for midi, ogg, etc.
Bug 2050320
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MidiMetadataRetriever.cpp
ibmediaplayerservice/MidiMetadataRetriever.h
ibmediaplayerservice/VorbisMetadataRetriever.cpp
ibmediaplayerservice/VorbisMetadataRetriever.h
be8e36e32b9cb2bb37e28e4c0d414ee0e46c84a2 04-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
5e5288410702ea426c401be19e9221f63532cfe8 03-Sep-2009 Marco Nelissen <marcone@google.com> am e1da8be5: Merge change 23835 into eclair

Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp

* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
When encountering a .nomedia file, notify the MediaScannerClient,
e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23835 into eclair

* changes:
When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
8b0466170082fdf12f78d7b70358002520e99e9b 03-Sep-2009 Marco Nelissen <marcone@google.com> When encountering a .nomedia file, notify the MediaScannerClient,
so that it can erase the data column for entries that are in the
folder containing the .nomedia file. This prevents us from
deleting (via a delete trigger) files when somebody adds a
.nomedia file after the fact.
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerClient.java
ni/android_media_MediaScanner.cpp
461cb5613c692f734e2fe9b005d21c5a2f3e8203 03-Sep-2009 Andreas Huber <andih@google.com> am f6190284: Merge change 23715 into eclair

Merge commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b' into eclair-plus-aosp

* commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b':
Setting the component role appears to be mandatory now for all mime types.
ca963369c7791436f650b6463b68cd3269ef4a15 03-Sep-2009 Andreas Huber <andih@google.com> am 8e65337d: Merge change 23714 into eclair

Merge commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8' into eclair-plus-aosp

* commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8':
Some work to make audio encoding work.
f619028470b63ba1c8e9d86fd2faab7bbece873b 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23715 into eclair

* changes:
Setting the component role appears to be mandatory now for all mime types.
8e65337d06a1cc4fe896d17a947d46ae5f7257a8 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23714 into eclair

* changes:
Some work to make audio encoding work.
7838887af4e63a1d31d98a9c4d31e1c40dabe297 03-Sep-2009 Eric Laurent <elaurent@google.com> am cabd01f4: Merge change 23798 into eclair

Merge commit 'cabd01f42afd0661d6a29217c62353c2eae3149a' into eclair-plus-aosp

* commit 'cabd01f42afd0661d6a29217c62353c2eae3149a':
Fix issue 2097083: STREAM_SYSTEM should be at max volume.
9d85d5adf90e7363304e2d4a22d60a2114bb7ab9 03-Sep-2009 Eric Laurent <elaurent@google.com> Fix issue 2097083: STREAM_SYSTEM should be at max volume.

Changed default volume for STREAM_SYSTEM and STREAM_SYSTEM_ENFORCED to the maximum value.
ava/android/media/AudioManager.java
4c48342572503c7a92e5634ef8db3f1f9e541256 03-Sep-2009 Andreas Huber <andih@google.com> Setting the component role appears to be mandatory now for all mime types.

Also using CODEC_LOGV instead of vanilla LOGV to include the component name the message related to.
ibstagefright/OMXCodec.cpp
da050cf206afff082f2a3693a8103a5df67df397 02-Sep-2009 Andreas Huber <andih@google.com> Some work to make audio encoding work.
ibstagefright/OMXCodec.cpp
30a85367eae2754039a5b4560032ae9c20574610 02-Sep-2009 Andreas Huber <andih@google.com> am 040571aa: Merge change 23632 into eclair

Merge commit '040571aa2f71031376ff37ffa827d3612eb89340' into eclair-plus-aosp

* commit '040571aa2f71031376ff37ffa827d3612eb89340':
Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
040571aa2f71031376ff37ffa827d3612eb89340 02-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23632 into eclair

* changes:
Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
56aa70f7f214f529b22d5bd8ed1679da87cab8cb 02-Sep-2009 Andreas Huber <andih@google.com> am 854bcb95: Merge change 23539 into eclair

Merge commit '854bcb95ce5d8d75b843e8da1b691fa93395977c' into eclair-plus-aosp

* commit '854bcb95ce5d8d75b843e8da1b691fa93395977c':
Squashed commit of the following:
7272f7f9aa61f330c0e74706a28b4fc47af3cda7 02-Sep-2009 Andreas Huber <andih@google.com> Increase buffer allocated to receive HTTP response, YouTube is rather verbose...

Yes, I know, fixed buffers are bad.
ibstagefright/HTTPStream.cpp
43ad6eaf7710e21d4d0df373103c3d99137d4ecc 02-Sep-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit c45bfbb97ccd05982008df47181f9c73abaf0497
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:58:12 2009 -0700

This quirk should not be enabled by default in order to make the bug reproducible by the vendor.

commit 21d72e80e795fcae53d9c3bcc8ba6312b081e420
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:55:45 2009 -0700

Undoing the hack to temporarily give up the lock to facilitate reading from the buffer source.

This simply causes too many issues, there need to be independent threads providing input buffers and dequeuing output buffers.

commit 84d507def8999c146ce124cc8edfe106c9ca70c2
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:16:23 2009 -0700

The AAC components appear to output stereo data even if the input data is mono...
ibstagefright/OMXCodec.cpp
85a2c7f1cad8fd55ed72a8a3dbb2b36632ebbff3 01-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
a7bdedabf447a559e0b914e4e5623f3af5ac8ef1 31-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 2081525: NPE in MediaScannerService.

Handle the case where the datetime string in jpeg exif is not in the format we expect.

Change-Id: I5462052c3dd723d01bce45f4924137632d081400
ava/android/media/ExifInterface.java
bf1071c07979b03a9f5e8281aba82ed05513185e 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23356 into eclair

* changes:
Temporarily unlock our mutex while fetching a buffer from the upstream source.
6db4aad623e1641785060450542737f3eacbb3de 01-Sep-2009 Andreas Huber <andih@google.com> Temporarily unlock our mutex while fetching a buffer from the upstream source.
ibstagefright/OMXCodec.cpp
52d6245ba2454eab456d609d065283dfa76e8c79 31-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22995 into eclair

* changes:
modified: res/layout/surface_view.xml modified: src/com/android/mediaframeworktest/MediaFrameworkTest.java modified: src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java Fixed the async mp3 playback test case and also switch the base activity to full screen.
d3b0d642c9f87acf586868139d4a54f43b2a71ad 28-Aug-2009 Yu Shan Emily Lau <yslau@google.com> modified: res/layout/surface_view.xml
modified: src/com/android/mediaframeworktest/MediaFrameworkTest.java
modified: src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Fixed the async mp3 playback test case and also switch the base activity to full screen.

modified: src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/res/layout/surface_view.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
72b1f379d5c97c8ff31d2201e78215af777d6bda 31-Aug-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ava/android/media/ExifInterface.java
ibdrm/mobile1/Android.mk
ibdrm/mobile1/include/objmng/drm_rights_manager.h
ibdrm/mobile1/src/objmng/drm_api.c
ibdrm/mobile1/src/objmng/drm_rights_manager.c
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
d06e5b877c67b8d9dcba94fdce5bb8f57dfb63d3 28-Aug-2009 Andreas Huber <andih@google.com> Fixes a race condition between entering ERROR state and initial buffer submit.
ibstagefright/OMXCodec.cpp
c035f7c79fda9474002d265175fc52692dbd78fe 28-Aug-2009 Daniel Sandler <dsandler@google.com> Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
ests/MediaFrameworkTest/res/drawable-hdpi/icon.png
ests/MediaFrameworkTest/res/drawable-mdpi/icon.png
ests/MediaFrameworkTest/res/drawable/icon.png
bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be 28-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22991 into eclair

* changes:
Apparently setting the preferred role of the OMX component is now required on this platform.
813a875286e8a1633d345b60c0f84bb0da87fc66 28-Aug-2009 Andreas Huber <andih@google.com> Apparently setting the preferred role of the OMX component is now required on this platform.
ibstagefright/OMXCodec.cpp
c1dccce74104c5ababb1118fda3ea43974adbad4 28-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22986 into eclair

* changes:
Squashed commit of the following:
329577aa6d422d1dbb33f4771fc5e2949b4ad312 27-Aug-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:48:54 2009 -0700

Getting rid of more code now obsolete with the departure of OMXDecoder.

commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:33:06 2009 -0700

Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.
ibstagefright/Android.mk
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXDecoder.cpp
3986afef0cf74b7519b1b25630b208e728a6ed5b 27-Aug-2009 Andreas Huber <andih@google.com> Fix a typo.
ibstagefright/SampleTable.cpp
bc86bda499b8600cc3dc900bba0e6421304c26dd 27-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22897 into eclair

* changes:
Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
e0daf8043fd4a9be995ff737d217b7b3514d4519 27-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22921 into eclair

* changes:
An attempt to fix a deadlock between OMXCodec::start and upstream ::read
6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7 27-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22870 into eclair

* changes:
Set Routing to A2DP only when state is Connected.
78333dd750c7353e47163407a662ef39a3c6b24a 27-Aug-2009 Jaikumar Ganesh <jaikumar@google.com> Set Routing to A2DP only when state is Connected.

We were setting the routing to A2DP when the state was Connecting too.
This was incorrect and can cause problems. One such problem was when
handling an incoming connection we set the routing to A2DP before
authorization. And even if authorization succeeds we get out sync with
AVDTP command state.
ava/android/media/AudioService.java
42978e55fe438ecdc1b0bac5bf31c2aadbd9e78d 27-Aug-2009 Andreas Huber <andih@google.com> An attempt to fix a deadlock between OMXCodec::start and upstream ::read
ibstagefright/OMXCodec.cpp
327c27be19ad333c4835c84397152a0b2cb33081 27-Aug-2009 Eric Laurent <elaurent@google.com> Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.

Add the possibility to delay routing and volume commands in AudioPolicyClientInterface. The delay is not blocking for the caller.
ibmedia/AudioSystem.cpp
127fcdcd9f76ca717713ae59dc625a706daa6573 27-Aug-2009 Andreas Huber <andih@google.com> Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
ibstagefright/OMXCodec.cpp
b5ceb9ee21f37ae0817c16490c1fc148dd3eb5e2 26-Aug-2009 Andreas Huber <andih@google.com> assert => CHECK in stagefright.
ibstagefright/AudioPlayer.cpp
ibstagefright/CachingDataSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/FileSource.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/MediaBufferGroup.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/MetaData.cpp
ibstagefright/MmapSource.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OMXDecoder.cpp
ibstagefright/SampleTable.cpp
ibstagefright/ShoutcastSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/QComHardwareRenderer.cpp
ibstagefright/omx/SoftwareRenderer.cpp
d7795892a551643dfd884f884170cb51f70edf92 26-Aug-2009 Andreas Huber <andih@google.com> Disregard the EOS buffer flag while flushing or shutting down the decoder.
ibstagefright/OMXCodec.cpp
446f44f61afd406e19760cd9cc5ad3a10fa11cbf 26-Aug-2009 Andreas Huber <andih@google.com> Keep up with latest changes to overlay handling on that unnamable platform.
ibstagefright/OMXCodec.cpp
ibstagefright/omx/Android.mk
ibstagefright/omx/TIHardwareRenderer.cpp
6ee9952bc20be72b9419cb653c9e2e833889a3d3 25-Aug-2009 Eric Laurent <elaurent@google.com> Fix issue 2076322: AudioService, too many stream volume steps.

MAX_STREAM_VOLUME[] now contains the maximum valid index instead of the number of indexes for all stream types.
ava/android/media/AudioService.java
f96d49a277af9ec888bb7d15988b57989ccb39af 25-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22646 into eclair

* changes:
Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
404cc418be3eeaef93729fab51a0124ed65e1adc 25-Aug-2009 Andreas Huber <andih@google.com> Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
ibstagefright/OMXCodec.cpp
523018f1828884e96b1265f3e347410280577945 25-Aug-2009 Yu Shan Emily Lau <yslau@google.com> am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"

Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair

* commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8':
Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
b56de7474d93e634f77be58a794fbd1b0e68f6a8 25-Aug-2009 Yu Shan Emily Lau <yslau@google.com> Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"

This reverts commit 051d8d6692a4f8d852f6336d1e31a3a907913ac7.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
e1a7ad23e0cefefc1e5c762a3d88179971077dcc 25-Aug-2009 Dianne Hackborn <hackbod@google.com> Fix build.

Change-Id: I7a21bc2151fb2a9a1135f676b563f40609bc997b
ava/android/media/MediaRecorder.java
4a51c20ce607c74914f90fd897f04080121ac13b 22-Aug-2009 Dianne Hackborn <hackbod@google.com> I am getting tired of the java doc warnings, so fix them.

Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
ava/android/media/AudioManager.java
ava/android/media/AudioSystem.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
6ab180aa65d2b4f155518af0ac7bb2777f9ce61f 13-Jun-2009 Kenny Root <kenny@the-b.org> Documentation: Clarify that a FileDescriptor must be seekable

In MediaPlayer, methods with an offset specified must be passed a
FileDescriptor that is seekable. This change notes that in the
JavaDoc.
ava/android/media/MediaPlayer.java
b91c52f77387a95b4ae554b369644e0f41e401ea 24-Aug-2009 Yu Shan Emily Lau <yslau@google.com> am 8c937a17: Merge change 22379 into donut

Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair

* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
051d8d6692a4f8d852f6336d1e31a3a907913ac7 22-Aug-2009 Yu Shan Emily Lau <yslau@google.com> modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.

modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
5c0a9133d2e8049f8952a190df91febf6b92064c 20-Aug-2009 Andreas Huber <andih@google.com> Dynamically allocate a pair of MemoryHeaps according buffer count/sizes required by the OMX component, respect JPEG compressed size.
ibstagefright/OMXCodec.cpp
a56d1c72190462aa9e377906583eceb58e0efcdd 19-Aug-2009 Nick Pelly <npelly@google.com> Fix AudioService on HFP power off due to new Bluetooth API.

HEADSET_STATE_CHANGED_ACTION contains a null BluetoothDevice when the HFP
disconnects.
ava/android/media/AudioService.java
ebf66ea2f8ae32cf0f0f19f0a4b1495edd1307a1 19-Aug-2009 Andreas Huber <andih@google.com> Better (proper) parsing of the AVCDecoderConfigurationRecord, respect hardware decoder profile/level limits.
ibstagefright/OMXCodec.cpp
4f5e602e1773a2990bb1f34f09875bd5cd057e5a 19-Aug-2009 Andreas Huber <andih@google.com> The PV AVC software decoder expects each fragment of a NAL unit to be handed to the decoder unframed.
ibstagefright/MPEG4Extractor.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OMXDecoder.cpp
1fd769ceea9a08c514765a7fb63c97c419a4a2c0 18-Aug-2009 Feng Qian <fqian@google.com> Fix missing -lpthread in linux-sim build.

It mimics the behavior in libstagefraight/Android.mk
ibstagefright/omx/Android.mk
bd022f423a33f0794bb53e5b0720da2d67e4631c 15-Aug-2009 Nick Pelly <npelly@google.com> Bluetooth: API change.

Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).

IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java

TODO:
Javadoc
ava/android/media/AudioService.java
2f10ae08d435b12e1798d93e0b90605717c66081 17-Aug-2009 Andreas Huber <andih@google.com> Support for marshalling pointers / intptr_t in Parcel.

Some refactoring to eliminate code duplication in Parcel implementation.
ibmedia/IOMX.cpp
be06d26cdc70070654f1eedcd08c1c68cd587ad6 14-Aug-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 5bb012f0065f7ffaaeb4f569d71f0e3a8d6b19c3
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 14 10:40:08 2009 -0700

An attempt at fixing export using the qcom encoders. More quirks.

commit 0690e76bfa48118a68287ccf1bbfa82febaa620c
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 14 09:08:28 2009 -0700

Callbacks are now dispatched from a separate thread in OMX.

commit c6571a039526df29b6343f9a1971dbc019088c61
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 13 15:42:25 2009 -0700

Massive API changes throughout stagefright, smart pointers everywhere.

commit 900612af6a0555664d9ba195112cd859491265f4
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 13 13:33:12 2009 -0700

OMXCodecs now properly shutdown.

commit 96732f05e1b0603dcd1b11f16a23512592eeb4f5
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 13 12:04:04 2009 -0700

More work on JPEG decoding using the hardware OMX component.

commit 63839a073ac393e3a130434ba467969053b694ad
Author: Andreas Huber <andih@google.com>
Date: Wed Aug 12 13:13:31 2009 -0700

An attempt to drive the JPEG decoder OMX node.

commit 3ac2fe5ab2926eda81b2123610b2434c645294ff
Author: Andreas Huber <andih@google.com>
Date: Tue Aug 11 16:38:21 2009 -0700

Renamed StateMachine to OMXCodec and put it in its proper place.

commit 247da75a96bf8881956413023dd49a84d5b4f5b2
Author: Andreas Huber <andih@google.com>
Date: Tue Aug 11 16:06:19 2009 -0700

Statemachine is now a full-fledged MediaSource.

commit 045244f6771fa0b9b329495c953afda900a84b71
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 7 09:16:54 2009 -0700

Properly setup the input format when exporting to AMR audio.

commit 271b984cb32c5cd9e46e3f90ae121f334e4b8da9
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 6 09:59:38 2009 -0700

Added some code to test audio encoding to the OMX harness.

commit 79af4748e4af33bd66d3fbac606e332a69741cf4
Author: Andreas Huber <andih@google.com>
Date: Wed Aug 5 14:36:22 2009 -0700

Merge the old OMXDecoder and the new, shiny, StateMachine code.

commit 91cf5dd77a8762bc10a0b2ffce35e3bbeb262231
Author: Andreas Huber <andih@google.com>
Date: Tue Aug 4 17:41:43 2009 -0700

A new harness to test OMX node compliance (and quirks).
ibmedia/IOMX.cpp
ibstagefright/Android.mk
ibstagefright/AudioPlayer.cpp
ibstagefright/CachingDataSource.cpp
ibstagefright/DataSource.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXCodec.cpp
ibstagefright/OMXDecoder.cpp
ibstagefright/SampleTable.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMX.h
099397cbd07c8c991f3126d0d0ac64bb6b3c0b47 17-Aug-2009 Chih-Chung Chang <chihchung@google.com> Fix 1860351: Put datetime in jpeg exif to datetaken field.
ava/android/media/ExifInterface.java
ava/android/media/MediaScanner.java
c9706f0262a2f399f95e0d78ba2b7616e08d0069 14-Aug-2009 Sahil Sachdeva <sahils@google.com> DO NOT MERGE, ALready merged to master.
1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaScanner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
5982013cfc8274ff0bafaba83c676b3a8890cba9 14-Aug-2009 Jared Suttles <jared.suttles@motorola.com> Change the number of volume steps from 6 to 7 per Verizon Requirements

Submitted on behalf of Helen Tran <Helen.Tran@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
e840928a3374250259ba296a091bb189b34d3448 12-Aug-2009 Mike Lockwood <lockwood@android.com> libdrm: "==" should be an assignment.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ibdrm/mobile2/src/util/domcore/NodeIterator.cpp
188f5a71061791906572de375c5efe26cadddbae 05-Aug-2009 Chia-chi Yeh <chiachi@android.com> DO NOT MERGE: cherry-pick: libdrm1: Use libcrypto instead of libaes.

It seems that libdrm1 was the only user of libaes.
Now libaes is no longer required and removing it saves 36 kilobytes.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ibdrm/mobile1/Android.mk
ibdrm/mobile1/include/objmng/drm_rights_manager.h
ibdrm/mobile1/src/objmng/drm_api.c
ibdrm/mobile1/src/objmng/drm_rights_manager.c
2ac8c279881a6a12f979f54954cab69c98ba9d98 12-Aug-2009 Wu-cheng Li <wuchengli@google.com> am cb2b2378: Merge change 20729 into donut

Merge commit 'cb2b2378c735e687c15e2af7f908c68ffae5fe90'

* commit 'cb2b2378c735e687c15e2af7f908c68ffae5fe90':
Fix the bug that EXIF attributes are always cached.
ac1e59d887651220f5367cc7fa4207b34eab774d 11-Aug-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ava/android/media/MediaScanner.java
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
c4e58c0f31c5044cfab0ffe80251df209844e9cc 11-Aug-2009 Eric Laurent <elaurent@google.com> Fix issue 2045983 ToneGenerator: fix void statement.

There is a void statement at line 917 of ToneGenerator.cpp: mState == TONE_IDLE;
This problem is harmless as in current code this execution path is never taken; it can only happen if a "new" operator fails in prepareWave() which is a case we usually consider as unlikely in android audio framework.
ibmedia/ToneGenerator.cpp
b826bf9182f4636ea891d1da156e26944b784ef7 11-Aug-2009 Wu-cheng Li <wuchengli@google.com> Fix the bug that EXIF attributes are always cached.

b2039501
ava/android/media/ExifInterface.java
ccf8b94169197875af6c89172015b9644919b064 07-Aug-2009 Andreas Huber <andih@google.com> Expose a variation of the createRenderer API that works on a plain Surface.
ibmedia/IOMX.cpp
ibstagefright/MediaPlayerImpl.cpp
e9ec12c47e83a082063aac467414558fb1aef7fb 07-Aug-2009 Andreas Huber <andih@google.com> Deprecate/remove now unused socketpair ipc communication in favour of exclusive binder use.
ibmedia/IOMX.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXDecoder.cpp
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMX.h
03a97462003a1df679144edeee921112d8925133 07-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20422

* changes:
Build the stagefright library by default.
0d596d4724c7da0719b0621648216f0906e774dd 07-Aug-2009 Andreas Huber <andih@google.com> Build the stagefright library by default.
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/Android.mk
ibstagefright/omx/Android.mk
d5603c126acdd94d9f7400bb1d04188020a425b4 06-Aug-2009 Eric Laurent <elaurent@google.com> AudioService now differentiates BT headsets and car kits.

The BT headset detection now makes the difference between car kits and headsets, which can be used by audio policy manager.
The headset connection is also detected earlier, that is when the headset is connected and not when the SCO socket is connected as it was the case before. This allows the audio policy manager to suspend A2DP output while ringing if a SCO headset is connected.
ava/android/media/AudioService.java
1420bf3ec6008d0823e76cc4f615f509af4e87ed 07-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9674

* changes:
Fix problem in AudioTrack with 8 bit PCM and direct output.
ddb78e7753be03937ad57ce7c3c842c52bdad65e 28-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 2001214: AudioFlinger and AudioPolicyService interfaces should not use pointers as handles to inputs and outputs.

Use integers instead of void* as input/output handles at IAudioFlinger and IAudioPolicyService interfaces.
AudioFlinger maintains an always increasing count of opened inputs or outputs as unique ID.
ibmedia/AudioSystem.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IAudioPolicyService.cpp
6874e3df0e3f6d6db6b474e73426f286db9ec6a8 07-Aug-2009 Yu Shan Emily Lau <yslau@google.com> am 3397f169: Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops.

Merge commit '3397f16949d2e86442c32f3b82d5ee3ace99ba82'

* commit '3397f16949d2e86442c32f3b82d5ee3ace99ba82':
Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops.
3397f16949d2e86442c32f3b82d5ee3ace99ba82 07-Aug-2009 Yu Shan Emily Lau <yslau@google.com> Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
6e1584ccd39b6e453f7bd43a169fafb6466974f9 07-Aug-2009 Andreas Huber <andih@google.com> The mp3 decoder now correctly uses microseconds to measure time. One less quirk.
ibstagefright/OMXDecoder.cpp
64e69e8ab8f63c0bba14d1e17c0e9595487fc0dc 05-Aug-2009 Chia-chi Yeh <chiachi@android.com> libdrm1: Use libcrypto instead of libaes.

It seems that libdrm1 was the only user of libaes.
Now libaes is no longer required and removing it saves 36 kilobytes.
ibdrm/mobile1/Android.mk
ibdrm/mobile1/include/objmng/drm_rights_manager.h
ibdrm/mobile1/src/objmng/drm_api.c
ibdrm/mobile1/src/objmng/drm_rights_manager.c
859c37548f4ed1d466b7edc6a01e579b6b55039f 05-Aug-2009 Yu Shan Emily Lau <yslau@google.com> am bd014e07: Remove the memory capture in the first run and make it the same as the cupcake test case.

Merge commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e'

* commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e':
Remove the memory capture in the first run and make it the same as the cupcake test case.
bd014e07e2e95d4ac706c6863e2587bd96daa51e 05-Aug-2009 Yu Shan Emily Lau <yslau@google.com> Remove the memory capture in the first run and make it the same as the cupcake test case.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ea03f4af10512521ad68f28dae7a2dea131dddbc 04-Aug-2009 Andreas Huber <andih@google.com> Recording/Export to .mp4/h.263 somewhat works on TI hardware.
ibstagefright/MPEG4Writer.cpp
ibstagefright/OMXDecoder.cpp
28ad42b58cf9043c5503672714c09a05b798a081 04-Aug-2009 Eric Laurent <elaurent@google.com> Fix problem in AudioTrack with 8 bit PCM and direct output.

Do not perform 8 to 16 bit conversion in AudioTrack write() and processAudioBuffer() if direct output flag is set.
ibmedia/AudioTrack.cpp
5192dda143bd58143aedbf25d37ff48020038193 03-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9517

* changes:
We don't need libopencore_author and libcutils in libmedia_jni
831fbc1c2050ea844a825be3be897347f95bcbad 03-Aug-2009 Marco Nelissen <marcone@google.com> We don't need libopencore_author and libcutils in libmedia_jni
ni/Android.mk
20b153bffc57711534c0f581258e06fa86afd67a 03-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> am 5fd26775: Merge change 9390 into donut

Merge commit '5fd26775bdd14b15058521c82e34b562e0c1e327'

* commit '5fd26775bdd14b15058521c82e34b562e0c1e327':
Name unknown albums after the folder they're in, similar to how songs
4935d05eaa306cef88cf0ab13eca386f270409ec 03-Aug-2009 Marco Nelissen <marcone@google.com> Untangle MediaPlayer, MediaRecorder, MediaScanner and MediaMetadataRetriever JNI
code, so that creating one of those doesn't initialize all the others. Shaves
a hundred milliseconds or so off music app startup time.
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/MediaScanner.java
ni/android_media_AmrInputStream.cpp
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/android_media_ResampleInputStream.cpp
0391107e13e1e6388a3175399d15b246d726b88f 03-Aug-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
5c1207be90fdf296c1b83034b7c68915e1749284 01-Aug-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ava/android/media/JetPlayer.java
ni/soundpool/SoundPool.cpp
c3c08ba5d67d836274fabdf4c1bff6f1053d95a3 01-Aug-2009 Marco Nelissen <marcone@google.com> Name unknown albums after the folder they're in, similar to how songs
with no title metadata are named after the file. Only files that are
in the root of the card will still belong to the "Unknown Album"
ava/android/media/MediaScanner.java
1de13168a9d9f55464dc98748ea28ef785f1048e 31-Jul-2009 Andreas Huber <andih@google.com> The IOMX interface now instantiates IOMXRenderers to hide the details of hardware accelerated blitting.
ibmedia/IOMX.cpp
ibstagefright/Android.mk
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/OMXDecoder.cpp
ibstagefright/QComHardwareRenderer.cpp
ibstagefright/SoftwareRenderer.cpp
ibstagefright/SurfaceRenderer.cpp
ibstagefright/TIHardwareRenderer.cpp
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMX.h
ibstagefright/omx/OMXRenderer.h
ibstagefright/omx/QComHardwareRenderer.cpp
ibstagefright/omx/SoftwareRenderer.cpp
ibstagefright/omx/TIHardwareRenderer.cpp
1b0efec3473134fb7de226f3e1fdade5b3529ad9 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 17c195c8: Merge change 9340 into donut

Merge commit '17c195c8da3470b2e69880e206342f0c2d85f938'

* commit '17c195c8da3470b2e69880e206342f0c2d85f938':
Fix issue 2025872: Deadlock in SoundPool.stop
17c195c8da3470b2e69880e206342f0c2d85f938 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9340 into donut

* changes:
Fix issue 2025872: Deadlock in SoundPool.stop
ed9584068144adedfdd6d119e2f928da595a1953 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am dccfaefd: Merge change 9285 into donut

Merge commit 'dccfaefd681a3895f6d4f9eedd106be817e1555d'

* commit 'dccfaefd681a3895f6d4f9eedd106be817e1555d':
Clear singleton reference during JetPlayer.release()
fd8c0e1ff8ef781ba169c0164458ec1ce95ee35c 31-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 2025872: Deadlock in SoundPool.stop

There were 2 problems in SoundPool:

1 If not using the shared memory buffer mode, there was a problem when a sound channel was stolen. The new channel could sometimes not be added to the restart
list if the AudioTrack callback thread was stopped before the underrun callback was called.

The SoundChannel::play() method is modified so that SoundPool::done() is called immediately after stopping the channel. There is a possibility that done() is called a second time by the callback; in this case it will be added 2 times to the restart list but the second start request will be ignored as the first one will have reset the next chennel ID when processed.

2 There was a deadlock on SoundPool::mLock if SoundPool::stop() was called while a channel restart was pending:
SoundPool::stop() lock mLock -> SoundChannel::stop() -> SoundPool::done() -> SoundPool::addToRestartList() -> try to lock mLock == deadlock

A second mutex mRestartLock is added to protect the restart list mRestart. mLock is still used to protect mChannels list but mRestart is now used to
protect access to mRestart by restart thread and client thread.
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
176e650931b7b03680c233368b92752f4ff3d25b 31-Jul-2009 Phil Dubach <phillipd@google.com> Clear singleton reference during JetPlayer.release()

Only one JetPlayer instance is supported at a time. A singleton reference is
created and returned in JetPlayer.getInstance(). When calling release() on the
instance, the corresponding native player is finalized. Therefore, release()
must also clear the singleton reference, so that any subsequent call to
getInstance() re-initializes the native player.
ava/android/media/JetPlayer.java
cbe7c5441c9af004dae93cff09787e21771beda8 30-Jul-2009 James Dong <jdong@google.com> Remove hardcoded maximum frame rate limit from the framework
bug 1993400
ni/android_media_MediaRecorder.cpp
61e4248f8f6ae8a8f40550cc0800e5190cd1dc09 29-Jul-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
a8675f67e33bc7337d148358783b0fd138b501ff 29-Jul-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/ExifInterface.java
ava/android/media/IAudioService.aidl
ava/android/media/MediaScanner.java
ibmedia/ToneGenerator.cpp
dutils/sdutil.cpp
c42ac9d4d03f62c3a1ba197a28a81fda44bd8b7f 29-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 2019031: Volume changes have no effect.

Send initStreamVolume() for each stream when media server restarts.
Also added restoring of phone state, device connection state and forced device for communications.
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
e406906e16bf31bdd0064b8d47df5b177e8e8550 29-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8878

* changes:
Support for selection of silent ringtone from the ringtone picker. This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
69f593ccb7414ee98991b1da1a4bfbd9951e3570 28-Jul-2009 Marco Nelissen <marcone@google.com> Support for selection of silent ringtone from the ringtone picker.
This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
ava/android/media/RingtoneManager.java
970764d14b663324df2a4324a890988a606c14a1 28-Jul-2009 Andreas Huber <andih@google.com> While other OMX nodes appear to now have switched to using microseconds to timestamp buffers, at least the TI AAC and MP3 decoders still use milliseconds.
ibstagefright/OMXDecoder.cpp
8a432776d003247c12222d8dd6a30ea4621aa2d0 28-Jul-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 374ea382ee3a9e3ce17e4c6357fc40d02e362810
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 28 09:54:13 2009 -0700

PV's OMX implementation now uses (spec-compliant) microseconds instead of milliseconds in buffer timestamps.

commit 8d02f8ab5d7b022ad4ad34db2a9bdeea6ce2acfe
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 27 14:24:26 2009 -0700

Support for using an overlay for video playback on TI hardware.

Appears to be currently constrained to CbYCrY 16-bit colorspace.

commit d17f321cb4b15c1fea378f33a7ef5998f23dd0fc
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 27 09:45:38 2009 -0700

Added '--audio-only' commandline option to stagefright tool.

commit d8beef6be5c668c46451446d87e622933371cd75
Author: Andreas Huber <andih@google.com>
Date: Fri Jul 24 13:35:00 2009 -0700

Generalize the various workarounds for OMX nodes with their own unique interpretation of the spec.

commit c7dfd53eeadf8ed5a39bf2b19b014dcd62f3324d
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 23 16:06:36 2009 -0700

Fixed erroneous TI AAC decoder behaviour wrt shutdown.

The AAC decoder appears to not return out buffers on an Executing->Idle transition, implemented a workaround that does a flush on all ports followed by the Executing->Idle. Oh, and flush with OMX_ALL doesn't properly work either. Fun.

commit d6377282e75060881336578f166f9c7feacf3f8f
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 23 14:06:50 2009 -0700

Apparently the "channels" parameter in AudioTrack's constructor no longer counts channels but is a bitmask of enabled destinations, update the code accordingly.

commit ff698c79e851a2e57d362e9c3a09828af4048087
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 16:54:44 2009 -0700

Fix MPEG4 decoding using TI's hardware decoder that I broke earlier...

commit 2ef78bb87cd856eb7f0b3d7dd68782a8650c12bf
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 15:43:18 2009 -0700

Now that the qcom decoder properly advertises its own custom colorspace, update dependent code to reflect this fact.

commit bbaec96910727080fd7c8a6907c04facb9f5220f
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 14:32:03 2009 -0700

Finishing up previous, incomplete change.

commit 76f14a1ae816b6f434771f8d12bdad81196f351e
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 14:25:17 2009 -0700

The TI video decoder now properly decoder AVC/H.264 content.

commit e106130d8c100d5c94603e43864a7a93cca10252
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 22 08:56:04 2009 -0700

Experimental support for the TI H.264 decoder, various modifications to OMXDecoder, non-functional still.

commit 241c3062dec3447db1a1ee74558cb4b9098fc404
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 21 12:13:09 2009 -0700

Enable TI hardware OMX decoders (except for AVC/H.264 which still has issues).

This particular set of OMX nodes does not appear to properly return our buffers when sending the "disable" command on a port. Rather it reqires manually flushing that port and _then_ disabling it instead.

commit 1c34506a46e32ce25f2a86f3b4250dcfc037356a
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 21 08:51:35 2009 -0700

Make it simpler to switch between the stagefright player and PVPlayer.

commit 249c6de05671d403f8dd51f095d49bf190430c9c
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 20 14:38:15 2009 -0700

Prepare to use soon-to-be-available hardware decoders in the OMX decoder.
ibmediaplayerservice/MediaPlayerService.cpp
ibstagefright/Android.mk
ibstagefright/AudioPlayer.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/OMXDecoder.cpp
ibstagefright/TIHardwareRenderer.cpp
3026a023b8979b7ddcb3fe97bbc45531c89fda92 27-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 2001517: AudioTrack compatibility issue.

Modified enum values in AudioFormat.java and AudioSystem.h.
Added code for backward compatibility in AudioTrack.java and AudioRecord.java.
ava/android/media/AudioFormat.java
ava/android/media/AudioRecord.java
ava/android/media/AudioTrack.java
d25ae67ca8f003ada2881154514523d8614d4b7e 27-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 2004738: Settings Backup Agent consistently throws ArrayIndexOutOfBoundsException during restore.

Use stream alias when accessing VOLUME_SETTINGS array.
ava/android/media/AudioService.java
2af1b3db3d4f687d008db74b150f149e956b4bc6 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge korg/donut into korg/master
974ff946d114610ec41172fb6076d9d8810c3680 27-Jun-2009 Ravi K Yenduri <yenduri@pv.com> Add support for .aac and .asf extensions.
ava/android/media/MediaFile.java
a553c25b33c99b345cf1c8688f8df0ed8df14e5a 17-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1795088 Improve audio routing code

Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
ava/android/media/AudioFormat.java
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/AudioTrack.java
ava/android/media/IAudioService.aidl
ava/android/media/JetPlayer.java
ava/android/media/ToneGenerator.java
ni/soundpool/SoundPool.cpp
ibmedia/Android.mk
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IAudioPolicyService.cpp
ibmedia/JetPlayer.cpp
ibmedia/ToneGenerator.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ediaserver/main_mediaserver.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
bc7269278042e448299c2e80e4dbb16fed05791d 21-Jul-2009 niko <niko@google.com> Added native metadata support.

Metadata.java:
Fixed typo 8k != 8092. The comment was correct though.

In Metadata.h, the new Metadata class is declared in the ns android::media
to limit the chances of conflict with other packages.

The MetadataType in MediaPlayerInterface is gone and moved to Metadata as
an inner typedef.

Similarly the SortedVector<MetadataType> instance have been replace by a
new type Metadata::Filter.

All the keys declared in the java counterpart are also in Metadata.h.

Metadata.cpp:
Contains the implementation of the native metadata packing.

There an associated change in the opencore package that should go in
at the same time as this one.
ava/android/media/Metadata.java
ibmedia/Android.mk
ibmedia/Metadata.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibmediaplayerservice/TestPlayerStub.h
ibmediaplayerservice/VorbisPlayer.h
ests/players/invoke_mock_media_player.cpp
c7bebd15378d98104e6cd32666665fd60eaa8043 22-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 5f2b05ea: Merge change 8220 into donut

Merge commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09'

* commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09':
Fix issue 1996218: Disable use of shared memory buffer by SoundPool.
45fce58ca1f8d967bdca574e79837ae2fcfed741 22-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1996218: Disable use of shared memory buffer by SoundPool.

Disabled USE_SHARED_MEM_BUFFER compilation switch in SoundPool.cpp.
ni/soundpool/SoundPool.cpp
cf4550c3198d6b3d92cdc52707fe70d7cc0caa9f 21-Jul-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioTrack.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/MediaScanner.java
ava/android/media/RingtoneManager.java
ava/android/media/ToneGenerator.java
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/soundpool/SoundPool.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/VorbisPlayer.cpp
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/res/raw/testmidi.mid
ests/MediaFrameworkTest/res/raw/testmp3.mp3
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
6fa41bbb56e0756d3eac15d6314007e4a450c9d3 20-Jul-2009 niko <niko@google.com> Minor cleanup in Metadata.java

Use a constant to express the size of a 32bits int.

In MediaPlayerMetadataParserTest, removed unused kTocken constant.
ava/android/media/Metadata.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java
c39173be3237be9f39d2b57bb38249126e183c53 20-Jul-2009 niko <niko@google.com> Fixed a bug in the parser.

When we parse the metadata we check that there is enough data in the parcel by checking
the byte availables and the size in the header.
Since the size is in the header has been read, we should make sure than dataAvailable() >= size - 4

This bug was hidden by some test code which has been removed.
ava/android/media/Metadata.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java
80b3ab3f2be40e2f996cef7bc3ec4652b5e1857d 20-Jul-2009 Andreas Huber <andih@google.com> Fixing the build: StagefrightPlayer now implements the newly introduced "getMetadata" pure virtual.
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
3e664221b6271cdc403656100187ff2420e1a107 20-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7747

* changes:
Added 3 metadata types for pause/seek forward/seek backward.
b8b117e1e7fffdeb245afd673068924b038d08d6 20-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am a8d5644b: Merge change 7726 into donut

Merge commit 'a8d5644b548263d68e2c9bfff58958b29c3525ff'

* commit 'a8d5644b548263d68e2c9bfff58958b29c3525ff':
Fix issue 1985479 lots of backup NPEs.
a8d5644b548263d68e2c9bfff58958b29c3525ff 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7726 into donut

* changes:
Fix issue 1985479 lots of backup NPEs.
ab6ee15f8cd2f34aa5e3f1d84dbd910ce7f49ddd 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 474b0f29: Merge change 7686 into donut

Merge commit '474b0f2941430b97b4f24f16f7173e5249ccc8f2'

* commit '474b0f2941430b97b4f24f16f7173e5249ccc8f2':
MediaScanner: Add check for null object in empty title handling code.
716383a686b086f68533a51785ba77186359ce6b 17-Jul-2009 Nicolas Catania <niko@google.com> Added 3 metadata types for pause/seek forward/seek backward.
ava/android/media/Metadata.java
cf541ee11669cbf9f429a5d1cb6f8bbc41e1ba57 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7617

* changes:
Added method to get metadata out of the player.
fd6e4820c6ee91c9c232a7598c1e45c002b868e7 17-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1985479 lots of backup NPEs.

Check that stream type is not STREAM_BLUETOOTH_SCO before writting to settings.
ava/android/media/AudioService.java
da3785ae9f165c2bced1f90e94f428a98c6e6ce7 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7624

* changes:
Impl. of the metadata getters.
8994837f27e783a10f5cc038a7ae7595aabffdb6 17-Jul-2009 niko <niko@google.com> Added method to get metadata out of the player.

The method passes a list of metadata ids to be retrieved and
a parcel where the metadata records should be appended.

If the list of ids is empty, all the metadata should be returned.
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/TestPlayerStub.h
ibmediaplayerservice/VorbisPlayer.h
ests/players/invoke_mock_media_player.cpp
f211c095f2b1e2e9e8efc05236b7871d5cfe9b12 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7701

* changes:
Clean up MP3Extractor code and fixes a bug that miscalculated the position of the header by a few bytes whenever we read in more data.
2e337a4e4b5d36228619d426255f7aa500b5b4ac 17-Jul-2009 Andreas Huber <andih@google.com> Clean up MP3Extractor code and fixes a bug that miscalculated the position of the header by a few bytes whenever we read in more data.
ibstagefright/MP3Extractor.cpp
84c024601295a266be4a4200aa46bf8b3a63de6e 17-Jul-2009 Andreas Huber <andih@google.com> stagefright: initialize more of the OMX_BUFFERHEADERTYPE structure as they are apparently not cleared by the OMX implementation.
ibstagefright/omx/OMX.cpp
bdc0e82f9c075edb67da4a2583e557824c280415 17-Jul-2009 Mike Lockwood <lockwood@android.com> MediaScanner: Add check for null object in empty title handling code.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/MediaScanner.java
9e1bd09c15f1fe391856ed53ff352b27f5017628 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 97a67cc2: Merge change 7544 into donut

Merge commit '97a67cc281805566d429d4ca6570348fcf6dabd9'

* commit '97a67cc281805566d429d4ca6570348fcf6dabd9':
sdutil: Up the mount/unmount wait times to account for disk check + reaper time
cb2e00eedce99b30faf5f238136a00bc5448c5f2 16-Jul-2009 Nicolas Catania <niko@google.com> Impl. of the metadata getters.

In Metadata, implemented the method that unmarshall the data from
a metadata parcel an return java entities.

Add 2 new types of metadata (Boolean and Date) and fixed an issue
in TimedText: the w3c standard specify a duration as well as the
time to be played => added a duration field.

In MetadataParserTest.java:
Moved the util private methods at the bottom of the file.
Added new tests for the getters (GETTERS section)
ava/android/media/Metadata.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java
97a67cc281805566d429d4ca6570348fcf6dabd9 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7544 into donut

* changes:
sdutil: Up the mount/unmount wait times to account for disk check + reaper time
5b3f4578452647d867305dd7f7ccfec761a51b84 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 58d19d1f: Merge change 7581 into donut

Merge commit '58d19d1f6321161fdcd10140fe7b9d9053f80bd2'

* commit '58d19d1f6321161fdcd10140fe7b9d9053f80bd2':
Fix bug that would cause files with blank title tags to not be shown in the music app.
3a3ba057821947e030311a2377f29c7611d9723b 17-Jul-2009 Marco Nelissen <marcone@google.com> Another fix for building libstagefright for the simulator, plus whitespace adjustments.
ibstagefright/Android.mk
7013c8bb9ef94b6016c2b915e8d2369e2475aac6 17-Jul-2009 Marco Nelissen <marcone@google.com> Fixes to make libstagefright build for the simulator.
ibstagefright/TimeSource.cpp
ibstagefright/TimedEventQueue.cpp
55973f1aade915824d2fa7ccab039bcd01a9a80a 16-Jul-2009 Marco Nelissen <marcone@google.com> Fix bug that would cause files with blank title tags to not be shown in the music app.
ava/android/media/MediaScanner.java
52e4ad89ad145fccfd3b17f49ed795aa61fda0a8 16-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7399

* changes:
Partial implementation of the parsing of Parcel into Metadata.
8f5fcab05f1d6f644a9c30f012b8ff302f24a118 13-Jul-2009 Nicolas Catania <niko@google.com> New test player stub to load mock native players.

Added a new class TestPlayerStub that takes a magic url in the setDataSource call.
Based on the value of the url, the stub is going to load a DL and create the concrete
player used during the test.
After these initialization steps TestPlayerStub is just a wrapper.

Added a new functional test MediaPlayerInvokeTest to demonstrate how a new
mock player to test the invoke method can be loaded.

Added a new mock player for the invoke test: invoke_mock_media_player.cpp.
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/TestPlayerStub.cpp
ibmediaplayerservice/TestPlayerStub.h
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java
ests/players/Android.mk
ests/players/README
ests/players/invoke_mock_media_player.cpp
9b0a5e57db8d3b701919d64d26269a9fa656e3be 16-Jul-2009 San Mehat <san@google.com> sdutil: Up the mount/unmount wait times to account for disk check + reaper time

Signed-off-by: San Mehat <san@google.com>
dutils/sdutil.cpp
e46b7be812d68e49710b34048662cbf18e2a6550 15-Jul-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit 8d179995654c19d9094e51989dc84ed0deba6e04
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 14 16:30:40 2009 -0700

Protect stagefright code with BUILD_WITH_STAGEFRIGHT build-define.

commit 99b41acb58c34e8f024c30c833a09fd7b31c4e1f
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 14 14:06:00 2009 -0700

OMX::list_nodes API, stagefright --list now lists all available OMX components.

commit 94a74c5b24aae6d7e446fff83d62ae3a57dc351b
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 13 16:04:29 2009 -0700

Reenabled "record" commandline application to test encoding, support for h263 codec specific data when writing to .mp4.

commit d363dd74f611577567c66d25900d6264c306468c
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 13 10:59:58 2009 -0700

Make non-socket communication in IOMX the default.

commit e89fc82c4fd138c88339887baf72f1d0e67f8660
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 13 10:32:33 2009 -0700

The OMX interface now optionally supports communication through the binder only (no sockets involved)

commit 28611de11223fba65299787cdd33f7fdbd6a60a3
Author: Andreas Huber <andih@google.com>
Date: Fri Jul 10 15:09:13 2009 -0700

Split off the logic to render to a Surface (not ISurface!) into SurfaceRender.{cpp,h}

commit c0cfa885faaeb17d3fc5436f6447b61708bd6fe1
Author: Andreas Huber <andih@google.com>
Date: Fri Jul 10 12:21:46 2009 -0700

Fix display dimensions vs. decoded dimensions display issues, unfortunately breaks software rendering a bit...

commit ae209a2b5d09caed5dd383c910f238926aaa8fc6
Author: Andreas Huber <andih@google.com>
Date: Fri Jul 10 09:33:29 2009 -0700

Simple video decoder performance test in "stagefright" commandline tool.

commit 59fe7840111d6f46dd3c48f4950146aed962dbd2
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 9 16:05:12 2009 -0700

StagefrightPlayer: Properly publish video dimensions by notifying the listener.

commit 51b6598f0e47be5e12d77f1d14e111e71c593638
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 9 11:38:15 2009 -0700

MediaPlayerInterface::AudioSink now supports the specification of a callback for pull-based audio.

commit 31ce53375d748da3e7d30e993ce89dae97fd65ea
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 8 17:23:37 2009 -0700

Proper support for pushing audio to a specified AudioSink interface. Still not bulletproof: video falls behind frequently.

commit a23e312b10631a5d47f5c9831205beac6b84ab36
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 8 15:10:13 2009 -0700

IGenesisPlayer and friends are no more, java interface now uses local playback instead
of playing inside the media server process.

commit 42ee5c06ab5ba1c16f50472b0b26a0526635c73c
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 8 13:17:03 2009 -0700

MP3 extractor now supports seeking (only fixed bitrate files currently supported)

commit 96a790405763bfa738d1c6845c99a9fdf579b66f
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 7 10:53:54 2009 -0700

Keeping up-to-date with new master-gl changes, removing CameraSource for now, removing unnecessary commandline utilities from the build.

commit 6c9dcb7c628c0347154dd7f37913a3a5f04deb99
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 6 16:40:02 2009 -0700

Finally take advantage of the fact that the Qcom OMX decoders already place the output buffers into memory accessible by the hardware yuv converter and avoid extra allocations and memcpys in that case. Split of the render logic into subclasses of VideoRenderer.

commit e8d46e81cffc15ffb0bdf03f511e4a4497ca7621
Author: Andreas Huber <andih@google.com>
Date: Mon Jul 6 12:18:29 2009 -0700

Added a few more cases of valid MPEG4 files to the sniffer, fixed end of stream notifications in MPEG4 files.

commit 88bffc5ed4033a607080f8777a1c0ec9e3e079de
Author: Andreas Huber <andih@google.com>
Date: Thu Jul 2 12:25:03 2009 -0700

MediaPlayerImpl now properly pauses/resumes instead of tearing down the decoder chains and starting back up from the beginning.

commit 732aa0a87c7e8d8a10776b275712649954962414
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 1 14:58:56 2009 -0700

Remove pthread_mutex_* and pthread_cond_* in favour of Mutex and Condition.

commit 669e5944b2fe0542a3b8dba0c441a94503e99fb0
Author: Andreas Huber <andih@google.com>
Date: Wed Jul 1 14:43:02 2009 -0700

Proper support for end-of-stream signalling of MediaSources.

commit afb038f2dc594c742e554b2d42b86ffc7434e3fc
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 30 16:48:03 2009 -0700

Support for the "sniffing" of datasources to determine their probable mime type (along with confidence). Slightly refactored the MP3Extractor to share common code with the sniffer.

commit ed3644b8bd56807e1db4b32433a93a2467f1f3c5
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 26 13:27:52 2009 -0700

I don't think prepare should automatically start the player.

commit 11eb9b49dc4a0819d366682817cba68613f4fe12
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 26 11:09:22 2009 -0700

Somewhat better timing information implemented in the MP3Extractor.

commit cab023a1751735c0ed26c8493498a91d8644c6c9
Author: Andreas Huber <andih@google.com>
Date: Thu Jun 25 15:41:56 2009 -0700

Initial checkin for support of mp3 content, extraction and playback. Media extractors now abstracted in MediaExtractor baseclass.

commit 40f4146bb3c647e56690dd9b0fa3ffdea60030dc
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 24 10:41:12 2009 -0700

Make sure we only allocate surface buffers if there is video to be played.

commit 7f85e7d92fe81740e102e09905b19354f4ac178e
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 24 10:19:32 2009 -0700

Clean up a failed merge and implement stub for new API in MediaPlayerBase.

commit f0e9d494a4c03402ea7b54891848ca5a50c421b2
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 12 15:38:03 2009 -0700

Support yuv420->rgb565 conversion if hardware color conversion is unavailable.

commit 87223248b3099cd5261b94169f84cfd1eba56a8f
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 12 09:35:56 2009 -0700

Remove unimplemented and currently unnecessary blocking option from MediaSource::ReadOptions.

commit e07e651f0325892b797f3eb64dbeca0f317afdfd
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 10 16:26:42 2009 -0700

Enable assertions in HTTPDataSource.

commit 0dc97adebea1721156880f4b3d5c70f8d50c53b2
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 10 12:34:39 2009 -0700

delete foo.

commit 7f05845dda496e7defee284d32509d127e785784
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 10 12:34:08 2009 -0700

added foo.

commit e432970c51eeec4e5d549bdb3e2d3e48ffb4f0e7
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 10 11:44:31 2009 -0700

Make sure to initialize all fields in _all_ constructors... Use a Mutex instead of the raw pthread_mutex_t.

commit d6286a6bbca639952491448fa3e609b775a8a814
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 9 17:11:49 2009 -0700

send_command is now implemented twice... ugly hack to get both shutdown working correctly and startup as well... playback now "works" on the emulator, too.

commit 8d657e004677a7c5dae4479e8519bcaa94c18aad
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 9 11:58:55 2009 -0700

Instead of erasing codec specific data once it's been output to the omx node, retain the data and just rewind after a stop.

commit 279fede6ba35cbc37c35616c53406bf2c9720202
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 9 10:58:11 2009 -0700

Various fixes related to play/pause. Decoder now properly frees OMXMediaBuffers, made MemoryDealer destructor protected instead of public to prevent accidental stack-allocation of MemoryDealer objects.

commit 0f717f15a6328efd3f34082929cd8ad2351095a9
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 9 08:44:12 2009 -0700

Make sure to rewind codec specific data on OMXDecoder::stop and reset AudioPlayer's notion of time mapping.

commit 0cfb63e33270daf9b215214608ab383f93a31823
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 8 14:25:48 2009 -0700

Massive rename.

commit 30ed8f476c4431a5275538958b3e281bd17d5eab
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 8 13:52:41 2009 -0700

send_command and fill/empty buffer commands must be executed in sequence, send_command is now dispatched over the socket instead of through the binder interface to ensure this.

commit b832d04011b2dd8a9632eb7e575bfe1addd1270d
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 8 10:21:17 2009 -0700

MediaBuffers can now be "clone()", they sit on top of the same data but have their own range and metadata. Once a clone's refcount drops to 0 it decrements the refcount on the original buffer.

commit 4e944672808bdf1ed40a69f3f602f93ebf7b4049
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 8 10:01:01 2009 -0700

Split MediaBuffer.h into MediaBufferGroup.h and MediaBuffer.h, same with their respective source files.

commit ddb7529b4de4828db51432bd405fddd76cfa3b6a
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 5 16:30:25 2009 -0700

More fudging with A/V sync...

commit 1e5a4d8df08237b58c06c6527a33152ae931addf
Author: Andreas Huber <andih@google.com>
Date: Fri Jun 5 11:54:20 2009 -0700

API cleanup of MediaSource. Got rid of MediaRing as it really doesn't serve a purpose if OMX decoders are used.

commit 0953c65232aa9753d17d2e25c5f5526eb810cf13
Author: Andreas Huber <andih@google.com>
Date: Thu Jun 4 16:59:19 2009 -0700

Experimental TimedEventQueue and an attempt at a cleaner player implementation using it, OMXDecoder is now a little less verbose.

commit 2085b8ea9484a21fa11f94194a27405d413aeecc
Author: Andreas Huber <andih@google.com>
Date: Thu Jun 4 10:17:01 2009 -0700

Properly bail out of the AV sync loop if the MediaPlayerImpl is stopped.

commit 471f143458a8a0d93cb1bf9568c63c3967279dc6
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 3 17:32:27 2009 -0700

Now this is much better AV sync, defer seeking the audio source until we know where the video source synced to.

commit 4010d371dbe62ce4971e13437776cba32cb0bb3d
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 3 16:01:07 2009 -0700

Tweaked some of the heuristics in AV sync, OMXDecoder is now a little less verbose, seek to a sync sample at or _after_ the requested position.

commit f3d4af1d5a4ac31fa02271b000f6c7ec593f0da9
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 3 15:33:58 2009 -0700

Change the TimeSource interface's APIs, prefer microseconds over milliseconds now, changed the way MediaPlayerImpl does AV sync.

commit 08bb46fa61d12e852a424698ddb0c90700328f6e
Author: Andreas Huber <andih@google.com>
Date: Wed Jun 3 11:57:24 2009 -0700

Using framework's Mutex and Condition classes instead of pthread functions, much saner locking in OMXDecoder.

commit 4d77b4e09e59bbf8c1af009ae7dc62b10af52fd6
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 2 17:12:03 2009 -0700

MediaSources now publish their format.

commit 7e429a26c57bf936e1a08035d2d11839f9f00310
Author: Andreas Huber <andih@google.com>
Date: Tue Jun 2 16:38:29 2009 -0700

MetaData is now implemented in terms of KeyedVector, MetaData is now reference counted.

commit 0fa957aa5c9bcb6ec122ed7b5b97430039be6797
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 1 14:39:55 2009 -0700

Sync sample seek support.

commit 78a5f090d02e7e6e1a146b29bdb7771eecaa2f86
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 1 13:51:11 2009 -0700

Distinguish shutdown from port-flush since one requires buffers to be freed and the other one doesn't. Fixes a problem with seek.

commit e57781d3b2c985a74cd8b60e7c8f2d576459d038
Author: Andreas Huber <andih@google.com>
Date: Mon Jun 1 10:52:20 2009 -0700

First shot at support for seeking a MediaSource. Sync frames are not properly handled yet.

commit 0551cd78fda78bf66877fb26c5a55e5ae23d8367
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 16:23:38 2009 -0700

Preliminary support for camera input.

commit f8ebafa65d10d5a06944de6b2e2992a33121b857
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 12:13:47 2009 -0700

Allow NativeMediaPlayer access to Surface's getISurface() method.

commit b1a9fb36eeccd9f49d28c1c64b31fccbd6506eeb
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 11:38:25 2009 -0700

Header files are now in their own genesis2 hierarchy below frameworks/base/include.

commit f49b8b234b8f6ce83148787eef540dd920f04aa6
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 11:22:03 2009 -0700

moved MPEG4Writer into libgenesis2.

commit 5224254919dac4728677335ea60429fa16f518b4
Author: Andreas Huber <andih@google.com>
Date: Thu May 28 11:13:38 2009 -0700

Everything now lives in the android namespace, integrated errors with android errors, renamed MediaPlayer to MediaPlayerImpl.

commit f9a9d84f7e0465ef5d1938a068655ba39527cf99
Author: Andreas Huber <andih@google.com>
Date: Wed May 27 16:43:11 2009 -0700

Support for getPosition() and getDuration().

commit 3206cc5140bcbc88be039f8d94b954af63e69752
Author: Andreas Huber <andih@google.com>
Date: Wed May 27 15:37:45 2009 -0700

Support for {MediaPlayer, GenesisPlayer, Genesis2Player}::isPlaying()

commit 9f41b248e0dfce71bbc50f883750cec52ebfd1fe
Author: Andreas Huber <andih@google.com>
Date: Wed May 27 13:49:50 2009 -0700

Proper disconnection from the OMX service.

commit cdcf47a2c31599109ee42277c7fa14af3c600091
Author: Andreas Huber <andih@google.com>
Date: Tue May 26 17:27:06 2009 -0700

New player type for the genesis player in libmediaplayerservice. Playing video through an ISurface now.

commit 0586af20ac9ae0403dd190bafd290b0f90549723
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 15:53:19 2009 -0700

Fix a buffer overflow error by adding padding in case we need to de-frame AVC data.

commit eac62fff6ad2ffb7b75c0d4a1b9620d33e93fb9b
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 13:35:30 2009 -0700

Support for http URIs in MediaPlayer, compensate for AudioTrack latency.

commit a7db456e3173d94d6b5e457547e2a6a5f7a8e1cc
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 11:33:25 2009 -0700

Support for URIs in MediaPlayer class, support for shoutcast streams in MediaPlayer, force shutdown of OMX nodes if they don't shutdown cleanly within a second.

commit 1f0268f4f14ad5215668f34e06a420850174d665
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 08:33:16 2009 -0700

and foo.txt is gone again.

commit 0feca4e0919f345704d78ec78894bac5027bd5ed
Author: Andreas Huber <andih@dhcp-172-19-27-148.mtv.corp.google.com>
Date: Fri May 22 08:28:49 2009 -0700

added foo.txt

commit 9c7d04b35cdc895a2de3602dc46522f608bd205f
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 08:28:04 2009 -0700

delete foo again

commit fec3ca1720992cce51b9a92b86b945da88a6b16c
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 08:27:45 2009 -0700

weird

commit 30a6571302333146e537e537a3a8986245cca87c
Author: Andreas Huber <andih@dhcp-172-19-27-148.mtv.corp.google.com>
Date: Fri May 22 08:18:55 2009 -0700

reverse test

commit dea3d99dd0fe9386e8a3c51954d9d0fe2be09d38
Author: Andreas Huber <andih@google.com>
Date: Fri May 22 08:18:22 2009 -0700

test

commit a9eeafec6e46072cac41e54ebdbd153cb7ae7518
Author: Andreas Huber <andih@google.com>
Date: Thu May 21 16:37:50 2009 -0700

Use the video ring again for now.

commit e05ff3d3c1c4f89ef499a2b172138a775fd694e3
Author: Andreas Huber <andih@google.com>
Date: Thu May 21 15:42:19 2009 -0700

Export to .mp4 now works for MPEG4 video content. Fixed a bug in the sample table wrt co64 chunks.

commit 5c44c540374a4e50c4e8aaab2b7a34aed6e1391e
Author: Andreas Huber <andih@google.com>
Date: Thu May 21 09:56:11 2009 -0700

Fix the build, all binder-related headers have moved and there's a new library libbinde
r to link against now.

commit 23e0a24404d16c898c2c6b3c7495ad303844bc71
Author: Andreas Huber <andih@google.com>
Date: Thu May 21 08:42:04 2009 -0700

Initial checkin of MPEG4Writer, a class to export media sources into an mpeg4 file. MPEG4/AVC metadata (efss & friends) not currently working.

commit 9cd77adb1ac194197364ffad00a0d7215f458e1a
Author: Andreas Huber <andih@google.com>
Date: Wed May 20 12:31:45 2009 -0700

New shell command to test recording/encoding. Various changes to OMXDecoder to support encoding properly. Now each OMXDecoder needs a dedicated thread on the client side since onEvent responses could block which would cause deadlocks if a node depends on the output of another node for example.

commit 5c510fb55ffed7ec25305999ed9b6c1eec48d503
Author: Andreas Huber <andih@google.com>
Date: Mon May 18 15:40:06 2009 -0700

Make media decoding the default in the genesis2 commandline app instead of shoutcast playback.

commit f6c7a2040b8eb43326621f12c3a936e09b3a70e3
Author: Andreas Huber <andih@google.com>
Date: Mon May 18 11:03:04 2009 -0700

The king is dead, long live the kind... Replaced old OMX binder interface with new OMX binder interface/socket hybrid.

commit 0d4955eb5df9bfafb576d22f2ed572644d6d69ac
Author: Andreas Huber <andih@google.com>
Date: Thu May 14 12:39:34 2009 -0700

dynamic negotiation of NAL framing with the MPEG4Source, removed stale code from genesis2 commandline tool. Enable support form PV H264 software decoder.

commit 380369f54a8027cbc9349305184d6bf527a24efe
Author: Andreas Huber <andih@google.com>
Date: Wed May 13 17:32:00 2009 -0700

Explore the option of running everything inside the mediaserver process by encapsulating the player in an IGenesisPlayer binder interface.

commit b5cada56b9089a23e0c461352a97dc71e08b424d
Author: Andreas Huber <andih@google.com>
Date: Wed May 13 12:11:06 2009 -0700

Introduction of TimeSource class, clean shutdown of OMX Nodes.

commit 89f6e582e605dcb2149eb67f73fe9345d4b9be2e
Author: Andreas Huber <andih@google.com>
Date: Tue May 12 17:11:56 2009 -0700

Helper classes MediaRing and MediaPlayer.

commit 9aaed8739b4bb941473da367fb88f63224d2f1b7
Author: Andreas Huber <andih@google.com>
Date: Tue May 12 14:19:18 2009 -0700

Using mmap to map a file instead of going through FILE* improves performance, who knew?

commit ad097a78bbd002c59193ffdc39b64935928426c7
Author: Andreas Huber <andih@google.com>
Date: Mon May 11 16:42:42 2009 -0700

Added a performance test, refactored AudioDecoder a little.

commit bdd1b80ab3f3ba43e04f1f996e7fa84ed2e2728a
Author: Andreas Huber <andih@google.com>
Date: Fri May 8 16:19:29 2009 -0700

No more copying the output buffers coming out of the decoder, NAL separation also done in the extractor to avoid copying the data.

commit 858955b42c29b8033841a8caaa56c2a449810ef3
Author: Andreas Huber <andih@google.com>
Date: Fri May 8 14:02:38 2009 -0700

Change from a model in which the caller specifies the destination buffer to one where the MediaSource returns a buffer.

commit 95098b6d4f8bdc37dfb6a109ca58db4d9e414e2d
Author: Andreas Huber <andih@google.com>
Date: Fri May 8 13:21:45 2009 -0700

Changes to support multiple pieces of codec specific data to the decoder, de-frame nal units from the h.264 stream and insert start codes

commit 3941fcf87a48dda81683df727dfb1381f62d9184
Author: Andreas Huber <andih@google.com>
Date: Thu May 7 16:37:45 2009 -0700

some refactoring. Most streams play now.

commit d3152862840d4dd39068e5197bec8674f3d55dd5
Author: Andreas Huber <andih@google.com>
Date: Thu May 7 15:37:32 2009 -0700

Misc. changes to support H264 decoding using the qcom hardware decoder

commit d4ecdfe7af36e7468270d1c2cbbdc540efe0351e
Author: Andreas Huber <andih@google.com>
Date: Thu May 7 09:28:18 2009 -0700

Timestamps are now stored as a fraction, i.e. units and scale, also, PV appears to violate OMX specs by assuming timestamps are in milliseconds instead of microseconds.

commit fe6a50943f885e065d4061aa727a54417e9f36db
Author: Andreas Huber <andih@google.com>
Date: Wed May 6 14:18:27 2009 -0700

Refactored commandline app instantiation of the decoder.

commit da1ff2724d0e78e8b360d9a2c34c55dd0e2c0492
Author: Andreas Huber <andih@google.com>
Date: Wed May 6 10:41:14 2009 -0700

Proper audio/video synchronization.

commit 569ee3a23f600f4b6b87c6178c0223b06e97f201
Author: Andreas Huber <andih@google.com>
Date: Wed May 6 09:17:20 2009 -0700

Preliminary support for timestamps.

commit e4e302a89207550d8a7170d8c0afbd9c15047c84
Author: Andreas Huber <andih@google.com>
Date: Tue May 5 15:13:12 2009 -0700

Another quick hack job to make CachingDataSource thread-safe as well.

commit dfb376a58bd7c09aa04e89558186fcfe13fe696c
Author: Andreas Huber <andih@google.com>
Date: Tue May 5 15:08:14 2009 -0700

Quick rushjob to make FileSource and SampleTable thread safe.

commit 02b29e7ebdab1f8b959b6c177ceb3b89d998f375
Author: Andreas Huber <andih@google.com>
Date: Mon May 4 17:22:04 2009 -0700

Made video decoding work for mpeg4/h263 and mostly(?) with AVC content.

commit 3a57b8ff15e48f5a0af03bf0a99c32e240dbb7ef
Author: Andreas Huber <andih@google.com>
Date: Mon May 4 09:26:42 2009 -0700

Getting rid of old sample code to drive the OMXNode binder interface.

commit 5b046aed0cf524a57ea711bc1e43ea80e57b2cb3
Author: Andreas Huber <andih@google.com>
Date: Fri May 1 16:21:11 2009 -0700

Moved files from the commandline utility into the framework, renamed MP3Decoder to AudioDecoder

commit 7f3fbba21512a078b732cc52c7bd5ba5acb9a317
Author: Andreas Huber <andih@google.com>
Date: Fri May 1 15:56:19 2009 -0700

Fixed buffer ordering and an off-by-1 error in the SampleTable code. Plays all AACs now :)

commit 024d06baab8f2c540dde16f7e7a4b6dd57f638c7
Author: Andreas Huber <andih@google.com>
Date: Fri May 1 11:52:48 2009 -0700

Some AAC content in .3gp or .mp4 files plays correctly now, other does not. Implemented ESFS parser.

commit 1470427866b0d3e0ce6848b4edc01c13a09be289
Author: Andreas Huber <andih@google.com>
Date: Thu Apr 30 15:19:31 2009 -0700

Another checkpoint, amr decoding now functional.

commit e612d044439f56331b6a2bc4a88622e04d4d42e7
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 29 12:11:29 2009 -0700

string wrapper around String8, various fixes, shoutcast now works again.

commit 2ea52dfb1a39bf3a223ffc87855e54919e2daff7
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 29 11:08:18 2009 -0700

Initial check-in of OMXNode binder interface.

commit 7880d2957f74c0d7fba7679431ff5adb3780543b
Author: Andreas Huber <andih@google.com>
Date: Wed Apr 29 10:05:01 2009 -0700

Initial check-in of both libgenesis2 and the genesis2 commandline tool.
ibmedia/Android.mk
ibmedia/IMediaPlayerService.cpp
ibmedia/IOMX.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/StagefrightPlayer.cpp
ibmediaplayerservice/StagefrightPlayer.h
ibstagefright/Android.mk
ibstagefright/AudioPlayer.cpp
ibstagefright/CachingDataSource.cpp
ibstagefright/CameraSource.cpp
ibstagefright/DataSource.cpp
ibstagefright/ESDS.cpp
ibstagefright/FileSource.cpp
ibstagefright/HTTPDataSource.cpp
ibstagefright/HTTPStream.cpp
ibstagefright/MP3Extractor.cpp
ibstagefright/MPEG4Extractor.cpp
ibstagefright/MPEG4Writer.cpp
ibstagefright/MediaBuffer.cpp
ibstagefright/MediaBufferGroup.cpp
ibstagefright/MediaExtractor.cpp
ibstagefright/MediaPlayerImpl.cpp
ibstagefright/MediaSource.cpp
ibstagefright/MetaData.cpp
ibstagefright/MmapSource.cpp
ibstagefright/OMXClient.cpp
ibstagefright/OMXDecoder.cpp
ibstagefright/QComHardwareRenderer.cpp
ibstagefright/SampleTable.cpp
ibstagefright/ShoutcastSource.cpp
ibstagefright/SoftwareRenderer.cpp
ibstagefright/SurfaceRenderer.cpp
ibstagefright/TimeSource.cpp
ibstagefright/TimedEventQueue.cpp
ibstagefright/Utils.cpp
ibstagefright/omx/Android.mk
ibstagefright/omx/OMX.cpp
ibstagefright/omx/OMX.h
ibstagefright/string.cpp
a5ccb22a3ddb342fe3f7e5493095c6e6dceda60b 15-Jul-2009 Nicolas Catania <niko@google.com> Partial implementation of the parsing of Parcel into Metadata.

In this first cut, a raw parcel is parsed to check that the overall
format is correct.

At the same time, we record the metadata seen and their position in
the parcel for later retrieval using the get* methods.

This means that the 'has' method to check the existence of a metadata
should work.

Removed size and iterator methods. Instead, I added a new method
to give access to the set of keys. The user can make use of the set
to call size(), empty(), iterator() etc...
ava/android/media/Metadata.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkUnitTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMetadataParserTest.java
1f872d4e8675b918dafdd730100df7e865d9ce0b 15-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7067

* changes:
add a ctor to Mutex to specify the type, which can be shared. This is used by sf and af an soon will allow some optimization in the kernel for non shared mutexes
ac2dd4d82f14b23387ec95b52663a1943fc5157d 14-Jul-2009 Mathias Agopian <mathias@google.com> first attempt to fix the sim
ibmedia/Android.mk
fb4f266a1b9f6a20e256d192a940ae4ccc510fad 14-Jul-2009 Mathias Agopian <mathias@google.com> add a ctor to Mutex to specify the type, which can be shared. This is used by sf and af an soon will allow some optimization in the kernel for non shared mutexes
ibmedia/AudioTrack.cpp
e41cc497f03b0fdcd95953894f65cf7b11ae6115 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6812

* changes:
Implemented the tracking of the metadata updates.
4df8b2c760665d16a4f3438245247fe410815bc6 10-Jul-2009 Nicolas Catania <niko@google.com> Implemented the tracking of the metadata updates.

Switched from Vector to SortedVector. Removed dead sorting code.
Added a type to represent MetadataType.

Minor fixes missed in the previous CL.
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
0fc736f321b01995d9f5913d2490cbb479554266 10-Jul-2009 Marco Nelissen <marcone@google.com> Don't pass references to temporary objects, and handle the case where we dont have a Surface.
ni/android_media_MediaPlayer.cpp
ibmedia/mediaplayer.cpp
b88993f073a353fba6a2d6e4510fad5a2a5b170d 10-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6797

* changes:
rename libsgl/libcorecg to libskia
b5af325fb1d21a9295bf3009cc95e5ead4999247 10-Jul-2009 Mike Reed <reed@google.com> rename libsgl/libcorecg to libskia
ni/Android.mk
5d55c7119820ee9bb06fc072e416fe98ba77cd28 09-Jul-2009 Nicolas Catania <niko@google.com> Basic plumbing to retrieve metadata from the native player.

IMediaPlayer.h
Added a getMetadata method that mirrors the on in MediaPlayer.java.

MediaPlayer.java
Added a native method to get the metadata from the native player.
Parse the parcel into a Metadata object.

Metadata.java
Added a stub to parse the Parcel returned by the native player into
a set of metadata.

android_media_MediaPlayer.cpp
JNI call to forward the getMetadata call.

MediaPlayerService.cpp
MediaPlayerService::Client implements the new getMetadata method added in IMediaPlayer.h
ava/android/media/MediaPlayer.java
ava/android/media/Metadata.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
c494ba2544699e576370b35b7e94fe09e29d1226 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6636

* changes:
Implemented the metadata changed notification filters.
cfe2c402d92385dca8204998d402f80cf97e6250 09-Jul-2009 Eric Laurent <elaurent@google.com> am 5964e737: Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call

Merge commit '5964e73774b381748013b91d04dfb6fc60f533ee'

* commit '5964e73774b381748013b91d04dfb6fc60f533ee':
Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call
5e7e8da04d4a7c5bef51cbb1121f956f1496784e 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am b799616d: Merge change 6208 into donut

Merge commit 'b799616d8f0f94e866767fa730f56d82543fb49b'

* commit 'b799616d8f0f94e866767fa730f56d82543fb49b':
Move ExifInterface to android.media package so we can reference it from MediaScanner.
b2c693919be966f179080a9ec70a7a82dbf57627 08-Jul-2009 Nicolas Catania <niko@google.com> Implemented the metadata changed notification filters.

IMediaPlayer:
new setMetadataFilter method so set a filter (2 lists of allowed and blocked metadata type)
serialized in a Parcel.

MediaPlayer.java/android_media_MediaPlayer.cpp/mediaplayer.cpp
new setMetadataFilter that passes the filter down to the MediaPlayerService's binder interface.

MediaPlayerService.cpp
The Client inner class holds the allowed and blocked metadata types.
These are in 2 vectors that get populated in the setMetadataFilter.

A new shourldDropMetadata method returns true if a type of metadata should be dropped according
to the filters.

The notify method in run the metadata update notifications thru the filter and possibly drop them.
ava/android/media/MediaPlayer.java
ava/android/media/Metadata.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
5964e73774b381748013b91d04dfb6fc60f533ee 09-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call

The cause is very likely that the WaveGenerator *lpWaveGen returned by lpToneGen->mWaveGens.valueFor(lFrequency) just before calling lpWaveGen->getSamples(lpOut, lGenSmp, lWaveCmd) is invalid. The frequency lFrequency is not part of the frequencies in mWaveGens.
This can happen if a different tone is started while the callback function is active: The state is changed to TONE_RESTARTING and the call to prepareWave() at line 1226 will change the tone descriptor pointed to by mpToneDesc as well as the content of mWaveGens. However, mpToneDesc was cached in a local variable lpToneDesc when entering the callback and is not reloaded when exiting prepareWave(). This causes a mismatch between the tone frequencies listed in lpToneDesc and the frequencies present in mWaveGens.
This regression was introduced in change 973 when mpToneDesc was cached in a local variable.
ibmedia/ToneGenerator.cpp
b799616d8f0f94e866767fa730f56d82543fb49b 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6208 into donut

* changes:
Move ExifInterface to android.media package so we can reference it from MediaScanner. Also hide public constructor and wrap common use cases as atomic operation to avoid race condition in jhead native codes.
9193e08dc1d91401fdf1846eaad4689da3911dc1 06-Jul-2009 Nicolas Catania <niko@google.com> New Metadata API for the MediaPlayer.

MediaPlayer.java
New method getMetadata to fetch metadata from the player.
New method setMetadataFilter to filter metadata notification and fetches.

Metadata.java
Added basic interface. Implementation incomplete.
ava/android/media/MediaPlayer.java
ava/android/media/Metadata.java
f751c8c2ca3b838330b0b71d43c91192dce42ca3 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am e9ac96f7: Merge change 6454 into donut

Merge commit 'e9ac96f76d513d2cee50dfea7d70b14669643ba9'

* commit 'e9ac96f76d513d2cee50dfea7d70b14669643ba9':
Fix issue 1967295: Add a method to request reloading of audio settings by AudioService.
4050c93601b3c3609b21cc1e18a29b64747e7fa9 08-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1967295: Add a method to request reloading of audio settings by AudioService.
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/IAudioService.aidl
20b03ea70bda3c4fb34e53cdf25cf98c4adb193f 06-Jul-2009 repo sync <raychen@google.com> Move ExifInterface to android.media package so we can reference it from MediaScanner.
Also hide public constructor and wrap common use cases as atomic operation to avoid
race condition in jhead native codes.
ava/android/media/ExifInterface.java
ava/android/media/MediaScanner.java
fcc5be99e0497f25a12e77622c27b4de30e45b3d 07-Jul-2009 Eric Laurent <elaurent@google.com> am 88e209dc: Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR

Merge commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c'

* commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c':
Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
88e209dcf8c2ebddda5c272f46d1bd5478bc639c 07-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR

Store sample rate on 32 bits instead of 16 bits in audio_track_cblk_t.
Removed sampleRate() methods from AudioTrack and AudioRecord: replaced by getSampleRate().
AudioTrack::setSampleRate() no returns a status.
ava/android/media/AudioTrack.java
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
03a9a3449af3e0e79e9bbcd87f8057189ab9e151 06-Jul-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
6231e3a778a4ffe61683abefa2479127f4566d4c 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am ef1f21b3: Merge change 6231 into donut

Merge commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7'

* commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7':
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
513d8068b4a34fa83640af924720ac4e89ab11f2 06-Jul-2009 Marco Nelissen <marcone@google.com> am 899725b0: Make sure ringtones are sorted correctly.

Merge commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5'

* commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5':
Make sure ringtones are sorted correctly.
73bb511adee5444ecd041146fbbd3677fb635949 06-Jul-2009 Marco Nelissen <marcone@google.com> Don't trim() in the mediascanner, as that would remove the special "sort first" character.
ava/android/media/MediaScanner.java
899725b05dd5c8c51f9f802d4f0a7190532ce0a5 06-Jul-2009 Marco Nelissen <marcone@google.com> Make sure ringtones are sorted correctly.
ava/android/media/RingtoneManager.java
56cfd6681aa4e5bb3088a283f10438dd6b746f98 03-Jul-2009 Shin-ichiro KAWASAKI <shinichiro.kawasaki.mg@hitachi.com> Modified libdrm to support SuperH platform

Added USTL_ANDROID_SH defination while build on SuperH platform
ibdrm/mobile2/Android.mk
ibdrm/mobile2/src/util/ustl-1.0/uutility.h
dfe983bd7979ccb1602f29b8f9804c98411d9cd6 02-Jul-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
8529fc3a15ebf21441976d1ea1cb623acbd14c40 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 2f8d58b7: Merge change 5420 into donut

Merge commit '2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede'

* commit '2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede':
Added two test cases to trace the failure in closing the hw decoder and the current playtime is greater than the duration.
2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5420 into donut

* changes:
Added two test cases to trace the failure in closing the hw decoder and the current playtime is greater than the duration.
f47b8e991f60aac8a8f4e6e710cf5eb7cfb3a05a 26-Jun-2009 Yu Shan Emily Lau <yslau@google.com> Added two test cases to trace the failure in closing the hw decoder and the current playtime is greater than the duration.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
548b9920a8d2eeaf98016e9a9eab15578d6e641f 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 2d9f3169: Merge change 5595 into donut

Merge commit '2d9f31697fb5ece89c80cc66bdd3bd9caa9df9c3'

* commit '2d9f31697fb5ece89c80cc66bdd3bd9caa9df9c3':
We might try to close the Vorbis file twice under certain
978811960a226824ecacb5fab14fb2094f1e8a09 27-Jun-2009 Dave Sparks <davidsparks@android.com> We might try to close the Vorbis file twice under certain
circumstances. This fix nulls the mFile member so we don't
try to close it twice. Bug 1904783.
ibmediaplayerservice/VorbisPlayer.cpp
f31868e59fbf59a8d479587c80b648fb37a166fc 25-Jun-2009 Mathias Agopian <mathias@google.com> merge master in master_gl
2387208c9ecb5dba01bd933312c80c5133bd3c41 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 3d7b8d1a: Merge change 5158 into donut

Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'

* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
Use a ref-counted callback interface for Camera.
567c2e22aa3c82b01acf24cec39654334a24629b 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 9efba9d2: Merge change 5176 into donut

Merge commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9'

* commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9':
Export the output to a text file and save to sdcard
20cb94eeb5b9672573fc86bf51e09bd66a774581 13-May-2009 Nicolas Catania <niko@google.com> Direct api to the native media player.

MediaPlayer.java has 3 new methods:
* newRequest creates a Parcel that can be used to send data to the
native player using invoke.
* invoke issues synchronous calls to the native player using opaque
parcels for the request and reply.

IMediaPlayer.h has 1 new abstract method:
* invoke

The Midi and Vorbis players have a stub for these. So far only PV
makes use of that new feature.

To avoid any copy overhead, the JNI interface uses Parcel as a java
object (no serialization/copy happens at the JNI layer).

The remote interface token is inserted when the Parcel is constructed
in java. That way the parcel is already routable when it reaches
IMediaPlayer.cpp (proxy). No extra copy is needed there.
ava/android/media/MediaPlayer.java
ni/Android.mk
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/VorbisPlayer.h
5e27115995c4506dddf4f1271effd4fb4c935ad3 24-Jun-2009 Dave Sparks <davidsparks@android.com> Use a ref-counted callback interface for Camera.
This allows the camera service to hang onto the callback interface
until all callbacks have been processed. This prevents problems
where pending callbacks in binder worker threads are processed
after the Java camera object and its associated native resources
have been released.
Bug 1884362
ni/android_media_MediaRecorder.cpp
9efba9d29f32daf1b6ee6485bae6764ab24f04e9 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5176 into donut

* changes:
Export the output to a text file and save to sdcard
f16da13585ac22bb8d8fe7538509c2726bb06f29 24-Jun-2009 Yu Shan Emily Lau <yslau@google.com> Export the output to a text file and save to sdcard
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
cf01aa3cfff321a774139c054e7cfc262ee27921 23-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 1bee98af: Merge change 5100 into donut

Merge commit '1bee98af6532eba3c6cda636eee890530c95a2a7'

* commit '1bee98af6532eba3c6cda636eee890530c95a2a7':
Fill in CDMA gaps and clean up ToneGenerator code
1bee98af6532eba3c6cda636eee890530c95a2a7 23-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5100 into donut

* changes:
Fill in CDMA gaps and clean up ToneGenerator code
6922f19d30e8952eabd8376f7461d31e481590e7 23-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 843f5eb3: Merge change 5054 into donut

Merge commit '843f5eb36a67367ae76800f74e184f00af50ef54'

* commit '843f5eb36a67367ae76800f74e184f00af50ef54':
Rollback the number of loop in the memory stress test
b6d90ca1292ffab015d5068f9e184b1dc84b7233 17-Jun-2009 David Krause <david.krause@motorola.com> Fill in CDMA gaps and clean up ToneGenerator code
ava/android/media/ToneGenerator.java
ibmedia/ToneGenerator.cpp
327420252cccbc302fdfe86cfef92711ed6f1c06 23-Jun-2009 Yu Shan Emily Lau <yslau@google.com> Rollback the number of loop in the memory stress test
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
949070dd74be18ee3dcc87dd32f47f65374e3d53 23-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 11348cff: Merge change 4885 into donut

Merge commit '11348cffef46585027ba3035357370177a554826'

* commit '11348cffef46585027ba3035357370177a554826':
Merge the output file into one.
a74603052b525e7c8709ffc3b618af0a8b140f0b 19-Jun-2009 Yu Shan Emily Lau <yslau@google.com> Merge the output file into one.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
dcd810d01394cbcc78905b46e212a49e38f88b8b 22-Jun-2009 niko <niko@google.com> Renamed all android.hardware.IMedia* strings to android.media.IMedia*

The android.hardware.ICamera string have not been changed (but is looks
like the camera service and client one should undergo the same procedure)

The implementation of the interface must provide a unique string for
it's interface name. Currently all these strings in the media framework
start with 'android.hardware' when it should really be 'android.media',
the interface token has nothing to do with hardware.
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/IMediaRecorder.cpp
69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584 16-Jun-2009 Mathias Agopian <mathias@google.com> Merge commit 'goog/master' into merge_master
a877427e2ffdb091801cd6803bb880104c753ef6 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 0e3d77af: Merge change 4324 into donut

Merge commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6'

* commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6':
AudioService: Fix routing problem recently introduced in setRouting().
d1f362fe144e6cbcb759fa9086a80adbfe9c7589 16-Jun-2009 Mike Lockwood <lockwood@android.com> AudioService: Fix routing problem recently introduced in setRouting().

Do not disable a route unless routes is zero, to avoid accidentally disabling
if the same route is enabled twice in a row.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ava/android/media/AudioService.java
cca860fa6bf35471ea71ed5e14186c81a9a41afc 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 3d4b7065: Merge change 4047 into donut

Merge commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5'

* commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5':
Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
5f80742306d6d66b1641f96b57ad819c3667b18e 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am d670b8c6: Merge change 3981 into donut

Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'

* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
Removed trailing whitespaces.
3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4047 into donut

* changes:
Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
9bcf401d13d47416043a704430388abd59aef7cd 12-Jun-2009 Eric Laurent <elaurent@google.com> Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly

The problem is that setRingerModeInt() does not handle streams not affected by ringer mode: when enabling "Alarm in silent mode" while in silent mode, setRingerModeInt is called after alarm streamis removed from ringer mode affected streams, and nothing is done.

The fix constists in also processing streams that are not affected by ringer mode and to restore last audible volume for them. It does not arm reapplying the volume for streams the are never affected by ringer mode as we don't do this very often.

The other problem noted in the bug report (ringer volume always restored to non zero value when exiting silent mode even if set to zero before) is also fixed: a new parameter is added to setIndex() and setStreamVolumeInt() to explicitely request to store the volume index as last audible instead of doing it automatically if index > 0.
ava/android/media/AudioService.java
32f82774884bdd709789ab9f3ccdf5b972ff7681 12-Jun-2009 Nicolas Catania <niko@google.com> Removed trailing whitespaces.
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/mediaplayer.cpp
1ecb750f65d17ba0e95add5d0c39201391faffd0 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 1d7d5db7: Merge change 3799 into donut

Merge commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf'

* commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf':
Turned on the windows media related test cases as the binary already integrated.
1d7d5db74f14e871c7be719a0cddf52a5a40dcbf 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3799 into donut

* changes:
Turned on the windows media related test cases as the binary already integrated.
afbc17ead22cf150eba5d5273e1e51c6d11b529f 11-Jun-2009 Yu Shan Emily Lau <yslau@google.com> Turned on the windows media related test cases as the binary already integrated.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
9da6971d8a10cbe95e2569cabd80ca337deba18c 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am faf41044: Merge change 3644 into donut

Merge commit 'faf410443f0c2ab2d30a1c8ce90f83157b5e593b'

* commit 'faf410443f0c2ab2d30a1c8ce90f83157b5e593b':
Print a message to the log when a file can't be opened on the client side.
a2df60598ac0158468ce242498b7bd3cb9383e13 10-Jun-2009 Marco Nelissen <marcone@google.com> Print a message to the log when a file can't be opened on the client side.
ava/android/media/MediaPlayer.java
f5b746e15708bea6a8ef5bb7f7cfea03d7415a7f 09-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am b2df1699: Merge change 1548 into donut

Merge commit 'b2df1699c996e62baa78877978cd2c5607ea4194'

* commit 'b2df1699c996e62baa78877978cd2c5607ea4194':
NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
b2df1699c996e62baa78877978cd2c5607ea4194 09-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1548 into donut

* changes:
NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
8c09399490ed1dce2073010c5850acd2b6af744f 08-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am bdf90a08: Merge change 3462 into donut

Merge commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3'

* commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3':
Capture the memory output before the playback and record start.
32e959163fbbaf1e01752616a81e30996a165688 08-Jun-2009 Yu Shan Emily Lau <yslau@google.com> Capture the memory output before the playback and record start.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
2bcda90c0234f67f210a96f195b355493ca7d1ff 08-Jun-2009 Jianhong Jiang <jianhong@google.com> NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
ibmedia/mediarecorder.cpp
a650aaa3918f47ceb116ce8dfd3f1e423687fa69 04-Jun-2009 Mathias Agopian <mathias@google.com> fix build
ibmediaplayerservice/MediaPlayerService.cpp
7c49790cde0acb494b6e8980662842c95dd8859a 01-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 162c9d0e: Merge change 2805 into donut

Merge commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47'

* commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47':
base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
162c9d0e90eaa71adc8c7d1456d1a9a95e638c47 01-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2805 into donut

* changes:
base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
4599184a1c1c3f54b396c49b5728e4031e559e18 01-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 450ad31b: Merge change 2774 into donut

Merge commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e'

* commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e':
Limit check on maxChannels for SoundPool.
450ad31b62af468aa0fb308a5c983b8f8334ae4e 01-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2774 into donut

* changes:
Limit check on maxChannels for SoundPool. Bug 1838724
5a3a77dabd744d5be79d7745c2a977c108a9ad98 01-Jun-2009 San Mehat <san@google.com> base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE

Signed-off-by: San Mehat <san@google.com>
ests/MediaFrameworkTest/AndroidManifest.xml
3c8704b171c812dde6f48e5416ba0b336470dd4a 30-May-2009 Dave Sparks <davidsparks@android.com> Limit check on maxChannels for SoundPool.
Bug 1838724
ni/soundpool/SoundPool.cpp
3b4062eeb01be33951ba214e027da523cf09f8b1 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of utils.h
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MetadataRetrieverClient.h
27b3eaf4de9e093bef27803dcfc6d572be5b08ca 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 0f5179c7: Merge change 2716 into donut

Merge commit '0f5179c7d333ddab729b5943766637c21d1b74db'

* commit '0f5179c7d333ddab729b5943766637c21d1b74db':
Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
0f5179c7d333ddab729b5943766637c21d1b74db 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2716 into donut

* changes:
Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow passing a null surface. The API is now enabled to change the surface while the video is playing. This could allow orientation changes during playback or to allow the audio track from a video to play in the background. NOTE: There are still changes required to pmem driver to allow remapping shared physical memory into a process in order for this to work. This change only enables the API to send the appropriate calls when the lower level code supports it.
8b0b174198793cabb2b3fcc015f9bfdc9d5082b5 29-May-2009 Dave Sparks <davidsparks@android.com> Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
passing a null surface. The API is now enabled to change the surface while
the video is playing. This could allow orientation changes during playback
or to allow the audio track from a video to play in the background.
NOTE: There are still changes required to pmem driver to allow remapping
shared physical memory into a process in order for this to work. This
change only enables the API to send the appropriate calls when the lower
level code supports it.
ava/android/media/MediaPlayer.java
ni/android_media_MediaPlayer.cpp
a70396cd0a914d61081eb201864e0bb18f478b84 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> am f6355e24: Merge change 2399 into donut

Merge commit 'f6355e24f5382356ea197135fdeff827aabfdb90'

* commit 'f6355e24f5382356ea197135fdeff827aabfdb90':
Motorola additions for CDMA support without CdmaSuppConnTracker
f6355e24f5382356ea197135fdeff827aabfdb90 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2399 into donut

* changes:
Motorola additions for CDMA support without CdmaSuppConnTracker
b86204a73d2c3911c063d635819e24d15d4885e3 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 2af7e639: Merge change 2654 into donut

Merge commit '2af7e639906981b1562f3187a60b6c848b7da17c'

* commit '2af7e639906981b1562f3187a60b6c848b7da17c':
Added the two validations for the memory stress test
01c0596b75388e3df7cb4fb022d904c4cac9d831 29-May-2009 Yu Shan Emily Lau <yslau@google.com> Added the two validations for the memory stress test
1) Set the maximum memory leakage to 150K in 200 loops of playback.
2) Check the pid of the meidaserver.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
dda5391d5079537e275c9f4ed2637a1484d0e4e8 29-May-2009 Wink Saville <wink@google.com> Motorola additions for CDMA support without CdmaSuppConnTracker

There are corresponding changes to hardware/ril and packages/apps/Phone
that are required to go with these changes.
ava/android/media/ToneGenerator.java
7e432e0c68017b760dce441144d724175dc3039d 27-May-2009 Android (Google) Code Review <android-gerrit@google.com> am f3288f17: Merge change 2468 into donut

Merge commit 'f3288f178ae2b2c7910b234f54f43475a83eb860'

* commit 'f3288f178ae2b2c7910b234f54f43475a83eb860':
setVolume did not check interface descriptor
aaf834a284a025cedd8ec1cf01d09e1790c1dcf8 23-May-2009 Mathias Agopian <mathias@google.com> some work to try to reduce the code size of some native libraries

- make sure that all binder Bn classes define a ctor and dtor in their respective library.
This avoids duplication of the ctor/dtor in libraries where these objects are instantiated.
This is also cleaner, should we want these ctor/dtor to do something one day.

- same change as above for some Bp classes and various other non-binder classes

- moved the definition of CHECK_INTERFACE() in IInterface.h instead of having it everywhere.

- improved the CHECK_INTERFACE() macro so it calls a single method in Parcel, instead of inlining its code everywhere

- IBinder::getInterfaceDescriptor() now returns a "const String16&" instead of String16, which saves calls to String16 and ~String16

- implemented a cache for BpBinder::getInterfaceDescriptor(), since this does an IPC. HOWEVER, this method never seems to be called.
The cache makes BpBinder bigger, so we need to figure out if we need this method at all.
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/IMediaRecorder.cpp
814941997f3f4b53064511b658cb510cafffe117 26-May-2009 Dave Sparks <davidsparks@android.com> setVolume did not check interface descriptor
DO NOT MERGE
ibmedia/IMediaPlayer.cpp
c5d0343b677d5ddc2d69fd15b81b084a40ab12ac 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> am de8268d6: Merge change 2331 into donut

Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c'

* commit 'de8268d6d1cd168510c490b17e93154d2eab767c':
Fix issue 1846343 - part 1
4bc035a65cac177be9294e69f110497e3b6e34e6 22-May-2009 Eric Laurent <elaurent@google.com> Fix issue 1846343 - part 1

This change is the first part of a fix for issue 1846343, :
- Added new enum values for input sources in AudioRecord and MediaRecorder for voice uplink, downlink and uplink+downlink sources.
- renamed streamType to inputSource in all native functions handling audio record.

A second change is required in opencore author driver and android audio input to completely fix the issue.
ava/android/media/AudioRecord.java
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
ibmedia/AudioRecord.cpp
ibmedia/IAudioFlinger.cpp
183baba8d12e5863bd1549e06e6da8a918f65fd0 21-May-2009 Android (Google) Code Review <android-gerrit@google.com> am c1c82509: Merge change 2163 into donut

Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538'

* commit 'c1c82509fb78403a969040cf057a66cbe3bfa538':
Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
6690dc54546809c973f7f630e6488fcd81dfaa82 21-May-2009 Dave Sparks <davidsparks@android.com> Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
implementation to the mediaserver process. The permission check was previously
enforced only at the AudioRecord binder interface for clients not in the same
process. This change adds an additional check when the client tries to set
the audio source.
Bug 1868334
ibmediaplayerservice/MediaRecorderClient.cpp
0795272aa226f4e965968a03daddc53ce30b7cda 20-May-2009 Mathias Agopian <mathias@google.com> move libbinder's header files under includes/binder
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ediaserver/main_mediaserver.cpp
dutils/sdutil.cpp
25ba5b6564224dceefa086b5c439ef28dad530ca 19-May-2009 Mathias Agopian <mathias@google.com> checkpoint: split libutils into libutils + libbinder
ni/Android.mk
ni/soundpool/Android.mk
ibmedia/Android.mk
ibmediaplayerservice/Android.mk
ediaserver/Android.mk
843ef36f7b96cc19ea7d2996b7c8661b41ec3452 20-May-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/AudioTrack.java
ava/android/media/JetPlayer.java
ava/android/media/MediaFile.java
ava/android/media/MediaScanner.java
ava/android/media/SoundPool.java
ava/android/media/ToneGenerator.java
ni/Android.mk
ni/android_media_AmrInputStream.cpp
ni/android_media_MediaRecorder.cpp
ni/soundpool/SoundPool.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/ToneGenerator.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/VorbisPlayer.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
c6b58959b3bbc41725e1bf25868713c80de897e3 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 379d3bd9: Merge change 2016 into donut

Merge commit '379d3bd974cfde9480fda733d4f442311924cbb9'

* commit '379d3bd974cfde9480fda733d4f442311924cbb9':
Replaced the old test media files with the new open source test media files.
379d3bd974cfde9480fda733d4f442311924cbb9 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2016 into donut

* changes:
Replaced the old test media files with the new open source test media files. Fix the bug in testGetThumbnail test.
be467b579e06443bc79ea6a04ba0b4d4746da994 20-May-2009 Yu Shan Emily Lau <yslau@google.com> Replaced the old test media files with the new open source test media files.
Fix the bug in testGetThumbnail test.
ests/MediaFrameworkTest/res/raw/testmidi.mid
ests/MediaFrameworkTest/res/raw/testmp3.mp3
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
6a889551359ff0f8546c24b8e2ffc1dd715241fe 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 988c4d1a: Merge change 2005 into donut

Merge commit '988c4d1a3ece97c078658a67b15949db900641e0'

* commit '988c4d1a3ece97c078658a67b15949db900641e0':
Added the write sdcard permission so that the mediarecorder test
f30c700e13963829e76fca430638dfb1aae9e00e 20-May-2009 Yu Shan Emily Lau <yslau@google.com> Added the write sdcard permission so that the mediarecorder test
can write the new recorded video into sdcard.
ests/MediaFrameworkTest/AndroidManifest.xml
6f3cbac7ebf3e74933e733354afee160475a13c8 19-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 65ff54c4: Merge change 1967 into donut

Merge commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9'

* commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9':
Document the media scanner's flow through native and java code, since
77f2c4c1f9d1b8b9266a18e8e28fcabdf6599399 19-May-2009 Marco Nelissen <marcone@google.com> Document the media scanner's flow through native and java code, since
I always forget how it works after a while.
ava/android/media/MediaScanner.java
86a99b9ad22d80129f8b5ecb2aad767188cd78d9 16-May-2009 Android (Google) Code Review <android-gerrit@google.com> am b3af6b48: Merge change 1748 into donut

Merge commit 'b3af6b4805040ea42c01765387c99089822bbe7e'

* commit 'b3af6b4805040ea42c01765387c99089822bbe7e':
Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
55eef638fae461d40b1ad4b1738bdef355a2d482 15-May-2009 Xia Wang <xiaw@google.com> Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
4ae6aa232be6c139c725e8bea579947be677840e 14-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 109b21ba: Merge change 1677 into donut

Merge commit '109b21bab5a9eb6c17e067b11784ade36129f24f'

* commit '109b21bab5a9eb6c17e067b11784ade36129f24f':
Findbugs fixes.
d282ac8610f72d964105efefe41120a5340f1ce0 14-May-2009 Marco Nelissen <marcone@google.com> Findbugs fixes.
ava/android/media/AudioManager.java
ava/android/media/MediaFile.java
ava/android/media/SoundPool.java
10fd73a238a2e406dd8b62ca76990d4d0a8651ce 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 7f2ae49: Merge change 1370 into donut

Merge commit '7f2ae493c58e221b2961ccbd92de24565665633c'

* commit '7f2ae493c58e221b2961ccbd92de24565665633c':
Fix a JNI layer crash due to null camera object passed to get_native_camera()
7f2ae493c58e221b2961ccbd92de24565665633c 11-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1370 into donut

* changes:
Fix a JNI layer crash due to null camera object passed to get_native_camera() The fix will check on the camera object and if it is a null object, we throw a NullPointerException; application layer should also avoid passing a null java object to MediaRecorder.setCamera().
429a3b5f1d94327e5cbb2dc80667af4574bba388 11-May-2009 James Dong <jdong@google.com> Fix a JNI layer crash due to null camera object passed to get_native_camera()
The fix will check on the camera object and if it is a null object, we
throw a NullPointerException; application layer should also avoid passing a null
java object to MediaRecorder.setCamera().
ni/android_media_MediaRecorder.cpp
30f91d6e10e5ea7b68c5eb329a7fa8981beb0ff9 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> am b85c374: Merge change 1155 into donut

Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'

* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
Don't allow negative numbers in ToneGenerator toneType parameter
b85c37432b3836fd30c81191425d7e00dcf2082c 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1155 into donut

* changes:
Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596
2bbaaf72ea2ca9003f7b6023ccc078445e38c722 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 0efb086: Merge change 1120 into donut

Merge commit '0efb0868841cc1c2b5a669b39880d931f54f705a'

* commit '0efb0868841cc1c2b5a669b39880d931f54f705a':
Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
0efb0868841cc1c2b5a669b39880d931f54f705a 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1120 into donut

* changes:
Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest (Currently not supported by OpenCore 2.0)
4c9224709862c38a97c51853a93d284f55d6135d 07-May-2009 Dave Sparks <davidsparks@android.com> Don't allow negative numbers in ToneGenerator toneType parameter
Bug 1836596
ibmedia/ToneGenerator.cpp
7c6b6fbe4c2cf621844aba0c9b409f067f574ef0 07-May-2009 Android (Google) Code Review <android-gerrit@google.com> am a6706b3: Merge change 1131 into donut

Merge commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2'

* commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2':
fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
9648e4b6774910afde095be94b8359ae80cd3dcb 07-May-2009 Eric Laurent <elaurent@google.com> fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer

Enabled USE_SHARED_MEM_BUFFER switch in SoundPool.cpp
ni/soundpool/SoundPool.cpp
fe1766474bb1a6f52305bb40bcf887eaa61b48ba 07-May-2009 Xia Wang <xiaw@google.com> Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
(Currently not supported by OpenCore 2.0)
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
56b7eeaa01fa34de1dad1b113f5355e999ee1d10 07-May-2009 The Android Open Source Project <initial-contribution@android.com> manual merge f3af740bdfc261b1cb25c0799af780d3753d4518

Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
761daf7550c256258886824fdb939b352c5fd08c 07-May-2009 The Android Open Source Project <initial-contribution@android.com> manual merge for b9c9d260f21b321527c4622a123af9767630d94d

Merge commit 'b9c9d260f21b321527c4622a123af9767630d94d'
f3af740bdfc261b1cb25c0799af780d3753d4518 05-May-2009 Eric Laurent <elaurent@google.com> Fixed issue 1709450: Requirements for CDMA Tone Generator

Added new tone types for CDMA IS-95 specific tones.
Automatic selection between IS-95, CEPT and JAPAN version base on operator
country code for call supervisory tones.
Also improved tone generator capabilities:
- Each tone segment can now generate its own set of frequencies
- A tone does not have to be a succession of alternating ON/OFF segments
- The sequence repetition does not have to start from first segment
ava/android/media/ToneGenerator.java
ibmedia/ToneGenerator.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
b9c9d260f21b321527c4622a123af9767630d94d 06-May-2009 Eric Laurent <elaurent@google.com> fix issue 1713090: After a Bluetooth call, MusicPlayer starts playing on speaker rather than wired external audio.

Temporary fix until audio routing is refactored in Eclair release:
- centralized and synchronized all audio routing control in AudioService.setRouting()
- deprecated AudioManager.setRouting() and AudioManager.getRouting() methods
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
0d8f5a3f4fd37bb70437e29e0abe28906f2edaf2 06-May-2009 Android (Google) Code Review <android-gerrit@google.com> am e556248: Merge change 1017 into donut

Merge commit 'e556248e859e7197d5f97c6c0724806d5913da24'

* commit 'e556248e859e7197d5f97c6c0724806d5913da24':
Changes in mediaframework test for the OpenCore 2.0 integration. Changes included:
c1b80cb7e30102b304d62beb9649f84c798e00e9 06-May-2009 Yu Shan Emily Lau <yslau@google.com> Changes in mediaframework test for the OpenCore 2.0 integration. Changes included:
1) The default value for the metatData
2) Add the videoSizedChange callback to get the video dimension
Added the test cases for the async reset callback test case for the Qualcomm new realease.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
568d91bddce4f8b9a05ba98014cf485967344eba 05-May-2009 Xia Wang <xiaw@google.com> fix the bug of testStartupTime in MediaPlayerPerformance test throws exception for an existing table
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
c02cac481c5e14792bf12f75392ccecdf4a59391 01-May-2009 James Dong <jdong@google.com> Change 79 in git master branch
ni/Android.mk
ni/android_media_AmrInputStream.cpp
ibmediaplayerservice/Android.mk
c2bc16cd5a20f0e9558213a6ce31fbb054a52709 30-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 7fe3b06: Merge change 740 into donut

Merge commit '7fe3b064d3645fcebd09b162c5989e0d702112e2'

* commit '7fe3b064d3645fcebd09b162c5989e0d702112e2':
MIDI render thread was nice 0, should be nice -16.
7fe3b064d3645fcebd09b162c5989e0d702112e2 30-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 740 into donut

* changes:
MIDI render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the MIDI render thread priority to the default for audio threads. Reference bug 1800905
ef77be9526ec05cb89881719dfdac4e07cef45d3 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am 9f98f79: Merge change 739 into donut

Merge commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a'

* commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a':
Vorbis render thread was nice 0, should be nice -16.
9d9f28b828784d6eca61a206c699e02bd66827b2 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am ba2eba4: Merge change 539 into donut

Merge commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d'

* commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d':
Modify and turn on the test case for video recording in portrait mode.
c082769b673f0ac57f39c44cffce4d756e48e140 29-Apr-2009 Dave Sparks <davidsparks@android.com> MIDI render thread was nice 0, should be nice -16.
Seems like a recent change sets the thread priority to 0. Previously it
inherited priority from the parent thread. This change sets the MIDI
render thread priority to the default for audio threads.
Reference bug 1800905
ibmediaplayerservice/MidiFile.cpp
0e051b189ff1b04899014fbd2aabbccb850a5437 29-Apr-2009 Dave Sparks <davidsparks@android.com> Vorbis render thread was nice 0, should be nice -16.
Seems like a recent change sets the thread priority to 0. Previously it
inherited priority from the parent thread. This change sets the Vorbis
render thread priority to the default for audio threads.
Reference bug 1800905
ibmediaplayerservice/VorbisPlayer.cpp
284e9b27537eeb5e353415c55da55941607ee5f1 24-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/donut'
2071043512fc9ceba5d06fe6ea23eeda499c8e02 24-Apr-2009 Yu Shan Emily Lau <yslau@google.com> Modify and turn on the test case for video recording in portrait mode.
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
74008f608af0c567456d37e63d48643689388c74 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
9f0b1a48506af8e18162f62570561135b65a4ed1 22-Apr-2009 Marco Nelissen <marcone@google.com> Do case-insensitive matching when determining whether something is music, an alarm sound, notification sound, etc.
ava/android/media/MediaScanner.java
ef02827d4c3b9c0601eddc9c348fc2ea866420a2 21-Apr-2009 Eric Laurent <elaurent@google.com> Fix issue 1745312: Various cleanups in media framework

AudioTrack, AudioRecord:
- remove useless mAudioFlinger member of AudioTrack and AudioRecord.
- signal cblk.cv condition in stop() method to speed up stop completion.
- extend wait condition timeout in obtainBuffer() when waitCount is -1 to avoid waking up callback thread unnecessarily

AudioFlinger:
- remove some warnings in AudioFlinger.cpp.
- remove function AudioFlinger::MixerThread::removetrack_l() as its content is never executed.
- remove useless call to setMasterVolume in AudioFlinger::handleForcedSpeakerRoute().
- Offset VOICE_CALL stream volume to reflect actual volume that is never 0 in hardware (this fix has been made in the open source): 0.01 + v * 0.99.

AudioSystem.java:
- correct typo in comment

IAudioflinger, IAudioFlingerClient:
- make AudioFlinger binder interfaces used for callbacks ONEWAY.

AudioHardwareInterface:
- correct routeStrings[] table in AudioHardwareInteface.cpp
ava/android/media/AudioSystem.java
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
486d95f71425726d69227fdf25ddd2b016529a50 21-Apr-2009 Jean-Michel Trivi <> Merge branch 'readonly-p4-master'
f3af6a0267dff0acacdeebf646f2b8647b1f7199 21-Apr-2009 Jean-Michel Trivi <> AI 147036: am: CL 147035 am: CL 147032 Finalize JetPlayer javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 147036
ava/android/media/JetPlayer.java
6fb5a1d0ee18b2d94340f3b35f86ad7319f3a11c 21-Apr-2009 Jean-Michel Trivi <> AI 147035: am: CL 147032 Finalize JetPlayer javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...

Automated import of CL 147035
ava/android/media/JetPlayer.java
e796cfaef8f73d3f1da8fe07990b2e94f17da1e4 20-Apr-2009 Jean-Michel Trivi <> Merge branch 'readonly-p4-master'
954bbe9fa356175f9019d51227c47cd48a077fb9 20-Apr-2009 Jean-Michel Trivi <> AI 146941: am: CL 146938 am: CL 146937 Finalize AudioRecord javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146941
ava/android/media/AudioRecord.java
ea63a41d269abd25d070c9fc9c5a249763cb549d 20-Apr-2009 Jean-Michel Trivi <> AI 146938: am: CL 146937 Finalize AudioRecord javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...

Automated import of CL 146938
ava/android/media/AudioRecord.java
094c065cbb2d4903424e4356d7f5d4ffb14a172e 19-Apr-2009 Dave Sparks <> Merge branch 'readonly-p4-master'
1bc5c2645df96b22385f2cdb63a92576e388350e 19-Apr-2009 Dave Sparks <> AI 146833: am: CL 146755 am: CL 146754 Fix some problems in the SoundPool docs and add additional text.
Original author: davidsparks
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146833
ava/android/media/SoundPool.java
d4fd29e02c8ccb418b4d9c6d77e8cf3e15eed08f 19-Apr-2009 Jean-Michel Trivi <> Merge branch 'readonly-p4-master'
3946a2b75b36cbdd1ac4d67d16dafdbabc8d2055 19-Apr-2009 Jean-Michel Trivi <> AI 146832: am: CL 146752 am: CL 146751 Finalize AudioTrack javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146832
ava/android/media/AudioTrack.java
89e2782d71c3e8b7a736f59efebe87af493e84b4 19-Apr-2009 Dave Sparks <> Merge branch 'readonly-p4-master'
32346a89c3b40a4f87186550d0ed2d75ced6f42c 19-Apr-2009 Dave Sparks <> AI 146671: am: CL 146668 am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format
Original author: davidsparks
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146671
ava/android/media/MediaRecorder.java
ec9cacad76081d1f8ee1033bf205dd51db8300b4 19-Apr-2009 Dave Sparks <> Merge branch 'readonly-p4-master'
40a9d1608766b5ddcb2bf837e9dd1b556bcfde47 19-Apr-2009 Dave Sparks <> AI 146658: am: CL 146655 am: CL 146654 Add java docs for SoundPool
Original author: davidsparks
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146658
ava/android/media/SoundPool.java
6cb9900e6f884adb6c9aa0243f2bf88985f671f8 17-Apr-2009 Dave Sparks <> AI 146755: am: CL 146754 Fix some problems in the SoundPool docs and add additional text.
Original author: davidsparks
Merged from: //branches/cupcake/...

Automated import of CL 146755
ava/android/media/SoundPool.java
ff14c25339da3f6cd86edd66ef42640e6d0c0787 17-Apr-2009 Jean-Michel Trivi <> AI 146752: am: CL 146751 Finalize AudioTrack javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...

Automated import of CL 146752
ava/android/media/AudioTrack.java
2170312ab0b6766e8b73b806efbe6abdbb702bbc 17-Apr-2009 Dave Sparks <> AI 146668: am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format
Original author: davidsparks
Merged from: //branches/cupcake/...

Automated import of CL 146668
ava/android/media/MediaRecorder.java
6cb76f6c238afdad0b37628a003c7d88186b5c2f 17-Apr-2009 Dave Sparks <> AI 146667: Add advice in MediaRecorder Java docs about using MPEG-4 container format
BUG=1753020

Automated import of CL 146667
ava/android/media/MediaRecorder.java
cef302d0950a02fdc6920475d0c357d3949e85c3 17-Apr-2009 Dave Sparks <> AI 146655: am: CL 146654 Add java docs for SoundPool
Original author: davidsparks
Merged from: //branches/cupcake/...

Automated import of CL 146655
ava/android/media/SoundPool.java
b1520e9333efdcc6ce3605be7c02bd0f0c9a0139 17-Apr-2009 Dave Sparks <> AI 146654: Add java docs for SoundPool
BUG=1795461

Automated import of CL 146654
ava/android/media/SoundPool.java
5e8c31ac31107c0cbc4a103e4f62342b07b5876b 15-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
894fa6cc1471995ebede74b03fc1d407440e1791 14-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 79

* changes:
Squashed commit of the following:
3ca47d101db63b619f15723d5131ff7bc8f3a5be 14-Apr-2009 Jianhong Jiang <jianhong@google.com> Squashed commit of the following:

commit b6cf47306b642f7cf7e1b55cce448e0deff38f36
Author: Jianhong Jiang <jianhong@google.com>
Date: Mon Apr 13 11:07:01 2009 -0700

Change tabs into 4 spaces.

commit 93c5890dbcc68e37aa0ef039b4a203acddca8968
Author: Jianhong Jiang <jianhong@google.com>
Date: Fri Apr 10 14:15:23 2009 -0700

OpenCore 2.02 related changes.
ni/Android.mk
ni/android_media_AmrInputStream.cpp
ibmediaplayerservice/Android.mk
75534fbe246e5562779500bc7cf7f0ddfe9b8330 14-Apr-2009 Dianne Hackborn <> Merge branch 'readonly-p4-master'
935ae463d495d41155e27feb849768ad2b8b16db 14-Apr-2009 Dianne Hackborn <> AI 145994: Integrate #145778 from Donut.

Automated import of CL 145994
ava/android/media/RingtoneManager.java
9536d0b41356bda58f97abc6ff2f7902f8219180 13-Apr-2009 Patrick Scott <> Merge branch 'readonly-p4-master'
3156bb00dd3ab3d6ec732bb6a64a2e84d08c34f0 13-Apr-2009 Patrick Scott <> AI 145870: Add a build property for the default alarm alert. Update the various
framework classes to deal with the new property. Also update various
documentation that mentions the default ringtones.
Use the build property as the default alert when the user has not chosen
an alert for an alarm. This is also used if the alarm alert is null when
the alarm fires.
BUG=1723684

Automated import of CL 145870
ava/android/media/MediaScanner.java
ava/android/media/RingtoneManager.java
f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 11-Apr-2009 Andy Stadler <> AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
ava/android/media/RingtoneManager.java
48276ab989a4d775961ce30a43635a317052672a 09-Apr-2009 Dianne Hackborn <> AI 145383: API review: clean up a bunch of @hides that have been pending API review.
Either expose them, or official hide them with an explanation for why.
BUG=1779439

Automated import of CL 145383
ava/android/media/RingtoneManager.java
bb038d160458d51b657e0848b25733a448c731b7 08-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Revert "Changes required to accommodate OpenCORE 2.0"

This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208.

Conflicts:

media/libmediaplayerservice/Android.mk
ni/Android.mk
ni/android_media_AmrInputStream.cpp
ibmediaplayerservice/Android.mk
73cf2a11eb02de670f0001b48ec821913751bc82 03-Apr-2009 Jean-Michel Trivi <> Merge branch 'readonly-p4-master'
e398e3bf2288fe60041396077d6fc0f81b0ab242 03-Apr-2009 Jean-Michel Trivi <> AI 144409: am: CL 144327 am: CL 144326 Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 144409
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
e7e370369d7a1f3d1587791e3bfdb48b92edc006 03-Apr-2009 Xia Wang <> Merge branch 'readonly-p4-master'
74e77fba25169c3ede762d4d7917ab65ebcbc352 03-Apr-2009 Xia Wang <> AI 144407: am: CL 144314 am: CL 144313 Add two test cases for AudioTrack.java
getMinBufferSize() returns ERROR_BAD_VALUE if
sampleRateInHz < 4000 or > 48000.
Original author: xiaw
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 144407
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
655434763fd0fffc5858301040f05d6e81b248b9 03-Apr-2009 Jean-Michel Trivi <> AI 144327: am: CL 144326 Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting.
Original author: jmtrivi
Merged from: //branches/cupcake/...

Automated import of CL 144327
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
36951ab6c28de5ee0100507b618f5f543bdc37b3 03-Apr-2009 Jean-Michel Trivi <> AI 144326: Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting.
BUG=1731117

Automated import of CL 144326
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
1b01f87b395a0c40d204f84ec09a66e3b4e31772 03-Apr-2009 Xia Wang <> AI 144314: am: CL 144313 Add two test cases for AudioTrack.java
getMinBufferSize() returns ERROR_BAD_VALUE if
sampleRateInHz < 4000 or > 48000.
Original author: xiaw
Merged from: //branches/cupcake/...

Automated import of CL 144314
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
7c3b6285c3c9e3b80a708c3499a388de5e10baaa 03-Apr-2009 Xia Wang <> AI 144313: Add two test cases for AudioTrack.java
getMinBufferSize() returns ERROR_BAD_VALUE if
sampleRateInHz < 4000 or > 48000.

Automated import of CL 144313
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
070410ec7f0f23dcd548cc410a03960eb00c35a4 02-Apr-2009 Eric Laurent <> Merge branch 'readonly-p4-master'
3547cc01246059ef52d36e0cc6d4c3877a94d6ed 02-Apr-2009 Eric Laurent <> AI 144097: am: CL 144054 am: CL 144053 Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800
The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().
The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.
Original author: elaurent
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 144097
ibmedia/AudioSystem.cpp
d7f347bdc878109df1f34c5015de2dc9f531d87b 01-Apr-2009 Eric Laurent <> AI 144054: am: CL 144053 Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800
The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().
The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.
Original author: elaurent
Merged from: //branches/cupcake/...

Automated import of CL 144054
ibmedia/AudioSystem.cpp
1177ece66ba67c817c13243e0d05319ebc914bab 01-Apr-2009 Eric Laurent <> AI 144053: Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800
The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().
The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.
BUG=1751242

Automated import of CL 144053
ibmedia/AudioSystem.cpp
caee1703fee75fbf37ba7774db64479a33cda82b 01-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'goog/readonly-p4-master'
aa7d8c88d35fe531d1c535566b73175d4afb6f5b 01-Apr-2009 Yu Shan Emily Lau <> AI 143906: am: CL 143905 am: CL 143904 Fix the failure in the media recorder large test by adding the Camera permission.
Original author: yslau
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143906
ests/MediaFrameworkTest/AndroidManifest.xml
b9f15d7b3c0d6bb66aede38f6f2302e2a8595416 01-Apr-2009 Yu Shan Emily Lau <> AI 143905: am: CL 143904 Fix the failure in the media recorder large test by adding the Camera permission.
Original author: yslau
Merged from: //branches/cupcake/...

Automated import of CL 143905
ests/MediaFrameworkTest/AndroidManifest.xml
ba6da788c4f8d539ed6b7f8f66e79d8d2747532d 01-Apr-2009 Yu Shan Emily Lau <> AI 143904: Fix the failure in the media recorder large test by adding the Camera permission.

Automated import of CL 143904
ests/MediaFrameworkTest/AndroidManifest.xml
762d30a31365e5cae9ba7c2802de60a2f8c3513d 29-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'open_source' into google_internal

Conflicts:
core/java/android/widget/TwoLineListItem.java
core/res/res/values/public.xml
preloaded-classes
d94755bf33193f50b1a63778788e82b5257f22c2 29-Mar-2009 Doug Kwan <> AI 143430: Remove broken and unused code.
This CL removes RoManager::getDevicePrivateKey() and its declaration.
The method is not used anywhere and it contains bad code that returns
reference to a local object.
This is tested by building the master tree and running the framework
testsuite. No error was found in testsuite.
BUG=1737538

Automated import of CL 143430
ibdrm/mobile2/include/rights/RoManager.h
ibdrm/mobile2/src/rights/RoManager.cpp
b8c055e7cbf3ca2ea2670747c2b482eca8251fb5 28-Mar-2009 Dave Sparks <> AI 143267: am: CL 143127 Media recorder service requires android.permission.CAMERA to record video
Original author: davidsparks
Merged from: //branches/cupcake/...

Automated import of CL 143267
ibmediaplayerservice/MediaRecorderClient.cpp
17612fcdcb450a1b0c99d0f272b17aeee02bb4bd 28-Mar-2009 Dave Sparks <> AI 143396: am: CL 143267 am: CL 143127 Media recorder service requires android.permission.CAMERA to record video
Original author: davidsparks
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143396
ibmediaplayerservice/MediaRecorderClient.cpp
64a5458e7627e704906d0bf6bb8e041536850252 28-Mar-2009 Mike Lockwood <> AI 143360: am: CL 143209 am: CL 143001 Remove sdutils from user build to save 12K on /system partition.
BUG=1739507
Original author: lockwood
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143360
dutils/Android.mk
b41349409b75cdc23558241eeb255e4ac4f46222 28-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'goog/cupcake'
3870a95435b69607384691fc915d0d150b96e21d 28-Mar-2009 Mike Lockwood <> AI 143209: am: CL 143001 Remove sdutils from user build to save 12K on /system partition.
BUG=1739507
Original author: lockwood
Merged from: //branches/cupcake/...

Automated import of CL 143209
dutils/Android.mk
e1861133d51b9e6a6f658eb366630ad4f4d3ff8f 27-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'

Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
ba9844ee1242243306aaf78cca2a15cb2dd2f083 27-Mar-2009 Dave Sparks <> AI 143127: Media recorder service requires android.permission.CAMERA to record video
BUG=1742392

Automated import of CL 143127
ibmediaplayerservice/MediaRecorderClient.cpp
d4d70d95ead48c827c5b44760929d9f7ae25d2f4 26-Mar-2009 Mike Lockwood <> Automated import from //branches/cupcake/...@143001,143001
dutils/Android.mk
26a857e18198548417ec9fd871f0a322b648b226 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/master/...@142377,142377
ava/android/media/JetPlayer.java
3d78f9ab080c582443d1b78d933c899b52588fb2 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/donutburger/...@142376,142376
ava/android/media/JetPlayer.java
3e7b3c0f270d2bf86fb701a94e55cb135480d571 25-Mar-2009 Yu Shan Emily Lau <> Automated import from //branches/master/...@142150,142150
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
fd92c5743975663d2082177b88a3c3a1edaea442 25-Mar-2009 Yu Shan Emily Lau <> Automated import from //branches/donutburger/...@142149,142149
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
ba5aba22ab1e5522051d706474881cc763f2daa5 25-Mar-2009 Eric Laurent <> Automated import from //branches/master/...@142066,142066
ibmedia/AudioRecord.cpp
272beb63834e213ee35a83741a5e2ae1279999d5 25-Mar-2009 Eric Laurent <> Automated import from //branches/donutburger/...@142065,142065
ibmedia/AudioRecord.cpp
effd8d55b2394e3f9a772fd6b71684546e17004f 25-Mar-2009 Andreas Huber <> Automated import from //branches/master/...@141712,141712
ibmedia/mediaplayer.cpp
e25b51baf43bab5b8c19546a93c0bf73025ffbee 25-Mar-2009 Andreas Huber <> Automated import from //branches/donutburger/...@141711,141711
ibmedia/mediaplayer.cpp
821ef406f8a481d41dda49903ff55069a676f265 25-Mar-2009 Dave Sparks <> Automated import from //branches/master/...@141595,141595
ibmediaplayerservice/MediaPlayerService.cpp
6ee2e78e1c74a9389db3fc687c7b03fec9494632 25-Mar-2009 Dave Sparks <> Automated import from //branches/donutburger/...@141593,141593
ibmediaplayerservice/MediaPlayerService.cpp
4a0029f95db144ba735b35e636400e8ce535383f 25-Mar-2009 Niko Catania <> Automated import from //branches/donutburger/...@141213,141213
ava/android/media/MediaPlayer.java
a06f6e328dd969699b1dcf347476d31a76a0f9fb 25-Mar-2009 Niko Catania <> Automated import from //branches/master/...@141214,141214
ava/android/media/MediaPlayer.java
78c131473165830c8d042a0f445ca858aaa7a4b1 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/donutburger/...@141200,141200
ibmedia/AudioRecord.cpp
108762b6e03b79c61641009bb4b4e3d090157401 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/master/...@141201,141201
ibmedia/AudioRecord.cpp
cb80d9fd97a4e188f0befc2721eea6a5c92a5047 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/cupcake/...@142374,142374
ava/android/media/JetPlayer.java
6887e54e5c8de4bdb3a6fc70548742f35a5d4d49 25-Mar-2009 Yu Shan Emily Lau <> Automated import from //branches/cupcake/...@142148,142148
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
e0366d0b2fc9bb232efbe3672e2ae883dea9451c 25-Mar-2009 Eric Laurent <> Automated import from //branches/cupcake/...@142064,142064
ibmedia/AudioRecord.cpp
e89554b02d65eb87fb502b675b366d41abfa4979 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/master/...@140869,140869
ibmedia/JetPlayer.cpp
d3ca04da8ad8f50b6abbf545e6de9a9a2bc2e0d1 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/donutburger/...@140867,140867
ibmedia/JetPlayer.cpp
ebb020aebc157ff127458dc20e1d0066b86bb99d 25-Mar-2009 Jason Sams <> Automated import from //branches/master/...@140868,140868
ibmedia/mediaplayer.cpp
4610f7d1f9c98c5abcb47d45b51bade2443fa84a 25-Mar-2009 Jason Sams <> Automated import from //branches/donutburger/...@140866,140866
ibmedia/mediaplayer.cpp
08905cc3362d8737290ceba96077aa2d234ab378 25-Mar-2009 Dianne Hackborn <> Automated import from //branches/donutburger/...@140818,140818
ni/soundpool/NOTICE
678764730bb7034537e04dbfe5b2191d775e1f73 25-Mar-2009 Dianne Hackborn <> Automated import from //branches/master/...@140824,140824
ni/soundpool/NOTICE
d01721d5ca5bfa943760ed61cc99ca1ffc044c50 25-Mar-2009 Niko Catania <> Automated import from //branches/donutburger/...@140811,140811
ava/android/media/AudioTrack.java
70322464af6c08624667cd37bb252053673f2e63 25-Mar-2009 Niko Catania <> Automated import from //branches/master/...@140812,140812
ava/android/media/AudioTrack.java
1a9f7399bb32c81ad5cc8c9d74ab3065b4a150ac 25-Mar-2009 Niko Catania <> Automated import from //branches/donutburger/...@140800,140800
ava/android/media/AudioService.java
5f44349c1239fdce883ae0d79e9990455a16e04a 25-Mar-2009 Niko Catania <> Automated import from //branches/master/...@140804,140804
ava/android/media/AudioService.java
4873375b2a7da6b6c323987203c1c11f3eb74201 25-Mar-2009 Andreas Huber <> Automated import from //branches/cupcake/...@141708,141708
ibmedia/mediaplayer.cpp
e025d2d74641d7654f65cbc1bc409f45f4a7b354 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/master/...@140665,140665
ibmedia/AudioTrack.cpp
4a5c1a7e84a250eafe0e3a12d859c45747520d55 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/donutburger/...@140663,140663
ibmedia/AudioTrack.cpp
a5e5643d5d022b59f37cae7f7dec8b24fe9510c1 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/master/...@140567,140567
ava/android/media/AudioRecord.java
cb9a44ed089b9f756f1fda6c9f7994e617138b36 25-Mar-2009 Dave Sparks <> Automated import from //branches/cupcake/...@141591,141591
ibmediaplayerservice/MediaPlayerService.cpp
470f71f4a4d6d3a504b62473bd435bf80493414f 25-Mar-2009 Jean-Michel Trivi <> Automated import from //branches/donutburger/...@140566,140566
ava/android/media/AudioRecord.java
3ff637187ab528137fb1fd82875ce08383265edb 25-Mar-2009 Jason Parekh <> Automated import from //branches/master/...@140509,140509
ava/android/media/AudioService.java
b109615ebebd6f3b9ae789412279f576c3ace46b 25-Mar-2009 Jason Parekh <> Automated import from //branches/donutburger/...@140507,140507
ava/android/media/AudioService.java
680f8c77d5e9e89ced62047f703b47a6b6cf4b86 21-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Deal better with situations where OpenCORE is disabled.
ni/Android.mk
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MetadataRetrieverClient.cpp
c2ad241504fcaa12d4579d3b0b4038d1ca8d08c9 20-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@141571
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioTrack.java
ava/android/media/MediaPlayer.java
ni/soundpool/NOTICE
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/JetPlayer.cpp
ibmedia/mediaplayer.cpp
105925376f8d0f6b318c9938c7b83ef7fef094da 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
ava/android/media/AudioManager.java
ava/android/media/AudioTrack.java
ava/android/media/JetPlayer.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
ibmedia/AudioTrack.cpp
ibmedia/JetPlayer.cpp
ibmedia/mediarecorder.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java
2a73de7b21a89aa2ba4c254d28658b49793425b2 18-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
c39a6e0c51e182338deb8b63d07933b585134929 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
ava/android/media/MediaPlayer.java
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
b2a3dd88a53cc8c6d19f6dc8ec4f3d6c4abd9b54 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
ibmedia/ToneGenerator.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
b22d55b9f8048b2a1ed99b90894c19388bebd7ae 06-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136620
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
4df2423a947bcd3f024cc3d3a1a315a8dc428598 05-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136594
ava/android/media/AudioTrack.java
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ibmedia/AudioTrack.cpp
ibmedia/mediarecorder.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ava/android/drm/mobile1/DrmConstraintInfo.java
ava/android/drm/mobile1/DrmException.java
ava/android/drm/mobile1/DrmRawContent.java
ava/android/drm/mobile1/DrmRights.java
ava/android/drm/mobile1/DrmRightsManager.java
ava/android/drm/mobile1/package.html
ava/android/media/AmrInputStream.java
ava/android/media/AsyncPlayer.java
ava/android/media/AudioFormat.java
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/AudioTrack.java
ava/android/media/FaceDetector.java
ava/android/media/IAudioService.aidl
ava/android/media/IMediaScannerListener.aidl
ava/android/media/IMediaScannerService.aidl
ava/android/media/JetPlayer.java
ava/android/media/MediaFile.java
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerClient.java
ava/android/media/MediaScannerConnection.java
ava/android/media/ResampleInputStream.java
ava/android/media/Ringtone.java
ava/android/media/RingtoneManager.java
ava/android/media/SoundPool.java
ava/android/media/ToneGenerator.java
ava/android/media/package.html
ni/Android.mk
ni/MODULE_LICENSE_APACHE2
ni/NOTICE
ni/android_media_AmrInputStream.cpp
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/android_media_ResampleInputStream.cpp
ni/soundpool/Android.mk
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/SoundPoolThread.cpp
ni/soundpool/SoundPoolThread.h
ni/soundpool/android_media_SoundPool.cpp
ibdrm/Android.mk
ibdrm/MODULE_LICENSE_APACHE2
ibdrm/NOTICE
ibdrm/mobile1/Android.mk
ibdrm/mobile1/include/drm_common_types.h
ibdrm/mobile1/include/jni/drm1_jni.h
ibdrm/mobile1/include/objmng/drm_decoder.h
ibdrm/mobile1/include/objmng/drm_file.h
ibdrm/mobile1/include/objmng/drm_i18n.h
ibdrm/mobile1/include/objmng/drm_inner.h
ibdrm/mobile1/include/objmng/drm_rights_manager.h
ibdrm/mobile1/include/objmng/drm_time.h
ibdrm/mobile1/include/objmng/svc_drm.h
ibdrm/mobile1/include/parser/parser_dcf.h
ibdrm/mobile1/include/parser/parser_dm.h
ibdrm/mobile1/include/parser/parser_rel.h
ibdrm/mobile1/include/xml/wbxml_tinyparser.h
ibdrm/mobile1/include/xml/xml_tinyParser.h
ibdrm/mobile1/src/jni/drm1_jni.c
ibdrm/mobile1/src/objmng/drm_api.c
ibdrm/mobile1/src/objmng/drm_decoder.c
ibdrm/mobile1/src/objmng/drm_file.c
ibdrm/mobile1/src/objmng/drm_i18n.c
ibdrm/mobile1/src/objmng/drm_rights_manager.c
ibdrm/mobile1/src/objmng/drm_time.c
ibdrm/mobile1/src/parser/parser_dcf.c
ibdrm/mobile1/src/parser/parser_dm.c
ibdrm/mobile1/src/parser/parser_rel.c
ibdrm/mobile1/src/xml/xml_tinyparser.c
ibdrm/mobile2/Android.mk
ibdrm/mobile2/include/Drm2CommonTypes.h
ibdrm/mobile2/include/dcf/DrmDcfCommon.h
ibdrm/mobile2/include/dcf/DrmDcfContainer.h
ibdrm/mobile2/include/dcf/DrmIStream.h
ibdrm/mobile2/include/dcf/DrmRawContent.h
ibdrm/mobile2/include/drmmanager/DrmManager.h
ibdrm/mobile2/include/rights/Asset.h
ibdrm/mobile2/include/rights/Constraint.h
ibdrm/mobile2/include/rights/OperationPermission.h
ibdrm/mobile2/include/rights/Right.h
ibdrm/mobile2/include/rights/Ro.h
ibdrm/mobile2/include/rights/RoManager.h
ibdrm/mobile2/include/roap/Registration.h
ibdrm/mobile2/include/roap/RoapMessageHandler.h
ibdrm/mobile2/include/util/crypto/DrmCrypto.h
ibdrm/mobile2/include/util/domcore/CharacterDataImpl.h
ibdrm/mobile2/include/util/domcore/DOMException.h
ibdrm/mobile2/include/util/domcore/DOMString.h
ibdrm/mobile2/include/util/domcore/DocumentImpl.h
ibdrm/mobile2/include/util/domcore/ElementImpl.h
ibdrm/mobile2/include/util/domcore/NodeImpl.h
ibdrm/mobile2/include/util/domcore/NodeIterator.h
ibdrm/mobile2/include/util/domcore/NodeListImpl.h
ibdrm/mobile2/include/util/domcore/NodeType.h
ibdrm/mobile2/include/util/domcore/TextImpl.h
ibdrm/mobile2/include/util/domcore/Vector.h
ibdrm/mobile2/include/util/domcore/stack.h
ibdrm/mobile2/include/util/xml/DomExpatAgent.h
ibdrm/mobile2/include/util/xml/ExpatWrapper.h
ibdrm/mobile2/include/util/xml/XMLDocumentImpl.h
ibdrm/mobile2/include/util/xml/XMLElementImpl.h
ibdrm/mobile2/src/dcf/DrmDcfCommon.cpp
ibdrm/mobile2/src/dcf/DrmDcfContainer.cpp
ibdrm/mobile2/src/dcf/DrmIStream.cpp
ibdrm/mobile2/src/dcf/DrmRawContent.cpp
ibdrm/mobile2/src/drmmanager/DrmManager.cpp
ibdrm/mobile2/src/rights/Asset.cpp
ibdrm/mobile2/src/rights/Constraint.cpp
ibdrm/mobile2/src/rights/OperationPermission.cpp
ibdrm/mobile2/src/rights/Right.cpp
ibdrm/mobile2/src/rights/Ro.cpp
ibdrm/mobile2/src/rights/RoManager.cpp
ibdrm/mobile2/src/roap/Registration.cpp
ibdrm/mobile2/src/roap/RoapMessageHandler.cpp
ibdrm/mobile2/src/util/crypto/DrmCrypto.cpp
ibdrm/mobile2/src/util/domcore/CharacterDataImpl.cpp
ibdrm/mobile2/src/util/domcore/DOMException.cpp
ibdrm/mobile2/src/util/domcore/DocumentImpl.cpp
ibdrm/mobile2/src/util/domcore/ElementImpl.cpp
ibdrm/mobile2/src/util/domcore/NodeImpl.cpp
ibdrm/mobile2/src/util/domcore/NodeIterator.cpp
ibdrm/mobile2/src/util/domcore/NodeListImpl.cpp
ibdrm/mobile2/src/util/domcore/TextImpl.cpp
ibdrm/mobile2/src/util/ustl-1.0/bktrace.cpp
ibdrm/mobile2/src/util/ustl-1.0/bktrace.h
ibdrm/mobile2/src/util/ustl-1.0/bsconf.h
ibdrm/mobile2/src/util/ustl-1.0/cmemlink.cpp
ibdrm/mobile2/src/util/ustl-1.0/cmemlink.h
ibdrm/mobile2/src/util/ustl-1.0/config.h
ibdrm/mobile2/src/util/ustl-1.0/fstream.cpp
ibdrm/mobile2/src/util/ustl-1.0/fstream.h
ibdrm/mobile2/src/util/ustl-1.0/memblock.cpp
ibdrm/mobile2/src/util/ustl-1.0/memblock.h
ibdrm/mobile2/src/util/ustl-1.0/memlink.cpp
ibdrm/mobile2/src/util/ustl-1.0/memlink.h
ibdrm/mobile2/src/util/ustl-1.0/mistream.cpp
ibdrm/mobile2/src/util/ustl-1.0/mistream.h
ibdrm/mobile2/src/util/ustl-1.0/mostream.h
ibdrm/mobile2/src/util/ustl-1.0/ofstream.cpp
ibdrm/mobile2/src/util/ustl-1.0/ofstream.h
ibdrm/mobile2/src/util/ustl-1.0/simd.h
ibdrm/mobile2/src/util/ustl-1.0/sistream.cpp
ibdrm/mobile2/src/util/ustl-1.0/sistream.h
ibdrm/mobile2/src/util/ustl-1.0/sostream.cpp
ibdrm/mobile2/src/util/ustl-1.0/sostream.h
ibdrm/mobile2/src/util/ustl-1.0/strmsize.h
ibdrm/mobile2/src/util/ustl-1.0/ualgo.h
ibdrm/mobile2/src/util/ustl-1.0/ualgobase.cpp
ibdrm/mobile2/src/util/ustl-1.0/ualgobase.h
ibdrm/mobile2/src/util/ustl-1.0/uassert.h
ibdrm/mobile2/src/util/ustl-1.0/ubitset.cpp
ibdrm/mobile2/src/util/ustl-1.0/ubitset.h
ibdrm/mobile2/src/util/ustl-1.0/uctralgo.h
ibdrm/mobile2/src/util/ustl-1.0/uctrstrm.h
ibdrm/mobile2/src/util/ustl-1.0/uexception.cpp
ibdrm/mobile2/src/util/ustl-1.0/uexception.h
ibdrm/mobile2/src/util/ustl-1.0/ufunction.h
ibdrm/mobile2/src/util/ustl-1.0/uheap.h
ibdrm/mobile2/src/util/ustl-1.0/uios.h
ibdrm/mobile2/src/util/ustl-1.0/uiosfunc.h
ibdrm/mobile2/src/util/ustl-1.0/uiterator.h
ibdrm/mobile2/src/util/ustl-1.0/ulaalgo.h
ibdrm/mobile2/src/util/ustl-1.0/ulimits.h
ibdrm/mobile2/src/util/ustl-1.0/ulist.h
ibdrm/mobile2/src/util/ustl-1.0/umap.h
ibdrm/mobile2/src/util/ustl-1.0/umatrix.h
ibdrm/mobile2/src/util/ustl-1.0/umemory.h
ibdrm/mobile2/src/util/ustl-1.0/umultimap.h
ibdrm/mobile2/src/util/ustl-1.0/umultiset.h
ibdrm/mobile2/src/util/ustl-1.0/unew.cpp
ibdrm/mobile2/src/util/ustl-1.0/unew.h
ibdrm/mobile2/src/util/ustl-1.0/unumeric.h
ibdrm/mobile2/src/util/ustl-1.0/upair.h
ibdrm/mobile2/src/util/ustl-1.0/upredalgo.h
ibdrm/mobile2/src/util/ustl-1.0/uqueue.h
ibdrm/mobile2/src/util/ustl-1.0/uset.h
ibdrm/mobile2/src/util/ustl-1.0/uspecial.h
ibdrm/mobile2/src/util/ustl-1.0/ustack.h
ibdrm/mobile2/src/util/ustl-1.0/ustdxept.cpp
ibdrm/mobile2/src/util/ustl-1.0/ustdxept.h
ibdrm/mobile2/src/util/ustl-1.0/ustl.tbff
ibdrm/mobile2/src/util/ustl-1.0/ustring.cpp
ibdrm/mobile2/src/util/ustl-1.0/ustring.h
ibdrm/mobile2/src/util/ustl-1.0/utf8.h
ibdrm/mobile2/src/util/ustl-1.0/utuple.h
ibdrm/mobile2/src/util/ustl-1.0/utypes.h
ibdrm/mobile2/src/util/ustl-1.0/uutility.h
ibdrm/mobile2/src/util/ustl-1.0/uvector.h
ibdrm/mobile2/src/util/xml/DomExpatAgent.cpp
ibdrm/mobile2/src/util/xml/ExpatWrapper.cpp
ibdrm/mobile2/src/util/xml/XMLDocumentImpl.cpp
ibdrm/mobile2/src/util/xml/XMLElementImpl.cpp
ibmedia/Android.mk
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/JetPlayer.cpp
ibmedia/MODULE_LICENSE_APACHE2
ibmedia/NOTICE
ibmedia/ToneGenerator.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/VorbisPlayer.cpp
ibmediaplayerservice/VorbisPlayer.h
ediaserver/Android.mk
ediaserver/main_mediaserver.cpp
dutils/Android.mk
dutils/sdutil.cpp
ests/MediaFrameworkTest/Android.mk
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/res/drawable/icon.png
ests/MediaFrameworkTest/res/layout/movie_view.xml
ests/MediaFrameworkTest/res/layout/surface_view.xml
ests/MediaFrameworkTest/res/raw/shortmp3.mp3
ests/MediaFrameworkTest/res/raw/testmidi.mid
ests/MediaFrameworkTest/res/raw/testmp3.mp3
ests/MediaFrameworkTest/res/values/strings.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkUnitTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/SimTonesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetCurrentPositionStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetDurationStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetVideoHeightStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetVideoWidthStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerIsPlayingStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMethodUnderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerPauseStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSeekToStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetAudioStreamTypeStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetLoopingStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetVolumeStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStateErrors.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStateUnitTestTemplate.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStopStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderMethodUnderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStateErrors.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStateUnitTestTemplate.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ava/android/drm/mobile1/DrmConstraintInfo.java
ava/android/drm/mobile1/DrmException.java
ava/android/drm/mobile1/DrmRawContent.java
ava/android/drm/mobile1/DrmRights.java
ava/android/drm/mobile1/DrmRightsManager.java
ava/android/drm/mobile1/package.html
ava/android/media/AmrInputStream.java
ava/android/media/AsyncPlayer.java
ava/android/media/AudioFormat.java
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/AudioTrack.java
ava/android/media/FaceDetector.java
ava/android/media/IAudioService.aidl
ava/android/media/IMediaScannerListener.aidl
ava/android/media/IMediaScannerService.aidl
ava/android/media/JetPlayer.java
ava/android/media/MediaFile.java
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerClient.java
ava/android/media/MediaScannerConnection.java
ava/android/media/ResampleInputStream.java
ava/android/media/Ringtone.java
ava/android/media/RingtoneManager.java
ava/android/media/SoundPool.java
ava/android/media/ToneGenerator.java
ava/android/media/package.html
ni/Android.mk
ni/MODULE_LICENSE_APACHE2
ni/NOTICE
ni/android_media_AmrInputStream.cpp
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/android_media_ResampleInputStream.cpp
ni/soundpool/Android.mk
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/SoundPoolThread.cpp
ni/soundpool/SoundPoolThread.h
ni/soundpool/android_media_SoundPool.cpp
ibdrm/Android.mk
ibdrm/MODULE_LICENSE_APACHE2
ibdrm/NOTICE
ibdrm/mobile1/Android.mk
ibdrm/mobile1/include/drm_common_types.h
ibdrm/mobile1/include/jni/drm1_jni.h
ibdrm/mobile1/include/objmng/drm_decoder.h
ibdrm/mobile1/include/objmng/drm_file.h
ibdrm/mobile1/include/objmng/drm_i18n.h
ibdrm/mobile1/include/objmng/drm_inner.h
ibdrm/mobile1/include/objmng/drm_rights_manager.h
ibdrm/mobile1/include/objmng/drm_time.h
ibdrm/mobile1/include/objmng/svc_drm.h
ibdrm/mobile1/include/parser/parser_dcf.h
ibdrm/mobile1/include/parser/parser_dm.h
ibdrm/mobile1/include/parser/parser_rel.h
ibdrm/mobile1/include/xml/wbxml_tinyparser.h
ibdrm/mobile1/include/xml/xml_tinyParser.h
ibdrm/mobile1/src/jni/drm1_jni.c
ibdrm/mobile1/src/objmng/drm_api.c
ibdrm/mobile1/src/objmng/drm_decoder.c
ibdrm/mobile1/src/objmng/drm_file.c
ibdrm/mobile1/src/objmng/drm_i18n.c
ibdrm/mobile1/src/objmng/drm_rights_manager.c
ibdrm/mobile1/src/objmng/drm_time.c
ibdrm/mobile1/src/parser/parser_dcf.c
ibdrm/mobile1/src/parser/parser_dm.c
ibdrm/mobile1/src/parser/parser_rel.c
ibdrm/mobile1/src/xml/xml_tinyparser.c
ibdrm/mobile2/Android.mk
ibdrm/mobile2/include/Drm2CommonTypes.h
ibdrm/mobile2/include/dcf/DrmDcfCommon.h
ibdrm/mobile2/include/dcf/DrmDcfContainer.h
ibdrm/mobile2/include/dcf/DrmIStream.h
ibdrm/mobile2/include/dcf/DrmRawContent.h
ibdrm/mobile2/include/drmmanager/DrmManager.h
ibdrm/mobile2/include/rights/Asset.h
ibdrm/mobile2/include/rights/Constraint.h
ibdrm/mobile2/include/rights/OperationPermission.h
ibdrm/mobile2/include/rights/Right.h
ibdrm/mobile2/include/rights/Ro.h
ibdrm/mobile2/include/rights/RoManager.h
ibdrm/mobile2/include/roap/Registration.h
ibdrm/mobile2/include/roap/RoapMessageHandler.h
ibdrm/mobile2/include/util/crypto/DrmCrypto.h
ibdrm/mobile2/include/util/domcore/CharacterDataImpl.h
ibdrm/mobile2/include/util/domcore/DOMException.h
ibdrm/mobile2/include/util/domcore/DOMString.h
ibdrm/mobile2/include/util/domcore/DocumentImpl.h
ibdrm/mobile2/include/util/domcore/ElementImpl.h
ibdrm/mobile2/include/util/domcore/NodeImpl.h
ibdrm/mobile2/include/util/domcore/NodeIterator.h
ibdrm/mobile2/include/util/domcore/NodeListImpl.h
ibdrm/mobile2/include/util/domcore/NodeType.h
ibdrm/mobile2/include/util/domcore/TextImpl.h
ibdrm/mobile2/include/util/domcore/Vector.h
ibdrm/mobile2/include/util/domcore/stack.h
ibdrm/mobile2/include/util/xml/DomExpatAgent.h
ibdrm/mobile2/include/util/xml/ExpatWrapper.h
ibdrm/mobile2/include/util/xml/XMLDocumentImpl.h
ibdrm/mobile2/include/util/xml/XMLElementImpl.h
ibdrm/mobile2/src/dcf/DrmDcfCommon.cpp
ibdrm/mobile2/src/dcf/DrmDcfContainer.cpp
ibdrm/mobile2/src/dcf/DrmIStream.cpp
ibdrm/mobile2/src/dcf/DrmRawContent.cpp
ibdrm/mobile2/src/drmmanager/DrmManager.cpp
ibdrm/mobile2/src/rights/Asset.cpp
ibdrm/mobile2/src/rights/Constraint.cpp
ibdrm/mobile2/src/rights/OperationPermission.cpp
ibdrm/mobile2/src/rights/Right.cpp
ibdrm/mobile2/src/rights/Ro.cpp
ibdrm/mobile2/src/rights/RoManager.cpp
ibdrm/mobile2/src/roap/Registration.cpp
ibdrm/mobile2/src/roap/RoapMessageHandler.cpp
ibdrm/mobile2/src/util/crypto/DrmCrypto.cpp
ibdrm/mobile2/src/util/domcore/CharacterDataImpl.cpp
ibdrm/mobile2/src/util/domcore/DOMException.cpp
ibdrm/mobile2/src/util/domcore/DocumentImpl.cpp
ibdrm/mobile2/src/util/domcore/ElementImpl.cpp
ibdrm/mobile2/src/util/domcore/NodeImpl.cpp
ibdrm/mobile2/src/util/domcore/NodeIterator.cpp
ibdrm/mobile2/src/util/domcore/NodeListImpl.cpp
ibdrm/mobile2/src/util/domcore/TextImpl.cpp
ibdrm/mobile2/src/util/ustl-1.0/bktrace.cpp
ibdrm/mobile2/src/util/ustl-1.0/bktrace.h
ibdrm/mobile2/src/util/ustl-1.0/bsconf.h
ibdrm/mobile2/src/util/ustl-1.0/cmemlink.cpp
ibdrm/mobile2/src/util/ustl-1.0/cmemlink.h
ibdrm/mobile2/src/util/ustl-1.0/config.h
ibdrm/mobile2/src/util/ustl-1.0/fstream.cpp
ibdrm/mobile2/src/util/ustl-1.0/fstream.h
ibdrm/mobile2/src/util/ustl-1.0/memblock.cpp
ibdrm/mobile2/src/util/ustl-1.0/memblock.h
ibdrm/mobile2/src/util/ustl-1.0/memlink.cpp
ibdrm/mobile2/src/util/ustl-1.0/memlink.h
ibdrm/mobile2/src/util/ustl-1.0/mistream.cpp
ibdrm/mobile2/src/util/ustl-1.0/mistream.h
ibdrm/mobile2/src/util/ustl-1.0/mostream.h
ibdrm/mobile2/src/util/ustl-1.0/ofstream.cpp
ibdrm/mobile2/src/util/ustl-1.0/ofstream.h
ibdrm/mobile2/src/util/ustl-1.0/simd.h
ibdrm/mobile2/src/util/ustl-1.0/sistream.cpp
ibdrm/mobile2/src/util/ustl-1.0/sistream.h
ibdrm/mobile2/src/util/ustl-1.0/sostream.cpp
ibdrm/mobile2/src/util/ustl-1.0/sostream.h
ibdrm/mobile2/src/util/ustl-1.0/strmsize.h
ibdrm/mobile2/src/util/ustl-1.0/ualgo.h
ibdrm/mobile2/src/util/ustl-1.0/ualgobase.cpp
ibdrm/mobile2/src/util/ustl-1.0/ualgobase.h
ibdrm/mobile2/src/util/ustl-1.0/uassert.h
ibdrm/mobile2/src/util/ustl-1.0/ubitset.cpp
ibdrm/mobile2/src/util/ustl-1.0/ubitset.h
ibdrm/mobile2/src/util/ustl-1.0/uctralgo.h
ibdrm/mobile2/src/util/ustl-1.0/uctrstrm.h
ibdrm/mobile2/src/util/ustl-1.0/uexception.cpp
ibdrm/mobile2/src/util/ustl-1.0/uexception.h
ibdrm/mobile2/src/util/ustl-1.0/ufunction.h
ibdrm/mobile2/src/util/ustl-1.0/uheap.h
ibdrm/mobile2/src/util/ustl-1.0/uios.h
ibdrm/mobile2/src/util/ustl-1.0/uiosfunc.h
ibdrm/mobile2/src/util/ustl-1.0/uiterator.h
ibdrm/mobile2/src/util/ustl-1.0/ulaalgo.h
ibdrm/mobile2/src/util/ustl-1.0/ulimits.h
ibdrm/mobile2/src/util/ustl-1.0/ulist.h
ibdrm/mobile2/src/util/ustl-1.0/umap.h
ibdrm/mobile2/src/util/ustl-1.0/umatrix.h
ibdrm/mobile2/src/util/ustl-1.0/umemory.h
ibdrm/mobile2/src/util/ustl-1.0/umultimap.h
ibdrm/mobile2/src/util/ustl-1.0/umultiset.h
ibdrm/mobile2/src/util/ustl-1.0/unew.cpp
ibdrm/mobile2/src/util/ustl-1.0/unew.h
ibdrm/mobile2/src/util/ustl-1.0/unumeric.h
ibdrm/mobile2/src/util/ustl-1.0/upair.h
ibdrm/mobile2/src/util/ustl-1.0/upredalgo.h
ibdrm/mobile2/src/util/ustl-1.0/uqueue.h
ibdrm/mobile2/src/util/ustl-1.0/uset.h
ibdrm/mobile2/src/util/ustl-1.0/uspecial.h
ibdrm/mobile2/src/util/ustl-1.0/ustack.h
ibdrm/mobile2/src/util/ustl-1.0/ustdxept.cpp
ibdrm/mobile2/src/util/ustl-1.0/ustdxept.h
ibdrm/mobile2/src/util/ustl-1.0/ustl.tbff
ibdrm/mobile2/src/util/ustl-1.0/ustring.cpp
ibdrm/mobile2/src/util/ustl-1.0/ustring.h
ibdrm/mobile2/src/util/ustl-1.0/utf8.h
ibdrm/mobile2/src/util/ustl-1.0/utuple.h
ibdrm/mobile2/src/util/ustl-1.0/utypes.h
ibdrm/mobile2/src/util/ustl-1.0/uutility.h
ibdrm/mobile2/src/util/ustl-1.0/uvector.h
ibdrm/mobile2/src/util/xml/DomExpatAgent.cpp
ibdrm/mobile2/src/util/xml/ExpatWrapper.cpp
ibdrm/mobile2/src/util/xml/XMLDocumentImpl.cpp
ibdrm/mobile2/src/util/xml/XMLElementImpl.cpp
ibmedia/Android.mk
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/JetPlayer.cpp
ibmedia/MODULE_LICENSE_APACHE2
ibmedia/NOTICE
ibmedia/ToneGenerator.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/VorbisPlayer.cpp
ibmediaplayerservice/VorbisPlayer.h
ediaserver/Android.mk
ediaserver/main_mediaserver.cpp
dutils/Android.mk
dutils/sdutil.cpp
ests/MediaFrameworkTest/Android.mk
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/res/drawable/icon.png
ests/MediaFrameworkTest/res/layout/movie_view.xml
ests/MediaFrameworkTest/res/layout/surface_view.xml
ests/MediaFrameworkTest/res/raw/shortmp3.mp3
ests/MediaFrameworkTest/res/raw/testmidi.mid
ests/MediaFrameworkTest/res/raw/testmp3.mp3
ests/MediaFrameworkTest/res/values/strings.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkUnitTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/SimTonesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetCurrentPositionStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetDurationStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetVideoHeightStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetVideoWidthStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerIsPlayingStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMethodUnderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerPauseStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSeekToStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetAudioStreamTypeStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetLoopingStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetVolumeStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStateErrors.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStateUnitTestTemplate.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStopStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderMethodUnderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStateErrors.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStateUnitTestTemplate.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
076357b8567458d4b6dfdcf839ef751634cd2bfb 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
ava/android/media/AudioRecord.java
ava/android/media/AudioTrack.java
ava/android/media/JetPlayer.java
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/Ringtone.java
ava/android/media/SoundPool.java
ni/android_media_MediaRecorder.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
3dec7d563a2f3e1eb967ce2054a00b6620e3558c 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
ava/android/media/AudioRecord.java
ava/android/media/AudioTrack.java
ava/android/media/JetPlayer.java
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/Ringtone.java
ava/android/media/SoundPool.java
ni/android_media_MediaRecorder.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
9f25eadc4869b4e587240332dec9a762b71b969d 02-Mar-2009 root <pmerle@kph.uni-mainz.de> Fixed typing mistake causing process crashes.
ibmedia/AudioRecord.cpp
15ab3eae2ec3d73b3e8aa60b33ae41445bf83f4b 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
ibmedia/AudioRecord.cpp
ibmedia/ToneGenerator.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStateUnitTestTemplate.java
3001a035439d8134a7d70d796376d1dfbff3cdcd 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
ava/android/media/AsyncPlayer.java
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioTrack.java
ava/android/media/IAudioService.aidl
ibmedia/AudioTrack.cpp
ibmedia/JetPlayer.cpp
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
da996f390e17e16f2dfa60e972e7ebc4f868f37e 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioTrack.java
ava/android/media/MediaRecorder.java
ni/android_media_MediaRecorder.cpp
ni/soundpool/SoundPool.cpp
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/JetPlayer.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/VorbisPlayer.cpp
d24b8183b93e781080b2c16c487e60d51c12da31 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
ava/android/media/AudioFormat.java
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/AudioTrack.java
ava/android/media/JetPlayer.java
ava/android/media/MediaFile.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/MediaScanner.java
ni/android_media_MediaRecorder.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ibmedia/Android.mk
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioFlingerClient.cpp
ibmedia/JetPlayer.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/VorbisPlayer.cpp
dutils/sdutil.cpp
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaAudioTrackTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
ea780b689f8ee3dff355deab2434bbd4ae04d208 22-Jan-2009 Brock Atchison <batchison@pv.com> Changes required to accommodate OpenCORE 2.0
ni/Android.mk
ni/android_media_AmrInputStream.cpp
ibmediaplayerservice/Android.mk
22f7dfd23490a3de2f21ff96949ba47003aac8f8 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
ibmedia/AudioRecord.cpp
ibmedia/AudioTrack.cpp
9266c558bf1d21ff647525ff99f7dadbca417309 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
dutils/Android.mk
dutils/sdutil.cpp
b798689749c64baba81f02e10cf2157c747d6b46 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
ava/android/media/AudioManager.java
ava/android/media/AudioTrack.java
ava/android/media/JetPlayer.java
ava/android/media/MediaMetadataRetriever.java
ava/android/media/ResampleInputStream.java
ni/Android.mk
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_ResampleInputStream.cpp
ibmedia/Android.mk
ibmedia/AudioTrack.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/JetPlayer.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediarecorder.cpp
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ava/android/media/AmrInputStream.java
ava/android/media/AudioFormat.java
ava/android/media/AudioManager.java
ava/android/media/AudioRecord.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/AudioTrack.java
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/MediaScanner.java
ava/android/media/Ringtone.java
ava/android/media/RingtoneManager.java
ava/android/media/SoundPool.java
ni/Android.mk
ni/android_media_AmrInputStream.cpp
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ibdrm/mobile1/src/jni/drm1_jni.c
ibdrm/mobile2/src/util/ustl-1.0/bktrace.cpp
ibmedia/Android.mk
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IMediaMetadataRetriever.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/IMediaRecorder.cpp
ibmedia/ToneGenerator.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmedia/mediarecorder.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MediaRecorderClient.cpp
ibmediaplayerservice/MediaRecorderClient.h
ibmediaplayerservice/MetadataRetrieverClient.cpp
ibmediaplayerservice/MetadataRetrieverClient.h
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/VorbisPlayer.cpp
ests/MediaFrameworkTest/Android.mk
ests/MediaFrameworkTest/AndroidManifest.xml
ests/MediaFrameworkTest/res/drawable/icon.png
ests/MediaFrameworkTest/res/layout/movie_view.xml
ests/MediaFrameworkTest/res/layout/surface_view.xml
ests/MediaFrameworkTest/res/raw/shortmp3.mp3
ests/MediaFrameworkTest/res/raw/testmidi.mid
ests/MediaFrameworkTest/res/raw/testmp3.mp3
ests/MediaFrameworkTest/res/values/strings.xml
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkPerfTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkUnitTestRunner.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/SimTonesTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/TonesAutoTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetCurrentPositionStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetDurationStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetVideoHeightStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerGetVideoWidthStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerIsPlayingStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerMethodUnderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerPauseStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSeekToStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetAudioStreamTypeStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetLoopingStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerSetVolumeStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStateErrors.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStateUnitTestTemplate.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaPlayerStopStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderMethodUnderTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStateErrors.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStateUnitTestTemplate.java
ests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
e70cfafe580c6f2994c4827cd8a534aabf3eb05c 21-Nov-2008 Jean-Baptiste Queru <jbq@google.com> Change ROUTE_ALL from 15 (4-bit mask) to -1 (32-bit mask) to allow for more routes in the future.
ava/android/media/AudioSystem.java
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ava/android/drm/mobile1/DrmConstraintInfo.java
ava/android/drm/mobile1/DrmException.java
ava/android/drm/mobile1/DrmRawContent.java
ava/android/drm/mobile1/DrmRights.java
ava/android/drm/mobile1/DrmRightsManager.java
ava/android/drm/mobile1/package.html
ava/android/media/AsyncPlayer.java
ava/android/media/AudioManager.java
ava/android/media/AudioService.java
ava/android/media/AudioSystem.java
ava/android/media/FaceDetector.java
ava/android/media/IAudioService.aidl
ava/android/media/IMediaScannerListener.aidl
ava/android/media/IMediaScannerService.aidl
ava/android/media/MediaFile.java
ava/android/media/MediaMetadataRetriever.java
ava/android/media/MediaPlayer.java
ava/android/media/MediaRecorder.java
ava/android/media/MediaScanner.java
ava/android/media/MediaScannerClient.java
ava/android/media/MediaScannerConnection.java
ava/android/media/Ringtone.java
ava/android/media/RingtoneManager.java
ava/android/media/SoundPool.java
ava/android/media/ToneGenerator.java
ava/android/media/package.html
ni/Android.mk
ni/MODULE_LICENSE_APACHE2
ni/NOTICE
ni/android_media_MediaMetadataRetriever.cpp
ni/android_media_MediaPlayer.cpp
ni/android_media_MediaRecorder.cpp
ni/android_media_MediaScanner.cpp
ni/soundpool/Android.mk
ni/soundpool/SoundPool.cpp
ni/soundpool/SoundPool.h
ni/soundpool/SoundPoolThread.cpp
ni/soundpool/SoundPoolThread.h
ni/soundpool/android_media_SoundPool.cpp
ibdrm/Android.mk
ibdrm/MODULE_LICENSE_APACHE2
ibdrm/NOTICE
ibdrm/mobile1/Android.mk
ibdrm/mobile1/include/drm_common_types.h
ibdrm/mobile1/include/jni/drm1_jni.h
ibdrm/mobile1/include/objmng/drm_decoder.h
ibdrm/mobile1/include/objmng/drm_file.h
ibdrm/mobile1/include/objmng/drm_i18n.h
ibdrm/mobile1/include/objmng/drm_inner.h
ibdrm/mobile1/include/objmng/drm_rights_manager.h
ibdrm/mobile1/include/objmng/drm_time.h
ibdrm/mobile1/include/objmng/svc_drm.h
ibdrm/mobile1/include/parser/parser_dcf.h
ibdrm/mobile1/include/parser/parser_dm.h
ibdrm/mobile1/include/parser/parser_rel.h
ibdrm/mobile1/include/xml/wbxml_tinyparser.h
ibdrm/mobile1/include/xml/xml_tinyParser.h
ibdrm/mobile1/src/jni/drm1_jni.c
ibdrm/mobile1/src/objmng/drm_api.c
ibdrm/mobile1/src/objmng/drm_decoder.c
ibdrm/mobile1/src/objmng/drm_file.c
ibdrm/mobile1/src/objmng/drm_i18n.c
ibdrm/mobile1/src/objmng/drm_rights_manager.c
ibdrm/mobile1/src/objmng/drm_time.c
ibdrm/mobile1/src/parser/parser_dcf.c
ibdrm/mobile1/src/parser/parser_dm.c
ibdrm/mobile1/src/parser/parser_rel.c
ibdrm/mobile1/src/xml/xml_tinyparser.c
ibdrm/mobile2/Android.mk
ibdrm/mobile2/include/Drm2CommonTypes.h
ibdrm/mobile2/include/dcf/DrmDcfCommon.h
ibdrm/mobile2/include/dcf/DrmDcfContainer.h
ibdrm/mobile2/include/dcf/DrmIStream.h
ibdrm/mobile2/include/dcf/DrmRawContent.h
ibdrm/mobile2/include/drmmanager/DrmManager.h
ibdrm/mobile2/include/rights/Asset.h
ibdrm/mobile2/include/rights/Constraint.h
ibdrm/mobile2/include/rights/OperationPermission.h
ibdrm/mobile2/include/rights/Right.h
ibdrm/mobile2/include/rights/Ro.h
ibdrm/mobile2/include/rights/RoManager.h
ibdrm/mobile2/include/roap/Registration.h
ibdrm/mobile2/include/roap/RoapMessageHandler.h
ibdrm/mobile2/include/util/crypto/DrmCrypto.h
ibdrm/mobile2/include/util/domcore/CharacterDataImpl.h
ibdrm/mobile2/include/util/domcore/DOMException.h
ibdrm/mobile2/include/util/domcore/DOMString.h
ibdrm/mobile2/include/util/domcore/DocumentImpl.h
ibdrm/mobile2/include/util/domcore/ElementImpl.h
ibdrm/mobile2/include/util/domcore/NodeImpl.h
ibdrm/mobile2/include/util/domcore/NodeIterator.h
ibdrm/mobile2/include/util/domcore/NodeListImpl.h
ibdrm/mobile2/include/util/domcore/NodeType.h
ibdrm/mobile2/include/util/domcore/TextImpl.h
ibdrm/mobile2/include/util/domcore/Vector.h
ibdrm/mobile2/include/util/domcore/stack.h
ibdrm/mobile2/include/util/xml/DomExpatAgent.h
ibdrm/mobile2/include/util/xml/ExpatWrapper.h
ibdrm/mobile2/include/util/xml/XMLDocumentImpl.h
ibdrm/mobile2/include/util/xml/XMLElementImpl.h
ibdrm/mobile2/src/dcf/DrmDcfCommon.cpp
ibdrm/mobile2/src/dcf/DrmDcfContainer.cpp
ibdrm/mobile2/src/dcf/DrmIStream.cpp
ibdrm/mobile2/src/dcf/DrmRawContent.cpp
ibdrm/mobile2/src/drmmanager/DrmManager.cpp
ibdrm/mobile2/src/rights/Asset.cpp
ibdrm/mobile2/src/rights/Constraint.cpp
ibdrm/mobile2/src/rights/OperationPermission.cpp
ibdrm/mobile2/src/rights/Right.cpp
ibdrm/mobile2/src/rights/Ro.cpp
ibdrm/mobile2/src/rights/RoManager.cpp
ibdrm/mobile2/src/roap/Registration.cpp
ibdrm/mobile2/src/roap/RoapMessageHandler.cpp
ibdrm/mobile2/src/util/crypto/DrmCrypto.cpp
ibdrm/mobile2/src/util/domcore/CharacterDataImpl.cpp
ibdrm/mobile2/src/util/domcore/DOMException.cpp
ibdrm/mobile2/src/util/domcore/DocumentImpl.cpp
ibdrm/mobile2/src/util/domcore/ElementImpl.cpp
ibdrm/mobile2/src/util/domcore/NodeImpl.cpp
ibdrm/mobile2/src/util/domcore/NodeIterator.cpp
ibdrm/mobile2/src/util/domcore/NodeListImpl.cpp
ibdrm/mobile2/src/util/domcore/TextImpl.cpp
ibdrm/mobile2/src/util/ustl-1.0/bktrace.cpp
ibdrm/mobile2/src/util/ustl-1.0/bktrace.h
ibdrm/mobile2/src/util/ustl-1.0/bsconf.h
ibdrm/mobile2/src/util/ustl-1.0/cmemlink.cpp
ibdrm/mobile2/src/util/ustl-1.0/cmemlink.h
ibdrm/mobile2/src/util/ustl-1.0/config.h
ibdrm/mobile2/src/util/ustl-1.0/fstream.cpp
ibdrm/mobile2/src/util/ustl-1.0/fstream.h
ibdrm/mobile2/src/util/ustl-1.0/memblock.cpp
ibdrm/mobile2/src/util/ustl-1.0/memblock.h
ibdrm/mobile2/src/util/ustl-1.0/memlink.cpp
ibdrm/mobile2/src/util/ustl-1.0/memlink.h
ibdrm/mobile2/src/util/ustl-1.0/mistream.cpp
ibdrm/mobile2/src/util/ustl-1.0/mistream.h
ibdrm/mobile2/src/util/ustl-1.0/mostream.h
ibdrm/mobile2/src/util/ustl-1.0/ofstream.cpp
ibdrm/mobile2/src/util/ustl-1.0/ofstream.h
ibdrm/mobile2/src/util/ustl-1.0/simd.h
ibdrm/mobile2/src/util/ustl-1.0/sistream.cpp
ibdrm/mobile2/src/util/ustl-1.0/sistream.h
ibdrm/mobile2/src/util/ustl-1.0/sostream.cpp
ibdrm/mobile2/src/util/ustl-1.0/sostream.h
ibdrm/mobile2/src/util/ustl-1.0/strmsize.h
ibdrm/mobile2/src/util/ustl-1.0/ualgo.h
ibdrm/mobile2/src/util/ustl-1.0/ualgobase.cpp
ibdrm/mobile2/src/util/ustl-1.0/ualgobase.h
ibdrm/mobile2/src/util/ustl-1.0/uassert.h
ibdrm/mobile2/src/util/ustl-1.0/ubitset.cpp
ibdrm/mobile2/src/util/ustl-1.0/ubitset.h
ibdrm/mobile2/src/util/ustl-1.0/uctralgo.h
ibdrm/mobile2/src/util/ustl-1.0/uctrstrm.h
ibdrm/mobile2/src/util/ustl-1.0/uexception.cpp
ibdrm/mobile2/src/util/ustl-1.0/uexception.h
ibdrm/mobile2/src/util/ustl-1.0/ufunction.h
ibdrm/mobile2/src/util/ustl-1.0/uheap.h
ibdrm/mobile2/src/util/ustl-1.0/uios.h
ibdrm/mobile2/src/util/ustl-1.0/uiosfunc.h
ibdrm/mobile2/src/util/ustl-1.0/uiterator.h
ibdrm/mobile2/src/util/ustl-1.0/ulaalgo.h
ibdrm/mobile2/src/util/ustl-1.0/ulimits.h
ibdrm/mobile2/src/util/ustl-1.0/ulist.h
ibdrm/mobile2/src/util/ustl-1.0/umap.h
ibdrm/mobile2/src/util/ustl-1.0/umatrix.h
ibdrm/mobile2/src/util/ustl-1.0/umemory.h
ibdrm/mobile2/src/util/ustl-1.0/umultimap.h
ibdrm/mobile2/src/util/ustl-1.0/umultiset.h
ibdrm/mobile2/src/util/ustl-1.0/unew.cpp
ibdrm/mobile2/src/util/ustl-1.0/unew.h
ibdrm/mobile2/src/util/ustl-1.0/unumeric.h
ibdrm/mobile2/src/util/ustl-1.0/upair.h
ibdrm/mobile2/src/util/ustl-1.0/upredalgo.h
ibdrm/mobile2/src/util/ustl-1.0/uqueue.h
ibdrm/mobile2/src/util/ustl-1.0/uset.h
ibdrm/mobile2/src/util/ustl-1.0/uspecial.h
ibdrm/mobile2/src/util/ustl-1.0/ustack.h
ibdrm/mobile2/src/util/ustl-1.0/ustdxept.cpp
ibdrm/mobile2/src/util/ustl-1.0/ustdxept.h
ibdrm/mobile2/src/util/ustl-1.0/ustl.tbff
ibdrm/mobile2/src/util/ustl-1.0/ustring.cpp
ibdrm/mobile2/src/util/ustl-1.0/ustring.h
ibdrm/mobile2/src/util/ustl-1.0/utf8.h
ibdrm/mobile2/src/util/ustl-1.0/utuple.h
ibdrm/mobile2/src/util/ustl-1.0/utypes.h
ibdrm/mobile2/src/util/ustl-1.0/uutility.h
ibdrm/mobile2/src/util/ustl-1.0/uvector.h
ibdrm/mobile2/src/util/xml/DomExpatAgent.cpp
ibdrm/mobile2/src/util/xml/ExpatWrapper.cpp
ibdrm/mobile2/src/util/xml/XMLDocumentImpl.cpp
ibdrm/mobile2/src/util/xml/XMLElementImpl.cpp
ibmedia/Android.mk
ibmedia/AudioRecord.cpp
ibmedia/AudioSystem.cpp
ibmedia/AudioTrack.cpp
ibmedia/IAudioFlinger.cpp
ibmedia/IAudioRecord.cpp
ibmedia/IAudioTrack.cpp
ibmedia/IMediaPlayer.cpp
ibmedia/IMediaPlayerClient.cpp
ibmedia/IMediaPlayerService.cpp
ibmedia/MODULE_LICENSE_APACHE2
ibmedia/NOTICE
ibmedia/ToneGenerator.cpp
ibmedia/mediametadataretriever.cpp
ibmedia/mediaplayer.cpp
ibmediaplayerservice/Android.mk
ibmediaplayerservice/MediaPlayerService.cpp
ibmediaplayerservice/MediaPlayerService.h
ibmediaplayerservice/MidiFile.cpp
ibmediaplayerservice/MidiFile.h
ibmediaplayerservice/VorbisPlayer.cpp
ibmediaplayerservice/VorbisPlayer.h
ediaserver/Android.mk
ediaserver/main_mediaserver.cpp
dutils/Android.mk
dutils/sdutil.cpp